Merge remote-tracking branch 'upstream/debian/experimental-no-abi-break' into feature/source-deb822

Conflicts:
	test/integration/test-apt-sources-deb822

1 files changed, 126 insertions, 67 deletions

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 7060351ce..c9a325bf0 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
 "PO-Revision-Date: 2012-09-03 01:53+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -1595,7 +1595,7 @@ msgstr "Ficheiros"
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
 #: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
 #: apt-ftparchive.1.xml:609
 msgid "See Also"
@@ -5163,7 +5163,7 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Exemplos"
@@ -6639,7 +6639,7 @@ msgstr ""
 "linha <literal>deb-src</literal> para obter índices das fontes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6648,21 +6648,57 @@ msgstr ""
 "tipos <literal>deb</literal> e <literal>deb-src</literal> é:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ opções ] uri distribuição [componente1] [componente2] [...]"
 
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+"     Type: deb\n"
+"     URI: http://example.com\n"
+"     Suites: stable\n"
+"     Sections: component1 component2\n"
+"     [option1]: [option1-value]\n"
+"\n"
+"     Type: deb-src\n"
+"     URI: http://example.com\n"
+"     Suites: stable\n"
+"     Sections: component1 component2\n"
+"     [option1]: [option1-value]\n"
+"   "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:100
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs.  "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest.  If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
-"<literal>distribution</literal> can specify an exact path, in which case the "
-"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<literal>suite</literal> can specify an exact path, in which case the "
+"components must be omitted and <literal>suite</literal> must end with a "
+"slash (<literal>/</literal>). This is useful for the case when only a "
 "particular sub-section of the archive denoted by the URI is of interest.  If "
-"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>suite</literal> does not specify an exact path, at least one "
 "<literal>component</literal> must be present."
 msgstr ""
 "O URI para o tipo <literal>deb</literal> tem de especificar a base da "
@@ -6676,15 +6712,24 @@ msgstr ""
 "presente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:109
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
+#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+#| "This permits architecture-independent <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+"literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 "<literal>distribution</literal> também pode conter uma variável. <literal>"
 "$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como "
@@ -6695,18 +6740,32 @@ msgstr ""
 "gerar automaticamente um URI com a arquitectura actual."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"Since only one distribution can be specified per line it may be necessary to "
-"have multiple lines for the same URI, if a subset of all available "
-"distributions or components at that location is desired.  APT will sort the "
-"URI list after it has generated a complete set internally, and will collapse "
-"multiple references to the same Internet host, for instance, into a single "
-"connection, so that it does not inefficiently establish an FTP connection, "
-"close it, do something else, and then re-establish a connection to that same "
-"host. This feature is useful for accessing busy FTP sites with limits on the "
-"number of simultaneous anonymous users. APT also parallelizes connections to "
-"different hosts to more effectively deal with sites with low bandwidth."
+#: sources.list.5.xml:117
+#, fuzzy
+#| msgid ""
+#| "Since only one distribution can be specified per line it may be necessary "
+#| "to have multiple lines for the same URI, if a subset of all available "
+#| "distributions or components at that location is desired.  APT will sort "
+#| "the URI list after it has generated a complete set internally, and will "
+#| "collapse multiple references to the same Internet host, for instance, "
+#| "into a single connection, so that it does not inefficiently establish an "
+#| "FTP connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"In the traditional style sources.list format since only one distribution can "
+"be specified per line it may be necessary to have multiple lines for the "
+"same URI, if a subset of all available distributions or components at that "
+"location is desired.  APT will sort the URI list after it has generated a "
+"complete set internally, and will collapse multiple references to the same "
+"Internet host, for instance, into a single connection, so that it does not "
+"inefficiently establish an FTP connection, close it, do something else, and "
+"then re-establish a connection to that same host. This feature is useful for "
+"accessing busy FTP sites with limits on the number of simultaneous anonymous "
+"users. APT also parallelizes connections to different hosts to more "
+"effectively deal with sites with low bandwidth."
 msgstr ""
 "Como apenas pode ser especificada por linha uma distribuição, pode ser "
 "necessário ter várias linhas para o mesmo URI, se só for desejado um sub-"
@@ -6721,7 +6780,7 @@ msgstr ""
 "sites com baixa largura de banda."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:131
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -6738,7 +6797,7 @@ msgstr ""
 "definições não suportadas serão ignoradas em silêncio):"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:137
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -6753,7 +6812,7 @@ msgstr ""
 "<literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:141
 #, fuzzy
 #| msgid ""
 #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6774,7 +6833,7 @@ msgstr ""
 "<literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:144
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -6791,7 +6850,7 @@ msgstr ""
 "lida com fontes mesmo actualmente autenticadas como não sendo autênticas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:151
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -6805,12 +6864,12 @@ msgstr ""
 "Internet, por exemplo)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:156
 msgid "Some examples:"
 msgstr "Alguns exemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:158
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6822,17 +6881,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:164
 msgid "URI specification"
 msgstr "Especificação da URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:166
 msgid "The currently recognized URI types are:"
 msgstr "Os tipos de URI actualmente reconhecidos são:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:170
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6843,7 +6902,7 @@ msgstr ""
 "arquivos locais."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:177
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6853,7 +6912,7 @@ msgstr ""
 "fontes."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:184
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6870,7 +6929,7 @@ msgstr ""
 "método de autenticação seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:195
 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. "
@@ -6891,7 +6950,7 @@ msgstr ""
 "configuração serão ignorados."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:207
 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.  "
@@ -6904,7 +6963,7 @@ msgstr ""
 "ficheiros com o APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:214
 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 "
@@ -6918,12 +6977,12 @@ msgstr ""
 "ficheiros a partir da máquina remota."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:221
 msgid "adding more recognizable URI types"
 msgstr "adicionando mais tipos de URI reconhecíveis"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:223
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -6942,7 +7001,7 @@ msgstr ""
 "exemplo o debtorrent - veja &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:235
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -6951,36 +7010,36 @@ msgstr ""
 "para stable/main, stable/contrib, e stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:240
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:242
 msgid "Source line for the above"
 msgstr "Linha de fonte para o referido acima"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:243
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:245
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6991,7 +7050,7 @@ msgstr ""
 "<literal>amd64</literal> e <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:247
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7001,7 +7060,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:250
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7010,13 +7069,13 @@ msgstr ""
 "hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:252
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:254
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7025,13 +7084,13 @@ msgstr ""
 "usa apenas a área &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:256
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:258
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7044,19 +7103,19 @@ msgstr ""
 "uma única sessão FTP para ambas linhas de recurso."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:262
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:271
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:264
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7075,7 +7134,7 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:276
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"