Release 1.6~alpha61.6_alpha6

59 files changed, 11717 insertions, 4059 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31f9a19c7..7d227e8eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,7 +176,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.6~alpha5")
+set(PACKAGE_VERSION "1.6~alpha6")
 
 if (NOT DEFINED DPKG_DATADIR)
   execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/changelog b/debian/changelog
index 0c41b26c6..80e64ace3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,54 @@
+apt (1.6~alpha6) unstable; urgency=medium
+
+  [ Julian Andres Klode ]
+  * Add Breaks: aptitude (<< 0.8.10) for gzip method removal
+  * Also look at https_proxy for https URLs
+  * Run wrap-and-sort
+  * Translate shared documentation parts again
+  * tests: Improve handling profiling messages on CI
+  * connect: Store the IP used when picking a connection
+  * Add rapid "happy eyeballs" connection fallback (RFC 8305) (Closes: #668948)
+    (LP: #1308200)
+
+  [ David Kalnischkies ]
+  * allow multivalue fields in deb822 sources to be folded (Closes: 881875)
+  * support COLUMNS environment variable in apt tools
+  * allow apt_auth.conf(5) to be translated
+  * if insecure repo is allowed continue on all http errors
+  * don't auto-switch candidate if installed is good enough
+  * update libapt-pkg symbols file
+  * explicitly name token in auth.conf parsing error
+  * fix over-calculating dpkg commandline length
+  * avoid some useless casts reported by -Wuseless-cast
+  * deal with floats without old-style cast
+  * support multiline values in LookupTag
+  * mark some 500 HTTP codes as transient acquire errors
+  * report transient errors as transient errors
+  * implement Acquire::Retries support for all items
+  * give the methods more metadata about the files to acquire
+  * implement fallback to alternative URIs for all items
+  * do not remap current files if nullptrs in cache generation
+  * apt.daily: remove unused dbus signal for apt update (Closes: 849636)
+  * Support cleartext signed InRelease files with CRLF line endings.
+    Thanks to Lukas Wunner for detailed report & initial patch! (Closes: 884922)
+  * document http options in new apt-transport-http manpage
+  * document https options in new apt-transport-https manpage
+  * refactor message generation for methods
+  * allow a method to request auxiliary files
+  * reimplement and simplify mirror:// method
+  * require methods to request AuxRequest capability at startup
+  * add tag-based control over mirror choices from the list
+  * non-local mirrorlists shouldn't redirect to local
+  * add apt-transport-mirror manpage
+
+  [ Milo Casagrande ]
+  * Italian program translation update (Closes: 882850)
+
+  [ Christian Göttsche ]
+  * apt.daily: fix several "shellcheck" annotations
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 03 Jan 2018 22:33:37 +0000
+
 apt (1.6~alpha5) unstable; urgency=medium
 
   [ Julian Andres Klode ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 8d0a56b6c..fcc9a5fcf 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -262,7 +262,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.6~alpha5">
+<!ENTITY apt-product-version "1.6~alpha6">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "jessie">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index e0be6a37d..de9e15663 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -19,7 +19,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2017-06-28T00:00:00Z</date>
+   <date>2017-11-22T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 7f2af495b..c23ed5183 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.6~alpha5\n"
+"Project-Id-Version: apt-doc 1.6~alpha6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-11-12 19:57+0100\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -505,7 +505,9 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "APT"
 msgstr ""
 
@@ -518,7 +520,9 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Description"
 msgstr ""
 
@@ -706,7 +710,8 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
 msgid "See Also"
 msgstr ""
 
@@ -1456,7 +1461,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
-#: apt_preferences.5.xml
+#: apt_preferences.5.xml apt_auth.conf.5.xml
 msgid "Files"
 msgstr ""
 
@@ -2089,6 +2094,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml apt-mark.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Options"
 msgstr ""
 
@@ -2764,7 +2771,7 @@ msgid "dburrows@debian.org"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt_auth.conf.5.xml
 msgid "5"
 msgstr ""
 
@@ -3279,123 +3286,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
-"URIs. It is in the standard form of "
-"<literal>http://[[user][:pass]@]host[:port]/</literal>.  Per host proxies "
-"can also be specified by using the form "
-"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>http_proxy</envar> environment variable will "
-"be used."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
-"response under any circumstances.  <literal>Max-Age</literal> sets the "
-"allowed maximum age (in seconds) of an index file in the cache of the "
-"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
-"store the requested archive files in its cache, which can be used to prevent "
-"the proxy from polluting its cache with (big) .deb files."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
-"e.g. on high-latency connections. It specifies how many requests are sent in "
-"a pipeline.  APT tries to detect and workaround misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification pipelining can be disabled by setting the value to "
-"0. It is enabled by default with the value 10."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
-"follow redirects, which is enabled by default."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The used bandwidth can be limited with "
-"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
-"kilobytes per second. The default value is 0 which deactivates the limit and "
-"tries to use all available bandwidth.  Note that this option implicitly "
-"disables downloading from multiple servers at the same time."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
-"User-Agent for the http download method as some proxies allow access for "
-"clients only if the client uses a known identifier."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
-"an external command to discover the http proxy to use. The first and only "
-"parameter is an URI denoting the host to be contacted to allow for "
-"host-specific configuration. APT expects the command to output the proxy on "
-"stdout as a single line in the style <literal>http://proxy:port/</literal> "
-"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
-"indicates that the generic proxy settings should be used.  Note that "
-"auto-detection will not be used for a host if a host-specific proxy "
-"configuration is already set via "
-"<literal>Acquire::http::Proxy::<replaceable>HOST</replaceable></literal>.  "
-"See the &squid-deb-proxy-client; package for an example implementation that "
-"uses avahi.  This option takes precedence over the legacy option name "
-"<literal>ProxyAutoDetect</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
-"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
-"the <literal>http</literal> method, and default to the same values if they "
-"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
-"yet supported."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
-"corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  "
-"<literal>&lt;host&gt;::Verify-Peer</literal> is the corresponding per-host "
-"option.  <literal>Verify-Host</literal> boolean suboption determines whether "
-"or not the server's hostname should be verified.  "
-"<literal>&lt;host&gt;::Verify-Host</literal> is the corresponding per-host "
-"option.  <literal>SslCert</literal> determines what certificate to use for "
-"client authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
-"corresponding per-host option.  <literal>SslKey</literal> determines what "
-"private key to use for client "
-"authentication. <literal>&lt;host&gt;::SslKey</literal> is the corresponding "
-"per-host option.  <literal>SslForceVersion</literal> overrides default SSL "
-"version to use.  It can contain either of the strings "
-"'<literal>TLSv1</literal>' or '<literal>SSLv3</literal>'.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is the corresponding "
-"per-host option."
+"The options in these scopes configure APTs acquire transports for the "
+"protocols HTTP and HTTPS and are documented in the &apt-transport-http; and "
+"&apt-transport-https; manpages respectively."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3422,6 +3315,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"The option <literal>timeout</literal> sets the timeout timer used by the "
+"method; this value applies to the connection as well as the data timeout."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 "some situations require that passive mode be disabled and port mode FTP used "
@@ -4263,6 +4163,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Examples"
 msgstr ""
 
@@ -5389,9 +5291,10 @@ msgid ""
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
-"especially that multiple values are separated by spaces, not by commas as in "
-"the one-line format. Multivalue fields like <literal>Architectures</literal> "
-"also have <literal>Architectures-Add</literal> and "
+"especially that multiple values are separated by whitespaces (like spaces, "
+"tabs and newlines), not by commas as in the one-line format.  Multivalue "
+"fields like <literal>Architectures</literal> also have "
+"<literal>Architectures-Add</literal> and "
 "<literal>Architectures-Remove</literal> to modify the default value rather "
 "than replacing it."
 msgstr ""
@@ -5718,19 +5621,23 @@ msgstr ""
 msgid "The currently recognized URI types are:"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-http;)"
+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;."
+"commonly used method. 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>
@@ -5744,6 +5651,11 @@ msgid ""
 "chosen transport method. See &apt-secure; for details."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-https;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
@@ -6061,6 +5973,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "1"
 msgstr ""
 
@@ -6860,6 +6774,785 @@ msgid ""
 "100 on error."
 msgstr ""
 
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt_auth.conf.5.xml
+msgid "Login configuration file for APT sources and proxies"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"APT configuration files like &sources-list; or &apt-conf; need to be "
+"accessible for everyone using apt tools on the system to have access to all "
+"package-related information like the available packages in a "
+"repository. Login information needed to connect to a proxy or to download "
+"data from a repository on the other hand shouldn't always be accessible by "
+"everyone and can hence not be placed in a file with world-readable file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used "
+"to store login information in a netrc-like format with restrictive file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "netrc-like format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The format defined here is similar to the format of the "
+"<filename>~/.netrc</filename> file used by "
+"<citerefentry><refentrytitle><command>ftp</command></refentrytitle><manvolnum>1</manvolnum></citerefentry> "
+"and similar programs interacting with servers.  It is a simple token-based "
+"format with the following tokens being recognized; Unknown tokens will be "
+"ignored. Tokens may be separated by spaces, tabs or newlines."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid ""
+"<literal>machine</literal> "
+"<replaceable>hostname</replaceable>[:<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Entries are looked up by searching for the "
+"<emphasis><literal>machine</literal></emphasis> token matching the hostname "
+"of the URI apt needs login information for. Extending the netrc-format a "
+"portnumber can be specified. If no port is given the token matches for all "
+"ports.  Similar the path is optional and only needed and useful if multiple "
+"repositories with different login information reside on the same server. A "
+"machine token with a path matches if the path in the URI starts with the "
+"path given in the token.  Once a match is made, the subsequent tokens are "
+"processed, stopping when the end of file is reached or another "
+"<emphasis><literal>machine</literal></emphasis> token is encountered."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid "<literal>login</literal> <replaceable>name</replaceable>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The username to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid "<literal>password</literal> <replaceable>string</replaceable>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The password to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org\n"
+"login apt\n"
+"password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "machine example.org login apt password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org/deb login apt password debian\n"
+"machine example.org/debian login apt password debian\n"
+"machine example.org/debian/ login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org:80 login apt password debian\n"
+"machine example.org/deb/ login apt password debian\n"
+"machine example.org/ubuntu login apt password debian\n"
+"machine example.orga login apt password debian\n"
+"machine example.net login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Supplying login information for a user named <literal>apt</literal> with the "
+"password <literal>debian</literal> for the &sources-list; entry <placeholder "
+"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
+"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
+"the following in the auth.conf file could be used: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
+"specific all of these lines will also apply to the example entry: "
+"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
+"the following lines apply: <placeholder type=\"literallayout\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Notes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Basic support for this feature is present since version 0.7.25, but was "
+"undocumented for years. The documentation was added in version 1.5 changing "
+"also the implementation slightly. For maximum backward compatibility you "
+"should avoid multiple <literal>machine</literal> tokens with the same "
+"hostname, but if you need multiple they should all have a path specified in "
+"the <literal>machine</literal> token."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid "<filename>/etc/apt/auth.conf</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information for APT sources and proxies in a netrc-like format.  "
+"Configuration Item: <literal>Dir::Etc::netrc</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid "&apt-conf; &sources-list;"
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-http.1.xml
+msgid "APT transport for downloading via the Hypertext Transfer Protocol (HTTP)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the Hypertext "
+"Transfer Protocol (HTTP). It is available by default and probably the most "
+"used of all transports. Note that a transport is never called directly by a "
+"user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"HTTP is an unencrypted transport protocol meaning that the whole "
+"communication with the remote server (or proxy) can be observed by a "
+"sufficiently capable attacker referred to commonly as man in the middle "
+"(MITM).  Such an attacker can <emphasis>not</emphasis> modify the "
+"communication to compromise the security of your system through as APTs data "
+"security model is independent of the chosen transport method. This is "
+"explained in detail in &apt-secure;. An overview over available transport "
+"methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Various options are available to modify its behaviour which can be set in an "
+"&apt-conf; file ranging from proxy configuration to workaround for specific "
+"server insufficiencies."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+msgid "Proxy Configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The environment variable <envar>http_proxy</envar> is supported for system "
+"wide configuration.  Proxies specific to apt can be configured via the "
+"option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
+"used only for certain hosts can be specified via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. "
+"Even more finegrained control can be achieved via proxy autodetection "
+"detailed further below.  All these options use the URI format "
+"<literal><replaceable>scheme</replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</replaceable>]/</literal>.  "
+"Supported URI schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS "
+"resolution), <literal>http</literal> and <literal>https</literal>.  "
+"Authentification details can be supplied via &apt-authconf; instead of "
+"including it in the URI directly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The various APT configuration options support the special value "
+"<literal>DIRECT</literal> meaning that no proxy should be used. The "
+"environment variable <envar>no_proxy</envar> with the same propose is also "
+"supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Further more there are three settings provided for cache control with "
+"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
+"tells the proxy not to use its cached response under any circumstances.  "
+"<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
+"seconds) of an index file in the cache of the proxy.  "
+"<literal>Acquire::http::No-Store</literal> specifies that the proxy should "
+"not store the requested archive files in its cache, which can be used to "
+"prevent the proxy from polluting its cache with (big) .deb files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+msgid "Automatic Proxy Configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for "
+"host-specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the previously specified URI format or the word "
+"<literal>DIRECT</literal> if no proxy should be used. No output indicates "
+"that the generic proxy settings should be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Note that auto-detection will not be used for a host if a host-specific "
+"proxy configuration is already set via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"See the &squid-deb-proxy-client; and &auto-apt-proxy; packages for example "
+"implementations."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This option takes precedence over the legacy option name "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+msgid "Connection Configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The option <literal>Acquire::http::Timeout</literal> sets the timeout timer "
+"used by the method; this value applies to the connection as well as the data "
+"timeout."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The used bandwidth can be limited with "
+"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
+"kilobytes per second. The default value is 0 which deactivates the limit and "
+"tries to use all available bandwidth. Note that this option implicitly "
+"disables downloading from multiple servers at the same time."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to "
+"0. It is enabled by default with the value 10."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::SendAccept</literal> is enabled by default and sends "
+"a <literal>Accept: text/*</literal> header field to the server for requests "
+"without file extensions to prevent the server from attempting content "
+"negotiation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-http.1.xml
+#, no-wrap
+msgid ""
+"Acquire::http {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-http-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTP\";\n"
+"\tSendAccept \"false\";\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid "&apt-conf; &apt-authconf; &sources-list;"
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-https.1.xml
+msgid "APT transport for downloading via the HTTP Secure protocol (HTTPS)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the HTTP "
+"Secure protocol (HTTPS) also referred to as HTTP over TLS. It is available "
+"by default since apt 1.5 and was before that available in a "
+"<package>apt-transport-https</package> package. Note that a transport is "
+"never called directly by a user but used by APT tools based on user "
+"configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"HTTP is by itself an unencrypted transport protocol (compare "
+"&apt-transport-http;), which, as indicated by the appended S is wrapped in "
+"an encrypted layer known as Transport Layer Security (TLS) which provides "
+"end-to-end encryption.  A sufficiently capable attacker can still observe "
+"the communication partners and deeper analyse of the encrypted communcation "
+"might still reveal important details.  An overview over available "
+"alternative transport methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"The HTTPS protocol is based on the HTTP protocol and as such this "
+"implementation has the same relation meaning that all options supported by "
+"&apt-transport-http; are also available via "
+"<literal>Acquire::https</literal> and will default to the same values "
+"specified for <literal>Acquire::http</literal>. This manpage will only "
+"document the options <emphasis>unique to https</emphasis>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Server credentials"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"By default all certificates trusted by the system (see "
+"<package>ca-certificates</package> package) are used for the verification of "
+"the server certificate. An alternative certificate authority (CA) can be "
+"configured with the <literal>Acquire::https::CAInfo</literal> option and its "
+"host-specific option "
+"<literal>Acquire::https::CAInfo::<replaceable>host</replaceable></literal>.  "
+"The option specifies a file is made of the concatenation of the CA "
+"certificates (in PEM format) creating the chain used for the verification of "
+"the path from the root (self signed one). If the remote server provides the "
+"whole chain during the exchange, the file need only contain the root "
+"certificate. Otherwise, the whole chain is required. If you need to support "
+"multiple authorities, the only way is to concatenate everything."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"A custom certificate revocation list (CRL) can be configured with the "
+"options <literal>Acquire::https::CRLFile</literal> and "
+"<literal>Acquire::https::CRLFile::<replaceable>host</replaceable></literal> "
+"respectively.  Like the previous option a file in PEM format needs to be "
+"specified."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Disabling security"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"When authenticating the server, if the certificate verification fails for "
+"some reason (expired, revoked, man in the middle, …), the connection fails.  "
+"This is obviously what you want in all cases and what the default value "
+"(true)  of the option <literal>Acquire::https::Verify-Peer</literal> and its "
+"host-specific variant provides. If you know <emphasis>exactly</emphasis> "
+"what you are doing, setting this option to \"false\" allows you to skip peer "
+"certificate verification and make the exchange succeed. Again, this option "
+"is for debugging or testing purpose only as it removes all security provided "
+"by the use of HTTPS."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Similarly the option <literal>Acquire::https::Verify-Host</literal> and its "
+"host-specific variant can be used to deactivate a security feature: The "
+"certificate provided by the server includes the identity of the server which "
+"should match the DNS name used to access it. By default, as requested by RFC "
+"2818, the name of the mirror is checked against the identity found in the "
+"certificate. This default behavior is safe and should not be changed, but if "
+"you know that the server you are using has a DNS name which does not match "
+"the identity in its certificate, you can set the option to \"false\", which "
+"will prevent the comparison to be done."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Client authentication"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Beside the password based authentication available (see &apt-authconf;) "
+"HTTPS supports authentication based on client certificates as well via "
+"<literal>Acquire::https::SSLCert</literal> and "
+"<literal>Acquire::https::SSLKey</literal>. They respectively should be set "
+"to the filename of the X.509 client certificate and the associated "
+"(unencrypted) private key, both in PEM format.  In practice the use of the "
+"host-specific variants of both options is highly recommended."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-https.1.xml
+#, no-wrap
+msgid ""
+"Acquire::https {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-https-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTPS\";\n"
+"\tSendAccept \"false\";\n"
+"\n"
+"\tCAInfo \"/path/to/ca/certs.pem\";\n"
+"\tCRLFile \"/path/to/all/crl.pem\";\n"
+"\tVerify-Peer \"true\";\n"
+"\tVerify-Host::broken.example.org \"false\";\n"
+"\tSSLCert::example.org \"/path/to/client/cert.pem\";\n"
+"\tSSLKey::example.org \"/path/to/client/key.pem\"\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid "&apt-transport-http; &apt-conf; &apt-authconf; &sources-list;"
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-mirror.1.xml
+msgid "APT transport for more automated mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This APT transport isn't implementing a protocol to access local or remote "
+"repositories on its own, but acquires a mirrorlist and redirects all "
+"requests to the mirror(s) picked from this list access via other transports "
+"like &apt-transport-http;. The basic functionality is available since apt "
+"0.7.24, but was undocumented until apt 1.6 which contained a complete rework "
+"of the transport and its supported features. Note that a transport is never "
+"called directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If the acquisition of a file via a mirror fails the method ensures that "
+"automatically another possible mirror of the list is tried until either the "
+"file is retrieved or no mirror is left in the list handling transparently "
+"server downtimes and similar problems."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The security implications of the transport are based on the security "
+"considerations associated with the transport used to acquire the mirrorlist "
+"and the transports involved in accessing the chosen mirror(s) by the "
+"transport."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This transport has no configuration options at present. The mirror selection "
+"is based entirely on the mirrors offered in the mirrorlist and the files apt "
+"needs to acquire."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirrorlist format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A mirrorlist contains at least one line each specifying an URI for a "
+"mirror.  Empty lines and those starting with a hash key "
+"(<literal>#</literal>) are ignored.  An URI always starts with a URI scheme "
+"which defines the transport used for this mirror. If the URI e.g. starts "
+"with <literal>http:</literal> the responsible transport is "
+"&apt-transport-http; which might have specific requirements for the format "
+"of the remaining part of the URI."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"An URI can optionally be separated from metadata about the mirror by a tab.  "
+"Multiple datapoints in the provided metadata can itself be separated by "
+"spaces for tabs.  (This is an advanced feature only available with apt >= "
+"1.6. Earlier apt versions will fail to parse mirrorlists using this feature)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Since apt 1.6 the usage of compressed mirrorlists is also supported.  Note "
+"that the filename of the mirrorlist must specify the compression algorithm "
+"used, there is no auto-detection based on file content performed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirror selection by metadata"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As specified in the format a mirror can have additional metadata attached to "
+"prevent a mirror from being selected for acquiring a file not matching this "
+"metadata.  This way the mirrorlist can e.g. contain partial mirrors serving "
+"only certain architectures and apt will automatically choose a different "
+"mirror for files requiring an unlisted architecture. Supported are limits "
+"for the architecture (<literal>arch</literal>), codename of the release "
+"(<literal>codename</literal>), component of the repository the file is in "
+"(<literal>component</literal>), language the file applies to "
+"(<literal>lang</literal>), suite name of the release "
+"(<literal>suite</literal>) and type of the file (<literal>type</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Fallback order for mirrors"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If no priority is given via the metadata key <literal>priority</literal> for "
+"a mirror the order in which mirrors are contacted is random. If a certain "
+"set of mirrors should be tried first before any of another set is tried a "
+"priority can be explicitly set. The mirrors with the lowest number are tried "
+"first. Mirrors which have no explicit priority set default to the highest "
+"possible number and are therefore tried last. The choice between mirrors "
+"with the same priority is again random."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Allowed transports in a mirrorlist"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The availability and choice of transports in a mirrorlist is limited by how "
+"the apt client is accessing the mirrorlist. If a local transport like "
+"<literal>file</literal> or <literal>copy</literal> is used the mirrorlist "
+"can also include local sources while a mirrorlist accessed via "
+"<literal>http</literal> can not. Additionally, a mirrorlist can not contain "
+"a mirrorlist or other wrapping transports (like "
+"<package>apt-transport-tor</package>).  See the documentation of these "
+"transports on how to use them with the mirror method."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that apt versions before 1.6 do not support any other transport than "
+"<literal>http</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Basic example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A basic mirrorlist example supported by all apt versions with a mirror "
+"method (>= 0.7.24) in which the client will pick any of the three mirrors:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"http://ftp.de.debian.org/debian/\n"
+"http://ftp.us.debian.org/debian/\n"
+"http://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Assuming a file with this content is stored as "
+"<filename>/etc/apt/mirrorlist.txt</filename> on your machine it can be used "
+"like this in &sources-list; (since apt 1.6):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror+file:/etc/apt/mirrorlist.txt &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"All versions of the mirror method support a mirrorlist accessible via http, "
+"so assuming it is available at "
+"<literal>http://apt.example.org/mirror.lst</literal> the sources.list entry "
+"from above could be written instead as:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror://apt.example.org/mirror.lst &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that since apt 1.6 the use of <literal>mirror+http</literal> should be "
+"preferred over <literal>mirror</literal> for uniformity. The functionality "
+"is the same."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Example with metadata-enhanced mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As explained in the format definition apt versions before 1.6 do not support "
+"this and will fail parsing the mirrorlist. The example mirrorlist is "
+"proposefully complicated to show some aspects of the selection. The "
+"following setup is assumed: The first mirror is local mirror accessible via "
+"the file method, but potentially incomplete. The second mirror has a great "
+"connection, but is a partial mirror in sofar as it only contains files "
+"related to the architectures <literal>amd64</literal> and "
+"<literal>all</literal>. The remaining mirrors are average mirrors which "
+"should be contacted only if the earlier ones didn't work."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"file:/srv/local/debian/mirror/\tpriority:1 type:index\n"
+"http://partial.example.org/mirror/\tpriority:2 arch:amd64 arch:all "
+"type:deb\n"
+"http://ftp.us.debian.org/debian/\ttype:deb\n"
+"http://ftp.de.debian.org/debian/\ttype:deb\n"
+"https://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"In this setup with this mirrorlist the first mirror will be used to download "
+"all index files assuming the mirrorlist itself is accessed via a local "
+"transport like <literal>file</literal>. If it isn't, the mirror is otherwise "
+"inaccessible or does not contain the requested file another mirror will be "
+"used to acquire the file, which one depending on the type of the file: An "
+"index file will be served by the last mirror in the list, while a package of "
+"architecture <literal>amd64</literal> is served by the second and those of "
+"e.g. architecture <literal>i386</literal> by one of the last three."
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
 #: guide.dbk offline.dbk
 msgid "en"
diff --git a/doc/po/de.po b/doc/po/de.po
index d0033eb2c..9e271ecfb 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-08-24 23:21+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -624,7 +624,9 @@ msgstr "8"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "APT"
 msgstr "APT"
 
@@ -637,7 +639,9 @@ msgstr "Befehlszeilenschnittstelle"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -912,7 +916,8 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
 msgid "See Also"
 msgstr "Siehe auch"
 
@@ -2038,7 +2043,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
-#: apt_preferences.5.xml
+#: apt_preferences.5.xml apt_auth.conf.5.xml
 msgid "Files"
 msgstr "Dateien"
 
@@ -2939,7 +2944,8 @@ msgstr ""
 "Ubuntu funktioniert dies aber."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
 msgid "Options"
 msgstr "Optionen"
 
@@ -3897,7 +3903,7 @@ msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt_auth.conf.5.xml
 msgid "5"
 msgstr "5"
 
@@ -4692,200 +4698,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
-"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>http_proxy</envar> environment variable will "
-"be used."
-msgstr ""
-"<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er "
-"wird standardmäßig in der Form <literal>http://[[Anwender][:"
-"Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxys kann "
-"außerdem in der Form <literal>http::Proxy::&lt;host&gt;</literal> mit dem "
-"speziellen Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass "
-"keine Proxys benutzt werden. Falls keine der obigen Einstellungen angegeben "
-"wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
-"response under any circumstances.  <literal>Max-Age</literal> sets the "
-"allowed maximum age (in seconds) of an index file in the cache of the "
-"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
-"store the requested archive files in its cache, which can be used to prevent "
-"the proxy from polluting its cache with (big) .deb files."
-msgstr ""
-"Für die Steuerung des Zwischenspeichers mit HTTP/1.1-konformen Proxy-"
-"Zwischenspeichern stehen drei Einstellungen zur Verfügung. <literal>No-"
-"Cache</literal> teilt dem Proxy mit, dass er unter keinen Umständen seine "
-"zwischengespeicherten Antworten benutzen soll, <literal>Max-Age</literal> "
-"setzt das maximal erlaubte Alter einer Indexdatei im Zwischenspeicher des "
-"Proxys (in Sekunden). <literal>No-Store</literal> gibt an, dass der Proxy "
-"die angefragten Archivdateien nicht in seinem Zwischenspeicher ablegen soll. "
-"Das kann verwandt werden, um zu verhindern, dass der Proxy seinen "
-"Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
+"The options in these scopes configure APTs acquire transports for the "
+"protocols HTTP and HTTPS and are documented in the &apt-transport-http; and "
+"&apt-transport-https; manpages respectively."
 msgstr ""
-"Die Option <literal>timeout</literal> stellt den Zeitnehmer, der von der "
-"Methode benutzt wird. Dieser Wert wird auf die Verbindungs- sowie die "
-"Datenzeitüberschreitungen angewandt."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and workaround misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
-"It is enabled by default with the value 10."
-msgstr ""
-"Die Einstellung <literal>Acquire::http::Pipeline-Depth</literal> kann "
-"verwandt werden, um HTTP-Weiterleitung zu aktivieren (RFC 2616 Abschnitt "
-"8.1.2.2), was z.B. bei Verbindungen mit hoher Latenz vorteilhaft sein kann. "
-"Sie gibt an, wie viele Anfragen in eine Leitung gesandt werden. APT "
-"versucht, zur Laufzeit Webserver und Proxys aufzuspüren, die sich falsch "
-"verhalten und eine Behelfslösung zu finden. Falls Sie jedoch wissen, dass "
-"sich Ihrer nicht konform zur HTTP/1.1-Spezifikation verhält, kann das "
-"Weiterleiten durch Setzen des Wertes auf 0 deaktiviert werden. Standardmäßig "
-"ist es mit dem Wert 10 aktiviert."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
-"follow redirects, which is enabled by default."
-msgstr ""
-"<literal>Acquire::http::AllowRedirect</literal> steuert, ob APT Umleitungen "
-"folgen wird, was standardmäßig aktiviert ist."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobytes per second. The default "
-"value is 0 which deactivates the limit and tries to use all available "
-"bandwidth.  Note that this option implicitly disables downloading from "
-"multiple servers at the same time."
-msgstr ""
-"Die benutzte Bandbreite kann durch <literal>Acquire::http::Dl-Limit</"
-"literal> eingeschränkt werden, was Ganzzahlwerte in Kilobyte pro Sekunde "
-"akzeptiert. Der Vorgabewert ist 0, was die Beschränkung ausschaltet und "
-"versucht, sämtliche verfügbare Bandbreite zu benutzen. Beachten Sie, dass "
-"diese Optionen implizit das Herunterladen von mehreren Servern zur gleichen "
-"Zeit deaktiviert."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
-"User-Agent for the http download method as some proxies allow access for "
-"clients only if the client uses a known identifier."
-msgstr ""
-"<literal>Acquire::http::User-Agent</literal> kann benutzt werden, um einen "
-"unterschiedlichen User-Agent für die HTTP-Download-Methode zu setzten, da "
-"einige Proxys den Clients nur dann Zugriff gewähren, wenn der Client einen "
-"bekannten Bezeichner verwendet."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
-"an external command to discover the http proxy to use. The first and only "
-"parameter is an URI denoting the host to be contacted to allow for host-"
-"specific configuration. APT expects the command to output the proxy on "
-"stdout as a single line in the style <literal>http://proxy:port/</literal> "
-"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
-"indicates that the generic proxy settings should be used.  Note that auto-"
-"detection will not be used for a host if a host-specific proxy configuration "
-"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
-"example implementation that uses avahi.  This option takes precedence over "
-"the legacy option name <literal>ProxyAutoDetect</literal>."
-msgstr ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> kann benutzt werden, um "
-"einen externen Befehl zum Auffinden des HTTP-Proxys anzugeben, der benutzt "
-"werden soll. Der erste und einzige Parameter ist ein URI, der den Rechner "
-"bezeichnet, der kontaktiert werden soll, um eine rechnerspezifische "
-"Konfiguration zu ermöglichen. APT erwartet den Befehl als Ausgabe auf der "
-"Standardausgabe als einzelne Zeile im Stil <literal>http://proxy:port/</"
-"literal> oder das Wort <literal>DIRECT</literal>, falls kein Proxy benutzt "
-"werden soll. Fehlt die Ausgabe, zeigt dies an, dass die allgemeinen Proxy-"
-"Einstellungen benutzt werden sollen. Beachten Sie, dass die automatische "
-"Erkennung nicht für einen Rechner benutzt wird, falls bereits eine "
-"rechnerspezifische Proxy-Konfiguration per <literal>Acquire::http::Proxy::"
-"<replaceable>Rechner</replaceable></literal> gesetzt wurde. Eine "
-"Beispielimplementierung, die Avahi benutzt, finden Sie im Paket &squid-deb-"
-"proxy-client;. Diese Option hat Vorrang vor dem veralteten Optionsnamen "
-"<literal>ProxyAutoDetect</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
-"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
-"the <literal>http</literal> method, and default to the same values if they "
-"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
-"yet supported."
-msgstr ""
-"Die Optionen <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> und "
-"<literal>proxy</literal> funktionieren für HTTPS-URIs auf die gleiche Weise "
-"wie für die Methode <literal>http</literal> und haben die gleichen "
-"Vorgabewerte, falls sie nicht explizit gesetzt wurden. Die Option "
-"<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
-"corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
-"literal> is the corresponding per-host option.  <literal>Verify-Host</"
-"literal> boolean suboption determines whether or not the server's hostname "
-"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
-"corresponding per-host option.  <literal>SslCert</literal> determines what "
-"certificate to use for client authentication. <literal>&lt;host&gt;::"
-"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
-"literal> determines what private key to use for client authentication. "
-"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
-"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
-"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> is the corresponding per-host option."
-msgstr ""
-"Die Unteroption <literal>CaInfo</literal> gibt den Ort an, an dem "
-"Informationen über vertrauenswürdige Zertifikate bereitgehalten werden. "
-"<literal>&lt;host&gt;::CaInfo</literal> ist die entsprechende Option pro "
-"Rechner. Die boolsche Unteroption <literal>Verify-Peer</literal> "
-"entscheidet, ob das Rechnerzertifikat des Servers mit den vertrauenswürdigen "
-"Zertifikaten geprüft werden soll oder nicht. <literal>&lt;host&gt;::Verify-"
-"Peer</literal> ist die entsprechende Option pro Rechner. Die boolsche "
-"Unteroption <literal>Verify-Host</literal> entscheidet, ob der Rechnername "
-"des Servers geprüft werden soll oder nicht. <literal>&lt;host&gt;::Verify-"
-"Host</literal> ist die entsprechende Option pro Rechner. <literal>SslCert</"
-"literal> entscheidet, welches Zertifikat zur Client-Authentifizierung "
-"benutzt wird. <literal>&lt;host&gt;::SslCert</literal> ist die entsprechende "
-"Option pro Rechner. <literal>SslKey</literal> entscheidet, welcher private "
-"Schlüssel für die Client-Authentifizierung benutzt werden. <literal>&lt;"
-"host&gt;::SslKey</literal> ist die entsprechende Option pro Rechner. "
-"<literal>SslForceVersion</literal> überschreibt die zu benutzende Standard-"
-"SSL-Version. Es kann die beiden Zeichenketten »<literal>TLSv1</literal>« "
-"oder »<literal>SSLv3</literal>« enthalten. Die entsprechende Option pro "
-"Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4925,6 +4741,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"The option <literal>timeout</literal> sets the timeout timer used by the "
+"method; this value applies to the connection as well as the data timeout."
+msgstr ""
+"Die Option <literal>timeout</literal> stellt den Zeitnehmer, der von der "
+"Methode benutzt wird. Dieser Wert wird auf die Verbindungs- sowie die "
+"Datenzeitüberschreitungen angewandt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 "some situations require that passive mode be disabled and port mode FTP used "
@@ -6162,6 +5988,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Examples"
 msgstr "Beispiele"
 
@@ -7707,6 +7535,25 @@ msgstr "Format im Deb822-Stil"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "Files in this format have the extension <filename>.sources</filename>.  "
+#| "The format is similar in syntax to other files used by Debian and its "
+#| "derivatives, such as the metadata files that apt will download from the "
+#| "configured sources or the <filename>debian/control</filename> file in a "
+#| "Debian source package.  Individual entries are separated by an empty "
+#| "line; additional empty lines are ignored, and a <literal>#</literal> "
+#| "character at the start of the line marks the entire line as a comment. An "
+#| "entry can hence be disabled by commenting out each line belonging to the "
+#| "stanza, but it is usually easier to add the field \"Enabled: no\" to the "
+#| "stanza to disable the entry. Removing the field or setting it to yes "
+#| "reenables it.  Options have the same syntax as every other field: A "
+#| "fieldname separated by a colon (<literal>:</literal>) and optionally "
+#| "spaces from its value(s).  Note especially that multiple values are "
+#| "separated by spaces, not by commas as in the one-line format. Multivalue "
+#| "fields like <literal>Architectures</literal> also have "
+#| "<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+#| "literal> to modify the default value rather than replacing it."
 msgid ""
 "Files in this format have the extension <filename>.sources</filename>.  The "
 "format is similar in syntax to other files used by Debian and its "
@@ -7720,10 +7567,11 @@ msgid ""
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
-"especially that multiple values are separated by spaces, not by commas as in "
-"the one-line format. Multivalue fields like <literal>Architectures</literal> "
-"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
-"Remove</literal> to modify the default value rather than replacing it."
+"especially that multiple values are separated by whitespaces (like spaces, "
+"tabs and newlines), not by commas as in the one-line format.  Multivalue "
+"fields like <literal>Architectures</literal> also have "
+"<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+"literal> to modify the default value rather than replacing it."
 msgstr ""
 "Dateien in diesem Format haben die Endung<filename>.sources</filename>. Die "
 "Syntax des Formates ist dem ähnlich, was andere von Debian und seinen "
@@ -8251,19 +8099,23 @@ msgstr "URI-Beschreibung"
 msgid "The currently recognized URI types are:"
 msgstr "Die derzeit zulässigen URI-Typen sind:"
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-http;)"
+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;."
+"commonly used method. 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>
@@ -8277,6 +8129,11 @@ msgid ""
 "chosen transport method. See &apt-secure; for details."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-https;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
@@ -8722,6 +8579,8 @@ msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "1"
 msgstr "1"
 
@@ -9819,6 +9678,895 @@ msgstr ""
 "<command>apt-ftparchive</command> gibt bei normalen Operationen 0 zurück, "
 "dezimal 100 bei Fehlern."
 
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Configuration file for APT"
+msgid "Login configuration file for APT sources and proxies"
+msgstr "Konfigurationsdatei für APT"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"APT configuration files like &sources-list; or &apt-conf; need to be "
+"accessible for everyone using apt tools on the system to have access to all "
+"package-related information like the available packages in a repository. "
+"Login information needed to connect to a proxy or to download data from a "
+"repository on the other hand shouldn't always be accessible by everyone and "
+"can hence not be placed in a file with world-readable file permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used "
+"to store login information in a netrc-like format with restrictive file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "netrc-like format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The format defined here is similar to the format of the <filename>~/.netrc</"
+"filename> file used by <citerefentry><refentrytitle><command>ftp</command></"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs "
+"interacting with servers.  It is a simple token-based format with the "
+"following tokens being recognized; Unknown tokens will be ignored. Tokens "
+"may be separated by spaces, tabs or newlines."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid ""
+"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Entries are looked up by searching for the <emphasis><literal>machine</"
+"literal></emphasis> token matching the hostname of the URI apt needs login "
+"information for. Extending the netrc-format a portnumber can be specified. "
+"If no port is given the token matches for all ports.  Similar the path is "
+"optional and only needed and useful if multiple repositories with different "
+"login information reside on the same server. A machine token with a path "
+"matches if the path in the URI starts with the path given in the token.  "
+"Once a match is made, the subsequent tokens are processed, stopping when the "
+"end of file is reached or another <emphasis><literal>machine</literal></"
+"emphasis> token is encountered."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>login</literal> <replaceable>name</replaceable>"
+msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The username to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>password</literal> <replaceable>string</replaceable>"
+msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The password to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Examples"
+msgid "Example"
+msgstr "Beispiele"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org\n"
+"login apt\n"
+"password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "machine example.org login apt password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org/deb login apt password debian\n"
+"machine example.org/debian login apt password debian\n"
+"machine example.org/debian/ login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org:80 login apt password debian\n"
+"machine example.org/deb/ login apt password debian\n"
+"machine example.org/ubuntu login apt password debian\n"
+"machine example.orga login apt password debian\n"
+"machine example.net login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Supplying login information for a user named <literal>apt</literal> with the "
+"password <literal>debian</literal> for the &sources-list; entry <placeholder "
+"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
+"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
+"the following in the auth.conf file could be used: <placeholder type="
+"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
+"specific all of these lines will also apply to the example entry: "
+"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
+"the following lines apply: <placeholder type=\"literallayout\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Notes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Basic support for this feature is present since version 0.7.25, but was "
+"undocumented for years. The documentation was added in version 1.5 changing "
+"also the implementation slightly. For maximum backward compatibility you "
+"should avoid multiple <literal>machine</literal> tokens with the same "
+"hostname, but if you need multiple they should all have a path specified in "
+"the <literal>machine</literal> token."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid "<filename>/etc/apt/auth.conf</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Show full versions for upgraded and installed packages.  Configuration "
+#| "Item: <literal>APT::Get::Show-Versions</literal>."
+msgid ""
+"Login information for APT sources and proxies in a netrc-like format.  "
+"Configuration Item: <literal>Dir::Etc::netrc</literal>."
+msgstr ""
+"zeigt vollständige Versionen für Pakete, von denen ein Upgrade durchgeführt "
+"oder die installiert wurden. Konfigurationselement: <literal>APT::Get::Show-"
+"Versions</literal>."
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "&apt-conf;, &sources-list;, &apt-get;"
+msgid "&apt-conf; &sources-list;"
+msgstr "&apt-conf;, &sources-list;, &apt-get;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-http.1.xml
+msgid ""
+"APT transport for downloading via the Hypertext Transfer Protocol (HTTP)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the Hypertext "
+"Transfer Protocol (HTTP). It is available by default and probably the most "
+"used of all transports. Note that a transport is never called directly by a "
+"user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"HTTP is an unencrypted transport protocol meaning that the whole "
+"communication with the remote server (or proxy) can be observed by a "
+"sufficiently capable attacker referred to commonly as man in the middle "
+"(MITM).  Such an attacker can <emphasis>not</emphasis> modify the "
+"communication to compromise the security of your system through as APTs data "
+"security model is independent of the chosen transport method. This is "
+"explained in detail in &apt-secure;. An overview over available transport "
+"methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Various options are available to modify its behaviour which can be set in an "
+"&apt-conf; file ranging from proxy configuration to workaround for specific "
+"server insufficiencies."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Proxy Configuration"
+msgstr "Benutzerkonfiguration"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The environment variable <envar>http_proxy</envar> is supported for system "
+"wide configuration.  Proxies specific to apt can be configured via the "
+"option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
+"used only for certain hosts can be specified via <literal>Acquire::http::"
+"Proxy::<replaceable>host</replaceable></literal>. Even more finegrained "
+"control can be achieved via proxy autodetection detailed further below.  All "
+"these options use the URI format <literal><replaceable>scheme</"
+"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
+"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
+"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
+"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
+"<literal>https</literal>.  Authentification details can be supplied via &apt-"
+"authconf; instead of including it in the URI directly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The various APT configuration options support the special value "
+"<literal>DIRECT</literal> meaning that no proxy should be used. The "
+"environment variable <envar>no_proxy</envar> with the same propose is also "
+"supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches.  <literal>No-Cache</literal> tells the proxy not to use its "
+#| "cached response under any circumstances.  <literal>Max-Age</literal> sets "
+#| "the allowed maximum age (in seconds) of an index file in the cache of the "
+#| "proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+#| "store the requested archive files in its cache, which can be used to "
+#| "prevent the proxy from polluting its cache with (big) .deb files."
+msgid ""
+"Further more there are three settings provided for cache control with "
+"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
+"tells the proxy not to use its cached response under any circumstances.  "
+"<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
+"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
+"http::No-Store</literal> specifies that the proxy should not store the "
+"requested archive files in its cache, which can be used to prevent the proxy "
+"from polluting its cache with (big) .deb files."
+msgstr ""
+"Für die Steuerung des Zwischenspeichers mit HTTP/1.1-konformen Proxy-"
+"Zwischenspeichern stehen drei Einstellungen zur Verfügung. <literal>No-"
+"Cache</literal> teilt dem Proxy mit, dass er unter keinen Umständen seine "
+"zwischengespeicherten Antworten benutzen soll, <literal>Max-Age</literal> "
+"setzt das maximal erlaubte Alter einer Indexdatei im Zwischenspeicher des "
+"Proxys (in Sekunden). <literal>No-Store</literal> gibt an, dass der Proxy "
+"die angefragten Archivdateien nicht in seinem Zwischenspeicher ablegen soll. "
+"Das kann verwandt werden, um zu verhindern, dass der Proxy seinen "
+"Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Automatic Proxy Configuration"
+msgstr "Benutzerkonfiguration"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to "
+#| "specify an external command to discover the http proxy to use. The first "
+#| "and only parameter is an URI denoting the host to be contacted to allow "
+#| "for host-specific configuration. APT expects the command to output the "
+#| "proxy on stdout as a single line in the style <literal>http://proxy:port/"
+#| "</literal> or the word <literal>DIRECT</literal> if no proxy should be "
+#| "used. No output indicates that the generic proxy settings should be "
+#| "used.  Note that auto-detection will not be used for a host if a host-"
+#| "specific proxy configuration is already set via <literal>Acquire::http::"
+#| "Proxy::<replaceable>HOST</replaceable></literal>.  See the &squid-deb-"
+#| "proxy-client; package for an example implementation that uses avahi.  "
+#| "This option takes precedence over the legacy option name "
+#| "<literal>ProxyAutoDetect</literal>."
+msgid ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the previously specified URI format or the word "
+"<literal>DIRECT</literal> if no proxy should be used. No output indicates "
+"that the generic proxy settings should be used."
+msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> kann benutzt werden, um "
+"einen externen Befehl zum Auffinden des HTTP-Proxys anzugeben, der benutzt "
+"werden soll. Der erste und einzige Parameter ist ein URI, der den Rechner "
+"bezeichnet, der kontaktiert werden soll, um eine rechnerspezifische "
+"Konfiguration zu ermöglichen. APT erwartet den Befehl als Ausgabe auf der "
+"Standardausgabe als einzelne Zeile im Stil <literal>http://proxy:port/</"
+"literal> oder das Wort <literal>DIRECT</literal>, falls kein Proxy benutzt "
+"werden soll. Fehlt die Ausgabe, zeigt dies an, dass die allgemeinen Proxy-"
+"Einstellungen benutzt werden sollen. Beachten Sie, dass die automatische "
+"Erkennung nicht für einen Rechner benutzt wird, falls bereits eine "
+"rechnerspezifische Proxy-Konfiguration per <literal>Acquire::http::Proxy::"
+"<replaceable>Rechner</replaceable></literal> gesetzt wurde. Eine "
+"Beispielimplementierung, die Avahi benutzt, finden Sie im Paket &squid-deb-"
+"proxy-client;. Diese Option hat Vorrang vor dem veralteten Optionsnamen "
+"<literal>ProxyAutoDetect</literal>."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Note that auto-detection will not be used for a host if a host-specific "
+"proxy configuration is already set via <literal>Acquire::http::Proxy::"
+"<replaceable>host</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"See the &squid-deb-proxy-client; and &auto-apt-proxy; packages for example "
+"implementations."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This option takes precedence over the legacy option name <literal>Acquire::"
+"http::ProxyAutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Connection Configuration"
+msgstr "Benutzerkonfiguration"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this value applies to the connection as well as the data timeout."
+msgid ""
+"The option <literal>Acquire::http::Timeout</literal> sets the timeout timer "
+"used by the method; this value applies to the connection as well as the data "
+"timeout."
+msgstr ""
+"Die Option <literal>timeout</literal> stellt den Zeitnehmer, der von der "
+"Methode benutzt wird. Dieser Wert wird auf die Verbindungs- sowie die "
+"Datenzeitüberschreitungen angewandt."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes per second. The "
+#| "default value is 0 which deactivates the limit and tries to use all "
+#| "available bandwidth.  Note that this option implicitly disables "
+#| "downloading from multiple servers at the same time."
+msgid ""
+"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+"literal> which accepts integer values in kilobytes per second. The default "
+"value is 0 which deactivates the limit and tries to use all available "
+"bandwidth. Note that this option implicitly disables downloading from "
+"multiple servers at the same time."
+msgstr ""
+"Die benutzte Bandbreite kann durch <literal>Acquire::http::Dl-Limit</"
+"literal> eingeschränkt werden, was Ganzzahlwerte in Kilobyte pro Sekunde "
+"akzeptiert. Der Vorgabewert ist 0, was die Beschränkung ausschaltet und "
+"versucht, sämtliche verfügbare Bandbreite zu benutzen. Beachten Sie, dass "
+"diese Optionen implizit das Herunterladen von mehreren Servern zur gleichen "
+"Zeit deaktiviert."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."
+msgstr ""
+"Die Einstellung <literal>Acquire::http::Pipeline-Depth</literal> kann "
+"verwandt werden, um HTTP-Weiterleitung zu aktivieren (RFC 2616 Abschnitt "
+"8.1.2.2), was z.B. bei Verbindungen mit hoher Latenz vorteilhaft sein kann. "
+"Sie gibt an, wie viele Anfragen in eine Leitung gesandt werden. APT "
+"versucht, zur Laufzeit Webserver und Proxys aufzuspüren, die sich falsch "
+"verhalten und eine Behelfslösung zu finden. Falls Sie jedoch wissen, dass "
+"sich Ihrer nicht konform zur HTTP/1.1-Spezifikation verhält, kann das "
+"Weiterleiten durch Setzen des Wertes auf 0 deaktiviert werden. Standardmäßig "
+"ist es mit dem Wert 10 aktiviert."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+"<literal>Acquire::http::AllowRedirect</literal> steuert, ob APT Umleitungen "
+"folgen wird, was standardmäßig aktiviert ist."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+"<literal>Acquire::http::User-Agent</literal> kann benutzt werden, um einen "
+"unterschiedlichen User-Agent für die HTTP-Download-Methode zu setzten, da "
+"einige Proxys den Clients nur dann Zugriff gewähren, wenn der Client einen "
+"bekannten Bezeichner verwendet."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::SendAccept</literal> is enabled by default and sends "
+"a <literal>Accept: text/*</literal> header field to the server for requests "
+"without file extensions to prevent the server from attempting content "
+"negotiation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-http.1.xml
+#, no-wrap
+msgid ""
+"Acquire::http {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-http-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTP\";\n"
+"\tSendAccept \"false\";\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgid "&apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-https.1.xml
+msgid "APT transport for downloading via the HTTP Secure protocol (HTTPS)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the HTTP "
+"Secure protocol (HTTPS) also referred to as HTTP over TLS. It is available "
+"by default since apt 1.5 and was before that available in a <package>apt-"
+"transport-https</package> package. Note that a transport is never called "
+"directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"HTTP is by itself an unencrypted transport protocol (compare &apt-transport-"
+"http;), which, as indicated by the appended S is wrapped in an encrypted "
+"layer known as Transport Layer Security (TLS) which provides end-to-end "
+"encryption.  A sufficiently capable attacker can still observe the "
+"communication partners and deeper analyse of the encrypted communcation "
+"might still reveal important details.  An overview over available "
+"alternative transport methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"The HTTPS protocol is based on the HTTP protocol and as such this "
+"implementation has the same relation meaning that all options supported by "
+"&apt-transport-http; are also available via <literal>Acquire::https</"
+"literal> and will default to the same values specified for <literal>Acquire::"
+"http</literal>. This manpage will only document the options <emphasis>unique "
+"to https</emphasis>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Server credentials"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"By default all certificates trusted by the system (see <package>ca-"
+"certificates</package> package) are used for the verification of the server "
+"certificate. An alternative certificate authority (CA) can be configured "
+"with the <literal>Acquire::https::CAInfo</literal> option and its host-"
+"specific option <literal>Acquire::https::CAInfo::<replaceable>host</"
+"replaceable></literal>.  The option specifies a file is made of the "
+"concatenation of the CA certificates (in PEM format) creating the chain used "
+"for the verification of the path from the root (self signed one). If the "
+"remote server provides the whole chain during the exchange, the file need "
+"only contain the root certificate. Otherwise, the whole chain is required. "
+"If you need to support multiple authorities, the only way is to concatenate "
+"everything."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"A custom certificate revocation list (CRL) can be configured with the "
+"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
+"https::CRLFile::<replaceable>host</replaceable></literal> respectively.  "
+"Like the previous option a file in PEM format needs to be specified."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Disabling security"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"When authenticating the server, if the certificate verification fails for "
+"some reason (expired, revoked, man in the middle, …), the connection fails.  "
+"This is obviously what you want in all cases and what the default value "
+"(true)  of the option <literal>Acquire::https::Verify-Peer</literal> and its "
+"host-specific variant provides. If you know <emphasis>exactly</emphasis> "
+"what you are doing, setting this option to \"false\" allows you to skip peer "
+"certificate verification and make the exchange succeed. Again, this option "
+"is for debugging or testing purpose only as it removes all security provided "
+"by the use of HTTPS."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Similarly the option <literal>Acquire::https::Verify-Host</literal> and its "
+"host-specific variant can be used to deactivate a security feature: The "
+"certificate provided by the server includes the identity of the server which "
+"should match the DNS name used to access it. By default, as requested by RFC "
+"2818, the name of the mirror is checked against the identity found in the "
+"certificate. This default behavior is safe and should not be changed, but if "
+"you know that the server you are using has a DNS name which does not match "
+"the identity in its certificate, you can set the option to \"false\", which "
+"will prevent the comparison to be done."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Client authentication"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Beside the password based authentication available (see &apt-authconf;) "
+"HTTPS supports authentication based on client certificates as well via "
+"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
+"SSLKey</literal>. They respectively should be set to the filename of the "
+"X.509 client certificate and the associated (unencrypted) private key, both "
+"in PEM format.  In practice the use of the host-specific variants of both "
+"options is highly recommended."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-https.1.xml
+#, no-wrap
+msgid ""
+"Acquire::https {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-https-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTPS\";\n"
+"\tSendAccept \"false\";\n"
+"\n"
+"\tCAInfo \"/path/to/ca/certs.pem\";\n"
+"\tCRLFile \"/path/to/all/crl.pem\";\n"
+"\tVerify-Peer \"true\";\n"
+"\tVerify-Host::broken.example.org \"false\";\n"
+"\tSSLCert::example.org \"/path/to/client/cert.pem\";\n"
+"\tSSLKey::example.org \"/path/to/client/key.pem\"\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+#, fuzzy
+#| msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgid "&apt-transport-http; &apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-mirror.1.xml
+msgid "APT transport for more automated mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This APT transport isn't implementing a protocol to access local or remote "
+"repositories on its own, but acquires a mirrorlist and redirects all "
+"requests to the mirror(s) picked from this list access via other transports "
+"like &apt-transport-http;. The basic functionality is available since apt "
+"0.7.24, but was undocumented until apt 1.6 which contained a complete rework "
+"of the transport and its supported features. Note that a transport is never "
+"called directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If the acquisition of a file via a mirror fails the method ensures that "
+"automatically another possible mirror of the list is tried until either the "
+"file is retrieved or no mirror is left in the list handling transparently "
+"server downtimes and similar problems."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The security implications of the transport are based on the security "
+"considerations associated with the transport used to acquire the mirrorlist "
+"and the transports involved in accessing the chosen mirror(s) by the "
+"transport."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This transport has no configuration options at present. The mirror selection "
+"is based entirely on the mirrors offered in the mirrorlist and the files apt "
+"needs to acquire."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirrorlist format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A mirrorlist contains at least one line each specifying an URI for a "
+"mirror.  Empty lines and those starting with a hash key (<literal>#</"
+"literal>) are ignored.  An URI always starts with a URI scheme which defines "
+"the transport used for this mirror. If the URI e.g. starts with "
+"<literal>http:</literal> the responsible transport is &apt-transport-http; "
+"which might have specific requirements for the format of the remaining part "
+"of the URI."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"An URI can optionally be separated from metadata about the mirror by a tab.  "
+"Multiple datapoints in the provided metadata can itself be separated by "
+"spaces for tabs.  (This is an advanced feature only available with apt >= "
+"1.6. Earlier apt versions will fail to parse mirrorlists using this feature)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Since apt 1.6 the usage of compressed mirrorlists is also supported.  Note "
+"that the filename of the mirrorlist must specify the compression algorithm "
+"used, there is no auto-detection based on file content performed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirror selection by metadata"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As specified in the format a mirror can have additional metadata attached to "
+"prevent a mirror from being selected for acquiring a file not matching this "
+"metadata.  This way the mirrorlist can e.g. contain partial mirrors serving "
+"only certain architectures and apt will automatically choose a different "
+"mirror for files requiring an unlisted architecture. Supported are limits "
+"for the architecture (<literal>arch</literal>), codename of the release "
+"(<literal>codename</literal>), component of the repository the file is in "
+"(<literal>component</literal>), language the file applies to (<literal>lang</"
+"literal>), suite name of the release (<literal>suite</literal>) and type of "
+"the file (<literal>type</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Fallback order for mirrors"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If no priority is given via the metadata key <literal>priority</literal> for "
+"a mirror the order in which mirrors are contacted is random. If a certain "
+"set of mirrors should be tried first before any of another set is tried a "
+"priority can be explicitly set. The mirrors with the lowest number are tried "
+"first. Mirrors which have no explicit priority set default to the highest "
+"possible number and are therefore tried last. The choice between mirrors "
+"with the same priority is again random."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Allowed transports in a mirrorlist"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The availability and choice of transports in a mirrorlist is limited by how "
+"the apt client is accessing the mirrorlist. If a local transport like "
+"<literal>file</literal> or <literal>copy</literal> is used the mirrorlist "
+"can also include local sources while a mirrorlist accessed via "
+"<literal>http</literal> can not. Additionally, a mirrorlist can not contain "
+"a mirrorlist or other wrapping transports (like <package>apt-transport-tor</"
+"package>).  See the documentation of these transports on how to use them "
+"with the mirror method."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that apt versions before 1.6 do not support any other transport than "
+"<literal>http</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Basic example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A basic mirrorlist example supported by all apt versions with a mirror "
+"method (>= 0.7.24) in which the client will pick any of the three mirrors:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"http://ftp.de.debian.org/debian/\n"
+"http://ftp.us.debian.org/debian/\n"
+"http://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
+"txt</filename> on your machine it can be used like this in &sources-list; "
+"(since apt 1.6):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror+file:/etc/apt/mirrorlist.txt &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"All versions of the mirror method support a mirrorlist accessible via http, "
+"so assuming it is available at <literal>http://apt.example.org/mirror.lst</"
+"literal> the sources.list entry from above could be written instead as:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb mirror://apt.example.org/mirror.lst &debian-stable-codename; main\n"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that since apt 1.6 the use of <literal>mirror+http</literal> should be "
+"preferred over <literal>mirror</literal> for uniformity. The functionality "
+"is the same."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Example with metadata-enhanced mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As explained in the format definition apt versions before 1.6 do not support "
+"this and will fail parsing the mirrorlist. The example mirrorlist is "
+"proposefully complicated to show some aspects of the selection. The "
+"following setup is assumed: The first mirror is local mirror accessible via "
+"the file method, but potentially incomplete. The second mirror has a great "
+"connection, but is a partial mirror in sofar as it only contains files "
+"related to the architectures <literal>amd64</literal> and <literal>all</"
+"literal>. The remaining mirrors are average mirrors which should be "
+"contacted only if the earlier ones didn't work."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"file:/srv/local/debian/mirror/\tpriority:1 type:index\n"
+"http://partial.example.org/mirror/\tpriority:2 arch:amd64 arch:all type:deb\n"
+"http://ftp.us.debian.org/debian/\ttype:deb\n"
+"http://ftp.de.debian.org/debian/\ttype:deb\n"
+"https://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"In this setup with this mirrorlist the first mirror will be used to download "
+"all index files assuming the mirrorlist itself is accessed via a local "
+"transport like <literal>file</literal>. If it isn't, the mirror is otherwise "
+"inaccessible or does not contain the requested file another mirror will be "
+"used to acquire the file, which one depending on the type of the file: An "
+"index file will be served by the last mirror in the list, while a package of "
+"architecture <literal>amd64</literal> is served by the second and those of e."
+"g. architecture <literal>i386</literal> by one of the last three."
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
 #: guide.dbk offline.dbk
 msgid "en"
@@ -11453,6 +12201,80 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
 #~ msgid ""
+#~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
+#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
+#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
+#~ "the above settings is specified, <envar>http_proxy</envar> environment "
+#~ "variable will be used."
+#~ msgstr ""
+#~ "<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. "
+#~ "Er wird standardmäßig in der Form <literal>http://[[Anwender][:"
+#~ "Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxys kann "
+#~ "außerdem in der Form <literal>http::Proxy::&lt;host&gt;</literal> mit dem "
+#~ "speziellen Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass "
+#~ "keine Proxys benutzt werden. Falls keine der obigen Einstellungen "
+#~ "angegeben wurde, wird die Umgebungsvariable <envar>http_proxy</envar> "
+#~ "benutzt."
+
+#~ msgid ""
+#~ "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+#~ "<literal>proxy</literal> options work for HTTPS URIs in the same way as "
+#~ "for the <literal>http</literal> method, and default to the same values if "
+#~ "they are not explicitly set. The <literal>Pipeline-Depth</literal> option "
+#~ "is not yet supported."
+#~ msgstr ""
+#~ "Die Optionen <literal>Cache-control</literal>, <literal>Timeout</"
+#~ "literal>, <literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> "
+#~ "und <literal>proxy</literal> funktionieren für HTTPS-URIs auf die gleiche "
+#~ "Weise wie für die Methode <literal>http</literal> und haben die gleichen "
+#~ "Vorgabewerte, falls sie nicht explizit gesetzt wurden. Die Option "
+#~ "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
+
+#~ msgid ""
+#~ "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#~ "boolean suboption determines whether or not the server's host certificate "
+#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
+#~ "Verify-Peer</literal> is the corresponding per-host option.  "
+#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
+#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
+#~ "Verify-Host</literal> is the corresponding per-host option.  "
+#~ "<literal>SslCert</literal> determines what certificate to use for client "
+#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
+#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
+#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
+#~ "SslKey</literal> is the corresponding per-host option.  "
+#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
+#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
+#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "literal> is the corresponding per-host option."
+#~ msgstr ""
+#~ "Die Unteroption <literal>CaInfo</literal> gibt den Ort an, an dem "
+#~ "Informationen über vertrauenswürdige Zertifikate bereitgehalten werden. "
+#~ "<literal>&lt;host&gt;::CaInfo</literal> ist die entsprechende Option pro "
+#~ "Rechner. Die boolsche Unteroption <literal>Verify-Peer</literal> "
+#~ "entscheidet, ob das Rechnerzertifikat des Servers mit den "
+#~ "vertrauenswürdigen Zertifikaten geprüft werden soll oder nicht. "
+#~ "<literal>&lt;host&gt;::Verify-Peer</literal> ist die entsprechende Option "
+#~ "pro Rechner. Die boolsche Unteroption <literal>Verify-Host</literal> "
+#~ "entscheidet, ob der Rechnername des Servers geprüft werden soll oder "
+#~ "nicht. <literal>&lt;host&gt;::Verify-Host</literal> ist die entsprechende "
+#~ "Option pro Rechner. <literal>SslCert</literal> entscheidet, welches "
+#~ "Zertifikat zur Client-Authentifizierung benutzt wird. <literal>&lt;"
+#~ "host&gt;::SslCert</literal> ist die entsprechende Option pro Rechner. "
+#~ "<literal>SslKey</literal> entscheidet, welcher private Schlüssel für die "
+#~ "Client-Authentifizierung benutzt werden. <literal>&lt;host&gt;::SslKey</"
+#~ "literal> ist die entsprechende Option pro Rechner. "
+#~ "<literal>SslForceVersion</literal> überschreibt die zu benutzende "
+#~ "Standard-SSL-Version. Es kann die beiden Zeichenketten »<literal>TLSv1</"
+#~ "literal>« oder »<literal>SSLv3</literal>« enthalten. Die entsprechende "
+#~ "Option pro Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
+
+#~ 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</"
diff --git a/doc/po/es.po b/doc/po/es.po
index dbad743ea..257a3fadc 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-08-24 23:21+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -708,7 +708,9 @@ msgstr "8"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "APT"
 msgstr "APT"
 
@@ -721,7 +723,9 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Description"
 msgstr "Descripción"
 
@@ -932,7 +936,8 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
 msgid "See Also"
 msgstr "Véase también"
 
@@ -2093,7 +2098,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
-#: apt_preferences.5.xml
+#: apt_preferences.5.xml apt_auth.conf.5.xml
 msgid "Files"
 msgstr "Ficheros"
 
@@ -2974,7 +2979,8 @@ msgstr ""
 "de APT para Ubuntu sí es compatible."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
 msgid "Options"
 msgstr "Opciones"
 
@@ -3921,7 +3927,7 @@ msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt_auth.conf.5.xml
 msgid "5"
 msgstr "5"
 
@@ -4700,196 +4706,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
-"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>http_proxy</envar> environment variable will "
-"be used."
-msgstr ""
-"<literal>http::Proxy</literal> define el proxy predeterminado que utilizar "
-"para direcciones HTTP URI. Utiliza el formato estándar <literal>http://"
-"[[usuario][:contraseña]@]máquina[:puerto]/</literal>. También se puede "
-"especificar un proxy por cada máquina usando la forma <literal>http::Proxy::"
-"&lt;máquina&gt;</literal> con la palabra especial <literal>DIRECT</literal> "
-"que significa que no se use ningún proxy. La variable de entorno "
-"<envar>http_proxy</envar> se usará en caso de no definir ninguna de las "
-"opciones anteriores."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
-"response under any circumstances.  <literal>Max-Age</literal> sets the "
-"allowed maximum age (in seconds) of an index file in the cache of the "
-"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
-"store the requested archive files in its cache, which can be used to prevent "
-"the proxy from polluting its cache with (big) .deb files."
+"The options in these scopes configure APTs acquire transports for the "
+"protocols HTTP and HTTPS and are documented in the &apt-transport-http; and "
+"&apt-transport-https; manpages respectively."
 msgstr ""
-"Se proporcionan tres opciones de configuración para el control de la caché "
-"con proxy cachés conformes a HTTP/1.1. <literal>No-Cache</literal> indica al "
-"proxy que nunca utilice la respuesta cacheada. <literal>Max-Age</literal> "
-"define la máxima antigüedad permitida (en segundos) de un fichero de índice "
-"en la caché de un proxy. <literal>No-Store</literal> define que el proxy no "
-"debe almacenar ficheros del archivo en su caché, que se puede utilizar para "
-"impedir que el proxy contamine la caché con ficheros «.deb» (de gran tamaño)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"La opción <literal>timeout</literal> define el tiempo máximo de espera "
-"utilizado por el método; este valor se aplica al establecimiento de conexión "
-"y a la recepción de datos."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-#, fuzzy
-#| msgid ""
-#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
-#| "to enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be "
-#| "beneficial e.g. on high-latency connections. It specifies how many "
-#| "requests are sent in a pipeline.  Previous APT versions had a default of "
-#| "10 for this setting, but the default value is now 0 (= disabled) to avoid "
-#| "problems with the ever-growing amount of webservers and proxies which "
-#| "choose to not conform to the HTTP/1.1 specification."
-msgid ""
-"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and workaround misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
-"It is enabled by default with the value 10."
-msgstr ""
-"La opción <literal>Acquire::http::Pipeline-Depth</literal> se puede utilizar "
-"para activar HTTP pipelining (RFC 2616 sección 8.1.2.2), que puede "
-"facilitar, por ejemplo, las conexiones de latencia alta. También define el "
-"número de solicitudes que se envían en cada pipeline. El valor "
-"predeterminado para esta opción con versiones anteriores de APT era 10, pero "
-"ahora el valor predeterminado es cero (= desactivado) para evitar problemas "
-"con la siempre creciente cantidad de servidores web y proxies que escogen no "
-"cumplir la especificación HTTP/1.1."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
-"follow redirects, which is enabled by default."
-msgstr ""
-"<literal>Acquire::http::AllowRedirect</literal> controla si APT respeta una "
-"redirección; activado por omisión."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-#, fuzzy
-#| msgid ""
-#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-#| "literal> which accepts integer values in kilobytes. The default value is "
-#| "0 which deactivates the limit and tries to use all available bandwidth "
-#| "(note that this option implicitly disables downloading from multiple "
-#| "servers at the same time.)"
-msgid ""
-"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobytes per second. The default "
-"value is 0 which deactivates the limit and tries to use all available "
-"bandwidth.  Note that this option implicitly disables downloading from "
-"multiple servers at the same time."
-msgstr ""
-"El ancho de banda usado se puede limitar mediante <literal>Acquire::http::Dl-"
-"Limit</literal>, que acepta valores enteros en kilobytes. El valor "
-"predeterminado es cero, que desactiva el límite e intenta utilizar todo el "
-"ancho de banda disponible (tenga en cuenta que esta opción desactiva "
-"implícitamente la descarga simultánea desde varios servidores)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
-"User-Agent for the http download method as some proxies allow access for "
-"clients only if the client uses a known identifier."
-msgstr ""
-"<literal>Acquire::http::User-Agent</literal> se puede usar para definir un "
-"«User-Agent» distinto para la descarga http ya que algunos proxys sólo "
-"permiten el acceso para clientes que usan un identificador conocido."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
-"an external command to discover the http proxy to use. The first and only "
-"parameter is an URI denoting the host to be contacted to allow for host-"
-"specific configuration. APT expects the command to output the proxy on "
-"stdout as a single line in the style <literal>http://proxy:port/</literal> "
-"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
-"indicates that the generic proxy settings should be used.  Note that auto-"
-"detection will not be used for a host if a host-specific proxy configuration "
-"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
-"example implementation that uses avahi.  This option takes precedence over "
-"the legacy option name <literal>ProxyAutoDetect</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
-"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
-"the <literal>http</literal> method, and default to the same values if they "
-"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
-"yet supported."
-msgstr ""
-"Las opciones <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> y "
-"<literal>proxy</literal> funcionan con direcciones HTTPS URI de la misma "
-"forma que con el método <literal>http</literal>, y utiliza los mismos "
-"valores predeterminados si no se define. Aún no se permite la opción "
-"<literal>Pipeline-Depth</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
-"corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
-"literal> is the corresponding per-host option.  <literal>Verify-Host</"
-"literal> boolean suboption determines whether or not the server's hostname "
-"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
-"corresponding per-host option.  <literal>SslCert</literal> determines what "
-"certificate to use for client authentication. <literal>&lt;host&gt;::"
-"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
-"literal> determines what private key to use for client authentication. "
-"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
-"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
-"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> is the corresponding per-host option."
-msgstr ""
-"La subopción <literal>CaInfo</literal> define la ubicación del fichero que "
-"guarda la información sobre certificados de confianza. <literal>&lt;"
-"host&gt;::CaInfo</literal> es la opción correspondiente para cada servidor. "
-"La subopción booleana <literal>Verify-Peer</literal> define si se debe "
-"comprobar el certificado del servidor con certificados de confianza. "
-"<literal>&lt;host&gt;::Verify-Peer</literal> es la opción correspondiente "
-"para cada servidor. La subopción booleana <literal>Verify-Host</literal> "
-"define si se debe comprobar el «hostname» del servidor. <literal>&lt;"
-"host&gt;::Verify-Host</literal> es la opción correspondiente para cada "
-"servidor. <literal>SslCert</literal> define el certificado que utilizar para "
-"la autenticación del cliente. <literal>&lt;host&gt;::SslCert</literal> es la "
-"opción correspondiente para cada servidor. <literal>SslKey</literal> define "
-"la clave privada que utilizar para la autenticación del cliente. "
-"<literal>&lt;host&gt;::SslKey</literal> es la opción correspondiente para "
-"cada servidor. <literal>SslForceVersion</literal> sustituye la versión "
-"predeterminada de SSL que utilizar. Se admiten las cadenas «<literal>TLSv1</"
-"literal>» o «<literal>SSLv3</literal>». <literal>&lt;host&gt;::"
-"SslForceVersion</literal> es la opción correspondiente para cada servidor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4927,6 +4747,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"The option <literal>timeout</literal> sets the timeout timer used by the "
+"method; this value applies to the connection as well as the data timeout."
+msgstr ""
+"La opción <literal>timeout</literal> define el tiempo máximo de espera "
+"utilizado por el método; este valor se aplica al establecimiento de conexión "
+"y a la recepción de datos."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 "some situations require that passive mode be disabled and port mode FTP used "
@@ -6115,6 +5945,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Examples"
 msgstr "Ejemplos"
 
@@ -7663,10 +7495,11 @@ msgid ""
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
-"especially that multiple values are separated by spaces, not by commas as in "
-"the one-line format. Multivalue fields like <literal>Architectures</literal> "
-"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
-"Remove</literal> to modify the default value rather than replacing it."
+"especially that multiple values are separated by whitespaces (like spaces, "
+"tabs and newlines), not by commas as in the one-line format.  Multivalue "
+"fields like <literal>Architectures</literal> also have "
+"<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+"literal> to modify the default value rather than replacing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -8103,19 +7936,23 @@ msgstr "Especificación del URI"
 msgid "The currently recognized URI types are:"
 msgstr "Los tipos de URI permitidos actualmente son:"
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-http;)"
+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;."
+"commonly used method. 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>
@@ -8129,6 +7966,11 @@ msgid ""
 "chosen transport method. See &apt-secure; for details."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-https;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
@@ -8568,6 +8410,8 @@ msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "1"
 msgstr "1"
 
@@ -9675,6 +9519,870 @@ msgstr ""
 "<command>apt-ftparchive</command> devuelve cero si no hay ningún error, y el "
 "valor 100 en caso de error."
 
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Configuration file for APT"
+msgid "Login configuration file for APT sources and proxies"
+msgstr "Fichero de configuración de APT"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"APT configuration files like &sources-list; or &apt-conf; need to be "
+"accessible for everyone using apt tools on the system to have access to all "
+"package-related information like the available packages in a repository. "
+"Login information needed to connect to a proxy or to download data from a "
+"repository on the other hand shouldn't always be accessible by everyone and "
+"can hence not be placed in a file with world-readable file permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used "
+"to store login information in a netrc-like format with restrictive file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "netrc-like format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The format defined here is similar to the format of the <filename>~/.netrc</"
+"filename> file used by <citerefentry><refentrytitle><command>ftp</command></"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs "
+"interacting with servers.  It is a simple token-based format with the "
+"following tokens being recognized; Unknown tokens will be ignored. Tokens "
+"may be separated by spaces, tabs or newlines."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid ""
+"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Entries are looked up by searching for the <emphasis><literal>machine</"
+"literal></emphasis> token matching the hostname of the URI apt needs login "
+"information for. Extending the netrc-format a portnumber can be specified. "
+"If no port is given the token matches for all ports.  Similar the path is "
+"optional and only needed and useful if multiple repositories with different "
+"login information reside on the same server. A machine token with a path "
+"matches if the path in the URI starts with the path given in the token.  "
+"Once a match is made, the subsequent tokens are processed, stopping when the "
+"end of file is reached or another <emphasis><literal>machine</literal></"
+"emphasis> token is encountered."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>login</literal> <replaceable>name</replaceable>"
+msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The username to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>password</literal> <replaceable>string</replaceable>"
+msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The password to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Examples"
+msgid "Example"
+msgstr "Ejemplos"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org\n"
+"login apt\n"
+"password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "machine example.org login apt password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org/deb login apt password debian\n"
+"machine example.org/debian login apt password debian\n"
+"machine example.org/debian/ login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org:80 login apt password debian\n"
+"machine example.org/deb/ login apt password debian\n"
+"machine example.org/ubuntu login apt password debian\n"
+"machine example.orga login apt password debian\n"
+"machine example.net login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Supplying login information for a user named <literal>apt</literal> with the "
+"password <literal>debian</literal> for the &sources-list; entry <placeholder "
+"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
+"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
+"the following in the auth.conf file could be used: <placeholder type="
+"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
+"specific all of these lines will also apply to the example entry: "
+"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
+"the following lines apply: <placeholder type=\"literallayout\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Notes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Basic support for this feature is present since version 0.7.25, but was "
+"undocumented for years. The documentation was added in version 1.5 changing "
+"also the implementation slightly. For maximum backward compatibility you "
+"should avoid multiple <literal>machine</literal> tokens with the same "
+"hostname, but if you need multiple they should all have a path specified in "
+"the <literal>machine</literal> token."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+msgid "<filename>/etc/apt/auth.conf</filename>"
+msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Show full versions for upgraded and installed packages.  Configuration "
+#| "Item: <literal>APT::Get::Show-Versions</literal>."
+msgid ""
+"Login information for APT sources and proxies in a netrc-like format.  "
+"Configuration Item: <literal>Dir::Etc::netrc</literal>."
+msgstr ""
+"Muestra las versiones completas para los paquetes actualizados e instalados. "
+"Opción de configuración: <literal>APT::Get::Show-Versions</literal>."
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "&apt-conf;, &sources-list;, &apt-get;"
+msgid "&apt-conf; &sources-list;"
+msgstr "&apt-conf;, &sources-list;, &apt-get;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-http.1.xml
+msgid ""
+"APT transport for downloading via the Hypertext Transfer Protocol (HTTP)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the Hypertext "
+"Transfer Protocol (HTTP). It is available by default and probably the most "
+"used of all transports. Note that a transport is never called directly by a "
+"user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"HTTP is an unencrypted transport protocol meaning that the whole "
+"communication with the remote server (or proxy) can be observed by a "
+"sufficiently capable attacker referred to commonly as man in the middle "
+"(MITM).  Such an attacker can <emphasis>not</emphasis> modify the "
+"communication to compromise the security of your system through as APTs data "
+"security model is independent of the chosen transport method. This is "
+"explained in detail in &apt-secure;. An overview over available transport "
+"methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Various options are available to modify its behaviour which can be set in an "
+"&apt-conf; file ranging from proxy configuration to workaround for specific "
+"server insufficiencies."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Proxy Configuration"
+msgstr "Configuración de usuario"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The environment variable <envar>http_proxy</envar> is supported for system "
+"wide configuration.  Proxies specific to apt can be configured via the "
+"option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
+"used only for certain hosts can be specified via <literal>Acquire::http::"
+"Proxy::<replaceable>host</replaceable></literal>. Even more finegrained "
+"control can be achieved via proxy autodetection detailed further below.  All "
+"these options use the URI format <literal><replaceable>scheme</"
+"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
+"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
+"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
+"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
+"<literal>https</literal>.  Authentification details can be supplied via &apt-"
+"authconf; instead of including it in the URI directly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The various APT configuration options support the special value "
+"<literal>DIRECT</literal> meaning that no proxy should be used. The "
+"environment variable <envar>no_proxy</envar> with the same propose is also "
+"supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches.  <literal>No-Cache</literal> tells the proxy not to use its "
+#| "cached response under any circumstances.  <literal>Max-Age</literal> sets "
+#| "the allowed maximum age (in seconds) of an index file in the cache of the "
+#| "proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+#| "store the requested archive files in its cache, which can be used to "
+#| "prevent the proxy from polluting its cache with (big) .deb files."
+msgid ""
+"Further more there are three settings provided for cache control with "
+"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
+"tells the proxy not to use its cached response under any circumstances.  "
+"<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
+"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
+"http::No-Store</literal> specifies that the proxy should not store the "
+"requested archive files in its cache, which can be used to prevent the proxy "
+"from polluting its cache with (big) .deb files."
+msgstr ""
+"Se proporcionan tres opciones de configuración para el control de la caché "
+"con proxy cachés conformes a HTTP/1.1. <literal>No-Cache</literal> indica al "
+"proxy que nunca utilice la respuesta cacheada. <literal>Max-Age</literal> "
+"define la máxima antigüedad permitida (en segundos) de un fichero de índice "
+"en la caché de un proxy. <literal>No-Store</literal> define que el proxy no "
+"debe almacenar ficheros del archivo en su caché, que se puede utilizar para "
+"impedir que el proxy contamine la caché con ficheros «.deb» (de gran tamaño)."
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Automatic Proxy Configuration"
+msgstr "Configuración de usuario"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the previously specified URI format or the word "
+"<literal>DIRECT</literal> if no proxy should be used. No output indicates "
+"that the generic proxy settings should be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Note that auto-detection will not be used for a host if a host-specific "
+"proxy configuration is already set via <literal>Acquire::http::Proxy::"
+"<replaceable>host</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"See the &squid-deb-proxy-client; and &auto-apt-proxy; packages for example "
+"implementations."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This option takes precedence over the legacy option name <literal>Acquire::"
+"http::ProxyAutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Connection Configuration"
+msgstr "Configuración de usuario"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this value applies to the connection as well as the data timeout."
+msgid ""
+"The option <literal>Acquire::http::Timeout</literal> sets the timeout timer "
+"used by the method; this value applies to the connection as well as the data "
+"timeout."
+msgstr ""
+"La opción <literal>timeout</literal> define el tiempo máximo de espera "
+"utilizado por el método; este valor se aplica al establecimiento de conexión "
+"y a la recepción de datos."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes. The default value is "
+#| "0 which deactivates the limit and tries to use all available bandwidth "
+#| "(note that this option implicitly disables downloading from multiple "
+#| "servers at the same time.)"
+msgid ""
+"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+"literal> which accepts integer values in kilobytes per second. The default "
+"value is 0 which deactivates the limit and tries to use all available "
+"bandwidth. Note that this option implicitly disables downloading from "
+"multiple servers at the same time."
+msgstr ""
+"El ancho de banda usado se puede limitar mediante <literal>Acquire::http::Dl-"
+"Limit</literal>, que acepta valores enteros en kilobytes. El valor "
+"predeterminado es cero, que desactiva el límite e intenta utilizar todo el "
+"ancho de banda disponible (tenga en cuenta que esta opción desactiva "
+"implícitamente la descarga simultánea desde varios servidores)."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
+#| "to enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be "
+#| "beneficial e.g. on high-latency connections. It specifies how many "
+#| "requests are sent in a pipeline.  Previous APT versions had a default of "
+#| "10 for this setting, but the default value is now 0 (= disabled) to avoid "
+#| "problems with the ever-growing amount of webservers and proxies which "
+#| "choose to not conform to the HTTP/1.1 specification."
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."
+msgstr ""
+"La opción <literal>Acquire::http::Pipeline-Depth</literal> se puede utilizar "
+"para activar HTTP pipelining (RFC 2616 sección 8.1.2.2), que puede "
+"facilitar, por ejemplo, las conexiones de latencia alta. También define el "
+"número de solicitudes que se envían en cada pipeline. El valor "
+"predeterminado para esta opción con versiones anteriores de APT era 10, pero "
+"ahora el valor predeterminado es cero (= desactivado) para evitar problemas "
+"con la siempre creciente cantidad de servidores web y proxies que escogen no "
+"cumplir la especificación HTTP/1.1."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+"<literal>Acquire::http::AllowRedirect</literal> controla si APT respeta una "
+"redirección; activado por omisión."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+"<literal>Acquire::http::User-Agent</literal> se puede usar para definir un "
+"«User-Agent» distinto para la descarga http ya que algunos proxys sólo "
+"permiten el acceso para clientes que usan un identificador conocido."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::SendAccept</literal> is enabled by default and sends "
+"a <literal>Accept: text/*</literal> header field to the server for requests "
+"without file extensions to prevent the server from attempting content "
+"negotiation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-http.1.xml
+#, no-wrap
+msgid ""
+"Acquire::http {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-http-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTP\";\n"
+"\tSendAccept \"false\";\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgid "&apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-https.1.xml
+msgid "APT transport for downloading via the HTTP Secure protocol (HTTPS)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the HTTP "
+"Secure protocol (HTTPS) also referred to as HTTP over TLS. It is available "
+"by default since apt 1.5 and was before that available in a <package>apt-"
+"transport-https</package> package. Note that a transport is never called "
+"directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"HTTP is by itself an unencrypted transport protocol (compare &apt-transport-"
+"http;), which, as indicated by the appended S is wrapped in an encrypted "
+"layer known as Transport Layer Security (TLS) which provides end-to-end "
+"encryption.  A sufficiently capable attacker can still observe the "
+"communication partners and deeper analyse of the encrypted communcation "
+"might still reveal important details.  An overview over available "
+"alternative transport methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"The HTTPS protocol is based on the HTTP protocol and as such this "
+"implementation has the same relation meaning that all options supported by "
+"&apt-transport-http; are also available via <literal>Acquire::https</"
+"literal> and will default to the same values specified for <literal>Acquire::"
+"http</literal>. This manpage will only document the options <emphasis>unique "
+"to https</emphasis>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Server credentials"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"By default all certificates trusted by the system (see <package>ca-"
+"certificates</package> package) are used for the verification of the server "
+"certificate. An alternative certificate authority (CA) can be configured "
+"with the <literal>Acquire::https::CAInfo</literal> option and its host-"
+"specific option <literal>Acquire::https::CAInfo::<replaceable>host</"
+"replaceable></literal>.  The option specifies a file is made of the "
+"concatenation of the CA certificates (in PEM format) creating the chain used "
+"for the verification of the path from the root (self signed one). If the "
+"remote server provides the whole chain during the exchange, the file need "
+"only contain the root certificate. Otherwise, the whole chain is required. "
+"If you need to support multiple authorities, the only way is to concatenate "
+"everything."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"A custom certificate revocation list (CRL) can be configured with the "
+"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
+"https::CRLFile::<replaceable>host</replaceable></literal> respectively.  "
+"Like the previous option a file in PEM format needs to be specified."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Disabling security"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"When authenticating the server, if the certificate verification fails for "
+"some reason (expired, revoked, man in the middle, …), the connection fails.  "
+"This is obviously what you want in all cases and what the default value "
+"(true)  of the option <literal>Acquire::https::Verify-Peer</literal> and its "
+"host-specific variant provides. If you know <emphasis>exactly</emphasis> "
+"what you are doing, setting this option to \"false\" allows you to skip peer "
+"certificate verification and make the exchange succeed. Again, this option "
+"is for debugging or testing purpose only as it removes all security provided "
+"by the use of HTTPS."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Similarly the option <literal>Acquire::https::Verify-Host</literal> and its "
+"host-specific variant can be used to deactivate a security feature: The "
+"certificate provided by the server includes the identity of the server which "
+"should match the DNS name used to access it. By default, as requested by RFC "
+"2818, the name of the mirror is checked against the identity found in the "
+"certificate. This default behavior is safe and should not be changed, but if "
+"you know that the server you are using has a DNS name which does not match "
+"the identity in its certificate, you can set the option to \"false\", which "
+"will prevent the comparison to be done."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Client authentication"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Beside the password based authentication available (see &apt-authconf;) "
+"HTTPS supports authentication based on client certificates as well via "
+"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
+"SSLKey</literal>. They respectively should be set to the filename of the "
+"X.509 client certificate and the associated (unencrypted) private key, both "
+"in PEM format.  In practice the use of the host-specific variants of both "
+"options is highly recommended."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-https.1.xml
+#, no-wrap
+msgid ""
+"Acquire::https {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-https-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTPS\";\n"
+"\tSendAccept \"false\";\n"
+"\n"
+"\tCAInfo \"/path/to/ca/certs.pem\";\n"
+"\tCRLFile \"/path/to/all/crl.pem\";\n"
+"\tVerify-Peer \"true\";\n"
+"\tVerify-Host::broken.example.org \"false\";\n"
+"\tSSLCert::example.org \"/path/to/client/cert.pem\";\n"
+"\tSSLKey::example.org \"/path/to/client/key.pem\"\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+#, fuzzy
+#| msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgid "&apt-transport-http; &apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-mirror.1.xml
+msgid "APT transport for more automated mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This APT transport isn't implementing a protocol to access local or remote "
+"repositories on its own, but acquires a mirrorlist and redirects all "
+"requests to the mirror(s) picked from this list access via other transports "
+"like &apt-transport-http;. The basic functionality is available since apt "
+"0.7.24, but was undocumented until apt 1.6 which contained a complete rework "
+"of the transport and its supported features. Note that a transport is never "
+"called directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If the acquisition of a file via a mirror fails the method ensures that "
+"automatically another possible mirror of the list is tried until either the "
+"file is retrieved or no mirror is left in the list handling transparently "
+"server downtimes and similar problems."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The security implications of the transport are based on the security "
+"considerations associated with the transport used to acquire the mirrorlist "
+"and the transports involved in accessing the chosen mirror(s) by the "
+"transport."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This transport has no configuration options at present. The mirror selection "
+"is based entirely on the mirrors offered in the mirrorlist and the files apt "
+"needs to acquire."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirrorlist format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A mirrorlist contains at least one line each specifying an URI for a "
+"mirror.  Empty lines and those starting with a hash key (<literal>#</"
+"literal>) are ignored.  An URI always starts with a URI scheme which defines "
+"the transport used for this mirror. If the URI e.g. starts with "
+"<literal>http:</literal> the responsible transport is &apt-transport-http; "
+"which might have specific requirements for the format of the remaining part "
+"of the URI."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"An URI can optionally be separated from metadata about the mirror by a tab.  "
+"Multiple datapoints in the provided metadata can itself be separated by "
+"spaces for tabs.  (This is an advanced feature only available with apt >= "
+"1.6. Earlier apt versions will fail to parse mirrorlists using this feature)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Since apt 1.6 the usage of compressed mirrorlists is also supported.  Note "
+"that the filename of the mirrorlist must specify the compression algorithm "
+"used, there is no auto-detection based on file content performed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirror selection by metadata"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As specified in the format a mirror can have additional metadata attached to "
+"prevent a mirror from being selected for acquiring a file not matching this "
+"metadata.  This way the mirrorlist can e.g. contain partial mirrors serving "
+"only certain architectures and apt will automatically choose a different "
+"mirror for files requiring an unlisted architecture. Supported are limits "
+"for the architecture (<literal>arch</literal>), codename of the release "
+"(<literal>codename</literal>), component of the repository the file is in "
+"(<literal>component</literal>), language the file applies to (<literal>lang</"
+"literal>), suite name of the release (<literal>suite</literal>) and type of "
+"the file (<literal>type</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Fallback order for mirrors"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If no priority is given via the metadata key <literal>priority</literal> for "
+"a mirror the order in which mirrors are contacted is random. If a certain "
+"set of mirrors should be tried first before any of another set is tried a "
+"priority can be explicitly set. The mirrors with the lowest number are tried "
+"first. Mirrors which have no explicit priority set default to the highest "
+"possible number and are therefore tried last. The choice between mirrors "
+"with the same priority is again random."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Allowed transports in a mirrorlist"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The availability and choice of transports in a mirrorlist is limited by how "
+"the apt client is accessing the mirrorlist. If a local transport like "
+"<literal>file</literal> or <literal>copy</literal> is used the mirrorlist "
+"can also include local sources while a mirrorlist accessed via "
+"<literal>http</literal> can not. Additionally, a mirrorlist can not contain "
+"a mirrorlist or other wrapping transports (like <package>apt-transport-tor</"
+"package>).  See the documentation of these transports on how to use them "
+"with the mirror method."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that apt versions before 1.6 do not support any other transport than "
+"<literal>http</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Basic example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A basic mirrorlist example supported by all apt versions with a mirror "
+"method (>= 0.7.24) in which the client will pick any of the three mirrors:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"http://ftp.de.debian.org/debian/\n"
+"http://ftp.us.debian.org/debian/\n"
+"http://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
+"txt</filename> on your machine it can be used like this in &sources-list; "
+"(since apt 1.6):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror+file:/etc/apt/mirrorlist.txt &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"All versions of the mirror method support a mirrorlist accessible via http, "
+"so assuming it is available at <literal>http://apt.example.org/mirror.lst</"
+"literal> the sources.list entry from above could be written instead as:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb mirror://apt.example.org/mirror.lst &debian-stable-codename; main\n"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that since apt 1.6 the use of <literal>mirror+http</literal> should be "
+"preferred over <literal>mirror</literal> for uniformity. The functionality "
+"is the same."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Example with metadata-enhanced mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As explained in the format definition apt versions before 1.6 do not support "
+"this and will fail parsing the mirrorlist. The example mirrorlist is "
+"proposefully complicated to show some aspects of the selection. The "
+"following setup is assumed: The first mirror is local mirror accessible via "
+"the file method, but potentially incomplete. The second mirror has a great "
+"connection, but is a partial mirror in sofar as it only contains files "
+"related to the architectures <literal>amd64</literal> and <literal>all</"
+"literal>. The remaining mirrors are average mirrors which should be "
+"contacted only if the earlier ones didn't work."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"file:/srv/local/debian/mirror/\tpriority:1 type:index\n"
+"http://partial.example.org/mirror/\tpriority:2 arch:amd64 arch:all type:deb\n"
+"http://ftp.us.debian.org/debian/\ttype:deb\n"
+"http://ftp.de.debian.org/debian/\ttype:deb\n"
+"https://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"In this setup with this mirrorlist the first mirror will be used to download "
+"all index files assuming the mirrorlist itself is accessed via a local "
+"transport like <literal>file</literal>. If it isn't, the mirror is otherwise "
+"inaccessible or does not contain the requested file another mirror will be "
+"used to acquire the file, which one depending on the type of the file: An "
+"index file will be served by the last mirror in the list, while a package of "
+"architecture <literal>amd64</literal> is served by the second and those of e."
+"g. architecture <literal>i386</literal> by one of the last three."
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
 #: guide.dbk offline.dbk
 msgid "en"
@@ -11271,6 +11979,79 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
 #~ msgid ""
+#~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
+#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
+#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
+#~ "the above settings is specified, <envar>http_proxy</envar> environment "
+#~ "variable will be used."
+#~ msgstr ""
+#~ "<literal>http::Proxy</literal> define el proxy predeterminado que "
+#~ "utilizar para direcciones HTTP URI. Utiliza el formato estándar "
+#~ "<literal>http://[[usuario][:contraseña]@]máquina[:puerto]/</literal>. "
+#~ "También se puede especificar un proxy por cada máquina usando la forma "
+#~ "<literal>http::Proxy::&lt;máquina&gt;</literal> con la palabra especial "
+#~ "<literal>DIRECT</literal> que significa que no se use ningún proxy. La "
+#~ "variable de entorno <envar>http_proxy</envar> se usará en caso de no "
+#~ "definir ninguna de las opciones anteriores."
+
+#~ msgid ""
+#~ "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+#~ "<literal>proxy</literal> options work for HTTPS URIs in the same way as "
+#~ "for the <literal>http</literal> method, and default to the same values if "
+#~ "they are not explicitly set. The <literal>Pipeline-Depth</literal> option "
+#~ "is not yet supported."
+#~ msgstr ""
+#~ "Las opciones <literal>Cache-control</literal>, <literal>Timeout</"
+#~ "literal>, <literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> y "
+#~ "<literal>proxy</literal> funcionan con direcciones HTTPS URI de la misma "
+#~ "forma que con el método <literal>http</literal>, y utiliza los mismos "
+#~ "valores predeterminados si no se define. Aún no se permite la opción "
+#~ "<literal>Pipeline-Depth</literal>."
+
+#~ msgid ""
+#~ "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#~ "boolean suboption determines whether or not the server's host certificate "
+#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
+#~ "Verify-Peer</literal> is the corresponding per-host option.  "
+#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
+#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
+#~ "Verify-Host</literal> is the corresponding per-host option.  "
+#~ "<literal>SslCert</literal> determines what certificate to use for client "
+#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
+#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
+#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
+#~ "SslKey</literal> is the corresponding per-host option.  "
+#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
+#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
+#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "literal> is the corresponding per-host option."
+#~ msgstr ""
+#~ "La subopción <literal>CaInfo</literal> define la ubicación del fichero "
+#~ "que guarda la información sobre certificados de confianza. <literal>&lt;"
+#~ "host&gt;::CaInfo</literal> es la opción correspondiente para cada "
+#~ "servidor. La subopción booleana <literal>Verify-Peer</literal> define si "
+#~ "se debe comprobar el certificado del servidor con certificados de "
+#~ "confianza. <literal>&lt;host&gt;::Verify-Peer</literal> es la opción "
+#~ "correspondiente para cada servidor. La subopción booleana <literal>Verify-"
+#~ "Host</literal> define si se debe comprobar el «hostname» del servidor. "
+#~ "<literal>&lt;host&gt;::Verify-Host</literal> es la opción correspondiente "
+#~ "para cada servidor. <literal>SslCert</literal> define el certificado que "
+#~ "utilizar para la autenticación del cliente. <literal>&lt;host&gt;::"
+#~ "SslCert</literal> es la opción correspondiente para cada servidor. "
+#~ "<literal>SslKey</literal> define la clave privada que utilizar para la "
+#~ "autenticación del cliente. <literal>&lt;host&gt;::SslKey</literal> es la "
+#~ "opción correspondiente para cada servidor. <literal>SslForceVersion</"
+#~ "literal> sustituye la versión predeterminada de SSL que utilizar. Se "
+#~ "admiten las cadenas «<literal>TLSv1</literal>» o «<literal>SSLv3</"
+#~ "literal>». <literal>&lt;host&gt;::SslForceVersion</literal> es la opción "
+#~ "correspondiente para cada servidor."
+
+#~ 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</"
@@ -11461,9 +12242,6 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Lista las huellas digitales de las claves de confianza."
 
-#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
 #~ msgid "Local trust database of archive keys."
 #~ msgstr "Base de datos local de las claves de confianza de archivos Debian"
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 5689d7ac6..2d180679a 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-08-24 23:21+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -621,7 +621,9 @@ msgstr "8"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "APT"
 msgstr "APT"
 
@@ -634,7 +636,9 @@ msgstr "interface en ligne de commande"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Description"
 msgstr "Description"
 
@@ -910,7 +914,8 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
 msgid "See Also"
 msgstr "Voir aussi"
 
@@ -2033,7 +2038,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
-#: apt_preferences.5.xml
+#: apt_preferences.5.xml apt_auth.conf.5.xml
 msgid "Files"
 msgstr "Fichiers"
 
@@ -2942,7 +2947,8 @@ msgstr ""
 "place. Par contre, la version d'Ubuntu permet de l'utiliser."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
 msgid "Options"
 msgstr "Options"
 
@@ -3897,7 +3903,7 @@ msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt_auth.conf.5.xml
 msgid "5"
 msgstr "5"
 
@@ -4697,190 +4703,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
-"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>http_proxy</envar> environment variable will "
-"be used."
-msgstr ""
-"<literal>http::Proxy</literal> est le mandataire (proxy) HTTP à utiliser par "
-"défaut pour les URI HTTP. Il se présente sous la forme standard : "
-"<literal>http://[[utilisateur][:mot_de_passe]@]hôte[:port]/</literal>. On "
-"peut spécifier un mandataire particulier par hôte distant en utilisant la "
-"syntaxe : <literal>http::Proxy::&lt;hôte&gt;</literal>. Le mot-clé spécial "
-"<literal>DIRECT</literal> indique alors de n'utiliser aucun mandataire pour "
-"l'hôte. Si aucun des paramètres précédents n'est défini, la variable "
-"d'environnement <envar>http_proxy</envar> annule et remplace toutes les "
-"options de mandataire HTTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
-"response under any circumstances.  <literal>Max-Age</literal> sets the "
-"allowed maximum age (in seconds) of an index file in the cache of the "
-"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
-"store the requested archive files in its cache, which can be used to prevent "
-"the proxy from polluting its cache with (big) .deb files."
-msgstr ""
-"Trois options de configuration sont fournies pour le contrôle des caches "
-"compatibles avec HTTP/1.1. <literal>No-Cache</literal> signifie que le "
-"mandataire ne doit jamais utiliser les réponses qu'il a stockées ; "
-"<literal>Max-Age</literal> établit l'ancienneté maximale (en secondes) d'un "
-"fichier d'index dans le cache du mandataire. <literal>No-Store</literal> "
-"indique que le mandataire ne doit pas mettre en cache les fichiers "
-"d'archive, ce qui peut éviter de polluer un cache mandataire avec des "
-"fichiers .deb très grands."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
+"The options in these scopes configure APTs acquire transports for the "
+"protocols HTTP and HTTPS and are documented in the &apt-transport-http; and "
+"&apt-transport-https; manpages respectively."
 msgstr ""
-"L'option <literal>timeout</literal> positionne le compteur d'expiration du "
-"délai (timeout) utilisé par la méthode. Cela s'applique aussi bien à la "
-"connexion qu'aux données."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and workaround misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
-"It is enabled by default with the value 10."
-msgstr ""
-"Le réglage <literal>Acquire::http::Pipeline-Depth</literal> permet "
-"d'utiliser l'enchaînement HTTP (« HTTP pipelining », RFC 2616 section "
-"8.1.2.2) ce qui peut être utile par exemple avec des connexions à latence "
-"élevée. Il indique le nombre de requêtes envoyées dans le tuyau. APT tente "
-"de détecter et de contourner les serveurs web et les mandataires qui se "
-"comportent mal à l'exécution, mais si vous savez que vos serveurs ne "
-"respectent pas la norme HTTP/1.1, l'enchaînement peut être désactivé en "
-"définissant cette valeur à 0. Il est activé par défaut avec une valeur de 10."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
-"follow redirects, which is enabled by default."
-msgstr ""
-"<literal>Acquire::http::AllowRedirect</literal> contrôle le fait qu'APT "
-"suive les redirections. Ce réglage est activé par défaut."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobytes per second. The default "
-"value is 0 which deactivates the limit and tries to use all available "
-"bandwidth.  Note that this option implicitly disables downloading from "
-"multiple servers at the same time."
-msgstr ""
-"La bande passante utilisée peut être limité avec <literal>Acquire::http::Dl-"
-"Limit</literal> qui peut prendre une valeur entière, l'unité utilisée étant "
-"le kilo-octet par seconde. La valeur par défaut est 0, ce qui correspond à "
-"aucune limitation de bande passante. Veuillez noter que cette option "
-"désactive implicitement le téléchargement simultané depuis plusieurs "
-"serveurs."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
-"User-Agent for the http download method as some proxies allow access for "
-"clients only if the client uses a known identifier."
-msgstr ""
-"L'option <literal>Acquire::http::User-Agent</literal> peut être utilisée "
-"pour envoyer une valeur User-Agent modifiée pour les téléchargements HTTP, "
-"ce qui peut par exemple être utile avec certains mandataires HTTP qui "
-"n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
-"an external command to discover the http proxy to use. The first and only "
-"parameter is an URI denoting the host to be contacted to allow for host-"
-"specific configuration. APT expects the command to output the proxy on "
-"stdout as a single line in the style <literal>http://proxy:port/</literal> "
-"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
-"indicates that the generic proxy settings should be used.  Note that auto-"
-"detection will not be used for a host if a host-specific proxy configuration "
-"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
-"example implementation that uses avahi.  This option takes precedence over "
-"the legacy option name <literal>ProxyAutoDetect</literal>."
-msgstr ""
-"L'option <literal>Acquire::http::Proxy-Auto-Detect</literal> peut être "
-"utilisée pour indiquer une commande externe pour découvrir le mandataire "
-"HTTP à utiliser. Le premier et seul paramètre est un URI indiquant l'hôte à "
-"contacter pour permettre une configuration propre à l'hôte. Apt s'attend à "
-"ce que la commande indique le mandataire sur la sortie standard dans le "
-"style <literal>http://proxy:port/</literal> ou le mot <literal>DIRECT</"
-"literal> si aucun mandataire ne doit être utilisé. Aucune sortie indique que "
-"le mandataire générique doit être utilisé. Notez que l'auto-détection ne "
-"sera pas exécutée si une configuration spécifique de mandataire hôte a déjà "
-"été établie par <literal>Acquire::http::Proxy::$HOST</literal>. Voir le "
-"paquet &squid-deb-proxy-client; pour un exemple d'implémentation qui utilise "
-"avahi. Cette option l'emporte sur l'ancien nom d'option "
-"<literal>ProxyAutoDetect</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
-"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
-"the <literal>http</literal> method, and default to the same values if they "
-"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
-"yet supported."
-msgstr ""
-"Les options <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> et "
-"<literal>proxy</literal> fonctionnent pour les URI HTTPS de la même manière "
-"que la méthode <literal>http</literal>. Les valeurs par défaut sont les "
-"mêmes si elles ne sont pas indiquées. L'option <literal>Pipeline-Depth</"
-"literal> n'est pas encore gérée."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
-"corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
-"literal> is the corresponding per-host option.  <literal>Verify-Host</"
-"literal> boolean suboption determines whether or not the server's hostname "
-"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
-"corresponding per-host option.  <literal>SslCert</literal> determines what "
-"certificate to use for client authentication. <literal>&lt;host&gt;::"
-"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
-"literal> determines what private key to use for client authentication. "
-"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
-"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
-"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> is the corresponding per-host option."
-msgstr ""
-"La sous-option <literal>CaInfo</literal> spécifie le fichier contenant les "
-"informations sur les certificats de confiance. La sous-option booléenne "
-"<literal>Verify-Peer</literal> précise si le certificat d'hôte du serveur "
-"doit être confronté aux certificats de confiance ou pas. La sous-option "
-"booléenne <literal>Verify-Host</literal> précise s'il faut vérifier ou pas "
-"le nom d'hôte du serveur. <literal>SslCert</literal> détermine le certificat "
-"à utiliser pour l'authentification du client.  <literal>SslKey</literal> "
-"détermine quelle clé privée doit être utilisée pour l'authentification du "
-"client. <literal>SslForceVersion</literal> surcharge la valeur par défaut "
-"pour la version de SSL à utiliser et peut contenir l'une des chaînes "
-"<literal>TLSv1</literal> ou <literal>SSLv3</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4921,6 +4747,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"The option <literal>timeout</literal> sets the timeout timer used by the "
+"method; this value applies to the connection as well as the data timeout."
+msgstr ""
+"L'option <literal>timeout</literal> positionne le compteur d'expiration du "
+"délai (timeout) utilisé par la méthode. Cela s'applique aussi bien à la "
+"connexion qu'aux données."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 "some situations require that passive mode be disabled and port mode FTP used "
@@ -6159,6 +5995,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Examples"
 msgstr "Exemples"
 
@@ -7681,6 +7519,25 @@ msgstr "Format deb822-Style"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "Files in this format have the extension <filename>.sources</filename>.  "
+#| "The format is similar in syntax to other files used by Debian and its "
+#| "derivatives, such as the metadata files that apt will download from the "
+#| "configured sources or the <filename>debian/control</filename> file in a "
+#| "Debian source package.  Individual entries are separated by an empty "
+#| "line; additional empty lines are ignored, and a <literal>#</literal> "
+#| "character at the start of the line marks the entire line as a comment. An "
+#| "entry can hence be disabled by commenting out each line belonging to the "
+#| "stanza, but it is usually easier to add the field \"Enabled: no\" to the "
+#| "stanza to disable the entry. Removing the field or setting it to yes "
+#| "reenables it.  Options have the same syntax as every other field: A "
+#| "fieldname separated by a colon (<literal>:</literal>) and optionally "
+#| "spaces from its value(s).  Note especially that multiple values are "
+#| "separated by spaces, not by commas as in the one-line format. Multivalue "
+#| "fields like <literal>Architectures</literal> also have "
+#| "<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+#| "literal> to modify the default value rather than replacing it."
 msgid ""
 "Files in this format have the extension <filename>.sources</filename>.  The "
 "format is similar in syntax to other files used by Debian and its "
@@ -7694,10 +7551,11 @@ msgid ""
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
-"especially that multiple values are separated by spaces, not by commas as in "
-"the one-line format. Multivalue fields like <literal>Architectures</literal> "
-"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
-"Remove</literal> to modify the default value rather than replacing it."
+"especially that multiple values are separated by whitespaces (like spaces, "
+"tabs and newlines), not by commas as in the one-line format.  Multivalue "
+"fields like <literal>Architectures</literal> also have "
+"<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+"literal> to modify the default value rather than replacing it."
 msgstr ""
 "Les fichiers dans ce format possèdent l'extension <filename>.sources</"
 "filename>. La syntaxe du format est similaire à celle des autres fichiers "
@@ -8223,19 +8081,23 @@ msgstr "Spécification des URI"
 msgid "The currently recognized URI types are:"
 msgstr "Les types d'URI actuellement reconnus sont :"
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-http;)"
+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;."
+"commonly used method. 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>
@@ -8249,6 +8111,11 @@ msgid ""
 "chosen transport method. See &apt-secure; for details."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-https;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
@@ -8695,6 +8562,8 @@ msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "1"
 msgstr "1"
 
@@ -9786,6 +9655,892 @@ msgstr ""
 "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
 "nombre 100 en cas d'erreur."
 
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Configuration file for APT"
+msgid "Login configuration file for APT sources and proxies"
+msgstr "Fichier de configuration pour APT"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"APT configuration files like &sources-list; or &apt-conf; need to be "
+"accessible for everyone using apt tools on the system to have access to all "
+"package-related information like the available packages in a repository. "
+"Login information needed to connect to a proxy or to download data from a "
+"repository on the other hand shouldn't always be accessible by everyone and "
+"can hence not be placed in a file with world-readable file permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used "
+"to store login information in a netrc-like format with restrictive file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "netrc-like format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The format defined here is similar to the format of the <filename>~/.netrc</"
+"filename> file used by <citerefentry><refentrytitle><command>ftp</command></"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs "
+"interacting with servers.  It is a simple token-based format with the "
+"following tokens being recognized; Unknown tokens will be ignored. Tokens "
+"may be separated by spaces, tabs or newlines."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid ""
+"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Entries are looked up by searching for the <emphasis><literal>machine</"
+"literal></emphasis> token matching the hostname of the URI apt needs login "
+"information for. Extending the netrc-format a portnumber can be specified. "
+"If no port is given the token matches for all ports.  Similar the path is "
+"optional and only needed and useful if multiple repositories with different "
+"login information reside on the same server. A machine token with a path "
+"matches if the path in the URI starts with the path given in the token.  "
+"Once a match is made, the subsequent tokens are processed, stopping when the "
+"end of file is reached or another <emphasis><literal>machine</literal></"
+"emphasis> token is encountered."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "--keyring <replaceable>filename</replaceable>"
+msgid "<literal>login</literal> <replaceable>name</replaceable>"
+msgstr "--keyring <replaceable>fichier</replaceable>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The username to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "add <replaceable>file(s)</replaceable>"
+msgid "<literal>password</literal> <replaceable>string</replaceable>"
+msgstr "add <replaceable>fichier(s)</replaceable>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The password to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Examples"
+msgid "Example"
+msgstr "Exemples"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org\n"
+"login apt\n"
+"password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "machine example.org login apt password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org/deb login apt password debian\n"
+"machine example.org/debian login apt password debian\n"
+"machine example.org/debian/ login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org:80 login apt password debian\n"
+"machine example.org/deb/ login apt password debian\n"
+"machine example.org/ubuntu login apt password debian\n"
+"machine example.orga login apt password debian\n"
+"machine example.net login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Supplying login information for a user named <literal>apt</literal> with the "
+"password <literal>debian</literal> for the &sources-list; entry <placeholder "
+"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
+"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
+"the following in the auth.conf file could be used: <placeholder type="
+"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
+"specific all of these lines will also apply to the example entry: "
+"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
+"the following lines apply: <placeholder type=\"literallayout\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Notes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Basic support for this feature is present since version 0.7.25, but was "
+"undocumented for years. The documentation was added in version 1.5 changing "
+"also the implementation slightly. For maximum backward compatibility you "
+"should avoid multiple <literal>machine</literal> tokens with the same "
+"hostname, but if you need multiple they should all have a path specified in "
+"the <literal>machine</literal> token."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+msgid "<filename>/etc/apt/auth.conf</filename>"
+msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT configuration file fragments.  Configuration Item: <literal>Dir::Etc::"
+#| "Parts</literal>."
+msgid ""
+"Login information for APT sources and proxies in a netrc-like format.  "
+"Configuration Item: <literal>Dir::Etc::netrc</literal>."
+msgstr ""
+"Éléments du fichier de configuration d'APT. Élément de configuration : "
+"<literal>Dir::Etc::Parts</literal>."
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "&apt-conf;, &sources-list;, &apt-get;"
+msgid "&apt-conf; &sources-list;"
+msgstr "&apt-conf;, &sources-list;, &apt-get;."
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-http.1.xml
+msgid ""
+"APT transport for downloading via the Hypertext Transfer Protocol (HTTP)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the Hypertext "
+"Transfer Protocol (HTTP). It is available by default and probably the most "
+"used of all transports. Note that a transport is never called directly by a "
+"user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"HTTP is an unencrypted transport protocol meaning that the whole "
+"communication with the remote server (or proxy) can be observed by a "
+"sufficiently capable attacker referred to commonly as man in the middle "
+"(MITM).  Such an attacker can <emphasis>not</emphasis> modify the "
+"communication to compromise the security of your system through as APTs data "
+"security model is independent of the chosen transport method. This is "
+"explained in detail in &apt-secure;. An overview over available transport "
+"methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Various options are available to modify its behaviour which can be set in an "
+"&apt-conf; file ranging from proxy configuration to workaround for specific "
+"server insufficiencies."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Proxy Configuration"
+msgstr "Configuration utilisateur"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The environment variable <envar>http_proxy</envar> is supported for system "
+"wide configuration.  Proxies specific to apt can be configured via the "
+"option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
+"used only for certain hosts can be specified via <literal>Acquire::http::"
+"Proxy::<replaceable>host</replaceable></literal>. Even more finegrained "
+"control can be achieved via proxy autodetection detailed further below.  All "
+"these options use the URI format <literal><replaceable>scheme</"
+"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
+"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
+"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
+"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
+"<literal>https</literal>.  Authentification details can be supplied via &apt-"
+"authconf; instead of including it in the URI directly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The various APT configuration options support the special value "
+"<literal>DIRECT</literal> meaning that no proxy should be used. The "
+"environment variable <envar>no_proxy</envar> with the same propose is also "
+"supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches.  <literal>No-Cache</literal> tells the proxy not to use its "
+#| "cached response under any circumstances.  <literal>Max-Age</literal> sets "
+#| "the allowed maximum age (in seconds) of an index file in the cache of the "
+#| "proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+#| "store the requested archive files in its cache, which can be used to "
+#| "prevent the proxy from polluting its cache with (big) .deb files."
+msgid ""
+"Further more there are three settings provided for cache control with "
+"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
+"tells the proxy not to use its cached response under any circumstances.  "
+"<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
+"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
+"http::No-Store</literal> specifies that the proxy should not store the "
+"requested archive files in its cache, which can be used to prevent the proxy "
+"from polluting its cache with (big) .deb files."
+msgstr ""
+"Trois options de configuration sont fournies pour le contrôle des caches "
+"compatibles avec HTTP/1.1. <literal>No-Cache</literal> signifie que le "
+"mandataire ne doit jamais utiliser les réponses qu'il a stockées ; "
+"<literal>Max-Age</literal> établit l'ancienneté maximale (en secondes) d'un "
+"fichier d'index dans le cache du mandataire. <literal>No-Store</literal> "
+"indique que le mandataire ne doit pas mettre en cache les fichiers "
+"d'archive, ce qui peut éviter de polluer un cache mandataire avec des "
+"fichiers .deb très grands."
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Automatic Proxy Configuration"
+msgstr "Configuration utilisateur"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to "
+#| "specify an external command to discover the http proxy to use. The first "
+#| "and only parameter is an URI denoting the host to be contacted to allow "
+#| "for host-specific configuration. APT expects the command to output the "
+#| "proxy on stdout as a single line in the style <literal>http://proxy:port/"
+#| "</literal> or the word <literal>DIRECT</literal> if no proxy should be "
+#| "used. No output indicates that the generic proxy settings should be "
+#| "used.  Note that auto-detection will not be used for a host if a host-"
+#| "specific proxy configuration is already set via <literal>Acquire::http::"
+#| "Proxy::<replaceable>HOST</replaceable></literal>.  See the &squid-deb-"
+#| "proxy-client; package for an example implementation that uses avahi.  "
+#| "This option takes precedence over the legacy option name "
+#| "<literal>ProxyAutoDetect</literal>."
+msgid ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the previously specified URI format or the word "
+"<literal>DIRECT</literal> if no proxy should be used. No output indicates "
+"that the generic proxy settings should be used."
+msgstr ""
+"L'option <literal>Acquire::http::Proxy-Auto-Detect</literal> peut être "
+"utilisée pour indiquer une commande externe pour découvrir le mandataire "
+"HTTP à utiliser. Le premier et seul paramètre est un URI indiquant l'hôte à "
+"contacter pour permettre une configuration propre à l'hôte. Apt s'attend à "
+"ce que la commande indique le mandataire sur la sortie standard dans le "
+"style <literal>http://proxy:port/</literal> ou le mot <literal>DIRECT</"
+"literal> si aucun mandataire ne doit être utilisé. Aucune sortie indique que "
+"le mandataire générique doit être utilisé. Notez que l'auto-détection ne "
+"sera pas exécutée si une configuration spécifique de mandataire hôte a déjà "
+"été établie par <literal>Acquire::http::Proxy::$HOST</literal>. Voir le "
+"paquet &squid-deb-proxy-client; pour un exemple d'implémentation qui utilise "
+"avahi. Cette option l'emporte sur l'ancien nom d'option "
+"<literal>ProxyAutoDetect</literal>."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Note that auto-detection will not be used for a host if a host-specific "
+"proxy configuration is already set via <literal>Acquire::http::Proxy::"
+"<replaceable>host</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"See the &squid-deb-proxy-client; and &auto-apt-proxy; packages for example "
+"implementations."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This option takes precedence over the legacy option name <literal>Acquire::"
+"http::ProxyAutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Connection Configuration"
+msgstr "Configuration utilisateur"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this value applies to the connection as well as the data timeout."
+msgid ""
+"The option <literal>Acquire::http::Timeout</literal> sets the timeout timer "
+"used by the method; this value applies to the connection as well as the data "
+"timeout."
+msgstr ""
+"L'option <literal>timeout</literal> positionne le compteur d'expiration du "
+"délai (timeout) utilisé par la méthode. Cela s'applique aussi bien à la "
+"connexion qu'aux données."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes per second. The "
+#| "default value is 0 which deactivates the limit and tries to use all "
+#| "available bandwidth.  Note that this option implicitly disables "
+#| "downloading from multiple servers at the same time."
+msgid ""
+"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+"literal> which accepts integer values in kilobytes per second. The default "
+"value is 0 which deactivates the limit and tries to use all available "
+"bandwidth. Note that this option implicitly disables downloading from "
+"multiple servers at the same time."
+msgstr ""
+"La bande passante utilisée peut être limité avec <literal>Acquire::http::Dl-"
+"Limit</literal> qui peut prendre une valeur entière, l'unité utilisée étant "
+"le kilo-octet par seconde. La valeur par défaut est 0, ce qui correspond à "
+"aucune limitation de bande passante. Veuillez noter que cette option "
+"désactive implicitement le téléchargement simultané depuis plusieurs "
+"serveurs."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."
+msgstr ""
+"Le réglage <literal>Acquire::http::Pipeline-Depth</literal> permet "
+"d'utiliser l'enchaînement HTTP (« HTTP pipelining », RFC 2616 section "
+"8.1.2.2) ce qui peut être utile par exemple avec des connexions à latence "
+"élevée. Il indique le nombre de requêtes envoyées dans le tuyau. APT tente "
+"de détecter et de contourner les serveurs web et les mandataires qui se "
+"comportent mal à l'exécution, mais si vous savez que vos serveurs ne "
+"respectent pas la norme HTTP/1.1, l'enchaînement peut être désactivé en "
+"définissant cette valeur à 0. Il est activé par défaut avec une valeur de 10."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+"<literal>Acquire::http::AllowRedirect</literal> contrôle le fait qu'APT "
+"suive les redirections. Ce réglage est activé par défaut."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+"L'option <literal>Acquire::http::User-Agent</literal> peut être utilisée "
+"pour envoyer une valeur User-Agent modifiée pour les téléchargements HTTP, "
+"ce qui peut par exemple être utile avec certains mandataires HTTP qui "
+"n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::SendAccept</literal> is enabled by default and sends "
+"a <literal>Accept: text/*</literal> header field to the server for requests "
+"without file extensions to prevent the server from attempting content "
+"negotiation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-http.1.xml
+#, no-wrap
+msgid ""
+"Acquire::http {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-http-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTP\";\n"
+"\tSendAccept \"false\";\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgid "&apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;."
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-https.1.xml
+msgid "APT transport for downloading via the HTTP Secure protocol (HTTPS)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the HTTP "
+"Secure protocol (HTTPS) also referred to as HTTP over TLS. It is available "
+"by default since apt 1.5 and was before that available in a <package>apt-"
+"transport-https</package> package. Note that a transport is never called "
+"directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"HTTP is by itself an unencrypted transport protocol (compare &apt-transport-"
+"http;), which, as indicated by the appended S is wrapped in an encrypted "
+"layer known as Transport Layer Security (TLS) which provides end-to-end "
+"encryption.  A sufficiently capable attacker can still observe the "
+"communication partners and deeper analyse of the encrypted communcation "
+"might still reveal important details.  An overview over available "
+"alternative transport methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"The HTTPS protocol is based on the HTTP protocol and as such this "
+"implementation has the same relation meaning that all options supported by "
+"&apt-transport-http; are also available via <literal>Acquire::https</"
+"literal> and will default to the same values specified for <literal>Acquire::"
+"http</literal>. This manpage will only document the options <emphasis>unique "
+"to https</emphasis>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Server credentials"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"By default all certificates trusted by the system (see <package>ca-"
+"certificates</package> package) are used for the verification of the server "
+"certificate. An alternative certificate authority (CA) can be configured "
+"with the <literal>Acquire::https::CAInfo</literal> option and its host-"
+"specific option <literal>Acquire::https::CAInfo::<replaceable>host</"
+"replaceable></literal>.  The option specifies a file is made of the "
+"concatenation of the CA certificates (in PEM format) creating the chain used "
+"for the verification of the path from the root (self signed one). If the "
+"remote server provides the whole chain during the exchange, the file need "
+"only contain the root certificate. Otherwise, the whole chain is required. "
+"If you need to support multiple authorities, the only way is to concatenate "
+"everything."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"A custom certificate revocation list (CRL) can be configured with the "
+"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
+"https::CRLFile::<replaceable>host</replaceable></literal> respectively.  "
+"Like the previous option a file in PEM format needs to be specified."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Disabling security"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"When authenticating the server, if the certificate verification fails for "
+"some reason (expired, revoked, man in the middle, …), the connection fails.  "
+"This is obviously what you want in all cases and what the default value "
+"(true)  of the option <literal>Acquire::https::Verify-Peer</literal> and its "
+"host-specific variant provides. If you know <emphasis>exactly</emphasis> "
+"what you are doing, setting this option to \"false\" allows you to skip peer "
+"certificate verification and make the exchange succeed. Again, this option "
+"is for debugging or testing purpose only as it removes all security provided "
+"by the use of HTTPS."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Similarly the option <literal>Acquire::https::Verify-Host</literal> and its "
+"host-specific variant can be used to deactivate a security feature: The "
+"certificate provided by the server includes the identity of the server which "
+"should match the DNS name used to access it. By default, as requested by RFC "
+"2818, the name of the mirror is checked against the identity found in the "
+"certificate. This default behavior is safe and should not be changed, but if "
+"you know that the server you are using has a DNS name which does not match "
+"the identity in its certificate, you can set the option to \"false\", which "
+"will prevent the comparison to be done."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Client authentication"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Beside the password based authentication available (see &apt-authconf;) "
+"HTTPS supports authentication based on client certificates as well via "
+"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
+"SSLKey</literal>. They respectively should be set to the filename of the "
+"X.509 client certificate and the associated (unencrypted) private key, both "
+"in PEM format.  In practice the use of the host-specific variants of both "
+"options is highly recommended."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-https.1.xml
+#, no-wrap
+msgid ""
+"Acquire::https {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-https-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTPS\";\n"
+"\tSendAccept \"false\";\n"
+"\n"
+"\tCAInfo \"/path/to/ca/certs.pem\";\n"
+"\tCRLFile \"/path/to/all/crl.pem\";\n"
+"\tVerify-Peer \"true\";\n"
+"\tVerify-Host::broken.example.org \"false\";\n"
+"\tSSLCert::example.org \"/path/to/client/cert.pem\";\n"
+"\tSSLKey::example.org \"/path/to/client/key.pem\"\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+#, fuzzy
+#| msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgid "&apt-transport-http; &apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-mirror.1.xml
+msgid "APT transport for more automated mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This APT transport isn't implementing a protocol to access local or remote "
+"repositories on its own, but acquires a mirrorlist and redirects all "
+"requests to the mirror(s) picked from this list access via other transports "
+"like &apt-transport-http;. The basic functionality is available since apt "
+"0.7.24, but was undocumented until apt 1.6 which contained a complete rework "
+"of the transport and its supported features. Note that a transport is never "
+"called directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If the acquisition of a file via a mirror fails the method ensures that "
+"automatically another possible mirror of the list is tried until either the "
+"file is retrieved or no mirror is left in the list handling transparently "
+"server downtimes and similar problems."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The security implications of the transport are based on the security "
+"considerations associated with the transport used to acquire the mirrorlist "
+"and the transports involved in accessing the chosen mirror(s) by the "
+"transport."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This transport has no configuration options at present. The mirror selection "
+"is based entirely on the mirrors offered in the mirrorlist and the files apt "
+"needs to acquire."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirrorlist format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A mirrorlist contains at least one line each specifying an URI for a "
+"mirror.  Empty lines and those starting with a hash key (<literal>#</"
+"literal>) are ignored.  An URI always starts with a URI scheme which defines "
+"the transport used for this mirror. If the URI e.g. starts with "
+"<literal>http:</literal> the responsible transport is &apt-transport-http; "
+"which might have specific requirements for the format of the remaining part "
+"of the URI."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"An URI can optionally be separated from metadata about the mirror by a tab.  "
+"Multiple datapoints in the provided metadata can itself be separated by "
+"spaces for tabs.  (This is an advanced feature only available with apt >= "
+"1.6. Earlier apt versions will fail to parse mirrorlists using this feature)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Since apt 1.6 the usage of compressed mirrorlists is also supported.  Note "
+"that the filename of the mirrorlist must specify the compression algorithm "
+"used, there is no auto-detection based on file content performed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirror selection by metadata"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As specified in the format a mirror can have additional metadata attached to "
+"prevent a mirror from being selected for acquiring a file not matching this "
+"metadata.  This way the mirrorlist can e.g. contain partial mirrors serving "
+"only certain architectures and apt will automatically choose a different "
+"mirror for files requiring an unlisted architecture. Supported are limits "
+"for the architecture (<literal>arch</literal>), codename of the release "
+"(<literal>codename</literal>), component of the repository the file is in "
+"(<literal>component</literal>), language the file applies to (<literal>lang</"
+"literal>), suite name of the release (<literal>suite</literal>) and type of "
+"the file (<literal>type</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Fallback order for mirrors"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If no priority is given via the metadata key <literal>priority</literal> for "
+"a mirror the order in which mirrors are contacted is random. If a certain "
+"set of mirrors should be tried first before any of another set is tried a "
+"priority can be explicitly set. The mirrors with the lowest number are tried "
+"first. Mirrors which have no explicit priority set default to the highest "
+"possible number and are therefore tried last. The choice between mirrors "
+"with the same priority is again random."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Allowed transports in a mirrorlist"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The availability and choice of transports in a mirrorlist is limited by how "
+"the apt client is accessing the mirrorlist. If a local transport like "
+"<literal>file</literal> or <literal>copy</literal> is used the mirrorlist "
+"can also include local sources while a mirrorlist accessed via "
+"<literal>http</literal> can not. Additionally, a mirrorlist can not contain "
+"a mirrorlist or other wrapping transports (like <package>apt-transport-tor</"
+"package>).  See the documentation of these transports on how to use them "
+"with the mirror method."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that apt versions before 1.6 do not support any other transport than "
+"<literal>http</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Basic example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A basic mirrorlist example supported by all apt versions with a mirror "
+"method (>= 0.7.24) in which the client will pick any of the three mirrors:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"http://ftp.de.debian.org/debian/\n"
+"http://ftp.us.debian.org/debian/\n"
+"http://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
+"txt</filename> on your machine it can be used like this in &sources-list; "
+"(since apt 1.6):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror+file:/etc/apt/mirrorlist.txt &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"All versions of the mirror method support a mirrorlist accessible via http, "
+"so assuming it is available at <literal>http://apt.example.org/mirror.lst</"
+"literal> the sources.list entry from above could be written instead as:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb mirror://apt.example.org/mirror.lst &debian-stable-codename; main\n"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that since apt 1.6 the use of <literal>mirror+http</literal> should be "
+"preferred over <literal>mirror</literal> for uniformity. The functionality "
+"is the same."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Example with metadata-enhanced mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As explained in the format definition apt versions before 1.6 do not support "
+"this and will fail parsing the mirrorlist. The example mirrorlist is "
+"proposefully complicated to show some aspects of the selection. The "
+"following setup is assumed: The first mirror is local mirror accessible via "
+"the file method, but potentially incomplete. The second mirror has a great "
+"connection, but is a partial mirror in sofar as it only contains files "
+"related to the architectures <literal>amd64</literal> and <literal>all</"
+"literal>. The remaining mirrors are average mirrors which should be "
+"contacted only if the earlier ones didn't work."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"file:/srv/local/debian/mirror/\tpriority:1 type:index\n"
+"http://partial.example.org/mirror/\tpriority:2 arch:amd64 arch:all type:deb\n"
+"http://ftp.us.debian.org/debian/\ttype:deb\n"
+"http://ftp.de.debian.org/debian/\ttype:deb\n"
+"https://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"In this setup with this mirrorlist the first mirror will be used to download "
+"all index files assuming the mirrorlist itself is accessed via a local "
+"transport like <literal>file</literal>. If it isn't, the mirror is otherwise "
+"inaccessible or does not contain the requested file another mirror will be "
+"used to acquire the file, which one depending on the type of the file: An "
+"index file will be served by the last mirror in the list, while a package of "
+"architecture <literal>amd64</literal> is served by the second and those of e."
+"g. architecture <literal>i386</literal> by one of the last three."
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
 #: guide.dbk offline.dbk
 msgid "en"
@@ -11420,6 +12175,73 @@ 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 ""
+#~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
+#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
+#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
+#~ "the above settings is specified, <envar>http_proxy</envar> environment "
+#~ "variable will be used."
+#~ msgstr ""
+#~ "<literal>http::Proxy</literal> est le mandataire (proxy) HTTP à utiliser "
+#~ "par défaut pour les URI HTTP. Il se présente sous la forme standard : "
+#~ "<literal>http://[[utilisateur][:mot_de_passe]@]hôte[:port]/</literal>. On "
+#~ "peut spécifier un mandataire particulier par hôte distant en utilisant la "
+#~ "syntaxe : <literal>http::Proxy::&lt;hôte&gt;</literal>. Le mot-clé "
+#~ "spécial <literal>DIRECT</literal> indique alors de n'utiliser aucun "
+#~ "mandataire pour l'hôte. Si aucun des paramètres précédents n'est défini, "
+#~ "la variable d'environnement <envar>http_proxy</envar> annule et remplace "
+#~ "toutes les options de mandataire HTTP."
+
+#~ msgid ""
+#~ "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+#~ "<literal>proxy</literal> options work for HTTPS URIs in the same way as "
+#~ "for the <literal>http</literal> method, and default to the same values if "
+#~ "they are not explicitly set. The <literal>Pipeline-Depth</literal> option "
+#~ "is not yet supported."
+#~ msgstr ""
+#~ "Les options <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> et "
+#~ "<literal>proxy</literal> fonctionnent pour les URI HTTPS de la même "
+#~ "manière que la méthode <literal>http</literal>. Les valeurs par défaut "
+#~ "sont les mêmes si elles ne sont pas indiquées. L'option <literal>Pipeline-"
+#~ "Depth</literal> n'est pas encore gérée."
+
+#~ msgid ""
+#~ "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#~ "boolean suboption determines whether or not the server's host certificate "
+#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
+#~ "Verify-Peer</literal> is the corresponding per-host option.  "
+#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
+#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
+#~ "Verify-Host</literal> is the corresponding per-host option.  "
+#~ "<literal>SslCert</literal> determines what certificate to use for client "
+#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
+#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
+#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
+#~ "SslKey</literal> is the corresponding per-host option.  "
+#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
+#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
+#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "literal> is the corresponding per-host option."
+#~ msgstr ""
+#~ "La sous-option <literal>CaInfo</literal> spécifie le fichier contenant "
+#~ "les informations sur les certificats de confiance. La sous-option "
+#~ "booléenne <literal>Verify-Peer</literal> précise si le certificat d'hôte "
+#~ "du serveur doit être confronté aux certificats de confiance ou pas. La "
+#~ "sous-option booléenne <literal>Verify-Host</literal> précise s'il faut "
+#~ "vérifier ou pas le nom d'hôte du serveur. <literal>SslCert</literal> "
+#~ "détermine le certificat à utiliser pour l'authentification du client.  "
+#~ "<literal>SslKey</literal> détermine quelle clé privée doit être utilisée "
+#~ "pour l'authentification du client. <literal>SslForceVersion</literal> "
+#~ "surcharge la valeur par défaut pour la version de SSL à utiliser et peut "
+#~ "contenir l'une des chaînes <literal>TLSv1</literal> ou <literal>SSLv3</"
+#~ "literal>."
+
+#~ 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</"
@@ -11631,9 +12453,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Afficher les empreintes des clés fiables."
 
-#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
 #~ msgid "Local trust database of archive keys."
 #~ msgstr "Base de données locale de fiabilité des clés de l'archive."
 
@@ -12201,9 +13020,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "Mettre à jour le trousseau de clés local avec le trousseau de clés de "
 #~ "l'archive Debian et supprimer les clés qui y sont périmées."
 
-#~ msgid "--keyring <replaceable>filename</replaceable>"
-#~ msgstr "--keyring <replaceable>fichier</replaceable>"
-
 #, fuzzy
 #~| msgid ""
 #~| "Seconds the Release file should be considered valid after it was "
@@ -12259,9 +13075,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr "Gestionnaire de paquets APT - manipulation du cache"
 
-#~ msgid "add <replaceable>file(s)</replaceable>"
-#~ msgstr "add <replaceable>fichier(s)</replaceable>"
-
 #~ msgid ""
 #~ "<literal>add</literal> adds the named package index files to the package "
 #~ "cache.  This is for debugging only."
@@ -12400,13 +13213,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "pire.  Utilisez-la à vos risques et périls."
 
 #~ msgid ""
-#~ "APT configuration file fragments.  Configuration Item: <literal>Dir::Etc::"
-#~ "Parts</literal>."
-#~ msgstr ""
-#~ "Éléments du fichier de configuration d'APT. Élément de configuration : "
-#~ "<literal>Dir::Etc::Parts</literal>."
-
-#~ msgid ""
 #~ "Storage area for retrieved package files.  Configuration Item: "
 #~ "<literal>Dir::Cache::Archives</literal>."
 #~ msgstr ""
diff --git a/doc/po/it.po b/doc/po/it.po
index f94386c35..de991a64f 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-08-24 23:21+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -671,7 +671,9 @@ msgstr "8"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "APT"
 msgstr "APT"
 
@@ -684,7 +686,9 @@ msgstr "interfaccia a riga di comando"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Description"
 msgstr "Descrizione"
 
@@ -957,7 +961,8 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
 msgid "See Also"
 msgstr "Vedere anche"
 
@@ -2071,7 +2076,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
-#: apt_preferences.5.xml
+#: apt_preferences.5.xml apt_auth.conf.5.xml
 msgid "Files"
 msgstr "File"
 
@@ -2966,7 +2971,8 @@ msgstr ""
 "<command>update</command>; APT in Ubuntu invece lo fa."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
 msgid "Options"
 msgstr "Opzioni"
 
@@ -3923,7 +3929,7 @@ msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt_auth.conf.5.xml
 msgid "5"
 msgstr "5"
 
@@ -4707,197 +4713,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
-"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>http_proxy</envar> environment variable will "
-"be used."
-msgstr ""
-"<literal>http::Proxy</literal> imposta il proxy predefinito da usare per gli "
-"URI HTTP. È nella forma standard <literal>http://[[utente][:password]@]host[:"
-"porta]/</literal>. Possono anche essere specificati proxy per ciascun host "
-"usando la forma <literal>http::Proxy::&lt;host&gt;</literal> con la speciale "
-"parola chiave <literal>DIRECT</literal> che significa di non usare un proxy. "
-"Se non viene specificata alcuna delle impostazioni precedenti, viene usata "
-"la variabile d'ambiente <envar>http_proxy</envar>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
-"response under any circumstances.  <literal>Max-Age</literal> sets the "
-"allowed maximum age (in seconds) of an index file in the cache of the "
-"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
-"store the requested archive files in its cache, which can be used to prevent "
-"the proxy from polluting its cache with (big) .deb files."
-msgstr ""
-"Sono fornite tre impostazioni per il controllo della cache in proxy con "
-"cache conformi a HTTP/1.1. <literal>No-Cache</literal> indica al proxy di "
-"non usare la sua risposta in cache in nessuna circostanza. <literal>Max-Age</"
-"literal> imposta l'età massima consentita (in secondi) di un file indice "
-"nella cache del proxy. <literal>No-Store</literal> specifica che il proxy "
-"non deve memorizzare i file archivio richiesti nella sua cache, il che può "
-"essere usato per evitare che il proxy riempia la propria cache con (grandi) "
-"file .deb."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"L'opzione <literal>timeout</literal> imposta il tempo di timeout usato dal "
-"metodo; questo valore si applica sia al timeout per la connessione sia a "
-"quello per i dati."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and workaround misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
-"It is enabled by default with the value 10."
-msgstr ""
-"L'impostazione <literal>Acquire::http::Pipeline-Depth</literal> può essere "
-"usata per abilitare le pipeline HTTP (RFC 2616, sezione 8.1.2.2) che possono "
-"essere utili, ad esempio, in connessioni con grande latenza. Specifica "
-"quante richieste sono inviate in una pipeline. APT cerca di rilevare al "
-"momento dell'esecuzione i server web e i proxy con comportamento non "
-"corretto e di aggirare il problema, ma se è noto che i propri non sono "
-"conformi alla specifica HTTP/1.1, l'uso delle pipeline può essere "
-"disabilitato impostando il valore a 0. In modo predefinito è abilitato con "
-"il valore 10."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
-"follow redirects, which is enabled by default."
-msgstr ""
-"<literal>Acquire::http::AllowRedirect</literal> specifica se APT segue o "
-"meno le ridirezioni che sono abilitate in modo predefinito."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobytes per second. The default "
-"value is 0 which deactivates the limit and tries to use all available "
-"bandwidth.  Note that this option implicitly disables downloading from "
-"multiple servers at the same time."
-msgstr ""
-"La quantità di banda utilizzata può essere limitata con <literal>Acquire::"
-"http::Dl-Limit</literal> che accetta valori interi in kilobyte al secondo. "
-"Il valore predefinito è 0 che disattiva il limite e cerca di usare tutta la "
-"banda disponibile. Notare che questa opzione implicitamente disabilita lo "
-"scaricamento da più server contemporaneamente."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
-"User-Agent for the http download method as some proxies allow access for "
-"clients only if the client uses a known identifier."
+"The options in these scopes configure APTs acquire transports for the "
+"protocols HTTP and HTTPS and are documented in the &apt-transport-http; and "
+"&apt-transport-https; manpages respectively."
 msgstr ""
-"<literal>Acquire::http::User-Agent</literal> può essere usata per impostare "
-"un User-Agent diverso per il metodo di scaricamento http, dato che alcuni "
-"proxy permettono l'accesso per i client solo se usano un identificativo "
-"conosciuto."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
-"an external command to discover the http proxy to use. The first and only "
-"parameter is an URI denoting the host to be contacted to allow for host-"
-"specific configuration. APT expects the command to output the proxy on "
-"stdout as a single line in the style <literal>http://proxy:port/</literal> "
-"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
-"indicates that the generic proxy settings should be used.  Note that auto-"
-"detection will not be used for a host if a host-specific proxy configuration "
-"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
-"example implementation that uses avahi.  This option takes precedence over "
-"the legacy option name <literal>ProxyAutoDetect</literal>."
-msgstr ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> può essere usato per "
-"specificare un comando esterno per rilevare il proxy http da usare. Il primo "
-"è unico parametro è un URI che indica l'host da contattare per permettere "
-"una configurazione specifica per host. APT si aspetta che il comando produca "
-"in output il proxy sullo stdout come singola riga nello stile "
-"<literal>http://proxy:porta/</literal> o la parola <literal>DIRECT</literal> "
-"se non deve essere usato un proxy. L'assenza di output indica che devono "
-"essere usate le impostazioni generiche per proxy. Notare che il rilevamento "
-"automatico non verrà usato per un host se una configurazione di proxy "
-"specifica per host è già impostata con <literal>Acquire::http::Proxy::"
-"<replaceable>HOST</replaceable></literal>. Vedere il pacchetto &squid-deb-"
-"proxy-client; per un esempio di implementazione che usa avahi. Questa "
-"opzione ha la precedenza sull'opzione col nome obsoleto "
-"<literal>ProxyAutoDetect</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
-"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
-"the <literal>http</literal> method, and default to the same values if they "
-"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
-"yet supported."
-msgstr ""
-"Le opzioni<literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> e "
-"<literal>proxy</literal> funzionano per gli URI HTTPS nello stesso modo che "
-"per il metodo <literal>http</literal> e assumono in modo predefinito lo "
-"stesso valore, a meno di non essere impostate in modo esplicito. L'opzione "
-"<literal>Pipeline-Depth</literal> non è ancora supportata."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
-"corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
-"literal> is the corresponding per-host option.  <literal>Verify-Host</"
-"literal> boolean suboption determines whether or not the server's hostname "
-"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
-"corresponding per-host option.  <literal>SslCert</literal> determines what "
-"certificate to use for client authentication. <literal>&lt;host&gt;::"
-"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
-"literal> determines what private key to use for client authentication. "
-"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
-"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
-"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> is the corresponding per-host option."
-msgstr ""
-"La sotto-opzione <literal>CaInfo</literal> specifica la posizione del file "
-"che contiene le informazioni sui certificati fidati; <literal>&lt;host&gt;::"
-"CaInfo</literal> è la corrispondente opzione specifica per ciascun host. La "
-"sotto-opzione booleana <literal>Verify-Peer</literal> determina se il "
-"certificato host del server deve o non deve essere verificato usando i "
-"certificati fidati; <literal>&lt;host&gt;::Verify-Peer</literal> è la "
-"corrispondente opzione specifica per ciascun host. La sotto-opzione booleana "
-"<literal>Verify-Host</literal> determina se il nome host del server deve o "
-"non deve essere verificato; <literal>&lt;host&gt;::Verify-Host</literal> è "
-"la corrispondente opzione specifica per ciascun host. <literal>SslCert</"
-"literal> determina quale certificato usare per l'autenticazione client; "
-"<literal>&lt;host&gt;::SslCert</literal> è la corrispondente opzione "
-"specifica per ciascun host. <literal>SslKey</literal> determina quale chiave "
-"privata usare per l'autenticazione client; <literal>&lt;host&gt;::SslKey</"
-"literal> è la corrispondente opzione specifica per ciascun host. "
-"<literal>SslForceVersion</literal> scavalca la versione predefinita SSL da "
-"usare e può contenere la stringa «<literal>TLSv1</literal>» o "
-"«<literal>SSLv3</literal>»;  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> è la corrispondente opzione specifica per ciascun host."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4936,6 +4755,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"The option <literal>timeout</literal> sets the timeout timer used by the "
+"method; this value applies to the connection as well as the data timeout."
+msgstr ""
+"L'opzione <literal>timeout</literal> imposta il tempo di timeout usato dal "
+"metodo; questo valore si applica sia al timeout per la connessione sia a "
+"quello per i dati."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 "some situations require that passive mode be disabled and port mode FTP used "
@@ -6156,6 +5985,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Examples"
 msgstr "Esempi"
 
@@ -7695,6 +7526,25 @@ msgstr "Formato in stile deb822"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "Files in this format have the extension <filename>.sources</filename>.  "
+#| "The format is similar in syntax to other files used by Debian and its "
+#| "derivatives, such as the metadata files that apt will download from the "
+#| "configured sources or the <filename>debian/control</filename> file in a "
+#| "Debian source package.  Individual entries are separated by an empty "
+#| "line; additional empty lines are ignored, and a <literal>#</literal> "
+#| "character at the start of the line marks the entire line as a comment. An "
+#| "entry can hence be disabled by commenting out each line belonging to the "
+#| "stanza, but it is usually easier to add the field \"Enabled: no\" to the "
+#| "stanza to disable the entry. Removing the field or setting it to yes "
+#| "reenables it.  Options have the same syntax as every other field: A "
+#| "fieldname separated by a colon (<literal>:</literal>) and optionally "
+#| "spaces from its value(s).  Note especially that multiple values are "
+#| "separated by spaces, not by commas as in the one-line format. Multivalue "
+#| "fields like <literal>Architectures</literal> also have "
+#| "<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+#| "literal> to modify the default value rather than replacing it."
 msgid ""
 "Files in this format have the extension <filename>.sources</filename>.  The "
 "format is similar in syntax to other files used by Debian and its "
@@ -7708,10 +7558,11 @@ msgid ""
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
-"especially that multiple values are separated by spaces, not by commas as in "
-"the one-line format. Multivalue fields like <literal>Architectures</literal> "
-"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
-"Remove</literal> to modify the default value rather than replacing it."
+"especially that multiple values are separated by whitespaces (like spaces, "
+"tabs and newlines), not by commas as in the one-line format.  Multivalue "
+"fields like <literal>Architectures</literal> also have "
+"<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+"literal> to modify the default value rather than replacing it."
 msgstr ""
 "I file in questo formato hanno l'estensione <filename>.sources</filename>. "
 "Il formato è simile nella sintassi ad altri file usati in Debian e nelle sue "
@@ -8230,19 +8081,23 @@ msgstr "Specificare URI"
 msgid "The currently recognized URI types are:"
 msgstr "I tipi di URI attualmente riconosciuti sono:"
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-http;)"
+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;."
+"commonly used method. 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>
@@ -8256,6 +8111,11 @@ msgid ""
 "chosen transport method. See &apt-secure; for details."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-https;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
@@ -8692,6 +8552,8 @@ msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "1"
 msgstr "1"
 
@@ -9777,6 +9639,893 @@ msgstr ""
 "<command>apt-ftparchive</command> restituisce zero in caso di funzionamento "
 "normale e il valore decimale 100 in caso di errore."
 
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Configuration file for APT"
+msgid "Login configuration file for APT sources and proxies"
+msgstr "file di configurazione di APT"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"APT configuration files like &sources-list; or &apt-conf; need to be "
+"accessible for everyone using apt tools on the system to have access to all "
+"package-related information like the available packages in a repository. "
+"Login information needed to connect to a proxy or to download data from a "
+"repository on the other hand shouldn't always be accessible by everyone and "
+"can hence not be placed in a file with world-readable file permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used "
+"to store login information in a netrc-like format with restrictive file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "netrc-like format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The format defined here is similar to the format of the <filename>~/.netrc</"
+"filename> file used by <citerefentry><refentrytitle><command>ftp</command></"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs "
+"interacting with servers.  It is a simple token-based format with the "
+"following tokens being recognized; Unknown tokens will be ignored. Tokens "
+"may be separated by spaces, tabs or newlines."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid ""
+"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Entries are looked up by searching for the <emphasis><literal>machine</"
+"literal></emphasis> token matching the hostname of the URI apt needs login "
+"information for. Extending the netrc-format a portnumber can be specified. "
+"If no port is given the token matches for all ports.  Similar the path is "
+"optional and only needed and useful if multiple repositories with different "
+"login information reside on the same server. A machine token with a path "
+"matches if the path in the URI starts with the path given in the token.  "
+"Once a match is made, the subsequent tokens are processed, stopping when the "
+"end of file is reached or another <emphasis><literal>machine</literal></"
+"emphasis> token is encountered."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>login</literal> <replaceable>name</replaceable>"
+msgstr "apt-get install <replaceable>pacchetto</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The username to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
+msgid "<literal>password</literal> <replaceable>string</replaceable>"
+msgstr "policy <replaceable>[ pacchetti ]</replaceable>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The password to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Examples"
+msgid "Example"
+msgstr "Esempi"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org\n"
+"login apt\n"
+"password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "machine example.org login apt password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org/deb login apt password debian\n"
+"machine example.org/debian login apt password debian\n"
+"machine example.org/debian/ login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org:80 login apt password debian\n"
+"machine example.org/deb/ login apt password debian\n"
+"machine example.org/ubuntu login apt password debian\n"
+"machine example.orga login apt password debian\n"
+"machine example.net login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Supplying login information for a user named <literal>apt</literal> with the "
+"password <literal>debian</literal> for the &sources-list; entry <placeholder "
+"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
+"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
+"the following in the auth.conf file could be used: <placeholder type="
+"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
+"specific all of these lines will also apply to the example entry: "
+"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
+"the following lines apply: <placeholder type=\"literallayout\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Notes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Basic support for this feature is present since version 0.7.25, but was "
+"undocumented for years. The documentation was added in version 1.5 changing "
+"also the implementation slightly. For maximum backward compatibility you "
+"should avoid multiple <literal>machine</literal> tokens with the same "
+"hostname, but if you need multiple they should all have a path specified in "
+"the <literal>machine</literal> token."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+msgid "<filename>/etc/apt/auth.conf</filename>"
+msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Show full versions for upgraded and installed packages.  Configuration "
+#| "Item: <literal>APT::Get::Show-Versions</literal>."
+msgid ""
+"Login information for APT sources and proxies in a netrc-like format.  "
+"Configuration Item: <literal>Dir::Etc::netrc</literal>."
+msgstr ""
+"Mostra la versione completa dei pacchetti aggiornati e installati. Voce di "
+"configurazione: <literal>APT::Get::Show-Versions</literal>."
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "&apt-conf;, &sources-list;, &apt-get;"
+msgid "&apt-conf; &sources-list;"
+msgstr "&apt-conf;, &sources-list;, &apt-get;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-http.1.xml
+msgid ""
+"APT transport for downloading via the Hypertext Transfer Protocol (HTTP)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the Hypertext "
+"Transfer Protocol (HTTP). It is available by default and probably the most "
+"used of all transports. Note that a transport is never called directly by a "
+"user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"HTTP is an unencrypted transport protocol meaning that the whole "
+"communication with the remote server (or proxy) can be observed by a "
+"sufficiently capable attacker referred to commonly as man in the middle "
+"(MITM).  Such an attacker can <emphasis>not</emphasis> modify the "
+"communication to compromise the security of your system through as APTs data "
+"security model is independent of the chosen transport method. This is "
+"explained in detail in &apt-secure;. An overview over available transport "
+"methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Various options are available to modify its behaviour which can be set in an "
+"&apt-conf; file ranging from proxy configuration to workaround for specific "
+"server insufficiencies."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Proxy Configuration"
+msgstr "Configurazione utente"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The environment variable <envar>http_proxy</envar> is supported for system "
+"wide configuration.  Proxies specific to apt can be configured via the "
+"option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
+"used only for certain hosts can be specified via <literal>Acquire::http::"
+"Proxy::<replaceable>host</replaceable></literal>. Even more finegrained "
+"control can be achieved via proxy autodetection detailed further below.  All "
+"these options use the URI format <literal><replaceable>scheme</"
+"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
+"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
+"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
+"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
+"<literal>https</literal>.  Authentification details can be supplied via &apt-"
+"authconf; instead of including it in the URI directly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The various APT configuration options support the special value "
+"<literal>DIRECT</literal> meaning that no proxy should be used. The "
+"environment variable <envar>no_proxy</envar> with the same propose is also "
+"supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches.  <literal>No-Cache</literal> tells the proxy not to use its "
+#| "cached response under any circumstances.  <literal>Max-Age</literal> sets "
+#| "the allowed maximum age (in seconds) of an index file in the cache of the "
+#| "proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+#| "store the requested archive files in its cache, which can be used to "
+#| "prevent the proxy from polluting its cache with (big) .deb files."
+msgid ""
+"Further more there are three settings provided for cache control with "
+"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
+"tells the proxy not to use its cached response under any circumstances.  "
+"<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
+"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
+"http::No-Store</literal> specifies that the proxy should not store the "
+"requested archive files in its cache, which can be used to prevent the proxy "
+"from polluting its cache with (big) .deb files."
+msgstr ""
+"Sono fornite tre impostazioni per il controllo della cache in proxy con "
+"cache conformi a HTTP/1.1. <literal>No-Cache</literal> indica al proxy di "
+"non usare la sua risposta in cache in nessuna circostanza. <literal>Max-Age</"
+"literal> imposta l'età massima consentita (in secondi) di un file indice "
+"nella cache del proxy. <literal>No-Store</literal> specifica che il proxy "
+"non deve memorizzare i file archivio richiesti nella sua cache, il che può "
+"essere usato per evitare che il proxy riempia la propria cache con (grandi) "
+"file .deb."
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Automatic Proxy Configuration"
+msgstr "Configurazione utente"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to "
+#| "specify an external command to discover the http proxy to use. The first "
+#| "and only parameter is an URI denoting the host to be contacted to allow "
+#| "for host-specific configuration. APT expects the command to output the "
+#| "proxy on stdout as a single line in the style <literal>http://proxy:port/"
+#| "</literal> or the word <literal>DIRECT</literal> if no proxy should be "
+#| "used. No output indicates that the generic proxy settings should be "
+#| "used.  Note that auto-detection will not be used for a host if a host-"
+#| "specific proxy configuration is already set via <literal>Acquire::http::"
+#| "Proxy::<replaceable>HOST</replaceable></literal>.  See the &squid-deb-"
+#| "proxy-client; package for an example implementation that uses avahi.  "
+#| "This option takes precedence over the legacy option name "
+#| "<literal>ProxyAutoDetect</literal>."
+msgid ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the previously specified URI format or the word "
+"<literal>DIRECT</literal> if no proxy should be used. No output indicates "
+"that the generic proxy settings should be used."
+msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> può essere usato per "
+"specificare un comando esterno per rilevare il proxy http da usare. Il primo "
+"è unico parametro è un URI che indica l'host da contattare per permettere "
+"una configurazione specifica per host. APT si aspetta che il comando produca "
+"in output il proxy sullo stdout come singola riga nello stile "
+"<literal>http://proxy:porta/</literal> o la parola <literal>DIRECT</literal> "
+"se non deve essere usato un proxy. L'assenza di output indica che devono "
+"essere usate le impostazioni generiche per proxy. Notare che il rilevamento "
+"automatico non verrà usato per un host se una configurazione di proxy "
+"specifica per host è già impostata con <literal>Acquire::http::Proxy::"
+"<replaceable>HOST</replaceable></literal>. Vedere il pacchetto &squid-deb-"
+"proxy-client; per un esempio di implementazione che usa avahi. Questa "
+"opzione ha la precedenza sull'opzione col nome obsoleto "
+"<literal>ProxyAutoDetect</literal>."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Note that auto-detection will not be used for a host if a host-specific "
+"proxy configuration is already set via <literal>Acquire::http::Proxy::"
+"<replaceable>host</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"See the &squid-deb-proxy-client; and &auto-apt-proxy; packages for example "
+"implementations."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This option takes precedence over the legacy option name <literal>Acquire::"
+"http::ProxyAutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Connection Configuration"
+msgstr "Configurazione utente"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this value applies to the connection as well as the data timeout."
+msgid ""
+"The option <literal>Acquire::http::Timeout</literal> sets the timeout timer "
+"used by the method; this value applies to the connection as well as the data "
+"timeout."
+msgstr ""
+"L'opzione <literal>timeout</literal> imposta il tempo di timeout usato dal "
+"metodo; questo valore si applica sia al timeout per la connessione sia a "
+"quello per i dati."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes per second. The "
+#| "default value is 0 which deactivates the limit and tries to use all "
+#| "available bandwidth.  Note that this option implicitly disables "
+#| "downloading from multiple servers at the same time."
+msgid ""
+"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+"literal> which accepts integer values in kilobytes per second. The default "
+"value is 0 which deactivates the limit and tries to use all available "
+"bandwidth. Note that this option implicitly disables downloading from "
+"multiple servers at the same time."
+msgstr ""
+"La quantità di banda utilizzata può essere limitata con <literal>Acquire::"
+"http::Dl-Limit</literal> che accetta valori interi in kilobyte al secondo. "
+"Il valore predefinito è 0 che disattiva il limite e cerca di usare tutta la "
+"banda disponibile. Notare che questa opzione implicitamente disabilita lo "
+"scaricamento da più server contemporaneamente."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."
+msgstr ""
+"L'impostazione <literal>Acquire::http::Pipeline-Depth</literal> può essere "
+"usata per abilitare le pipeline HTTP (RFC 2616, sezione 8.1.2.2) che possono "
+"essere utili, ad esempio, in connessioni con grande latenza. Specifica "
+"quante richieste sono inviate in una pipeline. APT cerca di rilevare al "
+"momento dell'esecuzione i server web e i proxy con comportamento non "
+"corretto e di aggirare il problema, ma se è noto che i propri non sono "
+"conformi alla specifica HTTP/1.1, l'uso delle pipeline può essere "
+"disabilitato impostando il valore a 0. In modo predefinito è abilitato con "
+"il valore 10."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+"<literal>Acquire::http::AllowRedirect</literal> specifica se APT segue o "
+"meno le ridirezioni che sono abilitate in modo predefinito."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+"<literal>Acquire::http::User-Agent</literal> può essere usata per impostare "
+"un User-Agent diverso per il metodo di scaricamento http, dato che alcuni "
+"proxy permettono l'accesso per i client solo se usano un identificativo "
+"conosciuto."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::SendAccept</literal> is enabled by default and sends "
+"a <literal>Accept: text/*</literal> header field to the server for requests "
+"without file extensions to prevent the server from attempting content "
+"negotiation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-http.1.xml
+#, no-wrap
+msgid ""
+"Acquire::http {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-http-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTP\";\n"
+"\tSendAccept \"false\";\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgid "&apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-https.1.xml
+msgid "APT transport for downloading via the HTTP Secure protocol (HTTPS)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the HTTP "
+"Secure protocol (HTTPS) also referred to as HTTP over TLS. It is available "
+"by default since apt 1.5 and was before that available in a <package>apt-"
+"transport-https</package> package. Note that a transport is never called "
+"directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"HTTP is by itself an unencrypted transport protocol (compare &apt-transport-"
+"http;), which, as indicated by the appended S is wrapped in an encrypted "
+"layer known as Transport Layer Security (TLS) which provides end-to-end "
+"encryption.  A sufficiently capable attacker can still observe the "
+"communication partners and deeper analyse of the encrypted communcation "
+"might still reveal important details.  An overview over available "
+"alternative transport methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"The HTTPS protocol is based on the HTTP protocol and as such this "
+"implementation has the same relation meaning that all options supported by "
+"&apt-transport-http; are also available via <literal>Acquire::https</"
+"literal> and will default to the same values specified for <literal>Acquire::"
+"http</literal>. This manpage will only document the options <emphasis>unique "
+"to https</emphasis>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Server credentials"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"By default all certificates trusted by the system (see <package>ca-"
+"certificates</package> package) are used for the verification of the server "
+"certificate. An alternative certificate authority (CA) can be configured "
+"with the <literal>Acquire::https::CAInfo</literal> option and its host-"
+"specific option <literal>Acquire::https::CAInfo::<replaceable>host</"
+"replaceable></literal>.  The option specifies a file is made of the "
+"concatenation of the CA certificates (in PEM format) creating the chain used "
+"for the verification of the path from the root (self signed one). If the "
+"remote server provides the whole chain during the exchange, the file need "
+"only contain the root certificate. Otherwise, the whole chain is required. "
+"If you need to support multiple authorities, the only way is to concatenate "
+"everything."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"A custom certificate revocation list (CRL) can be configured with the "
+"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
+"https::CRLFile::<replaceable>host</replaceable></literal> respectively.  "
+"Like the previous option a file in PEM format needs to be specified."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Disabling security"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"When authenticating the server, if the certificate verification fails for "
+"some reason (expired, revoked, man in the middle, …), the connection fails.  "
+"This is obviously what you want in all cases and what the default value "
+"(true)  of the option <literal>Acquire::https::Verify-Peer</literal> and its "
+"host-specific variant provides. If you know <emphasis>exactly</emphasis> "
+"what you are doing, setting this option to \"false\" allows you to skip peer "
+"certificate verification and make the exchange succeed. Again, this option "
+"is for debugging or testing purpose only as it removes all security provided "
+"by the use of HTTPS."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Similarly the option <literal>Acquire::https::Verify-Host</literal> and its "
+"host-specific variant can be used to deactivate a security feature: The "
+"certificate provided by the server includes the identity of the server which "
+"should match the DNS name used to access it. By default, as requested by RFC "
+"2818, the name of the mirror is checked against the identity found in the "
+"certificate. This default behavior is safe and should not be changed, but if "
+"you know that the server you are using has a DNS name which does not match "
+"the identity in its certificate, you can set the option to \"false\", which "
+"will prevent the comparison to be done."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Client authentication"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Beside the password based authentication available (see &apt-authconf;) "
+"HTTPS supports authentication based on client certificates as well via "
+"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
+"SSLKey</literal>. They respectively should be set to the filename of the "
+"X.509 client certificate and the associated (unencrypted) private key, both "
+"in PEM format.  In practice the use of the host-specific variants of both "
+"options is highly recommended."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-https.1.xml
+#, no-wrap
+msgid ""
+"Acquire::https {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-https-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTPS\";\n"
+"\tSendAccept \"false\";\n"
+"\n"
+"\tCAInfo \"/path/to/ca/certs.pem\";\n"
+"\tCRLFile \"/path/to/all/crl.pem\";\n"
+"\tVerify-Peer \"true\";\n"
+"\tVerify-Host::broken.example.org \"false\";\n"
+"\tSSLCert::example.org \"/path/to/client/cert.pem\";\n"
+"\tSSLKey::example.org \"/path/to/client/key.pem\"\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+#, fuzzy
+#| msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgid "&apt-transport-http; &apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-mirror.1.xml
+msgid "APT transport for more automated mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This APT transport isn't implementing a protocol to access local or remote "
+"repositories on its own, but acquires a mirrorlist and redirects all "
+"requests to the mirror(s) picked from this list access via other transports "
+"like &apt-transport-http;. The basic functionality is available since apt "
+"0.7.24, but was undocumented until apt 1.6 which contained a complete rework "
+"of the transport and its supported features. Note that a transport is never "
+"called directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If the acquisition of a file via a mirror fails the method ensures that "
+"automatically another possible mirror of the list is tried until either the "
+"file is retrieved or no mirror is left in the list handling transparently "
+"server downtimes and similar problems."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The security implications of the transport are based on the security "
+"considerations associated with the transport used to acquire the mirrorlist "
+"and the transports involved in accessing the chosen mirror(s) by the "
+"transport."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This transport has no configuration options at present. The mirror selection "
+"is based entirely on the mirrors offered in the mirrorlist and the files apt "
+"needs to acquire."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirrorlist format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A mirrorlist contains at least one line each specifying an URI for a "
+"mirror.  Empty lines and those starting with a hash key (<literal>#</"
+"literal>) are ignored.  An URI always starts with a URI scheme which defines "
+"the transport used for this mirror. If the URI e.g. starts with "
+"<literal>http:</literal> the responsible transport is &apt-transport-http; "
+"which might have specific requirements for the format of the remaining part "
+"of the URI."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"An URI can optionally be separated from metadata about the mirror by a tab.  "
+"Multiple datapoints in the provided metadata can itself be separated by "
+"spaces for tabs.  (This is an advanced feature only available with apt >= "
+"1.6. Earlier apt versions will fail to parse mirrorlists using this feature)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Since apt 1.6 the usage of compressed mirrorlists is also supported.  Note "
+"that the filename of the mirrorlist must specify the compression algorithm "
+"used, there is no auto-detection based on file content performed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirror selection by metadata"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As specified in the format a mirror can have additional metadata attached to "
+"prevent a mirror from being selected for acquiring a file not matching this "
+"metadata.  This way the mirrorlist can e.g. contain partial mirrors serving "
+"only certain architectures and apt will automatically choose a different "
+"mirror for files requiring an unlisted architecture. Supported are limits "
+"for the architecture (<literal>arch</literal>), codename of the release "
+"(<literal>codename</literal>), component of the repository the file is in "
+"(<literal>component</literal>), language the file applies to (<literal>lang</"
+"literal>), suite name of the release (<literal>suite</literal>) and type of "
+"the file (<literal>type</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Fallback order for mirrors"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If no priority is given via the metadata key <literal>priority</literal> for "
+"a mirror the order in which mirrors are contacted is random. If a certain "
+"set of mirrors should be tried first before any of another set is tried a "
+"priority can be explicitly set. The mirrors with the lowest number are tried "
+"first. Mirrors which have no explicit priority set default to the highest "
+"possible number and are therefore tried last. The choice between mirrors "
+"with the same priority is again random."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Allowed transports in a mirrorlist"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The availability and choice of transports in a mirrorlist is limited by how "
+"the apt client is accessing the mirrorlist. If a local transport like "
+"<literal>file</literal> or <literal>copy</literal> is used the mirrorlist "
+"can also include local sources while a mirrorlist accessed via "
+"<literal>http</literal> can not. Additionally, a mirrorlist can not contain "
+"a mirrorlist or other wrapping transports (like <package>apt-transport-tor</"
+"package>).  See the documentation of these transports on how to use them "
+"with the mirror method."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that apt versions before 1.6 do not support any other transport than "
+"<literal>http</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Basic example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A basic mirrorlist example supported by all apt versions with a mirror "
+"method (>= 0.7.24) in which the client will pick any of the three mirrors:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"http://ftp.de.debian.org/debian/\n"
+"http://ftp.us.debian.org/debian/\n"
+"http://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
+"txt</filename> on your machine it can be used like this in &sources-list; "
+"(since apt 1.6):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror+file:/etc/apt/mirrorlist.txt &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"All versions of the mirror method support a mirrorlist accessible via http, "
+"so assuming it is available at <literal>http://apt.example.org/mirror.lst</"
+"literal> the sources.list entry from above could be written instead as:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb mirror://apt.example.org/mirror.lst &debian-stable-codename; main\n"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that since apt 1.6 the use of <literal>mirror+http</literal> should be "
+"preferred over <literal>mirror</literal> for uniformity. The functionality "
+"is the same."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Example with metadata-enhanced mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As explained in the format definition apt versions before 1.6 do not support "
+"this and will fail parsing the mirrorlist. The example mirrorlist is "
+"proposefully complicated to show some aspects of the selection. The "
+"following setup is assumed: The first mirror is local mirror accessible via "
+"the file method, but potentially incomplete. The second mirror has a great "
+"connection, but is a partial mirror in sofar as it only contains files "
+"related to the architectures <literal>amd64</literal> and <literal>all</"
+"literal>. The remaining mirrors are average mirrors which should be "
+"contacted only if the earlier ones didn't work."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"file:/srv/local/debian/mirror/\tpriority:1 type:index\n"
+"http://partial.example.org/mirror/\tpriority:2 arch:amd64 arch:all type:deb\n"
+"http://ftp.us.debian.org/debian/\ttype:deb\n"
+"http://ftp.de.debian.org/debian/\ttype:deb\n"
+"https://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"In this setup with this mirrorlist the first mirror will be used to download "
+"all index files assuming the mirrorlist itself is accessed via a local "
+"transport like <literal>file</literal>. If it isn't, the mirror is otherwise "
+"inaccessible or does not contain the requested file another mirror will be "
+"used to acquire the file, which one depending on the type of the file: An "
+"index file will be served by the last mirror in the list, while a package of "
+"architecture <literal>amd64</literal> is served by the second and those of e."
+"g. architecture <literal>i386</literal> by one of the last three."
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
 #: guide.dbk offline.dbk
 msgid "en"
@@ -11388,6 +12137,80 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
+#~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
+#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
+#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
+#~ "the above settings is specified, <envar>http_proxy</envar> environment "
+#~ "variable will be used."
+#~ msgstr ""
+#~ "<literal>http::Proxy</literal> imposta il proxy predefinito da usare per "
+#~ "gli URI HTTP. È nella forma standard <literal>http://[[utente][:"
+#~ "password]@]host[:porta]/</literal>. Possono anche essere specificati "
+#~ "proxy per ciascun host usando la forma <literal>http::Proxy::&lt;host&gt;"
+#~ "</literal> con la speciale parola chiave <literal>DIRECT</literal> che "
+#~ "significa di non usare un proxy. Se non viene specificata alcuna delle "
+#~ "impostazioni precedenti, viene usata la variabile d'ambiente "
+#~ "<envar>http_proxy</envar>."
+
+#~ msgid ""
+#~ "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+#~ "<literal>proxy</literal> options work for HTTPS URIs in the same way as "
+#~ "for the <literal>http</literal> method, and default to the same values if "
+#~ "they are not explicitly set. The <literal>Pipeline-Depth</literal> option "
+#~ "is not yet supported."
+#~ msgstr ""
+#~ "Le opzioni<literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> e "
+#~ "<literal>proxy</literal> funzionano per gli URI HTTPS nello stesso modo "
+#~ "che per il metodo <literal>http</literal> e assumono in modo predefinito "
+#~ "lo stesso valore, a meno di non essere impostate in modo esplicito. "
+#~ "L'opzione <literal>Pipeline-Depth</literal> non è ancora supportata."
+
+#~ msgid ""
+#~ "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#~ "boolean suboption determines whether or not the server's host certificate "
+#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
+#~ "Verify-Peer</literal> is the corresponding per-host option.  "
+#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
+#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
+#~ "Verify-Host</literal> is the corresponding per-host option.  "
+#~ "<literal>SslCert</literal> determines what certificate to use for client "
+#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
+#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
+#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
+#~ "SslKey</literal> is the corresponding per-host option.  "
+#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
+#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
+#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "literal> is the corresponding per-host option."
+#~ msgstr ""
+#~ "La sotto-opzione <literal>CaInfo</literal> specifica la posizione del "
+#~ "file che contiene le informazioni sui certificati fidati; <literal>&lt;"
+#~ "host&gt;::CaInfo</literal> è la corrispondente opzione specifica per "
+#~ "ciascun host. La sotto-opzione booleana <literal>Verify-Peer</literal> "
+#~ "determina se il certificato host del server deve o non deve essere "
+#~ "verificato usando i certificati fidati; <literal>&lt;host&gt;::Verify-"
+#~ "Peer</literal> è la corrispondente opzione specifica per ciascun host. La "
+#~ "sotto-opzione booleana <literal>Verify-Host</literal> determina se il "
+#~ "nome host del server deve o non deve essere verificato; <literal>&lt;"
+#~ "host&gt;::Verify-Host</literal> è la corrispondente opzione specifica per "
+#~ "ciascun host. <literal>SslCert</literal> determina quale certificato "
+#~ "usare per l'autenticazione client; <literal>&lt;host&gt;::SslCert</"
+#~ "literal> è la corrispondente opzione specifica per ciascun host. "
+#~ "<literal>SslKey</literal> determina quale chiave privata usare per "
+#~ "l'autenticazione client; <literal>&lt;host&gt;::SslKey</literal> è la "
+#~ "corrispondente opzione specifica per ciascun host. "
+#~ "<literal>SslForceVersion</literal> scavalca la versione predefinita SSL "
+#~ "da usare e può contenere la stringa «<literal>TLSv1</literal>» o "
+#~ "«<literal>SSLv3</literal>»;  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "literal> è la corrispondente opzione specifica per ciascun host."
+
+#~ 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</"
@@ -11597,9 +12420,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Elenca le impronte digitali delle chiavi fidate."
 
-#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
 #~ msgid "Local trust database of archive keys."
 #~ msgstr "Database locale di fiducia delle chiavi archiviate."
 
@@ -12824,9 +13644,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ msgid "xvcg <replaceable>pkg(s)</replaceable>"
 #~ msgstr "xvcg <replaceable>pacchetti</replaceable>"
 
-#~ msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-#~ msgstr "policy <replaceable>[ pacchetti ]</replaceable>"
-
 #~ msgid "madison <replaceable>/[ pkg(s) ]</replaceable>"
 #~ msgstr "madison <replaceable>/[ pacchetti ]</replaceable>"
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 822587dcc..842cd7093 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-08-24 23:21+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -670,7 +670,9 @@ msgstr "8"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "APT"
 msgstr "APT"
 
@@ -683,7 +685,9 @@ msgstr "コマンドラインインターフェイス"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Description"
 msgstr "説明"
 
@@ -945,7 +949,8 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
 msgid "See Also"
 msgstr "関連項目"
 
@@ -2005,7 +2010,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
-#: apt_preferences.5.xml
+#: apt_preferences.5.xml apt_auth.conf.5.xml
 msgid "Files"
 msgstr "ファイル"
 
@@ -2872,7 +2877,8 @@ msgstr ""
 "有効です。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
 msgid "Options"
 msgstr "オプション"
 
@@ -3795,7 +3801,7 @@ msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt_auth.conf.5.xml
 msgid "5"
 msgstr "5"
 
@@ -4525,184 +4531,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
-"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>http_proxy</envar> environment variable will "
-"be used."
+"The options in these scopes configure APTs acquire transports for the "
+"protocols HTTP and HTTPS and are documented in the &apt-transport-http; and "
+"&apt-transport-https; manpages respectively."
 msgstr ""
-"<literal>http::Proxy</literal> には、HTTP URI で使用するデフォルトプロキシを"
-"設定します。<literal>http://[[user][:pass]@]host[:port]/</literal> という標準"
-"形で表します。ホストごとのプロキシを、<literal>http::Proxy::&lt;host&gt;</"
-"literal> という形で指定できます。この時、プロキシを使用しないという意味の特殊"
-"キーワード <literal>DIRECT</literal> も使用できます。上記の設定をなにも指定し"
-"ないと、環境変数 <envar>http_proxy</envar> を使用します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
-"response under any circumstances.  <literal>Max-Age</literal> sets the "
-"allowed maximum age (in seconds) of an index file in the cache of the "
-"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
-"store the requested archive files in its cache, which can be used to prevent "
-"the proxy from polluting its cache with (big) .deb files."
-msgstr ""
-"HTTP/1.1 準拠のプロキシキャッシュの制御について 3 種類の設定があります。"
-"<literal>No-Cache</literal> はプロキシに対して、いかなる時もキャッシュを使用"
-"しないと伝えます。<literal>Max-Age</literal> は、プロキシのキャッシュにあるイ"
-"ンデックスファイルの最大利用期間 (秒) を設定します。<literal>No-Store</"
-"literal> は、リクエストしたアーカイブファイルを、プロキシがキャッシュに格納し"
-"ないように指定します。これにより (大きな) .deb ファイルでプロキシのキャッシュ"
-"が汚れるのを防げます。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"<literal>timeout</literal> オプションは、この方法でのタイムアウトまでの時間を"
-"設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま"
-"す。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and workaround misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
-"It is enabled by default with the value 10."
-msgstr ""
-"<literal>Acquire::http::Pipeline-Depth</literal> の設定は、例えばレイテンシの"
-"高い接続で有益な HTTP パイプライン (RFC 2616 8.1.2.2 節) を有効にするのに使用"
-"できます。APT は、実行時の Web サーバやプロキシの不作法な振る舞いの検出と回避"
-"策を試します。しかし、HTTP/1.1 仕様に準拠していないことがわかっている場合は、"
-"値を 0 に設定することでパイプラインを無効にすることができます。これは、デフォ"
-"ルトで値 10 で有効になっています。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
-"follow redirects, which is enabled by default."
-msgstr ""
-"<literal>Acquire::http::AllowRedirect</literal> は APT がリダイレクトをたどる"
-"かどうかを制御します。デフォルトでは有効です。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobytes per second. The default "
-"value is 0 which deactivates the limit and tries to use all available "
-"bandwidth.  Note that this option implicitly disables downloading from "
-"multiple servers at the same time."
-msgstr ""
-"使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> に秒あ"
-"たりのキロバイトで整数値を与えます。デフォルト値は 0 で、制限を解除し、使用で"
-"きる帯域をすべて使おうとします。このオプションは暗黙的に、同時に複数のサーバ"
-"からダウンロードしなくなることに注意してください。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
-"User-Agent for the http download method as some proxies allow access for "
-"clients only if the client uses a known identifier."
-msgstr ""
-"クライアントが既知の識別子を使用する場合にのみ、プロキシがアクセスを許可する"
-"場合、<literal>Acquire::http::User-Agent</literal> を使用して、http でダウン"
-"ロードするための、異なる User-Agent を設定できます。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
-"an external command to discover the http proxy to use. The first and only "
-"parameter is an URI denoting the host to be contacted to allow for host-"
-"specific configuration. APT expects the command to output the proxy on "
-"stdout as a single line in the style <literal>http://proxy:port/</literal> "
-"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
-"indicates that the generic proxy settings should be used.  Note that auto-"
-"detection will not be used for a host if a host-specific proxy configuration "
-"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
-"example implementation that uses avahi.  This option takes precedence over "
-"the legacy option name <literal>ProxyAutoDetect</literal>."
-msgstr ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> を使って利用する http プ"
-"ロキシを検出するための外部コマンドを指定できます。最初で唯一のパラメータはホ"
-"スト固有の設定を可能にするために通信する先のホストを示すURIです。APT はコマン"
-"ドが標準出力に1行の <literal>http://proxy:port/</literal> 形式でプロキシを出"
-"力、あるいはプロキシを何も使わない場合には <literal>DIRECT</literal> という語"
-"を出力することを期待しています。出力しない場合は一般のプロキシ設定を利用する"
-"ことになります。<literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal> によってホスト固有のプロキシ設定がセットされているとそ"
-"のホストについては自動検出が行われないことに注意してください。avahi を利用す"
-"る実装例については &squid-deb-proxy-client; パッケージを見てください。このオ"
-"プションは古い <literal>ProxyAutoDetect</literal> よりも優先されます。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
-"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
-"the <literal>http</literal> method, and default to the same values if they "
-"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
-"yet supported."
-msgstr ""
-"<literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal>, "
-"<literal>proxy</literal> の各オプションは、HTTPS URI でも <literal>http</"
-"literal> メソッドと同様に動作します。また、明示的に値を指定しない場合のデフォ"
-"ルト値も同様です。<literal>Pipeline-Depth</literal> オプションはまだサポート"
-"していません。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
-"corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
-"literal> is the corresponding per-host option.  <literal>Verify-Host</"
-"literal> boolean suboption determines whether or not the server's hostname "
-"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
-"corresponding per-host option.  <literal>SslCert</literal> determines what "
-"certificate to use for client authentication. <literal>&lt;host&gt;::"
-"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
-"literal> determines what private key to use for client authentication. "
-"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
-"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
-"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> is the corresponding per-host option."
-msgstr ""
-"<literal>CaInfo</literal> サブオプションは、信頼済み証明書情報の保持場所を指"
-"定します。<literal>&lt;host&gt;::CaInfo</literal> は、同様のホストごとのオプ"
-"ションです。<literal>Verify-Peer</literal> 真偽値サブオプションは、信頼済み証"
-"明書に対してサーバのホスト証明書を、検証するかどうかを決定します。"
-"<literal>&lt;host&gt;::Verify-Peer</literal> は、同様のホストごとのオプション"
-"です。<literal>Verify-Host</literal> 真偽値サブオプションは、サーバのホスト名"
-"を検証するかどうかを決定します。<literal>&lt;host&gt;::Verify-Host</literal> "
-"は、同様のホストごとのオプションです。<literal>SslCert</literal> は、クライア"
-"ント認証に使用する証明書を決定します。<literal>&lt;host&gt;::SslCert</"
-"literal> は、同様のホストごとのオプションです。<literal>SslKey</literal> は、"
-"クライアント認証に使用する秘密鍵を決定します。<literal>&lt;host&gt;::SslKey</"
-"literal> は、同様のホストごとのオプションです。<literal>SslForceVersion</"
-"literal> は、デフォルトで使用する SSL のバージョンを上書きしま"
-"す。'<literal>TLSv1</literal>' か '<literal>SSLv3</literal>' という文字列を指"
-"定できます。<literal>&lt;host&gt;::SslForceVersion</literal> は、同様のホスト"
-"ごとのオプションです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4739,6 +4571,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"The option <literal>timeout</literal> sets the timeout timer used by the "
+"method; this value applies to the connection as well as the data timeout."
+msgstr ""
+"<literal>timeout</literal> オプションは、この方法でのタイムアウトまでの時間を"
+"設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま"
+"す。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 "some situations require that passive mode be disabled and port mode FTP used "
@@ -5892,6 +5734,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Examples"
 msgstr "サンプル"
 
@@ -7377,6 +7221,25 @@ msgstr "deb822 スタイル形式"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "Files in this format have the extension <filename>.sources</filename>.  "
+#| "The format is similar in syntax to other files used by Debian and its "
+#| "derivatives, such as the metadata files that apt will download from the "
+#| "configured sources or the <filename>debian/control</filename> file in a "
+#| "Debian source package.  Individual entries are separated by an empty "
+#| "line; additional empty lines are ignored, and a <literal>#</literal> "
+#| "character at the start of the line marks the entire line as a comment. An "
+#| "entry can hence be disabled by commenting out each line belonging to the "
+#| "stanza, but it is usually easier to add the field \"Enabled: no\" to the "
+#| "stanza to disable the entry. Removing the field or setting it to yes "
+#| "reenables it.  Options have the same syntax as every other field: A "
+#| "fieldname separated by a colon (<literal>:</literal>) and optionally "
+#| "spaces from its value(s).  Note especially that multiple values are "
+#| "separated by spaces, not by commas as in the one-line format. Multivalue "
+#| "fields like <literal>Architectures</literal> also have "
+#| "<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+#| "literal> to modify the default value rather than replacing it."
 msgid ""
 "Files in this format have the extension <filename>.sources</filename>.  The "
 "format is similar in syntax to other files used by Debian and its "
@@ -7390,10 +7253,11 @@ msgid ""
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
-"especially that multiple values are separated by spaces, not by commas as in "
-"the one-line format. Multivalue fields like <literal>Architectures</literal> "
-"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
-"Remove</literal> to modify the default value rather than replacing it."
+"especially that multiple values are separated by whitespaces (like spaces, "
+"tabs and newlines), not by commas as in the one-line format.  Multivalue "
+"fields like <literal>Architectures</literal> also have "
+"<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+"literal> to modify the default value rather than replacing it."
 msgstr ""
 "この形式のファイルは、<filename>.sources</filename> 拡張子を持っています。形"
 "式は、設定された取得元または Debian ソースパッケージの debian/control ファイ"
@@ -7881,19 +7745,23 @@ msgstr "URI の仕様"
 msgid "The currently recognized URI types are:"
 msgstr "現在認識できる URI タイプは以下のとおりです:"
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-http;)"
+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;."
+"commonly used method. 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>
@@ -7907,6 +7775,11 @@ msgid ""
 "chosen transport method. See &apt-secure; for details."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-https;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
@@ -8341,6 +8214,8 @@ msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "1"
 msgstr "1"
 
@@ -9391,6 +9266,882 @@ msgstr ""
 "<command>apt-ftparchive</command> は正常終了時に 0 を返します。エラー時には十"
 "進の 100 を返します。"
 
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Configuration file for APT"
+msgid "Login configuration file for APT sources and proxies"
+msgstr "APT の設定ファイル"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"APT configuration files like &sources-list; or &apt-conf; need to be "
+"accessible for everyone using apt tools on the system to have access to all "
+"package-related information like the available packages in a repository. "
+"Login information needed to connect to a proxy or to download data from a "
+"repository on the other hand shouldn't always be accessible by everyone and "
+"can hence not be placed in a file with world-readable file permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used "
+"to store login information in a netrc-like format with restrictive file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "netrc-like format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The format defined here is similar to the format of the <filename>~/.netrc</"
+"filename> file used by <citerefentry><refentrytitle><command>ftp</command></"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs "
+"interacting with servers.  It is a simple token-based format with the "
+"following tokens being recognized; Unknown tokens will be ignored. Tokens "
+"may be separated by spaces, tabs or newlines."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid ""
+"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Entries are looked up by searching for the <emphasis><literal>machine</"
+"literal></emphasis> token matching the hostname of the URI apt needs login "
+"information for. Extending the netrc-format a portnumber can be specified. "
+"If no port is given the token matches for all ports.  Similar the path is "
+"optional and only needed and useful if multiple repositories with different "
+"login information reside on the same server. A machine token with a path "
+"matches if the path in the URI starts with the path given in the token.  "
+"Once a match is made, the subsequent tokens are processed, stopping when the "
+"end of file is reached or another <emphasis><literal>machine</literal></"
+"emphasis> token is encountered."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>login</literal> <replaceable>name</replaceable>"
+msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The username to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>password</literal> <replaceable>string</replaceable>"
+msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The password to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Examples"
+msgid "Example"
+msgstr "サンプル"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org\n"
+"login apt\n"
+"password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "machine example.org login apt password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org/deb login apt password debian\n"
+"machine example.org/debian login apt password debian\n"
+"machine example.org/debian/ login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org:80 login apt password debian\n"
+"machine example.org/deb/ login apt password debian\n"
+"machine example.org/ubuntu login apt password debian\n"
+"machine example.orga login apt password debian\n"
+"machine example.net login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Supplying login information for a user named <literal>apt</literal> with the "
+"password <literal>debian</literal> for the &sources-list; entry <placeholder "
+"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
+"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
+"the following in the auth.conf file could be used: <placeholder type="
+"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
+"specific all of these lines will also apply to the example entry: "
+"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
+"the following lines apply: <placeholder type=\"literallayout\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Notes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Basic support for this feature is present since version 0.7.25, but was "
+"undocumented for years. The documentation was added in version 1.5 changing "
+"also the implementation slightly. For maximum backward compatibility you "
+"should avoid multiple <literal>machine</literal> tokens with the same "
+"hostname, but if you need multiple they should all have a path specified in "
+"the <literal>machine</literal> token."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid "<filename>/etc/apt/auth.conf</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Show full versions for upgraded and installed packages.  Configuration "
+#| "Item: <literal>APT::Get::Show-Versions</literal>."
+msgid ""
+"Login information for APT sources and proxies in a netrc-like format.  "
+"Configuration Item: <literal>Dir::Etc::netrc</literal>."
+msgstr ""
+"更新・インストールするパッケージのバージョンをすべて表示します。設定項目: "
+"<literal>APT::Get::Show-Versions</literal>"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "&apt-conf;, &sources-list;, &apt-get;"
+msgid "&apt-conf; &sources-list;"
+msgstr "&apt-conf;, &sources-list;, &apt-get;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-http.1.xml
+msgid ""
+"APT transport for downloading via the Hypertext Transfer Protocol (HTTP)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the Hypertext "
+"Transfer Protocol (HTTP). It is available by default and probably the most "
+"used of all transports. Note that a transport is never called directly by a "
+"user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"HTTP is an unencrypted transport protocol meaning that the whole "
+"communication with the remote server (or proxy) can be observed by a "
+"sufficiently capable attacker referred to commonly as man in the middle "
+"(MITM).  Such an attacker can <emphasis>not</emphasis> modify the "
+"communication to compromise the security of your system through as APTs data "
+"security model is independent of the chosen transport method. This is "
+"explained in detail in &apt-secure;. An overview over available transport "
+"methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Various options are available to modify its behaviour which can be set in an "
+"&apt-conf; file ranging from proxy configuration to workaround for specific "
+"server insufficiencies."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Proxy Configuration"
+msgstr "ユーザ設定"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The environment variable <envar>http_proxy</envar> is supported for system "
+"wide configuration.  Proxies specific to apt can be configured via the "
+"option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
+"used only for certain hosts can be specified via <literal>Acquire::http::"
+"Proxy::<replaceable>host</replaceable></literal>. Even more finegrained "
+"control can be achieved via proxy autodetection detailed further below.  All "
+"these options use the URI format <literal><replaceable>scheme</"
+"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
+"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
+"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
+"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
+"<literal>https</literal>.  Authentification details can be supplied via &apt-"
+"authconf; instead of including it in the URI directly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The various APT configuration options support the special value "
+"<literal>DIRECT</literal> meaning that no proxy should be used. The "
+"environment variable <envar>no_proxy</envar> with the same propose is also "
+"supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches.  <literal>No-Cache</literal> tells the proxy not to use its "
+#| "cached response under any circumstances.  <literal>Max-Age</literal> sets "
+#| "the allowed maximum age (in seconds) of an index file in the cache of the "
+#| "proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+#| "store the requested archive files in its cache, which can be used to "
+#| "prevent the proxy from polluting its cache with (big) .deb files."
+msgid ""
+"Further more there are three settings provided for cache control with "
+"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
+"tells the proxy not to use its cached response under any circumstances.  "
+"<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
+"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
+"http::No-Store</literal> specifies that the proxy should not store the "
+"requested archive files in its cache, which can be used to prevent the proxy "
+"from polluting its cache with (big) .deb files."
+msgstr ""
+"HTTP/1.1 準拠のプロキシキャッシュの制御について 3 種類の設定があります。"
+"<literal>No-Cache</literal> はプロキシに対して、いかなる時もキャッシュを使用"
+"しないと伝えます。<literal>Max-Age</literal> は、プロキシのキャッシュにあるイ"
+"ンデックスファイルの最大利用期間 (秒) を設定します。<literal>No-Store</"
+"literal> は、リクエストしたアーカイブファイルを、プロキシがキャッシュに格納し"
+"ないように指定します。これにより (大きな) .deb ファイルでプロキシのキャッシュ"
+"が汚れるのを防げます。"
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Automatic Proxy Configuration"
+msgstr "ユーザ設定"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to "
+#| "specify an external command to discover the http proxy to use. The first "
+#| "and only parameter is an URI denoting the host to be contacted to allow "
+#| "for host-specific configuration. APT expects the command to output the "
+#| "proxy on stdout as a single line in the style <literal>http://proxy:port/"
+#| "</literal> or the word <literal>DIRECT</literal> if no proxy should be "
+#| "used. No output indicates that the generic proxy settings should be "
+#| "used.  Note that auto-detection will not be used for a host if a host-"
+#| "specific proxy configuration is already set via <literal>Acquire::http::"
+#| "Proxy::<replaceable>HOST</replaceable></literal>.  See the &squid-deb-"
+#| "proxy-client; package for an example implementation that uses avahi.  "
+#| "This option takes precedence over the legacy option name "
+#| "<literal>ProxyAutoDetect</literal>."
+msgid ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the previously specified URI format or the word "
+"<literal>DIRECT</literal> if no proxy should be used. No output indicates "
+"that the generic proxy settings should be used."
+msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> を使って利用する http プ"
+"ロキシを検出するための外部コマンドを指定できます。最初で唯一のパラメータはホ"
+"スト固有の設定を可能にするために通信する先のホストを示すURIです。APT はコマン"
+"ドが標準出力に1行の <literal>http://proxy:port/</literal> 形式でプロキシを出"
+"力、あるいはプロキシを何も使わない場合には <literal>DIRECT</literal> という語"
+"を出力することを期待しています。出力しない場合は一般のプロキシ設定を利用する"
+"ことになります。<literal>Acquire::http::Proxy::<replaceable>HOST</"
+"replaceable></literal> によってホスト固有のプロキシ設定がセットされているとそ"
+"のホストについては自動検出が行われないことに注意してください。avahi を利用す"
+"る実装例については &squid-deb-proxy-client; パッケージを見てください。このオ"
+"プションは古い <literal>ProxyAutoDetect</literal> よりも優先されます。"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Note that auto-detection will not be used for a host if a host-specific "
+"proxy configuration is already set via <literal>Acquire::http::Proxy::"
+"<replaceable>host</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"See the &squid-deb-proxy-client; and &auto-apt-proxy; packages for example "
+"implementations."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This option takes precedence over the legacy option name <literal>Acquire::"
+"http::ProxyAutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Connection Configuration"
+msgstr "ユーザ設定"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this value applies to the connection as well as the data timeout."
+msgid ""
+"The option <literal>Acquire::http::Timeout</literal> sets the timeout timer "
+"used by the method; this value applies to the connection as well as the data "
+"timeout."
+msgstr ""
+"<literal>timeout</literal> オプションは、この方法でのタイムアウトまでの時間を"
+"設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま"
+"す。"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes per second. The "
+#| "default value is 0 which deactivates the limit and tries to use all "
+#| "available bandwidth.  Note that this option implicitly disables "
+#| "downloading from multiple servers at the same time."
+msgid ""
+"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+"literal> which accepts integer values in kilobytes per second. The default "
+"value is 0 which deactivates the limit and tries to use all available "
+"bandwidth. Note that this option implicitly disables downloading from "
+"multiple servers at the same time."
+msgstr ""
+"使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> に秒あ"
+"たりのキロバイトで整数値を与えます。デフォルト値は 0 で、制限を解除し、使用で"
+"きる帯域をすべて使おうとします。このオプションは暗黙的に、同時に複数のサーバ"
+"からダウンロードしなくなることに注意してください。"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."
+msgstr ""
+"<literal>Acquire::http::Pipeline-Depth</literal> の設定は、例えばレイテンシの"
+"高い接続で有益な HTTP パイプライン (RFC 2616 8.1.2.2 節) を有効にするのに使用"
+"できます。APT は、実行時の Web サーバやプロキシの不作法な振る舞いの検出と回避"
+"策を試します。しかし、HTTP/1.1 仕様に準拠していないことがわかっている場合は、"
+"値を 0 に設定することでパイプラインを無効にすることができます。これは、デフォ"
+"ルトで値 10 で有効になっています。"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+"<literal>Acquire::http::AllowRedirect</literal> は APT がリダイレクトをたどる"
+"かどうかを制御します。デフォルトでは有効です。"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+"クライアントが既知の識別子を使用する場合にのみ、プロキシがアクセスを許可する"
+"場合、<literal>Acquire::http::User-Agent</literal> を使用して、http でダウン"
+"ロードするための、異なる User-Agent を設定できます。"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::SendAccept</literal> is enabled by default and sends "
+"a <literal>Accept: text/*</literal> header field to the server for requests "
+"without file extensions to prevent the server from attempting content "
+"negotiation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-http.1.xml
+#, no-wrap
+msgid ""
+"Acquire::http {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-http-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTP\";\n"
+"\tSendAccept \"false\";\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgid "&apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-https.1.xml
+msgid "APT transport for downloading via the HTTP Secure protocol (HTTPS)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the HTTP "
+"Secure protocol (HTTPS) also referred to as HTTP over TLS. It is available "
+"by default since apt 1.5 and was before that available in a <package>apt-"
+"transport-https</package> package. Note that a transport is never called "
+"directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"HTTP is by itself an unencrypted transport protocol (compare &apt-transport-"
+"http;), which, as indicated by the appended S is wrapped in an encrypted "
+"layer known as Transport Layer Security (TLS) which provides end-to-end "
+"encryption.  A sufficiently capable attacker can still observe the "
+"communication partners and deeper analyse of the encrypted communcation "
+"might still reveal important details.  An overview over available "
+"alternative transport methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"The HTTPS protocol is based on the HTTP protocol and as such this "
+"implementation has the same relation meaning that all options supported by "
+"&apt-transport-http; are also available via <literal>Acquire::https</"
+"literal> and will default to the same values specified for <literal>Acquire::"
+"http</literal>. This manpage will only document the options <emphasis>unique "
+"to https</emphasis>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Server credentials"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"By default all certificates trusted by the system (see <package>ca-"
+"certificates</package> package) are used for the verification of the server "
+"certificate. An alternative certificate authority (CA) can be configured "
+"with the <literal>Acquire::https::CAInfo</literal> option and its host-"
+"specific option <literal>Acquire::https::CAInfo::<replaceable>host</"
+"replaceable></literal>.  The option specifies a file is made of the "
+"concatenation of the CA certificates (in PEM format) creating the chain used "
+"for the verification of the path from the root (self signed one). If the "
+"remote server provides the whole chain during the exchange, the file need "
+"only contain the root certificate. Otherwise, the whole chain is required. "
+"If you need to support multiple authorities, the only way is to concatenate "
+"everything."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"A custom certificate revocation list (CRL) can be configured with the "
+"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
+"https::CRLFile::<replaceable>host</replaceable></literal> respectively.  "
+"Like the previous option a file in PEM format needs to be specified."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Disabling security"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"When authenticating the server, if the certificate verification fails for "
+"some reason (expired, revoked, man in the middle, …), the connection fails.  "
+"This is obviously what you want in all cases and what the default value "
+"(true)  of the option <literal>Acquire::https::Verify-Peer</literal> and its "
+"host-specific variant provides. If you know <emphasis>exactly</emphasis> "
+"what you are doing, setting this option to \"false\" allows you to skip peer "
+"certificate verification and make the exchange succeed. Again, this option "
+"is for debugging or testing purpose only as it removes all security provided "
+"by the use of HTTPS."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Similarly the option <literal>Acquire::https::Verify-Host</literal> and its "
+"host-specific variant can be used to deactivate a security feature: The "
+"certificate provided by the server includes the identity of the server which "
+"should match the DNS name used to access it. By default, as requested by RFC "
+"2818, the name of the mirror is checked against the identity found in the "
+"certificate. This default behavior is safe and should not be changed, but if "
+"you know that the server you are using has a DNS name which does not match "
+"the identity in its certificate, you can set the option to \"false\", which "
+"will prevent the comparison to be done."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Client authentication"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Beside the password based authentication available (see &apt-authconf;) "
+"HTTPS supports authentication based on client certificates as well via "
+"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
+"SSLKey</literal>. They respectively should be set to the filename of the "
+"X.509 client certificate and the associated (unencrypted) private key, both "
+"in PEM format.  In practice the use of the host-specific variants of both "
+"options is highly recommended."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-https.1.xml
+#, no-wrap
+msgid ""
+"Acquire::https {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-https-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTPS\";\n"
+"\tSendAccept \"false\";\n"
+"\n"
+"\tCAInfo \"/path/to/ca/certs.pem\";\n"
+"\tCRLFile \"/path/to/all/crl.pem\";\n"
+"\tVerify-Peer \"true\";\n"
+"\tVerify-Host::broken.example.org \"false\";\n"
+"\tSSLCert::example.org \"/path/to/client/cert.pem\";\n"
+"\tSSLKey::example.org \"/path/to/client/key.pem\"\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+#, fuzzy
+#| msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgid "&apt-transport-http; &apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-mirror.1.xml
+msgid "APT transport for more automated mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This APT transport isn't implementing a protocol to access local or remote "
+"repositories on its own, but acquires a mirrorlist and redirects all "
+"requests to the mirror(s) picked from this list access via other transports "
+"like &apt-transport-http;. The basic functionality is available since apt "
+"0.7.24, but was undocumented until apt 1.6 which contained a complete rework "
+"of the transport and its supported features. Note that a transport is never "
+"called directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If the acquisition of a file via a mirror fails the method ensures that "
+"automatically another possible mirror of the list is tried until either the "
+"file is retrieved or no mirror is left in the list handling transparently "
+"server downtimes and similar problems."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The security implications of the transport are based on the security "
+"considerations associated with the transport used to acquire the mirrorlist "
+"and the transports involved in accessing the chosen mirror(s) by the "
+"transport."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This transport has no configuration options at present. The mirror selection "
+"is based entirely on the mirrors offered in the mirrorlist and the files apt "
+"needs to acquire."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirrorlist format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A mirrorlist contains at least one line each specifying an URI for a "
+"mirror.  Empty lines and those starting with a hash key (<literal>#</"
+"literal>) are ignored.  An URI always starts with a URI scheme which defines "
+"the transport used for this mirror. If the URI e.g. starts with "
+"<literal>http:</literal> the responsible transport is &apt-transport-http; "
+"which might have specific requirements for the format of the remaining part "
+"of the URI."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"An URI can optionally be separated from metadata about the mirror by a tab.  "
+"Multiple datapoints in the provided metadata can itself be separated by "
+"spaces for tabs.  (This is an advanced feature only available with apt >= "
+"1.6. Earlier apt versions will fail to parse mirrorlists using this feature)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Since apt 1.6 the usage of compressed mirrorlists is also supported.  Note "
+"that the filename of the mirrorlist must specify the compression algorithm "
+"used, there is no auto-detection based on file content performed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirror selection by metadata"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As specified in the format a mirror can have additional metadata attached to "
+"prevent a mirror from being selected for acquiring a file not matching this "
+"metadata.  This way the mirrorlist can e.g. contain partial mirrors serving "
+"only certain architectures and apt will automatically choose a different "
+"mirror for files requiring an unlisted architecture. Supported are limits "
+"for the architecture (<literal>arch</literal>), codename of the release "
+"(<literal>codename</literal>), component of the repository the file is in "
+"(<literal>component</literal>), language the file applies to (<literal>lang</"
+"literal>), suite name of the release (<literal>suite</literal>) and type of "
+"the file (<literal>type</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Fallback order for mirrors"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If no priority is given via the metadata key <literal>priority</literal> for "
+"a mirror the order in which mirrors are contacted is random. If a certain "
+"set of mirrors should be tried first before any of another set is tried a "
+"priority can be explicitly set. The mirrors with the lowest number are tried "
+"first. Mirrors which have no explicit priority set default to the highest "
+"possible number and are therefore tried last. The choice between mirrors "
+"with the same priority is again random."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Allowed transports in a mirrorlist"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The availability and choice of transports in a mirrorlist is limited by how "
+"the apt client is accessing the mirrorlist. If a local transport like "
+"<literal>file</literal> or <literal>copy</literal> is used the mirrorlist "
+"can also include local sources while a mirrorlist accessed via "
+"<literal>http</literal> can not. Additionally, a mirrorlist can not contain "
+"a mirrorlist or other wrapping transports (like <package>apt-transport-tor</"
+"package>).  See the documentation of these transports on how to use them "
+"with the mirror method."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that apt versions before 1.6 do not support any other transport than "
+"<literal>http</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Basic example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A basic mirrorlist example supported by all apt versions with a mirror "
+"method (>= 0.7.24) in which the client will pick any of the three mirrors:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"http://ftp.de.debian.org/debian/\n"
+"http://ftp.us.debian.org/debian/\n"
+"http://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
+"txt</filename> on your machine it can be used like this in &sources-list; "
+"(since apt 1.6):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror+file:/etc/apt/mirrorlist.txt &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"All versions of the mirror method support a mirrorlist accessible via http, "
+"so assuming it is available at <literal>http://apt.example.org/mirror.lst</"
+"literal> the sources.list entry from above could be written instead as:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb mirror://apt.example.org/mirror.lst &debian-stable-codename; main\n"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that since apt 1.6 the use of <literal>mirror+http</literal> should be "
+"preferred over <literal>mirror</literal> for uniformity. The functionality "
+"is the same."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Example with metadata-enhanced mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As explained in the format definition apt versions before 1.6 do not support "
+"this and will fail parsing the mirrorlist. The example mirrorlist is "
+"proposefully complicated to show some aspects of the selection. The "
+"following setup is assumed: The first mirror is local mirror accessible via "
+"the file method, but potentially incomplete. The second mirror has a great "
+"connection, but is a partial mirror in sofar as it only contains files "
+"related to the architectures <literal>amd64</literal> and <literal>all</"
+"literal>. The remaining mirrors are average mirrors which should be "
+"contacted only if the earlier ones didn't work."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"file:/srv/local/debian/mirror/\tpriority:1 type:index\n"
+"http://partial.example.org/mirror/\tpriority:2 arch:amd64 arch:all type:deb\n"
+"http://ftp.us.debian.org/debian/\ttype:deb\n"
+"http://ftp.de.debian.org/debian/\ttype:deb\n"
+"https://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"In this setup with this mirrorlist the first mirror will be used to download "
+"all index files assuming the mirrorlist itself is accessed via a local "
+"transport like <literal>file</literal>. If it isn't, the mirror is otherwise "
+"inaccessible or does not contain the requested file another mirror will be "
+"used to acquire the file, which one depending on the type of the file: An "
+"index file will be served by the last mirror in the list, while a package of "
+"architecture <literal>amd64</literal> is served by the second and those of e."
+"g. architecture <literal>i386</literal> by one of the last three."
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
 #: guide.dbk offline.dbk
 msgid "en"
@@ -10946,6 +11697,75 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
 #~ msgid ""
+#~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
+#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
+#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
+#~ "the above settings is specified, <envar>http_proxy</envar> environment "
+#~ "variable will be used."
+#~ msgstr ""
+#~ "<literal>http::Proxy</literal> には、HTTP URI で使用するデフォルトプロキシ"
+#~ "を設定します。<literal>http://[[user][:pass]@]host[:port]/</literal> とい"
+#~ "う標準形で表します。ホストごとのプロキシを、<literal>http::Proxy::&lt;"
+#~ "host&gt;</literal> という形で指定できます。この時、プロキシを使用しないと"
+#~ "いう意味の特殊キーワード <literal>DIRECT</literal> も使用できます。上記の"
+#~ "設定をなにも指定しないと、環境変数 <envar>http_proxy</envar> を使用しま"
+#~ "す。"
+
+#~ msgid ""
+#~ "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+#~ "<literal>proxy</literal> options work for HTTPS URIs in the same way as "
+#~ "for the <literal>http</literal> method, and default to the same values if "
+#~ "they are not explicitly set. The <literal>Pipeline-Depth</literal> option "
+#~ "is not yet supported."
+#~ msgstr ""
+#~ "<literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal>, "
+#~ "<literal>proxy</literal> の各オプションは、HTTPS URI でも <literal>http</"
+#~ "literal> メソッドと同様に動作します。また、明示的に値を指定しない場合のデ"
+#~ "フォルト値も同様です。<literal>Pipeline-Depth</literal> オプションはまだサ"
+#~ "ポートしていません。"
+
+#~ msgid ""
+#~ "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#~ "boolean suboption determines whether or not the server's host certificate "
+#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
+#~ "Verify-Peer</literal> is the corresponding per-host option.  "
+#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
+#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
+#~ "Verify-Host</literal> is the corresponding per-host option.  "
+#~ "<literal>SslCert</literal> determines what certificate to use for client "
+#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
+#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
+#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
+#~ "SslKey</literal> is the corresponding per-host option.  "
+#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
+#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
+#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "literal> is the corresponding per-host option."
+#~ msgstr ""
+#~ "<literal>CaInfo</literal> サブオプションは、信頼済み証明書情報の保持場所を"
+#~ "指定します。<literal>&lt;host&gt;::CaInfo</literal> は、同様のホストごとの"
+#~ "オプションです。<literal>Verify-Peer</literal> 真偽値サブオプションは、信"
+#~ "頼済み証明書に対してサーバのホスト証明書を、検証するかどうかを決定します。"
+#~ "<literal>&lt;host&gt;::Verify-Peer</literal> は、同様のホストごとのオプ"
+#~ "ションです。<literal>Verify-Host</literal> 真偽値サブオプションは、サーバ"
+#~ "のホスト名を検証するかどうかを決定します。<literal>&lt;host&gt;::Verify-"
+#~ "Host</literal> は、同様のホストごとのオプションです。<literal>SslCert</"
+#~ "literal> は、クライアント認証に使用する証明書を決定します。<literal>&lt;"
+#~ "host&gt;::SslCert</literal> は、同様のホストごとのオプションです。"
+#~ "<literal>SslKey</literal> は、クライアント認証に使用する秘密鍵を決定しま"
+#~ "す。<literal>&lt;host&gt;::SslKey</literal> は、同様のホストごとのオプショ"
+#~ "ンです。<literal>SslForceVersion</literal> は、デフォルトで使用する SSL の"
+#~ "バージョンを上書きします。'<literal>TLSv1</literal>' か '<literal>SSLv3</"
+#~ "literal>' という文字列を指定できます。<literal>&lt;host&gt;::"
+#~ "SslForceVersion</literal> は、同様のホストごとのオプションです。"
+
+#~ 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</"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 0cc937d42..0ef9ee469 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.5-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-11-12 19:50+0100\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\n"
 "PO-Revision-Date: 2017-10-23 17:02+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -674,7 +674,9 @@ msgstr "8"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "APT"
 msgstr "APT"
 
@@ -687,7 +689,9 @@ msgstr "commandoregelinterface"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -969,7 +973,8 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
 msgid "See Also"
 msgstr "Zie ook"
 
@@ -2110,7 +2115,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
-#: apt_preferences.5.xml
+#: apt_preferences.5.xml apt_auth.conf.5.xml
 msgid "Files"
 msgstr "Bestanden"
 
@@ -3022,7 +3027,8 @@ msgstr ""
 "<command>update</command>, maar APT in Ubuntu wel."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
 msgid "Options"
 msgstr "Opties"
 
@@ -3996,7 +4002,7 @@ msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt_auth.conf.5.xml
 msgid "5"
 msgstr "5"
 
@@ -4804,201 +4810,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
-"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>http_proxy</envar> environment variable will "
-"be used."
+"The options in these scopes configure APTs acquire transports for the "
+"protocols HTTP and HTTPS and are documented in the &apt-transport-http; and "
+"&apt-transport-https; manpages respectively."
 msgstr ""
-"<literal>http::Proxy</literal> stelt de te gebruiken standaard-proxy in voor "
-"URI's van het type HTTP. De standaardvorm ervan is <literal>http://[[user][:"
-"pass]@]host[:port]/</literal>. Proxy's kunnen ook per computer ingesteld "
-"worden volgens het schema <literal>http::Proxy::&lt;host&gt;</literal>, "
-"waarbij het bijzondere trefwoord <literal>DIRECT</literal> betekent dat geen "
-"proxy's gebruikt worden. Indien geen van de bovenstaande instellingen "
-"opgegeven werd, zal de omgevingsvariabele <envar>http_proxy</envar> gebruikt "
-"worden."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
-"response under any circumstances.  <literal>Max-Age</literal> sets the "
-"allowed maximum age (in seconds) of an index file in the cache of the "
-"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
-"store the requested archive files in its cache, which can be used to prevent "
-"the proxy from polluting its cache with (big) .deb files."
-msgstr ""
-"Er staan drie configuratieopties ter beschikking om HTTP/1.1-compatibele "
-"proxy-caches te beheren. <literal>No-Cache</literal> zegt de proxy om in "
-"geen geval gebruik te maken van het in zijn cache beschikbare antwoord. "
-"<literal>Max-Age</literal> stelt de maximum toegelaten leeftijd (in "
-"seconden) in van een indexbestand in de cache van de proxy. <literal>No-"
-"Store</literal> geeft aan dat de proxy de opgevraagde archiefbestanden niet "
-"in zijn cache moet opslaan. Zo kan men voorkomen dat de cache van de proxy "
-"vervuild raakt met (grote) .deb-bestanden."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"De optie <literal>timeout</literal> stelt de tijdslimiet in die gehanteerd "
-"moet worden door de timer die door deze methode gebruikt wordt. Deze waarde "
-"is zowel van toepassing op de tijdslimiet van de verbinding als op die van "
-"de data-overdracht."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and workaround misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
-"It is enabled by default with the value 10."
-msgstr ""
-"De instelling <literal>Acquire::http::Pipeline-Depth</literal> kan gebruikt "
-"worden om de techniek van HTTP pipelining (RFC 2616 sectie 8.1.2.2) toe te "
-"passen. Die kan bijvoorbeeld nuttig zijn bij verbindingen met een hoge "
-"vertraging (high-latency connections). APT tracht tijdens het uitvoeren van "
-"de bewerking webservers en proxy's die zich niet correct gedragen, te "
-"ontdekken en te omzeilen, maar als u weet dat de uwe niet conform de "
-"HTTP/1.1 specificatie is, kan het werken met een pijplijn uitgezet worden "
-"door de waarde op 0 te zetten. Standaard is dit geactiveerd met de waarde 10."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
-"follow redirects, which is enabled by default."
-msgstr ""
-"<literal>Acquire::http::AllowRedirect</literal> regelt of APT eventuele "
-"omleidingen volgt. Standaard staat dit aan."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobytes per second. The default "
-"value is 0 which deactivates the limit and tries to use all available "
-"bandwidth.  Note that this option implicitly disables downloading from "
-"multiple servers at the same time."
-msgstr ""
-"De gebruikte bandbreedte kan beperkt worden via <literal>Acquire::http::Dl-"
-"Limit</literal> dat in gehele getallen uitgedrukte waarden in kilobytes per "
-"seconde accepteert. De standaardwaarde is 0 waardoor er geen limiet "
-"ingesteld wordt en er geprobeerd wordt om alle beschikbare bandbreedte te "
-"gebruiken. Merk op dat deze optie impliciet het gelijktijdig downloaden "
-"vanaf meerdere servers uitschakelt."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
-"User-Agent for the http download method as some proxies allow access for "
-"clients only if the client uses a known identifier."
-msgstr ""
-"<literal>Acquire::http::User-Agent</literal> kan gebruikt worden om voor "
-"User-Agent een andere waarde in te stellen om bij de http-downloadmethode te "
-"gebruiken. Sommige proxy's verlenen een cliënt enkel toegang als die een "
-"gekende identificatie gebruikt."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
-"an external command to discover the http proxy to use. The first and only "
-"parameter is an URI denoting the host to be contacted to allow for host-"
-"specific configuration. APT expects the command to output the proxy on "
-"stdout as a single line in the style <literal>http://proxy:port/</literal> "
-"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
-"indicates that the generic proxy settings should be used.  Note that auto-"
-"detection will not be used for a host if a host-specific proxy configuration "
-"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
-"example implementation that uses avahi.  This option takes precedence over "
-"the legacy option name <literal>ProxyAutoDetect</literal>."
-msgstr ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> kan gebruikt worden om "
-"een extern commando op te geven om de te gebruiken http-proxy te vinden. De "
-"eerste en enige parameter is een URI die aangeeft met welke computer contact "
-"gemaakt moet worden om computerspecifieke configuratie te kunnen gebruiken. "
-"APT verwacht dat het commando de proxy op de standaarduitvoer op één enkele "
-"regel weergeeft volgens het schema <literal>http://proxy:port/</literal> of "
-"anders het woord <literal>DIRECT</literal> in het geval geen proxy gebruikt "
-"moet worden. Geen uitvoer geeft aan dat de generieke proxy-instellingen "
-"gebruikt moeten worden. Merk op dat geen autodetectie gebruikt zal worden "
-"voor een computer indien reeds een computerspecifieke proxyconfiguratie "
-"ingesteld werd via <literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal>. Raadpleeg het pakket &squid-deb-proxy-client; voor "
-"een voorbeeldtoepassing waarin avahi gebruikt wordt. Deze optie heeft "
-"voorrang op de verouderde optienaam <literal>ProxyAutoDetect</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
-"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
-"the <literal>http</literal> method, and default to the same values if they "
-"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
-"yet supported."
-msgstr ""
-"De opties <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> en "
-"<literal>proxy</literal> werken op dezelfde manier voor URI's van het type "
-"HTTPS als voor de <literal>http</literal>-methode en hebben dezelfde "
-"standaardwaarden als ze niet expliciet ingesteld werden. De optie "
-"<literal>Pipeline-Depth</literal> wordt momenteel nog niet ondersteund."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
-"corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
-"literal> is the corresponding per-host option.  <literal>Verify-Host</"
-"literal> boolean suboption determines whether or not the server's hostname "
-"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
-"corresponding per-host option.  <literal>SslCert</literal> determines what "
-"certificate to use for client authentication. <literal>&lt;host&gt;::"
-"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
-"literal> determines what private key to use for client authentication. "
-"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
-"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
-"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> is the corresponding per-host option."
-msgstr ""
-"De suboptie <literal>CaInfo</literal> specificeert de plaats waar het "
-"bestand zich bevindt dat informatie bevat over vertrouwde certificaten. "
-"<literal>&lt;host&gt;::CaInfo</literal> is de overeenkomstige optie voor een "
-"specifieke computer. De booleaanse suboptie <literal>Verify-Peer</literal> "
-"bepaalt of het computercertificaat van de server al dan niet geverifieerd "
-"moet worden tegenover de vertrouwde certificaten. <literal>&lt;host&gt;::"
-"Verify-Peer</literal> is de overeenkomstige optie voor een specifieke "
-"computer. De booleaanse suboptie <literal>Verify-Host</literal> bepaalt of "
-"de computernaam van de server wel of niet geverifieerd moet worden. "
-"<literal>&lt;host&gt;::Verify-Host</literal> is de overeenkomstige optie "
-"voor een specifieke computer. <literal>SslCert</literal> bepaalt welk "
-"certificaat gebruikt moet worden voor de authenticatie van de cliënt. "
-"<literal>&lt;host&gt;::SslCert</literal> is de overeenkomstige optie voor "
-"een specifieke computer. <literal>SslKey</literal> bepaalt welke "
-"privésleutel gebruikt moet worden voor de authenticatie van de cliënt. "
-"<literal>&lt;host&gt;::SslKey</literal> is de overeenkomstige optie voor een "
-"specifieke computer. <literal>SslForceVersion</literal> overschrijft de "
-"standaardinstelling voor de te gebruiken versie van SSL. Het kan ofwel "
-"'<literal>TLSv1</literal>' of '<literal>SSLv3</literal>' als tekenreeks "
-"bevatten. <literal>&lt;host&gt;::SslForceVersion</literal> is de "
-"overeenkomstige optie voor een specifieke computer."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5038,6 +4853,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"The option <literal>timeout</literal> sets the timeout timer used by the "
+"method; this value applies to the connection as well as the data timeout."
+msgstr ""
+"De optie <literal>timeout</literal> stelt de tijdslimiet in die gehanteerd "
+"moet worden door de timer die door deze methode gebruikt wordt. Deze waarde "
+"is zowel van toepassing op de tijdslimiet van de verbinding als op die van "
+"de data-overdracht."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 "some situations require that passive mode be disabled and port mode FTP used "
@@ -6292,6 +6118,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Examples"
 msgstr "Voorbeelden"
 
@@ -7849,6 +7677,25 @@ msgstr "Indeling in deb822-stijl"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "Files in this format have the extension <filename>.sources</filename>.  "
+#| "The format is similar in syntax to other files used by Debian and its "
+#| "derivatives, such as the metadata files that apt will download from the "
+#| "configured sources or the <filename>debian/control</filename> file in a "
+#| "Debian source package.  Individual entries are separated by an empty "
+#| "line; additional empty lines are ignored, and a <literal>#</literal> "
+#| "character at the start of the line marks the entire line as a comment. An "
+#| "entry can hence be disabled by commenting out each line belonging to the "
+#| "stanza, but it is usually easier to add the field \"Enabled: no\" to the "
+#| "stanza to disable the entry. Removing the field or setting it to yes "
+#| "reenables it.  Options have the same syntax as every other field: A "
+#| "fieldname separated by a colon (<literal>:</literal>) and optionally "
+#| "spaces from its value(s).  Note especially that multiple values are "
+#| "separated by spaces, not by commas as in the one-line format. Multivalue "
+#| "fields like <literal>Architectures</literal> also have "
+#| "<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+#| "literal> to modify the default value rather than replacing it."
 msgid ""
 "Files in this format have the extension <filename>.sources</filename>.  The "
 "format is similar in syntax to other files used by Debian and its "
@@ -7862,10 +7709,11 @@ msgid ""
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
-"especially that multiple values are separated by spaces, not by commas as in "
-"the one-line format. Multivalue fields like <literal>Architectures</literal> "
-"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
-"Remove</literal> to modify the default value rather than replacing it."
+"especially that multiple values are separated by whitespaces (like spaces, "
+"tabs and newlines), not by commas as in the one-line format.  Multivalue "
+"fields like <literal>Architectures</literal> also have "
+"<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+"literal> to modify the default value rather than replacing it."
 msgstr ""
 "Bestanden met deze indeling hebben de extensie <filename>.sources</"
 "filename>. Op het gebied van de syntaxis is de indeling gelijkaardig aan "
@@ -8399,19 +8247,35 @@ msgstr "URI-specificatie"
 msgid "The currently recognized URI types are:"
 msgstr "De momenteel herkende URI-types zijn:"
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-http;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| 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;."
 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;."
+"commonly used method. 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 ""
 "De methode http geeft een HTTP-server op voor een archief. Dit is de meest "
 "gebruikte methode waarvoor veel configuratieopties beschikbaar zijn binnen "
@@ -8443,6 +8307,11 @@ msgstr ""
 "databeveiligingsmodel dat toegepast wordt door APT, onafhankelijk van de "
 "gekozen transportmethode functioneert. Raadpleeg voor details &apt-secure;."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-https;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
@@ -8874,6 +8743,8 @@ msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "1"
 msgstr "1"
 
@@ -9987,6 +9858,909 @@ msgstr ""
 "<command>apt-ftparchive</command> geeft de terugkeerwaarde nul bij een "
 "normaal verlopen operatie, het decimaal getal 100 in geval van een fout."
 
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Configuration file for APT"
+msgid "Login configuration file for APT sources and proxies"
+msgstr "Configuratiebestand van APT"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"APT configuration files like &sources-list; or &apt-conf; need to be "
+"accessible for everyone using apt tools on the system to have access to all "
+"package-related information like the available packages in a repository. "
+"Login information needed to connect to a proxy or to download data from a "
+"repository on the other hand shouldn't always be accessible by everyone and "
+"can hence not be placed in a file with world-readable file permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used "
+"to store login information in a netrc-like format with restrictive file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "netrc-like format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The format defined here is similar to the format of the <filename>~/.netrc</"
+"filename> file used by <citerefentry><refentrytitle><command>ftp</command></"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs "
+"interacting with servers.  It is a simple token-based format with the "
+"following tokens being recognized; Unknown tokens will be ignored. Tokens "
+"may be separated by spaces, tabs or newlines."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid ""
+"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Entries are looked up by searching for the <emphasis><literal>machine</"
+"literal></emphasis> token matching the hostname of the URI apt needs login "
+"information for. Extending the netrc-format a portnumber can be specified. "
+"If no port is given the token matches for all ports.  Similar the path is "
+"optional and only needed and useful if multiple repositories with different "
+"login information reside on the same server. A machine token with a path "
+"matches if the path in the URI starts with the path given in the token.  "
+"Once a match is made, the subsequent tokens are processed, stopping when the "
+"end of file is reached or another <emphasis><literal>machine</literal></"
+"emphasis> token is encountered."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>login</literal> <replaceable>name</replaceable>"
+msgstr "apt-get install <replaceable>pakket</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The username to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>password</literal> <replaceable>string</replaceable>"
+msgstr "apt-get install <replaceable>pakket</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The password to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Examples"
+msgid "Example"
+msgstr "Voorbeelden"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org\n"
+"login apt\n"
+"password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "machine example.org login apt password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org/deb login apt password debian\n"
+"machine example.org/debian login apt password debian\n"
+"machine example.org/debian/ login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org:80 login apt password debian\n"
+"machine example.org/deb/ login apt password debian\n"
+"machine example.org/ubuntu login apt password debian\n"
+"machine example.orga login apt password debian\n"
+"machine example.net login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Supplying login information for a user named <literal>apt</literal> with the "
+"password <literal>debian</literal> for the &sources-list; entry <placeholder "
+"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
+"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
+"the following in the auth.conf file could be used: <placeholder type="
+"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
+"specific all of these lines will also apply to the example entry: "
+"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
+"the following lines apply: <placeholder type=\"literallayout\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Notes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Basic support for this feature is present since version 0.7.25, but was "
+"undocumented for years. The documentation was added in version 1.5 changing "
+"also the implementation slightly. For maximum backward compatibility you "
+"should avoid multiple <literal>machine</literal> tokens with the same "
+"hostname, but if you need multiple they should all have a path specified in "
+"the <literal>machine</literal> token."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+msgid "<filename>/etc/apt/auth.conf</filename>"
+msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Show full versions for upgraded and installed packages.  Configuration "
+#| "Item: <literal>APT::Get::Show-Versions</literal>."
+msgid ""
+"Login information for APT sources and proxies in a netrc-like format.  "
+"Configuration Item: <literal>Dir::Etc::netrc</literal>."
+msgstr ""
+"Geef het volledige versienummer weer van opgewaardeerde en geïnstalleerde "
+"pakketten. Configuratie-item: <literal>APT::Get::Show-Versions</literal>."
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "&apt-conf;, &sources-list;, &apt-get;"
+msgid "&apt-conf; &sources-list;"
+msgstr "&apt-conf;, &sources-list;, &apt-get;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-http.1.xml
+msgid ""
+"APT transport for downloading via the Hypertext Transfer Protocol (HTTP)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the Hypertext "
+"Transfer Protocol (HTTP). It is available by default and probably the most "
+"used of all transports. Note that a transport is never called directly by a "
+"user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| 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."
+msgid ""
+"HTTP is an unencrypted transport protocol meaning that the whole "
+"communication with the remote server (or proxy) can be observed by a "
+"sufficiently capable attacker referred to commonly as man in the middle "
+"(MITM).  Such an attacker can <emphasis>not</emphasis> modify the "
+"communication to compromise the security of your system through as APTs data "
+"security model is independent of the chosen transport method. This is "
+"explained in detail in &apt-secure;. An overview over available transport "
+"methods is given in &sources-list;."
+msgstr ""
+"Merk op dat deze authenticatiemethodes onveilig zijn, aangezien de volledige "
+"communicatie met de externe server (of de proxy) onversleuteld verloopt. "
+"Daardoor kan een voldoende onderlegde aanvaller de logingegevens bekijken en "
+"opslaan evenals de rest van de interactie. De aanvaller kan evenwel de "
+"communicatie <emphasis>niet</emphasis> beïnvloeden, vermits het "
+"databeveiligingsmodel dat toegepast wordt door APT, onafhankelijk van de "
+"gekozen transportmethode functioneert. Raadpleeg voor details &apt-secure;."
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Various options are available to modify its behaviour which can be set in an "
+"&apt-conf; file ranging from proxy configuration to workaround for specific "
+"server insufficiencies."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Proxy Configuration"
+msgstr "Configuratie op gebruikersniveau"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The environment variable <envar>http_proxy</envar> is supported for system "
+"wide configuration.  Proxies specific to apt can be configured via the "
+"option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
+"used only for certain hosts can be specified via <literal>Acquire::http::"
+"Proxy::<replaceable>host</replaceable></literal>. Even more finegrained "
+"control can be achieved via proxy autodetection detailed further below.  All "
+"these options use the URI format <literal><replaceable>scheme</"
+"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
+"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
+"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
+"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
+"<literal>https</literal>.  Authentification details can be supplied via &apt-"
+"authconf; instead of including it in the URI directly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The various APT configuration options support the special value "
+"<literal>DIRECT</literal> meaning that no proxy should be used. The "
+"environment variable <envar>no_proxy</envar> with the same propose is also "
+"supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches.  <literal>No-Cache</literal> tells the proxy not to use its "
+#| "cached response under any circumstances.  <literal>Max-Age</literal> sets "
+#| "the allowed maximum age (in seconds) of an index file in the cache of the "
+#| "proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+#| "store the requested archive files in its cache, which can be used to "
+#| "prevent the proxy from polluting its cache with (big) .deb files."
+msgid ""
+"Further more there are three settings provided for cache control with "
+"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
+"tells the proxy not to use its cached response under any circumstances.  "
+"<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
+"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
+"http::No-Store</literal> specifies that the proxy should not store the "
+"requested archive files in its cache, which can be used to prevent the proxy "
+"from polluting its cache with (big) .deb files."
+msgstr ""
+"Er staan drie configuratieopties ter beschikking om HTTP/1.1-compatibele "
+"proxy-caches te beheren. <literal>No-Cache</literal> zegt de proxy om in "
+"geen geval gebruik te maken van het in zijn cache beschikbare antwoord. "
+"<literal>Max-Age</literal> stelt de maximum toegelaten leeftijd (in "
+"seconden) in van een indexbestand in de cache van de proxy. <literal>No-"
+"Store</literal> geeft aan dat de proxy de opgevraagde archiefbestanden niet "
+"in zijn cache moet opslaan. Zo kan men voorkomen dat de cache van de proxy "
+"vervuild raakt met (grote) .deb-bestanden."
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "Repository Configuration"
+msgid "Automatic Proxy Configuration"
+msgstr "Configuratie van de pakketbron"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to "
+#| "specify an external command to discover the http proxy to use. The first "
+#| "and only parameter is an URI denoting the host to be contacted to allow "
+#| "for host-specific configuration. APT expects the command to output the "
+#| "proxy on stdout as a single line in the style <literal>http://proxy:port/"
+#| "</literal> or the word <literal>DIRECT</literal> if no proxy should be "
+#| "used. No output indicates that the generic proxy settings should be "
+#| "used.  Note that auto-detection will not be used for a host if a host-"
+#| "specific proxy configuration is already set via <literal>Acquire::http::"
+#| "Proxy::<replaceable>HOST</replaceable></literal>.  See the &squid-deb-"
+#| "proxy-client; package for an example implementation that uses avahi.  "
+#| "This option takes precedence over the legacy option name "
+#| "<literal>ProxyAutoDetect</literal>."
+msgid ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the previously specified URI format or the word "
+"<literal>DIRECT</literal> if no proxy should be used. No output indicates "
+"that the generic proxy settings should be used."
+msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> kan gebruikt worden om "
+"een extern commando op te geven om de te gebruiken http-proxy te vinden. De "
+"eerste en enige parameter is een URI die aangeeft met welke computer contact "
+"gemaakt moet worden om computerspecifieke configuratie te kunnen gebruiken. "
+"APT verwacht dat het commando de proxy op de standaarduitvoer op één enkele "
+"regel weergeeft volgens het schema <literal>http://proxy:port/</literal> of "
+"anders het woord <literal>DIRECT</literal> in het geval geen proxy gebruikt "
+"moet worden. Geen uitvoer geeft aan dat de generieke proxy-instellingen "
+"gebruikt moeten worden. Merk op dat geen autodetectie gebruikt zal worden "
+"voor een computer indien reeds een computerspecifieke proxyconfiguratie "
+"ingesteld werd via <literal>Acquire::http::Proxy::<replaceable>HOST</"
+"replaceable></literal>. Raadpleeg het pakket &squid-deb-proxy-client; voor "
+"een voorbeeldtoepassing waarin avahi gebruikt wordt. Deze optie heeft "
+"voorrang op de verouderde optienaam <literal>ProxyAutoDetect</literal>."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Note that auto-detection will not be used for a host if a host-specific "
+"proxy configuration is already set via <literal>Acquire::http::Proxy::"
+"<replaceable>host</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"See the &squid-deb-proxy-client; and &auto-apt-proxy; packages for example "
+"implementations."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This option takes precedence over the legacy option name <literal>Acquire::"
+"http::ProxyAutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Connection Configuration"
+msgstr "Configuratie op gebruikersniveau"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this value applies to the connection as well as the data timeout."
+msgid ""
+"The option <literal>Acquire::http::Timeout</literal> sets the timeout timer "
+"used by the method; this value applies to the connection as well as the data "
+"timeout."
+msgstr ""
+"De optie <literal>timeout</literal> stelt de tijdslimiet in die gehanteerd "
+"moet worden door de timer die door deze methode gebruikt wordt. Deze waarde "
+"is zowel van toepassing op de tijdslimiet van de verbinding als op die van "
+"de data-overdracht."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes per second. The "
+#| "default value is 0 which deactivates the limit and tries to use all "
+#| "available bandwidth.  Note that this option implicitly disables "
+#| "downloading from multiple servers at the same time."
+msgid ""
+"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+"literal> which accepts integer values in kilobytes per second. The default "
+"value is 0 which deactivates the limit and tries to use all available "
+"bandwidth. Note that this option implicitly disables downloading from "
+"multiple servers at the same time."
+msgstr ""
+"De gebruikte bandbreedte kan beperkt worden via <literal>Acquire::http::Dl-"
+"Limit</literal> dat in gehele getallen uitgedrukte waarden in kilobytes per "
+"seconde accepteert. De standaardwaarde is 0 waardoor er geen limiet "
+"ingesteld wordt en er geprobeerd wordt om alle beschikbare bandbreedte te "
+"gebruiken. Merk op dat deze optie impliciet het gelijktijdig downloaden "
+"vanaf meerdere servers uitschakelt."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."
+msgstr ""
+"De instelling <literal>Acquire::http::Pipeline-Depth</literal> kan gebruikt "
+"worden om de techniek van HTTP pipelining (RFC 2616 sectie 8.1.2.2) toe te "
+"passen. Die kan bijvoorbeeld nuttig zijn bij verbindingen met een hoge "
+"vertraging (high-latency connections). APT tracht tijdens het uitvoeren van "
+"de bewerking webservers en proxy's die zich niet correct gedragen, te "
+"ontdekken en te omzeilen, maar als u weet dat de uwe niet conform de "
+"HTTP/1.1 specificatie is, kan het werken met een pijplijn uitgezet worden "
+"door de waarde op 0 te zetten. Standaard is dit geactiveerd met de waarde 10."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+"<literal>Acquire::http::AllowRedirect</literal> regelt of APT eventuele "
+"omleidingen volgt. Standaard staat dit aan."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+"<literal>Acquire::http::User-Agent</literal> kan gebruikt worden om voor "
+"User-Agent een andere waarde in te stellen om bij de http-downloadmethode te "
+"gebruiken. Sommige proxy's verlenen een cliënt enkel toegang als die een "
+"gekende identificatie gebruikt."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::SendAccept</literal> is enabled by default and sends "
+"a <literal>Accept: text/*</literal> header field to the server for requests "
+"without file extensions to prevent the server from attempting content "
+"negotiation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-http.1.xml
+#, no-wrap
+msgid ""
+"Acquire::http {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-http-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTP\";\n"
+"\tSendAccept \"false\";\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgid "&apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-https.1.xml
+msgid "APT transport for downloading via the HTTP Secure protocol (HTTPS)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the HTTP "
+"Secure protocol (HTTPS) also referred to as HTTP over TLS. It is available "
+"by default since apt 1.5 and was before that available in a <package>apt-"
+"transport-https</package> package. Note that a transport is never called "
+"directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"HTTP is by itself an unencrypted transport protocol (compare &apt-transport-"
+"http;), which, as indicated by the appended S is wrapped in an encrypted "
+"layer known as Transport Layer Security (TLS) which provides end-to-end "
+"encryption.  A sufficiently capable attacker can still observe the "
+"communication partners and deeper analyse of the encrypted communcation "
+"might still reveal important details.  An overview over available "
+"alternative transport methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"The HTTPS protocol is based on the HTTP protocol and as such this "
+"implementation has the same relation meaning that all options supported by "
+"&apt-transport-http; are also available via <literal>Acquire::https</"
+"literal> and will default to the same values specified for <literal>Acquire::"
+"http</literal>. This manpage will only document the options <emphasis>unique "
+"to https</emphasis>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Server credentials"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"By default all certificates trusted by the system (see <package>ca-"
+"certificates</package> package) are used for the verification of the server "
+"certificate. An alternative certificate authority (CA) can be configured "
+"with the <literal>Acquire::https::CAInfo</literal> option and its host-"
+"specific option <literal>Acquire::https::CAInfo::<replaceable>host</"
+"replaceable></literal>.  The option specifies a file is made of the "
+"concatenation of the CA certificates (in PEM format) creating the chain used "
+"for the verification of the path from the root (self signed one). If the "
+"remote server provides the whole chain during the exchange, the file need "
+"only contain the root certificate. Otherwise, the whole chain is required. "
+"If you need to support multiple authorities, the only way is to concatenate "
+"everything."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"A custom certificate revocation list (CRL) can be configured with the "
+"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
+"https::CRLFile::<replaceable>host</replaceable></literal> respectively.  "
+"Like the previous option a file in PEM format needs to be specified."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Disabling security"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"When authenticating the server, if the certificate verification fails for "
+"some reason (expired, revoked, man in the middle, …), the connection fails.  "
+"This is obviously what you want in all cases and what the default value "
+"(true)  of the option <literal>Acquire::https::Verify-Peer</literal> and its "
+"host-specific variant provides. If you know <emphasis>exactly</emphasis> "
+"what you are doing, setting this option to \"false\" allows you to skip peer "
+"certificate verification and make the exchange succeed. Again, this option "
+"is for debugging or testing purpose only as it removes all security provided "
+"by the use of HTTPS."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Similarly the option <literal>Acquire::https::Verify-Host</literal> and its "
+"host-specific variant can be used to deactivate a security feature: The "
+"certificate provided by the server includes the identity of the server which "
+"should match the DNS name used to access it. By default, as requested by RFC "
+"2818, the name of the mirror is checked against the identity found in the "
+"certificate. This default behavior is safe and should not be changed, but if "
+"you know that the server you are using has a DNS name which does not match "
+"the identity in its certificate, you can set the option to \"false\", which "
+"will prevent the comparison to be done."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Client authentication"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Beside the password based authentication available (see &apt-authconf;) "
+"HTTPS supports authentication based on client certificates as well via "
+"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
+"SSLKey</literal>. They respectively should be set to the filename of the "
+"X.509 client certificate and the associated (unencrypted) private key, both "
+"in PEM format.  In practice the use of the host-specific variants of both "
+"options is highly recommended."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-https.1.xml
+#, no-wrap
+msgid ""
+"Acquire::https {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-https-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTPS\";\n"
+"\tSendAccept \"false\";\n"
+"\n"
+"\tCAInfo \"/path/to/ca/certs.pem\";\n"
+"\tCRLFile \"/path/to/all/crl.pem\";\n"
+"\tVerify-Peer \"true\";\n"
+"\tVerify-Host::broken.example.org \"false\";\n"
+"\tSSLCert::example.org \"/path/to/client/cert.pem\";\n"
+"\tSSLKey::example.org \"/path/to/client/key.pem\"\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+#, fuzzy
+#| msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgid "&apt-transport-http; &apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-mirror.1.xml
+msgid "APT transport for more automated mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This APT transport isn't implementing a protocol to access local or remote "
+"repositories on its own, but acquires a mirrorlist and redirects all "
+"requests to the mirror(s) picked from this list access via other transports "
+"like &apt-transport-http;. The basic functionality is available since apt "
+"0.7.24, but was undocumented until apt 1.6 which contained a complete rework "
+"of the transport and its supported features. Note that a transport is never "
+"called directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If the acquisition of a file via a mirror fails the method ensures that "
+"automatically another possible mirror of the list is tried until either the "
+"file is retrieved or no mirror is left in the list handling transparently "
+"server downtimes and similar problems."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The security implications of the transport are based on the security "
+"considerations associated with the transport used to acquire the mirrorlist "
+"and the transports involved in accessing the chosen mirror(s) by the "
+"transport."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This transport has no configuration options at present. The mirror selection "
+"is based entirely on the mirrors offered in the mirrorlist and the files apt "
+"needs to acquire."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirrorlist format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A mirrorlist contains at least one line each specifying an URI for a "
+"mirror.  Empty lines and those starting with a hash key (<literal>#</"
+"literal>) are ignored.  An URI always starts with a URI scheme which defines "
+"the transport used for this mirror. If the URI e.g. starts with "
+"<literal>http:</literal> the responsible transport is &apt-transport-http; "
+"which might have specific requirements for the format of the remaining part "
+"of the URI."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"An URI can optionally be separated from metadata about the mirror by a tab.  "
+"Multiple datapoints in the provided metadata can itself be separated by "
+"spaces for tabs.  (This is an advanced feature only available with apt >= "
+"1.6. Earlier apt versions will fail to parse mirrorlists using this feature)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Since apt 1.6 the usage of compressed mirrorlists is also supported.  Note "
+"that the filename of the mirrorlist must specify the compression algorithm "
+"used, there is no auto-detection based on file content performed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirror selection by metadata"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As specified in the format a mirror can have additional metadata attached to "
+"prevent a mirror from being selected for acquiring a file not matching this "
+"metadata.  This way the mirrorlist can e.g. contain partial mirrors serving "
+"only certain architectures and apt will automatically choose a different "
+"mirror for files requiring an unlisted architecture. Supported are limits "
+"for the architecture (<literal>arch</literal>), codename of the release "
+"(<literal>codename</literal>), component of the repository the file is in "
+"(<literal>component</literal>), language the file applies to (<literal>lang</"
+"literal>), suite name of the release (<literal>suite</literal>) and type of "
+"the file (<literal>type</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Fallback order for mirrors"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If no priority is given via the metadata key <literal>priority</literal> for "
+"a mirror the order in which mirrors are contacted is random. If a certain "
+"set of mirrors should be tried first before any of another set is tried a "
+"priority can be explicitly set. The mirrors with the lowest number are tried "
+"first. Mirrors which have no explicit priority set default to the highest "
+"possible number and are therefore tried last. The choice between mirrors "
+"with the same priority is again random."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Allowed transports in a mirrorlist"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The availability and choice of transports in a mirrorlist is limited by how "
+"the apt client is accessing the mirrorlist. If a local transport like "
+"<literal>file</literal> or <literal>copy</literal> is used the mirrorlist "
+"can also include local sources while a mirrorlist accessed via "
+"<literal>http</literal> can not. Additionally, a mirrorlist can not contain "
+"a mirrorlist or other wrapping transports (like <package>apt-transport-tor</"
+"package>).  See the documentation of these transports on how to use them "
+"with the mirror method."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that apt versions before 1.6 do not support any other transport than "
+"<literal>http</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Basic example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A basic mirrorlist example supported by all apt versions with a mirror "
+"method (>= 0.7.24) in which the client will pick any of the three mirrors:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"http://ftp.de.debian.org/debian/\n"
+"http://ftp.us.debian.org/debian/\n"
+"http://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
+"txt</filename> on your machine it can be used like this in &sources-list; "
+"(since apt 1.6):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror+file:/etc/apt/mirrorlist.txt &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"All versions of the mirror method support a mirrorlist accessible via http, "
+"so assuming it is available at <literal>http://apt.example.org/mirror.lst</"
+"literal> the sources.list entry from above could be written instead as:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb mirror://apt.example.org/mirror.lst &debian-stable-codename; main\n"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that since apt 1.6 the use of <literal>mirror+http</literal> should be "
+"preferred over <literal>mirror</literal> for uniformity. The functionality "
+"is the same."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Example with metadata-enhanced mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As explained in the format definition apt versions before 1.6 do not support "
+"this and will fail parsing the mirrorlist. The example mirrorlist is "
+"proposefully complicated to show some aspects of the selection. The "
+"following setup is assumed: The first mirror is local mirror accessible via "
+"the file method, but potentially incomplete. The second mirror has a great "
+"connection, but is a partial mirror in sofar as it only contains files "
+"related to the architectures <literal>amd64</literal> and <literal>all</"
+"literal>. The remaining mirrors are average mirrors which should be "
+"contacted only if the earlier ones didn't work."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"file:/srv/local/debian/mirror/\tpriority:1 type:index\n"
+"http://partial.example.org/mirror/\tpriority:2 arch:amd64 arch:all type:deb\n"
+"http://ftp.us.debian.org/debian/\ttype:deb\n"
+"http://ftp.de.debian.org/debian/\ttype:deb\n"
+"https://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"In this setup with this mirrorlist the first mirror will be used to download "
+"all index files assuming the mirrorlist itself is accessed via a local "
+"transport like <literal>file</literal>. If it isn't, the mirror is otherwise "
+"inaccessible or does not contain the requested file another mirror will be "
+"used to acquire the file, which one depending on the type of the file: An "
+"index file will be served by the last mirror in the list, while a package of "
+"architecture <literal>amd64</literal> is served by the second and those of e."
+"g. architecture <literal>i386</literal> by one of the last three."
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
 #: guide.dbk offline.dbk
 msgid "en"
@@ -11641,6 +12415,82 @@ msgstr ""
 "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
 
 #~ msgid ""
+#~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
+#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
+#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
+#~ "the above settings is specified, <envar>http_proxy</envar> environment "
+#~ "variable will be used."
+#~ msgstr ""
+#~ "<literal>http::Proxy</literal> stelt de te gebruiken standaard-proxy in "
+#~ "voor URI's van het type HTTP. De standaardvorm ervan is <literal>http://"
+#~ "[[user][:pass]@]host[:port]/</literal>. Proxy's kunnen ook per computer "
+#~ "ingesteld worden volgens het schema <literal>http::Proxy::&lt;host&gt;</"
+#~ "literal>, waarbij het bijzondere trefwoord <literal>DIRECT</literal> "
+#~ "betekent dat geen proxy's gebruikt worden. Indien geen van de "
+#~ "bovenstaande instellingen opgegeven werd, zal de omgevingsvariabele "
+#~ "<envar>http_proxy</envar> gebruikt worden."
+
+#~ msgid ""
+#~ "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+#~ "<literal>proxy</literal> options work for HTTPS URIs in the same way as "
+#~ "for the <literal>http</literal> method, and default to the same values if "
+#~ "they are not explicitly set. The <literal>Pipeline-Depth</literal> option "
+#~ "is not yet supported."
+#~ msgstr ""
+#~ "De opties <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> en "
+#~ "<literal>proxy</literal> werken op dezelfde manier voor URI's van het "
+#~ "type HTTPS als voor de <literal>http</literal>-methode en hebben dezelfde "
+#~ "standaardwaarden als ze niet expliciet ingesteld werden. De optie "
+#~ "<literal>Pipeline-Depth</literal> wordt momenteel nog niet ondersteund."
+
+#~ msgid ""
+#~ "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#~ "boolean suboption determines whether or not the server's host certificate "
+#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
+#~ "Verify-Peer</literal> is the corresponding per-host option.  "
+#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
+#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
+#~ "Verify-Host</literal> is the corresponding per-host option.  "
+#~ "<literal>SslCert</literal> determines what certificate to use for client "
+#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
+#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
+#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
+#~ "SslKey</literal> is the corresponding per-host option.  "
+#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
+#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
+#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "literal> is the corresponding per-host option."
+#~ msgstr ""
+#~ "De suboptie <literal>CaInfo</literal> specificeert de plaats waar het "
+#~ "bestand zich bevindt dat informatie bevat over vertrouwde certificaten. "
+#~ "<literal>&lt;host&gt;::CaInfo</literal> is de overeenkomstige optie voor "
+#~ "een specifieke computer. De booleaanse suboptie <literal>Verify-Peer</"
+#~ "literal> bepaalt of het computercertificaat van de server al dan niet "
+#~ "geverifieerd moet worden tegenover de vertrouwde certificaten. "
+#~ "<literal>&lt;host&gt;::Verify-Peer</literal> is de overeenkomstige optie "
+#~ "voor een specifieke computer. De booleaanse suboptie <literal>Verify-"
+#~ "Host</literal> bepaalt of de computernaam van de server wel of niet "
+#~ "geverifieerd moet worden. <literal>&lt;host&gt;::Verify-Host</literal> is "
+#~ "de overeenkomstige optie voor een specifieke computer. <literal>SslCert</"
+#~ "literal> bepaalt welk certificaat gebruikt moet worden voor de "
+#~ "authenticatie van de cliënt. <literal>&lt;host&gt;::SslCert</literal> is "
+#~ "de overeenkomstige optie voor een specifieke computer. <literal>SslKey</"
+#~ "literal> bepaalt welke privésleutel gebruikt moet worden voor de "
+#~ "authenticatie van de cliënt. <literal>&lt;host&gt;::SslKey</literal> is "
+#~ "de overeenkomstige optie voor een specifieke computer. "
+#~ "<literal>SslForceVersion</literal> overschrijft de standaardinstelling "
+#~ "voor de te gebruiken versie van SSL. Het kan ofwel '<literal>TLSv1</"
+#~ "literal>' of '<literal>SSLv3</literal>' als tekenreeks bevatten. "
+#~ "<literal>&lt;host&gt;::SslForceVersion</literal> is de overeenkomstige "
+#~ "optie voor een specifieke computer."
+
+#~ 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</"
@@ -11853,9 +12703,6 @@ msgstr ""
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "De vingerafdrukken van de betrouwbare sleutels weergeven."
 
-#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
 #~ msgid "Local trust database of archive keys."
 #~ msgstr "Lokale database van betrouwbare archiefsleutels."
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index d2612ad32..14c40b92d 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-08-24 23:21+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -666,7 +666,9 @@ msgstr "8"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "APT"
 msgstr "APT"
 
@@ -679,7 +681,9 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Description"
 msgstr "Opis"
 
@@ -894,7 +898,8 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
 msgid "See Also"
 msgstr "Zobacz także"
 
@@ -2102,7 +2107,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
-#: apt_preferences.5.xml
+#: apt_preferences.5.xml apt_auth.conf.5.xml
 msgid "Files"
 msgstr "Pliki"
 
@@ -3022,7 +3027,8 @@ msgstr ""
 "command>, ale APT w Ubuntu je obsługuje."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
 msgid "Options"
 msgstr "Opcje"
 
@@ -3990,7 +3996,7 @@ msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt_auth.conf.5.xml
 msgid "5"
 msgstr "5"
 
@@ -4534,119 +4540,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
-"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>http_proxy</envar> environment variable will "
-"be used."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
-"response under any circumstances.  <literal>Max-Age</literal> sets the "
-"allowed maximum age (in seconds) of an index file in the cache of the "
-"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
-"store the requested archive files in its cache, which can be used to prevent "
-"the proxy from polluting its cache with (big) .deb files."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and workaround misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
-"It is enabled by default with the value 10."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
-"follow redirects, which is enabled by default."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobytes per second. The default "
-"value is 0 which deactivates the limit and tries to use all available "
-"bandwidth.  Note that this option implicitly disables downloading from "
-"multiple servers at the same time."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
-"User-Agent for the http download method as some proxies allow access for "
-"clients only if the client uses a known identifier."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
-"an external command to discover the http proxy to use. The first and only "
-"parameter is an URI denoting the host to be contacted to allow for host-"
-"specific configuration. APT expects the command to output the proxy on "
-"stdout as a single line in the style <literal>http://proxy:port/</literal> "
-"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
-"indicates that the generic proxy settings should be used.  Note that auto-"
-"detection will not be used for a host if a host-specific proxy configuration "
-"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
-"example implementation that uses avahi.  This option takes precedence over "
-"the legacy option name <literal>ProxyAutoDetect</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
-"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
-"the <literal>http</literal> method, and default to the same values if they "
-"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
-"yet supported."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
-"corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
-"literal> is the corresponding per-host option.  <literal>Verify-Host</"
-"literal> boolean suboption determines whether or not the server's hostname "
-"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
-"corresponding per-host option.  <literal>SslCert</literal> determines what "
-"certificate to use for client authentication. <literal>&lt;host&gt;::"
-"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
-"literal> determines what private key to use for client authentication. "
-"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
-"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
-"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> is the corresponding per-host option."
+"The options in these scopes configure APTs acquire transports for the "
+"protocols HTTP and HTTPS and are documented in the &apt-transport-http; and "
+"&apt-transport-https; manpages respectively."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4671,6 +4567,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"The option <literal>timeout</literal> sets the timeout timer used by the "
+"method; this value applies to the connection as well as the data timeout."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 "some situations require that passive mode be disabled and port mode FTP used "
@@ -5508,6 +5411,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Examples"
 msgstr "Przykłady"
 
@@ -7049,10 +6954,11 @@ msgid ""
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
-"especially that multiple values are separated by spaces, not by commas as in "
-"the one-line format. Multivalue fields like <literal>Architectures</literal> "
-"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
-"Remove</literal> to modify the default value rather than replacing it."
+"especially that multiple values are separated by whitespaces (like spaces, "
+"tabs and newlines), not by commas as in the one-line format.  Multivalue "
+"fields like <literal>Architectures</literal> also have "
+"<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+"literal> to modify the default value rather than replacing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -7493,19 +7399,23 @@ msgstr "Określanie URI"
 msgid "The currently recognized URI types are:"
 msgstr "Obecnie rozpoznawane są następujące typy URI:"
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-http;)"
+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;."
+"commonly used method. 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>
@@ -7519,6 +7429,11 @@ msgid ""
 "chosen transport method. See &apt-secure; for details."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-https;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
@@ -7943,6 +7858,8 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "1"
 msgstr "1"
 
@@ -8829,6 +8746,816 @@ msgstr ""
 "<command>apt-ftparchive</command> zwraca zero, gdy zakończyło się pomyślnie, "
 "100 - w przypadku błędu."
 
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Configuration file for APT"
+msgid "Login configuration file for APT sources and proxies"
+msgstr "Plik konfiguracyjny dla APT"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"APT configuration files like &sources-list; or &apt-conf; need to be "
+"accessible for everyone using apt tools on the system to have access to all "
+"package-related information like the available packages in a repository. "
+"Login information needed to connect to a proxy or to download data from a "
+"repository on the other hand shouldn't always be accessible by everyone and "
+"can hence not be placed in a file with world-readable file permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used "
+"to store login information in a netrc-like format with restrictive file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "netrc-like format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The format defined here is similar to the format of the <filename>~/.netrc</"
+"filename> file used by <citerefentry><refentrytitle><command>ftp</command></"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs "
+"interacting with servers.  It is a simple token-based format with the "
+"following tokens being recognized; Unknown tokens will be ignored. Tokens "
+"may be separated by spaces, tabs or newlines."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid ""
+"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Entries are looked up by searching for the <emphasis><literal>machine</"
+"literal></emphasis> token matching the hostname of the URI apt needs login "
+"information for. Extending the netrc-format a portnumber can be specified. "
+"If no port is given the token matches for all ports.  Similar the path is "
+"optional and only needed and useful if multiple repositories with different "
+"login information reside on the same server. A machine token with a path "
+"matches if the path in the URI starts with the path given in the token.  "
+"Once a match is made, the subsequent tokens are processed, stopping when the "
+"end of file is reached or another <emphasis><literal>machine</literal></"
+"emphasis> token is encountered."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>login</literal> <replaceable>name</replaceable>"
+msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The username to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "add <replaceable>file(s)</replaceable>"
+msgid "<literal>password</literal> <replaceable>string</replaceable>"
+msgstr "add <replaceable>plik(i)</replaceable>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The password to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Examples"
+msgid "Example"
+msgstr "Przykłady"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org\n"
+"login apt\n"
+"password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "machine example.org login apt password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org/deb login apt password debian\n"
+"machine example.org/debian login apt password debian\n"
+"machine example.org/debian/ login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org:80 login apt password debian\n"
+"machine example.org/deb/ login apt password debian\n"
+"machine example.org/ubuntu login apt password debian\n"
+"machine example.orga login apt password debian\n"
+"machine example.net login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Supplying login information for a user named <literal>apt</literal> with the "
+"password <literal>debian</literal> for the &sources-list; entry <placeholder "
+"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
+"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
+"the following in the auth.conf file could be used: <placeholder type="
+"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
+"specific all of these lines will also apply to the example entry: "
+"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
+"the following lines apply: <placeholder type=\"literallayout\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Notes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Basic support for this feature is present since version 0.7.25, but was "
+"undocumented for years. The documentation was added in version 1.5 changing "
+"also the implementation slightly. For maximum backward compatibility you "
+"should avoid multiple <literal>machine</literal> tokens with the same "
+"hostname, but if you need multiple they should all have a path specified in "
+"the <literal>machine</literal> token."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+msgid "<filename>/etc/apt/auth.conf</filename>"
+msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Show full versions for upgraded and installed packages.  Configuration "
+#| "Item: <literal>APT::Get::Show-Versions</literal>."
+msgid ""
+"Login information for APT sources and proxies in a netrc-like format.  "
+"Configuration Item: <literal>Dir::Etc::netrc</literal>."
+msgstr ""
+"Wyświetla pełne wersje aktualizowanych pakietów Pozycja w pliku "
+"konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>."
+
+#
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "&apt-conf;, &sources-list;, &apt-get;"
+msgid "&apt-conf; &sources-list;"
+msgstr "&apt-conf;, &sources-list;, &apt-get;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-http.1.xml
+msgid ""
+"APT transport for downloading via the Hypertext Transfer Protocol (HTTP)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the Hypertext "
+"Transfer Protocol (HTTP). It is available by default and probably the most "
+"used of all transports. Note that a transport is never called directly by a "
+"user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"HTTP is an unencrypted transport protocol meaning that the whole "
+"communication with the remote server (or proxy) can be observed by a "
+"sufficiently capable attacker referred to commonly as man in the middle "
+"(MITM).  Such an attacker can <emphasis>not</emphasis> modify the "
+"communication to compromise the security of your system through as APTs data "
+"security model is independent of the chosen transport method. This is "
+"explained in detail in &apt-secure;. An overview over available transport "
+"methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Various options are available to modify its behaviour which can be set in an "
+"&apt-conf; file ranging from proxy configuration to workaround for specific "
+"server insufficiencies."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Proxy Configuration"
+msgstr "Konfiguracja użytkownika"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The environment variable <envar>http_proxy</envar> is supported for system "
+"wide configuration.  Proxies specific to apt can be configured via the "
+"option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
+"used only for certain hosts can be specified via <literal>Acquire::http::"
+"Proxy::<replaceable>host</replaceable></literal>. Even more finegrained "
+"control can be achieved via proxy autodetection detailed further below.  All "
+"these options use the URI format <literal><replaceable>scheme</"
+"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
+"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
+"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
+"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
+"<literal>https</literal>.  Authentification details can be supplied via &apt-"
+"authconf; instead of including it in the URI directly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The various APT configuration options support the special value "
+"<literal>DIRECT</literal> meaning that no proxy should be used. The "
+"environment variable <envar>no_proxy</envar> with the same propose is also "
+"supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Further more there are three settings provided for cache control with "
+"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
+"tells the proxy not to use its cached response under any circumstances.  "
+"<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
+"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
+"http::No-Store</literal> specifies that the proxy should not store the "
+"requested archive files in its cache, which can be used to prevent the proxy "
+"from polluting its cache with (big) .deb files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Automatic Proxy Configuration"
+msgstr "Konfiguracja użytkownika"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the previously specified URI format or the word "
+"<literal>DIRECT</literal> if no proxy should be used. No output indicates "
+"that the generic proxy settings should be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Note that auto-detection will not be used for a host if a host-specific "
+"proxy configuration is already set via <literal>Acquire::http::Proxy::"
+"<replaceable>host</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"See the &squid-deb-proxy-client; and &auto-apt-proxy; packages for example "
+"implementations."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This option takes precedence over the legacy option name <literal>Acquire::"
+"http::ProxyAutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Connection Configuration"
+msgstr "Konfiguracja użytkownika"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The option <literal>Acquire::http::Timeout</literal> sets the timeout timer "
+"used by the method; this value applies to the connection as well as the data "
+"timeout."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+"literal> which accepts integer values in kilobytes per second. The default "
+"value is 0 which deactivates the limit and tries to use all available "
+"bandwidth. Note that this option implicitly disables downloading from "
+"multiple servers at the same time."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::SendAccept</literal> is enabled by default and sends "
+"a <literal>Accept: text/*</literal> header field to the server for requests "
+"without file extensions to prevent the server from attempting content "
+"negotiation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-http.1.xml
+#, no-wrap
+msgid ""
+"Acquire::http {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-http-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTP\";\n"
+"\tSendAccept \"false\";\n"
+"};\n"
+msgstr ""
+
+#
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgid "&apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-https.1.xml
+msgid "APT transport for downloading via the HTTP Secure protocol (HTTPS)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the HTTP "
+"Secure protocol (HTTPS) also referred to as HTTP over TLS. It is available "
+"by default since apt 1.5 and was before that available in a <package>apt-"
+"transport-https</package> package. Note that a transport is never called "
+"directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"HTTP is by itself an unencrypted transport protocol (compare &apt-transport-"
+"http;), which, as indicated by the appended S is wrapped in an encrypted "
+"layer known as Transport Layer Security (TLS) which provides end-to-end "
+"encryption.  A sufficiently capable attacker can still observe the "
+"communication partners and deeper analyse of the encrypted communcation "
+"might still reveal important details.  An overview over available "
+"alternative transport methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"The HTTPS protocol is based on the HTTP protocol and as such this "
+"implementation has the same relation meaning that all options supported by "
+"&apt-transport-http; are also available via <literal>Acquire::https</"
+"literal> and will default to the same values specified for <literal>Acquire::"
+"http</literal>. This manpage will only document the options <emphasis>unique "
+"to https</emphasis>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Server credentials"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"By default all certificates trusted by the system (see <package>ca-"
+"certificates</package> package) are used for the verification of the server "
+"certificate. An alternative certificate authority (CA) can be configured "
+"with the <literal>Acquire::https::CAInfo</literal> option and its host-"
+"specific option <literal>Acquire::https::CAInfo::<replaceable>host</"
+"replaceable></literal>.  The option specifies a file is made of the "
+"concatenation of the CA certificates (in PEM format) creating the chain used "
+"for the verification of the path from the root (self signed one). If the "
+"remote server provides the whole chain during the exchange, the file need "
+"only contain the root certificate. Otherwise, the whole chain is required. "
+"If you need to support multiple authorities, the only way is to concatenate "
+"everything."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"A custom certificate revocation list (CRL) can be configured with the "
+"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
+"https::CRLFile::<replaceable>host</replaceable></literal> respectively.  "
+"Like the previous option a file in PEM format needs to be specified."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Disabling security"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"When authenticating the server, if the certificate verification fails for "
+"some reason (expired, revoked, man in the middle, …), the connection fails.  "
+"This is obviously what you want in all cases and what the default value "
+"(true)  of the option <literal>Acquire::https::Verify-Peer</literal> and its "
+"host-specific variant provides. If you know <emphasis>exactly</emphasis> "
+"what you are doing, setting this option to \"false\" allows you to skip peer "
+"certificate verification and make the exchange succeed. Again, this option "
+"is for debugging or testing purpose only as it removes all security provided "
+"by the use of HTTPS."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Similarly the option <literal>Acquire::https::Verify-Host</literal> and its "
+"host-specific variant can be used to deactivate a security feature: The "
+"certificate provided by the server includes the identity of the server which "
+"should match the DNS name used to access it. By default, as requested by RFC "
+"2818, the name of the mirror is checked against the identity found in the "
+"certificate. This default behavior is safe and should not be changed, but if "
+"you know that the server you are using has a DNS name which does not match "
+"the identity in its certificate, you can set the option to \"false\", which "
+"will prevent the comparison to be done."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Client authentication"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Beside the password based authentication available (see &apt-authconf;) "
+"HTTPS supports authentication based on client certificates as well via "
+"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
+"SSLKey</literal>. They respectively should be set to the filename of the "
+"X.509 client certificate and the associated (unencrypted) private key, both "
+"in PEM format.  In practice the use of the host-specific variants of both "
+"options is highly recommended."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-https.1.xml
+#, no-wrap
+msgid ""
+"Acquire::https {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-https-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTPS\";\n"
+"\tSendAccept \"false\";\n"
+"\n"
+"\tCAInfo \"/path/to/ca/certs.pem\";\n"
+"\tCRLFile \"/path/to/all/crl.pem\";\n"
+"\tVerify-Peer \"true\";\n"
+"\tVerify-Host::broken.example.org \"false\";\n"
+"\tSSLCert::example.org \"/path/to/client/cert.pem\";\n"
+"\tSSLKey::example.org \"/path/to/client/key.pem\"\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+#, fuzzy
+#| msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgid "&apt-transport-http; &apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-mirror.1.xml
+msgid "APT transport for more automated mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This APT transport isn't implementing a protocol to access local or remote "
+"repositories on its own, but acquires a mirrorlist and redirects all "
+"requests to the mirror(s) picked from this list access via other transports "
+"like &apt-transport-http;. The basic functionality is available since apt "
+"0.7.24, but was undocumented until apt 1.6 which contained a complete rework "
+"of the transport and its supported features. Note that a transport is never "
+"called directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If the acquisition of a file via a mirror fails the method ensures that "
+"automatically another possible mirror of the list is tried until either the "
+"file is retrieved or no mirror is left in the list handling transparently "
+"server downtimes and similar problems."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The security implications of the transport are based on the security "
+"considerations associated with the transport used to acquire the mirrorlist "
+"and the transports involved in accessing the chosen mirror(s) by the "
+"transport."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This transport has no configuration options at present. The mirror selection "
+"is based entirely on the mirrors offered in the mirrorlist and the files apt "
+"needs to acquire."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirrorlist format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A mirrorlist contains at least one line each specifying an URI for a "
+"mirror.  Empty lines and those starting with a hash key (<literal>#</"
+"literal>) are ignored.  An URI always starts with a URI scheme which defines "
+"the transport used for this mirror. If the URI e.g. starts with "
+"<literal>http:</literal> the responsible transport is &apt-transport-http; "
+"which might have specific requirements for the format of the remaining part "
+"of the URI."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"An URI can optionally be separated from metadata about the mirror by a tab.  "
+"Multiple datapoints in the provided metadata can itself be separated by "
+"spaces for tabs.  (This is an advanced feature only available with apt >= "
+"1.6. Earlier apt versions will fail to parse mirrorlists using this feature)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Since apt 1.6 the usage of compressed mirrorlists is also supported.  Note "
+"that the filename of the mirrorlist must specify the compression algorithm "
+"used, there is no auto-detection based on file content performed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirror selection by metadata"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As specified in the format a mirror can have additional metadata attached to "
+"prevent a mirror from being selected for acquiring a file not matching this "
+"metadata.  This way the mirrorlist can e.g. contain partial mirrors serving "
+"only certain architectures and apt will automatically choose a different "
+"mirror for files requiring an unlisted architecture. Supported are limits "
+"for the architecture (<literal>arch</literal>), codename of the release "
+"(<literal>codename</literal>), component of the repository the file is in "
+"(<literal>component</literal>), language the file applies to (<literal>lang</"
+"literal>), suite name of the release (<literal>suite</literal>) and type of "
+"the file (<literal>type</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Fallback order for mirrors"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If no priority is given via the metadata key <literal>priority</literal> for "
+"a mirror the order in which mirrors are contacted is random. If a certain "
+"set of mirrors should be tried first before any of another set is tried a "
+"priority can be explicitly set. The mirrors with the lowest number are tried "
+"first. Mirrors which have no explicit priority set default to the highest "
+"possible number and are therefore tried last. The choice between mirrors "
+"with the same priority is again random."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Allowed transports in a mirrorlist"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The availability and choice of transports in a mirrorlist is limited by how "
+"the apt client is accessing the mirrorlist. If a local transport like "
+"<literal>file</literal> or <literal>copy</literal> is used the mirrorlist "
+"can also include local sources while a mirrorlist accessed via "
+"<literal>http</literal> can not. Additionally, a mirrorlist can not contain "
+"a mirrorlist or other wrapping transports (like <package>apt-transport-tor</"
+"package>).  See the documentation of these transports on how to use them "
+"with the mirror method."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that apt versions before 1.6 do not support any other transport than "
+"<literal>http</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Basic example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A basic mirrorlist example supported by all apt versions with a mirror "
+"method (>= 0.7.24) in which the client will pick any of the three mirrors:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"http://ftp.de.debian.org/debian/\n"
+"http://ftp.us.debian.org/debian/\n"
+"http://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
+"txt</filename> on your machine it can be used like this in &sources-list; "
+"(since apt 1.6):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror+file:/etc/apt/mirrorlist.txt &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"All versions of the mirror method support a mirrorlist accessible via http, "
+"so assuming it is available at <literal>http://apt.example.org/mirror.lst</"
+"literal> the sources.list entry from above could be written instead as:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb mirror://apt.example.org/mirror.lst &debian-stable-codename; main\n"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that since apt 1.6 the use of <literal>mirror+http</literal> should be "
+"preferred over <literal>mirror</literal> for uniformity. The functionality "
+"is the same."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Example with metadata-enhanced mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As explained in the format definition apt versions before 1.6 do not support "
+"this and will fail parsing the mirrorlist. The example mirrorlist is "
+"proposefully complicated to show some aspects of the selection. The "
+"following setup is assumed: The first mirror is local mirror accessible via "
+"the file method, but potentially incomplete. The second mirror has a great "
+"connection, but is a partial mirror in sofar as it only contains files "
+"related to the architectures <literal>amd64</literal> and <literal>all</"
+"literal>. The remaining mirrors are average mirrors which should be "
+"contacted only if the earlier ones didn't work."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"file:/srv/local/debian/mirror/\tpriority:1 type:index\n"
+"http://partial.example.org/mirror/\tpriority:2 arch:amd64 arch:all type:deb\n"
+"http://ftp.us.debian.org/debian/\ttype:deb\n"
+"http://ftp.de.debian.org/debian/\ttype:deb\n"
+"https://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"In this setup with this mirrorlist the first mirror will be used to download "
+"all index files assuming the mirrorlist itself is accessed via a local "
+"transport like <literal>file</literal>. If it isn't, the mirror is otherwise "
+"inaccessible or does not contain the requested file another mirror will be "
+"used to acquire the file, which one depending on the type of the file: An "
+"index file will be served by the last mirror in the list, while a package of "
+"architecture <literal>amd64</literal> is served by the second and those of e."
+"g. architecture <literal>i386</literal> by one of the last three."
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
 #: guide.dbk offline.dbk
 msgid "en"
@@ -10486,9 +11213,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Wyświetla listę odcisków zaufanych kluczy."
 
-#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
 #~ msgid "Local trust database of archive keys."
 #~ msgstr "Lokalna składnica zaufanych kluczy archiwum."
 
@@ -10866,9 +11590,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora"
 
-#~ msgid "add <replaceable>file(s)</replaceable>"
-#~ msgstr "add <replaceable>plik(i)</replaceable>"
-
 #~ msgid ""
 #~ "<literal>add</literal> adds the named package index files to the package "
 #~ "cache.  This is for debugging only."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 19638c757..fa027b777 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-08-24 23:21+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -669,7 +669,9 @@ msgstr "8"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "APT"
 msgstr "APT"
 
@@ -682,7 +684,9 @@ msgstr "interface de linha de comandos"
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Description"
 msgstr "Descrição"
 
@@ -940,7 +944,8 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
 msgid "See Also"
 msgstr "Veja também"
 
@@ -2041,7 +2046,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
-#: apt_preferences.5.xml
+#: apt_preferences.5.xml apt_auth.conf.5.xml
 msgid "Files"
 msgstr "Ficheiros"
 
@@ -2915,7 +2920,8 @@ msgstr ""
 "lo."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
 msgid "Options"
 msgstr "Opções"
 
@@ -3852,7 +3858,7 @@ msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt_auth.conf.5.xml
 msgid "5"
 msgstr "5"
 
@@ -4636,208 +4642,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
-"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>http_proxy</envar> environment variable will "
-"be used."
+"The options in these scopes configure APTs acquire transports for the "
+"protocols HTTP and HTTPS and are documented in the &apt-transport-http; and "
+"&apt-transport-https; manpages respectively."
 msgstr ""
-"<literal>http::Proxy</literal> define o proxy http predefinido a usar para "
-"URIs de HTTP. Está no formato standard de <literal>http://[[user][:"
-"pass]@]host[:port]/</literal>. Também podem ser especificados proxies por "
-"máquina ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> com a "
-"palavra chave especial <literal>DIRECT</literal> que significa não usar "
-"proxies. Se nenhuma das definições acima for especificada, será usada a "
-"variável de ambiente <envar>http_proxy</envar>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
-"response under any circumstances.  <literal>Max-Age</literal> sets the "
-"allowed maximum age (in seconds) of an index file in the cache of the "
-"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
-"store the requested archive files in its cache, which can be used to prevent "
-"the proxy from polluting its cache with (big) .deb files."
-msgstr ""
-"São disponibilizadas três definições para controle de cache como caches de "
-"proxy compatíveis com HTTP/1.1. <literal>No-Cache</literal> diz ao proxy "
-"para não usar a sua resposta em cache sob nenhumas circunstâncias, "
-"<literal>Max-Age</literal> define a idade máxima permitida (em segundos) de "
-"um ficheiro índice na cache do proxy. <literal>No-Store</literal> especifica "
-"que o proxy não deve armazenar os ficheiros de arquivo pedidos na sua cache, "
-"o que pode ser usado para prevenir que o proxy polua a sua cache com "
-"(grandes) ficheiros .deb."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"A opção <literal>timeout</literal> define o tempo limite usado por este "
-"método, este valor aplica-se à ligação assim como os tempos de limite de "
-"dados."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-#, fuzzy
-#| msgid ""
-#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
-#| "to enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be "
-#| "beneficial e.g. on high-latency connections. It specifies how many "
-#| "requests are sent in a pipeline.  Previous APT versions had a default of "
-#| "10 for this setting, but the default value is now 0 (= disabled) to avoid "
-#| "problems with the ever-growing amount of webservers and proxies which "
-#| "choose to not conform to the HTTP/1.1 specification."
-msgid ""
-"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and workaround misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
-"It is enabled by default with the value 10."
-msgstr ""
-"A definição <literal>Acquire::http::Pipeline-Depth</literal> pode ser usada "
-"para activar o 'pipelining' de HTTP (RFC 2616 secção 8.1.2.2) a qual pode "
-"ser benéfica por exemplo em ligações de alta latência. Especifica quantos "
-"pedidos são enviados num pipeline. As versões anteriores do APT tinham uma "
-"predefinição de 10 para esta definição, mas o valor predefinido agora é 0 (= "
-"desactivado) para evitar problemas com a quantidade crescente de servidores "
-"web e proxies que escolheram não respeitar a especificação HTTP/1.1."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
-"follow redirects, which is enabled by default."
-msgstr ""
-"<literal>Acquire::http::AllowRedirect</literal> controla se o APT irá seguir "
-"os redireccionamentos, o que está activo por predefinição."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobytes per second. The default "
-"value is 0 which deactivates the limit and tries to use all available "
-"bandwidth.  Note that this option implicitly disables downloading from "
-"multiple servers at the same time."
-msgstr ""
-"A largura de banda usada pode ser limitada com <literal>Acquire::http::Dl-"
-"Limit</literal> que aceita valores inteiros em kilobytes por segundo. O "
-"valor predefinido é 0 que desactiva o limite e tenta usar toda a largura de "
-"banda disponível. Note que esta opção implicitamente desactiva a descarga a "
-"partir de múltiplos servidores ao mesmo tempo."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
-"User-Agent for the http download method as some proxies allow access for "
-"clients only if the client uses a known identifier."
-msgstr ""
-"<literal>Acquire::http::User-Agent</literal> pode ser usado para definir um "
-"Utilizador-Agente diferente para o método de download por http, porque "
-"alguns proxies apenas permitem acesso a clientes se o cliente usar um "
-"identificador conhecido."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-#, fuzzy
-#| msgid ""
-#| "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to "
-#| "specify an external command to discover the http proxy to use. Apt "
-#| "expects the command to output the proxy on stdout in the style "
-#| "<literal>http://proxy:port/</literal>. This will override the generic "
-#| "<literal>Acquire::http::Proxy</literal> but not any specific host proxy "
-#| "configuration set via <literal>Acquire::http::Proxy::$HOST</literal>.  "
-#| "See the &squid-deb-proxy-client; package for an example implementation "
-#| "that uses avahi. This option takes precedence over the legacy option name "
-#| "<literal>ProxyAutoDetect</literal>."
-msgid ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
-"an external command to discover the http proxy to use. The first and only "
-"parameter is an URI denoting the host to be contacted to allow for host-"
-"specific configuration. APT expects the command to output the proxy on "
-"stdout as a single line in the style <literal>http://proxy:port/</literal> "
-"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
-"indicates that the generic proxy settings should be used.  Note that auto-"
-"detection will not be used for a host if a host-specific proxy configuration "
-"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
-"example implementation that uses avahi.  This option takes precedence over "
-"the legacy option name <literal>ProxyAutoDetect</literal>."
-msgstr ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> pode ser usado para "
-"especificar um comando externo para descobrir o proxy http a usar. O apt "
-"espera que o comando forneça o resultado do proxy no stdout ao estilo "
-"<literal>http://proxy:port/</literal>. Isto irá sobrepor o <literal>Acquire::"
-"http::Proxy</literal> genérico mas não qualquer configuração especifica da "
-"máquina proxy definida via <literal>Acquire::http::Proxy::$HOST</literal>. "
-"Veja o pacote &squid-deb-proxy-client; para um exemplo de implementação que "
-"usa avahi. Esta opção toma precedência sobre o nome de opção antigo "
-"<literal>ProxyAutoDetect</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
-"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
-"the <literal>http</literal> method, and default to the same values if they "
-"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
-"yet supported."
-msgstr ""
-"As opções <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> e "
-"<literal>proxy</literal> funcionam para URIs HTTPS do mesmo modo que para o "
-"método <literal>http</literal>, e tem por predefinição os mesmos valores se "
-"estes não forem definidos especificamente A opção <literal>Pipeline-Depth</"
-"literal> ainda não é suportada."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
-"corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
-"literal> is the corresponding per-host option.  <literal>Verify-Host</"
-"literal> boolean suboption determines whether or not the server's hostname "
-"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
-"corresponding per-host option.  <literal>SslCert</literal> determines what "
-"certificate to use for client authentication. <literal>&lt;host&gt;::"
-"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
-"literal> determines what private key to use for client authentication. "
-"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
-"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
-"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> is the corresponding per-host option."
-msgstr ""
-"A sub-opção <literal>CaInfo</literal> especifica o lugar do ficheiro que "
-"contém informação acerca de certificados de confiança. <literal>&lt;"
-"host&gt;::CaInfo</literal> é a opção 'por máquina' correspondente. A sub-"
-"opção booleana <literal>Verify-Peer</literal> determina se o certificado da "
-"máquina anfitriã deve ou não ser verificado com certificados de confiança. "
-"<literal>&lt;host&gt;::Verify-Peer</literal> é a opção 'por máquina' "
-"correspondente. A sub-opção booleana <literal>Verify-Host</literal> "
-"determina se o nome da máquina servidora deve ao não ser verificado. "
-"<literal>&lt;host&gt;::Verify-Host</literal> é a opção 'por máquina' "
-"correspondente. <literal>SslCert</literal> determina qual certificado a usar "
-"para autenticação de clientes. <literal>&lt;host&gt;::SslCert</literal> é a "
-"opção 'por máquina' correspondente. <literal>SslKey</literal> determina qual "
-"a chave privada a usar para autenticação de clientes. <literal>&lt;host&gt;::"
-"SslKey</literal> é a opção 'por máquina' correspondente. "
-"<literal>SslForceVersion</literal> sobrepõe a versão SSL predefinida a usar. "
-"Pode conter qualquer uma das strings 'TLSv1' ou 'SSLv3'. <literal>&lt;"
-"host&gt;::SslForceVersion</literal> é a opção 'por máquina' correspondente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4876,6 +4684,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"The option <literal>timeout</literal> sets the timeout timer used by the "
+"method; this value applies to the connection as well as the data timeout."
+msgstr ""
+"A opção <literal>timeout</literal> define o tempo limite usado por este "
+"método, este valor aplica-se à ligação assim como os tempos de limite de "
+"dados."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 "some situations require that passive mode be disabled and port mode FTP used "
@@ -6050,6 +5868,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Examples"
 msgstr "Exemplos"
 
@@ -7593,10 +7413,11 @@ msgid ""
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
-"especially that multiple values are separated by spaces, not by commas as in "
-"the one-line format. Multivalue fields like <literal>Architectures</literal> "
-"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
-"Remove</literal> to modify the default value rather than replacing it."
+"especially that multiple values are separated by whitespaces (like spaces, "
+"tabs and newlines), not by commas as in the one-line format.  Multivalue "
+"fields like <literal>Architectures</literal> also have "
+"<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+"literal> to modify the default value rather than replacing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -8040,19 +7861,23 @@ msgstr "Especificação da URI"
 msgid "The currently recognized URI types are:"
 msgstr "Os tipos de URI actualmente reconhecidos são:"
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-http;)"
+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;."
+"commonly used method. 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>
@@ -8066,6 +7891,11 @@ msgid ""
 "chosen transport method. See &apt-secure; for details."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-https;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
@@ -8504,6 +8334,8 @@ msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "1"
 msgstr "1"
 
@@ -9601,6 +9433,891 @@ msgstr ""
 "<command>apt-ftparchive</command> devolve zero na operação normal, 100 "
 "decimal em erro."
 
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Configuration file for APT"
+msgid "Login configuration file for APT sources and proxies"
+msgstr "Ficheiro de configuração para o APT"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"APT configuration files like &sources-list; or &apt-conf; need to be "
+"accessible for everyone using apt tools on the system to have access to all "
+"package-related information like the available packages in a repository. "
+"Login information needed to connect to a proxy or to download data from a "
+"repository on the other hand shouldn't always be accessible by everyone and "
+"can hence not be placed in a file with world-readable file permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used "
+"to store login information in a netrc-like format with restrictive file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "netrc-like format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The format defined here is similar to the format of the <filename>~/.netrc</"
+"filename> file used by <citerefentry><refentrytitle><command>ftp</command></"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs "
+"interacting with servers.  It is a simple token-based format with the "
+"following tokens being recognized; Unknown tokens will be ignored. Tokens "
+"may be separated by spaces, tabs or newlines."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid ""
+"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Entries are looked up by searching for the <emphasis><literal>machine</"
+"literal></emphasis> token matching the hostname of the URI apt needs login "
+"information for. Extending the netrc-format a portnumber can be specified. "
+"If no port is given the token matches for all ports.  Similar the path is "
+"optional and only needed and useful if multiple repositories with different "
+"login information reside on the same server. A machine token with a path "
+"matches if the path in the URI starts with the path given in the token.  "
+"Once a match is made, the subsequent tokens are processed, stopping when the "
+"end of file is reached or another <emphasis><literal>machine</literal></"
+"emphasis> token is encountered."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>login</literal> <replaceable>name</replaceable>"
+msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The username to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>password</literal> <replaceable>string</replaceable>"
+msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The password to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Examples"
+msgid "Example"
+msgstr "Exemplos"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org\n"
+"login apt\n"
+"password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "machine example.org login apt password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org/deb login apt password debian\n"
+"machine example.org/debian login apt password debian\n"
+"machine example.org/debian/ login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org:80 login apt password debian\n"
+"machine example.org/deb/ login apt password debian\n"
+"machine example.org/ubuntu login apt password debian\n"
+"machine example.orga login apt password debian\n"
+"machine example.net login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Supplying login information for a user named <literal>apt</literal> with the "
+"password <literal>debian</literal> for the &sources-list; entry <placeholder "
+"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
+"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
+"the following in the auth.conf file could be used: <placeholder type="
+"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
+"specific all of these lines will also apply to the example entry: "
+"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
+"the following lines apply: <placeholder type=\"literallayout\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Notes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Basic support for this feature is present since version 0.7.25, but was "
+"undocumented for years. The documentation was added in version 1.5 changing "
+"also the implementation slightly. For maximum backward compatibility you "
+"should avoid multiple <literal>machine</literal> tokens with the same "
+"hostname, but if you need multiple they should all have a path specified in "
+"the <literal>machine</literal> token."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+msgid "<filename>/etc/apt/auth.conf</filename>"
+msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Show full versions for upgraded and installed packages.  Configuration "
+#| "Item: <literal>APT::Get::Show-Versions</literal>."
+msgid ""
+"Login information for APT sources and proxies in a netrc-like format.  "
+"Configuration Item: <literal>Dir::Etc::netrc</literal>."
+msgstr ""
+"Mostra as versões completas para pacotes actualizados e instalados.  Item de "
+"Configuração: <literal>APT::Get::Show-Versions</literal>."
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "&apt-conf;, &sources-list;, &apt-get;"
+msgid "&apt-conf; &sources-list;"
+msgstr "&apt-conf;, &sources-list;, &apt-get;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-http.1.xml
+msgid ""
+"APT transport for downloading via the Hypertext Transfer Protocol (HTTP)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the Hypertext "
+"Transfer Protocol (HTTP). It is available by default and probably the most "
+"used of all transports. Note that a transport is never called directly by a "
+"user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"HTTP is an unencrypted transport protocol meaning that the whole "
+"communication with the remote server (or proxy) can be observed by a "
+"sufficiently capable attacker referred to commonly as man in the middle "
+"(MITM).  Such an attacker can <emphasis>not</emphasis> modify the "
+"communication to compromise the security of your system through as APTs data "
+"security model is independent of the chosen transport method. This is "
+"explained in detail in &apt-secure;. An overview over available transport "
+"methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Various options are available to modify its behaviour which can be set in an "
+"&apt-conf; file ranging from proxy configuration to workaround for specific "
+"server insufficiencies."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Proxy Configuration"
+msgstr "Configuração do utilizador"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The environment variable <envar>http_proxy</envar> is supported for system "
+"wide configuration.  Proxies specific to apt can be configured via the "
+"option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
+"used only for certain hosts can be specified via <literal>Acquire::http::"
+"Proxy::<replaceable>host</replaceable></literal>. Even more finegrained "
+"control can be achieved via proxy autodetection detailed further below.  All "
+"these options use the URI format <literal><replaceable>scheme</"
+"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
+"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
+"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
+"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
+"<literal>https</literal>.  Authentification details can be supplied via &apt-"
+"authconf; instead of including it in the URI directly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The various APT configuration options support the special value "
+"<literal>DIRECT</literal> meaning that no proxy should be used. The "
+"environment variable <envar>no_proxy</envar> with the same propose is also "
+"supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches.  <literal>No-Cache</literal> tells the proxy not to use its "
+#| "cached response under any circumstances.  <literal>Max-Age</literal> sets "
+#| "the allowed maximum age (in seconds) of an index file in the cache of the "
+#| "proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+#| "store the requested archive files in its cache, which can be used to "
+#| "prevent the proxy from polluting its cache with (big) .deb files."
+msgid ""
+"Further more there are three settings provided for cache control with "
+"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
+"tells the proxy not to use its cached response under any circumstances.  "
+"<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
+"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
+"http::No-Store</literal> specifies that the proxy should not store the "
+"requested archive files in its cache, which can be used to prevent the proxy "
+"from polluting its cache with (big) .deb files."
+msgstr ""
+"São disponibilizadas três definições para controle de cache como caches de "
+"proxy compatíveis com HTTP/1.1. <literal>No-Cache</literal> diz ao proxy "
+"para não usar a sua resposta em cache sob nenhumas circunstâncias, "
+"<literal>Max-Age</literal> define a idade máxima permitida (em segundos) de "
+"um ficheiro índice na cache do proxy. <literal>No-Store</literal> especifica "
+"que o proxy não deve armazenar os ficheiros de arquivo pedidos na sua cache, "
+"o que pode ser usado para prevenir que o proxy polua a sua cache com "
+"(grandes) ficheiros .deb."
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Automatic Proxy Configuration"
+msgstr "Configuração do utilizador"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to "
+#| "specify an external command to discover the http proxy to use. Apt "
+#| "expects the command to output the proxy on stdout in the style "
+#| "<literal>http://proxy:port/</literal>. This will override the generic "
+#| "<literal>Acquire::http::Proxy</literal> but not any specific host proxy "
+#| "configuration set via <literal>Acquire::http::Proxy::$HOST</literal>.  "
+#| "See the &squid-deb-proxy-client; package for an example implementation "
+#| "that uses avahi. This option takes precedence over the legacy option name "
+#| "<literal>ProxyAutoDetect</literal>."
+msgid ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the previously specified URI format or the word "
+"<literal>DIRECT</literal> if no proxy should be used. No output indicates "
+"that the generic proxy settings should be used."
+msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> pode ser usado para "
+"especificar um comando externo para descobrir o proxy http a usar. O apt "
+"espera que o comando forneça o resultado do proxy no stdout ao estilo "
+"<literal>http://proxy:port/</literal>. Isto irá sobrepor o <literal>Acquire::"
+"http::Proxy</literal> genérico mas não qualquer configuração especifica da "
+"máquina proxy definida via <literal>Acquire::http::Proxy::$HOST</literal>. "
+"Veja o pacote &squid-deb-proxy-client; para um exemplo de implementação que "
+"usa avahi. Esta opção toma precedência sobre o nome de opção antigo "
+"<literal>ProxyAutoDetect</literal>."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Note that auto-detection will not be used for a host if a host-specific "
+"proxy configuration is already set via <literal>Acquire::http::Proxy::"
+"<replaceable>host</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"See the &squid-deb-proxy-client; and &auto-apt-proxy; packages for example "
+"implementations."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This option takes precedence over the legacy option name <literal>Acquire::"
+"http::ProxyAutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "User Configuration"
+msgid "Connection Configuration"
+msgstr "Configuração do utilizador"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this value applies to the connection as well as the data timeout."
+msgid ""
+"The option <literal>Acquire::http::Timeout</literal> sets the timeout timer "
+"used by the method; this value applies to the connection as well as the data "
+"timeout."
+msgstr ""
+"A opção <literal>timeout</literal> define o tempo limite usado por este "
+"método, este valor aplica-se à ligação assim como os tempos de limite de "
+"dados."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes per second. The "
+#| "default value is 0 which deactivates the limit and tries to use all "
+#| "available bandwidth.  Note that this option implicitly disables "
+#| "downloading from multiple servers at the same time."
+msgid ""
+"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+"literal> which accepts integer values in kilobytes per second. The default "
+"value is 0 which deactivates the limit and tries to use all available "
+"bandwidth. Note that this option implicitly disables downloading from "
+"multiple servers at the same time."
+msgstr ""
+"A largura de banda usada pode ser limitada com <literal>Acquire::http::Dl-"
+"Limit</literal> que aceita valores inteiros em kilobytes por segundo. O "
+"valor predefinido é 0 que desactiva o limite e tenta usar toda a largura de "
+"banda disponível. Note que esta opção implicitamente desactiva a descarga a "
+"partir de múltiplos servidores ao mesmo tempo."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid ""
+#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
+#| "to enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be "
+#| "beneficial e.g. on high-latency connections. It specifies how many "
+#| "requests are sent in a pipeline.  Previous APT versions had a default of "
+#| "10 for this setting, but the default value is now 0 (= disabled) to avoid "
+#| "problems with the ever-growing amount of webservers and proxies which "
+#| "choose to not conform to the HTTP/1.1 specification."
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."
+msgstr ""
+"A definição <literal>Acquire::http::Pipeline-Depth</literal> pode ser usada "
+"para activar o 'pipelining' de HTTP (RFC 2616 secção 8.1.2.2) a qual pode "
+"ser benéfica por exemplo em ligações de alta latência. Especifica quantos "
+"pedidos são enviados num pipeline. As versões anteriores do APT tinham uma "
+"predefinição de 10 para esta definição, mas o valor predefinido agora é 0 (= "
+"desactivado) para evitar problemas com a quantidade crescente de servidores "
+"web e proxies que escolheram não respeitar a especificação HTTP/1.1."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+"<literal>Acquire::http::AllowRedirect</literal> controla se o APT irá seguir "
+"os redireccionamentos, o que está activo por predefinição."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+"<literal>Acquire::http::User-Agent</literal> pode ser usado para definir um "
+"Utilizador-Agente diferente para o método de download por http, porque "
+"alguns proxies apenas permitem acesso a clientes se o cliente usar um "
+"identificador conhecido."
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::SendAccept</literal> is enabled by default and sends "
+"a <literal>Accept: text/*</literal> header field to the server for requests "
+"without file extensions to prevent the server from attempting content "
+"negotiation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-http.1.xml
+#, no-wrap
+msgid ""
+"Acquire::http {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-http-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTP\";\n"
+"\tSendAccept \"false\";\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgid "&apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-https.1.xml
+msgid "APT transport for downloading via the HTTP Secure protocol (HTTPS)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the HTTP "
+"Secure protocol (HTTPS) also referred to as HTTP over TLS. It is available "
+"by default since apt 1.5 and was before that available in a <package>apt-"
+"transport-https</package> package. Note that a transport is never called "
+"directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"HTTP is by itself an unencrypted transport protocol (compare &apt-transport-"
+"http;), which, as indicated by the appended S is wrapped in an encrypted "
+"layer known as Transport Layer Security (TLS) which provides end-to-end "
+"encryption.  A sufficiently capable attacker can still observe the "
+"communication partners and deeper analyse of the encrypted communcation "
+"might still reveal important details.  An overview over available "
+"alternative transport methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"The HTTPS protocol is based on the HTTP protocol and as such this "
+"implementation has the same relation meaning that all options supported by "
+"&apt-transport-http; are also available via <literal>Acquire::https</"
+"literal> and will default to the same values specified for <literal>Acquire::"
+"http</literal>. This manpage will only document the options <emphasis>unique "
+"to https</emphasis>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Server credentials"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"By default all certificates trusted by the system (see <package>ca-"
+"certificates</package> package) are used for the verification of the server "
+"certificate. An alternative certificate authority (CA) can be configured "
+"with the <literal>Acquire::https::CAInfo</literal> option and its host-"
+"specific option <literal>Acquire::https::CAInfo::<replaceable>host</"
+"replaceable></literal>.  The option specifies a file is made of the "
+"concatenation of the CA certificates (in PEM format) creating the chain used "
+"for the verification of the path from the root (self signed one). If the "
+"remote server provides the whole chain during the exchange, the file need "
+"only contain the root certificate. Otherwise, the whole chain is required. "
+"If you need to support multiple authorities, the only way is to concatenate "
+"everything."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"A custom certificate revocation list (CRL) can be configured with the "
+"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
+"https::CRLFile::<replaceable>host</replaceable></literal> respectively.  "
+"Like the previous option a file in PEM format needs to be specified."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Disabling security"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"When authenticating the server, if the certificate verification fails for "
+"some reason (expired, revoked, man in the middle, …), the connection fails.  "
+"This is obviously what you want in all cases and what the default value "
+"(true)  of the option <literal>Acquire::https::Verify-Peer</literal> and its "
+"host-specific variant provides. If you know <emphasis>exactly</emphasis> "
+"what you are doing, setting this option to \"false\" allows you to skip peer "
+"certificate verification and make the exchange succeed. Again, this option "
+"is for debugging or testing purpose only as it removes all security provided "
+"by the use of HTTPS."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Similarly the option <literal>Acquire::https::Verify-Host</literal> and its "
+"host-specific variant can be used to deactivate a security feature: The "
+"certificate provided by the server includes the identity of the server which "
+"should match the DNS name used to access it. By default, as requested by RFC "
+"2818, the name of the mirror is checked against the identity found in the "
+"certificate. This default behavior is safe and should not be changed, but if "
+"you know that the server you are using has a DNS name which does not match "
+"the identity in its certificate, you can set the option to \"false\", which "
+"will prevent the comparison to be done."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Client authentication"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Beside the password based authentication available (see &apt-authconf;) "
+"HTTPS supports authentication based on client certificates as well via "
+"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
+"SSLKey</literal>. They respectively should be set to the filename of the "
+"X.509 client certificate and the associated (unencrypted) private key, both "
+"in PEM format.  In practice the use of the host-specific variants of both "
+"options is highly recommended."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-https.1.xml
+#, no-wrap
+msgid ""
+"Acquire::https {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-https-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTPS\";\n"
+"\tSendAccept \"false\";\n"
+"\n"
+"\tCAInfo \"/path/to/ca/certs.pem\";\n"
+"\tCRLFile \"/path/to/all/crl.pem\";\n"
+"\tVerify-Peer \"true\";\n"
+"\tVerify-Host::broken.example.org \"false\";\n"
+"\tSSLCert::example.org \"/path/to/client/cert.pem\";\n"
+"\tSSLKey::example.org \"/path/to/client/key.pem\"\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+#, fuzzy
+#| msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgid "&apt-transport-http; &apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-mirror.1.xml
+msgid "APT transport for more automated mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This APT transport isn't implementing a protocol to access local or remote "
+"repositories on its own, but acquires a mirrorlist and redirects all "
+"requests to the mirror(s) picked from this list access via other transports "
+"like &apt-transport-http;. The basic functionality is available since apt "
+"0.7.24, but was undocumented until apt 1.6 which contained a complete rework "
+"of the transport and its supported features. Note that a transport is never "
+"called directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If the acquisition of a file via a mirror fails the method ensures that "
+"automatically another possible mirror of the list is tried until either the "
+"file is retrieved or no mirror is left in the list handling transparently "
+"server downtimes and similar problems."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The security implications of the transport are based on the security "
+"considerations associated with the transport used to acquire the mirrorlist "
+"and the transports involved in accessing the chosen mirror(s) by the "
+"transport."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This transport has no configuration options at present. The mirror selection "
+"is based entirely on the mirrors offered in the mirrorlist and the files apt "
+"needs to acquire."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirrorlist format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A mirrorlist contains at least one line each specifying an URI for a "
+"mirror.  Empty lines and those starting with a hash key (<literal>#</"
+"literal>) are ignored.  An URI always starts with a URI scheme which defines "
+"the transport used for this mirror. If the URI e.g. starts with "
+"<literal>http:</literal> the responsible transport is &apt-transport-http; "
+"which might have specific requirements for the format of the remaining part "
+"of the URI."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"An URI can optionally be separated from metadata about the mirror by a tab.  "
+"Multiple datapoints in the provided metadata can itself be separated by "
+"spaces for tabs.  (This is an advanced feature only available with apt >= "
+"1.6. Earlier apt versions will fail to parse mirrorlists using this feature)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Since apt 1.6 the usage of compressed mirrorlists is also supported.  Note "
+"that the filename of the mirrorlist must specify the compression algorithm "
+"used, there is no auto-detection based on file content performed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirror selection by metadata"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As specified in the format a mirror can have additional metadata attached to "
+"prevent a mirror from being selected for acquiring a file not matching this "
+"metadata.  This way the mirrorlist can e.g. contain partial mirrors serving "
+"only certain architectures and apt will automatically choose a different "
+"mirror for files requiring an unlisted architecture. Supported are limits "
+"for the architecture (<literal>arch</literal>), codename of the release "
+"(<literal>codename</literal>), component of the repository the file is in "
+"(<literal>component</literal>), language the file applies to (<literal>lang</"
+"literal>), suite name of the release (<literal>suite</literal>) and type of "
+"the file (<literal>type</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Fallback order for mirrors"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If no priority is given via the metadata key <literal>priority</literal> for "
+"a mirror the order in which mirrors are contacted is random. If a certain "
+"set of mirrors should be tried first before any of another set is tried a "
+"priority can be explicitly set. The mirrors with the lowest number are tried "
+"first. Mirrors which have no explicit priority set default to the highest "
+"possible number and are therefore tried last. The choice between mirrors "
+"with the same priority is again random."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Allowed transports in a mirrorlist"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The availability and choice of transports in a mirrorlist is limited by how "
+"the apt client is accessing the mirrorlist. If a local transport like "
+"<literal>file</literal> or <literal>copy</literal> is used the mirrorlist "
+"can also include local sources while a mirrorlist accessed via "
+"<literal>http</literal> can not. Additionally, a mirrorlist can not contain "
+"a mirrorlist or other wrapping transports (like <package>apt-transport-tor</"
+"package>).  See the documentation of these transports on how to use them "
+"with the mirror method."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that apt versions before 1.6 do not support any other transport than "
+"<literal>http</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Basic example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A basic mirrorlist example supported by all apt versions with a mirror "
+"method (>= 0.7.24) in which the client will pick any of the three mirrors:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"http://ftp.de.debian.org/debian/\n"
+"http://ftp.us.debian.org/debian/\n"
+"http://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
+"txt</filename> on your machine it can be used like this in &sources-list; "
+"(since apt 1.6):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror+file:/etc/apt/mirrorlist.txt &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"All versions of the mirror method support a mirrorlist accessible via http, "
+"so assuming it is available at <literal>http://apt.example.org/mirror.lst</"
+"literal> the sources.list entry from above could be written instead as:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid "deb mirror://apt.example.org/mirror.lst &debian-stable-codename; main\n"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that since apt 1.6 the use of <literal>mirror+http</literal> should be "
+"preferred over <literal>mirror</literal> for uniformity. The functionality "
+"is the same."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Example with metadata-enhanced mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As explained in the format definition apt versions before 1.6 do not support "
+"this and will fail parsing the mirrorlist. The example mirrorlist is "
+"proposefully complicated to show some aspects of the selection. The "
+"following setup is assumed: The first mirror is local mirror accessible via "
+"the file method, but potentially incomplete. The second mirror has a great "
+"connection, but is a partial mirror in sofar as it only contains files "
+"related to the architectures <literal>amd64</literal> and <literal>all</"
+"literal>. The remaining mirrors are average mirrors which should be "
+"contacted only if the earlier ones didn't work."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"file:/srv/local/debian/mirror/\tpriority:1 type:index\n"
+"http://partial.example.org/mirror/\tpriority:2 arch:amd64 arch:all type:deb\n"
+"http://ftp.us.debian.org/debian/\ttype:deb\n"
+"http://ftp.de.debian.org/debian/\ttype:deb\n"
+"https://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"In this setup with this mirrorlist the first mirror will be used to download "
+"all index files assuming the mirrorlist itself is accessed via a local "
+"transport like <literal>file</literal>. If it isn't, the mirror is otherwise "
+"inaccessible or does not contain the requested file another mirror will be "
+"used to acquire the file, which one depending on the type of the file: An "
+"index file will be served by the last mirror in the list, while a package of "
+"architecture <literal>amd64</literal> is served by the second and those of e."
+"g. architecture <literal>i386</literal> by one of the last three."
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
 #: guide.dbk offline.dbk
 msgid "en"
@@ -11190,6 +11907,77 @@ 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 ""
+#~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
+#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
+#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
+#~ "the above settings is specified, <envar>http_proxy</envar> environment "
+#~ "variable will be used."
+#~ msgstr ""
+#~ "<literal>http::Proxy</literal> define o proxy http predefinido a usar "
+#~ "para URIs de HTTP. Está no formato standard de <literal>http://[[user][:"
+#~ "pass]@]host[:port]/</literal>. Também podem ser especificados proxies por "
+#~ "máquina ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> "
+#~ "com a palavra chave especial <literal>DIRECT</literal> que significa não "
+#~ "usar proxies. Se nenhuma das definições acima for especificada, será "
+#~ "usada a variável de ambiente <envar>http_proxy</envar>."
+
+#~ msgid ""
+#~ "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+#~ "<literal>proxy</literal> options work for HTTPS URIs in the same way as "
+#~ "for the <literal>http</literal> method, and default to the same values if "
+#~ "they are not explicitly set. The <literal>Pipeline-Depth</literal> option "
+#~ "is not yet supported."
+#~ msgstr ""
+#~ "As opções <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+#~ "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> e "
+#~ "<literal>proxy</literal> funcionam para URIs HTTPS do mesmo modo que para "
+#~ "o método <literal>http</literal>, e tem por predefinição os mesmos "
+#~ "valores se estes não forem definidos especificamente A opção "
+#~ "<literal>Pipeline-Depth</literal> ainda não é suportada."
+
+#~ msgid ""
+#~ "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#~ "boolean suboption determines whether or not the server's host certificate "
+#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
+#~ "Verify-Peer</literal> is the corresponding per-host option.  "
+#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
+#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
+#~ "Verify-Host</literal> is the corresponding per-host option.  "
+#~ "<literal>SslCert</literal> determines what certificate to use for client "
+#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
+#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
+#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
+#~ "SslKey</literal> is the corresponding per-host option.  "
+#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
+#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
+#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "literal> is the corresponding per-host option."
+#~ msgstr ""
+#~ "A sub-opção <literal>CaInfo</literal> especifica o lugar do ficheiro que "
+#~ "contém informação acerca de certificados de confiança. <literal>&lt;"
+#~ "host&gt;::CaInfo</literal> é a opção 'por máquina' correspondente. A sub-"
+#~ "opção booleana <literal>Verify-Peer</literal> determina se o certificado "
+#~ "da máquina anfitriã deve ou não ser verificado com certificados de "
+#~ "confiança. <literal>&lt;host&gt;::Verify-Peer</literal> é a opção 'por "
+#~ "máquina' correspondente. A sub-opção booleana <literal>Verify-Host</"
+#~ "literal> determina se o nome da máquina servidora deve ao não ser "
+#~ "verificado. <literal>&lt;host&gt;::Verify-Host</literal> é a opção 'por "
+#~ "máquina' correspondente. <literal>SslCert</literal> determina qual "
+#~ "certificado a usar para autenticação de clientes. <literal>&lt;host&gt;::"
+#~ "SslCert</literal> é a opção 'por máquina' correspondente. "
+#~ "<literal>SslKey</literal> determina qual a chave privada a usar para "
+#~ "autenticação de clientes. <literal>&lt;host&gt;::SslKey</literal> é a "
+#~ "opção 'por máquina' correspondente. <literal>SslForceVersion</literal> "
+#~ "sobrepõe a versão SSL predefinida a usar. Pode conter qualquer uma das "
+#~ "strings 'TLSv1' ou 'SSLv3'. <literal>&lt;host&gt;::SslForceVersion</"
+#~ "literal> é a opção 'por máquina' correspondente."
+
+#~ 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</"
@@ -11375,9 +12163,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Lista as fingerprints das chaves de confiança."
 
-#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
 #~ msgid "Local trust database of archive keys."
 #~ msgstr "Base de dados local de confiança de chaves de arquivos."
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 402640fac..285ca64df 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-08-24 23:21+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -488,7 +488,9 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "APT"
 msgstr ""
 
@@ -501,7 +503,9 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 #, fuzzy
 msgid "Description"
 msgstr "Descrição"
@@ -690,7 +694,8 @@ msgstr ""
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
-#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
 #, fuzzy
 msgid "See Also"
 msgstr "Consulte também"
@@ -1428,7 +1433,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
-#: apt_preferences.5.xml
+#: apt_preferences.5.xml apt_auth.conf.5.xml
 msgid "Files"
 msgstr ""
 
@@ -2052,7 +2057,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
 msgid "Options"
 msgstr ""
 
@@ -2727,7 +2733,7 @@ msgid "dburrows@debian.org"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt_auth.conf.5.xml
 msgid "5"
 msgstr ""
 
@@ -3240,119 +3246,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
-"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>http_proxy</envar> environment variable will "
-"be used."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
-"response under any circumstances.  <literal>Max-Age</literal> sets the "
-"allowed maximum age (in seconds) of an index file in the cache of the "
-"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
-"store the requested archive files in its cache, which can be used to prevent "
-"the proxy from polluting its cache with (big) .deb files."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and workaround misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
-"It is enabled by default with the value 10."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
-"follow redirects, which is enabled by default."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobytes per second. The default "
-"value is 0 which deactivates the limit and tries to use all available "
-"bandwidth.  Note that this option implicitly disables downloading from "
-"multiple servers at the same time."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
-"User-Agent for the http download method as some proxies allow access for "
-"clients only if the client uses a known identifier."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
-"an external command to discover the http proxy to use. The first and only "
-"parameter is an URI denoting the host to be contacted to allow for host-"
-"specific configuration. APT expects the command to output the proxy on "
-"stdout as a single line in the style <literal>http://proxy:port/</literal> "
-"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
-"indicates that the generic proxy settings should be used.  Note that auto-"
-"detection will not be used for a host if a host-specific proxy configuration "
-"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
-"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
-"example implementation that uses avahi.  This option takes precedence over "
-"the legacy option name <literal>ProxyAutoDetect</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
-"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
-"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
-"the <literal>http</literal> method, and default to the same values if they "
-"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
-"yet supported."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
-"corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
-"literal> is the corresponding per-host option.  <literal>Verify-Host</"
-"literal> boolean suboption determines whether or not the server's hostname "
-"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
-"corresponding per-host option.  <literal>SslCert</literal> determines what "
-"certificate to use for client authentication. <literal>&lt;host&gt;::"
-"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
-"literal> determines what private key to use for client authentication. "
-"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
-"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
-"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> is the corresponding per-host option."
+"The options in these scopes configure APTs acquire transports for the "
+"protocols HTTP and HTTPS and are documented in the &apt-transport-http; and "
+"&apt-transport-https; manpages respectively."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3377,6 +3273,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"The option <literal>timeout</literal> sets the timeout timer used by the "
+"method; this value applies to the connection as well as the data timeout."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 "some situations require that passive mode be disabled and port mode FTP used "
@@ -4207,6 +4110,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "Examples"
 msgstr "Exemplos"
 
@@ -5709,10 +5614,11 @@ msgid ""
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
-"especially that multiple values are separated by spaces, not by commas as in "
-"the one-line format. Multivalue fields like <literal>Architectures</literal> "
-"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
-"Remove</literal> to modify the default value rather than replacing it."
+"especially that multiple values are separated by whitespaces (like spaces, "
+"tabs and newlines), not by commas as in the one-line format.  Multivalue "
+"fields like <literal>Architectures</literal> also have "
+"<literal>Architectures-Add</literal> and <literal>Architectures-Remove</"
+"literal> to modify the default value rather than replacing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6029,19 +5935,23 @@ msgstr ""
 msgid "The currently recognized URI types are:"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-http;)"
+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;."
+"commonly used method. 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>
@@ -6055,6 +5965,11 @@ msgid ""
 "chosen transport method. See &apt-secure; for details."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml
+msgid "(&apt-transport-https;)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
@@ -6368,6 +6283,8 @@ msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
+#: apt-transport-http.1.xml apt-transport-https.1.xml
+#: apt-transport-mirror.1.xml
 msgid "1"
 msgstr ""
 
@@ -7170,6 +7087,795 @@ msgid ""
 "100 on error."
 msgstr ""
 
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt_auth.conf.5.xml
+msgid "Login configuration file for APT sources and proxies"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"APT configuration files like &sources-list; or &apt-conf; need to be "
+"accessible for everyone using apt tools on the system to have access to all "
+"package-related information like the available packages in a repository. "
+"Login information needed to connect to a proxy or to download data from a "
+"repository on the other hand shouldn't always be accessible by everyone and "
+"can hence not be placed in a file with world-readable file permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used "
+"to store login information in a netrc-like format with restrictive file "
+"permissions."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "netrc-like format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"The format defined here is similar to the format of the <filename>~/.netrc</"
+"filename> file used by <citerefentry><refentrytitle><command>ftp</command></"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs "
+"interacting with servers.  It is a simple token-based format with the "
+"following tokens being recognized; Unknown tokens will be ignored. Tokens "
+"may be separated by spaces, tabs or newlines."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+msgid ""
+"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Entries are looked up by searching for the <emphasis><literal>machine</"
+"literal></emphasis> token matching the hostname of the URI apt needs login "
+"information for. Extending the netrc-format a portnumber can be specified. "
+"If no port is given the token matches for all ports.  Similar the path is "
+"optional and only needed and useful if multiple repositories with different "
+"login information reside on the same server. A machine token with a path "
+"matches if the path in the URI starts with the path given in the token.  "
+"Once a match is made, the subsequent tokens are processed, stopping when the "
+"end of file is reached or another <emphasis><literal>machine</literal></"
+"emphasis> token is encountered."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>login</literal> <replaceable>name</replaceable>"
+msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The username to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "apt-get install <replaceable>package</replaceable>/sid\n"
+msgid "<literal>password</literal> <replaceable>string</replaceable>"
+msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "The password to be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "Examples"
+msgid "Example"
+msgstr "Exemplos"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org\n"
+"login apt\n"
+"password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid "machine example.org login apt password debian"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org/deb login apt password debian\n"
+"machine example.org/debian login apt password debian\n"
+"machine example.org/debian/ login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt_auth.conf.5.xml
+#, no-wrap
+msgid ""
+"machine example.org:80 login apt password debian\n"
+"machine example.org/deb/ login apt password debian\n"
+"machine example.org/ubuntu login apt password debian\n"
+"machine example.orga login apt password debian\n"
+"machine example.net login apt password debian\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Supplying login information for a user named <literal>apt</literal> with the "
+"password <literal>debian</literal> for the &sources-list; entry <placeholder "
+"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
+"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
+"the following in the auth.conf file could be used: <placeholder type="
+"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
+"specific all of these lines will also apply to the example entry: "
+"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
+"the following lines apply: <placeholder type=\"literallayout\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt_auth.conf.5.xml
+msgid "Notes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Basic support for this feature is present since version 0.7.25, but was "
+"undocumented for years. The documentation was added in version 1.5 changing "
+"also the implementation slightly. For maximum backward compatibility you "
+"should avoid multiple <literal>machine</literal> tokens with the same "
+"hostname, but if you need multiple they should all have a path specified in "
+"the <literal>machine</literal> token."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt_auth.conf.5.xml
+#, fuzzy
+msgid "<filename>/etc/apt/auth.conf</filename>"
+msgstr "<filename>/etc/apt.conf</>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information for APT sources and proxies in a netrc-like format.  "
+"Configuration Item: <literal>Dir::Etc::netrc</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgid "&apt-conf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-http.1.xml
+msgid ""
+"APT transport for downloading via the Hypertext Transfer Protocol (HTTP)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the Hypertext "
+"Transfer Protocol (HTTP). It is available by default and probably the most "
+"used of all transports. Note that a transport is never called directly by a "
+"user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"HTTP is an unencrypted transport protocol meaning that the whole "
+"communication with the remote server (or proxy) can be observed by a "
+"sufficiently capable attacker referred to commonly as man in the middle "
+"(MITM).  Such an attacker can <emphasis>not</emphasis> modify the "
+"communication to compromise the security of your system through as APTs data "
+"security model is independent of the chosen transport method. This is "
+"explained in detail in &apt-secure;. An overview over available transport "
+"methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Various options are available to modify its behaviour which can be set in an "
+"&apt-conf; file ranging from proxy configuration to workaround for specific "
+"server insufficiencies."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+msgid "Proxy Configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The environment variable <envar>http_proxy</envar> is supported for system "
+"wide configuration.  Proxies specific to apt can be configured via the "
+"option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
+"used only for certain hosts can be specified via <literal>Acquire::http::"
+"Proxy::<replaceable>host</replaceable></literal>. Even more finegrained "
+"control can be achieved via proxy autodetection detailed further below.  All "
+"these options use the URI format <literal><replaceable>scheme</"
+"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
+"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
+"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
+"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
+"<literal>https</literal>.  Authentification details can be supplied via &apt-"
+"authconf; instead of including it in the URI directly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The various APT configuration options support the special value "
+"<literal>DIRECT</literal> meaning that no proxy should be used. The "
+"environment variable <envar>no_proxy</envar> with the same propose is also "
+"supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Further more there are three settings provided for cache control with "
+"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
+"tells the proxy not to use its cached response under any circumstances.  "
+"<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
+"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
+"http::No-Store</literal> specifies that the proxy should not store the "
+"requested archive files in its cache, which can be used to prevent the proxy "
+"from polluting its cache with (big) .deb files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+msgid "Automatic Proxy Configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the previously specified URI format or the word "
+"<literal>DIRECT</literal> if no proxy should be used. No output indicates "
+"that the generic proxy settings should be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"Note that auto-detection will not be used for a host if a host-specific "
+"proxy configuration is already set via <literal>Acquire::http::Proxy::"
+"<replaceable>host</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"See the &squid-deb-proxy-client; and &auto-apt-proxy; packages for example "
+"implementations."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"This option takes precedence over the legacy option name <literal>Acquire::"
+"http::ProxyAutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-http.1.xml
+msgid "Connection Configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The option <literal>Acquire::http::Timeout</literal> sets the timeout timer "
+"used by the method; this value applies to the connection as well as the data "
+"timeout."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+"literal> which accepts integer values in kilobytes per second. The default "
+"value is 0 which deactivates the limit and tries to use all available "
+"bandwidth. Note that this option implicitly disables downloading from "
+"multiple servers at the same time."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-http.1.xml
+msgid ""
+"<literal>Acquire::http::SendAccept</literal> is enabled by default and sends "
+"a <literal>Accept: text/*</literal> header field to the server for requests "
+"without file extensions to prevent the server from attempting content "
+"negotiation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-http.1.xml
+#, no-wrap
+msgid ""
+"Acquire::http {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-http-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTP\";\n"
+"\tSendAccept \"false\";\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-http.1.xml
+#, fuzzy
+#| msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgid "&apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-https.1.xml
+msgid "APT transport for downloading via the HTTP Secure protocol (HTTPS)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"This APT transport allows the use of repositories accessed via the HTTP "
+"Secure protocol (HTTPS) also referred to as HTTP over TLS. It is available "
+"by default since apt 1.5 and was before that available in a <package>apt-"
+"transport-https</package> package. Note that a transport is never called "
+"directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"HTTP is by itself an unencrypted transport protocol (compare &apt-transport-"
+"http;), which, as indicated by the appended S is wrapped in an encrypted "
+"layer known as Transport Layer Security (TLS) which provides end-to-end "
+"encryption.  A sufficiently capable attacker can still observe the "
+"communication partners and deeper analyse of the encrypted communcation "
+"might still reveal important details.  An overview over available "
+"alternative transport methods is given in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+msgid ""
+"The HTTPS protocol is based on the HTTP protocol and as such this "
+"implementation has the same relation meaning that all options supported by "
+"&apt-transport-http; are also available via <literal>Acquire::https</"
+"literal> and will default to the same values specified for <literal>Acquire::"
+"http</literal>. This manpage will only document the options <emphasis>unique "
+"to https</emphasis>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Server credentials"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"By default all certificates trusted by the system (see <package>ca-"
+"certificates</package> package) are used for the verification of the server "
+"certificate. An alternative certificate authority (CA) can be configured "
+"with the <literal>Acquire::https::CAInfo</literal> option and its host-"
+"specific option <literal>Acquire::https::CAInfo::<replaceable>host</"
+"replaceable></literal>.  The option specifies a file is made of the "
+"concatenation of the CA certificates (in PEM format) creating the chain used "
+"for the verification of the path from the root (self signed one). If the "
+"remote server provides the whole chain during the exchange, the file need "
+"only contain the root certificate. Otherwise, the whole chain is required. "
+"If you need to support multiple authorities, the only way is to concatenate "
+"everything."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"A custom certificate revocation list (CRL) can be configured with the "
+"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
+"https::CRLFile::<replaceable>host</replaceable></literal> respectively.  "
+"Like the previous option a file in PEM format needs to be specified."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Disabling security"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"When authenticating the server, if the certificate verification fails for "
+"some reason (expired, revoked, man in the middle, …), the connection fails.  "
+"This is obviously what you want in all cases and what the default value "
+"(true)  of the option <literal>Acquire::https::Verify-Peer</literal> and its "
+"host-specific variant provides. If you know <emphasis>exactly</emphasis> "
+"what you are doing, setting this option to \"false\" allows you to skip peer "
+"certificate verification and make the exchange succeed. Again, this option "
+"is for debugging or testing purpose only as it removes all security provided "
+"by the use of HTTPS."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Similarly the option <literal>Acquire::https::Verify-Host</literal> and its "
+"host-specific variant can be used to deactivate a security feature: The "
+"certificate provided by the server includes the identity of the server which "
+"should match the DNS name used to access it. By default, as requested by RFC "
+"2818, the name of the mirror is checked against the identity found in the "
+"certificate. This default behavior is safe and should not be changed, but if "
+"you know that the server you are using has a DNS name which does not match "
+"the identity in its certificate, you can set the option to \"false\", which "
+"will prevent the comparison to be done."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-https.1.xml
+msgid "Client authentication"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-https.1.xml
+msgid ""
+"Beside the password based authentication available (see &apt-authconf;) "
+"HTTPS supports authentication based on client certificates as well via "
+"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
+"SSLKey</literal>. They respectively should be set to the filename of the "
+"X.509 client certificate and the associated (unencrypted) private key, both "
+"in PEM format.  In practice the use of the host-specific variants of both "
+"options is highly recommended."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: apt-transport-https.1.xml
+#, no-wrap
+msgid ""
+"Acquire::https {\n"
+"\tProxy::example.org \"DIRECT\";\n"
+"\tProxy \"socks5h://apt:pass@localhost:9050\";\n"
+"\tProxy-Auto-Detect \"/usr/local/bin/apt-https-proxy-auto-detect\";\n"
+"\tNo-Cache \"true\";\n"
+"\tMax-Age \"3600\";\n"
+"\tNo-Store \"true\";\n"
+"\tTimeout \"10\";\n"
+"\tDl-Limit \"42\";\n"
+"\tPipeline-Depth \"0\";\n"
+"\tAllowRedirect \"false\";\n"
+"\tUser-Agent \"My APT-HTTPS\";\n"
+"\tSendAccept \"false\";\n"
+"\n"
+"\tCAInfo \"/path/to/ca/certs.pem\";\n"
+"\tCRLFile \"/path/to/all/crl.pem\";\n"
+"\tVerify-Peer \"true\";\n"
+"\tVerify-Host::broken.example.org \"false\";\n"
+"\tSSLCert::example.org \"/path/to/client/cert.pem\";\n"
+"\tSSLKey::example.org \"/path/to/client/key.pem\"\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-https.1.xml
+#, fuzzy
+#| msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgid "&apt-transport-http; &apt-conf; &apt-authconf; &sources-list;"
+msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-transport-mirror.1.xml
+msgid "APT transport for more automated mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This APT transport isn't implementing a protocol to access local or remote "
+"repositories on its own, but acquires a mirrorlist and redirects all "
+"requests to the mirror(s) picked from this list access via other transports "
+"like &apt-transport-http;. The basic functionality is available since apt "
+"0.7.24, but was undocumented until apt 1.6 which contained a complete rework "
+"of the transport and its supported features. Note that a transport is never "
+"called directly by a user but used by APT tools based on user configuration."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If the acquisition of a file via a mirror fails the method ensures that "
+"automatically another possible mirror of the list is tried until either the "
+"file is retrieved or no mirror is left in the list handling transparently "
+"server downtimes and similar problems."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The security implications of the transport are based on the security "
+"considerations associated with the transport used to acquire the mirrorlist "
+"and the transports involved in accessing the chosen mirror(s) by the "
+"transport."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"This transport has no configuration options at present. The mirror selection "
+"is based entirely on the mirrors offered in the mirrorlist and the files apt "
+"needs to acquire."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirrorlist format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A mirrorlist contains at least one line each specifying an URI for a "
+"mirror.  Empty lines and those starting with a hash key (<literal>#</"
+"literal>) are ignored.  An URI always starts with a URI scheme which defines "
+"the transport used for this mirror. If the URI e.g. starts with "
+"<literal>http:</literal> the responsible transport is &apt-transport-http; "
+"which might have specific requirements for the format of the remaining part "
+"of the URI."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"An URI can optionally be separated from metadata about the mirror by a tab.  "
+"Multiple datapoints in the provided metadata can itself be separated by "
+"spaces for tabs.  (This is an advanced feature only available with apt >= "
+"1.6. Earlier apt versions will fail to parse mirrorlists using this feature)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Since apt 1.6 the usage of compressed mirrorlists is also supported.  Note "
+"that the filename of the mirrorlist must specify the compression algorithm "
+"used, there is no auto-detection based on file content performed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Mirror selection by metadata"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As specified in the format a mirror can have additional metadata attached to "
+"prevent a mirror from being selected for acquiring a file not matching this "
+"metadata.  This way the mirrorlist can e.g. contain partial mirrors serving "
+"only certain architectures and apt will automatically choose a different "
+"mirror for files requiring an unlisted architecture. Supported are limits "
+"for the architecture (<literal>arch</literal>), codename of the release "
+"(<literal>codename</literal>), component of the repository the file is in "
+"(<literal>component</literal>), language the file applies to (<literal>lang</"
+"literal>), suite name of the release (<literal>suite</literal>) and type of "
+"the file (<literal>type</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Fallback order for mirrors"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"If no priority is given via the metadata key <literal>priority</literal> for "
+"a mirror the order in which mirrors are contacted is random. If a certain "
+"set of mirrors should be tried first before any of another set is tried a "
+"priority can be explicitly set. The mirrors with the lowest number are tried "
+"first. Mirrors which have no explicit priority set default to the highest "
+"possible number and are therefore tried last. The choice between mirrors "
+"with the same priority is again random."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Allowed transports in a mirrorlist"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"The availability and choice of transports in a mirrorlist is limited by how "
+"the apt client is accessing the mirrorlist. If a local transport like "
+"<literal>file</literal> or <literal>copy</literal> is used the mirrorlist "
+"can also include local sources while a mirrorlist accessed via "
+"<literal>http</literal> can not. Additionally, a mirrorlist can not contain "
+"a mirrorlist or other wrapping transports (like <package>apt-transport-tor</"
+"package>).  See the documentation of these transports on how to use them "
+"with the mirror method."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that apt versions before 1.6 do not support any other transport than "
+"<literal>http</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Basic example"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"A basic mirrorlist example supported by all apt versions with a mirror "
+"method (>= 0.7.24) in which the client will pick any of the three mirrors:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"http://ftp.de.debian.org/debian/\n"
+"http://ftp.us.debian.org/debian/\n"
+"http://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
+"txt</filename> on your machine it can be used like this in &sources-list; "
+"(since apt 1.6):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror+file:/etc/apt/mirrorlist.txt &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"All versions of the mirror method support a mirrorlist accessible via http, "
+"so assuming it is available at <literal>http://apt.example.org/mirror.lst</"
+"literal> the sources.list entry from above could be written instead as:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid "deb mirror://apt.example.org/mirror.lst &debian-stable-codename; main\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"Note that since apt 1.6 the use of <literal>mirror+http</literal> should be "
+"preferred over <literal>mirror</literal> for uniformity. The functionality "
+"is the same."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-transport-mirror.1.xml
+msgid "Example with metadata-enhanced mirror selection"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"As explained in the format definition apt versions before 1.6 do not support "
+"this and will fail parsing the mirrorlist. The example mirrorlist is "
+"proposefully complicated to show some aspects of the selection. The "
+"following setup is assumed: The first mirror is local mirror accessible via "
+"the file method, but potentially incomplete. The second mirror has a great "
+"connection, but is a partial mirror in sofar as it only contains files "
+"related to the architectures <literal>amd64</literal> and <literal>all</"
+"literal>. The remaining mirrors are average mirrors which should be "
+"contacted only if the earlier ones didn't work."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literallayout>
+#: apt-transport-mirror.1.xml
+#, no-wrap
+msgid ""
+"file:/srv/local/debian/mirror/\tpriority:1 type:index\n"
+"http://partial.example.org/mirror/\tpriority:2 arch:amd64 arch:all type:deb\n"
+"http://ftp.us.debian.org/debian/\ttype:deb\n"
+"http://ftp.de.debian.org/debian/\ttype:deb\n"
+"https://deb.debian.org/debian/\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-transport-mirror.1.xml
+msgid ""
+"In this setup with this mirrorlist the first mirror will be used to download "
+"all index files assuming the mirrorlist itself is accessed via a local "
+"transport like <literal>file</literal>. If it isn't, the mirror is otherwise "
+"inaccessible or does not contain the requested file another mirror will be "
+"used to acquire the file, which one depending on the type of the file: An "
+"index file will be served by the last mirror in the list, while a package of "
+"architecture <literal>amd64</literal> is served by the second and those of e."
+"g. architecture <literal>i386</literal> by one of the last three."
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
 #: guide.dbk offline.dbk
 msgid "en"
@@ -8288,10 +8994,6 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
 #, fuzzy
-#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-#~ msgstr "<filename>/etc/apt.conf</>"
-
-#, fuzzy
 #~ msgid "&apt-get;, &apt-conf;"
 #~ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 5572b8da3..bfad35aa7 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2017-09-10T00:00:00Z</date>
+   <date>2017-11-22T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 36538a17c..6f9548977 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.6~alpha5\n"
+"Project-Id-Version: apt 1.6~alpha6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-11-12 19:57+0100\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,7 +145,7 @@ msgstr ""
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
@@ -354,6 +354,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr ""
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -366,12 +371,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -416,6 +415,11 @@ msgstr ""
 
 #: apt-pkg/acquire.cc
 #, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr ""
+
+#: apt-pkg/acquire.cc
+#, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
@@ -477,7 +481,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr ""
 
@@ -1518,11 +1522,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr ""
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3280,29 +3279,29 @@ msgstr ""
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
+#: methods/connect.cc
 #, c-format
-msgid "Connecting to %s (%s)"
+msgid "[IP: %s %s]"
 msgstr ""
 
 #: methods/connect.cc
 #, c-format
-msgid "[IP: %s %s]"
+msgid "Connected to %s (%s)"
 msgstr ""
 
-#: methods/connect.cc
+#: methods/connect.cc methods/http.cc
 #, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgid "Connecting to %s (%s)"
 msgstr ""
 
 #: methods/connect.cc
 #, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
 #: methods/connect.cc
 #, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
+msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
@@ -3314,6 +3313,11 @@ msgstr ""
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr ""
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3559,30 +3563,6 @@ msgstr ""
 msgid "Error writing to output file"
 msgstr ""
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr ""
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr ""
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 1417287bb..d912d8a5d 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -148,7 +148,7 @@ msgstr ""
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "تعذرت قراءة %s"
@@ -360,6 +360,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "فشل إحضار %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -372,12 +377,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -422,6 +421,11 @@ msgstr ""
 
 #: apt-pkg/acquire.cc
 #, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr ""
+
+#: apt-pkg/acquire.cc
+#, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
@@ -483,7 +487,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "تعذرت قراءة قائمة المصادر."
 
@@ -1530,11 +1534,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "فشل إحضار %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3341,17 +3340,23 @@ msgstr "لم يُعثر على الملف"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "الاتصال بـ%s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "الاتصال بـ%s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "الاتصال بـ%s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
@@ -3361,11 +3366,6 @@ msgstr ""
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "فشل"
@@ -3375,6 +3375,11 @@ msgstr "فشل"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "تعذر الاتصال بـ%s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3622,30 +3627,6 @@ msgstr "انتهى وقت الاتصال"
 msgid "Error writing to output file"
 msgstr "خطأ في الكتابة إلى ملف المُخرجات"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "فشل إغلاق الملف %s"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "فشل إغلاق الملف %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "فشل تعيين وقت التعديل"
@@ -3658,6 +3639,14 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "فشل إغلاق الملف %s"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "فشل إغلاق الملف %s"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "فتح ملف التهيئة %s"
 
diff --git a/po/ast.po b/po/ast.po
index 4e7dd7657..7820f75fb 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -144,7 +144,7 @@ msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nun ye a lleer %s"
@@ -357,6 +357,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Falló algamar %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -371,14 +376,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
-"paquete %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -422,6 +419,12 @@ msgid "List directory %spartial is missing."
 msgstr "Falta'l direutoriu de llistes %spartial."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Falta'l direutoriu de llistes %spartial."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Falta'l direutoriu d'archivos %spartial."
@@ -488,7 +491,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Has d'executar apt-get update pa iguar estos problemes"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Nun pudo lleese la llista de fontes."
 
@@ -1576,11 +1579,6 @@ msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Falló algamar %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3502,17 +3500,23 @@ msgstr "Nun s'atopa'l ficheru."
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Coneutando a %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Coneutando a %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Coneutando a %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nun se pudo crear un socket pa %s (f=%u t=%u p=%u)"
@@ -3522,11 +3526,6 @@ msgstr "Nun se pudo crear un socket pa %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nun se pudo coneutar a %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Nun se pudo coneutar a %s:%s (%s); expiró'l tiempu de conexón"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Falló"
@@ -3536,6 +3535,11 @@ msgstr "Falló"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nun se pudo coneutar a %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Nun se pudo coneutar a %s:%s (%s); expiró'l tiempu de conexón"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3787,30 +3791,6 @@ msgstr "Gandió'l tiempu de conexón"
 msgid "Error writing to output file"
 msgstr "Fallu al escribir nel ficheru de salida"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Nun s'alcontró ficheru espeyu '%s'"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Nun s'alcontró ficheru espeyu '%s'"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Nun s'alcontró ficheru espeyu '%s'"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Espeyu: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Nun se pudo afitar la hora de modificación"
@@ -3823,6 +3803,26 @@ msgstr "Conexón encaboxada prematuramente"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: "
+#~ "pal paquete %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Nun s'alcontró ficheru espeyu '%s'"
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Nun s'alcontró ficheru espeyu '%s'"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Nun s'alcontró ficheru espeyu '%s'"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Espeyu: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Abriendo ficheros de configuración %s"
 
diff --git a/po/bg.po b/po/bg.po
index 1cfd98e6a..2a972bf49 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -150,7 +150,7 @@ msgstr "Файл %s/%s заменя този в пакет %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Неуспех при четенето на %s"
@@ -365,6 +365,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Неуспех при изтеглянето на %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -379,13 +384,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -429,6 +427,12 @@ msgid "List directory %spartial is missing."
 msgstr "Директорията със списъци %spartial липсва."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Директорията със списъци %spartial липсва."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Директорията за архиви %spartial липсва."
@@ -499,7 +503,7 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Списъкът с източници не можа да бъде прочетен."
 
@@ -1606,11 +1610,6 @@ msgstr "Трябва да добавите адреси-URI от тип „sourc
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Неуспех при изтеглянето на %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3545,17 +3544,23 @@ msgstr "Файлът не е намерен"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Свързване с %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Свързване с %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Свързване с %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)"
@@ -3565,11 +3570,6 @@ msgstr "Неуспех при създаването на гнездо за %s (
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Не може да се започне свързване с %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Неуспех"
@@ -3579,6 +3579,11 @@ msgstr "Неуспех"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Неуспех при свързване с %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3834,30 +3839,6 @@ msgstr "Допустимото време за свързване изтече"
 msgid "Error writing to output file"
 msgstr "Грешка при записа на изходен файл"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Файлът „%s“ на огледалния сървър не е намерен "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Грешка при четене файла „%s“ от огледалния сървър"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Грешка при четене файла „%s“ от огледалния сървър"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Огледален сървър: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Неуспех при задаването на време на промяна"
@@ -3870,6 +3851,25 @@ msgstr "Връзката прекъсна преждевременно"
 msgid "Empty files can't be valid archives"
 msgstr "Празни файлове не могат да бъдат валидни архиви"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет "
+#~ "%s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Файлът „%s“ на огледалния сървър не е намерен "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Грешка при четене файла „%s“ от огледалния сървър"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Грешка при четене файла „%s“ от огледалния сървър"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Огледален сървър: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Отваряне на конфигурационен файл %s"
 
diff --git a/po/bs.po b/po/bs.po
index 55889dcba..a739540a5 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -146,7 +146,7 @@ msgstr ""
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu čitati %s"
@@ -356,6 +356,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, fuzzy, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Ne mogu otvoriti %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -368,12 +373,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -418,6 +417,11 @@ msgstr ""
 
 #: apt-pkg/acquire.cc
 #, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr ""
+
+#: apt-pkg/acquire.cc
+#, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
@@ -479,7 +483,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr ""
 
@@ -1528,11 +1532,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Ne mogu otvoriti %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3323,29 +3322,30 @@ msgstr "Datoteka nije pronađena"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr ""
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr ""
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s"
+msgid "Connected to %s (%s)"
+msgstr "Povezujem se sa %s"
+
+#: methods/connect.cc methods/http.cc
 #, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgid "Connecting to %s (%s)"
 msgstr ""
 
 #: methods/connect.cc
 #, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
 #: methods/connect.cc
 #, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
+msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
@@ -3357,6 +3357,11 @@ msgstr "Neuspješno"
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr ""
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3604,30 +3609,6 @@ msgstr ""
 msgid "Error writing to output file"
 msgstr ""
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Ne mogu otvoriti %s"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Ne mogu otvoriti %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr ""
@@ -3640,6 +3621,14 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Ne mogu otvoriti %s"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Ne mogu otvoriti %s"
+
 #~ msgid "Opening %s"
 #~ msgstr "Otvaram %s"
 
diff --git a/po/ca.po b/po/ca.po
index 809b97cbb..ed29ac724 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -149,7 +149,7 @@ msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "No es pot llegir %s"
@@ -389,6 +389,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "No s'ha pogut obtenir %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -404,14 +409,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "No es troba una font per baixar la versió «%s» de «%s»"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"L'índex dels fitxers en el paquet està corromput. El fitxer no existeix: "
-"camp per al paquet %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -456,6 +453,12 @@ msgid "List directory %spartial is missing."
 msgstr "Falta el directori de llistes %spartial."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Falta el directori de llistes %spartial."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Falta el directori d'arxius %spartial."
@@ -531,7 +534,7 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Potser voldreu executar apt-get update per a corregir aquests problemes"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "No s'ha pogut llegir la llista de les fonts."
 
@@ -1645,11 +1648,6 @@ msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "No s'ha pogut convertir %s a sencer: fora de rang"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "No s'ha pogut obtenir %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3632,17 +3630,23 @@ msgstr "Fitxer no trobat"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr "Les connexions directes als dominis %s estan bloquejades per defecte."
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "S'està connectant amb %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "S'està connectant amb %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "S'està connectant amb %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "No s'ha pogut crear un sòcol per a %s (f=%u t=%u p=%u)"
@@ -3652,11 +3656,6 @@ msgstr "No s'ha pogut crear un sòcol per a %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "No es pot iniciar la connexió amb %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Ha fallat"
@@ -3666,6 +3665,11 @@ msgstr "Ha fallat"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "No s'ha pogut connectar amb %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3923,30 +3927,6 @@ msgstr "Connexió finalitzada"
 msgid "Error writing to output file"
 msgstr "S'ha produït un error en escriure al fitxer de sortida"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "No s'ha trobat el fitxer rèplica «%s»"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "No es pot llegir el fitxer rèplica «%s»"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "No s'ha trobat l'entrada en el fitxer de rèplica «%s»"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Rèplica: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "No s'ha pogut establir el temps de modificació"
@@ -3959,6 +3939,24 @@ 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 ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "L'índex dels fitxers en el paquet està corromput. El fitxer no existeix: "
+#~ "camp per al paquet %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "No s'ha trobat el fitxer rèplica «%s»"
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "No es pot llegir el fitxer rèplica «%s»"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "No s'ha trobat l'entrada en el fitxer de rèplica «%s»"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Rèplica: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "S'està obrint el fitxer de configuració %s"
 
diff --git a/po/cs.po b/po/cs.po
index 069fe2203..f13345029 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -146,7 +146,7 @@ msgstr "Soubor %s/%s přepisuje ten z balíku %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nelze číst %s"
@@ -383,6 +383,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Selhalo stažení %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -397,13 +402,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -447,6 +445,12 @@ msgid "List directory %spartial is missing."
 msgstr "Adresář seznamů %spartial chybí."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Adresář seznamů %spartial chybí."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Archivní adresář %spartial chybí."
@@ -514,7 +518,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Nelze přečíst seznam zdrojů."
 
@@ -1593,11 +1597,6 @@ msgstr "Do sources.list musíte zadat „zdrojové“ URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "Nelze převést %s na celé číslo: mimo rozsah"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Selhalo stažení %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3536,17 +3535,23 @@ msgstr "Soubor nebyl nalezen"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr "Přímé spojení k doménám %s je implicitně blokováno."
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Připojování k %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Připojování k %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Připojování k %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nelze vytvořit socket pro %s (f=%u t=%u p=%u)"
@@ -3556,11 +3561,6 @@ msgstr "Nelze vytvořit socket pro %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nelze navázat spojení na %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Nelze se připojit k %s:%s (%s), čas spojení vypršel"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Selhalo"
@@ -3570,6 +3570,11 @@ msgstr "Selhalo"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nelze se připojit k %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Nelze se připojit k %s:%s (%s), čas spojení vypršel"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3821,30 +3826,6 @@ msgstr "Čas spojení vypršel"
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Soubor se zrcadly „%s“ nebyl nalezen "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Nelze číst soubor se zrcadly „%s“"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "V souboru se zrcadly „%s“ nebyl nalezen žádný záznam"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Zrcadlo: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Nelze nastavit čas modifikace"
@@ -3857,6 +3838,23 @@ 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 ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Soubor se zrcadly „%s“ nebyl nalezen "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Nelze číst soubor se zrcadly „%s“"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "V souboru se zrcadly „%s“ nebyl nalezen žádný záznam"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Zrcadlo: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Otevírá se konfigurační soubor %s"
 
diff --git a/po/cy.po b/po/cy.po
index 64c766e38..1c9f5df69 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -148,7 +148,7 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
@@ -362,6 +362,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Methwyd cyrchu %s  %s"
+
 # FIXME: case
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -377,13 +382,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -431,6 +429,11 @@ msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
@@ -497,7 +500,7 @@ msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Methwyd darllen y rhestr ffynhonellau."
 
@@ -1572,11 +1575,6 @@ msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Methwyd cyrchu %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3531,17 +3529,23 @@ msgstr "Ffeil heb ei ganfod"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
@@ -3551,11 +3555,6 @@ msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Methwyd"
@@ -3565,6 +3564,11 @@ msgstr "Methwyd"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Methwyd cysylltu i %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3818,30 +3822,6 @@ msgstr "Goramserodd y cysylltiad"
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Methwyd agor ffeil %s"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Methwyd agor ffeil %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Methwyd gosod amser newid"
@@ -3854,6 +3834,19 @@ msgstr "Caewyd y cysylltiad yn gynnar"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Methwyd agor ffeil %s"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Methwyd agor ffeil %s"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Yn agor y ffeil cyfluniad %s"
 
diff --git a/po/da.po b/po/da.po
index a491b215a..68e450e07 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -151,7 +151,7 @@ msgstr "File %s/%s overskriver filen i pakken %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunne ikke læse %s"
@@ -390,6 +390,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Kunne ikke hente %s %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -404,12 +409,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "Pakkeindeksfilerne er i stykker. Intet »Filename:«-felt for pakken %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -453,6 +452,12 @@ msgid "List directory %spartial is missing."
 msgstr "Listemappen %spartial mangler."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Listemappen %spartial mangler."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arkivmappen %spartial mangler."
@@ -521,7 +526,7 @@ msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Du kan muligvis rette problemet ved at køre »apt-get update«"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Listen med kilder kunne ikke læses."
 
@@ -1607,11 +1612,6 @@ msgstr "Du skal have nogle »source«-URI'er i din sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "Kan ikke konvertere %s til heltal: uden for interval"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Kunne ikke hente %s %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3571,17 +3571,23 @@ msgstr "Fil blev ikke fundet"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr "Direkte forbindelse til %s-domæner er som standard blokeret."
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Forbinder til %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Forbinder til %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Forbinder til %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)"
@@ -3591,11 +3597,6 @@ msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kan ikke oprette forbindelse til %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudløb"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Mislykkedes"
@@ -3605,6 +3606,11 @@ msgstr "Mislykkedes"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kunne ikke forbinde til %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudløb"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3858,30 +3864,6 @@ msgstr "Tidsudløb på forbindelsen"
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Ingen spejlfil »%s« fundet "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Kan ikke læse spejlfil »%s«"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Ingen post fundet i spejlfil »%s«"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Spejl: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Kunne ikke angive ændringstidspunkt"
@@ -3894,6 +3876,23 @@ msgstr "Forbindelsen lukkedes for hurtigt"
 msgid "Empty files can't be valid archives"
 msgstr "Tomme filer kan ikke være gyldige arkiver"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Pakkeindeksfilerne er i stykker. Intet »Filename:«-felt for pakken %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Ingen spejlfil »%s« fundet "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Kan ikke læse spejlfil »%s«"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Ingen post fundet i spejlfil »%s«"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Spejl: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Åbner konfigurationsfilen %s"
 
diff --git a/po/de.po b/po/de.po
index 33768f0ff..aa7388526 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -149,7 +149,7 @@ msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben."
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s kann nicht gelesen werden."
@@ -366,6 +366,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Fehlschlag beim Holen von %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -383,13 +388,6 @@ msgstr ""
 "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« "
 "herunterzuladen."
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -435,6 +433,12 @@ msgid "List directory %spartial is missing."
 msgstr "Listenverzeichnis %spartial fehlt."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Listenverzeichnis %spartial fehlt."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Archivverzeichnis %spartial fehlt."
@@ -505,7 +509,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren."
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Die Liste der Quellen konnte nicht gelesen werden."
 
@@ -1626,11 +1630,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Fehlschlag beim Holen von %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3618,17 +3617,23 @@ msgstr "Datei nicht gefunden"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Verbindung mit %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Verbindung mit %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Verbindung mit %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Socket für %s konnte nicht erzeugt werden (f=%u t=%u p=%u)."
@@ -3638,13 +3643,6 @@ msgstr "Socket für %s konnte nicht erzeugt werden (f=%u t=%u p=%u)."
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Verbindung mit %s:%s kann nicht aufgebaut werden (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-"Verbindung mit %s:%s konnte nicht aufgebaut werden (%s), eine "
-"Zeitüberschreitung trat auf."
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Fehlgeschlagen"
@@ -3654,6 +3652,13 @@ msgstr "Fehlgeschlagen"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Verbindung mit %s:%s nicht möglich (%s)"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr ""
+"Verbindung mit %s:%s konnte nicht aufgebaut werden (%s), eine "
+"Zeitüberschreitung trat auf."
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3915,30 +3920,6 @@ msgstr "Zeitüberschreitung bei Verbindung"
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Keine Datei von Spiegelserver »%s« gefunden"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden."
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Kein Eintrag in Spiegeldatei »%s« gefunden"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Spiegelserver: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Änderungszeitpunkt kann nicht gesetzt werden."
@@ -3951,6 +3932,23 @@ msgstr "Verbindung vorzeitig beendet"
 msgid "Empty files can't be valid archives"
 msgstr "Leere Dateien können kein gültiges Archiv sein."
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Keine Datei von Spiegelserver »%s« gefunden"
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden."
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Kein Eintrag in Spiegeldatei »%s« gefunden"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Spiegelserver: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Konfigurationsdatei %s wird geöffnet"
 
diff --git a/po/dz.po b/po/dz.po
index 7cdcdb492..cc15b7abc 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -148,7 +148,7 @@ msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་ས�
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
@@ -360,6 +360,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -374,13 +379,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -425,6 +423,11 @@ msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s�
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག"
 
@@ -490,7 +493,7 @@ msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
 
@@ -1548,11 +1551,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3474,17 +3472,23 @@ msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "%s (%s)་ལུ་མཐུད་དོ།"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "%s (%s)་ལུ་མཐུད་དོ།"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "%s (%s)་ལུ་མཐུད་དོ།"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u)གི་དོན་ལུ་སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
@@ -3494,11 +3498,6 @@ msgstr "%s (f=%u t=%u p=%u)གི་དོན་ལུ་སོ་ཀེཊི�
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s)ལུ་མཐུད་ལམ་དེ་འགོ་འབྱེད་འབད་མ་ཚུགས།"
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས་  མཐུད་ལམ་ངལ་མཚམས།"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -3508,6 +3507,11 @@ msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 msgid "Could not connect to %s:%s (%s)."
 msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས་  མཐུད་ལམ་ངལ་མཚམས།"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3761,30 +3765,6 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།
 msgid "Error writing to output file"
 msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -3797,6 +3777,19 @@ msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལ
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
 
diff --git a/po/el.po b/po/el.po
index 6a32f573b..5c68c0f1f 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -156,7 +156,7 @@ msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέ�
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Αδύνατη η ανάγνωση του %s"
@@ -367,6 +367,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Αποτυχία ανάκτησης του %s   %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -381,14 +386,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
-"πακέτο %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -435,6 +432,11 @@ msgstr "Ο φάκελος λιστών %spartial αγνοείται."
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "Ο φάκελος λιστών %spartial αγνοείται."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
 
@@ -502,7 +504,7 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
 
@@ -1566,11 +1568,6 @@ msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών'
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Αποτυχία ανάκτησης του %s   %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3500,17 +3497,23 @@ msgstr "Το αρχείο Δε Βρέθηκε"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Σύνδεση στο %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Σύνδεση στο %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Σύνδεση στο %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Αδύνατη η δημιουργία υποδοχής για το %s (f=%u t=%u p=%u)"
@@ -3520,11 +3523,6 @@ msgstr "Αδύνατη η δημιουργία υποδοχής για το %s (
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Απέτυχε"
@@ -3534,6 +3532,11 @@ msgstr "Απέτυχε"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3789,30 +3792,6 @@ msgstr "Λήξη χρόνου σύνδεσης"
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
@@ -3825,6 +3804,20 @@ msgstr "Η σύνδεση έκλεισε πρόωρα"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
+#~ "πακέτο %s."
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
 
diff --git a/po/es.po b/po/es.po
index 27a736ed7..ff8c8ef57 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\n"
 "PO-Revision-Date: 2016-01-26 01:51+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
@@ -205,7 +205,7 @@ msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "No se pudo leer %s"
@@ -445,6 +445,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Fallo al obtener %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -461,14 +466,6 @@ msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 "No se puede encontrar una fuente para descargar la versión «%s» de «%s»"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Los archivos de índice de paquetes están dañados. No existe un campo "
-"«Filename:» para el paquete %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -513,6 +510,12 @@ msgid "List directory %spartial is missing."
 msgstr "Falta el directorio de listas %spartial."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Falta el directorio de listas %spartial."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Falta el directorio de archivos %spartial."
@@ -589,7 +592,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Tal vez deba ejecutar «apt-get update» para corregir estos problemas"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "No se pudieron leer las listas de fuentes."
 
@@ -1711,11 +1714,6 @@ msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "No se pudo convertir %s a entero: fuera de rango"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Fallo al obtener %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3694,17 +3692,23 @@ msgstr "Fichero no encontrado"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Conectando a %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Conectando a %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Conectando a %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "No se pudo crear un socket para %s (f=%u t=%u p=%u)"
@@ -3714,11 +3718,6 @@ msgstr "No se pudo crear un socket para %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "No se puede iniciar la conexión a %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "No se pudo conectar a %s:%s (%s), caducó el tiempo para conexión"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Falló"
@@ -3728,6 +3727,11 @@ msgstr "Falló"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "No se pudo conectar a %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "No se pudo conectar a %s:%s (%s), caducó el tiempo para conexión"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3983,30 +3987,6 @@ msgstr "Caducó la conexión"
 msgid "Error writing to output file"
 msgstr "Error escribiendo al fichero de salida"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "No se encontró el archivo de réplica «%s»"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "No se puede leer el archivo de réplica «%s»"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "No se encontró ninguna entrada en el archivo de réplica «%s»"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Réplica: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Fallo al establecer el tiempo de modificación"
@@ -4019,6 +3999,24 @@ 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 ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Los archivos de índice de paquetes están dañados. No existe un campo "
+#~ "«Filename:» para el paquete %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "No se encontró el archivo de réplica «%s»"
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "No se puede leer el archivo de réplica «%s»"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "No se encontró ninguna entrada en el archivo de réplica «%s»"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Réplica: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Abriendo fichero de configuración %s"
 
diff --git a/po/eu.po b/po/eu.po
index 69b5f1b92..3959b55ce 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -147,7 +147,7 @@ msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ezin da %s irakurri"
@@ -358,6 +358,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Ezin da lortu %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -372,14 +377,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
-"paketearentzat."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -424,6 +421,11 @@ msgstr "%spartial zerrenda-direktorioa falta da."
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "%spartial zerrenda-direktorioa falta da."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "%spartial artxibo direktorioa falta da."
 
@@ -488,7 +490,7 @@ msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Ezin izan da Iturburu zerrenda irakurri."
 
@@ -1547,11 +1549,6 @@ msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Ezin da lortu %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3467,17 +3464,23 @@ msgstr "Ez da fitxategia aurkitu"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Konektatzen -> %s.(%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Konektatzen -> %s.(%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Konektatzen -> %s.(%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)"
@@ -3487,12 +3490,6 @@ msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora muga gainditu du"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Huts egin du"
@@ -3502,6 +3499,12 @@ msgstr "Huts egin du"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Ezin izan da konektatu -> %s:%s (%s)"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr ""
+"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora muga gainditu du"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3756,30 +3759,6 @@ msgstr "Konexioaren denbora muga gainditu da"
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "%s fitxategia ezin izan da ireki"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "%s fitxategia ezin izan da ireki"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Huts egin du aldaketa ordua ezartzean"
@@ -3792,6 +3771,20 @@ msgstr "Konexioa behar baino lehenago itxi da"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
+#~ "paketearentzat."
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "%s fitxategia ezin izan da ireki"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "%s fitxategia ezin izan da ireki"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "%s konfigurazio fitxategia irekitzen"
 
diff --git a/po/fi.po b/po/fi.po
index e8a9be29e..77724fce1 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -147,7 +147,7 @@ msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Tiedostoa %s ei voi lukea"
@@ -358,6 +358,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Tiedoston %s nouto ei onnistunut  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -372,14 +377,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
-"kenttää."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -424,6 +421,11 @@ msgstr "Luettelokansio %spartial puuttuu."
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "Luettelokansio %spartial puuttuu."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arkistokansio %spartial puuttuu."
 
@@ -488,7 +490,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
 
@@ -1542,11 +1544,6 @@ msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Tiedoston %s nouto ei onnistunut  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3462,17 +3459,23 @@ msgstr "Tiedostoa ei löydy"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Avataan yhteys %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Avataan yhteys %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Avataan yhteys %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)"
@@ -3482,11 +3485,6 @@ msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Yhteyden %s avaus ei onnistu: %s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Ei onnistunut"
@@ -3496,6 +3494,11 @@ msgstr "Ei onnistunut"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3748,30 +3751,6 @@ msgstr "Yhteys aikakatkaistiin"
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Tiedostoa %s ei voitu avata"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Tiedostoa %s ei voitu avata"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -3784,6 +3763,20 @@ msgstr "Yhteys katkesi ennenaikaisesti"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
+#~ "kenttää."
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Tiedostoa %s ei voitu avata"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Tiedostoa %s ei voitu avata"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Avataan asetustiedosto %s"
 
diff --git a/po/fr.po b/po/fr.po
index 509717cff..6688e2592 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -149,7 +149,7 @@ msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossible de lire %s"
@@ -366,6 +366,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Impossible de récupérer %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -382,14 +387,6 @@ msgstr ""
 "Impossible de trouver une source de téléchargement de la version « %s » de "
 "« %s »"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
-"pour le paquet %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -435,6 +432,12 @@ msgid "List directory %spartial is missing."
 msgstr "Le répertoire %spartial pour les listes n'existe pas."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Le répertoire %spartial pour les listes n'existe pas."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Le répertoire d'archive %spartial n'existe pas."
@@ -505,7 +508,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "La liste des sources ne peut être lue."
 
@@ -1631,11 +1634,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Impossible de récupérer %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3608,17 +3606,23 @@ msgstr "Fichier non trouvé"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Connexion à %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP : %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Connexion à %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Connexion à %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)"
@@ -3628,11 +3632,6 @@ msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Impossible d'initialiser la connexion à %s: %s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Échec"
@@ -3642,6 +3641,11 @@ msgstr "Échec"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Connexion à %s: %s (%s) impossible."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3901,30 +3905,6 @@ msgstr "Délai de connexion dépassé"
 msgid "Error writing to output file"
 msgstr "Erreur d'écriture du fichier de sortie"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Aucun fichier miroir « %s » n'a été trouvé"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Impossible de lire le fichier de miroir « %s »."
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »."
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Miroir : %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Impossible de modifier l'heure "
@@ -3937,6 +3917,24 @@ 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 ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Les fichiers d'index des paquets sont corrompus. Aucun champ "
+#~ "« Filename: » pour le paquet %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Aucun fichier miroir « %s » n'a été trouvé"
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Impossible de lire le fichier de miroir « %s »."
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »."
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Miroir : %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Ouverture du fichier de configuration %s"
 
diff --git a/po/gl.po b/po/gl.po
index 88dd4ce19..055817b07 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -151,7 +151,7 @@ msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Non é posíbel ler %s"
@@ -365,6 +365,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Non foi posíbel obter %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -379,14 +384,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Os ficheiros de índices de paquetes están danados. Non hai un campo "
-"Filename: para o paquete %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -430,6 +427,12 @@ msgid "List directory %spartial is missing."
 msgstr "Non se atopa a lista de directorios %sparcial."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Non se atopa a lista de directorios %sparcial."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Non se atopa a lista de arquivos %sparcial."
@@ -498,7 +501,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Pode querer executar «apt-get update» para corrixir estes problemas"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Non foi posíbel ler a lista de orixes."
 
@@ -1598,11 +1601,6 @@ msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Non foi posíbel obter %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3533,17 +3531,23 @@ msgstr "Non se atopou o ficheiro"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Conectando a %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Conectando a %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Conectando a %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Non foi posíbel crear un socket para %s (f=%u t=%u p=%u)"
@@ -3553,11 +3557,6 @@ msgstr "Non foi posíbel crear un socket para %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Non é posíbel iniciar a conexión a %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Non foi posíbel conectar a %s:%s (%s), a conexión esgotou o tempo"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Fallou"
@@ -3567,6 +3566,11 @@ msgstr "Fallou"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Non foi posíbel conectar a %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Non foi posíbel conectar a %s:%s (%s), a conexión esgotou o tempo"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3822,30 +3826,6 @@ msgstr "A conexión esgotou o tempo"
 msgid "Error writing to output file"
 msgstr "Produciuse un erro ao escribir no ficheiro de saída"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Non se atopou ningún ficheiro de replica «%s» "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Non é posíbel ler o ficheiro de replica «%s»"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Non é posíbel ler o ficheiro de replica «%s»"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Replica: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Non foi posíbel estabelecer a hora de modificación"
@@ -3858,6 +3838,25 @@ 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 ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Os ficheiros de índices de paquetes están danados. Non hai un campo "
+#~ "Filename: para o paquete %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Non se atopou ningún ficheiro de replica «%s» "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Non é posíbel ler o ficheiro de replica «%s»"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Non é posíbel ler o ficheiro de replica «%s»"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Replica: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Abrindo o ficheiro de configuración %s"
 
diff --git a/po/hu.po b/po/hu.po
index 25d19a9e2..bd1f8a5bd 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -148,7 +148,7 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s nem olvasható"
@@ -388,6 +388,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Sikertelen letöltés: %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -402,13 +407,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -454,6 +452,12 @@ msgid "List directory %spartial is missing."
 msgstr "A(z) %spartial listakönyvtár hiányzik."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "A(z) %spartial listakönyvtár hiányzik."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "A(z) %spartial archívumkönyvtár hiányzik."
@@ -526,7 +530,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Próbálja futtatni az „apt-get update” parancsot ezen hibák javításához"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "A források listája olvashatatlan."
 
@@ -1633,11 +1637,6 @@ msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "%s nem alakítható egésszé: kívül esik a tartományon"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Sikertelen letöltés: %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3591,17 +3590,23 @@ msgstr "A fájl nem található"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Csatlakozás: %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Csatlakozás: %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Csatlakozás: %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Foglalat létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)"
@@ -3611,11 +3616,6 @@ msgstr "Foglalat létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Sikertelen"
@@ -3625,6 +3625,11 @@ msgstr "Sikertelen"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nem lehet kapcsolódni ehhez: %s: %s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3881,30 +3886,6 @@ msgstr "Időtúllépés a kapcsolatban"
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Nem található a(z) „%s” tükörfájl "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "A(z) „%s” tükörfájl nem olvasható"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Nem található bejegyzés a(z) „%s” tükörfájlban"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Tükör: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "A módosítási idő beállítása sikertelen"
@@ -3917,6 +3898,23 @@ 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 ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Nem található a(z) „%s” tükörfájl "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "A(z) „%s” tükörfájl nem olvasható"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Nem található bejegyzés a(z) „%s” tükörfájlban"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Tükör: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "%s konfigurációs fájl megnyitása"
 
diff --git a/po/it.po b/po/it.po
index 9572187d7..db1207adc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.6~alpha5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-01 18:06+0100\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\n"
 "PO-Revision-Date: 2017-11-27 13:57+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -149,7 +149,7 @@ msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossibile leggere %s"
@@ -452,6 +452,13 @@ msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
 msgid "List directory %spartial is missing."
 msgstr "Manca la directory di liste %spartial."
 
+# (ndt) sarebbe da controllare meglio assieme a quella dopo
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Manca la directory di liste %spartial."
+
 #: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
@@ -525,7 +532,7 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "È consigliato eseguire \"apt-get update\" per correggere questi problemi"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Impossibile leggere l'elenco dei sorgenti."
 
@@ -3659,17 +3666,23 @@ msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 "Il collegamento diretto ai domini %s è bloccato per impostazione predefinita."
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Connessione a %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Connessione a %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Connessione a %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)"
@@ -3679,12 +3692,6 @@ msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Impossibile iniziare la connessione a %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-"Impossibile connettersi a %s:%s (%s), tempo esaurito per la connessione"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Non riuscito"
@@ -3694,6 +3701,12 @@ msgstr "Non riuscito"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Impossibile connettersi a %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr ""
+"Impossibile connettersi a %s:%s (%s), tempo esaurito per la connessione"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3952,30 +3965,6 @@ msgstr "Connessione terminata"
 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Nessun file mirror \"%s\" trovato "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Impossibile leggere il file mirror \"%s\""
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Nessuna voce trovata nel file mirror \"%s\""
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Mirror: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Impostazione della data di modifica non riuscita"
@@ -3988,6 +3977,18 @@ msgstr "Connessione chiusa prematuramente"
 msgid "Empty files can't be valid archives"
 msgstr "File vuoti non possono essere archivi validi"
 
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Nessun file mirror \"%s\" trovato "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Impossibile leggere il file mirror \"%s\""
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Nessuna voce trovata nel file mirror \"%s\""
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Mirror: %s]"
+
 # (ndt) sarebbe da controllare se veramente possono esistere più file indice
 #~ msgid ""
 #~ "The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/ja.po b/po/ja.po
index bad1a47d0..0001045d3 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -151,7 +151,7 @@ msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s を読み込むことができません"
@@ -390,6 +390,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "%s の取得に失敗しました  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -404,14 +409,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
-"フィールドがありません。"
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -458,6 +455,12 @@ msgid "List directory %spartial is missing."
 msgstr "リストディレクトリ %spartial が見つかりません。"
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "リストディレクトリ %spartial が見つかりません。"
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "アーカイブディレクトリ %spartial が見つかりません。"
@@ -530,7 +533,7 @@ msgstr ""
 "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
 "せん"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "ソースのリストを読むことができません。"
 
@@ -1627,11 +1630,6 @@ msgstr "sources.list に 'ソース' URI を指定する必要があります"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "%s を整数に変換できません: 範囲外"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s の取得に失敗しました  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3581,17 +3579,23 @@ msgstr "ファイルが見つかりません"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr "%s ドメインへの直接の接続はデフォルトでブロックされています。"
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "%s (%s) へ接続しています"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "%s (%s) へ接続しています"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "%s (%s) へ接続しています"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません"
@@ -3601,11 +3605,6 @@ msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s) への接続を開始できません。"
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "失敗"
@@ -3615,6 +3614,11 @@ msgstr "失敗"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "%s:%s (%s) へ接続できませんでした。"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3865,30 +3869,6 @@ msgstr "接続タイムアウト"
 msgid "Error writing to output file"
 msgstr "出力ファイルへの書き込みでエラーが発生しました"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "ミラーファイル '%s' が見つかりません "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "ミラーファイル '%s' を読み込めません"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "ミラーファイル '%s' のエントリが見つかりません"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[ミラー: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "変更時刻の設定に失敗しました"
@@ -3901,6 +3881,24 @@ msgstr "途中で接続がクローズされました"
 msgid "Empty files can't be valid archives"
 msgstr "空のファイルは有効なアーカイブと認められません"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
+#~ "フィールドがありません。"
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "ミラーファイル '%s' が見つかりません "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "ミラーファイル '%s' を読み込めません"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "ミラーファイル '%s' のエントリが見つかりません"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[ミラー: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "設定ファイル %s をオープンできませんでした"
 
diff --git a/po/km.po b/po/km.po
index 93c619015..09e856da9 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -150,7 +150,7 @@ msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​�
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "មិន​អាច​អាន​ %s បានឡើយ"
@@ -362,6 +362,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -376,12 +381,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -426,6 +425,11 @@ msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់ប�
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។"
 
@@ -489,7 +493,7 @@ msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថ�
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
 
@@ -1542,11 +1546,6 @@ msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs ម
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3449,17 +3448,23 @@ msgstr "រកឯកសារ​មិន​ឃើញ​"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP ៖ %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "មិន​អាច​បង្កើត​រន្ធ​សម្រាប់ %s (f=%u t=%u p=%u) បានឡើយ"
@@ -3469,11 +3474,6 @@ msgstr "មិន​អាច​បង្កើត​រន្ធ​សម្រ
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "មិនអាច​ចាប់ផ្ដើម​ការតភ្ជាប់​​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ។"
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល​"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "បាន​បរាជ័យ"
@@ -3483,6 +3483,11 @@ msgstr "បាន​បរាជ័យ"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s:%s (%s) បានឡើយ ។"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល​"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3730,30 +3735,6 @@ msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
 msgid "Error writing to output file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
@@ -3766,6 +3747,18 @@ msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
 
diff --git a/po/ko.po b/po/ko.po
index efea2fd79..49975a53d 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -144,7 +144,7 @@ msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s을(를) 읽을 수 없습니다"
@@ -357,6 +357,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "%s 파일을 받는데 실패했습니다  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -371,13 +376,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -422,6 +420,12 @@ msgid "List directory %spartial is missing."
 msgstr "목록 디렉터리 %spartial이 빠졌습니다."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "목록 디렉터리 %spartial이 빠졌습니다."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "아카이브 디렉터리 %spartial이 빠졌습니다."
@@ -487,7 +491,7 @@ msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다."
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "소스 목록을 읽을 수 없습니다."
 
@@ -1552,11 +1556,6 @@ msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s 파일을 받는데 실패했습니다  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3462,17 +3461,23 @@ msgstr "파일이 없습니다"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "%s(%s)에 연결하는 중입니다"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "%s(%s)에 연결하는 중입니다"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "%s(%s)에 연결하는 중입니다"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s에 대한 소켓을 만들 수 없습니다 (f=%u t=%u p=%u)"
@@ -3482,11 +3487,6 @@ msgstr "%s에 대한 소켓을 만들 수 없습니다 (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "실패"
@@ -3496,6 +3496,11 @@ msgstr "실패"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "%s:%s에 연결할 수 없습니다 (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3745,30 +3750,6 @@ msgstr "연결 시간이 초과했습니다"
 msgid "Error writing to output file"
 msgstr "출력 파일에 쓰는데 오류가 발생했습니다"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "'%s' 미러 파일이 없습니다 "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "'%s' 미러 파일이 없습니다 "
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "'%s' 미러 파일이 없습니다 "
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[미러 사이트: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "파일 변경 시각을 설정하는데 실패했습니다"
@@ -3781,6 +3762,26 @@ msgstr "연결이 너무 빨리 끊어졌습니다"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니"
+#~ "다."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "'%s' 미러 파일이 없습니다 "
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "'%s' 미러 파일이 없습니다 "
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "'%s' 미러 파일이 없습니다 "
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[미러 사이트: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "설정 파일 %s 파일을 여는 중입니다"
 
diff --git a/po/ku.po b/po/ku.po
index b71a29779..b413616e2 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -149,7 +149,7 @@ msgstr ""
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nikare %s bixwîne"
@@ -360,6 +360,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Anîna %s %s biserneket"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -372,12 +377,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -422,6 +421,11 @@ msgstr "Peldanka '%s' kêm e"
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "Peldanka '%s' kêm e"
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Peldanka '%s' kêm e"
 
@@ -483,7 +487,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr ""
 
@@ -1529,11 +1533,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Anîna %s %s biserneket"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3347,29 +3346,30 @@ msgstr "Pel nehate dîtin"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Girêdan bi %s (%s) re pêk tê"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Girêdan bi %s (%s) re pêk tê"
+
+#: methods/connect.cc methods/http.cc
 #, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr ""
+msgid "Connecting to %s (%s)"
+msgstr "Girêdan bi %s (%s) re pêk tê"
 
 #: methods/connect.cc
 #, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
 #: methods/connect.cc
 #, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
+msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
@@ -3381,6 +3381,11 @@ msgstr "Serneket"
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr ""
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3630,30 +3635,6 @@ msgstr ""
 msgid "Error writing to output file"
 msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Nikarî pelê %s veke"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Nikarî pelê %s veke"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr ""
@@ -3666,6 +3647,14 @@ msgstr "Girêdan zû hatiye girtin"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Nikarî pelê %s veke"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Nikarî pelê %s veke"
+
 #~ msgid "Opening %s"
 #~ msgstr "%s tê vekirin"
 
diff --git a/po/lt.po b/po/lt.po
index 58e50fd36..c6993c662 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -149,7 +149,7 @@ msgstr ""
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nepavyko perskaityti %s"
@@ -360,6 +360,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Nepavyko parsiųsti %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -372,12 +377,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -422,6 +421,11 @@ msgstr "Trūksta aplanko „%s“"
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "Trūksta aplanko „%s“"
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Trūksta aplanko „%s“"
 
@@ -485,7 +489,7 @@ msgstr ""
 "Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų "
 "ištaisytos"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Nepavyko perskaityti šaltinių sąrašo."
 
@@ -1531,11 +1535,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Nepavyko parsiųsti %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3445,30 +3444,31 @@ msgstr "Failas nerastas"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Jungiamasi prie %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Jungiamasi prie %s (%s)"
+
+#: methods/connect.cc methods/http.cc
 #, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr ""
+msgid "Connecting to %s (%s)"
+msgstr "Jungiamasi prie %s (%s)"
 
 #: methods/connect.cc
 #, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
 #: methods/connect.cc
 #, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Nepavyko prisijungti prie %s:%s (%s), prisijungimas per ilgai užtruko"
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr ""
 
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
@@ -3479,6 +3479,11 @@ msgstr "Nepavyko"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nepavyko prisijungti prie %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Nepavyko prisijungti prie %s:%s (%s), prisijungimas per ilgai užtruko"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3724,30 +3729,6 @@ msgstr "Prisijungimo laiko limitas baigėsi"
 msgid "Error writing to output file"
 msgstr ""
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Nepavyko atverti failo %s"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Nepavyko atverti failo %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr ""
@@ -3760,6 +3741,14 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Nepavyko atverti failo %s"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Nepavyko atverti failo %s"
+
 #~ msgid "Opening %s"
 #~ msgstr "Atveriama %s"
 
diff --git a/po/mr.po b/po/mr.po
index 7c1c7c746..286d09580 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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 "
@@ -146,7 +146,7 @@ msgstr "File %s/%s, %s पॅकेज मधल्या एका वर प�
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s वाचण्यास असमर्थ"
@@ -357,6 +357,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "%s  %s आणणे असफल"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -371,14 +376,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
-"ठिकाण %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -423,6 +420,11 @@ msgstr "संचयिका यादीत %s पार्शल हरवल
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "संचयिका यादीत %s पार्शल हरवले आहे."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे."
 
@@ -487,7 +489,7 @@ msgstr "पॅकेजच्या याद्या किंवा संच
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी  apt-get update प्रोग्राम चालू करु शकता"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
 
@@ -1543,11 +1545,6 @@ msgstr "तुम्ही तुमच्या उगमस्थान या
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s  %s आणणे असफल"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3447,17 +3444,23 @@ msgstr "फाईल सापडली नाही"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "%s (%s) ला जोडत आहे"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[आयपी:%s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "%s (%s) ला जोडत आहे"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "%s (%s) ला जोडत आहे"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u) साठी सॉकेट तयार करू शकत नाही"
@@ -3467,11 +3470,6 @@ msgstr "%s (f=%u t=%u p=%u) साठी सॉकेट तयार करू
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s). साठी जोडणी इनिशिएट/पुढाकारीत करू शकत नाही"
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "%s:%s (%s) ला जोडू शकत नाही,जोडणी वेळेअभावी तुटली"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "असमर्थ"
@@ -3481,6 +3479,11 @@ msgstr "असमर्थ"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "%s:%s (%s) ला जोडू शकत नाही"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "%s:%s (%s) ला जोडू शकत नाही,जोडणी वेळेअभावी तुटली"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3730,30 +3733,6 @@ msgstr "जोडणी वेळेअभावी तुटली"
 msgid "Error writing to output file"
 msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "%s फाईल उघडता येत नाही"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "%s फाईल उघडता येत नाही"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ"
@@ -3766,6 +3745,20 @@ msgstr "जोडणी अकाली बंद झाली"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
+#~ "ठिकाण %s."
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "%s फाईल उघडता येत नाही"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "%s फाईल उघडता येत नाही"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "%s संरचना फाईल उघडत आहे"
 
diff --git a/po/nb.po b/po/nb.po
index e351e46bd..fcd225cd1 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -152,7 +152,7 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarer ikke å lese %s"
@@ -365,6 +365,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Klarte ikke å skaffe %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -379,12 +384,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -428,6 +427,12 @@ msgid "List directory %spartial is missing."
 msgstr "Listemappa %spartial mangler."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Listemappa %spartial mangler."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arkivmappa %spartial mangler."
@@ -494,7 +499,7 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Det kan hende du vil kjøre «apt-get update» for å rette på disse problemene"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Kan ikke lese kildlista."
 
@@ -1571,11 +1576,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr "Kan ikke gjøre om %s til heltall: utenfor rekkevidde"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Klarte ikke å skaffe %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3517,17 +3517,23 @@ msgstr "Fant ikke fila"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Kobler til %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Kobler til %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Kobler til %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Klarte ikke å opprette en sokkel for %s (f=%u t=%u p=%u)"
@@ -3537,11 +3543,6 @@ msgstr "Klarte ikke å opprette en sokkel for %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Klarte ikke å koble til %s:%s (%s), tidsavbrudd på forbindelsen"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Mislyktes"
@@ -3551,6 +3552,11 @@ msgstr "Mislyktes"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Klarte ikke å koble til %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Klarte ikke å koble til %s:%s (%s), tidsavbrudd på forbindelsen"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3802,30 +3808,6 @@ msgstr "Tidsavbrudd på forbindelsen"
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Ingen speilfil «%s» funnet"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Ingen speilfil «%s» funnet"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Ingen speilfil «%s» funnet"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Speil: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Klarte ikke å sette endringstidspunkt"
@@ -3838,6 +3820,25 @@ msgstr "Forbindelsen ble uventet stengt"
 msgid "Empty files can't be valid archives"
 msgstr "Tomme filer kan ikke være gyldige arkiver"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Ingen speilfil «%s» funnet"
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Ingen speilfil «%s» funnet"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Ingen speilfil «%s» funnet"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Speil: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Åpner oppsettsfila %s"
 
diff --git a/po/ne.po b/po/ne.po
index 2ee2d5fd4..dfc9a316d 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -146,7 +146,7 @@ msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा �
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s पढ्न असफल भयो"
@@ -358,6 +358,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "%s  %s तान्न असफल भयो"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -372,12 +377,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -422,6 +421,11 @@ msgstr "आंशिक सूचिहरुको डाइरेक्ट्�
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।"
 
@@ -485,7 +489,7 @@ msgstr "प्याकेज सूचीहरू वा वस्तुस्
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
 
@@ -1538,11 +1542,6 @@ msgstr "तपाईँको स्रोत सूचिमा केही 's
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s  %s तान्न असफल भयो"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3447,17 +3446,23 @@ msgstr "फाइल फेला परेन "
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "%s (%s) मा जडान गरिदैछ"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "%s (%s) मा जडान गरिदैछ"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "%s (%s) मा जडान गरिदैछ"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u) को लागि सकेट सिर्जना गर्न सकिएन"
@@ -3467,11 +3472,6 @@ msgstr "%s (f=%u t=%u p=%u) को लागि सकेट सिर्जन�
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr " %s:%s (%s) मा जडान सुरुवात गर्न सकेन"
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "%s:%s (%s) मा जडान गर्न सकिएन, जडान समय सकियो"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "असफल भयो"
@@ -3481,6 +3481,11 @@ msgstr "असफल भयो"
 msgid "Could not connect to %s:%s (%s)."
 msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "%s:%s (%s) मा जडान गर्न सकिएन, जडान समय सकियो"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3729,30 +3734,6 @@ msgstr "जडान समय सकियो"
 msgid "Error writing to output file"
 msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "फाइल %s खोल्न सकिएन"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "फाइल %s खोल्न सकिएन"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "परिमार्जन समय सेट असफल भयो"
@@ -3765,6 +3746,19 @@ msgstr "जडान असमायिक बन्द भयो"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "फाइल %s खोल्न सकिएन"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "फाइल %s खोल्न सकिएन"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
 
diff --git a/po/nl.po b/po/nl.po
index 5e6960989..c9d81abb6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-10-20 23:00+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\n"
 "PO-Revision-Date: 2017-09-29 22:22+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -152,7 +152,7 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kan %s niet lezen"
@@ -396,6 +396,11 @@ msgstr ""
 "pakketbron uitgevoerd kunnen worden. Raadpleeg man-pagina %s voor bijkomende "
 "informatie."
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Ophalen van %s is mislukt  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -410,14 +415,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Kan geen bron vinden om versie '%s' van '%s' op te halen"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
-"pakket %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -463,6 +460,12 @@ msgid "List directory %spartial is missing."
 msgstr "Lijstmap %spartial is afwezig."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Lijstmap %spartial is afwezig."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Archiefmap %spartial is afwezig."
@@ -536,7 +539,7 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "De lijst van bronnen kon niet gelezen worden."
 
@@ -1655,11 +1658,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr "Kan %s niet naar een geheel getal omzetten: buiten het bereik"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Ophalen van %s is mislukt  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3654,17 +3652,23 @@ msgstr "Bestand niet gevonden"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr "Een rechtstreekse verbinding met %s-domeinen is standaard geblokkeerd."
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Er wordt verbinding gemaakt met %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Er wordt verbinding gemaakt met %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Er wordt verbinding gemaakt met %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken"
@@ -3674,11 +3678,6 @@ msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kan de verbinding met %s:%s (%s) niet aangaan."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Kon niet verbinden met %s:%s (%s); de verbinding verliep"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Mislukt"
@@ -3688,6 +3687,11 @@ msgstr "Mislukt"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kon niet verbinden met %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Kon niet verbinden met %s:%s (%s); de verbinding verliep"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3947,30 +3951,6 @@ msgstr "Verbinding verliep"
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar uitvoerbestand"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Geen spiegelbestand '%s' gevonden "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Kan spiegelbestand '%s' niet lezen"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Geen vermelding gevonden in spiegelbestand '%s'"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Spiegelserver: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Instellen van de aanpassingstijd is mislukt"
@@ -3983,6 +3963,24 @@ msgstr "Verbinding werd voortijdig afgebroken"
 msgid "Empty files can't be valid archives"
 msgstr "Lege bestanden kunnen geen geldige archieven zijn"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld "
+#~ "voor pakket %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Geen spiegelbestand '%s' gevonden "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Kan spiegelbestand '%s' niet lezen"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Geen vermelding gevonden in spiegelbestand '%s'"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Spiegelserver: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Configuratiebestand %s wordt geopend"
 
diff --git a/po/nn.po b/po/nn.po
index 3a3184bb0..80d133bd6 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -149,7 +149,7 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarte ikkje lesa %s"
@@ -361,6 +361,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Klarte ikkje henta %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -375,13 +380,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Pakkeindeksfilene er �ydelagde. Feltet �Filename:� manglar for pakken %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -429,6 +427,11 @@ msgstr "Listekatalogen %spartial manglar."
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "Listekatalogen %spartial manglar."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arkivkatalogen %spartial manglar."
 
@@ -494,7 +497,7 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Du vil kanskje pr�va � retta p� desse problema ved � k�yra �apt-get update�."
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Kjeldelista kan ikkje lesast."
 
@@ -1547,11 +1550,6 @@ msgstr "Du m� leggja nokre kjelde-URI-ar i fila sources.list."
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Klarte ikkje henta %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3462,17 +3460,23 @@ msgstr "Fann ikkje fila"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Koplar til %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Koplar til %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Koplar til %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)"
@@ -3482,11 +3486,6 @@ msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot p� sambandet"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Mislukkast"
@@ -3496,6 +3495,11 @@ msgstr "Mislukkast"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Klarte ikkje kopla til %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot p� sambandet"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3744,30 +3748,6 @@ msgstr "Tidsavbrot p� sambandet"
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Klarte ikkje opna fila %s"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Klarte ikkje opna fila %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
@@ -3780,6 +3760,19 @@ msgstr "Sambandet vart uventa stengd"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Pakkeindeksfilene er �ydelagde. Feltet �Filename:� manglar for pakken %s."
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Klarte ikkje opna fila %s"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Klarte ikkje opna fila %s"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Opnar oppsettsfila %s"
 
diff --git a/po/pl.po b/po/pl.po
index a3c161ab9..857a3d142 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -152,7 +152,7 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nie można czytać %s"
@@ -367,6 +367,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Nie udało się pobrać %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -381,13 +386,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -431,6 +429,12 @@ msgid "List directory %spartial is missing."
 msgstr "Brakuje katalogu list %spartial."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Brakuje katalogu list %spartial."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Brakuje katalogu archiwów %spartial."
@@ -497,7 +501,7 @@ msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Należy uruchomić apt-get update aby naprawić te problemy."
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Nie udało się odczytać list źródeł."
 
@@ -1604,11 +1608,6 @@ msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.li
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Nie udało się pobrać %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3573,17 +3572,23 @@ msgstr "Nie odnaleziono pliku"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Łączenie z %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Łączenie z %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Łączenie z %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nie udało się utworzyć gniazda dla %s (f=%u t=%u p=%u)"
@@ -3593,11 +3598,6 @@ msgstr "Nie udało się utworzyć gniazda dla %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nie udało się zainicjalizować połączenia z %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Nie udało się połączyć z %s:%s (%s), przekroczenie czasu połączenia"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Nie udało się"
@@ -3607,6 +3607,11 @@ msgstr "Nie udało się"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nie udało się połączyć z %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Nie udało się połączyć z %s:%s (%s), przekroczenie czasu połączenia"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3861,30 +3866,6 @@ msgstr "Przekroczenie czasu połączenia"
 msgid "Error writing to output file"
 msgstr "Błąd przy pisaniu do pliku wyjściowego"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Nie znaleziono pliku serwera lustrzanego \"%s\""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\""
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\""
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Serwer lustrzany: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Nie udało się ustawić czasu modyfikacji"
@@ -3897,6 +3878,24 @@ 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 ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Nie znaleziono pliku serwera lustrzanego \"%s\""
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\""
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\""
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Serwer lustrzany: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Otwieranie pliku konfiguracyjnego %s"
 
diff --git a/po/pt.po b/po/pt.po
index 09d7d49dd..ac18fe0a6 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -147,7 +147,7 @@ msgstr "O ficheiro %s/%s substitui o que está no pacote %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Não foi possível ler %s"
@@ -363,6 +363,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Falhou obter %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -378,14 +383,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
-"para o pacote %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -430,6 +427,12 @@ msgid "List directory %spartial is missing."
 msgstr "Falta directório de listas %spartial."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Falta directório de listas %spartial."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Falta o directório de arquivos %spartial."
@@ -500,7 +503,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Você terá que executar apt-get update para corrigir estes problemas"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pôde ser lida."
 
@@ -1611,11 +1614,6 @@ msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Falhou obter %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3552,17 +3550,23 @@ msgstr "Ficheiro não encontrado"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "A Ligar a %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "A Ligar a %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "A Ligar a %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
@@ -3572,11 +3576,6 @@ msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Não posso iniciar a ligação para %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Falhou"
@@ -3586,6 +3585,11 @@ msgstr "Falhou"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Não foi possível ligar em %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3839,30 +3843,6 @@ msgstr "O tempo da ligação expirou"
 msgid "Error writing to output file"
 msgstr "Erro ao escrever para o ficheiro de saída"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Não foi encontrado ficheiro de mirror '%s'"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Não pode ler ficheiro de mirror '%s'"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Não pode ler ficheiro de mirror '%s'"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Mirror: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Falhou definir hora de modificação"
@@ -3875,6 +3855,25 @@ msgstr "Ligação encerrada prematuramente"
 msgid "Empty files can't be valid archives"
 msgstr "Ficheiros vazios não podem ser arquivos válidos"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo "
+#~ "Filename: para o pacote %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Não foi encontrado ficheiro de mirror '%s'"
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Não pode ler ficheiro de mirror '%s'"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Não pode ler ficheiro de mirror '%s'"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Mirror: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "A abrir o ficheiro de configuração %s"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8595a74fd..87c607831 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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."
@@ -147,7 +147,7 @@ msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossível ler %s"
@@ -358,6 +358,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Falhou ao buscar %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -373,14 +378,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
-"\" para o pacote %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -426,6 +423,11 @@ msgstr "Diretório de listas %spartial está faltando."
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "Diretório de listas %spartial está faltando."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Diretório de arquivos %spartial está faltando."
 
@@ -493,7 +495,7 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Você terá que executar apt-get update para corrigir estes problemas"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pode ser lida."
 
@@ -1555,11 +1557,6 @@ msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Falhou ao buscar %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3487,17 +3484,23 @@ msgstr "Arquivo não encontrado"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Conectando em %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Conectando em %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Conectando em %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
@@ -3507,11 +3510,6 @@ msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Não foi possível iniciar a conexão para %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Falhou"
@@ -3521,6 +3519,11 @@ msgstr "Falhou"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Não foi possível conectar em %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3775,30 +3778,6 @@ msgstr "Conexão expirou"
 msgid "Error writing to output file"
 msgstr "Erro escrevendo para arquivo de saída"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Não foi possível abrir arquivo %s"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Não foi possível abrir arquivo %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Falhou ao definir hora de modificação"
@@ -3811,6 +3790,20 @@ msgstr "Conexão encerrada prematuramente"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo "
+#~ "\"Filename:\" para o pacote %s."
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Não foi possível abrir arquivo %s"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Não foi possível abrir arquivo %s"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Abrindo arquivo de configuração %s"
 
diff --git a/po/ro.po b/po/ro.po
index 061f2a4ee..2a8f5b392 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -150,7 +150,7 @@ msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nu s-a putut citi %s"
@@ -362,6 +362,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Eșec la aducerea lui %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -376,14 +381,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
-"pachetul %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -429,6 +426,11 @@ msgstr "Directorul de liste %spartial lipsește."
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "Directorul de liste %spartial lipsește."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Directorul de arhive %spartial lipsește."
 
@@ -496,7 +498,7 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme."
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Lista surselor nu poate fi citită."
 
@@ -1558,11 +1560,6 @@ msgstr "Trebuie să puneți niște 'surse' de URI în sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Eșec la aducerea lui %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3496,17 +3493,23 @@ msgstr "Fișier negăsit"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Conectare la %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Conectare la %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Conectare la %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nu s-a putut crea un socket pentru %s (f=%u t=%u p=%u)"
@@ -3516,12 +3519,6 @@ msgstr "Nu s-a putut crea un socket pentru %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nu s-a putut iniția conexiunea cu %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-"Nu s-a putut realiza conexiunea cu %s:%s (%s), timpul de conectare expirat"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Eșec"
@@ -3531,6 +3528,12 @@ msgstr "Eșec"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr ""
+"Nu s-a putut realiza conexiunea cu %s:%s (%s), timpul de conectare expirat"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3788,30 +3791,6 @@ msgstr "Timp de conectare expirat"
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fișierului de rezultat"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Nu s-a putut deschide fișierul %s"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Nu s-a putut deschide fișierul %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Eșec la ajustarea timpului de modificare"
@@ -3824,6 +3803,20 @@ msgstr "Conexiune închisă prematur"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' "
+#~ "la pachetul %s."
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Nu s-a putut deschide fișierul %s"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Nu s-a putut deschide fișierul %s"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Se deschide fișierul de configurare %s"
 
diff --git a/po/ru.po b/po/ru.po
index 5e49b200f..63b7d10e4 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -154,7 +154,7 @@ msgstr "Файл %s/%s переписывает файл в пакете %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Невозможно прочитать %s"
@@ -393,6 +393,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Не удалось получить %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -407,12 +412,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -456,6 +455,12 @@ msgid "List directory %spartial is missing."
 msgstr "Каталог списка %spartial отсутствует."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Каталог списка %spartial отсутствует."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Архивный каталог %spartial отсутствует."
@@ -527,7 +532,7 @@ msgstr "Списки пакетов или файл состояния не мо
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Вы можете запустить «apt-get update» для исправления этих ошибок"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Не читается перечень источников."
 
@@ -1644,11 +1649,6 @@ msgstr "Вы должны заполнить sources.list, поместив ту
 msgid "Cannot convert %s to integer: out of range"
 msgstr "Невозможно преобразовать %s в целое число: выход за пределы диапазона"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Не удалось получить %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3623,17 +3623,23 @@ msgstr "Файл не найден"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Соединение с %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Соединение с %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Соединение с %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Не удаётся создать сокет для %s (f=%u t=%u p=%u)"
@@ -3643,11 +3649,6 @@ msgstr "Не удаётся создать сокет для %s (f=%u t=%u p=%u)
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Невозможно инициализировать соединение с %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Неудачно"
@@ -3657,6 +3658,11 @@ msgstr "Неудачно"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Не удаётся соединиться с %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3915,30 +3921,6 @@ msgstr "Время ожидания для соединения истекло"
 msgid "Error writing to output file"
 msgstr "Ошибка записи в выходной файл"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Файл «%s» не найден на зеркале"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Невозможно прочитать файл на зеркале «%s»"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Не найден элемент в файл на зеркале «%s»"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Зеркало: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Не удалось установить время модификации"
@@ -3951,6 +3933,22 @@ msgstr "Соединение закрыто преждевременно"
 msgid "Empty files can't be valid archives"
 msgstr "Пустые файлы не могут быть допустимыми архивами"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Файл «%s» не найден на зеркале"
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Невозможно прочитать файл на зеркале «%s»"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Не найден элемент в файл на зеркале «%s»"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Зеркало: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Открытие файла настройки %s"
 
diff --git a/po/sk.po b/po/sk.po
index 7f9ec7a13..500236c04 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -149,7 +149,7 @@ msgstr "Súbor %s/%s prepisuje ten z balíka %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nedá sa načítať %s"
@@ -364,6 +364,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Zlyhalo stiahnutie %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -378,12 +383,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -427,6 +426,12 @@ msgid "List directory %spartial is missing."
 msgstr "Adresár zoznamov %spartial chýba."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Adresár zoznamov %spartial chýba."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Archívny adresár %spartial chýba."
@@ -491,7 +496,7 @@ msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvor
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Nedá sa načítať zoznam zdrojov."
 
@@ -1577,11 +1582,6 @@ msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Zlyhalo stiahnutie %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3516,17 +3516,23 @@ msgstr "Súbor sa nenašiel"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Pripája sa k %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Pripája sa k %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Pripája sa k %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nedá sa vytvoriť socket pre %s (f=%u t=%u p=%u)"
@@ -3536,11 +3542,6 @@ msgstr "Nedá sa vytvoriť socket pre %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Chyba"
@@ -3550,6 +3551,11 @@ msgstr "Chyba"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nedá sa pripojiť k %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3800,30 +3806,6 @@ msgstr "Uplynul čas spojenia"
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Na zrkadle nebol nájdený súbor „%s“"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Zrkadlo: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Zlyhalo nastavenie času zmeny"
@@ -3836,6 +3818,24 @@ 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 ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Na zrkadle nebol nájdený súbor „%s“"
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Zrkadlo: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Otvára sa konfiguračný súbor %s"
 
diff --git a/po/sl.po b/po/sl.po
index 81e908ba6..675f6e729 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -149,7 +149,7 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni mogoče brati %s"
@@ -364,6 +364,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Ni mogoče dobiti %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -378,14 +383,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
-"%s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -429,6 +426,12 @@ msgid "List directory %spartial is missing."
 msgstr "Mapa seznama %spartial manjka."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Mapa seznama %spartial manjka."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Mapa arhivov %spartial manjka."
@@ -493,7 +496,7 @@ msgstr "Ni mogoče odprti ali razčleniti seznama paketov ali datoteke stanja."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Za odpravljanje težav poskusite zagnati apt-get update."
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Seznama virov ni mogoče brati."
 
@@ -1577,11 +1580,6 @@ msgstr "V sources.list morate vstaviti URI-je z viri"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Ni mogoče dobiti %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3523,17 +3521,23 @@ msgstr "Datoteke ni mogoče najti"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Povezovanje z %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Povezovanje z %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Povezovanje z %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Ni mogoče ustvariti vtiča za %s (f=%u t=%u p=%u)"
@@ -3543,11 +3547,6 @@ msgstr "Ni mogoče ustvariti vtiča za %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ni mogoče začeti povezave z %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Ni se mogoče povezati z %s:%s (%s). Povezava je zakasnela."
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Spodletelo"
@@ -3557,6 +3556,11 @@ msgstr "Spodletelo"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Ni se mogoče povezati z %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Ni se mogoče povezati z %s:%s (%s). Povezava je zakasnela."
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3807,30 +3811,6 @@ msgstr "Povezava je zakasnela"
 msgid "Error writing to output file"
 msgstr "Napaka med pisanjem v izhodno datoteko"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Datoteke zrcalnih strežnikov '%s' ni mogoče najti "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Zrcalni strežnik: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Nastavitev časa spremembe je spodletela"
@@ -3843,6 +3823,25 @@ msgstr "Povezava se je prezgodaj zaprla"
 msgid "Empty files can't be valid archives"
 msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za "
+#~ "paket %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Datoteke zrcalnih strežnikov '%s' ni mogoče najti "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Zrcalni strežnik: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Odpiranje nastavitvene datoteke %s"
 
diff --git a/po/sv.po b/po/sv.po
index 1914f7e0c..178a432e3 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -150,7 +150,7 @@ msgstr "Filen %s/%s skriver över den i paketet %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunde inte läsa %s"
@@ -368,6 +368,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Misslyckades med att hämta %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -382,12 +387,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Kan inte hitta en källa för att hämta version ”%s” av ”%s”"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "Paketindexfilerna är skadade. Inget ”Filename:”-fält för paketet %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -431,6 +430,12 @@ msgid "List directory %spartial is missing."
 msgstr "Listkatalogen %spartial saknas."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Listkatalogen %spartial saknas."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arkivkatalogen %spartial saknas."
@@ -501,7 +506,7 @@ msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Du kan möjligen rätta till problemet genom att köra ”apt-get update”"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Listan över källor kunde inte läsas."
 
@@ -1599,11 +1604,6 @@ msgstr "Du måste lägga till några ”source”-URI:er i din sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Misslyckades med att hämta %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3548,16 +3548,22 @@ msgstr "Filen hittades inte"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Ansluter till %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
+#: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Ansluter till %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Ansluter till %s (%s)"
+
 # [f]amilj, [t]yp, [p]rotokoll
 #: methods/connect.cc
 #, c-format
@@ -3569,11 +3575,6 @@ msgstr "Kunde inte skapa ett uttag (socket) för %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kunde inte initiera anslutningen till %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen överskred tidsgräns"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Misslyckades"
@@ -3583,6 +3584,11 @@ msgstr "Misslyckades"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kunde inte ansluta till %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen överskred tidsgräns"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3840,30 +3846,6 @@ msgstr "Anslutningen överskred tidsgränsen"
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Ingen spegelfil ”%s” hittades "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Kan inte läsa spegelfilen ”%s”"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Ingen post funnen i spegelfilen ”%s”"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Spegel: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Misslyckades med att ställa in ändringstid"
@@ -3876,6 +3858,23 @@ msgstr "Anslutningen stängdes i förtid"
 msgid "Empty files can't be valid archives"
 msgstr "Tomma filer kan inte vara giltiga arkiv"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Paketindexfilerna är skadade. Inget ”Filename:”-fält för paketet %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Ingen spegelfil ”%s” hittades "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Kan inte läsa spegelfilen ”%s”"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Ingen post funnen i spegelfilen ”%s”"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Spegel: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Öppnar konfigurationsfilen %s"
 
diff --git a/po/th.po b/po/th.po
index 98fa1fef0..7849ceda2 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -147,7 +147,7 @@ msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพก�
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "ไม่สามารถอ่าน %s"
@@ -363,6 +363,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "ไม่สามารถดาวน์โหลด %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -375,12 +380,6 @@ msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s ค�
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -424,6 +423,12 @@ msgid "List directory %spartial is missing."
 msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial"
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial"
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial"
@@ -488,7 +493,7 @@ msgstr "ไม่สามารถแจงหรือเปิดรายช
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
 
@@ -1550,11 +1555,6 @@ msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน so
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "ไม่สามารถดาวน์โหลด %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3440,17 +3440,23 @@ msgstr "ไม่พบแฟ้ม"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "เชื่อมต่อไปยัง %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "เชื่อมต่อไปยัง %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "เชื่อมต่อไปยัง %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "ไม่สามารถสร้างซ็อกเก็ตสำหรับ %s (f=%u t=%u p=%u)"
@@ -3460,11 +3466,6 @@ msgstr "ไม่สามารถสร้างซ็อกเก็ตสำ
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "ไม่สามารถเริ่มการเชื่อมต่อไปยัง %s:%s (%s)"
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s) เนื่องจากหมดเวลาคอย"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "ล้มเหลว"
@@ -3474,6 +3475,11 @@ msgstr "ล้มเหลว"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s)"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s) เนื่องจากหมดเวลาคอย"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3721,30 +3727,6 @@ msgstr "หมดเวลารอเชื่อมต่อ"
 msgid "Error writing to output file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "ไม่พบแฟ้มแหล่งสำเนา '%s'"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำเนา '%s'"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "ไม่พบรายการในแฟ้มแหล่งสำเนา '%s'"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[แหล่งสำเนา: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
@@ -3757,6 +3739,22 @@ msgstr "การเชื่อมต่อถูกปิดก่อนเว
 msgid "Empty files can't be valid archives"
 msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "ไม่พบแฟ้มแหล่งสำเนา '%s'"
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำเนา '%s'"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "ไม่พบรายการในแฟ้มแหล่งสำเนา '%s'"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[แหล่งสำเนา: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
 
diff --git a/po/tl.po b/po/tl.po
index d960e0d00..346fb4f70 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -149,7 +149,7 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Hindi mabasa ang %s"
@@ -361,6 +361,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Bigo sa pagkuha ng %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -375,14 +380,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
-"paketeng %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -428,6 +425,11 @@ msgstr "Nawawala ang directory ng talaan %spartial."
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "Nawawala ang directory ng talaan %spartial."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Nawawala ang directory ng arkibo %spartial."
 
@@ -497,7 +499,7 @@ msgstr ""
 "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang "
 "ito"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
 
@@ -1562,11 +1564,6 @@ msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Bigo sa pagkuha ng %s  %s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3481,17 +3478,23 @@ msgstr "Hindi Nahanap ang Talaksan"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Kumokonekta sa %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Kumokonekta sa %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Kumokonekta sa %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)"
@@ -3501,11 +3504,6 @@ msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Bigo"
@@ -3515,6 +3513,11 @@ msgstr "Bigo"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Hindi maka-konekta sa %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3768,30 +3771,6 @@ msgstr "Nag-timeout ang koneksyon"
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Hindi mabuksan ang talaksang %s"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Hindi mabuksan ang talaksang %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Bigo ang pagtakda ng oras ng pagbago"
@@ -3804,6 +3783,20 @@ msgstr "Nagsara ng maaga ang koneksyon"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
+#~ "paketeng %s."
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Hindi mabuksan ang talaksang %s"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Hindi mabuksan ang talaksang %s"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Binubuksan ang talaksang pagsasaayos %s"
 
diff --git a/po/tr.po b/po/tr.po
index 72fc599da..82299300e 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -150,7 +150,7 @@ msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak isti
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s okunamadı"
@@ -390,6 +390,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "%s alınamadı %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -404,12 +409,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "Paket indeks dosyaları bozuk. %s paketinin 'Filename:' alanı yok."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -455,6 +454,12 @@ msgid "List directory %spartial is missing."
 msgstr "Liste dizini %spartial bulunamadı."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Liste dizini %spartial bulunamadı."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arşiv dizini %spartial bulunamadı."
@@ -527,7 +532,7 @@ msgstr "Paket listeleri ya da durum dosyası ayrıştırılamadı ya da açılam
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Bu sorunları gidermek için apt-get update komutunu çalıştırabilirsiniz"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Kaynak listesi okunamadı."
 
@@ -1616,11 +1621,6 @@ msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "%s metni tam sayıya dönüştürülemiyor: aralığın dışında"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s alınamadı %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3585,17 +3585,23 @@ msgstr "Dosya bulunamadı"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr "%s alan adına doğrudan bağlantılar öntanımlı olarak engellenmiştir."
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Bağlanılıyor %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Bağlanılıyor %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Bağlanılıyor %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s için bir soket oluşturulamadı (f=%u t=%u p=%u)"
@@ -3605,11 +3611,6 @@ msgstr "%s için bir soket oluşturulamadı (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s bağlantısı başlatılamıyor (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Adrese bağlanılamadı: %s:%s (%s), bağlantı zaman aşımına uğradı"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Başarısız"
@@ -3619,6 +3620,11 @@ msgstr "Başarısız"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Adrese bağlanılamadı: %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Adrese bağlanılamadı: %s:%s (%s), bağlantı zaman aşımına uğradı"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3868,30 +3874,6 @@ msgstr "Bağlantı zaman aşımına uğradı"
 msgid "Error writing to output file"
 msgstr "Çıktı dosyasına yazılırken hata"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "'%s' yansı dosyası bulunamadı "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Yansı dosyası %s okunamıyor"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "'%s' yansı dosyasında hiç girdi bulunmuyor"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Yansı: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Değişiklik zamanı ayarlanamadı"
@@ -3904,6 +3886,22 @@ 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 ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr "Paket indeks dosyaları bozuk. %s paketinin 'Filename:' alanı yok."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "'%s' yansı dosyası bulunamadı "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Yansı dosyası %s okunamıyor"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "'%s' yansı dosyasında hiç girdi bulunmuyor"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Yansı: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Yapılandırma dosyası (%s) açılıyor"
 
diff --git a/po/uk.po b/po/uk.po
index bbba4cc58..c5a45e8a0 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -156,7 +156,7 @@ msgstr "Файл %s/%s перезаписує інший файл в пакун�
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Неможливо прочитати %s"
@@ -372,6 +372,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Не вдалося завантажити %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -386,13 +391,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -437,6 +435,12 @@ msgid "List directory %spartial is missing."
 msgstr "Відсутня директорія зі списками: %spartial"
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Відсутня директорія зі списками: %spartial"
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Відсутня директорія для архівів: %spartial"
@@ -502,7 +506,7 @@ msgstr "Не можу обробити чи відкрити перелік па
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Для виправлення цих помилок Ви можете виконати apt-get update"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Неможливо прочитати перелік вихідних кодів."
 
@@ -1608,11 +1612,6 @@ msgstr "Додайте деякі посилання (URI) на вихідні �
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Не вдалося завантажити %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3575,17 +3574,23 @@ msgstr "Файл не знайдено"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "З'єднання з %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "З'єднання з %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "З'єднання з %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Неможливо створити сокет для %s (f=%u t=%u p=%u)"
@@ -3595,11 +3600,6 @@ msgstr "Неможливо створити сокет для %s (f=%u t=%u p=%u
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Неможливо почати з'єднання з %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Невдача"
@@ -3609,6 +3609,11 @@ msgstr "Невдача"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Неможливо під'єднатися до %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3862,30 +3867,6 @@ msgstr "Час очікування з'єднання вийшов"
 msgid "Error writing to output file"
 msgstr "Помилка запису у вихідний файл"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Не знайдено файла дзеркала '%s' "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Неможливо прочитати файл дзеркала '%s'"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Неможливо прочитати файл дзеркала '%s'"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Дзеркало: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Не вдалося встановити час модифікації"
@@ -3898,6 +3879,24 @@ msgstr "З'єднання завершено передчасно"
 msgid "Empty files can't be valid archives"
 msgstr "Пусті файли не можуть бути правильними архівами"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Не знайдено файла дзеркала '%s' "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Неможливо прочитати файл дзеркала '%s'"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Неможливо прочитати файл дзеркала '%s'"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Дзеркало: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Відкривається конфігураційний файл %s"
 
diff --git a/po/vi.po b/po/vi.po
index c03031b9d..0ed3ff54b 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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"
@@ -151,7 +151,7 @@ msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "Không thể đọc %s"
@@ -368,6 +368,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Gặp lỗi khi lấy về %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -382,14 +387,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
-"tin:) cho gói %s."
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -433,6 +430,12 @@ msgid "List directory %spartial is missing."
 msgstr "Thiếu thư mục danh sách %spartial."
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "Thiếu thư mục danh sách %spartial."
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Thiếu thư mục kho lưu %spartial."
@@ -499,7 +502,7 @@ msgstr ""
 "Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề "
 "này"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "Không thể đọc danh sách nguồn."
 
@@ -1591,11 +1594,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Gặp lỗi khi lấy về %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3545,17 +3543,23 @@ msgstr "Không tìm thấy tập tin"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Đang kết nối đến %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[Địa chỉ IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "Đang kết nối đến %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Đang kết nối đến %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)"
@@ -3565,11 +3569,6 @@ msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Không thể khởi tạo kết nối đến %s:%s (%s)."
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Không thể kết nối đến %s:%s (%s), kết nối bị quá giờ"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "Gặp lỗi"
@@ -3579,6 +3578,11 @@ msgstr "Gặp lỗi"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Không thể kết nối đến %s:%s (%s)."
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Không thể kết nối đến %s:%s (%s), kết nối bị quá giờ"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3831,30 +3835,6 @@ msgstr "Kết nối đã quá giờ"
 msgid "Error writing to output file"
 msgstr "Gặp lỗi khi ghi vào tập tin đầu ra"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Không tìm thấy tập tin bản sao “%s” "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Không thể đọc tập tin bản sao “%s”"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Không tìm thấy điểm vào trong tập tin bản sao “%s”"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Bản sao: %s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "Gặp lỗi khi đặt giờ sửa đổi"
@@ -3867,6 +3847,24 @@ 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 ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr ""
+#~ "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên "
+#~ "tập tin:) cho gói %s."
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "Không tìm thấy tập tin bản sao “%s” "
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "Không thể đọc tập tin bản sao “%s”"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "Không tìm thấy điểm vào trong tập tin bản sao “%s”"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[Bản sao: %s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "Đang mở tập tin cấu hình %s..."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4d5265181..228bba287 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\n"
 "PO-Revision-Date: 2017-10-08 11:00+0000\n"
 "Last-Translator: Mo Zhou <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -149,7 +149,7 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
@@ -368,6 +368,11 @@ msgid ""
 msgstr ""
 "为了让这个仓库能够应用，这必须在更新之前显式接受。更多细节请参阅 %s 手册。"
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "无法下载 %s  %s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -382,12 +387,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "没有源可以用来下载 %s 版本的 %s"
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -431,6 +430,12 @@ msgid "List directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 缺失。"
 
 #: apt-pkg/acquire.cc
+#, fuzzy, c-format
+#| msgid "List directory %spartial is missing."
+msgid "List directory %sauxfiles is missing."
+msgstr "软件包列表的目录 %spartial 缺失。"
+
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "仓库目录 %spartial 确实。"
@@ -497,7 +502,7 @@ msgstr "无法解析或打开软件包的列表或是状态文件。"
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您可能需要运行 apt-get update 来解决这些问题"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "无法读取源列表。"
 
@@ -1552,11 +1557,6 @@ msgstr "您必须在 sources.list 中指定代码源(deb-src) URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "无法将 %s 转换为整数：超出范围"
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "无法下载 %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3444,17 +3444,23 @@ msgstr "无法找到文件"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr "通向 %s 域名的直接连接被设为默认阻止。"
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "正在连接 %s (%s)"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "正在连接 %s (%s)"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "正在连接 %s (%s)"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
@@ -3464,11 +3470,6 @@ msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "无法发起与 %s:%s (%s) 的连接"
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "无法连接上 %s:%s (%s)，连接超时"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "失败"
@@ -3478,6 +3479,11 @@ msgstr "失败"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "无法连接上 %s:%s (%s)。"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "无法连接上 %s:%s (%s)，连接超时"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3724,30 +3730,6 @@ msgstr "连接超时"
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "没有找到镜像文件 %s"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "无法读取镜像文件 %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "在镜像文件 %s 中未找到所需条目"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[镜像：%s]"
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
@@ -3760,6 +3742,22 @@ msgstr "连接被永久关闭"
 msgid "Empty files can't be valid archives"
 msgstr "空文件不是有效归档"
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
+
+#~ msgid "No mirror file '%s' found "
+#~ msgstr "没有找到镜像文件 %s"
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "无法读取镜像文件 %s"
+
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "在镜像文件 %s 中未找到所需条目"
+
+#~ msgid "[Mirror: %s]"
+#~ msgstr "[镜像：%s]"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "正在打开配置文件 %s"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index eb9140222..9404b4aca 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-10-22 23:49+0200\n"
+"POT-Creation-Date: 2018-01-03 22:34+0000\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."
@@ -149,7 +149,7 @@ msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案"
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
 #: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "無法讀取 %s"
@@ -360,6 +360,11 @@ msgid ""
 "applied. See %s manpage for details."
 msgstr ""
 
+#: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "無法取得 %s，%s"
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -374,12 +379,6 @@ msgstr ""
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
-
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -424,6 +423,11 @@ msgstr "找不到清單目錄 %spartial。"
 
 #: apt-pkg/acquire.cc
 #, fuzzy, c-format
+msgid "List directory %sauxfiles is missing."
+msgstr "找不到清單目錄 %spartial。"
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "找不到套件檔目錄 %spartial。"
 
@@ -487,7 +491,7 @@ msgstr "無法分析或開啟套件清單或狀況檔。"
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您也許得執行 apt-get update 以修正這些問題"
 
-#: apt-pkg/cachefile.cc
+#: apt-pkg/cachefile.cc methods/mirror.cc
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源列表。"
 
@@ -1537,11 +1541,6 @@ msgstr "在 sources.list 中必須包含一些 'source' URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "無法取得 %s，%s"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3427,17 +3426,23 @@ msgstr "找不到檔案"
 msgid "Direct connection to %s domains is blocked by default."
 msgstr ""
 
-#: methods/connect.cc methods/http.cc
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "正和 %s (%s) 連線"
-
 #: methods/connect.cc
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #: methods/connect.cc
+#, fuzzy, c-format
+#| msgid "Connecting to %s (%s)"
+msgid "Connected to %s (%s)"
+msgstr "正和 %s (%s) 連線"
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "正和 %s (%s) 連線"
+
+#: methods/connect.cc
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "無法建立 socket 指向 %s (f=%u t=%u p=%u)"
@@ -3447,11 +3452,6 @@ msgstr "無法建立 socket 指向 %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "無法初始和 %s:%s (%s) 的連線。"
 
-#: methods/connect.cc
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "無法和 %s:%s (%s) 連線，連線逾時"
-
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "失敗"
@@ -3461,6 +3461,11 @@ msgstr "失敗"
 msgid "Could not connect to %s:%s (%s)."
 msgstr "無法和 %s:%s (%s) 連線。"
 
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "無法和 %s:%s (%s) 連線，連線逾時"
+
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc methods/rsh.cc
@@ -3708,30 +3713,6 @@ msgstr "連線逾時"
 msgid "Error writing to output file"
 msgstr "在寫入輸出檔時發生錯誤"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "無法開啟檔案 %s"
-
-#: methods/mirror.cc
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "無法開啟檔案 %s"
-
-#: methods/mirror.cc
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc
 msgid "Failed to set modification time"
 msgstr "無法設定修改時間"
@@ -3744,6 +3725,18 @@ msgstr "連線突然終止"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid ""
+#~ "The package index files are corrupted. No Filename: field for package %s."
+#~ msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
+
+#, fuzzy
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "無法開啟檔案 %s"
+
+#, fuzzy
+#~ msgid "No entry found in mirror file '%s'"
+#~ msgstr "無法開啟檔案 %s"
+
 #~ msgid "Opening configuration file %s"
 #~ msgstr "開啟設定檔 %s"