Release 1.6~alpha61.6_alpha6

13 files changed, 9704 insertions, 1913 deletions

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>