summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--COPYING24
-rw-r--r--apt-pkg/contrib/strutl.h2
-rw-r--r--debian/control4
-rw-r--r--doc/apt.conf.5.xml52
-rw-r--r--doc/design.dbk16
-rw-r--r--doc/examples/configure-index26
-rw-r--r--doc/files.dbk3
-rw-r--r--doc/guide.dbk1
-rw-r--r--doc/po/apt-doc.pot94
-rw-r--r--doc/po/de.po281
-rw-r--r--doc/po/es.po279
-rw-r--r--doc/po/fr.po284
-rw-r--r--doc/po/it.po277
-rw-r--r--doc/po/ja.po265
-rw-r--r--doc/po/nl.po287
-rw-r--r--doc/po/pl.po154
-rw-r--r--doc/po/pt.po273
-rw-r--r--doc/po/pt_BR.po91
-rw-r--r--doc/sources.list.5.xml24
20 files changed, 964 insertions, 1476 deletions
diff --git a/.gitignore b/.gitignore
index e6f4ed2f4..371d9948f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,10 +66,7 @@ docbook-text-style.xsl
**/methods/mirror+ftp
**/methods/mirror+http
**/methods/mirror+https
-**/methods/ftp
**/methods/rred
-**/methods/rsh
-**/methods/ssh
**/methods/gzip
**/methods/bzip2
**/methods/xz
diff --git a/COPYING b/COPYING
index 670c30d5d..0f0e3f68f 100644
--- a/COPYING
+++ b/COPYING
@@ -16,11 +16,8 @@ Comment:
for the project has always been GPL-2+, so we cannot be sure that contributors
meant to grant additional permissions.
.
- Translation files are considered to generally be GPL-2+,
- but they also include strings used by methods/rsh.cc which appears to be GPL-2.
- As the translations are split into separate domains later on,
- these strings are not loaded by library users outside of apt
- (they are in the 'apt' translation domain).
+ Translation files are also considered to generally be GPL-2+,
+ but they might include strings used in code with other licenses.
.
The apt-pkg/contrib/fileutl.cc file states "RunScripts()" is "GPLv2".
We believe that this was not meant to exclude later versions of the GPL,
@@ -56,23 +53,6 @@ Files: methods/connect.c
Copyright: Copyright (c) 1996 - 2023, Daniel Stenberg, <daniel@haxx.se>, and many contributors
License: GPL-2+ and curl
-Files: methods/rsh.cc
-Copyright: 2000 Ben Collins <bcollins@debian.org>
-License: GPL-2
-Comment:
- This file stated:
- Licensed under the GNU General Public License v2 [no exception clauses]
- .
- We believe that this was intended to be not a statement against future
- versions of the GPL, but meant to exclude the Qt license exception in
- place in APT until that time.
- .
- We received permission from Ben in 2021 to relicense under GPL-2+,
- contributions from Adam Heath and Daniel Hartwig may still have to
- be considered GPL-2 for the time being.
- .
- Other contributions are GPL-2+
-
Files: CMake/FindBerkeley.cmake
Copyright: 2006, Alexander Dymo, <adymo@kdevelop.org>
2016, Julian Andres Klode <jak@debian.org>
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 6f80155e8..fdaa23766 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -98,7 +98,7 @@ APT_PUBLIC std::string TimeRFC1123(time_t Date, bool const NumericTimezone);
* @return \b true if parsing was successful, otherwise \b false.
*/
[[nodiscard]] APT_PUBLIC bool RFC1123StrToTime(const std::string &str,time_t &time);
-[[nodiscard]] APT_PUBLIC bool FTPMDTMStrToTime(const char* const str,time_t &time);
+[[nodiscard, deprecated("Unused and untested in src:apt")]] APT_PUBLIC bool FTPMDTMStrToTime(const char *str, time_t &time);
APT_PUBLIC std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0);
APT_PUBLIC int StringToBool(const std::string &Text,int Default = -1);
APT_PUBLIC bool ReadMessages(int Fd, std::vector<std::string> &List);
diff --git a/debian/control b/debian/control
index 896573a33..aa106ff50 100644
--- a/debian/control
+++ b/debian/control
@@ -96,8 +96,8 @@ Description: package management runtime library
solver or by interfacing with an external one
* authenticating the sources and validating the retrieved data
* installation and removal of packages in the system
- * providing different transports to retrieve data over cdrom, ftp,
- http(s), rsh as well as an interface to add more transports like
+ * providing different transports to retrieve data over cdrom and
+ http(s) as well as an interface to add more transports like
tor+http(s) (apt-transport-tor).
Package: apt-doc
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 702a71c78..356427032 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -535,47 +535,6 @@ APT::Compressor::rev {
manpages respectively.</para></listitem>
</varlistentry>
- <varlistentry><term><option>ftp</option></term>
- <listitem><para>
- <literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.
- It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>.
- Per host proxies can also be specified by using the form
- <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal>
- meaning to use no proxies. If no one of the above settings is specified,
- <envar>ftp_proxy</envar> environment variable
- will be used. To use an FTP
- proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in the
- configuration file. This entry specifies the commands to send to tell
- the proxy server what to connect to. Please see
- &configureindex; for an example of
- how to do this. The substitution variables representing the corresponding
- URI component are <literal>$(PROXY_USER)</literal>,
- <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>,
- <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> and
- <literal>$(SITE_PORT)</literal>.</para>
-
- <para>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.</para>
-
- <para>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 instead. This can be done globally or for connections that
- go through a proxy or for a specific host (see the sample config file
- for examples).</para>
-
- <para>It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</envar>
- environment variable to an HTTP URL - see the discussion of the http method
- above for syntax. You cannot set this in the configuration file and it is
- not recommended to use FTP over HTTP due to its low efficiency.</para>
-
- <para>The setting <literal>ForceExtended</literal> controls the use of RFC2428
- <literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is false, which means
- these commands are only used if the control connection is IPv6. Setting this
- to true forces their use even on IPv4 connections. Note that most FTP servers
- do not support RFC2428.</para></listitem>
- </varlistentry>
-
<varlistentry><term><option>cdrom</option></term>
<listitem><para>
For URIs using the <literal>cdrom</literal> method, the only configurable
@@ -1057,17 +1016,6 @@ APT::Compressor::rev {
</varlistentry>
<varlistentry>
- <term><option>Debug::Acquire::ftp</option></term>
-
- <listitem>
- <para>
- Print information related to downloading packages using
- FTP.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>Debug::Acquire::http</option></term>
<listitem>
diff --git a/doc/design.dbk b/doc/design.dbk
index ab49d9790..2ed3800a5 100644
--- a/doc/design.dbk
+++ b/doc/design.dbk
@@ -142,7 +142,7 @@ still satisfied.
<para>
Handle source lists for updates from multiple sources. APT should also be able
to handle diverse methods of acquiring new packages; local filesystem,
-mountable CD-ROM drives, FTP accessible repositories are some of the methods
+mountable CD-ROM drives, HTTP accessible repositories are some of the methods
that come to mind. Also, the source lists can be separated into categories,
such as main, contrib, non-local, non-free, my-very-own, etc. APT
should be set up to retrieve the Packages files from these multiple source
@@ -203,7 +203,7 @@ midst of installation, which may cause havoc on the machine)
<para>
This process handles setting of user or site options, and configuration of all
aspects of APT. It allows the user to set the location and order of package
-sources, allowing them to set up source list details, like ftp site locations,
+sources, allowing them to set up source list details, like http site locations,
passwords, etc. Display options may also be set.
</para>
</listitem>
@@ -216,7 +216,7 @@ Build a list of available packages, using source lists or a base location and
trawling for Packages files (needs to be aware of architecture). This may
involve finding and retrieving Packages files, storing them locally for
efficiency, and parsing the data for later use. This would entail contacting
-various underlying access modules (ftp, cdrom mounts, etc) Use a backing store
+various underlying access modules (http, cdrom mounts, etc) Use a backing store
for speed. This may also require downloading the actual package files locally
for speed.
</para>
@@ -308,7 +308,7 @@ set here?
Distinct versions of the same package are recorded separately, but if multiple
Packages files contain the same version of a package, then only the first one
is recorded. For this reason, the least expensive update source should be
-listed first (local file system is better than a remote ftp site)
+listed first (local file system is better than a remote http site)
</para>
<para>
This module should interact with the user interface module to set and change
@@ -318,7 +318,7 @@ information in an on disk data file, to be read on future invocations.
<orderedlist numeration="arabic">
<listitem>
<para>
-FTP methods
+HTTP methods
</para>
</listitem>
<listitem>
@@ -394,9 +394,9 @@ module to interact with dpkg
<chapter id="ch5"><title>Data flow and conversions analysis.</title>
<screen>
- ____________
- __\|ftp modules|
- / /|___________|
+ _____________
+ __\|http modules|
+ / /|____________|
_ ____________ / ________________
| update | / |mount/local file|
|==========================&gt;| module |/_____\| traversals |
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 482b6d870..ba51a9881 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -333,31 +333,6 @@ Acquire
User-Agent "Debian APT-CURL/1.0";
};
- ftp
- {
- Proxy "ftp://127.0.0.1/";
- Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting
-
- /* Required script to perform proxy login. This example should work
- for tisfwtk */
- ProxyLogin
- {
- "USER $(PROXY_USER)";
- "PASS $(PROXY_PASS)";
- "USER $(SITE_USER)@$(SITE):$(SITE_PORT)";
- "PASS $(SITE_PASS)";
- };
-
- Timeout "30";
- ConnectionAttemptDelayMsec "250";
-
- /* Passive mode control, proxy, non-proxy and per-host. Pasv mode
- is preferred if possible */
- Passive "true";
- Proxy::Passive "true";
- Passive::http.us.debian.org "true"; // Specific per-host setting
- };
-
cdrom
{
AutoDetect "<BOOL>"; // do auto detection of the cdrom mountpoint
@@ -578,7 +553,6 @@ Debug
BuildDeps "<BOOL>";
pkgInitialize "<BOOL>"; // This one will dump the configuration space
NoLocking "<BOOL>";
- Acquire::Ftp "<BOOL>"; // Show ftp command traffic
Acquire::Http "<BOOL>"; // Show http command traffic
Acquire::Https "<BOOL>"; // Show https debug
Acquire::tor "<BOOL>";
diff --git a/doc/files.dbk b/doc/files.dbk
index 95e6257e4..ac671fdba 100644
--- a/doc/files.dbk
+++ b/doc/files.dbk
@@ -85,15 +85,12 @@ The var directory structure is as follows:
cdrom
copy
file
- ftp
gpgv
gzip
http
https
lzma
rred
- rsh
- ssh
</screen>
<para>
As is specified in the FHS 2.1 /var/lib/apt is used for application data that
diff --git a/doc/guide.dbk b/doc/guide.dbk
index c5e6df257..bb314fdd5 100644
--- a/doc/guide.dbk
+++ b/doc/guide.dbk
@@ -223,7 +223,6 @@ use packages on your CD-ROM before downloading from the Internet.
For example:
file:/mnt/debian,
- ftp://ftp.example.org/debian,
http://deb.debian.org/debian,
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index bb7a2180e..039aec3d8 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -3466,64 +3466,6 @@ msgid ""
"&apt-transport-https; manpages respectively."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
-"It is in the standard form of "
-"<literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host proxies can "
-"also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the "
-"<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
-"entry specifies the commands to send to tell the proxy server what to "
-"connect to. Please see &configureindex; for an example of how to do "
-"this. The substitution variables representing the corresponding URI "
-"component are <literal>$(PROXY_USER)</literal>, "
-"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
-"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> and "
-"<literal>$(SITE_PORT)</literal>."
-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 "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the "
-"<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
-"discussion of the http method above for syntax. You cannot set this in the "
-"configuration file and it is not recommended to use FTP over HTTP due to its "
-"low efficiency."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml
#, no-wrap
@@ -4185,11 +4127,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
msgid "Print information related to downloading packages using HTTP."
msgstr ""
@@ -6133,42 +6070,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml
msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using removable media to copy files around with "
"APT."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml
msgid "adding more recognizable URI types"
@@ -9102,7 +9009,6 @@ msgid ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
diff --git a/doc/po/de.po b/doc/po/de.po
index 7268e5d8c..e663f9a5e 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -4980,98 +4980,6 @@ msgstr ""
"Protokolle HTTP und HTTPS abwickelt. Sie sind in den Handbuchseiten &apt-"
"transport-http; beziehungsweise &apt-transport-https; dokumentiert."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>. Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> setzt den Standard-Proxy, der für FTP-URIs "
-"benutzt werden soll. Er wird in der Standardform <literal>ftp://[[Benutzer][:"
-"Passwort]@]Rechner[:Port]/</literal> angegeben. Proxys pro Rechner können "
-"außerdem in der Form <literal>ftp::Proxy::&lt;Rechner&gt;</literal> "
-"angegeben werden. Hierbei bedeutet das spezielle Schlüsselwort "
-"<literal>DIRECT</literal>, dass keine Proxys benutzt werden. Falls keine der "
-"obigen Einstellungen angegeben wurde, wird die Umgebungsvariable "
-"<envar>ftp_proxy</envar> benutzt. Um einen FTP-Proxy zu benutzen, müssen Sie "
-"in der Konfigurationsdatei das Skript <literal>ftp::ProxyLogin</literal> "
-"setzen. Dieser Eintrag gibt die Befehle an, die gesendet werden müssen, um "
-"dem Proxy-Server mitzuteilen, womit er sich verbinden soll. Ein Beispiel, "
-"wie das funktioniert, finden Sie unter &configureindex;. Die "
-"Platzhaltervariablen, die für den zugehörigen URI-Bestandteil stehen, sind "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> und <literal>$(SITE_PORT)</literal>."
-
-#. 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 angewendet."
-
-#. 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 "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"Mehrere Einstellungen werden zum Steuern des passiven Modus bereitgestellt. "
-"Generell ist es sicher, den passiven Modus eingeschaltet zu lassen, er "
-"funktioniert in nahezu jeder Umgebung. Jedoch erfordern einige Situationen, "
-"dass der passive Modus ausgeschaltet und stattdessen Port-Modus-FTP benutzt "
-"wird. Dies kann global eingestellt werden oder für Verbindungen, die durch "
-"einen Proxy oder zu einem bestimmten Rechner gehen (Beispiele finden Sie in "
-"der Musterkonfigurationsdatei)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"Es ist möglich, FTP über HTTP zu leiten, indem die Umgebungsvariable "
-"<envar>ftp_proxy</envar> auf eine HTTP-URL gesetzt wird – lesen Sie die "
-"Besprechung der HTTP-Methode oberhalb bezüglich der Syntax. Sie können dies "
-"nicht in der Konfigurationsdatei setzen und es wird wegen der geringen "
-"Effizienz nicht empfohlen, FTP über HTTP zu benutzen."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"Die Einstellung <literal>ForceExtended</literal> steuert die Benutzung der "
-"RFC-2428-Befehle <literal>EPSV</literal> und <literal>EPRT</literal>. Die "
-"Vorgabe ist »false«, was bedeutet, dass diese Befehle nur benutzt werden, "
-"wenn die Steuerverbindung IPv6 ist. Durch Stellen auf »true« wird die "
-"Benutzung selbst auf IPv4-Verbindungen erzwungen. Beachten Sie, dass die "
-"wenigsten FTP-Server RFC 2428 unterstützen."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml
#, no-wrap
@@ -6087,13 +5995,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
-"beziehen."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
@@ -8874,39 +8775,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml
msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-"Das Schema »ftp« gibt einen FTP-Server für ein Archiv an. Die Verwendung von "
-"FTP geht zu Gunsten von <literal>http</literal> und <literal>https</literal> "
-"zurück und viele Archive haben entweder nie FTP-Zugriff geboten oder ziehen "
-"diesen zurück. Falls Sie diese Methode immer noch benötigen, sind dafür "
-"viele Konfigurationsoptionen im Bereich <literal>Acquire::ftp</literal> "
-"verfügbar und ausführlich in &apt-conf; erklärt."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Bitte beachten Sie, dass ein FTP-Proxy durch Benutzung der <envar>ftp_proxy</"
-"envar>-Umgebungsvariablen angegeben werden kann. Es ist mittels dieser "
-"Umgebungsvariable und <emphasis>nur</emphasis> dieser Umgebungsvariable "
-"möglich, einen HTTP-Proxy anzugeben (HTTP-Proxy-Server verstehen oft auch "
-"FTP-URLs). Proxys, die HTTP benutzen und in der Konfigurationsdatei "
-"festgelegt sind, werden ignoriert."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using removable media to copy files around with "
@@ -8917,20 +8785,6 @@ msgstr ""
"Herkunftsort benutzt zu werden. Dies ist für Leute nützlich, die "
"Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"Die Methode »rsh/ssh« ruft RSH/SSH auf, um sich mit einem Rechner in der "
-"Ferne zu verbinden und als angegebener Benutzer auf die Dateien zuzugreifen. "
-"Es wird empfohlen, vorher Rhosts oder RSA-Schlüssel zu konfigurieren. Für "
-"die Übertragung von Dateien aus der Ferne werden die Standardbefehle "
-"<command>find</command> und <command>dd</command> verwandt."
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml
msgid "adding more recognizable URI types"
@@ -12868,7 +12722,6 @@ msgid ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -12881,7 +12734,6 @@ msgstr ""
"\n"
" Zum Beispiel:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -14074,6 +13926,139 @@ msgstr ""
"benutzt werden."
#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs. It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>. Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> setzt den Standard-Proxy, der für FTP-URIs "
+#~ "benutzt werden soll. Er wird in der Standardform <literal>ftp://"
+#~ "[[Benutzer][:Passwort]@]Rechner[:Port]/</literal> angegeben. Proxys pro "
+#~ "Rechner können außerdem in der Form <literal>ftp::Proxy::&lt;Rechner&gt;</"
+#~ "literal> angegeben werden. Hierbei bedeutet das spezielle Schlüsselwort "
+#~ "<literal>DIRECT</literal>, dass keine Proxys benutzt werden. Falls keine "
+#~ "der obigen Einstellungen angegeben wurde, wird die Umgebungsvariable "
+#~ "<envar>ftp_proxy</envar> benutzt. Um einen FTP-Proxy zu benutzen, müssen "
+#~ "Sie in der Konfigurationsdatei das Skript <literal>ftp::ProxyLogin</"
+#~ "literal> setzen. Dieser Eintrag gibt die Befehle an, die gesendet werden "
+#~ "müssen, um dem Proxy-Server mitzuteilen, womit er sich verbinden soll. "
+#~ "Ein Beispiel, wie das funktioniert, finden Sie unter &configureindex;. "
+#~ "Die Platzhaltervariablen, die für den zugehörigen URI-Bestandteil stehen, "
+#~ "sind <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> und <literal>$(SITE_PORT)</literal>."
+
+#~ 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 angewendet."
+
+#~ 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 instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "Mehrere Einstellungen werden zum Steuern des passiven Modus "
+#~ "bereitgestellt. Generell ist es sicher, den passiven Modus eingeschaltet "
+#~ "zu lassen, er funktioniert in nahezu jeder Umgebung. Jedoch erfordern "
+#~ "einige Situationen, dass der passive Modus ausgeschaltet und stattdessen "
+#~ "Port-Modus-FTP benutzt wird. Dies kann global eingestellt werden oder für "
+#~ "Verbindungen, die durch einen Proxy oder zu einem bestimmten Rechner "
+#~ "gehen (Beispiele finden Sie in der Musterkonfigurationsdatei)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "Es ist möglich, FTP über HTTP zu leiten, indem die Umgebungsvariable "
+#~ "<envar>ftp_proxy</envar> auf eine HTTP-URL gesetzt wird – lesen Sie die "
+#~ "Besprechung der HTTP-Methode oberhalb bezüglich der Syntax. Sie können "
+#~ "dies nicht in der Konfigurationsdatei setzen und es wird wegen der "
+#~ "geringen Effizienz nicht empfohlen, FTP über HTTP zu benutzen."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "Die Einstellung <literal>ForceExtended</literal> steuert die Benutzung "
+#~ "der RFC-2428-Befehle <literal>EPSV</literal> und <literal>EPRT</literal>. "
+#~ "Die Vorgabe ist »false«, was bedeutet, dass diese Befehle nur benutzt "
+#~ "werden, wenn die Steuerverbindung IPv6 ist. Durch Stellen auf »true« wird "
+#~ "die Benutzung selbst auf IPv4-Verbindungen erzwungen. Beachten Sie, dass "
+#~ "die wenigsten FTP-Server RFC 2428 unterstützen."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "gibt Informationen aus, die sich auf das Herunterladen von Paketen per "
+#~ "FTP beziehen."
+
+#~ msgid ""
+#~ "The ftp scheme specifies an FTP server for an archive. Use of FTP is on "
+#~ "the decline in favour of <literal>http</literal> and <literal>https</"
+#~ "literal> and many archives either never offered or are retiring FTP "
+#~ "access. If you still need this method many configuration options for it "
+#~ "are available in the <literal>Acquire::ftp</literal> scope and detailed "
+#~ "in &apt-conf;."
+#~ msgstr ""
+#~ "Das Schema »ftp« gibt einen FTP-Server für ein Archiv an. Die Verwendung "
+#~ "von FTP geht zu Gunsten von <literal>http</literal> und <literal>https</"
+#~ "literal> zurück und viele Archive haben entweder nie FTP-Zugriff geboten "
+#~ "oder ziehen diesen zurück. Falls Sie diese Methode immer noch benötigen, "
+#~ "sind dafür viele Konfigurationsoptionen im Bereich <literal>Acquire::ftp</"
+#~ "literal> verfügbar und ausführlich in &apt-conf; erklärt."
+
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Bitte beachten Sie, dass ein FTP-Proxy durch Benutzung der "
+#~ "<envar>ftp_proxy</envar>-Umgebungsvariablen angegeben werden kann. Es ist "
+#~ "mittels dieser Umgebungsvariable und <emphasis>nur</emphasis> dieser "
+#~ "Umgebungsvariable möglich, einen HTTP-Proxy anzugeben (HTTP-Proxy-Server "
+#~ "verstehen oft auch FTP-URLs). Proxys, die HTTP benutzen und in der "
+#~ "Konfigurationsdatei festgelegt sind, werden ignoriert."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "Die Methode »rsh/ssh« ruft RSH/SSH auf, um sich mit einem Rechner in der "
+#~ "Ferne zu verbinden und als angegebener Benutzer auf die Dateien "
+#~ "zuzugreifen. Es wird empfohlen, vorher Rhosts oder RSA-Schlüssel zu "
+#~ "konfigurieren. Für die Übertragung von Dateien aus der Ferne werden die "
+#~ "Standardbefehle <command>find</command> und <command>dd</command> "
+#~ "verwandt."
+
+#~ msgid ""
#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
#~ msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
diff --git a/doc/po/es.po b/doc/po/es.po
index bf6f153f3..a73c95ca6 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -4947,96 +4947,6 @@ msgid ""
"&apt-transport-https; manpages respectively."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>. Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> define el proxy predeterminado que utilizar "
-"para los URI de FTP. Utiliza el formato estándar <literal>ftp://[[usuario][:"
-"contraseña]@]máquina[:puerto]/</literal>. También se puede especificar un "
-"proxy por cada máquina usando la forma <literal>ftp::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>ftp_proxy</envar> "
-"se usará en caso de no definir ninguna de las opciones anteriores. Para usar "
-"un proxy FTP debe configurar el script <literal>ftp::ProxyLogin</literal> en "
-"el fichero de configuración. Esta entrada define las órdenes a enviar para "
-"decirle al servidor del proxy a qué conectarse. Consulte &configureindex; "
-"para un ejemplo de uso. Las variables de sustitución que representan el "
-"componente URI son <literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</"
-"literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
-"<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>."
-
-#. 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 "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"Puede controlar el modo pasivo a través de varias opciones. Habitualmente, "
-"es seguro dejar activado el modo pasivo, y funciona en casi todos los "
-"entornos. Sin embargo algunas situaciones requieren desactivar el modo "
-"pasivo y usar el modo puerto de FTP en su lugar. Esto se puede hacer "
-"globalmente, para conexiones a través de un proxy o para una máquina en "
-"concreto (consulte el ejemplo de fichero de configuración para ver algunos "
-"ejemplos)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"Es posible usar un proxy FTP a través de HTTP definiendo la variable de "
-"entorno <envar>ftp_proxy</envar> con un HTTP URL. Para la sintaxis consulte "
-"la explicación anterior del método http. Esto no puede definir en el fichero "
-"de configuración y no se recomienda el uso de FTP por encima de HTTP debido "
-"a su poca eficiencia."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"La opción <literal>ForceExtended</literal> controla el uso de las órdenes de "
-"RFC 2428 <literal>EPSV</literal> y <literal>EPRT</literal>. De forma "
-"predeterminada es «false», que significa que sólo se usa si el control de "
-"conexión es IPv6. Cambiándolo a «true» fuerza su uso incluso en conexiones "
-"IPv4. Tenga en cuenta que la mayoría de los servidores de FTP no son "
-"compatibles con la RFC 2428."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml
#, no-wrap
@@ -5958,12 +5868,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Muestra la información relacionada con la descarga de paquetes mediante FTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Muestra la información relacionada con la descarga de paquetes mediante HTTP."
@@ -8547,45 +8451,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml
msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-#, fuzzy
-#| msgid ""
-#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
-#| "behavior is highly configurable; for more information see the &apt-conf; "
-#| "manual page. Please note that an FTP proxy can be specified by using the "
-#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
-#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-#| "environment variable and <emphasis>only</emphasis> this environment "
-#| "variable. Proxies using HTTP specified in the configuration file will be "
-#| "ignored."
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"El esquema «ftp» definea un servidor FTP como el archivo de paquetes. El "
-"comportamiento de APT con FTP es muy configurable, para más información "
-"consulte la página de manual de &apt-conf;. Tenga en cuenta que puede "
-"especificar un proxy FTP mediante la variable de entorno <envar>ftp_proxy</"
-"envar>. Es posible especificar un servidor proxy HTTP (los servidores proxy "
-"HTTP normalmente comprenden los URL de tipo FTP) mediante este método y SÓLO "
-"este método. Se ignoran los proxies que utilizan HTTP definidos en el "
-"fichero de configuración."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using removable media to copy files around with "
@@ -8596,20 +8461,6 @@ msgstr ""
"Es de utilidad para personas que utilizan dispositivos extraíbles, ya que "
"permite realizar la copia de ficheros con APT."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"El método «rsh/ssh» invoca RSH/SSH para establecer una conexión con una "
-"máquina remota y acceder a los ficheros como un usuario dado. Se recomienda "
-"configurar previamente rhosts o las claves RSA. Las órdenes estándar "
-"<command>find</command> y <command>dd</command> se utilizan para realizar la "
-"transferencia de ficheros desde la máquina remota."
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml
msgid "adding more recognizable URI types"
@@ -12163,7 +12014,6 @@ msgid ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -12176,7 +12026,6 @@ msgstr ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -13341,6 +13190,134 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
msgid "Which will use the already fetched archives on the disc."
msgstr "Esto utiliza los archivos del disco previamente obtenidos."
+#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs. It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>. Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> define el proxy predeterminado que utilizar "
+#~ "para los URI de FTP. Utiliza el formato estándar <literal>ftp://[[usuario]"
+#~ "[:contraseña]@]máquina[:puerto]/</literal>. También se puede especificar "
+#~ "un proxy por cada máquina usando la forma <literal>ftp::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>ftp_proxy</envar> se usará en caso de no definir ninguna de las "
+#~ "opciones anteriores. Para usar un proxy FTP debe configurar el script "
+#~ "<literal>ftp::ProxyLogin</literal> en el fichero de configuración. Esta "
+#~ "entrada define las órdenes a enviar para decirle al servidor del proxy a "
+#~ "qué conectarse. Consulte &configureindex; para un ejemplo de uso. Las "
+#~ "variables de sustitución que representan el componente URI son "
+#~ "<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> "
+#~ "<literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
+#~ "<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>."
+
+#~ 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."
+
+#~ 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 instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "Puede controlar el modo pasivo a través de varias opciones. "
+#~ "Habitualmente, es seguro dejar activado el modo pasivo, y funciona en "
+#~ "casi todos los entornos. Sin embargo algunas situaciones requieren "
+#~ "desactivar el modo pasivo y usar el modo puerto de FTP en su lugar. Esto "
+#~ "se puede hacer globalmente, para conexiones a través de un proxy o para "
+#~ "una máquina en concreto (consulte el ejemplo de fichero de configuración "
+#~ "para ver algunos ejemplos)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "Es posible usar un proxy FTP a través de HTTP definiendo la variable de "
+#~ "entorno <envar>ftp_proxy</envar> con un HTTP URL. Para la sintaxis "
+#~ "consulte la explicación anterior del método http. Esto no puede definir "
+#~ "en el fichero de configuración y no se recomienda el uso de FTP por "
+#~ "encima de HTTP debido a su poca eficiencia."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "La opción <literal>ForceExtended</literal> controla el uso de las órdenes "
+#~ "de RFC 2428 <literal>EPSV</literal> y <literal>EPRT</literal>. De forma "
+#~ "predeterminada es «false», que significa que sólo se usa si el control de "
+#~ "conexión es IPv6. Cambiándolo a «true» fuerza su uso incluso en "
+#~ "conexiones IPv4. Tenga en cuenta que la mayoría de los servidores de FTP "
+#~ "no son compatibles con la RFC 2428."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "Muestra la información relacionada con la descarga de paquetes mediante "
+#~ "FTP."
+
+#, fuzzy
+#~| msgid ""
+#~| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#~| "behavior is highly configurable; for more information see the &apt-conf; "
+#~| "manual page. Please note that an FTP proxy can be specified by using the "
+#~| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~| "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~| "environment variable and <emphasis>only</emphasis> this environment "
+#~| "variable. Proxies using HTTP specified in the configuration file will be "
+#~| "ignored."
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "El esquema «ftp» definea un servidor FTP como el archivo de paquetes. El "
+#~ "comportamiento de APT con FTP es muy configurable, para más información "
+#~ "consulte la página de manual de &apt-conf;. Tenga en cuenta que puede "
+#~ "especificar un proxy FTP mediante la variable de entorno "
+#~ "<envar>ftp_proxy</envar>. Es posible especificar un servidor proxy HTTP "
+#~ "(los servidores proxy HTTP normalmente comprenden los URL de tipo FTP) "
+#~ "mediante este método y SÓLO este método. Se ignoran los proxies que "
+#~ "utilizan HTTP definidos en el fichero de configuración."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "El método «rsh/ssh» invoca RSH/SSH para establecer una conexión con una "
+#~ "máquina remota y acceder a los ficheros como un usuario dado. Se "
+#~ "recomienda configurar previamente rhosts o las claves RSA. Las órdenes "
+#~ "estándar <command>find</command> y <command>dd</command> se utilizan para "
+#~ "realizar la transferencia de ficheros desde la máquina remota."
+
#, fuzzy
#~| msgid "APT key management utility"
#~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index df70ce2b8..a8cac01a3 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -4956,100 +4956,6 @@ msgstr ""
"dans les pages de manuel &apt-transport-http; et &apt-transport-https; "
"respectivement."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>. Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> est le mandataire (proxy) FTP à utiliser par "
-"défaut pour les URI FTP. Il se présente sous la forme standard : "
-"<literal>ftp://[[user][:pass]@]host[:port]/</literal>. On peut spécifier un "
-"mandataire particulier par hôte distant en utilisant la syntaxe : "
-"<literal>ftp::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éfinis, la variable "
-"d'environnement <envar>ftp_proxy</envar> annule et replace toutes les "
-"options de mandataire FTP. Pour utiliser un mandataire FTP, vous devrez "
-"renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans le fichier de "
-"configuration. Cette entrée spécifie les commandes à envoyer au mandataire "
-"pour lui préciser à quoi il doit se connecter. Voyez &configureindex; pour "
-"savoir comment faire. Les variables de substitution qui représentent le "
-"composant d'URI correspondant sont : <literal>$(PROXY_USER)</literal>, "
-"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
-"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> et "
-"<literal>$(SITE_PORT)</literal>."
-
-#. 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 "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"Plusieurs options de configuration sont fournies pour contrôler le mode "
-"passif. Il est généralement plus sûr d'activer le mode passif et cela marche "
-"dans presque tous les environnements. Cependant, certaines situations "
-"nécessitent que le mode passif soit désactivé et que le mode « port » de ftp "
-"soit utilisé à la place. On peut le faire globalement, pour des connexions "
-"qui passent par un mandataire ou pour une machine spécifique (examinez le "
-"modèle de fichier de configuration)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"Il est possible de faire transiter le trafic FTP par un mandataire HTTP en "
-"positionnant la variable d'environnement <envar>ftp_proxy</envar> à une URL "
-"HTTP -- consultez la méthode http ci-dessus pour la syntaxe. On ne peut pas "
-"le faire dans le fichier de configuration et il n'est de toute façon pas "
-"recommandé d'utiliser FTP au travers de HTTP en raison de la faible "
-"efficacité de cette méthode."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"L'option <literal>ForceExtended</literal> contrôle l'utilisation des "
-"commandes liées à la RFC 2428, <literal>EPSV</literal> et <literal>EPRT</"
-"literal>. Par défaut, elle vaut « false » ce qui signifie que ces commandes "
-"ne sont utilisées que pour une connexion de type IPv6. Quand elle vaut "
-"« true », on les utilise même si la connexion est de type IPv4. La plupart "
-"des serveurs FTP ne suivent pas la RFC 2428."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml
#, no-wrap
@@ -6070,12 +5976,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Affiche les informations concernant le téléchargement de paquets par FTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Affiche les informations concernant le téléchargement de paquets par HTTP."
@@ -8816,39 +8716,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml
msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-"Le procédé <literal>ftp</literal> indique un serveur FTP comme archive. "
-"L'utilisation de FTP décline en faveur de <literal>http</literal> et "
-"<literal>https</literal> et plusieurs archives soit n'ont jamais offert "
-"d'accès FTP, soit le retirent. Si vous avez encore besoin de cette méthode, "
-"plusieurs options de configuration sont disponibles dans le champ d'action "
-"<literal>Acquire::ftp</literal> et détaillées dans &apt-conf;."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Veuillez noter qu'on peut spécifier un mandataire FTP en utilisant la "
-"variable d'environnement <envar>ftp_proxy</envar>. On peut aussi spécifier "
-"un mandataire HTTP (les serveurs mandataires HTTP comprennent souvent les "
-"URL FTP) en utilisant cette méthode et <emphasis>seulement</emphasis> cette "
-"méthode. Les mandataires qui utilisent HTTP et qui sont spécifiés dans le "
-"fichier de configuration seront ignorés."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using removable media to copy files around with "
@@ -8860,20 +8727,6 @@ msgstr ""
"servir aux utilisateurs qui se servent d'un support amovible pour recopier "
"des fichiers avec APT."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine distante "
-"et pour accéder aux fichiers en tant qu'un certain utilisateur. Il est "
-"recommandé de régler préalablement les hôtes distants (rhosts) ou les clés "
-"RSA. Les commandes standard <command>find</command> et <command>dd</command> "
-"sont utilisées pour l'accès aux fichiers de la machine distante."
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml
msgid "adding more recognizable URI types"
@@ -12710,7 +12563,6 @@ msgid ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -12723,7 +12575,6 @@ msgstr ""
"\n"
" Exemple :\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -13905,6 +13756,141 @@ 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>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs. It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>. Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> est le mandataire (proxy) FTP à utiliser "
+#~ "par défaut pour les URI FTP. Il se présente sous la forme standard : "
+#~ "<literal>ftp://[[user][:pass]@]host[:port]/</literal>. On peut spécifier "
+#~ "un mandataire particulier par hôte distant en utilisant la syntaxe : "
+#~ "<literal>ftp::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éfinis, la "
+#~ "variable d'environnement <envar>ftp_proxy</envar> annule et replace "
+#~ "toutes les options de mandataire FTP. Pour utiliser un mandataire FTP, "
+#~ "vous devrez renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans "
+#~ "le fichier de configuration. Cette entrée spécifie les commandes à "
+#~ "envoyer au mandataire pour lui préciser à quoi il doit se connecter. "
+#~ "Voyez &configureindex; pour savoir comment faire. Les variables de "
+#~ "substitution qui représentent le composant d'URI correspondant sont : "
+#~ "<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> et <literal>$(SITE_PORT)</literal>."
+
+#~ 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."
+
+#~ 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 instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "Plusieurs options de configuration sont fournies pour contrôler le mode "
+#~ "passif. Il est généralement plus sûr d'activer le mode passif et cela "
+#~ "marche dans presque tous les environnements. Cependant, certaines "
+#~ "situations nécessitent que le mode passif soit désactivé et que le mode "
+#~ "« port » de ftp soit utilisé à la place. On peut le faire globalement, "
+#~ "pour des connexions qui passent par un mandataire ou pour une machine "
+#~ "spécifique (examinez le modèle de fichier de configuration)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "Il est possible de faire transiter le trafic FTP par un mandataire HTTP "
+#~ "en positionnant la variable d'environnement <envar>ftp_proxy</envar> à "
+#~ "une URL HTTP -- consultez la méthode http ci-dessus pour la syntaxe. On "
+#~ "ne peut pas le faire dans le fichier de configuration et il n'est de "
+#~ "toute façon pas recommandé d'utiliser FTP au travers de HTTP en raison de "
+#~ "la faible efficacité de cette méthode."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "L'option <literal>ForceExtended</literal> contrôle l'utilisation des "
+#~ "commandes liées à la RFC 2428, <literal>EPSV</literal> et <literal>EPRT</"
+#~ "literal>. Par défaut, elle vaut « false » ce qui signifie que ces "
+#~ "commandes ne sont utilisées que pour une connexion de type IPv6. Quand "
+#~ "elle vaut « true », on les utilise même si la connexion est de type IPv4. "
+#~ "La plupart des serveurs FTP ne suivent pas la RFC 2428."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "Affiche les informations concernant le téléchargement de paquets par FTP."
+
+#~ msgid ""
+#~ "The ftp scheme specifies an FTP server for an archive. Use of FTP is on "
+#~ "the decline in favour of <literal>http</literal> and <literal>https</"
+#~ "literal> and many archives either never offered or are retiring FTP "
+#~ "access. If you still need this method many configuration options for it "
+#~ "are available in the <literal>Acquire::ftp</literal> scope and detailed "
+#~ "in &apt-conf;."
+#~ msgstr ""
+#~ "Le procédé <literal>ftp</literal> indique un serveur FTP comme archive. "
+#~ "L'utilisation de FTP décline en faveur de <literal>http</literal> et "
+#~ "<literal>https</literal> et plusieurs archives soit n'ont jamais offert "
+#~ "d'accès FTP, soit le retirent. Si vous avez encore besoin de cette "
+#~ "méthode, plusieurs options de configuration sont disponibles dans le "
+#~ "champ d'action <literal>Acquire::ftp</literal> et détaillées dans &apt-"
+#~ "conf;."
+
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Veuillez noter qu'on peut spécifier un mandataire FTP en utilisant la "
+#~ "variable d'environnement <envar>ftp_proxy</envar>. On peut aussi "
+#~ "spécifier un mandataire HTTP (les serveurs mandataires HTTP comprennent "
+#~ "souvent les URL FTP) en utilisant cette méthode et <emphasis>seulement</"
+#~ "emphasis> cette méthode. Les mandataires qui utilisent HTTP et qui sont "
+#~ "spécifiés dans le fichier de configuration seront ignorés."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine "
+#~ "distante et pour accéder aux fichiers en tant qu'un certain utilisateur. "
+#~ "Il est recommandé de régler préalablement les hôtes distants (rhosts) ou "
+#~ "les clés RSA. Les commandes standard <command>find</command> et "
+#~ "<command>dd</command> sont utilisées pour l'accès aux fichiers de la "
+#~ "machine distante."
+
+#~ msgid ""
#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
#~ msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
diff --git a/doc/po/it.po b/doc/po/it.po
index 5fa78e1e8..a8880cf4f 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -4960,96 +4960,6 @@ msgid ""
"&apt-transport-https; manpages respectively."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>. Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> imposta il proxy predefinito da usare per gli "
-"URI FTP. È nella forma standard <literal>ftp://[[utente][:password]@]host[:"
-"porta]/</literal>. Si possono anche specificare proxy per ciascun host "
-"usando la forma <literal>ftp::Proxy::&lt;host&gt;</literal> con la speciale "
-"parola chiave <literal>DIRECT</literal> che indica di non usare proxy. Se "
-"nessuna delle opzioni precedenti è impostata, viene usata la variabile "
-"d'ambiente <envar>ftp_proxy</envar>. Per usare un proxy FTP è necessario "
-"impostare lo script <literal>ftp::ProxyLogin</literal> nel file di "
-"configurazione. Questa voce specifica i comandi da inviare per dire al "
-"server proxy a cosa connettersi. Vedere &configureindex; per un esempio di "
-"come utilizzarla. Le variabili di sostituzione che rappresentano i "
-"corrispondenti componenti dell'URI sono <literal>$(PROXY_USER)</literal>, "
-"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
-"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> e "
-"<literal>$(SITE_PORT)</literal>."
-
-#. 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 "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"Sono fornite diverse impostazioni per controllare la modalità passiva. "
-"Generalmente è sicuro lasciare attiva la modalità passiva; funziona in quasi "
-"tutti gli ambienti. Tuttavia in alcune situazioni è necessario disabilitare "
-"la modalità passiva e usare invece la modalità per porta FTP. Ciò può essere "
-"fatto globalmente o, per connessioni che passano attraverso un proxy, per "
-"uno specifico host (vedere il file di configurazione d'esempio)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"È possibile usare FTP attraverso un proxy via HTTP impostando la variabile "
-"d'ambiente <envar>ftp_proxy</envar> ad un URL HTTP; per la sintassi vedere "
-"la spiegazione del metodo http più sopra. Non è possibile impostare questa "
-"opzione nel file di configurazione e l'uso di FTP via HTTP non è raccomando "
-"a causa della sua bassa efficienza."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"L'impostazione <literal>ForceExtended</literal> controlla l'uso dei comandi "
-"<literal>EPSV</literal> e <literal>EPRT</literal> della RFC 2428. Il valore "
-"predefinito è falso, il che significa che questi comandi sono usati "
-"solamente se la connessione di controllo è IPv6. Impostare questo valore a "
-"vero forza il loro uso anche su connessioni IPv4. Notare che la maggior "
-"parte dei server FTP non supporta la RFC 2428."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml
#, no-wrap
@@ -6051,12 +5961,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Stampa informazioni relative allo scaricamento dei pacchetti usando FTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP."
@@ -8763,44 +8667,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml
msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-#, fuzzy
-#| msgid ""
-#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
-#| "behavior is highly configurable; for more information see the &apt-conf; "
-#| "manual page. Please note that an FTP proxy can be specified by using the "
-#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
-#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-#| "environment variable and <emphasis>only</emphasis> this environment "
-#| "variable. Proxies using HTTP specified in the configuration file will be "
-#| "ignored."
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Il tipo ftp specifica un server FTP per l'archivio. Il comportamento FTP di "
-"APT è altamente configurabile; per maggiori informazioni vedere la pagina di "
-"manuale &apt-conf;. Notare che è possibile specificare un proxy FTP usando "
-"la variabile d'ambiente <envar>ftp_proxy</envar>. È possibile specificare un "
-"proxy HTTP (i server proxy HTTP spesso gestiscono gli URL FTP) usando questa "
-"e <emphasis>SOLO</emphasis> questa variabile d'ambiente. I proxy che usano "
-"HTTP specificati nel file di configurazione verranno ignorati."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using removable media to copy files around with "
@@ -8811,20 +8677,6 @@ msgstr ""
"direttamente dalla loro posizione. Ciò è utile per coloro che usano supporti "
"rimovibili, per copiare i file nelle varie posizioni con APT."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"Il metodo rsh/ssh invoca RSH/SSH per connettersi ad un host remoto e "
-"accedere ai file come un determinato utente. È raccomandato configurare "
-"precedentemente le chiavi RSA o rhosts. Per effettuare i trasferimenti di "
-"file dall'host remoto vengono usati i comandi standard <command>find</"
-"command> e <command>dd</command>."
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml
msgid "adding more recognizable URI types"
@@ -12498,7 +12350,6 @@ msgid ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -12511,7 +12362,6 @@ msgstr ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -13687,6 +13537,133 @@ msgid "Which will use the already fetched archives on the disc."
msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs. It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>. Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> imposta il proxy predefinito da usare per "
+#~ "gli URI FTP. È nella forma standard <literal>ftp://[[utente][:"
+#~ "password]@]host[:porta]/</literal>. Si possono anche specificare proxy "
+#~ "per ciascun host usando la forma <literal>ftp::Proxy::&lt;host&gt;</"
+#~ "literal> con la speciale parola chiave <literal>DIRECT</literal> che "
+#~ "indica di non usare proxy. Se nessuna delle opzioni precedenti è "
+#~ "impostata, viene usata la variabile d'ambiente <envar>ftp_proxy</envar>. "
+#~ "Per usare un proxy FTP è necessario impostare lo script <literal>ftp::"
+#~ "ProxyLogin</literal> nel file di configurazione. Questa voce specifica i "
+#~ "comandi da inviare per dire al server proxy a cosa connettersi. Vedere "
+#~ "&configureindex; per un esempio di come utilizzarla. Le variabili di "
+#~ "sostituzione che rappresentano i corrispondenti componenti dell'URI sono "
+#~ "<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>."
+
+#~ 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."
+
+#~ 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 instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "Sono fornite diverse impostazioni per controllare la modalità passiva. "
+#~ "Generalmente è sicuro lasciare attiva la modalità passiva; funziona in "
+#~ "quasi tutti gli ambienti. Tuttavia in alcune situazioni è necessario "
+#~ "disabilitare la modalità passiva e usare invece la modalità per porta "
+#~ "FTP. Ciò può essere fatto globalmente o, per connessioni che passano "
+#~ "attraverso un proxy, per uno specifico host (vedere il file di "
+#~ "configurazione d'esempio)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "È possibile usare FTP attraverso un proxy via HTTP impostando la "
+#~ "variabile d'ambiente <envar>ftp_proxy</envar> ad un URL HTTP; per la "
+#~ "sintassi vedere la spiegazione del metodo http più sopra. Non è possibile "
+#~ "impostare questa opzione nel file di configurazione e l'uso di FTP via "
+#~ "HTTP non è raccomando a causa della sua bassa efficienza."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "L'impostazione <literal>ForceExtended</literal> controlla l'uso dei "
+#~ "comandi <literal>EPSV</literal> e <literal>EPRT</literal> della RFC 2428. "
+#~ "Il valore predefinito è falso, il che significa che questi comandi sono "
+#~ "usati solamente se la connessione di controllo è IPv6. Impostare questo "
+#~ "valore a vero forza il loro uso anche su connessioni IPv4. Notare che la "
+#~ "maggior parte dei server FTP non supporta la RFC 2428."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "Stampa informazioni relative allo scaricamento dei pacchetti usando FTP."
+
+#, fuzzy
+#~| msgid ""
+#~| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#~| "behavior is highly configurable; for more information see the &apt-conf; "
+#~| "manual page. Please note that an FTP proxy can be specified by using the "
+#~| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~| "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~| "environment variable and <emphasis>only</emphasis> this environment "
+#~| "variable. Proxies using HTTP specified in the configuration file will be "
+#~| "ignored."
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Il tipo ftp specifica un server FTP per l'archivio. Il comportamento FTP "
+#~ "di APT è altamente configurabile; per maggiori informazioni vedere la "
+#~ "pagina di manuale &apt-conf;. Notare che è possibile specificare un proxy "
+#~ "FTP usando la variabile d'ambiente <envar>ftp_proxy</envar>. È possibile "
+#~ "specificare un proxy HTTP (i server proxy HTTP spesso gestiscono gli URL "
+#~ "FTP) usando questa e <emphasis>SOLO</emphasis> questa variabile "
+#~ "d'ambiente. I proxy che usano HTTP specificati nel file di configurazione "
+#~ "verranno ignorati."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "Il metodo rsh/ssh invoca RSH/SSH per connettersi ad un host remoto e "
+#~ "accedere ai file come un determinato utente. È raccomandato configurare "
+#~ "precedentemente le chiavi RSA o rhosts. Per effettuare i trasferimenti di "
+#~ "file dall'host remoto vengono usati i comandi standard <command>find</"
+#~ "command> e <command>dd</command>."
+
+#~ msgid ""
#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
#~ msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 783e29c32..c20904566 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -4773,92 +4773,6 @@ msgid ""
"&apt-transport-https; manpages respectively."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>. Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> は、FTP URI を使用する際のデフォルトプロキシを"
-"設定します。<literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準"
-"形で表します。ホストごとのプロキシを、<literal>ftp::Proxy::&lt;host&gt;</"
-"literal> という形で指定できます。この時、プロキシを使用しないという意味の特殊"
-"キーワード <literal>DIRECT</literal> も使用できます。上記の設定をなにも指定し"
-"ないと、環境変数 <envar>ftp_proxy</envar> を使用します。FTP プロキシを使用す"
-"るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す"
-"る必要があります。このエントリには、接続する際にプロキシサーバに送信するコマ"
-"ンドを設定します。どのようにするのかは &configureindex; の例を参照してくださ"
-"い。URI を構成するコンポーネントに対応する置換変数は、"
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal>, <literal>$(SITE_PORT)</literal> です。"
-
-#. 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 "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"設定のいくつかは、パッシブモードを制御するものです。一般的に、パッシブモード"
-"のままにしておく方が安全で、ほぼどんな環境でも動作します。しかしある状況下で"
-"は、パッシブモードが無効のため、代わりにポートモード FTP を使用する必要があり"
-"ます。この設定は、プロキシを通る接続や特定のホストへの接続全般に有効です (設"
-"定例はサンプル設定ファイルを参照してください)。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"環境変数 <envar>ftp_proxy</envar> に HTTP URL を指定すると FTP over HTTP のプ"
-"ロキシが利用可能になります。構文は前述の http についての説明を参照してくださ"
-"い。設定ファイルの中でこれをセットすることはできません。また、効率が悪いため "
-"FTP over HTTP を使用するのは推奨しません。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"<literal>ForceExtended</literal> の設定は RFC2428 の <literal>EPSV</literal> "
-"コマンドと <literal>EPRT</literal> コマンドの使用を制御します。デフォルトで"
-"は false で、コントロールコネクションが IPv6 の時にのみ、このコマンドを使用す"
-"るということです。これを true にセットすると、IPv4 コネクションでも、強制的に"
-"このコマンドを使用します。ほとんどの FTP サーバは RFC2428 をサポートしていな"
-"いことに注意してください。"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml
#, no-wrap
@@ -5813,11 +5727,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
@@ -8422,43 +8331,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml
msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-#, fuzzy
-#| msgid ""
-#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
-#| "behavior is highly configurable; for more information see the &apt-conf; "
-#| "manual page. Please note that an FTP proxy can be specified by using the "
-#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
-#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-#| "environment variable and <emphasis>only</emphasis> this environment "
-#| "variable. Proxies using HTTP specified in the configuration file will be "
-#| "ignored."
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"ftp スキームは、アーカイブに FTP サーバを指定します。APT の FTP の振る舞い"
-"は、高度に設定できます。詳細は、&apt-conf; のマニュアルページをご覧ください。"
-"FTP プロキシは、<envar>ftp_proxy</envar> 環境変数で指定することに注意してくだ"
-"さい。この環境変数、さらにこの<emphasis>環境変数のみ</emphasis>を使用して、"
-"HTTP プロキシを使用できます (HTTP プロキシサーバは大抵 FTP URL も理解できま"
-"す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using removable media to copy files around with "
@@ -8468,20 +8340,6 @@ msgstr ""
"キャッシュディレクトリにコピーするところが違います。リムーバブルメディアを使"
"用していて、APT でコピーを行う場合に便利です。"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"rsh/ssh メソッドは、与えられたユーザでリモートホストに接続し、ファイルにアク"
-"セスするのに rsh/ssh を使用します。あらかじめ rhosts や RSA キーの設定をして"
-"おくことをお勧めします。リモートホストからのファイル転送に、標準の "
-"<command>find</command> コマンドと <command>dd</command> コマンドを使用しま"
-"す。"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml
msgid "adding more recognizable URI types"
@@ -11991,7 +11849,6 @@ msgid ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -12004,7 +11861,6 @@ msgstr ""
"\n"
" 例:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -13135,6 +12991,127 @@ msgid "Which will use the already fetched archives on the disc."
msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs. It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>. Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> は、FTP URI を使用する際のデフォルトプロキシ"
+#~ "を設定します。<literal>ftp://[[user][:pass]@]host[:port]/</literal> という"
+#~ "標準形で表します。ホストごとのプロキシを、<literal>ftp::Proxy::&lt;"
+#~ "host&gt;</literal> という形で指定できます。この時、プロキシを使用しないと"
+#~ "いう意味の特殊キーワード <literal>DIRECT</literal> も使用できます。上記の"
+#~ "設定をなにも指定しないと、環境変数 <envar>ftp_proxy</envar> を使用します。"
+#~ "FTP プロキシを使用するには、設定ファイルに <literal>ftp::ProxyLogin</"
+#~ "literal> スクリプトを設定する必要があります。このエントリには、接続する際"
+#~ "にプロキシサーバに送信するコマンドを設定します。どのようにするのかは "
+#~ "&configureindex; の例を参照してください。URI を構成するコンポーネントに対"
+#~ "応する置換変数は、<literal>$(PROXY_USER)</literal>, "
+#~ "<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
+#~ "<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, "
+#~ "<literal>$(SITE_PORT)</literal> です。"
+
+#~ 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> オプションは、この方法でのタイムアウトまでの時"
+#~ "間を設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれ"
+#~ "ています。"
+
+#~ 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 instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "設定のいくつかは、パッシブモードを制御するものです。一般的に、パッシブモー"
+#~ "ドのままにしておく方が安全で、ほぼどんな環境でも動作します。しかしある状況"
+#~ "下では、パッシブモードが無効のため、代わりにポートモード FTP を使用する必"
+#~ "要があります。この設定は、プロキシを通る接続や特定のホストへの接続全般に有"
+#~ "効です (設定例はサンプル設定ファイルを参照してください)。"
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "環境変数 <envar>ftp_proxy</envar> に HTTP URL を指定すると FTP over HTTP "
+#~ "のプロキシが利用可能になります。構文は前述の http についての説明を参照して"
+#~ "ください。設定ファイルの中でこれをセットすることはできません。また、効率が"
+#~ "悪いため FTP over HTTP を使用するのは推奨しません。"
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "<literal>ForceExtended</literal> の設定は RFC2428 の <literal>EPSV</"
+#~ "literal> コマンドと <literal>EPRT</literal> コマンドの使用を制御します。デ"
+#~ "フォルトでは false で、コントロールコネクションが IPv6 の時にのみ、このコ"
+#~ "マンドを使用するということです。これを true にセットすると、IPv4 コネク"
+#~ "ションでも、強制的にこのコマンドを使用します。ほとんどの FTP サーバは "
+#~ "RFC2428 をサポートしていないことに注意してください。"
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
+
+#, fuzzy
+#~| msgid ""
+#~| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#~| "behavior is highly configurable; for more information see the &apt-conf; "
+#~| "manual page. Please note that an FTP proxy can be specified by using the "
+#~| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~| "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~| "environment variable and <emphasis>only</emphasis> this environment "
+#~| "variable. Proxies using HTTP specified in the configuration file will be "
+#~| "ignored."
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "ftp スキームは、アーカイブに FTP サーバを指定します。APT の FTP の振る舞い"
+#~ "は、高度に設定できます。詳細は、&apt-conf; のマニュアルページをご覧くださ"
+#~ "い。FTP プロキシは、<envar>ftp_proxy</envar> 環境変数で指定することに注意"
+#~ "してください。この環境変数、さらにこの<emphasis>環境変数のみ</emphasis>を"
+#~ "使用して、HTTP プロキシを使用できます (HTTP プロキシサーバは大抵 FTP URL "
+#~ "も理解できます)。設定ファイルで HTTP を利用するプロキシが指定してあって"
+#~ "も、無視されます。"
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "rsh/ssh メソッドは、与えられたユーザでリモートホストに接続し、ファイルにア"
+#~ "クセスするのに rsh/ssh を使用します。あらかじめ rhosts や RSA キーの設定を"
+#~ "しておくことをお勧めします。リモートホストからのファイル転送に、標準の "
+#~ "<command>find</command> コマンドと <command>dd</command> コマンドを使用し"
+#~ "ます。"
+
+#~ msgid ""
#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
#~ msgstr ""
diff --git a/doc/po/nl.po b/doc/po/nl.po
index e265e318a..7c161e2db 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -5066,100 +5066,6 @@ msgstr ""
"de protocollen HTTP en HTTPS en worden gedocumenteerd in de respectieve man-"
"pagina's &apt-transport-http; en &apt-transport-https;."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>. Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> stelt de te gebruiken standaard-proxy in voor "
-"URI's van het type FTP. De standaardvorm ervan is <literal>ftp://[[user][:"
-"pass]@]host[:port]/</literal>. Proxy's kunnen ook per computer ingesteld "
-"worden volgens het schema <literal>ftp::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>ftp_proxy</envar> gebruikt "
-"worden. Om een FTP-proxy te gebruiken zult u het script <literal>ftp::"
-"ProxyLogin</literal> in het configuratiebestand moeten instellen. Dit item "
-"omschrijft de te verzenden commando's die de proxy-server moeten laten weten "
-"waarmee hij een verbinding moet maken. Raadpleeg &configureindex; voor een "
-"voorbeeld van hoe dit moet gedaan worden. De substitutievariabelen die de "
-"overeenkomstige URI-component vertegenwoordigen, zijn "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> en <literal>$(SITE_PORT)</literal>."
-
-#. 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 "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"Meerdere instellingen zijn beschikbaar om de passieve modus te controleren. "
-"Over het algemeen is het veilig om de passieve modus aan te laten staan. Hij "
-"werkt in praktisch elke omgeving. Toch vereisen sommige situaties het "
-"uitschakelen van de passieve modus en het gebruik in de plaats daarvan van "
-"FTP in poortmodus. Dit kan globaal gebeuren of voor verbindingen die langs "
-"een proxy passeren of voor een specifieke computer. (raadpleeg voor "
-"voorbeelden het voorbeeldconfiguratiebestand)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"Het is mogelijk om proxy voor FTP over HTTP te laten verlopen door de "
-"omgevingsvariabele <envar>ftp_proxy</envar> in te stellen op een URL van het "
-"type HTTP - zie de eerdere bespreking van de http-methode voor de syntaxis. "
-"U kunt dit niet in het configuratiebestand instellen en het gebruik van FTP "
-"over HTTP wordt niet aangeraden omwille van zijn geringe efficiëntie."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"De instelling <literal>ForceExtended</literal> regelt het gebruik van de "
-"RFC2428 commando's <literal>EPSV</literal> en <literal>EPRT</literal>. "
-"Standaard staat ze uitgeschakeld (ingesteld op false), hetgeen betekent dat "
-"deze commando's enkel gebruikt worden indien de controleverbinding van het "
-"type IPv6 is. Deze instelling aanzetten (instellen op true) verplicht het "
-"gebruik van deze commando's zelfs bij verbindingen van het type IPv4. Merk "
-"op dat de meeste FTP-servers RFC2428 niet ondersteunen."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml
#, no-wrap
@@ -6155,13 +6061,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Weergeven van informatie in verband met het downloaden van pakketten met "
-"behulp van FTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Weergeven van informatie in verband met het downloaden van pakketten met "
@@ -9011,38 +8910,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml
msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-"De methode ftp geeft een FTP-server op voor een archief. Het gebruik van FTP "
-"is op de terugweg ten voordele van <literal>http</literal> en "
-"<literal>https</literal> en veel archieven hebben ofwel nooit FTP-toegang "
-"aangeboden of trekken die terug in. Indien u deze methode nog steeds nodig "
-"heeft, zijn er veel configuratieopties voor beschikbaar binnen de ruimte "
-"<literal>Acquire::ftp</literal>. Ze worden in &apt-conf; gedetailleerd."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Noteer dat een FTP-proxy opgegeven kan worden met de omgevingsvariabele "
-"<envar>ftp_proxy</envar>. Met deze omgevingsvariabele en <emphasis>enkel</"
-"emphasis> daarmee kan ook een HTTP-proxy opgegeven worden (HTTP proxyservers "
-"kunnen vaak omgaan met FTP-URL's). Proxy's die HTTP gebruiken en in het "
-"configuratiebestand vermeld staan worden genegeerd."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using removable media to copy files around with "
@@ -9053,21 +8920,6 @@ msgstr ""
"locatie te gebruiken. Dit is nuttig voor gebruikers van verwijderbare media "
"om met behulp van APT bestanden te kopiëren."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"De methode rsh/ssh maakt gebruik van RSH/SSH om een verbinding met een "
-"externe computer te maken en als een welbepaalde gebruiker toegang te "
-"krijgen tot de bestanden. Voorafgaandelijke configuratie van rhosts of RSA-"
-"sleutels wordt aanbevolen. De standaardcommando's <command>find</command> en "
-"<command>dd</command> worden gebruikt om de overdracht van bestanden van de "
-"externe computer uit te voeren."
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml
msgid "adding more recognizable URI types"
@@ -13021,7 +12873,6 @@ msgid ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -13034,7 +12885,6 @@ msgstr ""
"\n"
" Bijvoorbeeld:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -14241,6 +14091,143 @@ msgstr ""
"En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs. It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>. Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> stelt de te gebruiken standaard-proxy in "
+#~ "voor URI's van het type FTP. De standaardvorm ervan is <literal>ftp://"
+#~ "[[user][:pass]@]host[:port]/</literal>. Proxy's kunnen ook per computer "
+#~ "ingesteld worden volgens het schema <literal>ftp::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>ftp_proxy</envar> gebruikt worden. Om een FTP-proxy te gebruiken "
+#~ "zult u het script <literal>ftp::ProxyLogin</literal> in het "
+#~ "configuratiebestand moeten instellen. Dit item omschrijft de te verzenden "
+#~ "commando's die de proxy-server moeten laten weten waarmee hij een "
+#~ "verbinding moet maken. Raadpleeg &configureindex; voor een voorbeeld van "
+#~ "hoe dit moet gedaan worden. De substitutievariabelen die de "
+#~ "overeenkomstige URI-component vertegenwoordigen, zijn "
+#~ "<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> en <literal>$(SITE_PORT)</literal>."
+
+#~ 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."
+
+#~ 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 instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "Meerdere instellingen zijn beschikbaar om de passieve modus te "
+#~ "controleren. Over het algemeen is het veilig om de passieve modus aan te "
+#~ "laten staan. Hij werkt in praktisch elke omgeving. Toch vereisen sommige "
+#~ "situaties het uitschakelen van de passieve modus en het gebruik in de "
+#~ "plaats daarvan van FTP in poortmodus. Dit kan globaal gebeuren of voor "
+#~ "verbindingen die langs een proxy passeren of voor een specifieke "
+#~ "computer. (raadpleeg voor voorbeelden het voorbeeldconfiguratiebestand)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "Het is mogelijk om proxy voor FTP over HTTP te laten verlopen door de "
+#~ "omgevingsvariabele <envar>ftp_proxy</envar> in te stellen op een URL van "
+#~ "het type HTTP - zie de eerdere bespreking van de http-methode voor de "
+#~ "syntaxis. U kunt dit niet in het configuratiebestand instellen en het "
+#~ "gebruik van FTP over HTTP wordt niet aangeraden omwille van zijn geringe "
+#~ "efficiëntie."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "De instelling <literal>ForceExtended</literal> regelt het gebruik van de "
+#~ "RFC2428 commando's <literal>EPSV</literal> en <literal>EPRT</literal>. "
+#~ "Standaard staat ze uitgeschakeld (ingesteld op false), hetgeen betekent "
+#~ "dat deze commando's enkel gebruikt worden indien de controleverbinding "
+#~ "van het type IPv6 is. Deze instelling aanzetten (instellen op true) "
+#~ "verplicht het gebruik van deze commando's zelfs bij verbindingen van het "
+#~ "type IPv4. Merk op dat de meeste FTP-servers RFC2428 niet ondersteunen."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "Weergeven van informatie in verband met het downloaden van pakketten met "
+#~ "behulp van FTP."
+
+#~ msgid ""
+#~ "The ftp scheme specifies an FTP server for an archive. Use of FTP is on "
+#~ "the decline in favour of <literal>http</literal> and <literal>https</"
+#~ "literal> and many archives either never offered or are retiring FTP "
+#~ "access. If you still need this method many configuration options for it "
+#~ "are available in the <literal>Acquire::ftp</literal> scope and detailed "
+#~ "in &apt-conf;."
+#~ msgstr ""
+#~ "De methode ftp geeft een FTP-server op voor een archief. Het gebruik van "
+#~ "FTP is op de terugweg ten voordele van <literal>http</literal> en "
+#~ "<literal>https</literal> en veel archieven hebben ofwel nooit FTP-toegang "
+#~ "aangeboden of trekken die terug in. Indien u deze methode nog steeds "
+#~ "nodig heeft, zijn er veel configuratieopties voor beschikbaar binnen de "
+#~ "ruimte <literal>Acquire::ftp</literal>. Ze worden in &apt-conf; "
+#~ "gedetailleerd."
+
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Noteer dat een FTP-proxy opgegeven kan worden met de omgevingsvariabele "
+#~ "<envar>ftp_proxy</envar>. Met deze omgevingsvariabele en <emphasis>enkel</"
+#~ "emphasis> daarmee kan ook een HTTP-proxy opgegeven worden (HTTP "
+#~ "proxyservers kunnen vaak omgaan met FTP-URL's). Proxy's die HTTP "
+#~ "gebruiken en in het configuratiebestand vermeld staan worden genegeerd."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "De methode rsh/ssh maakt gebruik van RSH/SSH om een verbinding met een "
+#~ "externe computer te maken en als een welbepaalde gebruiker toegang te "
+#~ "krijgen tot de bestanden. Voorafgaandelijke configuratie van rhosts of "
+#~ "RSA-sleutels wordt aanbevolen. De standaardcommando's <command>find</"
+#~ "command> en <command>dd</command> worden gebruikt om de overdracht van "
+#~ "bestanden van de externe computer uit te voeren."
+
+#~ msgid ""
#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
#~ msgstr ""
diff --git a/doc/po/pl.po b/doc/po/pl.po
index c8c38c448..c1c58c1e6 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -4749,61 +4749,6 @@ msgid ""
"&apt-transport-https; manpages respectively."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>. Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-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 "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml
#, no-wrap
@@ -5458,11 +5403,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
msgid "Print information related to downloading packages using HTTP."
msgstr ""
@@ -7980,44 +7920,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml
msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-#, fuzzy
-#| msgid ""
-#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
-#| "behavior is highly configurable; for more information see the &apt-conf; "
-#| "manual page. Please note that an FTP proxy can be specified by using the "
-#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
-#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-#| "environment variable and <emphasis>only</emphasis> this environment "
-#| "variable. Proxies using HTTP specified in the configuration file will be "
-#| "ignored."
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Schemat ftp opisuje serwer FTP archiwum. Zachowanie modułu FTP można "
-"dowolnie konfigurować, szczegóły można znaleźć na stronie podręcznika &apt-"
-"conf;. Proszę zauważyć, że można podać serwer proxy FTP, używając zmiennej "
-"środowiskowej <envar>ftp_proxy</envar>. Możliwe jest podanie serwera proxy "
-"HTTP (które to serwery często rozumieją lokalizacje zasobów FTP), używając "
-"tej i <emphasis>tylko</emphasis> tej zmiennej środowiskowej. Podane w pliku "
-"konfiguracyjnym serwery proxy używające HTTP zostaną zignorowane."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using removable media to copy files around with "
@@ -8028,20 +7930,6 @@ msgstr ""
"katalogu bufora. Jest to użyteczne w przypadku używania nośnika przenośnego "
"do skopiowania plików przy użyciu APT."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"Metoda rsh/ssh uruchamia RSH/SSH do połączenia się ze zdalnym komputerem i "
-"uzyskania dostępu do plików jako podany użytkownik. Dobrym pomysłem jest "
-"wcześniejsze przygotowanie kluczy RSA lub dostępu rhosts. APT używa "
-"standardowych poleceń <command>find</command> i <command>dd</command> do "
-"przetransferowania plików ze zdalnego komputera."
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml
msgid "adding more recognizable URI types"
@@ -11322,7 +11210,6 @@ msgid ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -11335,7 +11222,6 @@ msgstr ""
"\n"
" Przykłady:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://ftp.pl.debian.org/debian,\n"
"\n"
"\n"
@@ -12508,6 +12394,46 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
msgid "Which will use the already fetched archives on the disc."
msgstr "Które użyje pobranych uprzednio archiwów z dysku."
+#, fuzzy
+#~| msgid ""
+#~| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#~| "behavior is highly configurable; for more information see the &apt-conf; "
+#~| "manual page. Please note that an FTP proxy can be specified by using the "
+#~| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~| "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~| "environment variable and <emphasis>only</emphasis> this environment "
+#~| "variable. Proxies using HTTP specified in the configuration file will be "
+#~| "ignored."
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Schemat ftp opisuje serwer FTP archiwum. Zachowanie modułu FTP można "
+#~ "dowolnie konfigurować, szczegóły można znaleźć na stronie podręcznika "
+#~ "&apt-conf;. Proszę zauważyć, że można podać serwer proxy FTP, używając "
+#~ "zmiennej środowiskowej <envar>ftp_proxy</envar>. Możliwe jest podanie "
+#~ "serwera proxy HTTP (które to serwery często rozumieją lokalizacje zasobów "
+#~ "FTP), używając tej i <emphasis>tylko</emphasis> tej zmiennej "
+#~ "środowiskowej. Podane w pliku konfiguracyjnym serwery proxy używające "
+#~ "HTTP zostaną zignorowane."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "Metoda rsh/ssh uruchamia RSH/SSH do połączenia się ze zdalnym komputerem "
+#~ "i uzyskania dostępu do plików jako podany użytkownik. Dobrym pomysłem "
+#~ "jest wcześniejsze przygotowanie kluczy RSA lub dostępu rhosts. APT używa "
+#~ "standardowych poleceń <command>find</command> i <command>dd</command> do "
+#~ "przetransferowania plików ze zdalnego komputera."
+
#~ msgid ""
#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 083a16f37..763da1bd1 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -4939,95 +4939,6 @@ msgstr ""
"protocolos HTTP e HTTPS e estão documentadas nos manuais &apt-transport-"
"http; e &apt-transport-https; respetivamente."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>. Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> define o proxy predefinido a usar para URIs "
-"FTP. Está no formato standard de <literal>ftp://[[user][:pass]@]host[:port]/"
-"</literal>. Os proxies por máquina podem também ser especificados ao usar o "
-"formato <literal>ftp::Proxy::&lt;host&gt;</literal> com a palavra chave "
-"especial <literal>DIRECT</literal> que significa não usar nenhum proxy. Se "
-"nenhuma das definições acima for especificada, será usada a variável de "
-"ambiente <envar>ftp_proxy</envar>. Para usar um proxy FTP você tem que "
-"definir o script <literal>ftp::ProxyLogin</literal> no ficheiro de "
-"configuração. Esta entrada especifica os comandos a enviar para dizer ao "
-"servidor proxy ao que se ligar. Por favor veja &configureindex; para um "
-"exemplo de como fazer isto. As variáveis de substituição que representam o "
-"componente URI correspondente são <literal>$(PROXY_USER)</literal> "
-"<literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> "
-"<literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> e "
-"<literal>$(SITE_PORT)</literal>."
-
-#. 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 "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"São disponibilizadas várias definições para controlar o modo passivo. "
-"Geralmente é seguro deixar o modo passivo ligado, funciona em quase todos "
-"ambientes. No entanto algumas situações requerem que o modo passivo seja "
-"desactivado e em vez disso usar o modo port FTP. Isto pode ser feito "
-"globalmente ou para ligações que passam por um proxy ou para uma máquina "
-"específica (veja a amostra de ficheiro de configuração para exemplos)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"É possível usar proxy FTP sobre HTTP ao definir a variável de ambiente "
-"<envar>ftp_proxy</envar> para um URL HTTP - veja a discussão do método http "
-"em cima para a sintaxe. Você não pode definir isto no ficheiro de "
-"configuração e não é recomendado usar FTP sobre HTTP devido à sua baixa "
-"eficiência."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"A definição <literal>ForceExtended</literal> controla o uso de comandos "
-"RFC2428 <literal>EPSV</literal> e <literal>EPRT</literal>. A predefinição é "
-"falso, o que significa que estes comandos apenas são usados se a ligação de "
-"controle for IPv6. Definir isto para verdadeiro força o seu uso mesmo em "
-"ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml
#, no-wrap
@@ -5989,12 +5900,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Escreve informação relacionada com o descarregamento de pacotes usando FTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
@@ -8774,38 +8679,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml
msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-"O esquema ftp especifica um servidor FTP para um arquivo. O uso de FTP está "
-"em declínio em favor de <literal>http</literal> e <literal>https</literal> e "
-"muitos arquivos ou nunca ofereceram ou estão a retirar o acesso FTP. Se você "
-"ainda precisa deste método, estão disponíveis muitas opções de configuração "
-"no escopo <literal>Acquire::ftp</literal> e detalhadas em &apt-conf;."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Por favor note que pode ser especificado um proxy FTP ao usar a variável de "
-"ambiente <envar>ftp_proxy</envar>. É possível especifica um proxy HTTP (os "
-"servidores proxy HTTP geralmente compreendem URLs de FTP) usando esta "
-"variável de ambiente e <emphasis>apenas</emphasis> esta variável de "
-"ambiente. Os proxies que usam HTTP especificados no ficheiro de configuração "
-"serão ignorados."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using removable media to copy files around with "
@@ -8816,20 +8689,6 @@ msgstr ""
"localização. Isto é útil para quem use um meio amovível para copiar "
"ficheiros com o APT."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"O método rsh/ssh invoca RSH/SSH a ligar a uma máquina remota e aceder a "
-"ficheiros como um dado utilizador. É recomendada a configuração prévia de "
-"rhosts ou chaves RSA. Os comandos standard <command>find</command> e "
-"<command>dd</command> são usados para executar as transferências de "
-"ficheiros a partir da máquina remota."
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml
msgid "adding more recognizable URI types"
@@ -12689,7 +12548,6 @@ msgid ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -12702,7 +12560,6 @@ msgstr ""
"\n"
" Por exemplo:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
@@ -13860,6 +13717,136 @@ 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>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs. It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>. Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> define o proxy predefinido a usar para URIs "
+#~ "FTP. Está no formato standard de <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>. Os proxies por máquina podem também ser especificados "
+#~ "ao usar o formato <literal>ftp::Proxy::&lt;host&gt;</literal> com a "
+#~ "palavra chave especial <literal>DIRECT</literal> que significa não usar "
+#~ "nenhum proxy. Se nenhuma das definições acima for especificada, será "
+#~ "usada a variável de ambiente <envar>ftp_proxy</envar>. Para usar um proxy "
+#~ "FTP você tem que definir o script <literal>ftp::ProxyLogin</literal> no "
+#~ "ficheiro de configuração. Esta entrada especifica os comandos a enviar "
+#~ "para dizer ao servidor proxy ao que se ligar. Por favor veja "
+#~ "&configureindex; para um exemplo de como fazer isto. As variáveis de "
+#~ "substituição que representam o componente URI correspondente são "
+#~ "<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> "
+#~ "<literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
+#~ "<literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>."
+
+#~ 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."
+
+#~ 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 instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "São disponibilizadas várias definições para controlar o modo passivo. "
+#~ "Geralmente é seguro deixar o modo passivo ligado, funciona em quase todos "
+#~ "ambientes. No entanto algumas situações requerem que o modo passivo seja "
+#~ "desactivado e em vez disso usar o modo port FTP. Isto pode ser feito "
+#~ "globalmente ou para ligações que passam por um proxy ou para uma máquina "
+#~ "específica (veja a amostra de ficheiro de configuração para exemplos)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "É possível usar proxy FTP sobre HTTP ao definir a variável de ambiente "
+#~ "<envar>ftp_proxy</envar> para um URL HTTP - veja a discussão do método "
+#~ "http em cima para a sintaxe. Você não pode definir isto no ficheiro de "
+#~ "configuração e não é recomendado usar FTP sobre HTTP devido à sua baixa "
+#~ "eficiência."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "A definição <literal>ForceExtended</literal> controla o uso de comandos "
+#~ "RFC2428 <literal>EPSV</literal> e <literal>EPRT</literal>. A predefinição "
+#~ "é falso, o que significa que estes comandos apenas são usados se a "
+#~ "ligação de controle for IPv6. Definir isto para verdadeiro força o seu "
+#~ "uso mesmo em ligações IPv4. Note que a maioria dos servidores FTP não "
+#~ "suporta RFC2428."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "Escreve informação relacionada com o descarregamento de pacotes usando "
+#~ "FTP."
+
+#~ msgid ""
+#~ "The ftp scheme specifies an FTP server for an archive. Use of FTP is on "
+#~ "the decline in favour of <literal>http</literal> and <literal>https</"
+#~ "literal> and many archives either never offered or are retiring FTP "
+#~ "access. If you still need this method many configuration options for it "
+#~ "are available in the <literal>Acquire::ftp</literal> scope and detailed "
+#~ "in &apt-conf;."
+#~ msgstr ""
+#~ "O esquema ftp especifica um servidor FTP para um arquivo. O uso de FTP "
+#~ "está em declínio em favor de <literal>http</literal> e <literal>https</"
+#~ "literal> e muitos arquivos ou nunca ofereceram ou estão a retirar o "
+#~ "acesso FTP. Se você ainda precisa deste método, estão disponíveis muitas "
+#~ "opções de configuração no escopo <literal>Acquire::ftp</literal> e "
+#~ "detalhadas em &apt-conf;."
+
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Por favor note que pode ser especificado um proxy FTP ao usar a variável "
+#~ "de ambiente <envar>ftp_proxy</envar>. É possível especifica um proxy HTTP "
+#~ "(os servidores proxy HTTP geralmente compreendem URLs de FTP) usando esta "
+#~ "variável de ambiente e <emphasis>apenas</emphasis> esta variável de "
+#~ "ambiente. Os proxies que usam HTTP especificados no ficheiro de "
+#~ "configuração serão ignorados."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "O método rsh/ssh invoca RSH/SSH a ligar a uma máquina remota e aceder a "
+#~ "ficheiros como um dado utilizador. É recomendada a configuração prévia de "
+#~ "rhosts ou chaves RSA. Os comandos standard <command>find</command> e "
+#~ "<command>dd</command> são usados para executar as transferências de "
+#~ "ficheiros a partir da máquina remota."
+
+#~ msgid ""
#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
#~ msgstr ""
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index f685f4026..38731a03f 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -3422,61 +3422,6 @@ msgid ""
"&apt-transport-https; manpages respectively."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>. Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-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 "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml
#, no-wrap
@@ -4124,11 +4069,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
msgid "Print information related to downloading packages using HTTP."
msgstr ""
@@ -6459,42 +6399,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml
msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs) using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using removable media to copy files around with "
"APT."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml
msgid "adding more recognizable URI types"
@@ -9448,7 +9358,6 @@ msgid ""
"\n"
" For example:\n"
" file:/mnt/debian,\n"
-" ftp://ftp.example.org/debian,\n"
" http://deb.debian.org/debian,\n"
"\n"
"\n"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 9d2185d7a..5d27ae005 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -487,36 +487,12 @@ Signed-By:
source list.</para></listitem>
</varlistentry>
- <varlistentry><term><command>ftp</command></term>
- <listitem><para>
- The ftp scheme specifies an FTP server for an archive. Use of FTP is on the
- decline in favour of <literal>http</literal> and <literal>https</literal>
- and many archives either never offered or are retiring FTP access. If you
- still need this method many configuration options for it are available in
- the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;.</para>
- <para>Please note that an FTP proxy can be specified
- by using the <envar>ftp_proxy</envar> environment variable. It is possible
- to specify an HTTP proxy (HTTP proxy servers often understand FTP URLs)
- using this environment variable and <emphasis>only</emphasis> this
- environment variable. Proxies using HTTP specified in
- the configuration file will be ignored.</para></listitem>
- </varlistentry>
-
<varlistentry><term><command>copy</command></term>
<listitem><para>
The copy scheme is identical to the file scheme except that packages are
copied into the cache directory instead of used directly at their location.
This is useful for people using removable media to copy files around with APT.</para></listitem>
</varlistentry>
-
- <varlistentry><term><command>rsh</command></term><term><command>ssh</command></term>
- <listitem><para>
- The rsh/ssh method invokes RSH/SSH to connect to a remote host and
- access the files as a given user. Prior configuration of rhosts or RSA keys
- is recommended. The standard <command>find</command> and <command>dd</command>
- commands are used to perform the file transfers from the remote host.
- </para></listitem>
- </varlistentry>
<varlistentry><term>adding more recognizable URI types</term>
<listitem><para>