X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/5b1e4e8606858e0ef85fda5092b85091ebc1d5ee..c1ab34c75f7e98fa1a9686c7bc59e578e1ae9572:/doc/po/pt.po?ds=sidebyside

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 3aefcc2a9..d5b81ca7f 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -5,9 +5,9 @@
 # Américo Monteiro <a_monteiro@gmx.com>, 2009 - 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.7\n"
+"Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-12-07 15:31+0100\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: apt.ent:7
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -37,7 +37,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:13
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -53,7 +53,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:24
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -79,7 +79,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:32
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -99,7 +99,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:42
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -123,7 +123,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:50
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -143,7 +143,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:62
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -173,7 +173,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:74
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -201,7 +201,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:85
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -227,7 +227,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:91
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -243,7 +243,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:97
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -259,7 +259,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:103
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -275,7 +275,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:109
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -291,7 +291,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -315,7 +315,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -331,7 +331,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:131
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -347,7 +347,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:137
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -363,7 +363,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:144
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -381,7 +381,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:150
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -397,7 +397,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:156
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -413,7 +413,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:163
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -431,7 +431,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -451,7 +451,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:175
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -463,7 +463,7 @@ msgstr ""
 "<!ENTITY translation-title \"TRADUÇÂO\">\n"
 
 #. type: Plain text
-#: apt.ent:184
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -481,7 +481,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:195
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -507,7 +507,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:198
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
@@ -516,7 +516,7 @@ msgstr ""
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 
 #. type: Plain text
-#: apt.ent:201
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
@@ -525,7 +525,7 @@ msgstr ""
 "synopsis-config-file \"ficheiro_de_configuração\">"
 
 #. type: Plain text
-#: apt.ent:204
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -536,7 +536,7 @@ msgstr ""
 "alvo\">"
 
 #. type: Plain text
-#: apt.ent:207
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
@@ -545,7 +545,7 @@ msgstr ""
 "synopsis-architecture \"arquitectura\">"
 
 #. type: Plain text
-#: apt.ent:210
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
@@ -554,7 +554,7 @@ msgstr ""
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 
 #. type: Plain text
-#: apt.ent:213
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
@@ -563,7 +563,7 @@ msgstr ""
 "ENTITY synopsis-pkg-ver-number \"número_de_versão_do_pacote\">"
 
 #. type: Plain text
-#: apt.ent:216
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
@@ -572,7 +572,7 @@ msgstr ""
 "apt --> <!ENTITY synopsis-prefix \"prefixo\">"
 
 #. type: Plain text
-#: apt.ent:219
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
@@ -581,7 +581,7 @@ msgstr ""
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 
 #. type: Plain text
-#: apt.ent:222
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
@@ -590,7 +590,7 @@ msgstr ""
 "media/cdrom --> <!ENTITY synopsis-cdrom-mount \"ponto_de_montagem-do_cdrom\">"
 
 #. type: Plain text
-#: apt.ent:225
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -601,7 +601,7 @@ msgstr ""
 "\"directório_temporário\">"
 
 #. type: Plain text
-#: apt.ent:228
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
@@ -610,7 +610,7 @@ msgstr ""
 "synopsis-filename \"nome_do_ficheiro\">"
 
 #. type: Plain text
-#: apt.ent:231
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
@@ -620,7 +620,7 @@ msgstr ""
 "\">"
 
 #. type: Plain text
-#: apt.ent:234
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
@@ -631,7 +631,7 @@ msgstr ""
 "\"ficheiro_de_sobreposição\">"
 
 #. type: Plain text
-#: apt.ent:237
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -642,7 +642,7 @@ msgstr ""
 "\"prefixo_de_caminho\">"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
@@ -651,7 +651,7 @@ msgstr ""
 "generate section --> <!ENTITY synopsis-section \"secção\">"
 
 #. type: Plain text
-#: apt.ent:243
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
@@ -660,97 +660,135 @@ msgstr ""
 "export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
-#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
-#: apt-config.8.xml:22
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
-#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
-#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
-#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
-#: apt-ftparchive.1.xml:23
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:28
+#: apt.8.xml
 msgid "command-line interface"
 msgstr "interface de linha de comandos"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
-#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
-#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
-#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
-#: apt-ftparchive.1.xml:34
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:34
+#: apt.8.xml
 msgid ""
-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more low-"
-"level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
 msgstr ""
-"<command>apt</command> (Advanced Package Tool) é uma ferramenta de linha de "
-"comandos para manuseamento de pacotes. Disponibiliza uma interface de linha "
-"de comandos para a gestão de pacotes do sistema. Veja também &apt-get; e "
-"&apt-cache; para mais opções de baixo nível dos comandos."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:43
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
 msgid ""
-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
-"versions</option> are supported."
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwhelming readers with a cornucopia of options and details."
 msgstr ""
-"<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
-"padrões da shell para corresponder aos nomes de pacotes e são suportadas as "
-"seguintes opções <option>--installed</option>, <option>--upgradable</"
-"option>, <option>--all-versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
 msgstr ""
-"<literal>search</literal> procura por termo(s) determinado(s) e mostra os "
-"pacotes correspondentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New packages will be "
+#| "installed, but existing packages will never be removed."
+msgid ""
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
+msgstr ""
+"<literal>upgrade</literal> é usado para instalar as versões mais recentes de "
+"todos os pacotes actualmente instalados no sistema a partir das fontes "
+"enumeradas em <filename>/etc/apt/sources.list</filename>. Serão instalados "
+"novos pacotes, mas pacotes existentes nunca serão removidos."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>full-upgrade</literal> performs the function of upgrade but may "
+#| "also remove installed packages if that is required in order to resolve a "
+#| "package conflict."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
+msgstr ""
+"<literal>full-upgrade</literal> executa a função de upgrade mas pode também "
+"remover pacotes instalados se tal for necessário de modo a resolver um "
+"conflito de pacotes."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>show</literal> mostra a informação do pacote para o(s) pacote(s) "
-"determinado(s)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overridden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"<literal>install</literal> é seguido por um ou mais nomes de pacotes que se "
-"deseja instalar ou actualizar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "A specific version of a package can be selected for installation by "
+#| "following the package name with an equals and the version of the package "
+#| "to select. This will cause that version to be located and selected for "
+#| "install. Alternatively a specific distribution can be selected by "
+#| "following the package name with a slash and the version of the "
+#| "distribution or the Archive name (stable, testing, unstable)."
 msgid ""
 "A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&stable-"
+"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
+"unstable). This will also select versions from this release for dependencies "
+"of this package if needed to satisfy the request."
 msgstr ""
 "Pode ser seleccionada para instalação uma versão específica de um pacote ao "
 "continuar o nome do pacote com um igual (=) e a versão do pacote a "
@@ -760,82 +798,129 @@ msgstr ""
 "versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml
 msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installation request for the accidentally removed "
+"package will restore its function as before in that case. On the other hand "
+"you can get rid of these leftovers by calling <command>purge</command> even "
+"on already removed packages. Note that this does not affect any data or "
+"configuration stored in your home directory."
 msgstr ""
-"<literal>remove</literal> é idêntico a <literal>install</literal>  à "
-"excepção que os pacotes são removidos em vez de instalados. Note que remover "
-"um pacote deixa os seus ficheiros de configuração no sistema. Se um sinal "
-"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
-"pacote identificado será instalado em vez de removido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for other packages and "
+#| "are now no longer needed."
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
-"<literal>edit-sources</literal> permite-lhe editar o seu ficheiro sources."
-"list e disponibiliza verificações de sanidade básicas."
+"<literal>autoremove</literal> é usado para remover pacotes que foram "
+"instalados automaticamente para satisfazer dependências de outros pacotes e "
+"que já não são necessários."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"You should check that the list does not include applications you have grown "
+"to like even though they were once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are also never proposed for automatic removal."
 msgstr ""
-"<literal>update</literal> é usado para re-sincronizar o índice dos pacotes a "
-"partir das suas fontes."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml
 msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
 msgstr ""
-"<literal>upgrade</literal> é usado para instalar as versões mais recentes de "
-"todos os pacotes actualmente instalados no sistema a partir das fontes "
-"enumeradas em <filename>/etc/apt/sources.list</filename>. Serão instalados "
-"novos pacotes, mas pacotes existentes nunca serão removidos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml
 msgid ""
-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and much more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
 msgstr ""
-"<literal>full-upgrade</literal> executa a função de upgrade mas pode também "
-"remover pacotes instalados se tal for necessário de modo a resolver um "
-"conflito de pacotes."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
-#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
-#: apt-ftparchive.1.xml:500
-msgid "options"
-msgstr "opções"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>list</literal> is used to display a list of packages. It "
+#| "supports shell pattern for matching package names and the following "
+#| "options: <option>--installed</option>, <option>--upgradable</option>, "
+#| "<option>--upgradeable</option>, <option>--all-versions</option> are "
+#| "supported."
+msgid ""
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
+msgstr ""
+"<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
+"padrões da shell para corresponder aos nomes de pacotes e são suportadas as "
+"seguintes opções <option>--installed</option>, <option>--upgradable</"
+"option>, <option>--all-versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
+"<literal>edit-sources</literal> permite-lhe editar o seu ficheiro sources."
+"list e disponibiliza verificações de sanidade básicas."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
-msgid "Script usage"
-msgstr "Utilização de script"
+#: apt.8.xml
+msgid "Script Usage and Differences from Other APT Tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "The &apt; commandline is designed as a end-user tool and it may change "
+#| "the output between versions. While it tries to not break backward "
+#| "compatibility there is no guarantee for it either.  All features of &apt; "
+#| "are available in &apt-cache; and &apt-get; via APT options. Please prefer "
+#| "using these commands in your scripts."
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"The &apt; commandline is designed as an end-user tool and it may change "
+"behavior between versions. While it tries not to break backward "
+"compatibility this is not guaranteed either if a change seems beneficial for "
+"interactive use."
 msgstr ""
 "A linha de comandos do &apt; foi desenhada como ferramenta de utilizador "
 "final e pode variar os textos mostrados entre versões. Apesar de tentar não "
@@ -844,61 +929,27 @@ msgstr ""
 "get; via opções do APT. Por favor dê preferência a usar estes comandos nos "
 "seus scripts."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
-msgid "Differences to &apt-get;"
-msgstr "Diferenças para o &apt-get;"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
-msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
-msgstr ""
-"O comando  <command>apt</command> destina-se a ser agradável para os "
-"utilizadores finais e não precisa de ser compatível com as versões "
-"anteriores como o &apt-get;. Por isso algumas opções são diferentes."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "A opção <literal>DPkg::Progress-Fancy</literal> está activada."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "A opção <literal>APT::Color</literal> está activada."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"Está disponível um novo comando <literal>list</literal> de modo semelhante a "
-"<literal>dpkg --list</literal>."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml
 msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So you should "
+"prefer using these commands (potentially with some additional options "
+"enabled) in your scripts as they keep backward compatibility as much as "
+"possible."
 msgstr ""
-"A opção <literal>upgrade</literal> tem <literal>--with-new-pkgs</literal> "
-"activado por predefinição."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
-#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
-#: apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701
-#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
-#: apt-ftparchive.1.xml:603
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
 msgid "See Also"
 msgstr "Veja também"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml
 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
@@ -907,14 +958,14 @@ msgstr ""
 "utilizadores do The APT em &guidesdir;, &apt-preferences;, o Howto do APT."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
-#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
-#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
+#: apt-ftparchive.1.xml
 msgid "Diagnostics"
 msgstr "Diagnóstico"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml
 msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -922,14 +973,14 @@ msgstr ""
 "<command>apt</command> devolve zero na operação normal, 100 decimal em erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:29
+#: apt-get.8.xml
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 "Utilitário de manuseamento de pacotes do APT -- interface de linha de "
 "comandos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:35
+#: apt-get.8.xml
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -942,8 +993,8 @@ msgstr ""
 "\"front-end\" como o &aptitude;, &synaptic; e &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
-#: apt-ftparchive.1.xml:50
+#: apt-get.8.xml apt-cache.8.xml apt-cdrom.8.xml apt-config.8.xml
+#: apt-ftparchive.1.xml
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -952,7 +1003,7 @@ msgstr ""
 "fornecida, um dos comandos abaixo têm que estar presentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:45
+#: apt-get.8.xml
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -976,7 +1027,7 @@ msgstr ""
 "ficheiros de pacotes não pode ser conhecido com antecedência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:57
+#: apt-get.8.xml
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -1002,7 +1053,7 @@ msgstr ""
 "novas versões de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:70
+#: apt-get.8.xml
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1027,7 +1078,7 @@ msgstr ""
 "sobrepor as definições gerais em pacotes individuais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:83
+#: apt-get.8.xml
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1043,7 +1094,7 @@ msgstr ""
 "estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:94
+#: apt-get.8.xml
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -1073,7 +1124,24 @@ msgstr ""
 "de resolução de conflitos do apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:119
+#: apt-get.8.xml
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"Pode ser seleccionada para instalação uma versão específica de um pacote ao "
+"continuar o nome do pacote com um igual (=) e a versão do pacote a "
+"seleccionar. Isto irá fazer com que essa versão seja localizada e "
+"seleccionada para instalação. Alternativamente pode ser seleccionada uma "
+"distribuição específica ao continuar o nome do pacote com uma slash (/) e a "
+"versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1082,7 +1150,7 @@ msgstr ""
 "e devem ser usados com cuidado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -1102,7 +1170,7 @@ msgstr ""
 "descarregadas e instaladas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:133
+#: apt-get.8.xml
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1111,7 +1179,7 @@ msgstr ""
 "instalação alternativa para pacotes individuais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -1130,7 +1198,22 @@ msgstr ""
 "caractere '^' ou '$', para criar uma expressão regular mais específica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:155
+#: apt-get.8.xml
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> é idêntico a <literal>install</literal>  à "
+"excepção que os pacotes são removidos em vez de instalados. Note que remover "
+"um pacote deixa os seus ficheiros de configuração no sistema. Se um sinal "
+"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
+"pacote identificado será instalado em vez de removido."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1141,7 +1224,7 @@ msgstr ""
 "configuração são também apagados)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1160,7 +1243,7 @@ msgstr ""
 "<literal>pkg/release</literal>, se possível."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:168
+#: apt-get.8.xml
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1175,7 +1258,7 @@ msgstr ""
 "de fonte erradas (muito antigas/muito novas) ou mesmo nenhuma."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1190,7 +1273,7 @@ msgstr ""
 "então o pacote fonte não será desempacotado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -1205,7 +1288,7 @@ msgstr ""
 "Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1216,7 +1299,7 @@ msgstr ""
 "descarregados para o directório actual, como tarballs fonte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1231,7 +1314,7 @@ msgstr ""
 "arquitectura-anfitriã com a opção <option>--host-architecture</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:200
+#: apt-get.8.xml
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1240,7 +1323,7 @@ msgstr ""
 "de pacotes e verifica por dependências quebradas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1249,7 +1332,7 @@ msgstr ""
 "directório actual."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1260,8 +1343,18 @@ msgstr ""
 "obtidos. Remove tudo excepto o ficheiro lock de <filename>&cachedir;/"
 "archives/</filename> e <filename>&cachedir;/archives/partial/</filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:218
+#: apt-get.8.xml
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1280,7 +1373,7 @@ msgstr ""
 "pacotes instalados sejam apagados se estiver definida para 'off'."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1291,17 +1384,23 @@ msgstr ""
 "que já não são necessários."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:233
-msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
-"installed.  However, you can specify the same options as for the "
-"<option>install</option> command."
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
+#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
+#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "changelogs</ulink> for Ubuntu).  By default it displays the changelog for "
+#| "the version that is installed.  However, you can specify the same options "
+#| "as for the <option>install</option> command."
+msgid ""
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>.  By default it "
+"displays the changelog for the version that is installed.  However, you can "
+"specify the same options as for the <option>install</option> command."
 msgstr ""
 "<literal>changelog</literal> descarrega o registo de alterações de um pacote "
 "e mostra-o através do <command>sensible-pager</command>. O nome do servidor "
@@ -1314,7 +1413,27 @@ msgstr ""
 "para o comando <option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml
+msgid ""
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "opções"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1323,7 +1442,7 @@ msgstr ""
 "de Configuração: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1332,7 +1451,7 @@ msgstr ""
 "Configuração: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1342,7 +1461,7 @@ msgstr ""
 "Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -1370,7 +1489,7 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1389,7 +1508,7 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1400,7 +1519,7 @@ msgstr ""
 "descarregados. Item de Configuração: <literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1420,37 +1539,21 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
-msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system.  Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-"Nenhuma acção; executa uma simulação dos eventos que irão ocorrer mas na "
-"realidade não altera o sistema. Item de Configuração: <literal>APT::Get::"
-"Simulate</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
+#: apt-get.8.xml
 msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>)  so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation.  A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>).  Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."
 msgstr ""
-"As simulações executadas como um utilizador irão desactivar automaticamente "
-"o bloqueio (<literal>Debug::NoLocking</literal>), e se a opção <literal>APT::"
-"Get::Show-User-Simulation-Note</literal> estiver definida (como está por "
-"predefinição) será também mostrado um aviso indicando que é apenas uma "
-"simulação. As execuções executadas pelo root não accionam nem o NoLocking "
-"nem o aviso - os super-utilizadores devem saber o que estão a fazer sem mais "
-"avisos do <literal>apt-get</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1465,7 +1568,7 @@ msgstr ""
 "indicam quebras que não têm consequência (raro)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1481,7 +1584,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1490,7 +1593,7 @@ msgstr ""
 "<literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1500,7 +1603,7 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1509,7 +1612,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1526,7 +1629,7 @@ msgstr ""
 "item de Configuração: <literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml
 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "
@@ -1542,7 +1645,7 @@ msgstr ""
 "<literal>APT::Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1551,7 +1654,7 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -1564,7 +1667,7 @@ msgstr ""
 "Item de Configuração: <literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1583,7 +1686,7 @@ msgstr ""
 "<literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1596,7 +1699,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1609,13 +1712,87 @@ msgstr ""
 "Item de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+"Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue "
+"sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser "
+"usado excepto em situações muito especiais. Usar o <literal>force-yes</"
+"literal> pode destruir potencialmente o seu sistema! Item de Configuração: "
+"<literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+"Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue "
+"sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser "
+"usado excepto em situações muito especiais. Usar o <literal>force-yes</"
+"literal> pode destruir potencialmente o seu sistema! Item de Configuração: "
+"<literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+"Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue "
+"sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser "
+"usado excepto em situações muito especiais. Usar o <literal>force-yes</"
+"literal> pode destruir potencialmente o seu sistema! Item de Configuração: "
+"<literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
-"<literal>APT::Get::force-yes</literal>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."
 msgstr ""
 "Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue "
 "sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser "
@@ -1624,7 +1801,7 @@ msgstr ""
 "<literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -1645,7 +1822,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1658,7 +1835,7 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1667,7 +1844,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1684,7 +1861,7 @@ msgstr ""
 "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1707,7 +1884,7 @@ msgstr ""
 "Release</literal>; veja também o manual &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1721,7 +1898,7 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1731,7 +1908,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1744,7 +1921,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1763,7 +1940,7 @@ msgstr ""
 "<literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1774,7 +1951,7 @@ msgstr ""
 "Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1783,18 +1960,18 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
-"is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself.  "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override.  Configuration Item: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
 msgstr ""
-"Ignora se os pacotes não podem ser autenticados e não avisa sobre isso. Isto "
-"é útil para ferramentas como o pbuilder. Item de Configuração: <literal>APT::"
-"Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml
 msgid ""
 "Forbid the update command to acquire unverifiable data from configured "
 "sources. Apt will fail at the update command for repositories without valid "
@@ -1803,7 +1980,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1818,13 +1995,13 @@ msgstr ""
 "Progress</literal> e <literal>Dpkg::Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
-#: apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml
 msgid "Files"
 msgstr "Ficheiros"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1835,7 +2012,7 @@ msgstr ""
 "preferences;, o Howto do APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1844,17 +2021,27 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:29
+#: apt-cache.8.xml
 msgid "query the APT cache"
 msgstr "pesquisa a cache do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-cache</command> performs a variety of operations on APT's "
+#| "package cache. <command>apt-cache</command> does not manipulate the state "
+#| "of the system but does provide operations to search and generate "
+#| "interesting output from the package metadata."
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."
 msgstr ""
 "<command>apt-cache</command> executa uma variedade de operações na cache de "
 "pacotes do APT. <command>apt-cache</command> não manipula o estado do "
@@ -1862,7 +2049,7 @@ msgstr ""
 "a partir dos metadados do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:45
+#: apt-cache.8.xml
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1872,14 +2059,12 @@ msgstr ""
 "estiver em falta ou desactualizada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
-#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
-#: apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:50
+#: apt-cache.8.xml
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1903,7 +2088,7 @@ msgstr ""
 "ao seguinte:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:62
+#: apt-cache.8.xml
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1929,7 +2114,7 @@ msgstr ""
 "Fornecimentos Reversos: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -1948,7 +2133,7 @@ msgstr ""
 "consultar o código fonte do apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:83
+#: apt-cache.8.xml
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1957,7 +2142,7 @@ msgstr ""
 "são esperados mais argumentos. As estatísticas reportadas são:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:86
+#: apt-cache.8.xml
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1966,7 +2151,7 @@ msgstr ""
 "encontrados na cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:90
+#: apt-cache.8.xml
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1979,7 +2164,7 @@ msgstr ""
 "dependências. A maioria dos pacotes caem nesta categoria."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -1996,7 +2181,7 @@ msgstr ""
 "mas não existe um existe um pacote chamado \"mail-transport-agent\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:104
+#: apt-cache.8.xml
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2009,7 +2194,7 @@ msgstr ""
 "pacote, xless, disponibiliza \"X11-text-viewer\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2022,7 +2207,7 @@ msgstr ""
 "um pacote real, como também disponibilizado pelo pacote debconf-tiny."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:117
+#: apt-cache.8.xml
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2038,11 +2223,17 @@ msgstr ""
 "declarações de Conflitos ou Breaks."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:124
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>Total distinct</literal> versions is the number of package "
+#| "versions found in the cache; this value is therefore at least equal to "
+#| "the number of total package names. If more than one distribution is being "
+#| "accessed (for instance, \"stable\" and \"unstable\"), this value can be "
+#| "considerably larger than the number of total package names."
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
 "instance, \"stable\" and \"unstable\"), this value can be considerably "
 "larger than the number of total package names."
 msgstr ""
@@ -2053,7 +2244,7 @@ msgstr ""
 "consideravelmente maior que o número do total de nomes de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2062,11 +2253,17 @@ msgstr ""
 "dependências reivindicadas por todos os pacotes na cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>showsrc</literal> displays all the source package records that "
+#| "match the given package names. All versions are shown, as well as all "
+#| "records that declare the name to be a binary package."
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."
 msgstr ""
 "<literal>showsrc</literal> mostra todos os registos de pacotes fonte que "
 "correspondem aos nomes de pacotes fornecidos. Todas as versões são "
@@ -2074,7 +2271,7 @@ msgstr ""
 "pacote binário."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2083,7 +2280,7 @@ msgstr ""
 "cache. É principalmente para depuração."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2093,7 +2290,7 @@ msgstr ""
 "&dselect;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2102,7 +2299,7 @@ msgstr ""
 "insatisfeitas na cache do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2111,12 +2308,22 @@ msgstr ""
 "print-avail</command>; mostra os registos do pacote para os pacotes nomeados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see &regex;.  It "
+#| "searches the package names and the descriptions for an occurrence of the "
+#| "regular expression and prints out the package name and the short "
+#| "description, including virtual package names.  If <option>--full</option> "
+#| "is given then output identical to <literal>show</literal> is produced for "
+#| "each matched package, and if <option>--names-only</option> is given then "
+#| "the long description is not searched, only the package name is."
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2125,7 +2332,7 @@ msgid ""
 "including virtual package names.  If <option>--full</option> is given then "
 "output identical to <literal>show</literal> is produced for each matched "
 "package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."
 msgstr ""
 "<literal>search</literal> executa uma busca de texto completo em todas as "
 "listas de pacotes disponíveis para o padrão POSIX regex fornecido, veja "
@@ -2137,7 +2344,7 @@ msgstr ""
 "então não há procura na descrição longa, apenas no nome do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2146,7 +2353,7 @@ msgstr ""
 "busca os quais são lidados em conjunto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2156,7 +2363,7 @@ msgstr ""
 "dependência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2165,12 +2372,12 @@ msgstr ""
 "que um pacote tem."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -2185,7 +2392,7 @@ msgstr ""
 "opção <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -2196,7 +2403,7 @@ msgstr ""
 "também são listados na lista gerada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2217,7 +2424,7 @@ msgstr ""
 "defina a opção <literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2231,14 +2438,14 @@ msgstr ""
 "dependências, linhas verdes são conflitos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de "
 "pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2248,12 +2455,12 @@ msgstr ""
 "VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -2266,7 +2473,7 @@ msgstr ""
 "acerca da selecção de prioridade do pacote nomeado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -2285,7 +2492,7 @@ msgstr ""
 "Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2296,7 +2503,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2311,7 +2518,7 @@ msgstr ""
 "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2325,7 +2532,7 @@ msgstr ""
 "Configuração: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2337,9 +2544,16 @@ msgstr ""
 "Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be tweaked with these flags "
+#| "which will omit the specified dependency type.  Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
 "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
 "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
@@ -2352,7 +2566,19 @@ msgstr ""
 "replaceable></literal> ex. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data.  A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture.  Configuration Item: <literal>APT::Cache::ShowImplicit</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2361,7 +2587,7 @@ msgstr ""
 "<literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2378,7 +2604,7 @@ msgstr ""
 "Configuração: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2390,16 +2616,20 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "Only search on the package names, not the long descriptions.  "
+#| "Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
 msgid ""
-"Only search on the package names, not the long descriptions.  Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions.  Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 "Apenas procura nos nomes dos pacotes, e não nas descrições longas. Item de "
 "Configuração: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2410,7 +2640,7 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2421,7 +2651,7 @@ msgstr ""
 "Configuração <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2432,12 +2662,12 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2446,12 +2676,12 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:28
+#: apt-key.8.xml
 msgid "APT key management utility"
 msgstr "Utilitário de gestão de chaves do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:35
+#: apt-key.8.xml
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -2462,12 +2692,12 @@ msgstr ""
 "estas chaves serão considerados de confiança."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:41
+#: apt-key.8.xml
 msgid "Commands"
 msgstr "Comandos"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:46
+#: apt-key.8.xml
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2478,41 +2708,49 @@ msgstr ""
 "se o nome do ficheiro for <literal>-</literal> a partir da entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:59
+#: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 msgstr "Remove uma chave da lista de chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:70
+#: apt-key.8.xml
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Escreve o &synopsis-param-keyid; da chave na saída standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:81
+#: apt-key.8.xml
 msgid "Output all trusted keys to standard output."
 msgstr "Escreve todas as chaves de confiança na saída standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:92
+#: apt-key.8.xml
 msgid "List trusted keys."
 msgstr "Lista as chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:103
+#: apt-key.8.xml
 msgid "List fingerprints of trusted keys."
 msgstr "Lista as fingerprints das chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:114
+#: apt-key.8.xml
 msgid ""
-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
-"Passa opções avançadas ao gpg. Com adv --recv-key você pode descarregar a "
-"chave pública."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:126
+#: apt-key.8.xml
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2525,7 +2763,7 @@ msgstr ""
 "por exemplo o pacote &keyring-package; em &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:140
+#: apt-key.8.xml
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2543,12 +2781,12 @@ msgstr ""
 "lo."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:156 apt-cdrom.8.xml:76
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Opções"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:157
+#: apt-key.8.xml
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2557,7 +2795,7 @@ msgstr ""
 "secção prévia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:160
+#: apt-key.8.xml
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2574,63 +2812,80 @@ msgstr ""
 "chaves são adicionadas a este."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:175
+#: apt-key.8.xml
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:176
+#: apt-key.8.xml
 msgid "Local trust database of archive keys."
 msgstr "Base de dados local de confiança de chaves de arquivos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:179
+#: apt-key.8.xml
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:180
+#: apt-key.8.xml
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Chaveiro das chaves de confiança dos arquivos &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:183
+#: apt-key.8.xml
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:184
+#: apt-key.8.xml
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Chaveiro das chaves de confiança removidas dos arquivos &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:193
+#: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:29
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
+#: apt-mark.8.xml
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml
 msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified front-end to set "
+"various settings for a package, such as marking a package as being "
+"automatically/manually installed or changing <command>dpkg</command> "
+"selections such as hold, install, deinstall and purge which are respected e."
+"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and Manually Installed Packages"
 msgstr ""
-"<command>apt-mark</command> irá modificar se um pacote foi marcado como "
-"sendo instalado automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:39
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed.  Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed by e.g.  <command>apt-get</command> or "
+#| "<command>aptitude</command>."
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while the package you installed explicitly is "
+"marked as manually installed.  Once an automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."
 msgstr ""
 "Quando você pede que um pacote seja instalado, e como resultado outros "
 "pacotes são instalados para satisfazer as suas dependências, as dependências "
@@ -2640,7 +2895,7 @@ msgstr ""
 "command> ou <command>aptitude</command> (exemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:48
+#: apt-mark.8.xml
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2651,7 +2906,7 @@ msgstr ""
 "pacote instalado manualmente depender deste pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2662,31 +2917,7 @@ msgstr ""
 "se nenhum outro pacote depender dele."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:64
-msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
-msgstr ""
-"<literal>hold</literal> é usado para marcar um pacote como retido, o que vai "
-"prevenir que o pacote seja automaticamente instalado, actualizado ou "
-"removido. O comando é apenas um invólucro em redor de <command>dpkg --set-"
-"selections</command> e o estado é assim mantido pelo &dpkg; e não é afectado "
-"pela opção <option>--file</option>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:74
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> é usado para cancelar um \"hold\" previamente "
-"definido num pacote para permitir de novo todas as acções."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2700,7 +2931,7 @@ msgstr ""
 "automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:88
+#: apt-mark.8.xml
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2710,17 +2941,8 @@ msgstr ""
 "<literal>showauto</literal>, excepto que irá escrever uma lista dos pacotes "
 "instalados manualmente."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:95
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
-msgstr ""
-"<literal>showhold</literal> é usado para escrever uma lista dos pacotes em "
-"retenção do mesmo modo que os outros comandos show."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:111
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2732,8 +2954,64 @@ msgstr ""
 "localização predefinida, a qual é <filename>extended_status</filename> no "
 "directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent Changes for a Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+msgid ""
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
+msgstr ""
+"<literal>manual</literal> é usado para marcar um pacote como sendo instalado "
+"manualmente, o que irá prevenir que o pacote seja removido automaticamente "
+"se nenhum outro pacote depender dele."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> é usado para cancelar um \"hold\" previamente "
+"definido num pacote para permitir de novo todas as acções."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showhold</literal> é usado para escrever uma lista dos pacotes em "
+"retenção do mesmo modo que os outros comandos show."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Schedule Packages for Install, Remove and Purge"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml
+msgid ""
+"Some front-ends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously scheduled changes to the install state of packages. Such "
+"changes can be scheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-mark.8.xml
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2742,17 +3020,23 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:43
+#: apt-secure.8.xml
 msgid "Archive authentication support for APT"
 msgstr "Suporte de autenticação de arquivos para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:48
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "Starting with version 0.6, <command>apt</command> contains code that does "
+#| "signature checking of the Release file for all archives. This ensures "
+#| "that packages in the archive can't be modified by people who have no "
+#| "access to the Release file signing key."
 msgid ""
-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."
 msgstr ""
 "A partir da versão 0.6, o <command>apt</command> contém código que faz "
 "verificação de assinaturas do ficheiro Release para todos os arquivos. Isto "
@@ -2760,39 +3044,58 @@ msgstr ""
 "não têm acesso à chave de assinatura do ficheiro Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:56
+#: apt-secure.8.xml
+msgid ""
+"If an archive has an unsigned Release file or no Release file at all current "
+"APT versions will raise a warning in <command>update</command> operations "
+"and front-ends like <command>apt-get</command> will require explicit "
+"confirmation if an installation request includes a package from such an "
+"unauthenticated archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
 msgid ""
-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
+"literal>."
 msgstr ""
-"Se um pacote vem dum arquivo sem assinatura ou com uma assinatura para a "
-"qual o apt não tem a chave, esse pacote é considerado 'não sendo de "
-"confiança' e instalá-lo irá resultar num grande aviso. Actualmente o "
-"<command>apt-get</command> irá avisar apenas de arquivos não assinados, "
-"lançamentos futuros poderão vir a forçar que todas as fontes sejam "
-"verificadas antes de descarregar pacotes delas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:65
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package front-ends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"Note: All APT-based package management front-ends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
-"Os frontends de pacotes &apt-get;, &aptitude; e &synaptic; suportam esta "
+"Os front-ends de pacotes &apt-get;, &aptitude; e &synaptic; suportam esta "
 "nova funcionalidade de autenticação."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:70
-msgid "Trusted archives"
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted Repositories"
 msgstr "Arquivos de confiança"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:73
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; trusting an archive does not mean that you trust its packages not "
+#| "to contain malicious code, but means that you trust the archive "
+#| "maintainer. It's the archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
@@ -2807,7 +3110,7 @@ msgstr ""
 "assegurar que a integridade do arquivo está correcta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:81
+#: apt-secure.8.xml
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2820,14 +3123,23 @@ msgstr ""
 "verify e devscripts respectivamente)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:88
-msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The chain of trust in Debian starts when a maintainer uploads a new "
+#| "package or a new version of a package to the Debian archive. In order to "
+#| "become effective, this upload needs to be signed by a key contained in "
+#| "the Debian Maintainers keyring (available in the debian-keyring package). "
+#| "Maintainers' keys are signed by other maintainers following pre-"
+#| "established procedures to ensure the identity of the key holder."
+msgid ""
+"The chain of trust in Debian starts (e.g.) when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainer keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
 msgstr ""
 "A corrente de confiança em Debian começa quando o responsável faz o upload "
 "de um novo pacote ou de uma nova versão de um pacote para o arquivo Debian. "
@@ -2838,7 +3150,7 @@ msgstr ""
 "para assegurar a identidade do dono da chave."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:98
+#: apt-secure.8.xml
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2860,7 +3172,7 @@ msgstr ""
 "package;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:109
+#: apt-secure.8.xml
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2872,7 +3184,7 @@ msgstr ""
 "confiar no APT que faz isto automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:114
+#: apt-secure.8.xml
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2881,7 +3193,7 @@ msgstr ""
 "desenhado para prevenir dois ataques possíveis:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:119
+#: apt-secure.8.xml
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2896,7 +3208,7 @@ msgstr ""
 "um servidor impostor (através de ataques de fraude de ARP ou DNS)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:127
+#: apt-secure.8.xml
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2909,12 +3221,18 @@ msgstr ""
 "descarregam pacotes a partir dessa máquina."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:134
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "However, it does not defend against a compromise of the Debian master "
+#| "server itself (which signs the packages) or against a compromise of the "
+#| "key used to sign the Release files. In any case, this mechanism can "
+#| "complement a per-package signature."
 msgid ""
-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."
 msgstr ""
 "No entanto, isto não defende contra um compromisso do próprio servidor "
 "mestre da Debian (o qual assina os pacotes) ou contra um compromisso da "
@@ -2922,17 +3240,25 @@ msgstr ""
 "mecanismo pode complementar uma assinatura por-pacote."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:140
-msgid "User configuration"
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "User Configuration"
 msgstr "Configuração do utilizador"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:142
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> is the program that manages the list of keys "
+#| "used by apt. It can be used to add or remove keys, although an "
+#| "installation of this release will automatically contain the default "
+#| "Debian archive signing keys used in the Debian package repositories."
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
 msgstr ""
 "<command>apt-key</command> é o programa que gere a lista de chaves usada "
 "pelo apt. Pode ser usado para adicionar ou remover chaves apesar de uma "
@@ -2941,7 +3267,16 @@ msgstr ""
 "pacotes Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:149
+#: apt-secure.8.xml
+msgid ""
+"Note that a default installation already contains all keys to securely "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2958,12 +3293,14 @@ msgstr ""
 "<filename>Release.gpg</filename> dos arquivos que você configurou."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:158
-msgid "Archive configuration"
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid "Archive configuration"
+msgid "Archive Configuration"
 msgstr "Configuração de arquivos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:160
+#: apt-secure.8.xml
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2972,7 +3309,7 @@ msgstr ""
 "manutenção, você tem que:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2983,7 +3320,7 @@ msgstr ""
 "command> (disponibilizado no apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:170
+#: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2994,18 +3331,36 @@ msgstr ""
 "gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:174
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
-"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, so that your users will "
 "know what key they need to import in order to authenticate the files in the "
-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."
 msgstr ""
 "<emphasis>Publicar a impressão digital da chave</emphasis>, deste modo os "
 "seus utilizadores irão saber que chave precisam de importar de modo a "
 "autenticar os ficheiros no arquivo."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securely the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leveraging the web of trust."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:181
+#: apt-secure.8.xml
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3016,7 +3371,7 @@ msgstr ""
 "previamente delineados."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:189
+#: apt-secure.8.xml
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign;, &debsig-verify;, &gpg;"
@@ -3025,12 +3380,20 @@ msgstr ""
 "&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:193
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "For more background information you might want to review the <ulink url="
+#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+#| "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+#| "(available also in the harden-doc package) and the <ulink url=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
-"Security Infrastructure</ulink> chapter of the Securing Debian Manual "
-"(available also in the harden-doc package) and the <ulink url=\"http://www."
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
+"available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""
@@ -3042,12 +3405,12 @@ msgstr ""
 "ulink> de V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:206
+#: apt-secure.8.xml
 msgid "Manpage Authors"
 msgstr "Autores do manual"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:208
+#: apt-secure.8.xml
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -3056,12 +3419,12 @@ msgstr ""
 "Jones, Colin Walters, Florian Weimer e Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:28
+#: apt-cdrom.8.xml
 msgid "APT CD-ROM management utility"
 msgstr "Utilitário de gestão de CD-ROM do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3074,7 +3437,7 @@ msgstr ""
 "e verificar os ficheiros de índice."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:41
+#: apt-cdrom.8.xml
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -3086,7 +3449,7 @@ msgstr ""
 "conta possíveis falhas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:52
+#: apt-cdrom.8.xml
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3101,7 +3464,7 @@ msgstr ""
 "lhe-à pedido um título descritivo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:60
+#: apt-cdrom.8.xml
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3112,7 +3475,7 @@ msgstr ""
 "list</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:68
+#: apt-cdrom.8.xml
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3121,7 +3484,7 @@ msgstr ""
 "assim como o nome de ficheiro armazenado"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:81
+#: apt-cdrom.8.xml
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
@@ -3132,7 +3495,7 @@ msgstr ""
 "cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:89
+#: apt-cdrom.8.xml
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -3144,7 +3507,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:98
+#: apt-cdrom.8.xml
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3156,7 +3519,7 @@ msgstr ""
 "CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3167,7 +3530,7 @@ msgstr ""
 "NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:115
+#: apt-cdrom.8.xml
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3180,7 +3543,7 @@ msgstr ""
 "configuração: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3191,7 +3554,7 @@ msgstr ""
 "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:136
+#: apt-cdrom.8.xml
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3202,12 +3565,12 @@ msgstr ""
 "configuração: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:149
+#: apt-cdrom.8.xml
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:154
+#: apt-cdrom.8.xml
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3216,12 +3579,12 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:29
+#: apt-config.8.xml
 msgid "APT Configuration Query program"
 msgstr "Programa de Consulta de Configuração do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:35
+#: apt-config.8.xml
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3234,7 +3597,7 @@ msgstr ""
 "um modo que é fácil de usar para aplicações em script."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:47
+#: apt-config.8.xml
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -3249,7 +3612,7 @@ msgstr ""
 "script shell deverá ser usado como se segue:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:55
+#: apt-config.8.xml
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3261,7 +3624,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:60
+#: apt-config.8.xml
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3270,7 +3633,7 @@ msgstr ""
 "options com uma predefinição de <option>-f</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:64
+#: apt-config.8.xml
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -3282,12 +3645,12 @@ msgstr ""
 "verificado internamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:73
+#: apt-config.8.xml
 msgid "Just show the contents of the configuration space."
 msgstr "Apenas mostra o conteúdo do espaço de configuração."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:86
+#: apt-config.8.xml
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3296,12 +3659,12 @@ msgstr ""
 "empty para removê-las dos resultados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:91
+#: apt-config.8.xml
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3319,13 +3682,13 @@ msgstr ""
 "pode ser escrito ao usar &percnt;&percnt;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
-#: apt-ftparchive.1.xml:604
+#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
+#: apt-ftparchive.1.xml
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:111
+#: apt-config.8.xml
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3334,27 +3697,27 @@ msgstr ""
 "em erro."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:16
+#: apt.conf.5.xml
 msgid "Initial documentation of Debug::*."
 msgstr "Documentação inicial do Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:17
+#: apt.conf.5.xml
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:34
+#: apt.conf.5.xml
 msgid "Configuration file for APT"
 msgstr "Ficheiro de configuração para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:38
+#: apt.conf.5.xml
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3368,7 +3731,7 @@ msgstr ""
 "para disponibilizar um ambiente uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3377,7 +3740,7 @@ msgstr ""
 "seguinte ordem:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:46
+#: apt.conf.5.xml
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3386,7 +3749,7 @@ msgstr ""
 "(se existir)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:48
+#: apt.conf.5.xml
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3405,7 +3768,7 @@ msgstr ""
 "literal> - que então nesse caso será ignorado em silêncio."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:55
+#: apt.conf.5.xml
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3413,7 +3776,14 @@ msgstr ""
 "main</literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:57
+#: apt.conf.5.xml
+msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3422,12 +3792,12 @@ msgstr ""
 "configuração ou para carregar mais ficheiros de configuração."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml
 msgid "Syntax"
 msgstr "Sintaxe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:62
+#: apt.conf.5.xml
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3442,7 +3812,7 @@ msgstr ""
 "ferramenta Get. A opções não herdam dos seus grupos parentes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3467,7 +3837,7 @@ msgstr ""
 "\"/-:._+\". Um novo scope pode ser aberto com chavetas, assim:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:81
+#: apt.conf.5.xml
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3485,7 +3855,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:89
+#: apt.conf.5.xml
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -3497,13 +3867,13 @@ msgstr ""
 "por um ponto e vírgula (;)."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:94
+#: apt.conf.5.xml
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:97
+#: apt.conf.5.xml
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3512,7 +3882,7 @@ msgstr ""
 "guia de como deve ficar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3522,7 +3892,7 @@ msgstr ""
 "pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3538,7 +3908,7 @@ msgstr ""
 "opção."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3558,7 +3928,7 @@ msgstr ""
 "acabar com um 'ponto e vírgula' (;) .)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3574,7 +3944,7 @@ msgstr ""
 "sobrepostos, apenas limpos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:126
+#: apt.conf.5.xml
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3593,7 +3963,7 @@ msgstr ""
 "ser usada na linha de comandos.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:134
+#: apt.conf.5.xml
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3623,12 +3993,12 @@ msgstr ""
 "explicitamente delas."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:149
+#: apt.conf.5.xml
 msgid "The APT Group"
 msgstr "O Grupo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:150
+#: apt.conf.5.xml
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3637,7 +4007,7 @@ msgstr ""
 "as opções para todas as ferramentas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3648,7 +4018,7 @@ msgstr ""
 "qual o APT foi compilado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3670,7 +4040,7 @@ msgstr ""
 "<command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3683,7 +4053,7 @@ msgstr ""
 "envar> usado pelo &dpkg-buildpackage; sobrepõe a notação da lista."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3696,7 +4066,7 @@ msgstr ""
 "'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3705,7 +4075,7 @@ msgstr ""
 "os pacotes segurados sejam ignorados na sua decisão de marcação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3719,7 +4089,7 @@ msgstr ""
 "directo de os reinstalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:203
+#: apt.conf.5.xml
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3746,7 +4116,7 @@ msgstr ""
 "de A não está mais satisfeita."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3775,7 +4145,7 @@ msgstr ""
 "que pode ajudar a prevenir."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3792,7 +4162,7 @@ msgstr ""
 "eles possa trabalhar em melhorar ou corrigir o processo de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:239
+#: apt.conf.5.xml
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3813,7 +4183,7 @@ msgstr ""
 "command> ou nada de que esses pacotes dependam."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:251
+#: apt.conf.5.xml
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3850,13 +4220,13 @@ msgstr ""
 "da cache é desactivado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Define quais pacotes são considerados dependências essenciais de compilação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:271
+#: apt.conf.5.xml
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3865,7 +4235,7 @@ msgstr ""
 "documentação para mais informação acerca das opções daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:276
+#: apt.conf.5.xml
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3874,7 +4244,7 @@ msgstr ""
 "documentação para mais informação acerca das opções daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:281
+#: apt.conf.5.xml
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3883,12 +4253,12 @@ msgstr ""
 "documentação para mais informação acerca das opções de aqui."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml
 msgid "The Acquire Group"
 msgstr "O Grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:288
+#: apt.conf.5.xml
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3899,7 +4269,17 @@ msgstr ""
 "descarga (veja também &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true, as giving a Release file's "
+#| "validation an expiration date prevents replay attacks over a long "
+#| "timescale, and can also for example help users to identify mirrors that "
+#| "are no longer updated - but the feature depends on the correctness of the "
+#| "clock on the user system. Archive maintainers are encouraged to create "
+#| "Release files with the <literal>Valid-Until</literal> header, but if they "
+#| "don't or a stricter value is desired the <literal>Max-ValidTime</literal> "
+#| "option below can be used."
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3908,7 +4288,9 @@ msgid ""
 "user system. Archive maintainers are encouraged to create Release files with "
 "the <literal>Valid-Until</literal> header, but if they don't or a stricter "
 "value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used.  The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
 msgstr ""
 "Opção relacionada com segurança com predefinição a 'verdadeiro', como dar a "
 "um ficheiros Release uma data de expiração previne ataques repetidos durante "
@@ -3921,7 +4303,16 @@ msgstr ""
 "seguinte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:308
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Maximum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid.  If the Release file itself includes a "
+#| "<literal>Valid-Until</literal> header the earlier date of the two is used "
+#| "as the expiration date.  The default value is <literal>0</literal> which "
+#| "stands for \"valid forever\".  Archive specific settings can be made by "
+#| "appending the label of the archive to the option name."
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3929,7 +4320,9 @@ msgid ""
 "<literal>Valid-Until</literal> header the earlier date of the two is used as "
 "the expiration date.  The default value is <literal>0</literal> which stands "
 "for \"valid forever\".  Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."
 msgstr ""
 "O tempo máximo (em segundos) após a sua criação (como indicado pelo "
 "cabeçalho <literal>Date</literal>) que o ficheiro <filename>Release</"
@@ -3941,7 +4334,16 @@ msgstr ""
 "nome da opção."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Minimum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid.  Use this if you need to use a seldom "
+#| "updated (local) mirror of a more frequently updated archive with a "
+#| "<literal>Valid-Until</literal> header instead of completely disabling the "
+#| "expiration date checking.  Archive specific settings can and should be "
+#| "used by appending the label of the archive to the option name."
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3949,7 +4351,9 @@ msgid ""
 "(local) mirror of a more frequently updated archive with a <literal>Valid-"
 "Until</literal> header instead of completely disabling the expiration date "
 "checking.  Archive specific settings can and should be used by appending the "
-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."
 msgstr ""
 "O tempo mínimo (em segundos) após a sua criação (como indicado no cabeçalho "
 "<literal>Date</literal>) que o ficheiro <filename>Release</filename> deve "
@@ -3961,18 +4365,24 @@ msgstr ""
 "arquivo ao nome da opção."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+#| "<filename>Packages</filename> files) instead of downloading whole ones. "
+#| "True by default."
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
-"by default."
+"by default. Preferably, this can be set for specific &sources-list; entries "
+"or index files by using the <option>PDiffs</option> option there."
 msgstr ""
 "Tenta descarregar deltas chamados <literal>PDiffs</literal> para índices "
 "(como os ficheiros <filename>Packages</filename>) em vez de os descarregar "
 "por inteiro. Verdadeiro por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3990,7 +4400,26 @@ msgstr ""
 "completo em vez das patches."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+#| "<filename>Packages</filename> files) instead of downloading whole ones. "
+#| "True by default."
+msgid ""
+"Try to download indexes via an URI constructed from a hashsum of the "
+"expected file rather than downloaded via a well-known stable filename. True "
+"by default, but automatically disabled if the source indicates no support "
+"for it. Usage can be forced with the special value \"force\". Preferably, "
+"this can be set for specific &sources-list; entries or index files by using "
+"the <option>By-Hash</option> option there."
+msgstr ""
+"Tenta descarregar deltas chamados <literal>PDiffs</literal> para índices "
+"(como os ficheiros <filename>Packages</filename>) em vez de os descarregar "
+"por inteiro. Verdadeiro por predefinição."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4005,7 +4434,7 @@ msgstr ""
 "aberta uma ligação por tipo de URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4014,7 +4443,7 @@ msgstr ""
 "tentar, no número fornecido de vezes, obter ficheiros falhados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:358
+#: apt.conf.5.xml
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -4024,7 +4453,7 @@ msgstr ""
 "A predefinição é verdadeiro."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -4043,7 +4472,7 @@ msgstr ""
 "variável de ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -4063,7 +4492,7 @@ msgstr ""
 "(grandes) ficheiros .deb."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381 apt.conf.5.xml:469
+#: 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."
@@ -4073,7 +4502,7 @@ msgstr ""
 "dados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:384
+#: apt.conf.5.xml
 #, fuzzy
 #| msgid ""
 #| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
@@ -4101,7 +4530,7 @@ msgstr ""
 "web e proxies que escolheram não respeitar a especificação HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4110,7 +4539,7 @@ msgstr ""
 "os redireccionamentos, o que está activo por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4125,7 +4554,7 @@ msgstr ""
 "partir de múltiplos servidores ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -4137,7 +4566,7 @@ msgstr ""
 "identificador conhecido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -4160,7 +4589,7 @@ msgstr ""
 "<literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4177,7 +4606,7 @@ msgstr ""
 "literal> ainda não é suportada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4216,7 +4645,7 @@ msgstr ""
 "host&gt;::SslForceVersion</literal> é a opção 'por máquina' correspondente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: 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]/</"
@@ -4250,7 +4679,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: 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, "
@@ -4266,7 +4695,7 @@ msgstr ""
 "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:479
+#: 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 "
@@ -4280,7 +4709,7 @@ msgstr ""
 "eficiência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: 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 "
@@ -4295,13 +4724,13 @@ msgstr ""
 "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:498
+#: apt.conf.5.xml
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4322,7 +4751,7 @@ msgstr ""
 "barra final. Comandos para desmontar podem ser especificados usando o UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4331,13 +4760,13 @@ msgstr ""
 "literal>, a qual passa parâmetros adicionais ao gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4356,19 +4785,19 @@ msgstr ""
 "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:525
+#: apt.conf.5.xml
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4400,13 +4829,13 @@ msgstr ""
 "automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:527
+#: apt.conf.5.xml
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4432,7 +4861,7 @@ msgstr ""
 "prefixar a lista com este tipo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4444,7 +4873,7 @@ msgstr ""
 "maioritariamente apenas para mirrors locais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4457,7 +4886,7 @@ msgstr ""
 "CPU quando constrói as caches de pacotes locais. Falso por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4477,13 +4906,13 @@ msgstr ""
 "especialmenteraros."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4522,7 +4951,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4536,24 +4965,32 @@ msgstr ""
 "literal>\" implícito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr "Ao descarregar, força o uso exclusivo do protocolo IPv4."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Ao descarregar, força o uso exclusivo do protocolo IPv6."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml
 msgid ""
 "The maximum file size of Release/Release.gpg/InRelease files.  The default "
 "is 10MB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to.  The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
 msgid ""
 "Allow the update operation to load data files from a repository without a "
 "trusted signature. If enabled this option no data files will be loaded and "
@@ -4562,7 +4999,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml
 msgid ""
 "Allow that a repository that was previously gpg signed to become unsigned "
 "durign a update operation. When there is no valid signature of a perviously "
@@ -4572,13 +5009,81 @@ msgid ""
 "source untrusted and warn about them if you try to install them."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them.  Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a text file, expect that package specific data is replaced "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
+"1. if the package is from a component (e.g. <literal>main</literal>)  this "
+"is the first part otherwise it is omitted, 2. the first letter of source "
+"package name, expect if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version.  "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>').  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Configuração do utilizador"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml
 msgid "Directories"
 msgstr "Directórios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4597,7 +5102,7 @@ msgstr ""
 "items que não começam com <filename>/</filename> ou <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4620,7 +5125,7 @@ msgstr ""
 "literal> o directório predefinido é contido em <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4635,7 +5140,7 @@ msgstr ""
 "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4646,7 +5151,7 @@ msgstr ""
 "estar feito então é carregado o ficheiro de configuração principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4664,16 +5169,26 @@ msgstr ""
 "respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "The configuration item <literal>RootDir</literal> has a special meaning.  "
+#| "If set, all paths in <literal>Dir::</literal> will be relative to "
+#| "<literal>RootDir</literal>, <emphasis>even paths that are specified "
+#| "absolutely</emphasis>.  So, for instance, if <literal>RootDir</literal> "
+#| "is set to <filename>/tmp/staging</filename> and <literal>Dir::State::"
+#| "status</literal> is set to <filename>/var/lib/dpkg/status</filename>, "
+#| "then the status file will be looked up in <filename>/tmp/staging/var/lib/"
+#| "dpkg/status</filename>."
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>.  So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>.  So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>.  If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."
 msgstr ""
 "O item de configuração <literal>RootDir</literal> tem um significado "
 "especial. Se definido, todos os caminhos em <literal>Dir::</literal> serão "
@@ -4685,7 +5200,7 @@ msgstr ""
 "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4703,12 +5218,12 @@ msgstr ""
 "expressão regular."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml
 msgid "APT in DSelect"
 msgstr "APT em DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4719,7 +5234,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4741,7 +5256,7 @@ msgstr ""
 "pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4750,7 +5265,7 @@ msgstr ""
 "comandos quando é corrido para a fase de instalação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4759,7 +5274,7 @@ msgstr ""
 "comandos quando é executado para a fase de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4768,12 +5283,12 @@ msgstr ""
 "continuar. A predefinição é avisar apenas em caso de erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml
 msgid "How APT calls &dpkg;"
 msgstr "Como o APT chama o &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4782,7 +5297,7 @@ msgstr ""
 "&dpkg;. Estas estão na secção <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4793,7 +5308,7 @@ msgstr ""
 "um argumento único ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4806,7 +5321,7 @@ msgstr ""
 "bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4824,20 +5339,51 @@ msgstr ""
 "predefinição a entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml
+msgid ""
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Each configuration directive line has the form <literal>key=value</"
+"literal>.  Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
 msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
+"\" is an incorrect typename which is just kept to remain compatible, it "
+"should be read as \"no\" and users are encouraged to support both."
 msgstr ""
-"A versão 2 deste protocolo despeja mais informação, incluindo a versão de "
-"protocolo, o espaço de configuração do APT e os pacotes, ficheiros e versões "
-"que foram alteradas. A versão 3 adiciona a arquitectura e a bandeira "
-"<literal>MultiArch</literal> a cada versão a ser despejada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4853,7 +5399,7 @@ msgstr ""
 "irá então enviar a informação na versão mais alta que suporta."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4871,7 +5417,7 @@ msgstr ""
 "descritor de ficheiro usado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4880,7 +5426,7 @@ msgstr ""
 "predefinição é <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4889,12 +5435,12 @@ msgstr ""
 "predefinição é desactivar a assinatura e produzir todos os binários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml
 msgid "dpkg trigger usage (and related options)"
 msgstr "Utilização trigger do dpkg (e opções relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:779
+#: apt.conf.5.xml
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4920,7 +5466,7 @@ msgstr ""
 "100% enquanto na realidade está a configurar todos os pacotes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4934,7 +5480,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4958,7 +5504,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4980,7 +5526,7 @@ msgstr ""
 "chamadas unpack e remove."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5010,7 +5556,7 @@ msgstr ""
 "arrancar."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5028,7 +5574,7 @@ msgstr ""
 "esta opção em todas excepto na última execução."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5044,7 +5590,7 @@ msgstr ""
 "configurar este pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5062,7 +5608,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5086,12 +5632,12 @@ msgstr ""
 "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml
 msgid "Periodic and Archives options"
 msgstr "Opções Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5104,12 +5650,12 @@ msgstr ""
 "Veja o cabeçalho deste script para uma breve documentação das suas opções."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml
 msgid "Debug options"
 msgstr "Opções de depuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5126,7 +5672,7 @@ msgstr ""
 "interesse para o utilizador normal, mas algumas podem ter:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5137,7 +5683,7 @@ msgstr ""
 "remove, purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5148,7 +5694,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como um utilizador não root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5160,7 +5706,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:904
+#: apt.conf.5.xml
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5169,12 +5715,12 @@ msgstr ""
 "IDs de CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:914
+#: apt.conf.5.xml
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue-se uma lista completa de opções de depuração para o apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:923
+#: apt.conf.5.xml
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5182,25 +5728,25 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: 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:945
+#: 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."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:967
+#: apt.conf.5.xml
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5209,7 +5755,7 @@ msgstr ""
 "criptográficas usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:978
+#: apt.conf.5.xml
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5218,13 +5764,13 @@ msgstr ""
 "armazenados em CD-ROMs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:988
+#: apt.conf.5.xml
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descreve os processos de resolver dependências de compilação no &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5233,7 +5779,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1008
+#: apt.conf.5.xml
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5244,7 +5790,7 @@ msgstr ""
 "para um CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5254,14 +5800,14 @@ msgstr ""
 "literal></quote> ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1031
+#: apt.conf.5.xml
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Regista no log quando os items são adicionados ou removidos da fila de "
 "download global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5270,7 +5816,7 @@ msgstr ""
 "checksums e assinaturas criptográficas dos ficheiros descarregados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5280,7 +5826,7 @@ msgstr ""
 "pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1063
+#: apt.conf.5.xml
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5289,7 +5835,7 @@ msgstr ""
 "do apt quando se descarrega diffs de índice em vez de índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1074
+#: apt.conf.5.xml
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5297,7 +5843,7 @@ msgstr ""
 "downloads."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1085
+#: apt.conf.5.xml
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5306,7 +5852,7 @@ msgstr ""
 "de pacotes e com a remoção de pacotes não utilizados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5321,7 +5867,7 @@ msgstr ""
 "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5352,7 +5898,7 @@ msgstr ""
 "pacote aparece."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1130
+#: apt.conf.5.xml
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5362,7 +5908,7 @@ msgstr ""
 "único."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1141
+#: apt.conf.5.xml
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5371,7 +5917,7 @@ msgstr ""
 "estado e quaisquer erros encontrados enquanto os analisa."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1152
+#: apt.conf.5.xml
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5380,7 +5926,7 @@ msgstr ""
 "literal> deve passar os pacotes ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1164
+#: apt.conf.5.xml
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5388,12 +5934,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml
 msgid "Output the priority of each package list on startup."
 msgstr "Escreve a prioridade da cada lista de pacote no arranque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1185
+#: apt.conf.5.xml
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5402,7 +5948,7 @@ msgstr ""
 "acontece quando é encontrado um problema de dependências complexo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1196
+#: apt.conf.5.xml
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5413,7 +5959,7 @@ msgstr ""
 "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1208
+#: apt.conf.5.xml
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5422,7 +5968,7 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5433,13 +5979,12 @@ msgstr ""
 "literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
-#: apt-ftparchive.1.xml:592
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5449,17 +5994,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:28
+#: apt_preferences.5.xml
 msgid "Preference control file for APT"
 msgstr "Ficheiro de controle de preferências para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:33
+#: apt_preferences.5.xml
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5472,7 +6017,7 @@ msgstr ""
 "ser seleccionadas para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:38
+#: apt_preferences.5.xml
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5494,7 +6039,7 @@ msgstr ""
 "para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:48
+#: apt_preferences.5.xml
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -5509,7 +6054,7 @@ msgstr ""
 "escolha da instância, apenas a escolha da versão."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:55
+#: apt_preferences.5.xml
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -5533,7 +6078,7 @@ msgstr ""
 "foi avisado."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:66
+#: apt_preferences.5.xml
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5555,24 +6100,24 @@ msgstr ""
 "em silêncio."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:75
+#: apt_preferences.5.xml
 msgid "APT's Default Priority Assignments"
 msgstr "Atribuições de Prioridade Predefinidas do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:90
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:77
+#: apt_preferences.5.xml
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -5600,7 +6145,7 @@ msgstr ""
 "\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:97
+#: apt_preferences.5.xml
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
@@ -5609,12 +6154,12 @@ msgstr ""
 "algoritmo para definir as prioridades das versões de um pacote. Atribuir:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:102
+#: apt_preferences.5.xml
 msgid "priority 1"
 msgstr "priority 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5627,12 +6172,12 @@ msgstr ""
 "<literal>experimental</literal> da Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml
 msgid "priority 100"
 msgstr "priority 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5645,33 +6190,42 @@ msgstr ""
 "backports da Debian desde <literal>squeeze-backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml
 msgid "priority 500"
 msgstr "priority 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:118
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
+#: apt_preferences.5.xml
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that do not belong to the target release."
 msgstr ""
-"para as versões que não estão instaladas e não pertencem ao lançamento "
-"destinado."
+"para as versões que não estão instaladas e pertencem ao lançamento destinado."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml
 msgid "priority 990"
 msgstr "priority 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:123
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#: apt_preferences.5.xml
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
 msgstr ""
 "para as versões que não estão instaladas e pertencem ao lançamento destinado."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -5689,7 +6243,7 @@ msgstr ""
 "yes\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5698,7 +6252,7 @@ msgstr ""
 "para determinar qual versão de um pacote deve instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5714,12 +6268,12 @@ msgstr ""
 "arriscado.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml
 msgid "Install the highest priority version."
 msgstr "Instala a versão de prioridade mais alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5728,7 +6282,7 @@ msgstr ""
 "(isto é, aquela com o número de versão mais alto)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5739,7 +6293,7 @@ msgstr ""
 "reinstall</literal> é fornecida, instala a que foi desinstalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5754,7 +6308,7 @@ msgstr ""
 "replaceable></command> ou <command>apt-get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5768,7 +6322,7 @@ msgstr ""
 "get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5787,12 +6341,12 @@ msgstr ""
 "prioridade mais alta que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml
 msgid "The Effect of APT Preferences"
 msgstr "O Efeito das Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5805,7 +6359,7 @@ msgstr ""
 "um ou dois formatos, um formato específico e um formato geral."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5822,7 +6376,7 @@ msgstr ""
 "por espaços."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5834,7 +6388,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -5849,7 +6403,7 @@ msgstr ""
 "nome de domínio totalmente qualificado do site."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -5861,7 +6415,7 @@ msgstr ""
 "local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5873,7 +6427,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -5886,7 +6440,7 @@ msgstr ""
 "servidor identificadas pelo nome de máquina \"ftp.de.debian.org\""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5898,7 +6452,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5913,7 +6467,7 @@ msgstr ""
 "como \"Debian\" ou \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5924,7 +6478,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5936,7 +6490,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5947,7 +6501,7 @@ msgstr ""
 "\"<literal>&testing-codename;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5959,7 +6513,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5971,7 +6525,7 @@ msgstr ""
 "version;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5982,13 +6536,22 @@ msgstr ""
 "Pin: release a=stable, v=&stable-version;\n"
 "Pin-Priority: 500\n"
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml
 msgid "Regular expressions and &glob; syntax"
 msgstr "Expressões regulares e sintaxe &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -6003,19 +6566,19 @@ msgstr ""
 "regular extensa do POSIX rodeada de barras)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6026,7 +6589,7 @@ msgstr ""
 "a todos os pacotes de um lançamento que começa com &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6038,7 +6601,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6056,12 +6619,12 @@ msgstr ""
 "considerado uma expressão &glob; em si próprio."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta as Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6071,12 +6634,12 @@ msgstr ""
 "(falando grosso):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6085,12 +6648,12 @@ msgstr ""
 "na versão do pacote (downgrade)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6099,12 +6662,12 @@ msgstr ""
 "destino, a menos que a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -6114,12 +6677,12 @@ msgstr ""
 "mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -6129,12 +6692,12 @@ msgstr ""
 "recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -6143,22 +6706,40 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml
 msgid "prevents the version from being installed"
 msgstr "previne a instalação da versão"
 
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
-msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version.  Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+#: apt_preferences.5.xml
+#, fuzzy
+#| msgid ""
+#| "If any specific-form records match an available package version then the "
+#| "first such record determines the priority of the package version.  "
+#| "Failing that, if any general-form records match an available package "
+#| "version then the first such record determines the priority of the package "
+#| "version."
+msgid ""
+"The first specific-form record matching an available package version "
+"determines the priority of the package version.  Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version.  Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
 msgstr ""
 "Se quaisquer registos de formato específico corresponder a uma versão de "
 "pacote disponível então o primeiro tal registo determina a prioridade da "
@@ -6167,7 +6748,7 @@ msgstr ""
 "determina a prioridade da versão de pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6176,7 +6757,7 @@ msgstr ""
 "registos apresentados atrás:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6204,12 +6785,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml
 msgid "Then:"
 msgstr "Então:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -6224,7 +6805,7 @@ msgstr ""
 "perl;*, então será feito um downgrade ao <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6235,7 +6816,7 @@ msgstr ""
 "versões, mesmo versões que pertencem ao lançamento de destino."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6248,12 +6829,12 @@ msgstr ""
 "instalação e se nenhuma versão do pacote já estiver instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6264,7 +6845,7 @@ msgstr ""
 "descrever os pacotes disponíveis nessa localização."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6284,27 +6865,27 @@ msgstr ""
 "definir prioridades do APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml
 msgid "the <literal>Package:</literal> line"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml
 msgid "gives the package name"
 msgstr "fornece o nome do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml
 msgid "the <literal>Version:</literal> line"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml
 msgid "gives the version number for the named package"
 msgstr "fornece o número de versão do pacote nomeado"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6326,12 +6907,12 @@ msgstr ""
 "APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6348,18 +6929,18 @@ msgstr ""
 "requerer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml
 msgid "the <literal>Codename:</literal> line"
 msgstr "a linha <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6376,13 +6957,13 @@ msgstr ""
 "preferências do APT requer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6399,7 +6980,7 @@ msgstr ""
 "seguintes linhas:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6411,12 +6992,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml
 msgid "the <literal>Component:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6434,18 +7015,18 @@ msgstr ""
 "a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml
 msgid "the <literal>Origin:</literal> line"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6458,18 +7039,18 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml
 msgid "the <literal>Label:</literal> line"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6482,13 +7063,13 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6513,12 +7094,12 @@ msgstr ""
 "literal> da distribuição <literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Linhas Opcionais num Registo de Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6529,12 +7110,12 @@ msgstr ""
 "literal>. Isto disponibiliza um espaço para comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml
 msgid "Tracking Stable"
 msgstr "Acompanhando Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6558,7 +7139,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6574,8 +7155,7 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
-#: apt_preferences.5.xml:672
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6587,7 +7167,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6600,13 +7180,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6619,12 +7199,12 @@ msgstr ""
 "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6652,7 +7232,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6669,7 +7249,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6682,13 +7262,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6707,12 +7287,12 @@ msgstr ""
 "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml
 msgid "Tracking the evolution of a codename release"
 msgstr "Acompanhando a evolução de um nome de código de lançamento"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6746,7 +7326,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6772,7 +7352,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6785,13 +7365,13 @@ msgstr ""
 "codename;</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6810,24 +7390,35 @@ msgstr ""
 "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:29
+#: sources.list.5.xml
 msgid "List of configured APT data sources"
 msgstr "Lista das fontes de dados APT configuradas"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:34
-msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The source list <filename>/etc/apt/sources.list</filename> is designed to "
+#| "support any number of active sources and a variety of source media. The "
+#| "file lists one source per line, with the most preferred source listed "
+#| "first. The information available from the configured sources is acquired "
+#| "by <command>apt-get update</command> (or by an equivalent command from "
+#| "another APT front-end)."
+msgid ""
+"The source list <filename>/etc/apt/sources.list</filename> and the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one-line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
 msgstr ""
 "A lista de fontes <filename>/etc/apt/sources.list</filename> está desenhada "
 "a suportar qualquer número de fontes activas e uma variedade de meios de "
@@ -6836,37 +7427,35 @@ msgstr ""
 "configuradas é obtida pelo <command>apt-get update</command> (ou por um "
 "comando equivalente de outra interface \"front-end\" do APT)."
 
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
-msgid ""
-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
-"literal>)  followed by options and arguments for this type.  Individual "
-"entries cannot be continued onto a following line. Empty lines are ignored, "
-"and a <literal>#</literal> character anywhere on a line marks the remainder "
-"of that line as a comment."
-msgstr ""
-"Cada linha que especifica uma fonte começa com o tipo (ex. <literal>deb-src</"
-"literal>) seguido das opções e argumentos para esse tipo. As entradas "
-"individuais não podem ser continuadas para a linha seguinte. As linhas "
-"vazias são ignoradas, e um caracter <literal>#</literal> em qualquer ponto "
-"numa linha marca o restante dessa linha como um comentário."
-
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files.  The format is the same as "
+#| "for the regular <filename>sources.list</filename> file.  File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters.  Otherwise APT will print a notice that it has ignored a "
+#| "file, unless that file matches a pattern in the <literal>Dir::Ignore-"
+#| "Files-Silently</literal> configuration list - in which case it will be "
+#| "silently ignored."
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files.  The format is the same as for "
-"the regular <filename>sources.list</filename> file.  File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"add sources.list entries in separate files.  Two different file formats are "
+"allowed as described in the next two sections.  Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format.  The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters.  Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."
 msgstr ""
 "O directório <filename>/etc/apt/sources.list.d</filename> disponibiliza um "
 "modo de adicionar entradas na sources.list em ficheiros separados. O formato "
@@ -6879,16 +7468,106 @@ msgstr ""
 "neste caso serão ignorados em silêncio."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml
+msgid "One-Line-Style Format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"Files in this format have the extension <filename>.list</filename>.  Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line.  If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>)  included in the line after the type separated from "
+"it with a space.  If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by an equals sign (<literal>=</literal>). "
+"Multivalue options also have <literal>-=</literal> and <literal>+=</literal> "
+"as separators, which instead of replacing the default with the given "
+"value(s) modify the default value(s) to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This is the traditional format and supported by all apt versions.  Note that "
+"not all options as described below are supported by all apt versions.  Note "
+"also that some older applications parsing this format on their own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml
+msgid "deb822-Style Format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>.  The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, such as the metadata files that apt will download from the "
+"configured sources or the <filename>debian/control</filename> file in a "
+"Debian source package.  Individual entries are separated by an empty line; "
+"additional empty lines are ignored, and a <literal>#</literal> character at "
+"the start of the line marks the entire line as a comment. An entry can hence "
+"be disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it.  Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s).  Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one-line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier.  It "
+"is intended to make this format gradually the default format, deprecating "
+"the previously described one-line-style format, as it is easier to create, "
+"extend and modify for humans and machines alike especially if a lot of "
+"sources and/or options are involved.  Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but may encounter problems with software not "
+"supporting the format yet."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src Types: General Format"
 msgstr "Os tipos deb e deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type references a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. The "
+#| "<literal>distribution</literal> is generally an archive name like "
+#| "<literal>stable</literal> or <literal>testing</literal> or a codename "
+#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</"
+#| "literal> while component is one of <literal>main</literal>, "
+#| "<literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "<literal>deb-src</literal> type references a Debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
 "literal> while component is one of <literal>main</literal>, "
@@ -6909,79 +7588,72 @@ msgstr ""
 "linha <literal>deb-src</literal> para obter índices das fontes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types is:"
 msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one-line-style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
 msgstr ""
 "O formato para uma entrada na <filename>sources.list</filename> usando os "
 "tipos <literal>deb</literal> e <literal>deb-src</literal> é:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
+#: sources.list.5.xml
 #, no-wrap
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ opções ] uri suite [componente1] [componente2] [...]"
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
-"     URIs: http://example.com\n"
-"     Suites: stable testing\n"
-"     Sections: component1 component2\n"
-"     Description: short\n"
-"      long long long\n"
-"     [option1]: [option1-value]\n"
-"\n"
-"     Types: deb\n"
-"     URIs: http://another.example.com\n"
-"     Suites: experimental\n"
-"     Sections: component1 component2\n"
-"     Enabled: no\n"
-"     Description: short\n"
-"      long long long\n"
-"     [option1]: [option1-value]\n"
+"     URIs: uri\n"
+"     Suites: suite\n"
+"     Components: [component1] [component2] [...]\n"
+"     option1: value1\n"
+"     option2: value2\n"
 "   "
 msgstr ""
-"     Tipos: deb deb-src\n"
-"     URIs: http://exemplo.com\n"
-"     Suites: stable testing\n"
-"     Secções: component1 component2\n"
-"     Descrição: curta\n"
-"      longa longa longa\n"
-"     [opção1]: [opção1-valor]\n"
-"\n"
-"     Tipos: deb\n"
-"     URIs: http://outro.exemlo.com\n"
-"     Suites: experimental\n"
-"     Secções: component1 component2\n"
-"     Activo: não\n"
-"     Descrição: curta\n"
-"      longa longa longa\n"
-"     [opção1]: [opção1-valor]\n"
-"   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "Alternatively a rfc822 style format is also supported: <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
 msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 "Em alternativa, é também suportado um formato estilo rfc822: <placeholder "
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml
+#, 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>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>suite</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>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>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest.  "
+"If <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 "
@@ -6994,13 +7666,22 @@ msgstr ""
 "menos um <literal>component</literal> tem de estar presente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml
+#, fuzzy
+#| 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."
 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, "
+"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 ""
@@ -7013,19 +7694,32 @@ msgstr ""
 "automaticamente um URI com a arquitectura actual."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
-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 "
+#: sources.list.5.xml
+#, fuzzy
+#| 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."
+msgid ""
+"Especially in the one-line-style 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."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
 msgstr ""
 "No estilo tradicional, o formato do sources.list, como apenas pode ser "
 "especificada por linha uma distribuição, pode ser necessário ter várias "
@@ -7041,30 +7735,96 @@ msgstr ""
 "banda baixa."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
-msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>.  Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
-msgstr ""
-"<literal>options</literal> é sempre opcional e precisa de ser rodeado por "
-"parênteses rectos. Pode consistir um múltiplas definições no formato "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>. As múltiplas definições são separadas por espaços. "
-"As seguinte definições são suportadas pelo APT (no entanto note que as "
-"definições não suportadas serão ignoradas em silêncio):"
+#: sources.list.5.xml
+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 "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+"É importante listar as fontes por ordem de preferência, com a fonte mais "
+"preferida listada em primeiro lugar. Tipicamente isto irá resultar numa "
+"ordenação por velocidades desde o mais rápido até ao mais lento (CD-ROM "
+"seguido por máquinas numa rede local, seguido por máquinas distantes na "
+"Internet, por exemplo)."
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"As an example, the sources for your distribution could look like this in one-"
+"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: Options"
+msgstr "Os tipos deb e deb-src"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"Each source entry can have options specified to modify which source is "
+"accessed and how data is acquired from it. Format, syntax and names of the "
+"options vary between the one-line-style and deb822-style formats as "
+"described, but they both have the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one-line name in brackets.  "
+"Remember that besides setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#| "replaceable>,…</literal> can be used to specify for which architectures "
+#| "information should be downloaded. If this option is not set all "
+#| "architectures defined by the <literal>APT::Architectures</literal> option "
+#| "will be downloaded."
 msgid ""
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
+msgstr ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
+"replaceable>,…</literal> pode ser usado para especificar para quais "
+"arquitecturas deve ser descarregada a informação. Se esta opção não estiver "
+"definida, serão descarregadas todas as arquitecturas definidas pela opção "
+"<literal>APT::Architectures</literal>."
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#| "replaceable>,…</literal> can be used to specify for which architectures "
+#| "information should be downloaded. If this option is not set all "
+#| "architectures defined by the <literal>APT::Architectures</literal> option "
+#| "will be downloaded."
+msgid ""
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information such as translated package "
+"descriptions should be downloaded.  If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
 msgstr ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> pode ser usado para especificar para quais "
@@ -7073,78 +7833,133 @@ msgstr ""
 "<literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml
+msgid ""
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope.  Additionally, specific targets "
+"can be enabled or disabled by using the identifier as field name instead of "
+"using this multivalue option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
 msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"<option>PDiffs</option> (<option>pdiffs</option>)  is a yes/no value which "
+"controls if APT should try to use PDiffs to update old indexes instead of "
+"downloading the new indexes entirely. The value of this option is ignored if "
+"the repository doesn't announce the availability of PDiffs.  Defaults to the "
+"value of the option with the same name for a specific index file defined in "
+"the <option>Acquire::IndexTargets</option> scope, which itself defaults to "
+"the value of configuration option <option>Acquire::PDiffs</option> which "
+"defaults to <literal>yes</literal>."
 msgstr ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> e <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> que podem ser usadas para "
-"adicionar/remover arquitecturas do conjunto que será descarregado."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
-msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
-msgstr ""
-"<literal>trusted=yes</literal> pode ser definido para indicar que os pacotes "
-"desta fonte são sempre autênticos mesmo que o ficheiro <filename>Release</"
-"filename> não esteja assinado ou a assinatura não possa ser verificada. Isto "
-"desactiva partes do &apt-secure; e deve por isso ser usado apenas num "
-"contexto local e de confiança. <literal>trusted=no</literal> é o oposto que "
-"lida com fontes mesmo actualmente autenticadas como não sendo autênticas."
+#: sources.list.5.xml
+msgid ""
+"<option>By-Hash</option> (<option>by-hash</option>)  can have the value "
+"<literal>yes</literal>, <literal>no</literal> or <literal>force</literal> "
+"and controls if APT should try to acquire indexes via a URI constructed from "
+"a hashsum of the expected file instead of using the well-known stable "
+"filename of the index. Using this can avoid hashsum mismatches, but requires "
+"a supporting mirror. A <literal>yes</literal> or <literal>no</literal> value "
+"activates/disables the use of this feature if this source indicates support "
+"for it, while <literal>force</literal> will enable the feature regardless of "
+"what the source indicates. Defaults to the value of the option of the same "
+"name for a specific index file defined in the <option>Acquire::IndexTargets</"
+"option> scope, which itself defaults to the value of configuration option "
+"<option>Acquire::By-Hash</option> which defaults to <literal>yes</literal>."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml
 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 "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"Furthermore, there are options which if set affect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
 msgstr ""
-"É importante listar as fontes por ordem de preferência, com a fonte mais "
-"preferida listada em primeiro lugar. Tipicamente isto irá resultar numa "
-"ordenação por velocidades desde o mais rápido até ao mais lento (CD-ROM "
-"seguido por máquinas numa rede local, seguido por máquinas distantes na "
-"Internet, por exemplo)."
 
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-msgid "Some examples:"
-msgstr "Alguns exemplos:"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override that decision. The value "
+"<literal>yes</literal> tells APT always to consider this source as trusted, "
+"even if it doesn't pass authentication checks. It disables parts of &apt-"
+"secure;, and should therefore only be used in a local and trusted context "
+"(if at all) as otherwise security is breached. The value <literal>no</"
+"literal> does the opposite, causing the source to be handled as untrusted "
+"even if the authentication checks passed successfully. The default value "
+"can't be set explicitly."
+msgstr ""
 
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
 msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-"   "
+"<option>Signed-By</option> (<option>signed-by</option>)  is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key either in the <filename>trusted.gpg</"
+"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set, only the key(s) in this keyring or only the key with this "
+"fingerprint is used for the &apt-secure; verification of this repository. "
+"Otherwise all keys in the trusted keyrings are considered valid signers for "
+"this repository."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>)  is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare a time until which the data provided in the "
+"repository should be considered valid, and if this time is reached, but no "
+"new data is provided, the data is considered expired and an error is "
+"raised.  Besides increasing security, as a malicious attacker can't send old "
+"data forever to prevent a user from upgrading to a new version, this also "
+"helps users identify mirrors which are no longer updated. However, some "
+"repositories such as historic archives are not updated any more by design, "
+"so this check can be disabled by setting this option to <literal>no</"
+"literal>.  Defaults to the value of configuration option <option>Acquire::"
+"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Valid-Until-Min</option> (<option>valid-until-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldom updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely.  Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."
 msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-"   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
-msgid "URI specification"
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "URI specification"
+msgid "URI Specification"
 msgstr "Especificação da URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml
 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:169
+#: sources.list.5.xml
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7155,7 +7970,7 @@ msgstr ""
 "arquivos locais."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7165,7 +7980,7 @@ msgstr ""
 "fontes."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7182,7 +7997,7 @@ msgstr ""
 "método de autenticação seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7203,7 +8018,7 @@ msgstr ""
 "configuração serão ignorados."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: 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.  "
@@ -7216,7 +8031,7 @@ msgstr ""
 "ficheiros com o APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: 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 "
@@ -7230,12 +8045,12 @@ msgstr ""
 "ficheiros a partir da máquina remota."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml
 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:222
+#: sources.list.5.xml
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7254,45 +8069,87 @@ msgstr ""
 "exemplo o debtorrent - veja &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian "
+#| "for stable/main, stable/contrib, and stable/non-free."
 msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 "Usa o arquivo armazenado localmente (ou montagem NFS) em /home/jason/debian "
 "para stable/main, stable/contrib, e stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
-#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr "deb file:/home/jason/debian stable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: 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:238
+#: sources.list.5.xml
 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:239
-#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: 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:241
-msgid "Source line for the above"
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "Source line for the above"
+msgid "Sources specification for the above."
 msgstr "Linha de fonte para o referido acima"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
-#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: 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:244
+#: sources.list.5.xml
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7303,17 +8160,41 @@ msgstr ""
 "<literal>amd64</literal> e <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
-#, no-wrap
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 msgid ""
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+msgstr ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
 msgstr ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7322,13 +8203,24 @@ msgstr ""
 "hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml
 #, 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><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb http://archive.debian.org/debian-archive hamm main"
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr "deb http://archive.debian.org/debian-archive hamm main"
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7337,13 +8229,24 @@ msgstr ""
 "usa apenas a área &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml
 #, 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><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml
 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 "
@@ -7356,19 +8259,49 @@ msgstr ""
 "uma única sessão FTP para ambas linhas de recurso."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml
 #, 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><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml
 #, 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><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml
+#, fuzzy
+#| 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</filename> on i386 machines, <filename>unstable/binary-amd64</"
+#| "filename> on amd64, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; "
+#| "official debian archives are not structured like this] <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
 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</"
@@ -7376,7 +8309,7 @@ msgid ""
 "amd64, and so forth for other supported architectures. [Note this example "
 "only illustrates how to use the substitution variable; official debian "
 "archives are not structured like this] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
 msgstr ""
 "Usa HTTP para aceder ao arquivo em ftp.tlh.debian.org, sob o directório "
 "universe, e usa apenas os ficheiros encontrados sob <filename>unstable/"
@@ -7387,17 +8320,48 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;, &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
+#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:29
+#: apt-extracttemplates.1.xml
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7406,7 +8370,7 @@ msgstr ""
 "partir de pacotes Debian"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7421,12 +8385,12 @@ msgstr ""
 "gerada uma linha no formato:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:40
+#: apt-extracttemplates.1.xml
 msgid "package version template-file config-script"
 msgstr "pacote versão ficheiro-modelo script-de-configuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7441,7 +8405,7 @@ msgstr ""
 "<filename>pacote.configuração.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:54
+#: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7452,7 +8416,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:71
+#: apt-extracttemplates.1.xml
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7461,12 +8425,12 @@ msgstr ""
 "decimal em erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:29
+#: apt-sortpkgs.1.xml
 msgid "Utility to sort package index files"
 msgstr "Utilitário para organizar ficheiros índice de pacotes"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -7479,7 +8443,7 @@ msgstr ""
 "registo de acordo com as regras de organização internas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7487,7 +8451,7 @@ msgstr ""
 "ficheiro pesquisável."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:50
+#: apt-sortpkgs.1.xml
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7496,7 +8460,7 @@ msgstr ""
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:64
+#: apt-sortpkgs.1.xml
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7505,12 +8469,12 @@ msgstr ""
 "em erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:29
+#: apt-ftparchive.1.xml
 msgid "Utility to generate index files"
 msgstr "Utilitário para gerar ficheiros de índice"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -7523,7 +8487,7 @@ msgstr ""
 "baseados no conteúdo desse site."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:39
+#: apt-ftparchive.1.xml
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7538,7 +8502,7 @@ msgstr ""
 "script o processo de geração para um arquivo completo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -7553,7 +8517,7 @@ msgstr ""
 "ficheiros e constrói os ficheiros comprimidos desejados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7566,7 +8530,7 @@ msgstr ""
 "Este comando é aproximadamente equivalente ao &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7574,7 +8538,7 @@ msgstr ""
 "dados de cache binária."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7587,7 +8551,7 @@ msgstr ""
 "Este comando é aproximadamente equivalente ao &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:71
+#: apt-ftparchive.1.xml
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -7599,7 +8563,7 @@ msgstr ""
 "fonte que irá ser usado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:78
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7617,7 +8581,20 @@ msgstr ""
 "por uma vírgula na saída."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:90
+#: apt-ftparchive.1.xml
+#, fuzzy
+#| msgid ""
+#| "The <literal>release</literal> command generates a Release file from a "
+#| "directory tree. It recursively searches the given directory for "
+#| "uncompressed <filename>Packages</filename> and <filename>Sources</"
+#| "filename> files and ones compressed with <command>gzip</command>, "
+#| "<command>bzip2</command> or <command>lzma</command> as well as "
+#| "<filename>Release</filename> and <filename>md5sum.txt</filename> files by "
+#| "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>). "
+#| "Additional filename patterns can be added by listing them in "
+#| "<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+#| "stdout a <filename>Release</filename> file containing an MD5, SHA1 and "
+#| "SHA256 digest for each file."
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7628,7 +8605,7 @@ msgid ""
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
 "literal>.  It then writes to stdout a <filename>Release</filename> file "
-"containing an MD5, SHA1 and SHA256 digest for each file."
+"containing (by default) an MD5, SHA1, SHA256 and SHA512 digest for each file."
 msgstr ""
 "O comando <literal>release</literal> gera um ficheiro Release a partir de "
 "uma árvore de directórios. Por predefinição, procura recursivamente no "
@@ -7641,7 +8618,7 @@ msgstr ""
 "contém um resultado de MD5, SHA1 e SHA256 para cada ficheiro."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:100
+#: apt-ftparchive.1.xml
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7662,7 +8639,7 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:113
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -7678,7 +8655,7 @@ msgstr ""
 "definições requeridas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:122
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7688,12 +8665,12 @@ msgstr ""
 "são necessários."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml
 msgid "The Generate Configuration"
 msgstr "A Configuração do Generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7710,7 +8687,7 @@ msgstr ""
 "árvore. Isto apenas afecta o modo de como a etiqueta scope é manuseada."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7718,12 +8695,12 @@ msgstr ""
 "abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml
 msgid "<literal>Dir</literal> Section"
 msgstr "Secção <literal>Dir</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:142
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7736,7 +8713,7 @@ msgstr ""
 "posteriores para produzir um caminho completo e absoluto."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:149
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -7746,17 +8723,17 @@ msgstr ""
 "directório que contém o <filename>ls-LR</filename> e nós da distribuição."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml
 msgid "Specifies the location of the override files."
 msgstr "Especifica a localização dos ficheiros de sobrepor."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:161
+#: apt-ftparchive.1.xml
 msgid "Specifies the location of the cache files."
 msgstr "Especifica a localização dos ficheiros de cache"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7765,12 +8742,12 @@ msgstr ""
 "definição <literal>FileList</literal> for usada mais abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml
 msgid "<literal>Default</literal> Section"
 msgstr "Secção <literal>Default</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7781,7 +8758,7 @@ msgstr ""
 "sobrepor estas predefinições em uma definição por-secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -7794,7 +8771,7 @@ msgstr ""
 "predefinição para todos os esquemas de compressão é '. gzip'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:188
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7803,7 +8780,7 @@ msgstr ""
 "pacote. A predefinição é '.deb'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7812,7 +8789,7 @@ msgstr ""
 "controla a compressão para os ficheiros das Fontes."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7821,7 +8798,7 @@ msgstr ""
 "fontes. A predefinição é '.dsc'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7830,7 +8807,7 @@ msgstr ""
 "controla a compressão para os ficheiros de Conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7839,7 +8816,7 @@ msgstr ""
 "controla a compressão para o ficheiro mestre Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7850,7 +8827,7 @@ msgstr ""
 "Links</literal> por secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -7860,7 +8837,7 @@ msgstr ""
 "independentemente do umask."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7871,12 +8848,12 @@ msgstr ""
 "<filename>Translation-en</filename> mestre."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:238
+#: apt-ftparchive.1.xml
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "Secção <literal>TreeDefault</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:240
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7887,7 +8864,7 @@ msgstr ""
 "$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:247
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -7898,7 +8875,7 @@ msgstr ""
 "alguns dias todos sejam reconstruídos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:254
+#: apt-ftparchive.1.xml
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -7916,7 +8893,7 @@ msgstr ""
 "modo. A predefinição é 10, as unidades são em dias."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7925,7 +8902,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7934,7 +8911,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7943,7 +8920,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7952,7 +8929,7 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7963,7 +8940,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -7974,7 +8951,7 @@ msgstr ""
 "$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:303
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -7989,12 +8966,12 @@ msgstr ""
 "ficheiros pacotes todos juntos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml
 msgid "Sets header file to prepend to the contents output."
 msgstr "Define o ficheiro cabeçalho para prefixar a saída de conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:317
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8003,7 +8980,7 @@ msgstr ""
 "secções podem partilhar a mesma base de dados."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8015,7 +8992,7 @@ msgstr ""
 "arquivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8028,12 +9005,12 @@ msgstr ""
 "arquivo. Isto é usado quando se processa índices de fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml
 msgid "<literal>Tree</literal> Section"
 msgstr "Secção <literal>Tree</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:340
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8048,7 +9025,7 @@ msgstr ""
 "<literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:345
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -8061,7 +9038,7 @@ msgstr ""
 "definição tal como <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:350
+#: apt-ftparchive.1.xml
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8072,7 +9049,7 @@ msgstr ""
 "variáveis."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8086,7 +9063,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8097,7 +9074,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:364
+#: apt-ftparchive.1.xml
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8108,18 +9085,18 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
-"this tree has a source archive."
+"this tree has a source archive.  The architecture 'all' signals that "
+"architecture specific files like <filename>Packages</filename> should not "
+"include information about architecture <literal>all</literal> packages in "
+"all files as they will be available in a dedicated file."
 msgstr ""
-"Isto é uma lista separada por espaços de todas as arquitecturas que aparecem "
-"sob a secção de buscas. A arquitectura especial 'source' é usada para "
-"indicar que esta árvore tem um arquivo fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8128,7 +9105,7 @@ msgstr ""
 "informação de secção, prioridade e endereço do responsável."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8137,22 +9114,22 @@ msgstr ""
 "informação de secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml
 msgid "Sets the binary extra override file."
 msgstr "Define o ficheiro de sobreposição extra binário."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml
 msgid "Sets the source extra override file."
 msgstr "Define o ficheiro de sobreposição extra fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "Secção <literal>BinDirectory</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8167,12 +9144,12 @@ msgstr ""
 "definições <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:416
+#: apt-ftparchive.1.xml
 msgid "Sets the Packages file output."
 msgstr "Define a saída do ficheiro Packages."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8181,42 +9158,42 @@ msgstr ""
 "<literal>Packages</literal> ou <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml
 msgid "Sets the Contents file output (optional)."
 msgstr "Define a saída do ficheiro Contents (opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml
 msgid "Sets the binary override file."
 msgstr "Define o ficheiro de sobreposição binário."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml
 msgid "Sets the source override file."
 msgstr "Define o ficheiro de sobreposição fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml
 msgid "Sets the cache DB."
 msgstr "Define a base de dados de cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml
 msgid "Appends a path to all the output paths."
 msgstr "Acrescenta um caminho a todos os caminhos de saída."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml
 msgid "Specifies the file list file."
 msgstr "Especifica o ficheiro de lista de ficheiros."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml
 msgid "The Binary Override File"
 msgstr "O Ficheiro Binary Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8231,19 +9208,19 @@ msgstr ""
 "permutação do responsável."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8260,12 +9237,12 @@ msgstr ""
 "formato substitui incondicionalmente o campo do responsável."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml
 msgid "The Source Override File"
 msgstr "O Ficheiro Source Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8276,12 +9253,12 @@ msgstr ""
 "nome de pacote fonte, o segundo é a secção onde o atribuir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml
 msgid "The Extra Override File"
 msgstr "O Ficheiro Extra Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8292,7 +9269,19 @@ msgstr ""
 "pacote, a segunda é a etiqueta e restante da linha é o novo valor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml
+#, fuzzy
+#| msgid ""
+#| "Generate the given checksum. These options default to on, when turned off "
+#| "the generated index files will not have the checksum fields where "
+#| "possible.  Configuration Items: <literal>APT::FTPArchive::"
+#| "<replaceable>Checksum</replaceable></literal> and <literal>APT::"
+#| "FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</"
+#| "replaceable></literal> where <literal><replaceable>Index</replaceable></"
+#| "literal> can be <literal>Packages</literal>, <literal>Sources</literal> "
+#| "or <literal>Release</literal> and <literal><replaceable>Checksum</"
+#| "replaceable></literal> can be <literal>MD5</literal>, <literal>SHA1</"
+#| "literal> or <literal>SHA256</literal>."
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8302,7 +9291,8 @@ msgid ""
 "<literal><replaceable>Index</replaceable></literal> can be "
 "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
-"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+"<literal>MD5</literal>, <literal>SHA1</literal>, <literal>SHA256</literal> "
+"or <literal>SHA512</literal>."
 msgstr ""
 "Gera o sumário de verificação dado. Estas opções usam a predefinição de "
 "ligadas, quando são desligadas os ficheiros de índice gerados não terão os "
@@ -8316,7 +9306,7 @@ msgstr ""
 "<literal>MD5</literal>, <literal>SHA1</literal> ou <literal>SHA256</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8325,7 +9315,7 @@ msgstr ""
 "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -8339,7 +9329,7 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -8352,7 +9342,7 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:539
+#: apt-ftparchive.1.xml
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -8368,7 +9358,7 @@ msgstr ""
 "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8379,7 +9369,7 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8388,7 +9378,7 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:560
+#: apt-ftparchive.1.xml
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8402,7 +9392,7 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8426,7 +9416,7 @@ msgstr ""
 "as verificações extras serão desnecessárias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8441,13 +9431,13 @@ msgstr ""
 "<filename>Translation-en</filename> só pode ser criado no comando generate."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:598
+#: apt-ftparchive.1.xml
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:594
+#: apt-ftparchive.1.xml
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8456,7 +9446,7 @@ msgstr ""
 "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:608
+#: apt-ftparchive.1.xml
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8465,32 +9455,32 @@ msgstr ""
 "decimal em erro."
 
 #. type: Attribute 'lang' of: <book>
-#: guide.dbk:9 offline.dbk:9
+#: guide.dbk offline.dbk
 msgid "en"
 msgstr "pt"
 
 #. type: Content of: <book><title>
-#: guide.dbk:11
+#: guide.dbk
 msgid "APT User's Guide"
 msgstr "Guia de Utilizador do APT"
 
 #. type: Content of: <book><bookinfo><authorgroup><author><personname>
-#: guide.dbk:17 offline.dbk:17
+#: guide.dbk offline.dbk
 msgid "Jason Gunthorpe"
 msgstr "Jason Gunthorpe"
 
 #. type: Content of: <book><bookinfo><authorgroup><author><email>
-#: guide.dbk:17 offline.dbk:17
+#: guide.dbk offline.dbk
 msgid "jgg@debian.org"
 msgstr "jgg@debian.org"
 
 #. type: Content of: <book><bookinfo><releaseinfo>
-#: guide.dbk:21 offline.dbk:21
+#: guide.dbk offline.dbk
 msgid "Version &apt-product-version;"
 msgstr "Versão &apt-product-version;"
 
 #. type: Content of: <book><bookinfo><abstract><para>
-#: guide.dbk:25
+#: guide.dbk
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
@@ -8498,19 +9488,19 @@ msgstr ""
 "pacotes APT."
 
 #. type: Content of: <book><bookinfo>
-#: guide.dbk:29
+#: guide.dbk
 msgid ""
 "<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 "<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 
 #. type: Content of: <book><bookinfo><legalnotice><title>
-#: guide.dbk:32 offline.dbk:33
+#: guide.dbk offline.dbk
 msgid "License Notice"
 msgstr "Aviso de Licença"
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: guide.dbk:34 offline.dbk:35
+#: guide.dbk offline.dbk
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8523,7 +9513,7 @@ msgstr ""
 "qualquer versão posterior."
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: guide.dbk:43 offline.dbk:41
+#: guide.dbk offline.dbk
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8532,12 +9522,12 @@ msgstr ""
 "licenses/GPL para a licença completa."
 
 #. type: Content of: <book><chapter><title>
-#: guide.dbk:50
+#: guide.dbk
 msgid "General"
 msgstr "Geral"
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:52
+#: guide.dbk
 msgid ""
 "The APT package currently contains two sections, the APT <command>dselect</"
 "command> method and the <command>apt-get</command> command line user "
@@ -8550,12 +9540,12 @@ msgstr ""
 "remover pacotes assim como descarregar novos pacotes da Internet."
 
 #. type: Content of: <book><chapter><section><title>
-#: guide.dbk:58
+#: guide.dbk
 msgid "Anatomy of the Package System"
 msgstr "Anatomia do Sistema de Pacotes"
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:60
+#: guide.dbk
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8567,7 +9557,7 @@ msgstr ""
 "sistema de dependências."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:65
+#: guide.dbk
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8583,7 +9573,7 @@ msgstr ""
 "e mais."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:72
+#: guide.dbk
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8596,7 +9586,7 @@ msgstr ""
 "para funcionar correctamente."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:77
+#: guide.dbk
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8609,7 +9599,7 @@ msgstr ""
 "uma dependência simples do emacs, e sem o emacs é completamente inútil."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:83
+#: guide.dbk
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8631,7 +9621,7 @@ msgstr ""
 "transporte de mail."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:93
+#: guide.dbk
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8652,7 +9642,7 @@ msgstr ""
 "adicionar uma grande confusão quando se tenta corrigir pacotes manualmente."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:103
+#: guide.dbk
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8665,12 +9655,12 @@ msgstr ""
 "automáticos que ajudam a seleccionar os pacotes para instalação."
 
 #. type: Content of: <book><chapter><title>
-#: guide.dbk:112
+#: guide.dbk
 msgid "apt-get"
 msgstr "apt-get"
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:114
+#: guide.dbk
 msgid ""
 "<command>apt-get</command> provides a simple way to install packages from "
 "the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
@@ -8684,7 +9674,7 @@ msgstr ""
 "<emphasis>Source</emphasis>."
 
 #. type: Content of: <book><chapter><para><footnote><para>
-#: guide.dbk:120
+#: guide.dbk
 msgid ""
 "If you are using an http proxy server you must set the http_proxy "
 "environment variable first, see sources.list(5)"
@@ -8693,7 +9683,7 @@ msgstr ""
 "de ambiente http_proxy primeiro, veja sources.list(5)"
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:120
+#: guide.dbk
 msgid ""
 "The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
 "done before using <command>apt-get</command> is to fetch the package lists "
@@ -8707,7 +9697,7 @@ msgstr ""
 "exemplo,"
 
 #. type: Content of: <book><chapter><screen>
-#: guide.dbk:128
+#: guide.dbk
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -8723,17 +9713,17 @@ msgstr ""
 "Building Dependency Tree... Done\n"
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:135
+#: guide.dbk
 msgid "Once updated there are several commands that can be used:"
 msgstr "Uma vez actualizado existem vários comandos que podem ser usados:"
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><term>
-#: guide.dbk:139
+#: guide.dbk
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
-#: guide.dbk:142
+#: guide.dbk
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
@@ -8754,12 +9744,12 @@ msgstr ""
 "literal> podem ser usados para forçar estes pacotes a instalar."
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><term>
-#: guide.dbk:154
+#: guide.dbk
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
-#: guide.dbk:157
+#: guide.dbk
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8778,12 +9768,12 @@ msgstr ""
 "algo mais que os seus argumentos serão alterados."
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><term>
-#: guide.dbk:168
+#: guide.dbk
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
-#: guide.dbk:171
+#: guide.dbk
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
@@ -8804,7 +9794,7 @@ msgstr ""
 "para instalar quaisquer pacotes que tenham ficado de fora."
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
-#: guide.dbk:181
+#: guide.dbk
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8813,7 +9803,7 @@ msgstr ""
 "decisões podem por vezes ser bastante surpreendentes."
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:188
+#: guide.dbk
 msgid ""
 "<command>apt-get</command> has several command line options that are "
 "detailed in its man page, <citerefentry><refentrytitle>apt-get</"
@@ -8835,12 +9825,12 @@ msgstr ""
 "novo comando que s descarregou mas sem o <literal>-d</literal>."
 
 #. type: Content of: <book><chapter><title>
-#: guide.dbk:200
+#: guide.dbk
 msgid "DSelect"
 msgstr "DSelect"
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:202
+#: guide.dbk
 msgid ""
 "The APT <command>dselect</command> method provides the complete APT system "
 "with the <command>dselect</command> package selection GUI. <command>dselect</"
@@ -8853,7 +9843,7 @@ msgstr ""
 "instalados ou removidos e o APT instala-os."
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:208
+#: guide.dbk
 msgid ""
 "To enable the APT method you need to select [A]ccess in <command>dselect</"
 "command> and then choose the APT method. You will be prompted for a set of "
@@ -8877,7 +9867,7 @@ msgstr ""
 "usar os pacotes no seu CD-ROM antes de descarregar da Internet."
 
 #. type: Content of: <book><chapter><screen>
-#: guide.dbk:219
+#: guide.dbk
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
@@ -8907,7 +9897,7 @@ msgstr ""
 " URL [http://llug.sep.bnl.gov/debian]:\n"
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:233
+#: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
@@ -8918,7 +9908,7 @@ msgstr ""
 "pergunta qual a distribuição a obter."
 
 #. type: Content of: <book><chapter><screen>
-#: guide.dbk:238
+#: guide.dbk
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
@@ -8934,7 +9924,7 @@ msgstr ""
 " Distribution [stable]:\n"
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:245
+#: guide.dbk
 msgid ""
 "The distribution refers to the Debian version in the archive, "
 "<emphasis>stable</emphasis> refers to the latest released version and "
@@ -8952,7 +9942,7 @@ msgstr ""
 "Estados Unidos. No entanto importar estes pacotes para os US é legal."
 
 #. type: Content of: <book><chapter><screen>
-#: guide.dbk:254
+#: guide.dbk
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
@@ -8966,7 +9956,7 @@ msgstr ""
 " Componentes [main contrib non-free]:\n"
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:260
+#: guide.dbk
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8979,7 +9969,7 @@ msgstr ""
 "restrições colocadas no seu uso e distribuição."
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:266
+#: guide.dbk
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -8988,7 +9978,7 @@ msgstr ""
 "continuar a perguntar-lhe até que tenha especificado todas as que deseja."
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:270
+#: guide.dbk
 msgid ""
 "Before starting to use <command>dselect</command> it is necessary to update "
 "the available list by selecting [U]pdate from the menu. This is a superset "
@@ -9003,7 +9993,7 @@ msgstr ""
 "mesmo que tenha sido feito <literal>apt-get update</literal> antes."
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:277
+#: guide.dbk
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9015,7 +10005,7 @@ msgstr ""
 "e [R]emove não fazem sentido, o comando [I]nstall executa ambos juntamente."
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:283
+#: guide.dbk
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
 "have been successfully installed. To change this behavior place "
@@ -9027,12 +10017,12 @@ msgstr ""
 "apt/apt.conf."
 
 #. type: Content of: <book><chapter><title>
-#: guide.dbk:289
+#: guide.dbk
 msgid "The Interface"
 msgstr "A Interface"
 
 #. type: Content of: <book><chapter><para><footnote><para>
-#: guide.dbk:293
+#: guide.dbk
 msgid ""
 "The <command>dselect</command> method actually is a set of wrapper scripts "
 "to <command>apt-get</command>. The method actually provides more "
@@ -9043,7 +10033,7 @@ msgstr ""
 "funcionalidades que aquelas presentes no <command>apt-get</command> sozinho."
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:291
+#: guide.dbk
 msgid ""
 "Both that APT <command>dselect</command> method and <command>apt-get</"
 "command> share the same interface. It is a simple system that generally "
@@ -9060,12 +10050,12 @@ msgstr ""
 "quanto falta fazer."
 
 #. type: Content of: <book><chapter><section><title>
-#: guide.dbk:302
+#: guide.dbk
 msgid "Startup"
 msgstr "Arranque"
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:304
+#: guide.dbk
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
@@ -9078,7 +10068,7 @@ msgstr ""
 "correndo <literal>apt-get check</literal>."
 
 #. type: Content of: <book><chapter><section><screen>
-#: guide.dbk:310
+#: guide.dbk
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9090,7 +10080,7 @@ msgstr ""
 "Building Dependency Tree... Done\n"
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:315
+#: guide.dbk
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9104,7 +10094,7 @@ msgstr ""
 "terminar."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:321
+#: guide.dbk
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
@@ -9117,7 +10107,7 @@ msgstr ""
 "relatório e o <command>apt-get</command> recusa-se a funcionar."
 
 #. type: Content of: <book><chapter><section><screen>
-#: guide.dbk:327
+#: guide.dbk
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9153,7 +10143,7 @@ msgstr ""
 "  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:344
+#: guide.dbk
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9168,7 +10158,7 @@ msgstr ""
 "pacote tem um problema de dependência."
 
 #. type: Content of: <book><chapter><section><para><footnote><para>
-#: guide.dbk:353
+#: guide.dbk
 msgid ""
 "APT however considers all known dependencies and attempts to prevent broken "
 "packages"
@@ -9177,7 +10167,7 @@ msgstr ""
 "pacotes quebrados"
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:351
+#: guide.dbk
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
 "is caused by <command>dpkg</command> missing some subtle relationships "
@@ -9194,7 +10184,7 @@ msgstr ""
 "sem que as suas dependências tenham sido instaladas."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:360
+#: guide.dbk
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
@@ -9213,7 +10203,7 @@ msgstr ""
 "responsável com falhas."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:369
+#: guide.dbk
 msgid ""
 "However, if the <literal>-f</literal> option is used to correct a seriously "
 "broken system caused by the first case then it is possible that it will "
@@ -9228,12 +10218,12 @@ msgstr ""
 "forçar) para corrigir a situação o suficiente para permitir ao APT continuar."
 
 #. type: Content of: <book><chapter><section><title>
-#: guide.dbk:377
+#: guide.dbk
 msgid "The Status Report"
 msgstr "O Relatório de Estado"
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:379
+#: guide.dbk
 msgid ""
 "Before proceeding <command>apt-get</command> will present a report on what "
 "will happen. Generally the report reflects the type of operation being "
@@ -9250,12 +10240,12 @@ msgstr ""
 "executado."
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:386
+#: guide.dbk
 msgid "The Extra Package list"
 msgstr "A lista de Pacotes Extra"
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:388
+#: guide.dbk
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9273,7 +10263,7 @@ msgstr ""
 "  ssh\n"
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:396
+#: guide.dbk
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
@@ -9286,12 +10276,12 @@ msgstr ""
 "geralmente o resultado de uma Auto instalação."
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:403
+#: guide.dbk
 msgid "The Packages to Remove"
 msgstr "Os Pacotes para Remover"
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:405
+#: guide.dbk
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
@@ -9307,7 +10297,7 @@ msgstr ""
 "  nas xpilot xfig\n"
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:412
+#: guide.dbk
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
@@ -9326,12 +10316,12 @@ msgstr ""
 "instalados, possivelmente devido a uma instalação abortada."
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:422
+#: guide.dbk
 msgid "The New Packages list"
 msgstr "A lista de Novos Pacotes"
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:424
+#: guide.dbk
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
@@ -9341,7 +10331,7 @@ msgstr ""
 "  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:428
+#: guide.dbk
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9352,12 +10342,12 @@ msgstr ""
 "estar quando o APT terminar."
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:433
+#: guide.dbk
 msgid "The Kept Back list"
 msgstr "A lista Kept Back"
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:435
+#: guide.dbk
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
@@ -9369,7 +10359,7 @@ msgstr ""
 "  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:440
+#: guide.dbk
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
@@ -9386,12 +10376,12 @@ msgstr ""
 "usando o <command>dselect</command> para resolver os seus problemas."
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:449
+#: guide.dbk
 msgid "Held Packages warning"
 msgstr "Aviso de Pacotes Mantidos"
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:451
+#: guide.dbk
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
@@ -9401,7 +10391,7 @@ msgstr ""
 "  cvs\n"
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:455
+#: guide.dbk
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9412,12 +10402,12 @@ msgstr ""
 "apenas deve acontecer durante um dist-upgrade ou install."
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:461
+#: guide.dbk
 msgid "Final summary"
 msgstr "Sumário final"
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:463
+#: guide.dbk
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
@@ -9425,7 +10415,7 @@ msgstr ""
 "acontecer."
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:466
+#: guide.dbk
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
@@ -9437,7 +10427,7 @@ msgstr ""
 "É necessário obter 65.7M/66.7M de arquivos. Após desempacotamento será usado 26.5M.\n"
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:471
+#: guide.dbk
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9468,7 +10458,7 @@ msgstr ""
 "pode indicar a quantidade de espaço que irá ser libertado."
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:485
+#: guide.dbk
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9477,12 +10467,12 @@ msgstr ""
 "pacotes a actualizar, e são semelhantes aos exemplos prévios."
 
 #. type: Content of: <book><chapter><section><title>
-#: guide.dbk:492
+#: guide.dbk
 msgid "The Status Display"
 msgstr "O Mostrador de Estado"
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:494
+#: guide.dbk
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9491,7 +10481,7 @@ msgstr ""
 "série de mensagens de estado."
 
 #. type: Content of: <book><chapter><section><screen>
-#: guide.dbk:498
+#: guide.dbk
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9511,7 +10501,7 @@ msgstr ""
 "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:507
+#: guide.dbk
 msgid ""
 "The lines starting with <emphasis>Get</emphasis> are printed out when APT "
 "begins to fetch a file while the last line indicates the progress of the "
@@ -9528,7 +10518,7 @@ msgstr ""
 "literal> estima a percentagem de pronto o que causa algumas imprecisões."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:515
+#: guide.dbk
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
@@ -9549,7 +10539,7 @@ msgstr ""
 "pacote que está a ser descarregado."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:525
+#: guide.dbk
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
@@ -9582,7 +10572,7 @@ msgstr ""
 "transferência mostrado."
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:540
+#: guide.dbk
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
@@ -9598,12 +10588,12 @@ msgstr ""
 "mostrador de estado."
 
 #. type: Content of: <book><chapter><section><title>
-#: guide.dbk:548
+#: guide.dbk
 msgid "Dpkg"
 msgstr "Dpkg"
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:550
+#: guide.dbk
 msgid ""
 "APT uses <command>dpkg</command> for installing the archives and will switch "
 "over to the <command>dpkg</command> interface once downloading is completed. "
@@ -9621,12 +10611,12 @@ msgstr ""
 "discutidas aqui."
 
 #. type: Content of: <book><title>
-#: offline.dbk:11
+#: offline.dbk
 msgid "Using APT Offline"
 msgstr "Usando o APT Offline"
 
 #. type: Content of: <book><bookinfo><abstract><para>
-#: offline.dbk:25
+#: offline.dbk
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9635,24 +10625,24 @@ msgstr ""
 "especificamente uma aproximação 'sneaker-net' para executar actualizações."
 
 #. type: Content of: <book><bookinfo>
-#: offline.dbk:30
+#: offline.dbk
 msgid ""
 "<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 "<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
 #. type: Content of: <book><chapter><title>
-#: offline.dbk:48
+#: offline.dbk
 msgid "Introduction"
 msgstr "Introdução"
 
 #. type: Content of: <book><chapter><section><title>
-#: offline.dbk:50 offline.dbk:80 offline.dbk:192
+#: offline.dbk
 msgid "Overview"
 msgstr "Visão geral"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:52
+#: offline.dbk
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9665,7 +10655,7 @@ msgstr ""
 "rápida mas estão fisicamente distantes."
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:58
+#: offline.dbk
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9689,12 +10679,18 @@ msgstr ""
 "emphasis> aquela com má ou nenhuma ligação."
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:69
+#: offline.dbk
+#, fuzzy
+#| msgid ""
+#| "This is achieved by creatively manipulating the APT configuration file. "
+#| "The essential premise to tell APT to look on a disc for it's archive "
+#| "files. Note that the disc should be formated with a filesystem that can "
+#| "handle long file names such as ext2, fat32 or vfat."
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
-"that the disc should be formated with a filesystem that can handle long file "
-"names such as ext2, fat32 or vfat."
+"that the disc should be formatted with a filesystem that can handle long "
+"file names such as ext2, fat32 or vfat."
 msgstr ""
 "Isto é conseguido ao manipular criativamente o ficheiro de configuração do "
 "APT. A premissa essencial para dizer ao APT para procurar num disco pelos "
@@ -9703,12 +10699,12 @@ msgstr ""
 "ext2, fat32 ou vfat."
 
 #. type: Content of: <book><chapter><title>
-#: offline.dbk:78
+#: offline.dbk
 msgid "Using APT on both machines"
 msgstr "Usando o APT em ambas máquinas"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:82
+#: offline.dbk
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9722,7 +10718,7 @@ msgstr ""
 "parecer-se com:"
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:88
+#: offline.dbk
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9744,12 +10740,12 @@ msgstr ""
 "    apt.conf\n"
 
 #. type: Content of: <book><chapter><section><title>
-#: offline.dbk:99
+#: offline.dbk
 msgid "The configuration file"
 msgstr "O ficheiro de configuração"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:101
+#: offline.dbk
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
@@ -9768,7 +10764,7 @@ msgstr ""
 "a file URIs."
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:109
+#: offline.dbk
 msgid ""
 "<emphasis>apt.conf</emphasis> must contain the necessary information to make "
 "APT use the disc:"
@@ -9777,7 +10773,7 @@ msgstr ""
 "fazer o APT usar o disco:"
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:113
+#: offline.dbk
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9829,7 +10825,7 @@ msgstr ""
 " };\n"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:138
+#: offline.dbk
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
 "configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
@@ -9840,7 +10836,7 @@ msgstr ""
 "conf</emphasis>."
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:143
+#: offline.dbk
 msgid ""
 "On the target machine the first thing to do is mount the disc and copy "
 "<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
@@ -9857,7 +10853,7 @@ msgstr ""
 "seguinte:"
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:152
+#: offline.dbk
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
@@ -9873,7 +10869,7 @@ msgstr ""
 " [ APT obtém todos os pacotes necessários para actualizar a máquina de destino ]\n"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:159
+#: offline.dbk
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
@@ -9886,7 +10882,7 @@ msgstr ""
 "problema ao comunicar as suas selecções de volta ao computador local."
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:165
+#: offline.dbk
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9895,7 +10891,7 @@ msgstr ""
 "para actualizar a máquina de destino. Devolva o disco e corra:"
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:169
+#: offline.dbk
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
@@ -9911,7 +10907,7 @@ msgstr ""
 "  [ Ou qualquer outro comando APT ]\n"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:176
+#: offline.dbk
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9920,7 +10916,7 @@ msgstr ""
 "estado seja o ficheiro local. Isto é muito importante!"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:180
+#: offline.dbk
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9936,12 +10932,12 @@ msgstr ""
 "APT!!"
 
 #. type: Content of: <book><chapter><title>
-#: offline.dbk:190
+#: offline.dbk
 msgid "Using APT and wget"
 msgstr "Usando APT e wget"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:194
+#: offline.dbk
 msgid ""
 "<emphasis>wget</emphasis> is a popular and portable download tool that can "
 "run on nearly any machine. Unlike the method above this requires that the "
@@ -9953,7 +10949,7 @@ msgstr ""
 "disponíveis."
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:199
+#: offline.dbk
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9965,12 +10961,12 @@ msgstr ""
 "apt-get e depois preparar um script wget para realmente ir buscar os pacotes."
 
 #. type: Content of: <book><chapter><section><title>
-#: offline.dbk:205
+#: offline.dbk
 msgid "Operation"
 msgstr "Operação"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:207
+#: offline.dbk
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9980,7 +10976,7 @@ msgstr ""
 "para gerar a lista de ficheiros."
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:211
+#: offline.dbk
 #, no-wrap
 msgid ""
 " # apt-get dist-upgrade\n"
@@ -9994,7 +10990,7 @@ msgstr ""
 " # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:217
+#: offline.dbk
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -10003,7 +10999,7 @@ msgstr ""
 "upgrade."
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:221
+#: offline.dbk
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10016,12 +11012,12 @@ msgstr ""
 "grave os resultados no disco."
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:227
+#: offline.dbk
 msgid "The remote machine would do something like"
 msgstr "A máquina remota deverá fazer algo como"
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:230
+#: offline.dbk
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
@@ -10033,7 +11029,7 @@ msgstr ""
 "  [ wait.. ]\n"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:235
+#: offline.dbk
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10042,12 +11038,303 @@ msgstr ""
 "instalação pode prosseguir usando,"
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:239
+#: offline.dbk
 #, no-wrap
 msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:242
+#: offline.dbk
 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 ""
+#~ "This is a space separated list of all the architectures that appear under "
+#~ "search section. The special architecture 'source' is used to indicate "
+#~ "that this tree has a source archive."
+#~ msgstr ""
+#~ "Isto é uma lista separada por espaços de todas as arquitecturas que "
+#~ "aparecem sob a secção de buscas. A arquitectura especial 'source' é usada "
+#~ "para indicar que esta árvore tem um arquivo fonte."
+
+#~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool) é uma ferramenta de linha "
+#~ "de comandos para manuseamento de pacotes. Disponibiliza uma interface de "
+#~ "linha de comandos para a gestão de pacotes do sistema. Veja também &apt-"
+#~ "get; e &apt-cache; para mais opções de baixo nível dos comandos."
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> procura por termo(s) determinado(s) e mostra os "
+#~ "pacotes correspondentes."
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> mostra a informação do pacote para o(s) pacote(s) "
+#~ "determinado(s)."
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> é seguido por um ou mais nomes de pacotes que "
+#~ "se deseja instalar ou actualizar."
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> é usado para re-sincronizar o índice dos "
+#~ "pacotes a partir das suas fontes."
+
+#~ msgid "Script usage"
+#~ msgstr "Utilização de script"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "Diferenças para o &apt-get;"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "O comando  <command>apt</command> destina-se a ser agradável para os "
+#~ "utilizadores finais e não precisa de ser compatível com as versões "
+#~ "anteriores como o &apt-get;. Por isso algumas opções são diferentes."
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "A opção <literal>DPkg::Progress-Fancy</literal> está activada."
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "A opção <literal>APT::Color</literal> está activada."
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "Está disponível um novo comando <literal>list</literal> de modo "
+#~ "semelhante a <literal>dpkg --list</literal>."
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "A opção <literal>upgrade</literal> tem <literal>--with-new-pkgs</literal> "
+#~ "activado por predefinição."
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Passa opções avançadas ao gpg. Com adv --recv-key você pode descarregar a "
+#~ "chave pública."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> irá modificar se um pacote foi marcado como "
+#~ "sendo instalado automaticamente."
+
+#~ msgid ""
+#~ "<literal>hold</literal> is used to mark a package as held back, which "
+#~ "will prevent the package from being automatically installed, upgraded or "
+#~ "removed.  The command is only a wrapper around <command>dpkg --set-"
+#~ "selections</command> and the state is therefore maintained by &dpkg; and "
+#~ "not affected by the <option>--file</option> option."
+#~ msgstr ""
+#~ "<literal>hold</literal> é usado para marcar um pacote como retido, o que "
+#~ "vai prevenir que o pacote seja automaticamente instalado, actualizado ou "
+#~ "removido. O comando é apenas um invólucro em redor de <command>dpkg --set-"
+#~ "selections</command> e o estado é assim mantido pelo &dpkg; e não é "
+#~ "afectado pela opção <option>--file</option>."
+
+#~ msgid ""
+#~ "If a package comes from a archive without a signature, or with a "
+#~ "signature that apt does not have a key for, that package is considered "
+#~ "untrusted, and installing it will result in a big warning. <command>apt-"
+#~ "get</command> will currently only warn for unsigned archives; future "
+#~ "releases might force all sources to be verified before downloading "
+#~ "packages from them."
+#~ msgstr ""
+#~ "Se um pacote vem dum arquivo sem assinatura ou com uma assinatura para a "
+#~ "qual o apt não tem a chave, esse pacote é considerado 'não sendo de "
+#~ "confiança' e instalá-lo irá resultar num grande aviso. Actualmente o "
+#~ "<command>apt-get</command> irá avisar apenas de arquivos não assinados, "
+#~ "lançamentos futuros poderão vir a forçar que todas as fontes sejam "
+#~ "verificadas antes de descarregar pacotes delas."
+
+#~ msgid ""
+#~ "No action; perform a simulation of events that would occur but do not "
+#~ "actually change the system.  Configuration Item: <literal>APT::Get::"
+#~ "Simulate</literal>."
+#~ msgstr ""
+#~ "Nenhuma acção; executa uma simulação dos eventos que irão ocorrer mas na "
+#~ "realidade não altera o sistema. Item de Configuração: <literal>APT::Get::"
+#~ "Simulate</literal>."
+
+#~ msgid ""
+#~ "Simulated runs performed as a user will automatically deactivate locking "
+#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
+#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
+#~ "notice will also be displayed indicating that this is only a simulation. "
+#~ "Runs performed as root do not trigger either NoLocking or the notice - "
+#~ "superusers should know what they are doing without further warnings from "
+#~ "<literal>apt-get</literal>."
+#~ msgstr ""
+#~ "As simulações executadas como um utilizador irão desactivar "
+#~ "automaticamente o bloqueio (<literal>Debug::NoLocking</literal>), e se a "
+#~ "opção <literal>APT::Get::Show-User-Simulation-Note</literal> estiver "
+#~ "definida (como está por predefinição) será também mostrado um aviso "
+#~ "indicando que é apenas uma simulação. As execuções executadas pelo root "
+#~ "não accionam nem o NoLocking nem o aviso - os super-utilizadores devem "
+#~ "saber o que estão a fazer sem mais avisos do <literal>apt-get</literal>."
+
+#~ msgid ""
+#~ "Ignore if packages can't be authenticated and don't prompt about it.  "
+#~ "This is useful for tools like pbuilder.  Configuration Item: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+#~ msgstr ""
+#~ "Ignora se os pacotes não podem ser autenticados e não avisa sobre isso. "
+#~ "Isto é útil para ferramentas como o pbuilder. Item de Configuração: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+
+#~ msgid ""
+#~ "Version 2 of this protocol dumps more information, including the protocol "
+#~ "version, the APT configuration space and the packages, files and versions "
+#~ "being changed. Version 3 adds the architecture and <literal>MultiArch</"
+#~ "literal> flag to each version being dumped."
+#~ msgstr ""
+#~ "A versão 2 deste protocolo despeja mais informação, incluindo a versão de "
+#~ "protocolo, o espaço de configuração do APT e os pacotes, ficheiros e "
+#~ "versões que foram alteradas. A versão 3 adiciona a arquitectura e a "
+#~ "bandeira <literal>MultiArch</literal> a cada versão a ser despejada."
+
+#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr ""
+#~ "para as versões que não estão instaladas e não pertencem ao lançamento "
+#~ "destinado."
+
+#~ msgid ""
+#~ "Each line specifying a source starts with type (e.g. <literal>deb-src</"
+#~ "literal>)  followed by options and arguments for this type.  Individual "
+#~ "entries cannot be continued onto a following line. Empty lines are "
+#~ "ignored, and a <literal>#</literal> character anywhere on a line marks "
+#~ "the remainder of that line as a comment."
+#~ msgstr ""
+#~ "Cada linha que especifica uma fonte começa com o tipo (ex. <literal>deb-"
+#~ "src</literal>) seguido das opções e argumentos para esse tipo. As "
+#~ "entradas individuais não podem ser continuadas para a linha seguinte. As "
+#~ "linhas vazias são ignoradas, e um caracter <literal>#</literal> em "
+#~ "qualquer ponto numa linha marca o restante dessa linha como um comentário."
+
+#~ msgid "deb [ options ] uri suite [component1] [component2] [...]"
+#~ msgstr "deb [ opções ] uri suite [componente1] [componente2] [...]"
+
+#~ msgid ""
+#~ "     Types: deb deb-src\n"
+#~ "     URIs: http://example.com\n"
+#~ "     Suites: stable testing\n"
+#~ "     Sections: component1 component2\n"
+#~ "     Description: short\n"
+#~ "      long long long\n"
+#~ "     [option1]: [option1-value]\n"
+#~ "\n"
+#~ "     Types: deb\n"
+#~ "     URIs: http://another.example.com\n"
+#~ "     Suites: experimental\n"
+#~ "     Sections: component1 component2\n"
+#~ "     Enabled: no\n"
+#~ "     Description: short\n"
+#~ "      long long long\n"
+#~ "     [option1]: [option1-value]\n"
+#~ "   "
+#~ msgstr ""
+#~ "     Tipos: deb deb-src\n"
+#~ "     URIs: http://exemplo.com\n"
+#~ "     Suites: stable testing\n"
+#~ "     Secções: component1 component2\n"
+#~ "     Descrição: curta\n"
+#~ "      longa longa longa\n"
+#~ "     [opção1]: [opção1-valor]\n"
+#~ "\n"
+#~ "     Tipos: deb\n"
+#~ "     URIs: http://outro.exemlo.com\n"
+#~ "     Suites: experimental\n"
+#~ "     Secções: component1 component2\n"
+#~ "     Activo: não\n"
+#~ "     Descrição: curta\n"
+#~ "      longa longa longa\n"
+#~ "     [opção1]: [opção1-valor]\n"
+#~ "   "
+
+#~ msgid ""
+#~ "<literal>options</literal> is always optional and needs to be surrounded "
+#~ "by square brackets. It can consist of multiple settings in the form "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+#~ "following settings are supported by APT (note however that unsupported "
+#~ "settings will be ignored silently):"
+#~ msgstr ""
+#~ "<literal>options</literal> é sempre opcional e precisa de ser rodeado por "
+#~ "parênteses rectos. Pode consistir um múltiplas definições no formato "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>. As múltiplas definições são separadas por "
+#~ "espaços. As seguinte definições são suportadas pelo APT (no entanto note "
+#~ "que as definições não suportadas serão ignoradas em silêncio):"
+
+#~ msgid ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> which can be "
+#~ "used to add/remove architectures from the set which will be downloaded."
+#~ msgstr ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> e <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> que podem ser "
+#~ "usadas para adicionar/remover arquitecturas do conjunto que será "
+#~ "descarregado."
+
+#~ msgid ""
+#~ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+#~ "this source are always authenticated even if the <filename>Release</"
+#~ "filename> file is not signed or the signature can't be checked. This "
+#~ "disables parts of &apt-secure; and should therefore only be used in a "
+#~ "local and trusted context. <literal>trusted=no</literal> is the opposite "
+#~ "which handles even correctly authenticated sources as not authenticated."
+#~ msgstr ""
+#~ "<literal>trusted=yes</literal> pode ser definido para indicar que os "
+#~ "pacotes desta fonte são sempre autênticos mesmo que o ficheiro "
+#~ "<filename>Release</filename> não esteja assinado ou a assinatura não "
+#~ "possa ser verificada. Isto desactiva partes do &apt-secure; e deve por "
+#~ "isso ser usado apenas num contexto local e de confiança. "
+#~ "<literal>trusted=no</literal> é o oposto que lida com fontes mesmo "
+#~ "actualmente autenticadas como não sendo autênticas."
+
+#~ msgid "Some examples:"
+#~ msgstr "Alguns exemplos:"
+
+#~ msgid ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib "
+#~ "non-free\n"
+#~ "   "
+#~ msgstr ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib "
+#~ "non-free\n"
+#~ "   "