X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b5cabd30cc1be1c6c1ca675ceb359bab577c1905..359dc85ba96a4ae12a0bdb158096d5cbb773e145:/doc/po/pt.po

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 48ffa011e..eed14a804 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -1,13 +1,14 @@
 # Translation of apt manpages to Portuguese
 # Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the apt-doc package.
+# This file is distributed under the same license as the apt package.
 #
 # Américo Monteiro <a_monteiro@netcabo.pt>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.7.26~exp3\n"
-"POT-Creation-Date: 2010-06-11 10:56+0300\n"
-"PO-Revision-Date: 2010-03-19 00:21+0000\n"
+"Project-Id-Version: apt 0.8.0~pre1\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2012-05-24 15:57+0300\n"
+"PO-Revision-Date: 2010-08-25 23:07+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
@@ -32,8 +33,8 @@ msgstr "16 Junho 1998"
 #. type: TH
 #: apt.8:17
 #, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
 
 #. type: SH
 #: apt.8:18
@@ -44,7 +45,7 @@ msgstr "NOME"
 #. type: Plain text
 #: apt.8:20
 msgid "apt - Advanced Package Tool"
-msgstr "apt - Advanced Package Tool"
+msgstr "apt - Ferramenta de Pacotes Avançada"
 
 #. type: SH
 #: apt.8:20
@@ -80,28 +81,11 @@ msgstr ""
 #. type: SH
 #: apt.8:31
 #, no-wrap
-msgid "OPTIONS"
-msgstr "OPÇÕES"
-
-#. type: Plain text
-#: apt.8:33 apt.8:35
-msgid "None."
-msgstr "Nenhum."
-
-#. type: SH
-#: apt.8:33
-#, no-wrap
-msgid "FILES"
-msgstr "FICHEIROS"
-
-#. type: SH
-#: apt.8:35
-#, no-wrap
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
 
 #. type: Plain text
-#: apt.8:42
+#: apt.8:38
 msgid ""
 "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 "B<apt_preferences>(5), B<apt-secure>(8)"
@@ -110,29 +94,29 @@ msgstr ""
 "B<apt_preferences>(5), B<apt-secure>(8)"
 
 #. type: SH
-#: apt.8:42
+#: apt.8:38
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "DIAGNÓSTICOS"
 
 #. type: Plain text
-#: apt.8:44
+#: apt.8:40
 msgid "apt returns zero on normal operation, decimal 100 on error."
 msgstr "o apt devolve zero na operação normal, 100 decimal em erro."
 
 #. type: SH
-#: apt.8:44
+#: apt.8:40
 #, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
 
 #. type: Plain text
-#: apt.8:46
+#: apt.8:42
 msgid "This manpage isn't even started."
 msgstr "Este manual ainda nem começou."
 
 #. type: Plain text
-#: apt.8:55
+#: apt.8:51
 msgid ""
 "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
 "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
@@ -143,518 +127,18 @@ msgstr ""
 "comando B<reportbug>(1) ."
 
 #. type: SH
-#: apt.8:55
+#: apt.8:51
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: apt.8:56
+#: apt.8:52
 msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 msgstr "apt foi escrito pelo APT team E<lt>apt@packages.debian.orgE<gt>."
 
 #. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
-#. type: Plain text
-#: apt.ent:10
-msgid ""
-"<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!"
-"ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex "
-"\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY "
-"aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/"
-"lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">"
-msgstr ""
-"<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!"
-"ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex "
-"\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY "
-"aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/"
-"lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">"
-
-#. type: Plain text
-#: apt.ent:17
-#, no-wrap
-msgid ""
-"<!-- Cross references to other man pages -->\n"
-"<!ENTITY apt-conf \"<citerefentry>\n"
-"    <refentrytitle><filename>apt.conf</filename></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!-- Cross references to other man pages -->\n"
-"<!ENTITY apt-conf \"<citerefentry>\n"
-"    <refentrytitle><filename>apt.conf</filename></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:23
-#, no-wrap
-msgid ""
-"<!ENTITY apt-get \"<citerefentry>\n"
-"    <refentrytitle><command>apt-get</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-get \"<citerefentry>\n"
-"    <refentrytitle><command>apt-get</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:29
-#, no-wrap
-msgid ""
-"<!ENTITY apt-config \"<citerefentry>\n"
-"    <refentrytitle><command>apt-config</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-config \"<citerefentry>\n"
-"    <refentrytitle><command>apt-config</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:35
-#, no-wrap
-msgid ""
-"<!ENTITY apt-cdrom \"<citerefentry>\n"
-"    <refentrytitle><command>apt-cdrom</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-cdrom \"<citerefentry>\n"
-"    <refentrytitle><command>apt-cdrom</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:41
-#, no-wrap
-msgid ""
-"<!ENTITY apt-cache \"<citerefentry>\n"
-"    <refentrytitle><command>apt-cache</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-cache \"<citerefentry>\n"
-"    <refentrytitle><command>apt-cache</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:47
-#, no-wrap
-msgid ""
-"<!ENTITY apt-preferences \"<citerefentry>\n"
-"    <refentrytitle><command>apt_preferences</command></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-preferences \"<citerefentry>\n"
-"    <refentrytitle><command>apt_preferences</command></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:53
-#, no-wrap
-msgid ""
-"<!ENTITY apt-key \"<citerefentry>\n"
-"    <refentrytitle><command>apt-key</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-key \"<citerefentry>\n"
-"    <refentrytitle><command>apt-key</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:59
-#, no-wrap
-msgid ""
-"<!ENTITY apt-secure \"<citerefentry>\n"
-"    <refentrytitle>apt-secure</refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-secure \"<citerefentry>\n"
-"    <refentrytitle>apt-secure</refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:65
-#, no-wrap
-msgid ""
-"<!ENTITY apt-ftparchive \"<citerefentry>\n"
-"    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-ftparchive \"<citerefentry>\n"
-"    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:72
-#, no-wrap
-msgid ""
-"<!ENTITY sources-list \"<citerefentry>\n"
-"    <refentrytitle><filename>sources.list</filename></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY sources-list \"<citerefentry>\n"
-"    <refentrytitle><filename>sources.list</filename></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:78
-#, no-wrap
-msgid ""
-"<!ENTITY reportbug \"<citerefentry>\n"
-"    <refentrytitle><command>reportbug</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY reportbug \"<citerefentry>\n"
-"    <refentrytitle><command>reportbug</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:84
-#, no-wrap
-msgid ""
-"<!ENTITY dpkg \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY dpkg \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:90
-#, no-wrap
-msgid ""
-"<!ENTITY dpkg-buildpackage \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY dpkg-buildpackage \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:96
-#, no-wrap
-msgid ""
-"<!ENTITY gzip \"<citerefentry>\n"
-"    <refentrytitle><command>gzip</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gzip \"<citerefentry>\n"
-"    <refentrytitle><command>gzip</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:102
-#, no-wrap
-msgid ""
-"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:108
-#, no-wrap
-msgid ""
-"<!ENTITY dpkg-scansources \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY dpkg-scansources \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:114
-#, no-wrap
-msgid ""
-"<!ENTITY dselect \"<citerefentry>\n"
-"    <refentrytitle><command>dselect</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY dselect \"<citerefentry>\n"
-"    <refentrytitle><command>dselect</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:120
-#, no-wrap
-msgid ""
-"<!ENTITY aptitude \"<citerefentry>\n"
-"    <refentrytitle><command>aptitude</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY aptitude \"<citerefentry>\n"
-"    <refentrytitle><command>aptitude</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:126
-#, no-wrap
-msgid ""
-"<!ENTITY synaptic \"<citerefentry>\n"
-"    <refentrytitle><command>synaptic</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY synaptic \"<citerefentry>\n"
-"    <refentrytitle><command>synaptic</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:132
-#, no-wrap
-msgid ""
-"<!ENTITY debsign \"<citerefentry>\n"
-"    <refentrytitle><command>debsign</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY debsign \"<citerefentry>\n"
-"    <refentrytitle><command>debsign</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:138
-#, no-wrap
-msgid ""
-"<!ENTITY debsig-verify \"<citerefentry>\n"
-"    <refentrytitle><command>debsig-verify</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY debsig-verify \"<citerefentry>\n"
-"    <refentrytitle><command>debsig-verify</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:144
-#, no-wrap
-msgid ""
-"<!ENTITY gpg \"<citerefentry>\n"
-"    <refentrytitle><command>gpg</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gpg \"<citerefentry>\n"
-"    <refentrytitle><command>gpg</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:150
-#, no-wrap
-msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
-"<!ENTITY wajig \"<citerefentry>\n"
-"    <refentrytitle><command>wajig</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY wajig \"<citerefentry>\n"
-"    <refentrytitle><command>wajig</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:168
-#, no-wrap
-msgid ""
-"<!-- Boiler plate docinfo section -->\n"
-"<!ENTITY apt-docinfo \"\n"
-" <refentryinfo>\n"
-"   <address><email>apt@packages.debian.org</email></address>\n"
-"   <author>\n"
-"     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-"     <contrib></contrib>\n"
-"   </author>\n"
-"   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
-"   <date>28 October 2008</date>\n"
-"   <productname>Linux</productname>\n"
-msgstr ""
-"<!-- Boiler plate docinfo section -->\n"
-"<!ENTITY apt-docinfo \"\n"
-" <refentryinfo>\n"
-"   <address><email>apt@packages.debian.org</email></address>\n"
-"   <author>\n"
-"     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-"     <contrib></contrib>\n"
-"   </author>\n"
-"   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
-"   <date>28 Outubro 2008</date>\n"
-"   <productname>Linux</productname>\n"
-
-#. type: Plain text
-#: apt.ent:171
-#, no-wrap
-msgid ""
-" </refentryinfo>\n"
-"\"> \n"
-msgstr ""
-" </refentryinfo>\n"
-"\"> \n"
-
-#. type: Plain text
-#: apt.ent:177
-#, no-wrap
-msgid ""
-"<!ENTITY apt-email \"\n"
-"   <address>\n"
-"    <email>apt@packages.debian.org</email>\n"
-"   </address>\n"
-"\">\n"
-msgstr ""
-"<!ENTITY apt-email \"\n"
-"   <address>\n"
-"    <email>apt@packages.debian.org</email>\n"
-"   </address>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:185
-#, no-wrap
-msgid ""
-"<!ENTITY apt-author.jgunthorpe \"\n"
-"   <author>\n"
-"    <firstname>Jason</firstname>\n"
-"    <surname>Gunthorpe</surname>\n"
-"    <contrib></contrib>\n"
-"   </author>\n"
-"\">\n"
-msgstr ""
-"<!ENTITY apt-author.jgunthorpe \"\n"
-"   <author>\n"
-"    <firstname>Jason</firstname>\n"
-"    <surname>Gunthorpe</surname>\n"
-"    <contrib></contrib>\n"
-"   </author>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:193
-#, no-wrap
-msgid ""
-"<!ENTITY apt-author.moconnor \"\n"
-"   <author>\n"
-"    <firstname>Mike</firstname>\n"
-"    <surname>O'Connor</surname>\n"
-"    <contrib></contrib>\n"
-"   </author>\n"
-"\">\n"
-msgstr ""
-"<!ENTITY apt-author.moconnor \"\n"
-"   <author>\n"
-"    <firstname>Mike</firstname>\n"
-"    <surname>O'Connor</surname>\n"
-"    <contrib></contrib>\n"
-"   </author>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:200
+#: apt.ent:7
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -672,37 +156,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
-#, no-wrap
-msgid ""
-"<!ENTITY apt-product \"\n"
-"   <productname>Linux</productname>\n"
-"\">\n"
-msgstr ""
-"<!ENTITY apt-product \"\n"
-"   <productname>Linux</productname>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:211
-#, no-wrap
-msgid ""
-"<!ENTITY apt-copyright \"\n"
-"    <copyright>\n"
-"     <holder>Jason Gunthorpe</holder>\n"
-"     <year>1998-2001</year>\n"
-"    </copyright>\n"
-"\">\n"
-msgstr ""
-"<!ENTITY apt-copyright \"\n"
-"    <copyright>\n"
-"     <holder>Jason Gunthorpe</holder>\n"
-"     <year>1998-2001</year>\n"
-"    </copyright>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:221
+#: apt.ent:13
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -718,13 +172,13 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:24
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>. \n"
+"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -744,7 +198,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:32
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -764,7 +218,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:42
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -788,7 +242,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:50
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -808,18 +262,8 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:270
-#, fuzzy, no-wrap
-#| msgid ""
-#| "     <varlistentry>\n"
-#| "      <term><option>-c</option></term>\n"
-#| "      <term><option>--config-file</option></term>\n"
-#| "     <listitem><para>Configuration File; Specify a configuration file to use. \n"
-#| "     The program will read the default configuration file and then this \n"
-#| "     configuration file. See &apt-conf; for syntax information.     \n"
-#| "     </para>\n"
-#| "     </listitem>\n"
-#| "     </varlistentry>\n"
+#: apt.ent:62
+#, no-wrap
 msgid ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
@@ -836,15 +280,19 @@ msgstr ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
 "      <term><option>--config-file</option></term>\n"
-"     <listitem><para>Ficheiro de Configuração; Especifica um ficheiro de configuração a usar. \n"
+"     <listitem><para>Ficheiro de Configuração; Especifica o ficheiro de \n"
+"     configuração a usar. \n"
 "     O programa irá ler o ficheiro de configuração predefinido e depois este \n"
-"     ficheiro de configuração. Veja &apt-conf; para informação de sintaxe.     \n"
+"     ficheiro de configuração. Se as definições de configuração precisarem de \n"
+"     ser definidas antes, os ficheiros de configuração predefinidos são \n"
+"     analisados especificando um ficheiro com a variável de ambiente \n"
+"     <envar>APT_CONFIG</envar>. Veja &apt-conf; para informação de sintaxe.\n"
 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:282
+#: apt.ent:74
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -872,7 +320,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:293
+#: apt.ent:85
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -898,7 +346,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:299
+#: apt.ent:91
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -914,7 +362,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:305
+#: apt.ent:97
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -930,7 +378,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:311
+#: apt.ent:103
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -946,12 +394,18 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:317
-#, no-wrap
+#: apt.ent:109
+#, fuzzy, no-wrap
+#| msgid ""
+#| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+#| "     <listitem><para>Storage area for package files in transit.\n"
+#| "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+#| "     </varlistentry>\n"
+#| "\">\n"
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 "     <listitem><para>Storage area for package files in transit.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
@@ -962,7 +416,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:327
+#: apt.ent:119
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -986,7 +440,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:333
+#: apt.ent:125
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1002,7 +456,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:339
+#: apt.ent:131
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -1018,7 +472,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:345
+#: apt.ent:137
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1034,7 +488,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:352
+#: apt.ent:144
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -1052,12 +506,18 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:358
-#, no-wrap
+#: apt.ent:150
+#, fuzzy, no-wrap
+#| msgid ""
+#| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+#| "     <listitem><para>Storage area for state information in transit.\n"
+#| "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+#| "     </varlistentry>\n"
+#| "\">\n"
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 "     <listitem><para>Storage area for state information in transit.\n"
-"     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+"     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
@@ -1068,7 +528,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:364
+#: apt.ent:156
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -1084,7 +544,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:371
+#: apt.ent:163
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -1102,7 +562,27 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:375
+#: apt.ent:171
+#, no-wrap
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Lista de estado de pacotes auto-instalados.\n"
+"      Item de Configuração: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:175
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1111,7 +591,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
 
 #. type: Plain text
-#: apt.ent:384
+#: apt.ent:184
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1129,7 +609,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:394
+#: apt.ent:195
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1149,99 +629,153 @@ msgstr ""
 "     tradução está atrasada relativamente ao conteúdo original.\n"
 "\">\n"
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
-#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
+#. type: Plain text
+#: apt.ent:198
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:201
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:204
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:207
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:210
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:213
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:216
 msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
-"February 2004</date>"
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
-"Fevereiro 2004</date>"
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cache.8.xml:22 apt-cache.8.xml:29
-msgid "apt-cache"
-msgstr "apt-cache"
+#. type: Plain text
+#: apt.ent:219
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:222
+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\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:225
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:228
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:231
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:234
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-override "
+"\"override-file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:237
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+"\"pathprefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:240
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"generate section --> <!ENTITY synopsis-section \"section\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:243
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23
-#: apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15
+#: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
+#: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24
-#: apt-extracttemplates.1.xml:24 apt-ftparchive.1.xml:24 apt-get.8.xml:24
-#: apt-key.8.xml:16 apt-mark.8.xml:24 apt-secure.8.xml:16
-#: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23
-#: sources.list.5.xml:24
+#: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
+#: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
+#: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+#: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26
+#: sources.list.5.xml:27
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:30
-msgid "APT package handling utility -- cache manipulator"
-msgstr "Utilitário de manuseamento de pacotes do APT -- manipulador de cache"
-
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:36
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>add <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-"replaceable></arg></arg> <arg>gencaches</arg> <arg>showpkg <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</"
-"arg> <arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
-"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-"\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </group>"
-msgstr ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>string de configuração</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>ficheiro</replaceable></arg></arg> <arg>gencaches</arg> "
-"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</"
-"replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pacote</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-"arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-"\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg>depends "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></"
-"arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pacote</replaceable></arg></arg> <arg>pkgnames <arg choice="
-"\"plain\"><replaceable>prefixo</replaceable></arg></arg> <arg>dotty <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></"
-"arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</"
-"replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pacotes</replaceable></arg></arg> <arg>madison <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pacotes</replaceable></arg></arg> </"
-"group>"
+#: apt-cache.8.xml:33
+msgid "query the APT cache"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
-#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
-#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
-#: sources.list.5.xml:33
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+#: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36
+#: sources.list.5.xml:36
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:63
+#: apt-cache.8.xml:39
 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 "
@@ -1254,7 +788,8 @@ msgstr ""
 "a partir dos metadados do pacote."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1262,43 +797,22 @@ msgstr ""
 "A menos que a opção <option>-h</option>, ou <option>--help</option> seja "
 "fornecida, um dos comandos abaixo têm que estar presentes."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:72
-msgid "add <replaceable>file(s)</replaceable>"
-msgstr "add <replaceable>ficheiro(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:73
+#: apt-cache.8.xml:49
 msgid ""
-"<literal>add</literal> adds the named package index files to the package "
-"cache.  This is for debugging only."
+"<literal>gencaches</literal> creates APT's package cache. This is done "
+"implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
-"<literal>add</literal> adiciona ficheiros índice do pacote nomeado à cache "
-"pacotes. Isto é apenas para depuração."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:77
-msgid "gencaches"
-msgstr "gencaches"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:78
-msgid ""
-"<literal>gencaches</literal> performs the same operation as <command>apt-get "
-"check</command>. It builds the source and package caches from the sources in "
-"&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
+msgid "&synopsis-pkg;"
 msgstr ""
-"<literal>gencaches</literal> executa a mesma operação que o <command>apt-get "
-"check</command>. Constrói as caches de fonte e pacote a partir das fontes em "
-"&sources-list; e a partir de <filename>/var/lib/dpkg/status</filename>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:84
-msgid "showpkg <replaceable>pkg(s)</replaceable>"
-msgstr "showpkg <replaceable>pacote(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:85
+#: apt-cache.8.xml:54
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1322,7 +836,7 @@ msgstr ""
 "ao seguinte:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:97
+#: apt-cache.8.xml:66
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1348,7 +862,7 @@ msgstr ""
 "Fornecimentos Reversos: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:109
+#: apt-cache.8.xml:78
 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, "
@@ -1366,13 +880,8 @@ msgstr ""
 "instalados. Para o significado específico do lembrete da saída é melhor "
 "consultar o código fonte do apt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:118
-msgid "stats"
-msgstr "stats"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:87
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1381,7 +890,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:121
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1390,7 +899,7 @@ msgstr ""
 "encontrados na cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:125
+#: apt-cache.8.xml:94
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1403,50 +912,50 @@ 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:131
+#: apt-cache.8.xml:100
 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 "
 "virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
-"package; several packages provide \"mail-transport-agent\", but there is no "
-"package named \"mail-transport-agent\"."
+"\"mail-transport-agent\" in the Debian system is a pure virtual package; "
+"several packages provide \"mail-transport-agent\", but there is no package "
+"named \"mail-transport-agent\"."
 msgstr ""
 "<literal>Pure virtual packages</literal> é o número de pacotes que existem "
 "apenas como nome de pacote virtual; isto é, os pacotes apenas "
 "\"disponibilizam\" o nome do pacote virtual, e nenhum pacote usa realmente o "
-"nome. Por exemplo, \"mail-transport-agent\" no sistema Debian GNU/Linux é um "
-"pacote puramente virtual; vários pacotes disponibilizam \"mail-transport-"
-"agent\", mas não existe um existe um pacote chamado \"mail-transport-agent\"."
+"nome. Por exemplo, \"mail-transport-agent\" no sistema Debian é um pacote "
+"puramente virtual; vários pacotes disponibilizam \"mail-transport-agent\", "
+"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:139
+#: apt-cache.8.xml:108
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
-"one package, xless, provides \"X11-text-viewer\"."
+"Debian system, \"X11-text-viewer\" is a virtual package, but only one "
+"package, xless, provides \"X11-text-viewer\"."
 msgstr ""
 "<literal>Single virtual packages</literal> é o número de pacotes com apenas "
 "um pacote a disponibilizar um pacote virtual particular. Por exemplo, no "
-"sistema Debian GNU/Linux, \"X11-text-viewer\" é um pacote virtual, mas "
-"apenas um pacote, xless, disponibiliza \"X11-text-viewer\"."
+"sistema Debian, \"X11-text-viewer\" é um pacote virtual, mas apenas um "
+"pacote, xless, disponibiliza \"X11-text-viewer\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:114
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
-"\" is both an actual package, and provided by the debconf-tiny package."
+"as the package name. For instance, in the Debian system, \"debconf\" is both "
+"an actual package, and provided by the debconf-tiny package."
 msgstr ""
 "<literal>Mixed virtual packages</literal> é o número de pacotes que ou "
 "disponibilizam um pacote virtual particular ou têm o nome de pacote virtual "
-"como o nome de pacote. Por exemplo, no sistema Debian GNU/Linux, \"debconf\" "
-"é tanto um pacote real, como também disponibilizado pelo pacote debconf-tiny."
+"como o nome de pacote. Por exemplo, no sistema Debian, \"debconf\" é tanto "
+"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:152
+#: apt-cache.8.xml:121
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1462,13 +971,20 @@ msgstr ""
 "declarações de Conflitos ou Breaks."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:159
+#: apt-cache.8.xml:128
+#, 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 (both "
+#| "\"stable\" and \"unstable\", for instance), is being accessed, 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 (both \"stable\" and "
-"\"unstable\", for instance), is being accessed, this value can be "
-"considerably larger than the number of total package names."
+"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."
 msgstr ""
 "<literal>Total distinct versions</literal> é o número de versões de pacotes "
 "encontrados na cache; este valor é portanto pelo menos igual ao número do "
@@ -1477,7 +993,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:166
+#: apt-cache.8.xml:135
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -1485,30 +1001,25 @@ msgstr ""
 "<literal>Total dependencies</literal> é o número de relacionamentos com "
 "dependências reivindicadas por todos os pacotes na cache."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:173
-msgid "showsrc <replaceable>pkg(s)</replaceable>"
-msgstr "showsrc <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:174
+#: apt-cache.8.xml:143
+#, 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."
 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."
+"records that declare the name to be a binary package."
 msgstr ""
 "<literal>showsrc</literal> mostra todos os registos de pacotes fonte que "
 "correspondem aos nomes de pacotes fornecidos. Todas as versões são "
 "mostradas, assim como todos os registos que declaram o nome como sendo um "
 "Binário."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:179 apt-config.8.xml:84
-msgid "dump"
-msgstr "dump"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:180
+#: apt-cache.8.xml:149
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -1516,13 +1027,8 @@ msgstr ""
 "<literal>dump</literal> mostra uma listagem curta de todos os pacotes na "
 "cache. É principalmente para depuração."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:184
-msgid "dumpavail"
-msgstr "dumpavail"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:185
+#: apt-cache.8.xml:154
 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."
@@ -1531,13 +1037,8 @@ msgstr ""
 "stdout. Isto é apropriado para usar com o &dpkg; e é usado pelo método "
 "&dselect;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:189
-msgid "unmet"
-msgstr "unmet"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:190
+#: apt-cache.8.xml:159
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -1545,13 +1046,8 @@ msgstr ""
 "<literal>unmet</literal> mostra um sumário de todas as dependências "
 "insatisfeitas na cache do pacote."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:194
-msgid "show <replaceable>pkg(s)</replaceable>"
-msgstr "show <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:195
+#: apt-cache.8.xml:164
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -1559,24 +1055,34 @@ msgstr ""
 "<literal>show</literal> executa uma função semelhante ao <command>dpkg --"
 "print-avail</command>; mostra os registos do pacote para os pacotes nomeados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:200
-msgid "search <replaceable>regex [ regex ... ]</replaceable>"
-msgstr "search <replaceable>regex [ regex ... ]</replaceable>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:169
+msgid "&synopsis-regex;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:201
+#: apt-cache.8.xml:170
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see "
+#| "<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
+#| "<manvolnum>7</manvolnum></citerefentry>.  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 "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>.  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."
+"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."
 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 "
@@ -1590,7 +1096,7 @@ msgstr ""
 "longa, apenas no nome do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:214
+#: apt-cache.8.xml:181
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -1598,13 +1104,8 @@ msgstr ""
 "Podem ser usados argumentos separados para especificar múltiplos padrões de "
 "busca os quais são lidados em conjunto."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:218
-msgid "depends <replaceable>pkg(s)</replaceable>"
-msgstr "depends <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:219
+#: apt-cache.8.xml:186
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -1613,13 +1114,8 @@ msgstr ""
 "pacote tem e todos os outros pacotes possíveis que podem satisfazer essa "
 "dependência."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:223
-msgid "rdepends <replaceable>pkg(s)</replaceable>"
-msgstr "rdepends <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:224
+#: apt-cache.8.xml:191
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -1628,12 +1124,12 @@ msgstr ""
 "que um pacote tem."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:228
-msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
-msgstr "pkgnames <replaceable>[ prefixo ]</replaceable>"
+#: apt-cache.8.xml:195
+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:229
+#: apt-cache.8.xml:196
 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 "
@@ -1648,7 +1144,7 @@ msgstr ""
 "opção <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:234
+#: apt-cache.8.xml:201
 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 "
@@ -1658,13 +1154,8 @@ msgstr ""
 "para download, instalável ou instalado, por exemplo, os pacotes virtuais "
 "também são listados na lista gerada."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:239
-msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgstr "dotty <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:240
+#: apt-cache.8.xml:207
 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."
@@ -1685,12 +1176,18 @@ msgstr ""
 "defina a opção <literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:216
+#, fuzzy
+#| msgid ""
+#| "The resulting nodes will have several shapes; normal packages are boxes, "
+#| "pure provides are triangles, mixed provides are diamonds, missing "
+#| "packages are hexagons. Orange boxes mean recursion was stopped [leaf "
+#| "packages], blue lines are pre-depends, green lines are conflicts."
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
-"pure provides are triangles, mixed provides are diamonds, missing packages "
-"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue "
-"lines are pre-depends, green lines are conflicts."
+"pure virtual packages are triangles, mixed virtual packages are diamonds, "
+"missing packages are hexagons. Orange boxes mean recursion was stopped (leaf "
+"packages), blue lines are pre-depends, green lines are conflicts."
 msgstr ""
 "Os nós resultantes irão ter várias formas; pacotes normais são caixas, "
 "fornecimentos puros são triângulos, fornecimentos mistos são diamantes, "
@@ -1699,19 +1196,14 @@ msgstr ""
 "verdes são conflitos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:221
 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><term>
-#: apt-cache.8.xml:257
-msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgstr "xvcg <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:258
+#: apt-cache.8.xml:225
 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>."
@@ -1721,12 +1213,12 @@ msgstr ""
 "VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:262
-msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-msgstr "policy <replaceable>[ pacote(s) ]</replaceable>"
+#: apt-cache.8.xml:229
+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:263
+#: apt-cache.8.xml:230
 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 "
@@ -1738,13 +1230,8 @@ msgstr ""
 "propriedades de cada fonte. Caso contrário escreve informação detalhada "
 "acerca da selecção de prioridade do pacote nomeado."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:269
-msgid "madison <replaceable>/[ pkg(s) ]</replaceable>"
-msgstr "madison <replaceable>/[ pacote(s) ]</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:237
 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 "
@@ -1762,25 +1249,15 @@ msgstr ""
 "arquitectura que o APT recolheu listas de pacotes (<literal>APT::"
 "Architecture</literal>)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr "opções"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>-p</option>"
-msgstr "<option>-p</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--pkg-cache</option>"
-msgstr "<option>--pkg-cache</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:286
+#: apt-cache.8.xml:253
 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::"
@@ -1790,19 +1267,8 @@ msgstr ""
 "a cache principal usada por todas as operações. Item de Configuração: "
 "<literal>Dir::Cache::pkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
-#: apt-sortpkgs.1.xml:58
-msgid "<option>-s</option>"
-msgstr "<option>-s</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291
-msgid "<option>--src-cache</option>"
-msgstr "<option>--src-cache</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:292
+#: apt-cache.8.xml:259
 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 "
@@ -1816,18 +1282,8 @@ msgstr ""
 "pacote é usada a cache fonte para evitar reanalisar todos os ficheiros do "
 "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
-msgid "<option>-q</option>"
-msgstr "<option>-q</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
-msgid "<option>--quiet</option>"
-msgstr "<option>--quiet</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:300
+#: apt-cache.8.xml:267
 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 "
@@ -1840,39 +1296,42 @@ msgstr ""
 "nível de serenidade, sobrepondo o ficheiro de configuração. Item de "
 "Configuração: <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:306
-msgid "<option>-i</option>"
-msgstr "<option>-i</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:306
-msgid "<option>--important</option>"
-msgstr "<option>--important</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:307
+#: apt-cache.8.xml:274
 msgid ""
-"Print only important dependencies; for use with unmet and depends. Causes "
-"only Depends and Pre-Depends relations to be printed.  Configuration Item: "
-"<literal>APT::Cache::Important</literal>."
+"Print only important dependencies; for use with <literal>unmet</literal> and "
+"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
+"be printed.  Configuration Item: <literal>APT::Cache::Important</literal>."
 msgstr ""
-"Escreve apenas dependências importantes; para usar com unmet e depends. "
-"Separa apenas relações de Depends e Pre-Depends para serem escritas. Item de "
-"Configuração: <literal>APT::Cache::Important</literal>."
+"Escreve apenas dependências importantes; para usar com <literal>unmet</"
+"literal> e <literal>depends</literal>. Separa apenas relações de Depends e "
+"Pre-Depends para serem escritas. Item de Configuração: <literal>APT::Cache::"
+"Important</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
-msgid "<option>-f</option>"
-msgstr "<option>-f</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
-msgid "<option>--full</option>"
-msgstr "<option>--full</option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:288
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be twicked 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> "
+"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>."
+msgstr ""
+"Por predefinição o <literal>depends</literal> e <literal>rdepends</literal> "
+"escrevem todas as dependências. Isto pode ser afinado com estas bandeiras "
+"que irão omitir o tipo de dependência especificado. Item de Configuração: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"ex. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:295
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1880,22 +1339,12 @@ msgstr ""
 "Escreve registos de pacote completos quando procura. Item de Configuração: "
 "<literal>APT::Cache::ShowFull</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
-msgid "<option>-a</option>"
-msgstr "<option>-a</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
-msgid "<option>--all-versions</option>"
-msgstr "<option>--all-versions</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:300
 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-"
-"versions</option> is specified, only the candidate version will displayed "
+"versions</option> is specified, only the candidate version will be displayed "
 "(the one which would be selected for installation).  This option is only "
 "applicable to the <literal>show</literal> command.  Configuration Item: "
 "<literal>APT::Cache::AllVersions</literal>."
@@ -1907,18 +1356,8 @@ msgstr ""
 "Esta opção é aplicável apenas ao comando <literal>show</literal>. Item de "
 "Configuração: <literal>APT::Cache::AllVersions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>-g</option>"
-msgstr "<option>-g</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--generate</option>"
-msgstr "<option>--generate</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:309
 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</"
@@ -1929,18 +1368,8 @@ msgstr ""
 "generate</option>. Item de Configuração: <literal>APT::Cache::Generate</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--names-only</option>"
-msgstr "<option>--names-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
-msgid "<option>-n</option>"
-msgstr "<option>-n</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:315
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1948,13 +1377,8 @@ 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><term>
-#: apt-cache.8.xml:337
-msgid "<option>--all-names</option>"
-msgstr "<option>--all-names</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:320
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1964,13 +1388,8 @@ msgstr ""
 "pacotes virtuais e dependências em falta. Item de configuração: "
 "<literal>APT::Cache::AllNames</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
-msgid "<option>--recurse</option>"
-msgstr "<option>--recurse</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:326
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1980,13 +1399,8 @@ msgstr ""
 "para que todos os pacotes mencionados sejam escritos uma vez. Item de "
 "Configuração <literal>APT::Cache::RecurseDepends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
-msgid "<option>--installed</option>"
-msgstr "<option>--installed</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:333
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1996,47 +1410,35 @@ msgstr ""
 "aos pacotes que estão actualmente instalados. Item de Configuração: "
 "<literal>APT::Cache::Installed</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
-#: apt-sortpkgs.1.xml:64
-msgid "&apt-commonoptions;"
-msgstr "&apt-commonoptions;"
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1044 apt_preferences.5.xml:630
+#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Ficheiros"
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
-msgid "&file-sourceslist; &file-statelists;"
-msgstr "&file-sourceslist; &file-statelists;"
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
-#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637
-#: sources.list.5.xml:233
+#: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+#: sources.list.5.xml:252
 msgid "See Also"
 msgstr "Veja também"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:351
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnóstico"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:356
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2044,42 +1446,13 @@ msgstr ""
 "<command>apt-cache</command> devolve zero em operação normal, 100 decimal em "
 "erro."
 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-cdrom.8.xml:13
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
-"February 2004</date>"
-msgstr ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
-"Fevereiro 2004</date>"
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28
-msgid "apt-cdrom"
-msgstr "apt-cdrom"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:29
+#: apt-cdrom.8.xml:32
 msgid "APT CDROM management utility"
 msgstr "Utilitário de gestão de CDROM do APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:35
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>ponto de montagem do cdrom</replaceable></"
-"option></arg> <arg><option>-o=<replaceable>string de configuração</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>ficheiro</"
-"replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:48
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -2092,7 +1465,7 @@ msgstr ""
 "e verificar os ficheiros de índice."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:55
+#: apt-cdrom.8.xml:45
 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 disk in a multi-cd set "
@@ -2103,13 +1476,8 @@ msgstr ""
 "de vários discos tem que ser inserido e sondado separadamente para ter em "
 "conta possíveis falhas."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:65
-msgid "add"
-msgstr "add"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -2123,8 +1491,8 @@ msgstr ""
 "disco não possuir um directório <filename>disk</filename> apropriado, ser-"
 "lhe-à pedido um título descritivo."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -2134,13 +1502,8 @@ msgstr ""
 "drive e mantêm uma base de dados desses IDs em <filename>&statedir;/cdroms."
 "list</filename>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:81
-msgid "ident"
-msgstr "ident"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:82
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -2148,34 +1511,13 @@ msgstr ""
 "Uma ferramenta de depuração para reportar a identificação do disco actual "
 "assim como o nome de ficheiro armazenado"
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:61
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present.  <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-"A menos que a opção <option>-h</option>, ou <option>--help</option> seja "
-"fornecida, um dos comandos abaixo têm que estar presentes. <placeholder type="
-"\"variablelist\" id=\"0\"/>"
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91 apt-key.8.xml:139
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
 msgid "Options"
 msgstr "Opções"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
-msgid "<option>-d</option>"
-msgstr "<option>-d</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95
-msgid "<option>--cdrom</option>"
-msgstr "<option>--cdrom</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:96
+#: apt-cdrom.8.xml:85
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -2186,18 +1528,8 @@ msgstr ""
 "configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::"
 "mount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:104
-msgid "<option>-r</option>"
-msgstr "<option>-r</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:104
-msgid "<option>--rename</option>"
-msgstr "<option>--rename</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:105
+#: apt-cdrom.8.xml:94
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -2208,18 +1540,8 @@ msgstr ""
 "command> pergunte por uma nova etiqueta. Item de configuração: <literal>APT::"
 "CDROM::Rename</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
-msgid "<option>-m</option>"
-msgstr "<option>-m</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113
-msgid "<option>--no-mount</option>"
-msgstr "<option>--no-mount</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:114
+#: apt-cdrom.8.xml:103
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -2229,13 +1551,8 @@ msgstr ""
 "desmontar o ponto de montagem. Item de configuração: <literal>APT::CDROM::"
 "NoMount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--fast</option>"
-msgstr "<option>--fast</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:111
 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 "
@@ -2247,13 +1564,8 @@ msgstr ""
 "já foi corrido com este disco e não detectou nenhum erro. Item de "
 "configuração: <literal>APT::CDROM::Fast</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131
-msgid "<option>--thorough</option>"
-msgstr "<option>--thorough</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:121
 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 "
@@ -2263,23 +1575,8 @@ msgstr ""
 "discos Debian antigos 1.1/1.2 que têm ficheiros de pacotes em lugares "
 "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
-msgid "<option>--just-print</option>"
-msgstr "<option>--just-print</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
-msgid "<option>--recon</option>"
-msgstr "<option>--recon</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
-msgid "<option>--no-act</option>"
-msgstr "<option>--no-act</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:143
+#: apt-cdrom.8.xml:132
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -2290,12 +1587,12 @@ msgstr ""
 "configuração: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:156
+#: apt-cdrom.8.xml:145
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:161
+#: apt-cdrom.8.xml:150
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2303,31 +1600,13 @@ msgstr ""
 "<command>apt-cdrom</command> devolve zero em operação normal, 100 decimal em "
 "erro."
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-config.8.xml:22 apt-config.8.xml:29
-msgid "apt-config"
-msgstr "apt-config"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:30
+#: apt-config.8.xml:33
 msgid "APT Configuration Query program"
 msgstr "Programa de Consulta de Configuração do APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:36
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>string de configuração</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:48
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -2339,22 +1618,8 @@ msgstr ""
 "ficheiro de configuração principal <filename>/etc/apt/apt.conf</filename> de "
 "um modo que é fácil de usar para aplicações em script."
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:72
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-"A menos que a opção <option>-h</option>, ou <option>--help</option> seja "
-"fornecida, um dos comandos abaixo têm que estar presentes."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:58
-msgid "shell"
-msgstr "shell"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:60
+#: apt-config.8.xml:51
 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 "
@@ -2369,7 +1634,7 @@ msgstr ""
 "script shell deverá ser usado como:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:68
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -2381,7 +1646,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:73
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -2390,7 +1655,7 @@ msgstr ""
 "options com uma predefinição de <option>-f</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:77
+#: apt-config.8.xml:68
 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 "
@@ -2402,18 +1667,42 @@ msgstr ""
 "verificado internamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:86
+#: apt-config.8.xml:77
 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:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-config.8.xml:95
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the name of the option, &percnt;f with the complete optionname and &percnt;v "
+"with the value of the option.  Use uppercase letters and special characters "
+"in the value will be encoded to ensure that it can e.g. be savely used in a "
+"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
+"&percnt;."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
-#: apt-sortpkgs.1.xml:70
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
+#: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:109
+#: apt-config.8.xml:115
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2421,38 +1710,20 @@ msgstr ""
 "<command>apt-config</command> devolve zero em operação normal, 100 decimal "
 "em erro."
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29
-msgid "apt-extracttemplates"
-msgstr "apt-extracttemplates"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:30
+#: apt-extracttemplates.1.xml:33
 msgid "Utility to extract DebConf config and templates from Debian packages"
 msgstr ""
 "Utilitário para extrair configurações e modelos DebConf a partir de pacotes "
 "Debian"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:36
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-msgstr ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>directório temporário</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</"
-"replaceable></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:44
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -2467,36 +1738,27 @@ msgstr ""
 "gerada uma linha no formato:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:49
+#: apt-extracttemplates.1.xml:44
 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:50
+#: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
 msgstr ""
 "ficheiro-modelo e script-de-configuração são escritos num directório "
-"temporário especificado por  -t ou --tempdir (<literal>APT::"
-"ExtractTemplates::TempDir</literal>) directório, com nomes de ficheiros no "
-"formato <filename>pacote.modelo.XXXX</filename> e <filename>pacote."
-"configuração.XXXX</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
-msgid "<option>-t</option>"
-msgstr "<option>-t</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60
-msgid "<option>--tempdir</option>"
-msgstr "<option>--tempdir</option>"
+"temporário especificado por <option>-t</option> ou <option>--tempdir</"
+"option> (<literal>APT::ExtractTemplates::TempDir</literal>) directório, com "
+"nomes de ficheiros no formato <filename>pacote.modelo.XXXX</filename> e "
+"<filename>pacote.configuração.XXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:62
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2507,7 +1769,7 @@ msgstr ""
 "ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:79
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2515,71 +1777,13 @@ msgstr ""
 "<command>apt-extracttemplates</command> devolve zero na operação normal, 100 "
 "decimal em erro."
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-ftparchive.1.xml:13
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
-"August 2009</date>"
-msgstr ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
-"Agosto 2009</date>"
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
-msgid "apt-ftparchive"
-msgstr "apt-ftparchive"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:30
+#: apt-ftparchive.1.xml:33
 msgid "Utility to generate index files"
 msgstr "Utilitário para gerar ficheiros de índice"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:36
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-msgstr ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>arquitectura</replaceable></option></"
-"arg> <arg><option>-o <replaceable>configuração</"
-"replaceable>=<replaceable>string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>ficheiro</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>caminho</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></arg></"
-"arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>caminho</"
-"replaceable></arg><arg><replaceable>sobrepor</"
-"replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></arg></"
-"arg> <arg>contents <arg choice=\"plain\"><replaceable>caminho</replaceable></"
-"arg></arg> <arg>release <arg choice=\"plain\"><replaceable>caminho</"
-"replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-"\"><replaceable>ficheiro-de-configuração</replaceable></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>secção</replaceable></arg></arg> "
-"<arg>clean <arg choice=\"plain\"><replaceable>ficheiro-de-configuração</"
-"replaceable></arg></arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:57
+#: apt-ftparchive.1.xml:39
 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 "
@@ -2592,7 +1796,7 @@ msgstr ""
 "baseados no conteúdo desse site."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:61
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -2607,7 +1811,7 @@ msgstr ""
 "script o processo de geração para um arquivo completo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:67
+#: apt-ftparchive.1.xml:49
 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 "
@@ -2621,13 +1825,8 @@ msgstr ""
 "geração completa, executa automaticamente verificações de alterações de "
 "ficheiros e constrói os ficheiros comprimidos desejados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:76
-msgid "packages"
-msgstr "packages"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:78
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -2640,20 +1839,15 @@ msgstr ""
 "Este comando é aproximadamente equivalente ao &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 "A opção <option>--db</option> pode ser usada para especificar uma base de "
 "dados de cache binária."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:86
-msgid "sources"
-msgstr "sources"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:88
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -2666,7 +1860,7 @@ msgstr ""
 "Este comando é aproximadamente equivalente ao &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:93
+#: apt-ftparchive.1.xml:75
 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 "
@@ -2677,13 +1871,8 @@ msgstr ""
 "source-override pode ser usada para alterar o ficheiro de sobreposição de "
 "fonte que irá ser usado."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:98
-msgid "contents"
-msgstr "contents"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:100
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -2700,36 +1889,32 @@ msgstr ""
 "múltiplos pacotes possuírem o mesmo ficheiro então cada pacote é separado "
 "por uma vírgula na saída."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:110
-msgid "release"
-msgstr "release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:112
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
-"directory tree. It recursively searches the given directory for Packages, "
-"Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and "
-"md5sum.txt files.  It then writes to stdout a Release file containing an MD5 "
-"digest and SHA1 digest for each file."
+"directory tree. It recursively searches the given directory for uncompressed "
+"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"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 Release file containing a MD5, SHA1 "
+"and SHA256 digest for each file."
 msgstr ""
-"O comando <literal>release</literal> gera um ficheiro Release a partir duma "
-"árvore de directórios. Procura recursivamente o directório dado por "
-"ficheiros Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources."
-"bz2, Release e md5sum.txt. Depois escreve para o stdout um ficheiro Release "
-"contendo um sumário MD5 e um sumário SHA1 por cada ficheiro."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
 "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
 "supported fields are: <literal>Origin</literal>, <literal>Label</literal>, "
 "<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
-"literal>, <literal>Date</literal>, <literal>Architectures</literal>, "
-"<literal>Components</literal>, <literal>Description</literal>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 "Valores para os campos de metadados adicionais no ficheiro Release são "
 "tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::"
@@ -2740,13 +1925,8 @@ msgstr ""
 "<literal>Architectures</literal>, <literal>Components</literal>, "
 "<literal>Description</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
-msgid "generate"
-msgstr "generate"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:117
 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 "
@@ -2761,13 +1941,8 @@ msgstr ""
 "de quais directórios, assim como disponibilizar um meio simples de manter as "
 "definições requeridas."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
-msgid "clean"
-msgstr "clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2777,12 +1952,12 @@ msgstr ""
 "são necessários."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:132
 msgid "The Generate Configuration"
 msgstr "A Configuração do Generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2799,7 +1974,7 @@ msgstr ""
 "árvore. Isto apenas afecta o modo de como a etiqueta scope é manuseada."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
@@ -2807,12 +1982,14 @@ msgstr ""
 "abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
-msgid "Dir Section"
-msgstr "Secção Dir"
+#: apt-ftparchive.1.xml:144
+#, fuzzy
+#| msgid "the <literal>Origin:</literal> line"
+msgid "<literal>Dir</literal> Section"
+msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2824,13 +2001,8 @@ msgstr ""
 "Estes directórios precedem a certos caminhos relativos definidos em secções "
 "posteriores para produzir um caminho completo e absoluto."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
-msgid "ArchiveDir"
-msgstr "ArchiveDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:153
 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 "
@@ -2839,33 +2011,18 @@ msgstr ""
 "Especifica a raiz do arquivo FTP, numa configuração Debian standard este é o "
 "directório que contém o <filename>ls-LR</filename> e nós da distribuição."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
-msgid "OverrideDir"
-msgstr "OverrideDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:160
 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><term>
-#: apt-ftparchive.1.xml:177
-msgid "CacheDir"
-msgstr "CacheDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:165
 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><term>
-#: apt-ftparchive.1.xml:182
-msgid "FileListDir"
-msgstr "FileListDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2874,12 +2031,14 @@ msgstr ""
 "definição <literal>FileList</literal> for usada mais abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
-msgid "Default Section"
-msgstr "Secção Default"
+#: apt-ftparchive.1.xml:176
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>Default</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2889,13 +2048,8 @@ msgstr ""
 "definições que controlam a operação do gerador. Outras secções podem "
 "sobrepor estas predefinições em uma definição por-secção."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Packages::Compress"
-msgstr "Packages::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:184
 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 "
@@ -2907,13 +2061,8 @@ msgstr ""
 "pelo menos um de:  '.' (nenhuma compressão), 'gzip' and 'bzip2'. A "
 "predefinição para todos os esquemas de compressão é '. gzip'."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
-msgid "Packages::Extensions"
-msgstr "Packages::Extensions"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2921,13 +2070,8 @@ msgstr ""
 "Define a lista predefinida das extensões de ficheiros que são ficheiros "
 "pacote. A predefinição é '.deb'."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
-msgid "Sources::Compress"
-msgstr "Sources::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -2935,13 +2079,8 @@ msgstr ""
 "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
 "controla a compressão para os ficheiros das Fontes."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
-msgid "Sources::Extensions"
-msgstr "Sources::Extensions"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -2949,13 +2088,8 @@ msgstr ""
 "Define a lista predefinida das extensões de ficheiros que são ficheiros de "
 "fontes. A predefinição é '.dsc'."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
-msgid "Contents::Compress"
-msgstr "Contents::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -2963,33 +2097,17 @@ msgstr ""
 "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
 "controla a compressão para os ficheiros de Conteúdos."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
-#, fuzzy
-#| msgid "Contents::Compress"
-msgid "Translation::Compress"
-msgstr "Contents::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
-#, fuzzy
-#| msgid ""
-#| "This is similar to <literal>Packages::Compress</literal> except that it "
-#| "controls the compression for the Contents files."
+#: apt-ftparchive.1.xml:216
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
-"controla a compressão para os ficheiros de Conteúdos."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
-msgid "DeLinkLimit"
-msgstr "DeLinkLimit"
+"controla a compressão para o ficheiro mestre Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:222
 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-"
@@ -2999,13 +2117,8 @@ msgstr ""
 "por execução. Isto é usado em conjunto com a definição <literal>External-"
 "Links</literal> por secção."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
-msgid "FileMode"
-msgstr "FileMode"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:229
 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."
@@ -3014,27 +2127,24 @@ msgstr ""
 "0644. Todos os ficheiros índice são definidos para este modo "
 "independentemente do umask."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
-#, fuzzy
-#| msgid "Description"
-msgid "LongDescription"
-msgstr "Descrição"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
+"Define se as descrições longas devem ser incluídas no ficheiro Packages ou "
+"divididas em um ficheiro Translation-en mestre."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:256
-msgid "TreeDefault Section"
-msgstr "Secção TreeDefault"
+#: apt-ftparchive.1.xml:242
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -3044,13 +2154,8 @@ msgstr ""
 "Todas estas variáveis são variáveis de substituição e têm as strings "
 "$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:263
-msgid "MaxContentsChange"
-msgstr "MaxContentsChange"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:251
 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 "
@@ -3060,13 +2165,8 @@ msgstr ""
 "cada dia. Os ficheiros de conteúdo são re-circulados para que ao fim de "
 "alguns dias todos sejam reconstruídos."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
-msgid "ContentsAge"
-msgstr "ContentsAge"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:258
 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. "
@@ -3083,13 +2183,8 @@ msgstr ""
 "que novos .debs sejam instalados, requerendo um novo ficheiro de qualquer "
 "modo. A predefinição é 10, as unidades são em dias."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281
-msgid "Directory"
-msgstr "Directory"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3097,13 +2192,8 @@ msgstr ""
 "Define o topo da árvore de directórios .deb. A predefinição é <filename>"
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287
-msgid "SrcDirectory"
-msgstr "SrcDirectory"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -3111,13 +2201,8 @@ msgstr ""
 "Define o topo da árvore de directórios de pacotes fonte. A predefinição é "
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
-msgid "Packages"
-msgstr "Packages"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -3125,13 +2210,8 @@ msgstr ""
 "Define o ficheiro Packages de saída. A predefinição é <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
-msgid "Sources"
-msgstr "Sources"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:287
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -3139,28 +2219,19 @@ msgstr ""
 "Define o ficheiro Sources de saída. A predefinição é <filename>$(DIST)/"
 "$(SECTION)/source/Sources</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305
-#, fuzzy
-#| msgid "Operation"
-msgid "Translation"
-msgstr "Operação"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:293
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
-msgid "InternalPrefix"
-msgstr "InternalPrefix"
+"Define se o ficheiro mestre Translation-en de saída com as descrições longas "
+"não deve ser incluído no ficheiro Packages. A predefinição é <filename>"
+"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:300
 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)/</"
@@ -3170,13 +2241,8 @@ msgstr ""
 "link interno em vez de um link externo. A predefinição é <filename>$(DIST)/"
 "$(SECTION)/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
-msgid "Contents"
-msgstr "Contents"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3189,23 +2255,13 @@ msgstr ""
 "então o <command>apt-ftparchive</command> irá automaticamente integrar esses "
 "ficheiros pacotes todos juntos."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:328
-msgid "Contents::Header"
-msgstr "Contents::Header"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml:316
 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><term>
-#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
-msgid "BinCacheDB"
-msgstr "BinCacheDB"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -3213,13 +2269,8 @@ msgstr ""
 "Define a base de dados de cache binária a usar para esta secção. Múltiplas "
 "secções podem partilhar a mesma base de dados."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:339
-msgid "FileList"
-msgstr "FileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:341
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3230,13 +2281,8 @@ msgstr ""
 "fornecido. Nomes de ficheiros relativos são prefixados com o directório de "
 "arquivo."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
-msgid "SourceFileList"
-msgstr "SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3249,12 +2295,14 @@ msgstr ""
 "arquivo. Isto é usado quando se processa índices de fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:356
-msgid "Tree Section"
-msgstr "Secção Tree"
+#: apt-ftparchive.1.xml:342
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>Tree</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:358
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -3269,20 +2317,20 @@ msgstr ""
 "<literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:349
 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 "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-"setting such as <filename>dists/woody</filename>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 "A secção <literal>Tree</literal> recebe uma etiqueta scope que define a "
 "variável <literal>$(DIST)</literal> e define a raiz da árvore (o caminho é "
 "prefixado por <literal>ArchiveDir</literal>). Tipicamente esta é uma "
-"definição tal como <filename>dists/woody</filename>."
+"definição tal como <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -3293,7 +2341,7 @@ msgstr ""
 "variáveis."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:374
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -3307,7 +2355,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml:357
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -3317,13 +2365,8 @@ msgstr ""
 "ftparchive</command> executa uma operação semelhante a: <placeholder type="
 "\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380
-msgid "Sections"
-msgstr "Sections"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -3333,13 +2376,8 @@ msgstr ""
 "distribuição, tipicamente isto é algo como <literal>main contrib non-free</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
-msgid "Architectures"
-msgstr "Architectures"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:375
 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 "
@@ -3349,13 +2387,8 @@ msgstr ""
 "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><term>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
-msgid "BinOverride"
-msgstr "BinOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -3363,13 +2396,8 @@ msgstr ""
 "Define o ficheiro de sobreposição binário. O ficheiro de sobreposição "
 "informação de secção, prioridade e endereço do responsável."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
-msgid "SrcOverride"
-msgstr "SrcOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -3377,33 +2405,25 @@ msgstr ""
 "Define o ficheiro de sobreposição fonte. O ficheiro de sobreposição "
 "informação de secção."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
-msgid "ExtraOverride"
-msgstr "ExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 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><term>
-#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
-msgid "SrcExtraOverride"
-msgstr "SrcExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 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:424
-msgid "BinDirectory Section"
+#: apt-ftparchive.1.xml:410
+#, fuzzy
+#| msgid "BinDirectory Section"
+msgid "<literal>BinDirectory</literal> Section"
 msgstr "Secção BinDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3418,12 +2438,12 @@ msgstr ""
 "definições <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:420
 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:439
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3432,52 +2452,42 @@ msgstr ""
 "<literal>Packages</literal> ou <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:431
 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:450
+#: apt-ftparchive.1.xml:436
 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:455
+#: apt-ftparchive.1.xml:441
 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:470
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr "Define a base de dados de cache."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:473
-msgid "PathPrefix"
-msgstr "PathPrefix"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:461
 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><term>
-#: apt-ftparchive.1.xml:478
-msgid "FileList, SourceFileList"
-msgstr "FileList, SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr "Especifica o ficheiro de lista de ficheiros."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:473
 msgid "The Binary Override File"
 msgstr "O Ficheiro Binary Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3492,19 +2502,19 @@ msgstr ""
 "permutação do responsável."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3521,12 +2531,12 @@ msgstr ""
 "formato substitui incondicionalmente o campo do responsável."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:490
 msgid "The Source Override File"
 msgstr "O Ficheiro Source Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3537,12 +2547,12 @@ msgstr ""
 "nome de pacote fonte, o segundo é a secção onde o atribuir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr "O Ficheiro Extra Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3552,29 +2562,40 @@ msgstr ""
 "seja adicionada ou substituída na saída. Tem 3 colunas, a primeira é o "
 "pacote, a segunda é a etiqueta e restante da linha é o novo valor."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:522
-msgid "<option>--md5</option>"
-msgstr "<option>--md5</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:524
-msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+#: apt-ftparchive.1.xml:510
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</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.  "
+"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>."
 msgstr ""
-"Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros "
-"índice gerados não terão campos MD5Sum onde possíveis. Item de Configuração: "
-"<literal>APT::FTPArchive::MD5</literal>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
-msgid "<option>--db</option>"
-msgstr "<option>--db</option>"
+"Valores para os campos de metadados adicionais no ficheiro Release são "
+"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::"
+"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>.  "
+"Os campos suportados são: <literal>Origin</literal>, <literal>Label</"
+"literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+"<literal>Codename</literal>, <literal>Date</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:521
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3583,7 +2604,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:537
+#: apt-ftparchive.1.xml:527
 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 "
@@ -3596,13 +2617,8 @@ msgstr ""
 "silêncio, sobrepondo o ficheiro de configuração. Item de Configuração: "
 "<literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:543
-msgid "<option>--delink</option>"
-msgstr "<option>--delink</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:535
 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 "
@@ -3614,13 +2630,8 @@ msgstr ""
 "predefinição é ligada e e pode ser desligada com <option>--no-delink</"
 "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--contents</option>"
-msgstr "<option>--contents</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:543
 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 "
@@ -3635,13 +2646,8 @@ msgstr ""
 "criação de quaisquer ficheiros de Conteúdos. A predefinição é ligado. Item "
 "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
-msgid "<option>--source-override</option>"
-msgstr "<option>--source-override</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3651,13 +2657,8 @@ msgstr ""
 "<literal>sources</literal>. Item de Configuração: <literal>APT::FTPArchive::"
 "SourceOverride</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
-msgid "<option>--readonly</option>"
-msgstr "<option>--readonly</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:559
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3665,13 +2666,8 @@ msgstr ""
 "Torna as bases de dados de cache apenas de leitura. Item de Configuração: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:573
-msgid "<option>--arch</option>"
-msgstr "<option>--arch</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3684,13 +2680,8 @@ msgstr ""
 "pacotes presentes no caminho fornecido. Item de Configuração: <literal>APT::"
 "FTPArchive::Architecture</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:582
+#: apt-ftparchive.1.xml:572
 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 "
@@ -3713,20 +2704,8 @@ msgstr ""
 "de versão, portanto em teoria ninguém irá ter estes problemas e então todas "
 "as verificações extras serão desnecessárias."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:592
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>APT::FTPArchive::LongDescription</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:594
-#, fuzzy
-#| msgid ""
-#| "This configuration option defaults to \"<literal>true</literal>\" and "
-#| "should only be set to <literal>\"false\"</literal> if the Archive "
-#| "generated with &apt-ftparchive; also provides <filename>Translation</"
-#| "filename> files. Note that it is currently not possible to create these "
-#| "files with <command>apt-ftparchive</command>."
+#: apt-ftparchive.1.xml:584
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3737,23 +2716,23 @@ msgstr ""
 "Esta opção de configuração tem a predefinição de \"<literal>true</literal>\" "
 "e deve apenas ser definida para <literal>\"false\"</literal> se o Arquivo "
 "gerado com &apt-ftparchive; também disponibilizar ficheiros "
-"<filename>Translation</filename>. Note que actualmente não é possível criar "
-"esses ficheiros com <command>apt-ftparchive</command>."
+"<filename>Translation</filename>. Note que o ficheiro mestre "
+"<filename>Translation-en</filename> só pode ser criado no comando generate."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477
-#: sources.list.5.xml:193
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+#: sources.list.5.xml:211
 msgid "Examples"
 msgstr "Examples"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:612
+#: apt-ftparchive.1.xml:602
 #, 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:608
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3762,7 +2741,7 @@ msgstr ""
 "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3770,120 +2749,28 @@ msgstr ""
 "<command>apt-ftparchive</command> devolve zero na operação normal, 100 "
 "decimal em erro."
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-get.8.xml:13
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
-"November 2008</date>"
-msgstr ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
-"Novembro 2008</date>"
-
-#. type: <heading></heading>
-#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
-msgid "apt-get"
-msgstr "apt-get"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:30
+#: apt-get.8.xml:33
 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><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:36
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <group choice='req'> <arg choice='plain'> "
-"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> "
-"<replaceable>target_release_number_expression</replaceable> </arg> <arg "
-"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </"
-"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</"
-"replaceable> </arg> <arg choice='plain'> /"
-"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </"
-"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>string_de_configuração</replaceable> </option> </"
-"arg> <arg> <option>-c= <replaceable>ficheiro_de_configuração</replaceable> </"
-"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
-"choice='plain'> <replaceable>nome_de_lançamento_de_destino</replaceable> </"
-"arg> <arg choice='plain'> "
-"<replaceable>expressão_de_número_de_lançamento_de_destino</replaceable> </"
-"arg> <arg choice='plain'> "
-"<replaceable>nome_de_código_do_lançamento_de_destino</replaceable> </arg> </"
-"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>número_de_versão_do_pacote</"
-"replaceable> </arg> <arg choice='plain'> /"
-"<replaceable>nome_do_lançamento_de_destino</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>nome_de_código_do_lançamento_de_destino</"
-"replaceable> </arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></"
-"arg></arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pacote</replaceable></arg></arg> <arg choice='plain'>source "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> "
-"<group choice='req'> <arg choice='plain'> "
-"=<replaceable>número_de_versão_do_pacote</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>nome_de_lançamento_de_destino</replaceable> </"
-"arg> <arg choice='plain'> /"
-"<replaceable>nome_de_código_de_lançamento_de_destino</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: apt-get.8.xml:39
 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 "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 "<command>apt-get</command> é a ferramenta de linha de comandos para lidar "
 "com pacotes, e pode ser considerada o \"back-end\" dos utilizadores para "
 "outras ferramentas que usam a biblioteca APT. Existem várias interfaces "
-"\"front-end\" como o &dselect;, &aptitude;, &synaptic;, &gnome-apt; e "
-"&wajig;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
-msgid "update"
-msgstr "update"
+"\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3906,13 +2793,8 @@ msgstr ""
 "note que a medição do processo total ira estar incorrecta pois o tamanho dos "
 "ficheiros de pacotes não pode ser conhecido com antecedência."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
-msgid "upgrade"
-msgstr "upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3937,13 +2819,8 @@ msgstr ""
 "para que o <command>apt-get</command> fique a saber que estão disponíveis "
 "novas versões de pacotes."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
-msgid "dselect-upgrade"
-msgstr "dselect-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3958,13 +2835,8 @@ msgstr ""
 "dos pacotes disponíveis, e executa as acções necessárias para realizar esse "
 "estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3987,25 +2859,20 @@ msgstr ""
 "de pacotes desejados. Veja também &apt-preferences; para um mecanismo para "
 "sobrepor as definições gerais em pacotes individuais."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
-msgid "install"
-msgstr "install"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:98
 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 "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
-"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
-"packages required by the package(s) specified for installation will also be "
-"retrieved and installed.  The <filename>/etc/apt/sources.list</filename> "
-"file is used to locate the desired packages. If a hyphen is appended to the "
-"package name (with no intervening space), the identified package will be "
-"removed if it is installed.  Similarly a plus sign can be used to designate "
-"a package to install. These latter features may be used to override "
-"decisions made by apt-get's conflict resolution system."
+"qualified filename (for instance, in a Debian system, libc6 would be the "
+"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
+"required by the package(s) specified for installation will also be retrieved "
+"and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
+"to locate the desired packages. If a hyphen is appended to the package name "
+"(with no intervening space), the identified package will be removed if it is "
+"installed.  Similarly a plus sign can be used to designate a package to "
+"install. These latter features may be used to override decisions made by apt-"
+"get's conflict resolution system."
 msgstr ""
 "<literal>install</literal> é seguido por um ou mais pacotes desejados para "
 "instalação ou actualização. Cada pacote é um nome de pacote, não um nome de "
@@ -4021,7 +2888,7 @@ msgstr ""
 "decisões feitas pelo sistema de resolução de conflitos do apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:116
 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 "
@@ -4038,7 +2905,7 @@ msgstr ""
 "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:210
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -4047,7 +2914,7 @@ msgstr ""
 "e devem ser usados com cuidado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:126
 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. "
@@ -4067,7 +2934,7 @@ msgstr ""
 "descarregadas e instaladas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -4076,7 +2943,7 @@ msgstr ""
 "instalação alternativa para pacotes individuais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:141
 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 "
@@ -4094,13 +2961,8 @@ msgstr ""
 "lo' e 'lowest'. Se isto for indesejável, ancore a expressão regular com a "
 "caractere '^' ou '$', para criar uma expressão regular mais específica."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
-msgid "remove"
-msgstr "remove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -4114,13 +2976,8 @@ msgstr ""
 "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><term>
-#: apt-get.8.xml:245
-msgid "purge"
-msgstr "purge"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -4130,18 +2987,13 @@ msgstr ""
 "excepção que os pacotes são removidos e purgados (quaisquer ficheiros de "
 "configuração são também apagados)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
-msgid "source"
-msgstr "source"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
 "package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
 "default release, set with the option <literal>APT::Default-Release</"
 "literal>, the <option>-t</option> option or per package with the "
 "<literal>pkg/release</literal> syntax, if possible."
@@ -4155,7 +3007,7 @@ msgstr ""
 "<literal>pkg/release</literal>, se possível."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -4171,12 +3023,19 @@ msgstr ""
 "instalada ou pode instalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:179
+#, fuzzy
+#| msgid ""
+#| "If the <option>--compile</option> option is specified then the package "
+#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+#| "command>, if <option>--download-only</option> is specified then the "
+#| "source package will not be unpacked."
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option.  If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
 msgstr ""
 "Se for especificada a opção <option>--compile</option> então o pacote irá "
 "ser compilado para um binário .deb usando <command>dpkg-buildpackage</"
@@ -4184,7 +3043,7 @@ msgstr ""
 "pacote fonte não será desempacotado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:186
 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 "
@@ -4199,7 +3058,7 @@ msgstr ""
 "Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -4209,27 +3068,24 @@ msgstr ""
 "existem apenas no directório actual e são semelhantes à descarga de tar "
 "balls fonte."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
-msgid "build-dep"
-msgstr "build-dep"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:198
+#, fuzzy
+#| msgid ""
+#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+#| "an attempt to satisfy the build dependencies for a source package."
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package natively. If desired a "
+"host-architecture can be specified with the <option>--host-architecture</"
+"option> option instead."
 msgstr ""
 "<literal>build-dep</literal> faz o apt-get instalar/remover pacotes numa "
 "tentativa de satisfazer dependências de compilação para um pacote fonte."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
-msgid "check"
-msgstr "check"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -4238,7 +3094,14 @@ msgstr ""
 "de pacotes e verifica por dependências quebradas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
+msgid ""
+"<literal>download</literal> will download the given binary package into the "
+"current directory."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -4256,13 +3119,8 @@ msgstr ""
 "querer executar <literal>apt-get clean</literal> de tempos a tempos para "
 "libertar espaço do disco."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
-msgid "autoclean"
-msgstr "autoclean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -4280,29 +3138,38 @@ msgstr ""
 "configuração <literal>APT::Clean-Installed</literal> irá prevenir que "
 "pacotes instalados sejam apagados se estiver definida para 'off'."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
-msgid "autoremove"
-msgstr "autoremove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:236
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for some package and that "
+#| "are no more needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
 msgstr ""
 "<literal>autoremove</literal> é usado para remover pacotes que foram "
 "instalados automaticamente para satisfazer dependências de algum pacote e "
 "que já não são necessários."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
-msgid "<option>--no-install-recommends</option>"
-msgstr "<option>--no-install-recommends</option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:241
+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."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4310,13 +3177,21 @@ msgstr ""
 "Não considera pacotes recomendados como dependências para instalação. Item "
 "de Configuração: <literal>APT::Install-Recommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
-msgid "<option>--download-only</option>"
-msgstr "<option>--download-only</option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:269
+#, fuzzy
+#| msgid ""
+#| "Do not consider recommended packages as a dependency for installing.  "
+#| "Configuration Item: <literal>APT::Install-Recommends</literal>."
+msgid ""
+"Consider suggested packages as a dependency for installing.  Configuration "
+"Item: <literal>APT::Install-Suggests</literal>."
+msgstr ""
+"Não considera pacotes recomendados como dependências para instalação. Item "
+"de Configuração: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4325,13 +3200,8 @@ msgstr ""
 "desempacotados nem instalados. Item de Configuração: <literal>APT::Get::"
 "Download-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
-msgid "<option>--fix-broken</option>"
-msgstr "<option>--fix-broken</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:279
 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 "
@@ -4358,18 +3228,8 @@ msgstr ""
 "option> pode produzir um erro em algumas situações. Item de Configuração: "
 "<literal>APT::Get::Fix-Broken</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
-msgid "<option>--ignore-missing</option>"
-msgstr "<option>--ignore-missing</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
-msgid "<option>--fix-missing</option>"
-msgstr "<option>--fix-missing</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4387,13 +3247,8 @@ msgstr ""
 "de comandos) e não pode ser descarregado estão será retido em silêncio. Item "
 "de Configuração: <literal>APT::Get::Fix-Missing</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
-msgid "<option>--no-download</option>"
-msgstr "<option>--no-download</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:305
 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 "
@@ -4404,7 +3259,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:367
+#: apt-get.8.xml:312
 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 "
@@ -4423,18 +3278,8 @@ msgstr ""
 "pode decidir fazer algo que você não esperava. Item de Configuração: "
 "<literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
-msgid "<option>--simulate</option>"
-msgstr "<option>--simulate</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--dry-run</option>"
-msgstr "<option>--dry-run</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4445,7 +3290,7 @@ msgstr ""
 "Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4463,7 +3308,7 @@ msgstr ""
 "get</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4475,23 +3320,8 @@ msgstr ""
 "rectos ([]) indicam pacotes quebrados e conjuntos de parênteses rectos "
 "vazios significam quebras que não têm consequência (raro)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>-y</option>"
-msgstr "<option>-y</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--yes</option>"
-msgstr "<option>--yes</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
-msgid "<option>--assume-yes</option>"
-msgstr "<option>--assume-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:346
 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 "
@@ -4506,18 +3336,21 @@ msgstr ""
 "literal> irá abortar. Item de Configuração: <literal>APT::Get::Assume-Yes</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
-msgid "<option>-u</option>"
-msgstr "<option>-u</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
-msgid "<option>--show-upgraded</option>"
-msgstr "<option>--show-upgraded</option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them.  Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Compila pacotes fonte após os descarregar. Item de Configuração: "
+"<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4526,18 +3359,8 @@ msgstr ""
 "prestes a ser actualizados. Item de Configuração: <literal>APT::Get::Show-"
 "Upgraded</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
-msgid "<option>-V</option>"
-msgstr "<option>-V</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
-msgid "<option>--verbose-versions</option>"
-msgstr "<option>--verbose-versions</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4545,23 +3368,19 @@ msgstr ""
 "Mostra as versões completas para pacotes actualizados e instalados.  Item de "
 "Configuração: <literal>APT::Get::Show-Versions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
-msgid "<option>-b</option>"
-msgstr "<option>-b</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
-msgid "<option>--compile</option>"
-msgstr "<option>--compile</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
-msgid "<option>--build</option>"
-msgstr "<option>--build</option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:371
+msgid ""
+"This option controls the architecture packages are built for by <command>apt-"
+"get source --compile</command> and how cross-builddependencies are "
+"satisfied. By default is it not set which means that the host architecture "
+"is the same as the build architecture (which is defined by <literal>APT::"
+"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
+"Architecture</literal>"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4569,28 +3388,8 @@ msgstr ""
 "Compila pacotes fonte após os descarregar. Item de Configuração: "
 "<literal>APT::Get::Compile</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
-msgid "<option>--install-recommends</option>"
-msgstr "<option>--install-recommends</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
-msgid "Also install recommended packages."
-msgstr "Também instala pacotes recomendados."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
-msgid "Do not install recommended packages."
-msgstr "Não instala pacotes recomendados."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
-msgid "<option>--ignore-hold</option>"
-msgstr "<option>--ignore-hold</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:386
 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 "
@@ -4602,13 +3401,8 @@ msgstr ""
 "upgrade</literal> para sobrepor um grande número de retenções não desejadas. "
 "Item de Configuração: <literal>APT::Ignore-Hold</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
-msgid "<option>--no-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4620,17 +3414,18 @@ msgstr ""
 "actualizados na linha de comandos se estes já estiverem instalados. Item de "
 "Configuração: <literal>APT::Get::Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
-msgid "<option>--only-upgrade</option>"
-msgstr "<option>--only-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:400
+#, fuzzy
+#| msgid ""
+#| "Do not install new packages; When used in conjunction with "
+#| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
+#| "packages on the command line from being upgraded if they are not already "
+#| "installed.  Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
-"literal>, <literal>only-upgrade</literal> will prevent packages on the "
-"command line from being upgraded if they are not already installed.  "
+"literal>, <literal>only-upgrade</literal> will install upgrades for already "
+"installed packages only and ignore requests to install new packages.  "
 "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
 msgstr ""
 "Não instala pacotes novos; Quando usado em conjunto com <literal>install</"
@@ -4638,13 +3433,8 @@ msgstr ""
 "actualizados na linha de comandos se estes não estiverem já instalados. Item "
 "de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
-msgid "<option>--force-yes</option>"
-msgstr "<option>--force-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:408
 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 "
@@ -4658,13 +3448,8 @@ msgstr ""
 "literal> pode destruir potencialmente o seu sistema! Item de Configuração: "
 "<literal>APT::Get::force-yes</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
-msgid "<option>--print-uris</option>"
-msgstr "<option>--print-uris</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:416
 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 "
@@ -4682,15 +3467,10 @@ msgstr ""
 "<literal>source</literal> e <literal>update</literal>. Quando usado com o "
 "comando  <literal>update</literal> o MD5 e o tamanho não são incluídos, e "
 "cabe ao utilizador descomprimir quaisquer ficheiros comprimidos. Item de "
-"Configuração: <literal>APT::Get::Print-URIs</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
-msgid "<option>--purge</option>"
-msgstr "<option>--purge</option>"
+"Configuração: <literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:427
 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. "
@@ -4702,13 +3482,8 @@ msgstr ""
 "<option>remove --purge</option> é equivalente ao comando <option>purge</"
 "option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
-msgid "<option>--reinstall</option>"
-msgstr "<option>--reinstall</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:435
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4716,13 +3491,8 @@ msgstr ""
 "Re-instala pacotes que já estão instalados e na versão mais recente. Item de "
 "Configuração: <literal>APT::Get::ReInstall</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
-msgid "<option>--list-cleanup</option>"
-msgstr "<option>--list-cleanup</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:440
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4738,18 +3508,8 @@ msgstr ""
 "desligar isto é no caso de você alterar frequentemente a sua lista de "
 "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--target-release</option>"
-msgstr "<option>--target-release</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
-msgid "<option>--default-release</option>"
-msgstr "<option>--default-release</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:451
 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 "
@@ -4771,13 +3531,8 @@ msgstr ""
 "<option>-t sid</option>. Item de Configuração: <literal>APT::Default-"
 "Release</literal>; veja também o manual &apt-preferences;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
-msgid "<option>--trivial-only</option>"
-msgstr "<option>--trivial-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:466
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4790,13 +3545,8 @@ msgstr ""
 "option> irá responder 'não'. Item de Configuração: <literal>APT::Get::"
 "Trivial-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
-msgid "<option>--no-remove</option>"
-msgstr "<option>--no-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:473
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4805,13 +3555,8 @@ msgstr ""
 "imediatamente sem aviso. Item de Configuração: <literal>APT::Get::Remove</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
-msgid "<option>--auto-remove</option>"
-msgstr "<option>--auto-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:479
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4823,13 +3568,8 @@ msgstr ""
 "literal>, removendo os pacotes de dependências não utilizados. Item de "
 "Configuração: <literal>APT::Get::AutomaticRemove</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
-msgid "<option>--only-source</option>"
-msgstr "<option>--only-source</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:486
 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 "
@@ -4847,23 +3587,8 @@ msgstr ""
 "e procurar o pacote fonte correspondente. Item de Configuração: "
 "<literal>APT::Get::Only-Source</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
-msgid "<option>--diff-only</option>"
-msgstr "<option>--diff-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
-msgid "<option>--dsc-only</option>"
-msgstr "<option>--dsc-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
-msgid "<option>--tar-only</option>"
-msgstr "<option>--tar-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:497
 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</"
@@ -4873,13 +3598,8 @@ msgstr ""
 "Configuração: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-"
 "Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
-msgid "<option>--arch-only</option>"
-msgstr "<option>--arch-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:503
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4887,13 +3607,8 @@ msgstr ""
 "Apenas processa dependências de compilação dependentes da arquitectura. Item "
 "de Configuração: <literal>APT::Get::Arch-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
-msgid "<option>--allow-unauthenticated</option>"
-msgstr "<option>--allow-unauthenticated</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:508
 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::"
@@ -4903,17 +3618,8 @@ msgstr ""
 "é útil para ferramentas como o pbuilder. Item de Configuração: <literal>APT::"
 "Get::AllowUnauthenticated</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
-msgid ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-msgstr ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:530
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4924,7 +3630,7 @@ msgstr ""
 "&guidesdir;, &apt-preferences;, o Howto do APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:536
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4932,51 +3638,13 @@ msgstr ""
 "<command>apt-get</command> devolve zero na operação normal, 100 decimal em "
 "erro."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
-msgid "ORIGINAL AUTHORS"
-msgstr "AUTORES ORIGINAIS"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
-msgid "&apt-author.jgunthorpe;"
-msgstr "&apt-author.jgunthorpe;"
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
-msgid "CURRENT AUTHORS"
-msgstr "AUTORES ACTUAIS"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
-msgid "&apt-author.team;"
-msgstr "&apt-author.team;"
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-key.8.xml:14 apt-key.8.xml:21
-msgid "apt-key"
-msgstr "apt-key"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:22
+#: apt-key.8.xml:32
 msgid "APT key management utility"
 msgstr "Utilitário de gestão de chaves do APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:28
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>nome de "
-"ficheiro</replaceable></option></arg> <arg><replaceable>comando</"
-"replaceable></arg> <arg rep=\"repeat\"><option><replaceable>argumentos</"
-"replaceable></option></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:37
+#: apt-key.8.xml:39
 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 "
@@ -4987,84 +3655,53 @@ msgstr ""
 "estas chaves serão considerados de confiança."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:43
+#: apt-key.8.xml:45
 msgid "Commands"
 msgstr "Comandos"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:45
-msgid "add <replaceable>filename</replaceable>"
-msgstr "add <replaceable>nome-de-ficheiro</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:49
+#: apt-key.8.xml:50
+#, fuzzy
+#| msgid ""
+#| "Add a new key to the list of trusted keys.  The key is read from "
+#| "<replaceable>filename</replaceable>, or standard input if "
+#| "<replaceable>filename</replaceable> is <literal>-</literal>."
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"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 "
+"filename is <literal>-</literal> from standard input."
 msgstr ""
 "Adiciona uma chave nova à lista de chaves de confiança. A chave é lida de "
 "<replaceable>nome de ficheiro</replaceable>, ou entrada standard se "
 "<replaceable>nome de ficheiro</replaceable> for <literal>-</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:57
-msgid "del <replaceable>keyid</replaceable>"
-msgstr "del <replaceable>id de chave</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:61
+#: apt-key.8.xml:63
 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><term>
-#: apt-key.8.xml:68
-msgid "export <replaceable>keyid</replaceable>"
-msgstr "export <replaceable>id de chave</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:72
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
-msgstr ""
-"Escreve o <replaceable>id de chave</replaceable> da chave na saída standard."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:79
-msgid "exportall"
-msgstr "exportall"
+#: apt-key.8.xml:74
+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:83
+#: apt-key.8.xml:85
 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><term>
-#: apt-key.8.xml:90
-msgid "list"
-msgstr "list"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:94
+#: apt-key.8.xml:96
 msgid "List trusted keys."
 msgstr "Lista as chaves de confiança."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:101
-msgid "finger"
-msgstr "finger"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:105
+#: apt-key.8.xml:107
 msgid "List fingerprints of trusted keys."
 msgstr "Lista as fingerprints das chaves de confiança."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:112
-msgid "adv"
-msgstr "adv"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:116
+#: apt-key.8.xml:118
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -5073,16 +3710,28 @@ msgstr ""
 "chave pública."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:128
+#: apt-key.8.xml:130
+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 "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
+"Debian."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:144
 msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key.  "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate.  APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
 msgstr ""
-"Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
-"remove do chaveiro as chaves de arquivo que já não são válidas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:140
+#: apt-key.8.xml:161
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -5090,18 +3739,21 @@ msgstr ""
 "Note que as opções precisam ser definidas antes dos comandos descritos na "
 "secção prévia."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:142
-msgid "--keyring <replaceable>filename</replaceable>"
-msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:164
+#, fuzzy
+#| msgid ""
+#| "With this option it is possible to specify a specific keyring file the "
+#| "command should operate on. The default is that a command is executed on "
+#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
+#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
+#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
+#| "added to this one."
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
 "<filename>trusted.gpg</filename> file as well as on all parts in the "
-"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
 "filename> is the primary keyring which means that e.g. new keys are added to "
 "this one."
 msgstr ""
@@ -5112,87 +3764,50 @@ msgstr ""
 "filename> é o chaveiro principal o que significa que, por exemplo, as novas "
 "chaves são adicionadas a este."
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:156
-msgid "&file-trustedgpg;"
-msgstr "&file-trustedgpg;"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:158
+#: apt-key.8.xml:179
 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:159
+#: apt-key.8.xml:180
 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:162
+#: apt-key.8.xml:183
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:184
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:187
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:167
+#: apt-key.8.xml:188
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:176
+#: apt-key.8.xml:197
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-mark.8.xml:13
-msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
-msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"Agosto 2009</date>"
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-mark.8.xml:22 apt-mark.8.xml:29
-msgid "apt-mark"
-msgstr "apt-mark"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:30
+#: apt-mark.8.xml:33
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:36
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
-msgstr ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>NOME DE FICHEIRO</replaceable></option></arg> <group choice="
-"\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:53
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -5201,7 +3816,7 @@ msgstr ""
 "sendo instalado automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:43
 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 "
@@ -5216,15 +3831,15 @@ msgstr ""
 "pacote instalado manualmente, eles serão removidos pelo <command>apt-get</"
 "command> ou <command>aptitude</command> (exemplos)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:65
-msgid "markauto"
-msgstr "markauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:66
+#: apt-mark.8.xml:52
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<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 "
 "installed packages depend on this package."
 msgstr ""
@@ -5232,15 +3847,15 @@ msgstr ""
 "instalado automaticamente, o que irá causar a remoção do pacote quando mais "
 "nenhum pacote instalado manualmente depender deste pacote."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:73
-msgid "unmarkauto"
-msgstr "unmarkauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:74
+#: apt-mark.8.xml:60
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</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>unmarkauto</literal> is used to mark a package as being manually "
+"<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."
 msgstr ""
@@ -5248,103 +3863,85 @@ msgstr ""
 "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><term>
-#: apt-mark.8.xml:81
-msgid "showauto"
-msgstr "showauto"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:68
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold 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 "
+"effected by the <option>--filename</option> option."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:82
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
 msgstr ""
 "<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
 "instalados automaticamente com cada pacote numa linha nova."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:93
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:84
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
-"<option>-f=<filename><replaceable>NOME DE FICHEIRO</replaceable></filename></"
-"option>"
+"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
+"instalados automaticamente com cada pacote numa linha nova."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:94
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:92
 msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
 msgstr ""
-"<option>--file=<filename><replaceable>NOME DE FICHEIRO</replaceable></"
-"filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:99
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
 msgstr ""
-"Lê/Escreve o estado de pacote a partir de "
-"<filename><replaceable>NOME_DE_FICHEIRO</replaceable></filename> em vez da "
-"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><variablelist><varlistentry><term>
-#: apt-mark.8.xml:103
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:104
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:105
-msgid "Show a short usage summary."
-msgstr "Mostra um curto sumário de utilização."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:111
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:113
-msgid "Show the program version."
-msgstr "Mostra a versão do programa."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/var/lib/apt/extended_states</filename>"
+"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
+"instalados automaticamente com cada pacote numa linha nova."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
+#: apt-mark.8.xml:115
+#, fuzzy
+#| msgid ""
+#| "Read/Write package stats from <filename><replaceable>FILENAME</"
+#| "replaceable></filename> instead of the default location, which is "
+#| "<filename>extended_status</filename> in the directory defined by the "
+#| "Configuration Item: <literal>Dir::State</literal>."
 msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
 msgstr ""
-"Lista de estado de pacotes auto-instalados. Item de Configuração: "
-"<literal>Dir::State</literal> que define o caminho para o ficheiro "
-"<filename>extended_states</filename>."
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get;,&aptitude;,&apt-conf;"
+"Lê/Escreve o estado de pacote a partir de &synopsis-param-filename; em vez "
+"da 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><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:136
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5352,18 +3949,13 @@ msgstr ""
 "<command>apt-mark</command> devolve zero na operação normal, 100 decimal em "
 "erro."
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-secure.8.xml:14 apt-secure.8.xml:36
-msgid "apt-secure"
-msgstr "apt-secure"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:37
+#: apt-secure.8.xml:47
 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:42
+#: apt-secure.8.xml:52
 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 "
@@ -5376,7 +3968,7 @@ msgstr ""
 "não têm acesso à chave de assinatura do ficheiro Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:50
+#: apt-secure.8.xml:60
 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 "
@@ -5392,7 +3984,7 @@ msgstr ""
 "verificadas antes de descarregar pacotes delas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:59
+#: apt-secure.8.xml:69
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -5401,12 +3993,12 @@ msgstr ""
 "nova funcionalidade de autenticação."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:64
+#: apt-secure.8.xml:74
 msgid "Trusted archives"
 msgstr "Arquivos de confiança"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:67
+#: apt-secure.8.xml:77
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of "
 "different steps. <command>apt-secure</command> is the last step in this "
@@ -5423,7 +4015,7 @@ msgstr ""
 "assegurar que a integridade do arquivo está correcta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:75
+#: apt-secure.8.xml:85
 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 "
@@ -5436,7 +4028,7 @@ msgstr ""
 "verify e devscripts respectivamente)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:82
+#: apt-secure.8.xml:92
 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. This upload in order to "
@@ -5454,7 +4046,7 @@ msgstr ""
 "para assegurar a identidade do dono da chave."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:92
+#: apt-secure.8.xml:102
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -5472,7 +4064,7 @@ msgstr ""
 "Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:102
+#: apt-secure.8.xml:112
 msgid ""
 "Any end user can check the signature of the Release file, extract the MD5 "
 "sum of a package from it and compare it with the MD5 sum of the package he "
@@ -5487,7 +4079,7 @@ msgstr ""
 "sumário MD5 e a assinatura do ficheiro Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:109
+#: apt-secure.8.xml:119
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -5496,7 +4088,7 @@ msgstr ""
 "desenhado para prevenir dois ataques possíveis:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:114
+#: apt-secure.8.xml:124
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, a malicious agent can introduce himself in the package download "
@@ -5511,7 +4103,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:122
+#: apt-secure.8.xml:132
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -5524,7 +4116,7 @@ msgstr ""
 "descarregam pacotes a partir dessa máquina."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:129
+#: apt-secure.8.xml:139
 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 "
@@ -5537,12 +4129,12 @@ msgstr ""
 "mecanismo pode complementar uma assinatura por-pacote."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:135
+#: apt-secure.8.xml:145
 msgid "User configuration"
 msgstr "Configuração do utilizador"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:137
+#: apt-secure.8.xml:147
 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 "
@@ -5556,13 +4148,22 @@ msgstr ""
 "pacotes Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:144
+#: apt-secure.8.xml:154
+#, fuzzy
+#| 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 it with <command>apt-key</command> and then run <command>apt-get "
+#| "update</command> so that apt can download and verify the "
+#| "<filename>Release.gpg</filename> files from the archives you have "
+#| "configured."
 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 "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
-"command> so that apt can download and verify the <filename>Release.gpg</"
-"filename> files from the archives you have configured."
+"command> so that apt can download and verify the <filename>InRelease</"
+"filename> or <filename>Release.gpg</filename> files from the archives you "
+"have configured."
 msgstr ""
 "De modo a adicionar uma chave nova você precisa primeiro de descarregá-la "
 "(você deve certificar-se que está a usar um canal de comunicação de "
@@ -5572,12 +4173,12 @@ msgstr ""
 "arquivos que você configurou."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:153
+#: apt-secure.8.xml:163
 msgid "Archive configuration"
 msgstr "Configuração de arquivos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:165
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -5586,7 +4187,7 @@ msgstr ""
 "manutenção, você tem que:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:160
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -5597,16 +4198,21 @@ msgstr ""
 "command> (disponibilizado no apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:175
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
+#| "abs -o Release.gpg Release</command>."
 msgid ""
-"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
-"o Release.gpg Release</command>."
+"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
+"gpg Release</command>."
 msgstr ""
 "<emphasis>Assiná-lo</emphasis>. Você pode fazer isso ao correr <command>gpg -"
 "abs -o Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:168
+#: apt-secure.8.xml:179
 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 "
@@ -5617,7 +4223,7 @@ msgstr ""
 "autenticar os ficheiros no arquivo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:186
 msgid ""
 "Whenever the contents of the archive changes (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps previously "
@@ -5628,7 +4234,7 @@ msgstr ""
 "previamente delineados."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:183
+#: apt-secure.8.xml:194
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
@@ -5637,29 +4243,29 @@ msgstr ""
 "&debsign; &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:198
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
-"\">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."
+"\"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."
 msgstr ""
 "Para mais informação de fundo você deve querer reler a <ulink url=\"http://"
-"www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
-"\">Infraestrutura de Segurança da Debian</ulink> no capítulo do Manual "
-"Debian de Segurança (disponível também no pacote harden-doc) e o <ulink url="
-"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
-"Distribution HOWTO</ulink> de V. Alex Brennen."
+"www.debian.org/doc/manuals/securing-debian-howto/ch7\">Infraestrutura de "
+"Segurança da Debian</ulink> no capítulo do Manual Debian de Segurança "
+"(disponível também no pacote harden-doc) e o <ulink url=\"http://www."
+"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+"ulink> de V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:200
+#: apt-secure.8.xml:211
 msgid "Manpage Authors"
 msgstr "Autores do manual"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:202
+#: apt-secure.8.xml:213
 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."
@@ -5667,31 +4273,13 @@ msgstr ""
 "Este manual é baseado no trabalho de Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer e Michael Vogt."
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29
-msgid "apt-sortpkgs"
-msgstr "apt-sortpkgs"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:30
+#: apt-sortpkgs.1.xml:33
 msgid "Utility to sort package index files"
 msgstr "Utilitário para organizar ficheiros índice de pacotes"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:36
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>string de configuração</replaceable></option></"
-"arg> <arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</replaceable></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:45
+#: apt-sortpkgs.1.xml:39
 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 "
@@ -5704,19 +4292,14 @@ msgstr ""
 "registo de acordo com as regras de organização internas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:51
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 "Todas as saídas são enviadas para o stdout, a entrada tem de ser um ficheiro "
 "pesquisável."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:58
-msgid "<option>--source</option>"
-msgstr "<option>--source</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:60
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -5725,7 +4308,7 @@ msgstr ""
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:74
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -5733,37 +4316,28 @@ msgstr ""
 "<command>apt-sortpkgs</command> devolve zero na operação normal, 100 decimal "
 "em erro."
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt.conf.5.xml:13
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
-"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>16 January 2010</date>"
+#. type: Content of: <refentry><refentryinfo><author><contrib>
+#: apt.conf.5.xml:20
+msgid "Initial documentation of Debug::*."
 msgstr ""
-"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-"firstname> <surname>Burrows</surname> <contrib>Documentação inicial do "
-"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>16 Janeiro 2010</date>"
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt.conf.5.xml:28 apt.conf.5.xml:35
-msgid "apt.conf"
-msgstr "apt.conf"
+#. type: Content of: <refentry><refentryinfo><author><email>
+#: apt.conf.5.xml:21
+msgid "dburrows@debian.org"
+msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:36
+#: apt.conf.5.xml:38
 msgid "Configuration file for APT"
 msgstr "Ficheiro de configuração para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:42
 msgid ""
 "<filename>apt.conf</filename> is the main configuration file for the APT "
 "suite of tools, but by far not the only place changes to options can be "
@@ -5777,7 +4351,7 @@ msgstr ""
 "disponibilizar um ambiente uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:45
+#: apt.conf.5.xml:47
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -5786,7 +4360,7 @@ msgstr ""
 "seguinte ordem:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:47
+#: apt.conf.5.xml:49
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -5795,12 +4369,21 @@ msgstr ""
 "(se existir)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:49
+#: apt.conf.5.xml:51
+#, fuzzy
+#| msgid ""
+#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+#| "order which have no or \"<literal>conf</literal>\" as filename extension "
+#| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
+#| "period (.) characters - otherwise they will be silently ignored."
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters - otherwise they will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
 msgstr ""
 "todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente "
 "alfanumérica sem extensão ou com \"<literal>conf</literal>\" como extensão "
@@ -5808,7 +4391,7 @@ msgstr ""
 "underscore (_) e ponto (.) - caso contrário serão ignorados em silêncio."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:58
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -5816,7 +4399,7 @@ msgstr ""
 "main</literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:60
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -5825,12 +4408,12 @@ msgstr ""
 "configuração ou para carregar mais ficheiros de configuração."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:60
+#: apt.conf.5.xml:64
 msgid "Syntax"
 msgstr "Sintaxe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:65
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -5845,7 +4428,7 @@ msgstr ""
 "ferramenta Get. A opções não herdam dos seus grupos parentes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:71
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5872,7 +4455,7 @@ msgstr ""
 "os caracteres \"/-:._+\". Um novo scope pode ser aberto com chavetas, como:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:81
+#: apt.conf.5.xml:85
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -5890,7 +4473,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:89
+#: apt.conf.5.xml:93
 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 "
@@ -5902,13 +4485,13 @@ msgstr ""
 "separada por um ponto e vírgula (;)."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:94
+#: apt.conf.5.xml:98
 #, 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:101
 msgid ""
 "In general the sample configuration file in <filename>&docdir;examples/apt."
 "conf</filename> &configureindex; is a good guide for how it should look."
@@ -5917,7 +4500,7 @@ msgstr ""
 "apt.conf</filename> &configureindex; é um bom guia de como deve ficar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:101
+#: apt.conf.5.xml:105
 msgid ""
 "The names of the configuration items are not case-sensitive. So in the "
 "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -5927,7 +4510,7 @@ msgstr ""
 "install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:104
+#: apt.conf.5.xml:108
 msgid ""
 "Names for the configuration items are optional if a list is defined as it "
 "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -5943,7 +4526,7 @@ msgstr ""
 "opção."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:113
 msgid ""
 "Two specials are allowed, <literal>#include</literal> (which is deprecated "
 "and not supported by alternative implementations) and <literal>#clear</"
@@ -5963,7 +4546,7 @@ msgstr ""
 "acabar com um 'ponto e vírgula' (;) .)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:117
+#: apt.conf.5.xml:121
 msgid ""
 "The #clear command is the only way to delete a list or a complete scope.  "
 "Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -5978,13 +4561,21 @@ msgstr ""
 "sobrepostos, apenas limpos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:122
+#: apt.conf.5.xml:126
+#, fuzzy
+#| msgid ""
+#| "All of the APT tools take a -o option which allows an arbitrary "
+#| "configuration directive to be specified on the command line. The syntax "
+#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
+#| "instance) followed by an equals sign then the new value of the option. "
+#| "Lists can be appended too by adding a trailing :: to the list name. (As "
+#| "you might suspect: The scope syntax can't be used on the command line.)"
 msgid ""
 "All of the APT tools take a -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
-"followed by an equals sign then the new value of the option. Lists can be "
-"appended too by adding a trailing :: to the list name. (As you might "
+"followed by an equals sign then the new value of the option. To append a new "
+"element to a list, add a trailing :: to the name of the list. (As you might "
 "suspect: The scope syntax can't be used on the command line.)"
 msgstr ""
 "Todas as ferramentas do APT recebem uma opção -o que permite uma directiva "
@@ -5996,12 +4587,26 @@ msgstr ""
 "usada na linha de comandos.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:129
+#: apt.conf.5.xml:133
+#, fuzzy
+#| msgid ""
+#| "Note that you can use :: only for appending one item per line to a list "
+#| "and that you should not use it in combination with the scope syntax.  "
+#| "(The scope syntax implicit insert ::) Using both syntaxes together will "
+#| "trigger a bug which some users unfortunately relay on: An option with the "
+#| "unusual name \"<literal>::</literal>\" which acts like every other option "
+#| "with a name. These introduces many problems including that a user who "
+#| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the "
+#| "hope to append to a list will gain the opposite as only the last "
+#| "assignment for this option \"<literal>::</literal>\" will be used. "
+#| "Upcoming APT versions will raise errors and will stop working if they "
+#| "encounter this misuse, so please correct such statements now as long as "
+#| "APT doesn't complain explicit about them."
 msgid ""
 "Note that you can use :: only for appending one item per line to a list and "
 "that you should not use it in combination with the scope syntax.  (The scope "
 "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately relay on: An option with the unusual name "
+"which some users unfortunately depend on: An option with the unusual name "
 "\"<literal>::</literal>\" which acts like every other option with a name. "
 "These introduces many problems including that a user who writes multiple "
 "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
@@ -6025,12 +4630,12 @@ msgstr ""
 "declarações agora enquanto o APT não se queixa explicitamente acerca delas."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:145
 msgid "The APT Group"
 msgstr "O Grupo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:146
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -6038,13 +4643,8 @@ msgstr ""
 "Este grupo de opções controla o comportamento geral do APT assim como mantém "
 "as opções para todas as ferramentas."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
-msgid "Architecture"
-msgstr "Architecture"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:151
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -6054,31 +4654,34 @@ msgstr ""
 "analisa listas de pacotes. A predefinição interna é a arquitectura para a "
 "qual o APT foi compilado."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:152
-msgid "Default-Release"
-msgstr "Default-Release"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:157
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+"set are e.g. also able to execute binaries compiled for the <literal>i386</"
+"literal> (<literal>x86</literal>) instruction set; This list is use when "
+"fetching files and parsing package lists. The internal default is always the "
+"native architecture (<literal>APT::Architecture</literal>)  and all foreign "
+"architectures it can retrieve by calling <command>dpkg --print-foreign-"
+"architectures</command>."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:153
+#: apt.conf.5.xml:167
 msgid ""
 "Default release to install packages from if more than one version available. "
 "Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-"
-"preferences;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 msgstr ""
 "Lançamento predefinido de onde instalar pacotes se existir mais de uma "
 "versão disponível. Contém o nome do lançamento, nome de código ou versão de "
-"lançamento. Exemplos: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', "
-"'4.0', '5.0*'. Veja também &apt-preferences;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
-msgid "Ignore-Hold"
-msgstr "Ignore-Hold"
+"lançamento. Exemplos: 'stable', 'testing', 'unstable', '&stable-codename;', "
+"'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:173
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -6086,13 +4689,8 @@ msgstr ""
 "Ignore Held packages; Esta opção global faz com que ao resolver problemas, "
 "os pacotes segurados sejam ignorados na sua decisão de marcação."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
-msgid "Clean-Installed"
-msgstr "Clean-Installed"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:178
 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 "
@@ -6105,13 +4703,8 @@ msgstr ""
 "também excluídos da limpeza - mas note que o APT não disponibiliza um meio "
 "directo de os reinstalar."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
-msgid "Immediate-Configure"
-msgstr "Immediate-Configure"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:185
 msgid ""
 "Defaults to on which will cause APT to install essential and important "
 "packages as fast as possible in the install/upgrade operation. This is done "
@@ -6174,13 +4767,8 @@ msgstr ""
 "do APT com o link de bug abaixo para que possam trabalhar na melhoria ou "
 "correcção do processo de actualização."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
-msgid "Force-LoopBreak"
-msgstr "Force-LoopBreak"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:208
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6196,40 +4784,70 @@ msgstr ""
 "GRAVE BUG. Esta opção deverá funcionar se os pacotes essenciais não forem "
 "tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
-msgstr "Cache-Limit"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
-msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
-msgstr ""
-"O APT usa um ficheiro de cache de memória mapeada de tamanho fixo para "
-"armazenar a informação 'disponível'. Isto define o tamanho dessa cache (em "
-"bytes)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
-msgid "Build-Essential"
-msgstr "Build-Essential"
+#: apt.conf.5.xml:217
+#, fuzzy
+#| 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 to which size the Cache will grow and is therefore the amount of "
+#| "memory APT will request at startup. The default value is 20971520 bytes "
+#| "(~20 MB). Note that these amount of space need to be available for APT "
+#| "otherwise it will likely fail ungracefully, so for memory restricted "
+#| "devices these value should be lowered while on systems with a lot of "
+#| "configured sources this might be increased.  <literal>Cache-Grow</"
+#| "literal> defines in byte with the default of 1048576 (~1 MB) how much the "
+#| "Cache size will be increased in the event the space defined by "
+#| "<literal>Cache-Start</literal> is not enough. These value will be applied "
+#| "again and again until either the cache is big enough to store all "
+#| "information or the size of the cache reaches the <literal>Cache-Limit</"
+#| "literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+#| "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+#| "automatic grow of the cache is disabled."
+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 "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that this amount of space needs to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices this value should "
+"be lowered while on systems with a lot of configured sources it should be "
+"increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"value will be applied again and again until either the cache is big enough "
+"to store all information or the size of the cache reaches the <literal>Cache-"
+"Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+"stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+"automatic grow of the cache is disabled."
+msgstr ""
+"O APT usa desde a versão 0.7.26 um ficheiro de cache com mapa de memória de "
+"tamanho ajustável para armazenar a informação disponível. <literal>Cache-"
+"Start</literal> actua como uma dica para que tamanho a Cache irá crescer e é "
+"por isso a quantidade de memória que o APT irá requerer no arranque. O valor "
+"predefinido é 20971520 bytes (~20 MB). Note que esta quantidade de espaço "
+"precisa estar disponível para o APT caso contrário ele irá con certeza "
+"falhar, portanto para dispositivos com pouca memória este valor deve ser "
+"diminuído enquanto que em sistemas com muitas fontes configuradas este pode "
+"ser aumentado. <literal>Cache-Grow</literal> define em bytes com a "
+"predefinição de 1048576 (~1 MB) quanto o tamanho da Cache será aumentado no "
+"caso do espaço definido por <literal>Cache-Start</literal> não ser "
+"suficiente. Este valor será aplicado várias vezes até que a cache seja "
+"suficientemente grande para armazenar toda a informação ou que o tamanho da "
+"cache alcance o <literal>Cache-Limit</literal>. O valor predefinido de "
+"<literal>Cache-Limit</literal> é 0 o que significa nenhum limite. Se "
+"<literal>Cache-Grow</literal> for definido para 0, o crescimento automático "
+"da cache é desactivado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:233
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 "Define quais pacote(s) são considerados dependências essenciais de "
 "compilação."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
-msgid "Get"
-msgstr "Get"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:237
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
@@ -6237,13 +4855,8 @@ msgstr ""
 "A subsecção Get controla a ferramenta &apt-get;, por favor veja a sua "
 "documentação para mais informação acerca das opções daqui."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
-msgid "Cache"
-msgstr "Cache"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:242
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
@@ -6251,13 +4864,8 @@ msgstr ""
 "A subsecção Cache controla a ferramenta &apt-cache;, por favor veja a sua "
 "documentação para mais informação acerca das opções daqui."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
-msgid "CDROM"
-msgstr "CDROM"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:247
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
@@ -6266,17 +4874,109 @@ msgstr ""
 "documentação para mais informação acerca das opções de aqui."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:253
 msgid "The Acquire Group"
 msgstr "O Grupo Acquire"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
-msgid "PDiffs"
-msgstr "PDiffs"
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+#, fuzzy
+#| msgid ""
+#| "The <literal>Acquire</literal> group of options controls the download of "
+#| "packages and the URI handlers.  <placeholder type=\"variablelist\" id="
+#| "\"0\"/>"
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+"O grupo de opções <literal>Acquire</literal> controla a descarga de pacotes "
+"e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:259
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time 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 volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+"Opção relacionada com segurança com predefinição a 'verdadeiro' como uma "
+"validação expirada para um ficheiro Release previne ataques repetidos "
+"durante longo tempo e pode, por exemplo, ajudar os utilizadores a "
+"identificar mirrors que não são actualizados à muito tempo - mas a "
+"funcionalidade depende da precisão de hora no sistema do utilizador. Os "
+"responsáveis do arquivo são encorajados a criar ficheiros Release com o "
+"cabeçalho <literal>Valid-Until</literal>, mas se não o fizerem ou se "
+"preferir-se um valor mais rigoroso pode-se usar a opção <literal>Max-"
+"ValidTime</literal> seguinte."
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:270
+#, fuzzy
+#| msgid ""
+#| "Seconds the Release file should be considered valid after it was created. "
+#| "The default is \"for ever\" (0) if the Release file of the archive "
+#| "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+#| "this date is the default. The date from the Release file or the date "
+#| "specified by the creation time of the Release file (<literal>Date</"
+#| "literal> header) plus the seconds specified with this options are used to "
+#| "check if the validation of a file has expired by using the earlier date "
+#| "of the two. Archive specific settings can be made by appending the label "
+#| "of the archive to the option name."
+msgid ""
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header).  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 \"for ever valid\".  Archive specific settings can "
+"be made by appending the label of the archive to the option name."
+msgstr ""
+"Segundos em que o ficheiro Release deve considerado válido após ser criado. "
+"A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não "
+"conter um cabeçalho <literal>Valid-Until</literal>. Se o tiver então esta "
+"data é a predefinida. A data do ficheiro Release ou a data especificada pela "
+"hora de criação do do ficheiro Release (cabeçalho <literal>Date</literal>) "
+"mais os segundos especificados com esta opção são usados para verificar se a "
+"validação de um ficheiro já expirou ao usar uma data anterior às duas. "
+"Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
+"do arquivo ao nome da opção. "
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:281
+#, fuzzy
+#| msgid ""
+#| "Seconds the Release file should be considered valid after it was created. "
+#| "The default is \"for ever\" (0) if the Release file of the archive "
+#| "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+#| "this date is the default. The date from the Release file or the date "
+#| "specified by the creation time of the Release file (<literal>Date</"
+#| "literal> header) plus the seconds specified with this options are used to "
+#| "check if the validation of a file has expired by using the earlier date "
+#| "of the two. Archive specific settings can be made by appending the label "
+#| "of the archive to the option name."
+msgid ""
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header).  Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular 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."
+msgstr ""
+"Segundos em que o ficheiro Release deve considerado válido após ser criado. "
+"A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não "
+"conter um cabeçalho <literal>Valid-Until</literal>. Se o tiver então esta "
+"data é a predefinida. A data do ficheiro Release ou a data especificada pela "
+"hora de criação do do ficheiro Release (cabeçalho <literal>Date</literal>) "
+"mais os segundos especificados com esta opção são usados para verificar se a "
+"validação de um ficheiro já expirou ao usar uma data anterior às duas. "
+"Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
+"do arquivo ao nome da opção. "
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:292
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
@@ -6286,12 +4986,20 @@ msgstr ""
 "predefinição."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:295
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum precentage of the size of all patches compared to "
+"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum percentage of the size of all patches compared to "
 "the size of the targeted file. If one of these limits is exceeded the "
 "complete file is downloaded instead of the patches."
 msgstr ""
@@ -6302,13 +5010,8 @@ msgstr ""
 "as patches comparadas com o tamanho do ficheiro de destino. Se um destes "
 "limites for excedido, é descarregado o ficheiro completo em vez das patches."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
-msgid "Queue-Mode"
-msgstr "Queue-Mode"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:305
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6322,13 +5025,8 @@ msgstr ""
 "ligação por máquina destino, <literal>access</literal> significa que será "
 "aberta uma ligação por tipo de URI."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
-msgid "Retries"
-msgstr "Retries"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:313
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -6336,13 +5034,8 @@ msgstr ""
 "Número de tentativas a executar. Se isto for diferente de zero o APT irá "
 "tentar, no número fornecido de vezes, obter ficheiros falhados."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
-msgid "Source-Symlinks"
-msgstr "Source-Symlinks"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:318
 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."
@@ -6351,13 +5044,8 @@ msgstr ""
 "os arquivos fonte serão links simbólicos, quando possível, em vez de cópias. "
 "A predefinição é verdadeiro."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
-msgid "http"
-msgstr "http"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:323
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6374,7 +5062,7 @@ msgstr ""
 "especificada, será usada a variável de ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:331
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6399,7 +5087,7 @@ msgstr ""
 "suporta nenhuma destas opções."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:341 apt.conf.5.xml:407
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -6410,26 +5098,26 @@ msgstr ""
 "e tempos limite de dados."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
-msgid ""
-"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
-"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
-"indicating how many outstanding requests APT should send. A value of zero "
-"MUST be specified if the remote host does not properly linger on TCP "
-"connections - otherwise data corruption will occur. Hosts which require this "
-"are in violation of RFC 2068."
-msgstr ""
-"É disponibilizada uma definição para controlar a profundidade do pipeline em "
-"casos onde o servidor remoto não é compatível com RFC ou é buggy (como o "
-"Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> pode ser um "
-"valor de 0 a 5 que indica quantos requerimentos pendentes o APT deve enviar. "
-"TEM de ser especificado um valor de 0 se a máquina remota não hesitar "
-"propriamente em ligações TCP - de outro modo irá ocorrer corrupção de dados. "
-"As máquinas que requerem isto estão em violação de RFC 2068."
+#: apt.conf.5.xml:344
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are send in a "
+"pipeline.  Previous APT versions had a default of 10 for this setting, but "
+"the default value is now 0 (= disabled) to avoid problems with the ever-"
+"growing amount of webservers and proxies which choose to not conform to the "
+"HTTP/1.1 specification."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:351
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+"redirects, which is enabled by default."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:354
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6444,7 +5132,7 @@ msgstr ""
 "múltiplos servidores ao mesmo tempo.)"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:359
 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 "
@@ -6455,13 +5143,8 @@ msgstr ""
 "alguns proxies apenas permitem acesso a clientes se o cliente usar um "
 "identificador conhecido."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
-msgid "https"
-msgstr "https"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:366
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -6476,7 +5159,7 @@ msgstr ""
 "literal> ainda não é suportada."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:372
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6510,15 +5193,10 @@ msgstr ""
 "<literal>&lt;host&gt;::SslKey</literal> é a opção por máquina "
 "correspondente. <literal>SslForceVersion</literal> sobrepõe a versão SSL "
 "predefinida a usar. Pode conter strings 'TLSv1' ou 'SSLv3'. <literal>&lt;"
-"host&gt;::SslForceVersion</literal> é a opção po máquina correspondente."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
-msgid "ftp"
-msgstr "ftp"
+"host&gt;::SslForceVersion</literal> é a opção po máquina correspondente."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:391
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6551,7 +5229,7 @@ msgstr ""
 "$(SITE_PORT)</literal>. Cada uma é tirada do seu componente URI respectivo."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:410
 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 "
@@ -6567,7 +5245,7 @@ msgstr ""
 "específica (Veja a amostra de ficheiro de configuração para exemplos)."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:417
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to a http url - see the discussion of the http "
@@ -6581,7 +5259,7 @@ msgstr ""
 "eficiência."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:422
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6595,19 +5273,14 @@ msgstr ""
 "controle for IPv6. Definir isto para verdadeiro força o seu uso mesmo em "
 "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
-msgid "cdrom"
-msgstr "cdrom"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:430
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6627,13 +5300,8 @@ msgstr ""
 "\" id=\"0\"/> dentro do bloco cdrom. É importante ter a barra final. "
 "Comandos para desmontar podem ser especificados usando UMount."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
-msgid "gpgv"
-msgstr "gpgv"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:441
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -6643,19 +5311,14 @@ msgstr ""
 "adicionais ao gpgv. <literal>gpgv::Options</literal> Opções adicionais "
 "passadas ao gpgv."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
-msgid "CompressionTypes"
-msgstr "CompressionTypes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:452
 #, 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><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:447
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -6674,19 +5337,19 @@ msgstr ""
 "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:457
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:460
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:453
 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 "
@@ -6717,21 +5380,33 @@ msgstr ""
 "lista pois será adicionado automaticamente."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:464
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:462
+#, fuzzy
+#| msgid ""
+#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
+#| "replaceable></literal> will be checked: If this setting exists the method "
+#| "will only be used if this file exists, e.g. for the bzip2 method (the "
+#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
+#| "also that list entries specified on the command line will be added at the "
+#| "end of the list specified in the configuration files, but before the "
+#| "default entries. To prefer a type in this case over the ones specified in "
+#| "in the configuration files you can set the option direct - not in list "
+#| "style.  This will not override the defined list, it will only prefix the "
+#| "list with this type."
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
 "will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
-"entries. To prefer a type in this case over the ones specified in in the "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line will be added at the "
+"end of the list specified in the configuration files, but before the default "
+"entries. To prefer a type in this case over the ones specified in the "
 "configuration files you can set the option direct - not in list style.  This "
 "will not override the defined list, it will only prefix the list with this "
 "type."
@@ -6748,42 +5423,28 @@ msgstr ""
 "sobrepor a lista definida, irá apenas prefixar a lista com este tipo."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:469
 msgid ""
-"While it is possible to add an empty compression type to the order list, but "
-"APT in its current version doesn't understand it correctly and will display "
-"many warnings about not downloaded files - these warnings are most of the "
-"time false negatives. Future versions will maybe include a way to really "
-"prefer uncompressed files to support the usage of local mirrors."
-msgstr ""
-"Apesar de ser possível de adicionar um tipo de compressão vazio à lista de "
-"ordem, o APT na sua versão actual não o compreende correctamente e irá "
-"mostrar muitos avisos acerca de ficheiros não descarregados - estes avisos "
-"são na maioria vezes falsos positivos. Futuras versões irão talvez incluir "
-"um modo de realmente preferir ficheiros não-comprimidos para suportar a "
-"utilização de mirrors locais."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
-msgid "GzipIndexes"
+"The special type <literal>uncompressed</literal> can be used to give "
+"uncompressed files a preference, but note that most archives don't provide "
+"uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:476
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
 "unpacking them. This saves quite a lot of disk space at the expense of more "
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:423
-msgid "Languages"
-msgstr "Languages"
+"Quando descarrega índices comprimidos em <literal>gzip</literal> (Pacotes, "
+"Fontes ou Traduções), mantêm-os localmente comprimidos em gzip em vez de os "
+"desempacotar. Isto poupa imenso espaço no disco à custa de mais pedidos à "
+"CPU quando constrói as caches de pacotes locais. Falso por predefinição."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:484
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"
@@ -6805,13 +5466,13 @@ msgstr ""
 "de definir aqui valores impossíveis."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:500
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#: apt.conf.5.xml:490
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -6850,30 +5511,39 @@ msgstr ""
 "APT não for usado num ambiente em francês, em tal ambiente a ordem deveria "
 "ser \"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:501
 msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
+"Note: To prevent problems resulting from APT being executed in different "
+"environments (e.g. by different users or by other programs) all Translation "
+"files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+"added to the end of the list (after an implicit \"<literal>none</literal>\")."
 msgstr ""
-"O grupo de opções <literal>Acquire</literal> controla a descarga de pacotes "
-"e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:512
 msgid "Directories"
 msgstr "Directories"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:514
+#, fuzzy
+#| msgid ""
+#| "The <literal>Dir::State</literal> section has directories that pertain to "
+#| "local state information. <literal>lists</literal> is the directory to "
+#| "place downloaded package lists in and <literal>status</literal> is the "
+#| "name of the dpkg status file.  <literal>preferences</literal> is the name "
+#| "of the APT preferences file.  <literal>Dir::State</literal> contains the "
+#| "default directory to prefix on all sub items if they do not start with "
+#| "<filename>/</filename> or <filename>./</filename>."
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
 "dpkg status file.  <literal>preferences</literal> is the name of the APT "
-"preferences file.  <literal>Dir::State</literal> contains the default "
-"directory to prefix on all sub items if they do not start with <filename>/</"
-"filename> or <filename>./</filename>."
+"<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+"contains the default directory to prefix on all sub items if they do not "
+"start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 "A secção <literal>Dir::State</literal> tem directórios que pertencem à "
 "informação de estado local. <literal>lists</literal> é o directório para "
@@ -6884,7 +5554,7 @@ msgstr ""
 "com <filename>/</filename> ou <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:521
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6905,7 +5575,7 @@ msgstr ""
 "literal> o directório predefinido é contido em <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:530
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6920,7 +5590,7 @@ msgstr ""
 "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:536
 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 "
@@ -6931,7 +5601,7 @@ msgstr ""
 "estar feito então é carregado o ficheiro de configuração principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:540
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6949,7 +5619,7 @@ msgstr ""
 "respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:548
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6969,13 +5639,31 @@ msgstr ""
 "<filename>/var/lib/dpkg/status</filename>, então o ficheiro status será "
 "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:561
+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 "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+"A lista <literal>Ignore-Files-Silently</literal> pode ser usada para "
+"especificar quais os ficheiros que o APT deve ignorar em silêncio enquanto "
+"analisa os ficheiros nos directórios de fragmento. Por predefinição que "
+"termine com <literal>.disabled</literal>, <literal>~</literal>, <literal>."
+"bak</literal> ou <literal>.dpkg-[a-z]+</literal> é ignorado em silêncio. "
+"Como visto no último valor predefinido, estes padrões podem usar sintaxe de "
+"expressão regular."
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:570
 msgid "APT in DSelect"
 msgstr "APT em DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:572
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6985,13 +5673,8 @@ msgstr ""
 "configuração controlam o comportamento predefinido. Estas estão na secção "
 "<literal>DSelect</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:502
-msgid "Clean"
-msgstr "Clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:577
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -7008,7 +5691,7 @@ msgstr ""
 "descarregar novos pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:586
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
@@ -7016,13 +5699,8 @@ msgstr ""
 "O conteúdo desta variável é passado ao &apt-get; como opções de linha de "
 "comandos quando é corrido para a fase de instalação."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
-msgid "Updateoptions"
-msgstr "Updateoptions"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:591
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
@@ -7030,13 +5708,8 @@ msgstr ""
 "O conteúdo desta variável é passado ao &apt-get; como opções de linha de "
 "comandos quando é executado para a fase de actualização."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:521
-msgid "PromptAfterUpdate"
-msgstr "PromptAfterUpdate"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:596
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -7045,12 +5718,12 @@ msgstr ""
 "continuar. A predefinição é avisar apenas em caso de erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:602
 msgid "How APT calls dpkg"
 msgstr "Como o APT chama o dpkg"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:603
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -7059,7 +5732,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:534
+#: apt.conf.5.xml:608
 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 "
@@ -7069,18 +5742,8 @@ msgstr ""
 "especificadas usando a notação de lista e cada item da lista é passado como "
 "um argumento único ao &dpkg;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
-msgid "Pre-Invoke"
-msgstr "Pre-Invoke"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
-msgid "Post-Invoke"
-msgstr "Post-Invoke"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:614
 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 "
@@ -7092,13 +5755,8 @@ msgstr ""
 "em notação listada. Os  comandos são invocados em ordem usando <filename>/"
 "bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
-msgid "Pre-Install-Pkgs"
-msgstr "Pre-Install-Pkgs"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:621
 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 "
@@ -7114,7 +5772,7 @@ msgstr ""
 "deb que vai instalar, um por cada linha."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:627
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -7128,13 +5786,8 @@ msgstr ""
 "options::cmd::Version</literal> a 2. <literal>cmd</literal> é um comando "
 "dado ao <literal>Pre-Install-Pkgs</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
-msgid "Run-Directory"
-msgstr "Run-Directory"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:635
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
@@ -7142,13 +5795,8 @@ msgstr ""
 "O APT muda para este directório (chdir) antes de invocar o dpkg, a "
 "predefinição é <filename>/</filename>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
-msgid "Build-options"
-msgstr "Build-options"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:640
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
@@ -7157,15 +5805,28 @@ msgstr ""
 "predefinição é desactivar a assinatura e produzir todos os binários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:645
 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:572
+#: apt.conf.5.xml:646
+#, fuzzy
+#| msgid ""
+#| "APT can call dpkg in a way so it can make aggressive use of triggers over "
+#| "multiply calls of dpkg. Without further options dpkg will use triggers "
+#| "only in between his own run. Activating these options can therefore "
+#| "decrease the time needed to perform the install / upgrade. Note that it "
+#| "is intended to activate these options per default in the future, but as "
+#| "it changes the way APT calling dpkg drastically it needs a lot more "
+#| "testing.  <emphasis>These options are therefore currently experimental "
+#| "and should not be used in productive environments.</emphasis> Also it "
+#| "breaks the progress reporting so all frontends will currently stay around "
+#| "half (or more) of the time in the 100% state while it actually configures "
+#| "all packages."
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiply calls of dpkg. Without further options dpkg will use triggers only "
+"multiple calls of dpkg. Without further options dpkg will use triggers only "
 "in between his own run. Activating these options can therefore decrease the "
 "time needed to perform the install / upgrade. Note that it is intended to "
 "activate these options per default in the future, but as it changes the way "
@@ -7188,7 +5849,7 @@ msgstr ""
 "todos os pacotes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:661
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -7202,7 +5863,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:655
 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 "
@@ -7225,13 +5886,8 @@ msgstr ""
 "combinação de opções defensiva seria <placeholder type=\"literallayout\" id="
 "\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:593
-msgid "DPkg::NoTriggers"
-msgstr "DPkg::NoTriggers"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:668
 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 "
@@ -7251,13 +5907,8 @@ msgstr ""
 "configure para o dpkg - agora o apt irá adicionar esta bandeira também às "
 "chamadas unpack e remove."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:601
-msgid "PackageManager::Configure"
-msgstr "PackageManager::Configure"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:676
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -7284,13 +5935,8 @@ msgstr ""
 "caso contrário o sistema poderia acabar num estado não configurado o qual "
 "poderia não arrancar!"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
-msgid "DPkg::ConfigurePending"
-msgstr "DPkg::ConfigurePending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:687
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -7307,13 +5953,8 @@ msgstr ""
 "vezes numa fila - ex. numa instalação. Nestes cenários você pode desactivar "
 "esta opção em todas excepto na última execução."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:619
-msgid "DPkg::TriggersPending"
-msgstr "DPkg::TriggersPending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:694
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7328,13 +5969,8 @@ msgstr ""
 "processar todos os triggers, e não apenas os triggers necessários para "
 "configurar este pacote."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:625
-msgid "PackageManager::UnpackAll"
-msgstr "PackageManager::UnpackAll"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:700
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7352,13 +5988,8 @@ msgstr ""
 "<literal>OrderCritical</literal> não foi usado, portanto este método é muito "
 "experimental e necessita de mais melhorias antes de se tornar realmente útil."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:633
-msgid "OrderList::Score::Immediate"
-msgstr "OrderList::Score::Immediate"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:715
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -7376,7 +6007,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:708
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -7400,12 +6031,12 @@ msgstr ""
 "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:728
 msgid "Periodic and Archives options"
 msgstr "Opções Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -7418,12 +6049,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:663
+#: apt.conf.5.xml:737
 msgid "Debug options"
 msgstr "Opções de depuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:739
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -7440,7 +6071,7 @@ msgstr ""
 "interesse para o utilizador normal, mas algumas podem ter:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:750
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7451,7 +6082,7 @@ msgstr ""
 "remove, purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:758
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7462,7 +6093,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:693
+#: apt.conf.5.xml:767
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -7474,7 +6105,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:701
+#: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
@@ -7483,63 +6114,38 @@ msgstr ""
 "IDs de CDROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:785
 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><term>
-#: apt.conf.5.xml:716
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr "<literal>Debug::Acquire::cdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:794
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "Escreve informação relacionada com o acesso a fontes de <literal>cdrom://</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr "<literal>Debug::Acquire::ftp</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:805
 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><term>
-#: apt.conf.5.xml:738
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr "<literal>Debug::Acquire::http</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:816
 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><term>
-#: apt.conf.5.xml:749
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr "<literal>Debug::Acquire::https</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:827
 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><term>
-#: apt.conf.5.xml:760
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr "<literal>Debug::Acquire::gpgv</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:838
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -7547,13 +6153,8 @@ msgstr ""
 "Escreve informação relacionada com a verificação de assinaturas "
 "criptográficas usando <literal>gpg</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:771
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr "<literal>Debug::aptcdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:849
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -7561,24 +6162,14 @@ msgstr ""
 "Escreve informação acerca do processo de aceder a colecções de pacotes "
 "armazenados em CD-ROMs."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr "<literal>Debug::BuildDeps</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:859
 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><term>
-#: apt.conf.5.xml:792
-msgid "<literal>Debug::Hashes</literal>"
-msgstr "<literal>Debug::Hashes</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:869
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -7586,13 +6177,8 @@ msgstr ""
 "Escreve cada hash criptográfico que é gerado pelas bibliotecas do "
 "<literal>apt</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr "<literal>Debug::IdentCDROM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:879
 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 "
@@ -7602,13 +6188,8 @@ msgstr ""
 "blocos usados e livres no sistema de ficheiros do CD-ROM, quando gera um ID "
 "para um CD-ROM."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr "<literal>Debug::NoLocking</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:890
 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."
@@ -7617,25 +6198,15 @@ msgstr ""
 "funcionamento de duas instâncias do <quote><literal>apt-get update</"
 "literal></quote> ao mesmo tempo."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr "<literal>Debug::pkgAcquire</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:902
 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><term>
-#: apt.conf.5.xml:835
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:912
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -7643,13 +6214,8 @@ msgstr ""
 "Escreve mensagens de estado e erros relacionados com a verificação de "
 "checksums e assinaturas criptográficas dos ficheiros descarregados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:845
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:922
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -7658,13 +6224,8 @@ msgstr ""
 "índice do pacote, e erros relacionados com as diffs de lista de índice do "
 "pacote."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:856
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:934
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -7672,26 +6233,16 @@ msgstr ""
 "Escreve informação relacionada com a aplicação de patch na lista de pacotes "
 "do apt quando se descarrega diffs de índice em vez de índices completos."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:945
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 "Regista todas as interacções com os sub-processos que realmente executam os "
 "downloads."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:878
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr "<literal>Debug::pkgAutoRemove</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:956
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -7699,13 +6250,8 @@ msgstr ""
 "Regista no log eventos relacionados com o estado instalado-automaticamente "
 "de pacotes e com a remoção de pacotes não utilizados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:889
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:892
+#: apt.conf.5.xml:966
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -7719,13 +6265,8 @@ msgstr ""
 "literal>, e não ao resolvedor de dependências total do <literal>apt</"
 "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:903
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:906
+#: apt.conf.5.xml:980
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -7754,23 +6295,13 @@ msgstr ""
 "que aquela instalada. <literal>section</literal> é o nome da secção onde o "
 "pacote aparece."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:925
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr "<literal>Debug::pkgInitConfig</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:1002
 msgid "Dump the default configuration to standard error on startup."
 msgstr "Despeja a configuração predefinida para o erro standard no arranque."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:935
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr "<literal>Debug::pkgDPkgPM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:1012
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -7779,13 +6310,8 @@ msgstr ""
 "está a ser invocado, com argumentos separados por um caractere de espaço "
 "único."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:1023
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -7793,13 +6319,8 @@ msgstr ""
 "Escreve todos os dados recebidos do &dpkg; no descritor de ficheiro de "
 "estado e quaisquer erros encontrados enquanto os analisa."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:956
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr "<literal>Debug::pkgOrderList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:960
+#: apt.conf.5.xml:1034
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -7807,36 +6328,21 @@ msgstr ""
 "Gera um rastro do algoritmo que decide a ordem na qual o <literal>apt</"
 "literal> deve passar os pacotes ao &dpkg;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:968
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr "<literal>Debug::pkgPackageManager</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1046
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 "Escreve mensagens de estado seguindo os passos executados quando invoca o "
 "&dpkg;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:979
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr "<literal>Debug::pkgPolicy</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:1057
 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><term>
-#: apt.conf.5.xml:989
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr "<literal>Debug::pkgProblemResolver</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:993
+#: apt.conf.5.xml:1067
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -7844,13 +6350,8 @@ msgstr ""
 "Rastreia a execução do resolvedor de dependências (isto só se aplica ao que "
 "acontece quando é encontrado um problema de dependências complexo)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1078
 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 "
@@ -7860,13 +6361,8 @@ msgstr ""
 "calculadas usadas pelo pkgProblemResolver. A descrição do do pacote é a "
 "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
-msgid "<literal>Debug::sourceList</literal>"
-msgstr "<literal>Debug::sourceList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1016
+#: apt.conf.5.xml:1090
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -7875,7 +6371,7 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1039
+#: apt.conf.5.xml:1113
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -7883,37 +6379,19 @@ msgstr ""
 "&configureindex; é um ficheiro de configuração que mostra valores exemplo "
 "para todas as opções possíveis."
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1046
-msgid "&file-aptconf;"
-msgstr "&file-aptconf;"
-
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1125
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt_preferences.5.xml:13
-msgid ""
-"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-msgstr ""
-"&apt-author.team; &apt-email; &apt-product; <date>16 Fevereiro 2010</date>"
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt_preferences.5.xml:21 apt_preferences.5.xml:28
-msgid "apt_preferences"
-msgstr "apt_preferences"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:29
+#: apt_preferences.5.xml:32
 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:34
+#: apt_preferences.5.xml:37
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -7926,7 +6404,7 @@ msgstr ""
 "ser seleccionadas para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:42
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -7948,7 +6426,7 @@ msgstr ""
 "seleccionado para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:49
+#: apt_preferences.5.xml:52
 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 "
@@ -7963,7 +6441,7 @@ msgstr ""
 "afecta a escolha da instância, apenas a escolha da versão."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:56
+#: apt_preferences.5.xml:59
 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 "
@@ -7987,14 +6465,24 @@ msgstr ""
 "foi avisado."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:67
+#: apt_preferences.5.xml:70
+#, fuzzy
+#| 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 "
+#| "following naming convention: The files have no or \"<literal>pref</"
+#| "literal>\" as filename extension and which only contain alphanumeric, "
+#| "hyphen (-), underscore (_) and period (.) characters - otherwise they "
+#| "will be silently ignored."
 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 "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
-"underscore (_) and period (.) characters - otherwise they will be silently "
-"ignored."
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters.  Otherwise APT will print a notice "
+"that it has ignored a file if the file doesn't match a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"case it will be silently ignored."
 msgstr ""
 "Note que os ficheiros no directório <filename>/etc/apt/preferences.d</"
 "filename> são analisados em ordem alfanumérica ascendente e precisam "
@@ -8004,24 +6492,24 @@ msgstr ""
 "(.) - caso contrário serão ignorados em silêncio."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:79
 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:89
+#: apt_preferences.5.xml:94
 #, 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:92
+#: apt_preferences.5.xml:97
 #, 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:76
+#: apt_preferences.5.xml:81
 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 "
@@ -8048,23 +6536,72 @@ msgstr ""
 "especificamente imobilizados. Por exemplo, <placeholder type=\"programlisting"
 "\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
-#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:101
+#, fuzzy
+#| 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: "
+#| "<placeholder type=\"variablelist\" id=\"0\"/>"
+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:"
+msgstr ""
+"Se o lançamento destinado foi especificado, então o APT usa o seguinte "
+"algoritmo para definir as prioridades das versões de um pacote. Atribuir: "
+"<placeholder type=\"variablelist\" id=\"0\"/>"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:106
+msgid "priority 1"
+msgstr "priority 1"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:107
+#, fuzzy
+#| msgid ""
+#| "to the versions coming from archives which in their <filename>Release</"
+#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "experimental archive."
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
+msgstr ""
+"para as versões vindas de arquivos cujos ficheiros <filename>Release</"
+"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
+"experimental da debian."
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:113
 msgid "priority 100"
 msgstr "priority 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:102
-msgid "to the version that is already installed (if any)."
-msgstr "para a versão que já está instalada (se alguma)."
+#: apt_preferences.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "to the versions coming from archives which in their <filename>Release</"
+#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "experimental archive."
+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 "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
+msgstr ""
+"para as versões vindas de arquivos cujos ficheiros <filename>Release</"
+"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
+"experimental da debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:121
 msgid "priority 500"
 msgstr "priority 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:122
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -8073,41 +6610,42 @@ msgstr ""
 "destinado."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:126
 msgid "priority 990"
 msgstr "priority 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:127
 msgid ""
 "to the versions that are not installed and 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:96
-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: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Se o lançamento destinado foi especificado, então o APT usa o seguinte "
-"algoritmo para definir as prioridades das versões de um pacote. Atribuir: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:132
+#, fuzzy
+#| 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 "
+#| "uninstalled package versions, expect versions coming from archives which "
+#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
+#| "yes\" - these versions get the priority 1."
 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 "
-"uninstalled package versions."
+"uninstalled package versions, except versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
-"Se o lançamento destinado não foi especificado, então o APT simplesmente "
+"Se o lançamento de destino não foi especificado, então o APT simplesmente "
 "atribui prioridade 100 a todas as versões de pacotes instalados e prioridade "
-"500 e todas as versões de pacotes não instalados."
+"500 e todas as versões de pacotes não instalados, à excepção de versões que "
+"venham de arquivos cujos ficheiros <filename>Release</filename> estejam "
+"marcados como \"NotAutomatic: yes\" - estas versões ficam com prioridade 1."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:139
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -8116,7 +6654,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:124
+#: apt_preferences.5.xml:142
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8132,12 +6670,12 @@ msgstr ""
 "arriscado.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:148
 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:131
+#: apt_preferences.5.xml:149
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -8146,7 +6684,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:134
+#: apt_preferences.5.xml:152
 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</"
@@ -8157,7 +6695,7 @@ msgstr ""
 "reinstall</literal> é fornecida, instala a que foi desinstalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:158
 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 "
@@ -8172,7 +6710,7 @@ msgstr ""
 "replaceable></command> ou <command>apt-get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:165
 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 "
@@ -8186,7 +6724,7 @@ msgstr ""
 "get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:170
 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 "
@@ -8205,12 +6743,12 @@ msgstr ""
 "prioridade mais alta que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:179
 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:163
+#: apt_preferences.5.xml:181
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -8223,7 +6761,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:169
+#: apt_preferences.5.xml:187
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8239,7 +6777,7 @@ msgstr ""
 "espaços."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8251,7 +6789,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:200
 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 "
@@ -8266,7 +6804,7 @@ msgstr ""
 "nome de domínio totalmente qualificado do site."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:206
 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 "
@@ -8278,7 +6816,7 @@ msgstr ""
 "local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:211
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8290,39 +6828,32 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:216
 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 "
 "high priority to all versions available from the server identified by the "
 "hostname \"ftp.de.debian.org\""
 msgstr ""
+"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</literal>"
+"\" que pode ser usada para corresponder a um nome de máquina. O seguinte "
+"registo irá atribuir uma alta prioridade a todas as versões disponíveis do "
+"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:202
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: origin \"\"\n"
-#| "Pin-Priority: 999\n"
+#: apt_preferences.5.xml:220
+#, no-wrap
 msgid ""
 "Package: *\n"
 "Pin: origin \"ftp.de.debian.org\"\n"
 "Pin-Priority: 999\n"
 msgstr ""
 "Package: *\n"
-"Pin: origin \"\"\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:206
-#, fuzzy
-#| msgid ""
-#| "A note of caution: the keyword used here is \"<literal>origin</literal>"
-#| "\".  This should not be confused with the Origin of a distribution as "
-#| "specified in a <filename>Release</filename> file.  What follows the "
-#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
-#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
+#: apt_preferences.5.xml:224
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -8330,15 +6861,14 @@ msgid ""
 "Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
 "\"."
 msgstr ""
-"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</literal>"
-"\". Isto não deve ser confundido com a Origem de uma distribuição como "
-"especificada num ficheiro <filename>Release</filename>. O que representa a "
-"etiqueta \"Origin:\" num ficheiro <filename>Release</filename> não é um "
-"endereço de Internet mas um nome de autor ou marca, tal como \"Debian\" ou "
-"\"Ximian\"."
+"Isto <emphasis>não</emphasis> deve ser confundido com a Origem de uma "
+"distribuição como especificada num ficheiro <filename>Release</filename>. O "
+"que representa a etiqueta \"Origin:\" num ficheiro <filename>Release</"
+"filename> não é um endereço de Internet mas um nome de autor ou marca, tal "
+"como \"Debian\" ou \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8349,7 +6879,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:233
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8361,30 +6891,30 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:238
 msgid ""
 "The following record assigns a high priority to all package versions "
-"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 msgstr ""
 "O seguinte registo atribui uma alta prioridade a todas as versões de pacotes "
 "pertencentes a qualquer distribuição cujo nome de código é "
-"\"<literal>squeeze</literal>\"."
+"\"<literal>&testing-codename;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:247
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8396,29 +6926,102 @@ msgstr ""
 "\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
 "Pin: release a=stable, v=3.0\n"
 "Pin-Priority: 500\n"
 msgstr ""
-"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin-Priority: 500\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:245
-msgid "How APT Interprets Priorities"
-msgstr "Como o APT Interpreta as Prioridades"
+"Package: *\n"
+"Pin: release a=stable, v=3.0\n"
+"Pin-Priority: 500\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, no-wrap
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+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 "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:307
+msgid "How APT Interprets Priorities"
+msgstr "Como o APT Interpreta as Prioridades"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+#, fuzzy
+#| msgid ""
+#| "Priorities (P) assigned in the APT preferences file must be positive or "
+#| "negative integers.  They are interpreted as follows (roughly speaking): "
+#| "<placeholder type=\"variablelist\" id=\"0\"/>"
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers.  They are interpreted as follows (roughly speaking):"
+msgstr ""
+"As prioridades (P) atribuídas no ficheiro de preferências do APT têm de ser "
+"inteiros positivos ou negativos. Elas são interpretadas como o seguinte "
+"(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:316
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8427,12 +7030,12 @@ msgstr ""
 "na versão do pacote (downgrade)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:320
 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:259
+#: apt_preferences.5.xml:321
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8441,12 +7044,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:264
+#: apt_preferences.5.xml:326
 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:265
+#: apt_preferences.5.xml:327
 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"
@@ -8456,12 +7059,12 @@ msgstr ""
 "mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:332
 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:271
+#: apt_preferences.5.xml:333
 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"
@@ -8471,12 +7074,12 @@ msgstr ""
 "recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:338
 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:277
+#: apt_preferences.5.xml:339
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8485,28 +7088,17 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:343
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:344
 msgid "prevents the version from being installed"
 msgstr "previne a instalação da versão"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:248
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers.  They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"As prioridades (P) atribuídas no ficheiro de preferências do APT têm de ser "
-"inteiros positivos ou negativos. Elas são interpretadas como o seguinte "
-"(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8520,7 +7112,7 @@ msgstr ""
 "determina a prioridade da versão de pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:355
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8529,7 +7121,7 @@ msgstr ""
 "registos apresentados atrás:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:297
+#: apt_preferences.5.xml:359
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8557,12 +7149,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr "Então:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:374
 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 "
@@ -8577,7 +7169,7 @@ msgstr ""
 "downgrade ao <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8588,7 +7180,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:321
+#: apt_preferences.5.xml:383
 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</"
@@ -8601,12 +7193,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:331
+#: apt_preferences.5.xml:393
 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:333
+#: apt_preferences.5.xml:395
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8616,54 +7208,96 @@ msgstr ""
 "ficheiros <filename>Packages</filename> e <filename>Release</filename> para "
 "descrever os pacotes disponíveis nessa localização."
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+#, fuzzy
+#| msgid ""
+#| "The <filename>Packages</filename> file is normally found in the directory "
+#| "<filename>.../dists/<replaceable>dist-name</replaceable>/"
+#| "<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+#| "filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+#| "Packages</filename>.  It consists of a series of multi-line records, one "
+#| "for each package available in that directory.  Only two lines in each "
+#| "record are relevant for setting APT priorities: <placeholder type="
+#| "\"variablelist\" id=\"0\"/>"
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>.  It consists of a series of multi-line records, one for "
+"each package available in that directory.  Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+"O ficheiro <filename>Packages</filename> é normalmente encontrado no "
+"directório <filename>.../dists/<replaceable>nome-da-distribuição</"
+"replaceable>/<replaceable>componente</replaceable>/"
+"<replaceable>arquitectura</replaceable></filename>: por exemplo, "
+"<filename>.../dists/stable/main/binary-i386/Packages</filename>. Consiste "
+"numa série de registos de várias linhas, um para cada pacote disponível "
+"nesse directório. Apenas duas linhas em cada registo são relevantes para "
+"definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:407
 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:346
+#: apt_preferences.5.xml:408
 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:349 apt_preferences.5.xml:399
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 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:350
+#: apt_preferences.5.xml:412
 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:337
+#: apt_preferences.5.xml:417
+#, fuzzy
+#| msgid ""
+#| "The <filename>Release</filename> file is normally found in the directory "
+#| "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+#| "example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+#| "dists/&stable-codename;/Release</filename>.  It consists of a single "
+#| "multi-line record which applies to <emphasis>all</emphasis> of the "
+#| "packages in the directory tree below its parent.  Unlike the "
+#| "<filename>Packages</filename> file, nearly all of the lines in a "
+#| "<filename>Release</filename> file are relevant for setting APT "
+#| "priorities: <placeholder type=\"variablelist\" id=\"0\"/>"
 msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>.  It consists of a series of multi-line records, one for "
-"each package available in that directory.  Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>.  It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent.  Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
 msgstr ""
-"O ficheiro <filename>Packages</filename> é normalmente encontrado no "
-"directório <filename>.../dists/<replaceable>nome-da-distribuição</"
-"replaceable>/<replaceable>componente</replaceable>/"
-"<replaceable>arquitectura</replaceable></filename>: por exemplo, "
-"<filename>.../dists/stable/main/binary-i386/Packages</filename>. Consiste "
-"numa série de registos de várias linhas, um para cada pacote disponível "
-"nesse directório. Apenas duas linhas em cada registo são relevantes para "
-"definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
+"O ficheiro <filename>Release</filename> fica normalmente no directório "
+"<filename>.../dists/<replaceable>nome da distribuição</replaceable></"
+"filename>: por exemplo, <filename>.../dists/stable/Release</filename>, ou "
+"<filename>.../dists/&stable-codename;/Release</filename>. Consiste num único "
+"registo de várias linhas que se aplica a <emphasis>todos</emphasis> os "
+"pacotes na árvore de directórios sob o seu pai. Ao contrário do ficheiro "
+"<filename>Packages</filename>, quase todas as linhas num ficheiro "
+"<filename>Release</filename> são relevantes para definir as prioridades do "
+"APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:428
 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:367
+#: apt_preferences.5.xml:429
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8680,56 +7314,57 @@ msgstr ""
 "requerer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:439
 #, 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:383
+#: apt_preferences.5.xml:445
 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:384
+#: apt_preferences.5.xml:446
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
-"For example, the line \"Codename: squeeze\" specifies that all of the "
-"packages in the directory tree below the parent of the <filename>Release</"
-"filename> file belong to a version named <literal>squeeze</literal>.  "
-"Specifying this value in the APT preferences file would require the line:"
+"For example, the line \"Codename: &testing-codename;\" specifies that all of "
+"the packages in the directory tree below the parent of the "
+"<filename>Release</filename> file belong to a version named "
+"<literal>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
 msgstr ""
 "nomeia o nome de código a qual todos os pacotes na árvore de directórios "
-"pertencem. Por exemplo, a linha \"Codename: squeeze\" especifica que todos "
-"os pacotes na árvore de directórios abaixo do pai do ficheiro "
+"pertencem. Por exemplo, a linha \"Codename: &testing-codename;\" especifica "
+"que todos os pacotes na árvore de directórios abaixo do pai do ficheiro "
 "<filename>Release</filename> pertencem a uma versão chamada "
-"<literal>squeeze</literal>. Especificar este valor no ficheiro de "
+"<literal>&testing-codename;</literal>. Especificar este valor no ficheiro de "
 "preferências do APT requer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:455
 #, no-wrap
-msgid "Pin: release n=squeeze\n"
-msgstr "Pin: release n=squeeze\n"
+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:400
+#: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
-"no version number for the <literal>testing</literal> and <literal>unstable</"
+"belong to Debian release version 3.0.  Note that there is normally no "
+"version number for the <literal>testing</literal> and <literal>unstable</"
 "literal> distributions because they have not been released yet.  Specifying "
 "this in the APT preferences file would require one of the following lines."
 msgstr ""
 "nomeia a versão de lançamento. Por exemplo, os pacotes na árvore podem "
-"pertencer ao lançamento de Debian GNU/Linux versão 3.0. Note que não há "
-"normalmente um número de versão para as distribuições <literal>testing</"
-"literal> e <literal>unstable</literal>. porque ainda não foram lançadas. "
-"Especificar isto no ficheiro de preferências do APT irá requerer uma das "
-"seguintes linhas:"
+"pertencer ao lançamento de Debian versão 3.0. Note que não há normalmente um "
+"número de versão para as distribuições <literal>testing</literal> e "
+"<literal>unstable</literal>. porque ainda não foram lançadas. Especificar "
+"isto no ficheiro de preferências do APT irá requerer uma das seguintes "
+"linhas:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8741,12 +7376,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:480
 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:419
+#: apt_preferences.5.xml:481
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8764,18 +7399,18 @@ msgstr ""
 "a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:490
 #, 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:434
+#: apt_preferences.5.xml:496
 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:435
+#: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8788,18 +7423,18 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:503
 #, 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:447
+#: apt_preferences.5.xml:509
 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:448
+#: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8812,35 +7447,13 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:516
 #, 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:355
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/woody/Release</filename>.  It consists of a single multi-line record "
-"which applies to <emphasis>all</emphasis> of the packages in the directory "
-"tree below its parent.  Unlike the <filename>Packages</filename> file, "
-"nearly all of the lines in a <filename>Release</filename> file are relevant "
-"for setting APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"O ficheiro <filename>Release</filename> fica normalmente no directório "
-"<filename>.../dists/<replaceable>nome da distribuição</replaceable></"
-"filename>: por exemplo, <filename>.../dists/stable/Release</filename>, ou "
-"<filename>.../dists/woody/Release</filename>. Consiste num único registo de "
-"várias linhas que se aplica a <emphasis>todos</emphasis> os pacotes na "
-"árvore de directórios sob o seu pai. Ao contrário do ficheiro "
-"<filename>Packages</filename>, quase todas as linhas num ficheiro "
-"<filename>Release</filename> são relevantes para definir as prioridades do "
-"APT: <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8865,12 +7478,12 @@ msgstr ""
 "literal> da distribuição <literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:536
 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:476
+#: apt_preferences.5.xml:538
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8881,12 +7494,12 @@ msgstr ""
 "literal>. Isto disponibiliza um espaço para comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:485
+#: apt_preferences.5.xml:547
 msgid "Tracking Stable"
 msgstr "Acompanhando Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:555
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8910,7 +7523,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:549
 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 "
@@ -8926,8 +7539,8 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -8939,7 +7552,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:567
 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 "
@@ -8952,13 +7565,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:584
 #, 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:516
+#: apt_preferences.5.xml:578
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -8971,12 +7584,12 @@ msgstr ""
 "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:590
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:599
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9004,7 +7617,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:592
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -9021,7 +7634,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:613
 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 "
@@ -9034,13 +7647,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:633
 #, 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:562
+#: apt_preferences.5.xml:624
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -9059,33 +7672,18 @@ msgstr ""
 "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:640
 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:592
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
-#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
-#| "Package: *\n"
-#| "Pin: release n=squeeze\n"
-#| "Pin-Priority: 900\n"
-#| "\n"
-#| "Explanation: Debian unstable is always codenamed with sid\n"
-#| "Package: *\n"
-#| "Pin: release a=sid\n"
-#| "Pin-Priority: 800\n"
-#| "\n"
-#| "Package: *\n"
-#| "Pin: release o=Debian\n"
-#| "Pin-Priority: -10\n"
+#: apt_preferences.5.xml:654
+#, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
-"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
@@ -9098,9 +7696,9 @@ msgid ""
 "Pin-Priority: -10\n"
 msgstr ""
 "Explicação: Desinstala ou não instala nenhumas versões de pacotes originais Debian\n"
-"Explicação: para além daquelas da distribuição com nome de código squeeze ou sid\n"
+"Explicação: para além daquelas da distribuição com nome de código &testing-codename; ou sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explicação: Debian unstable tem sempre o nome de código sid\n"
@@ -9113,7 +7711,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:642
 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 "
@@ -9139,78 +7737,68 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:671
 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 "
-"the release codenamed with <literal>squeeze</literal>.  <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Com um ficheiro &sources-list; apropriado e o ficheiro de preferências "
 "acima, qualquer dos seguintes comandos fará com que o APT actualize para a "
-"versão mais recente no lançamento com nome de código <literal>squeeze</"
-"literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
+"versão mais recente no lançamento com nome de código <literal>&testing-"
+"codename;</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:691
 #, 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:620
+#: apt_preferences.5.xml:682
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 "<command>apt-get upgrade</command> will upgrade the package to the most "
-"recent <literal>squeeze</literal> version if that is more recent than the "
-"installed version, otherwise, to the most recent <literal>sid</literal> "
-"version if that is more recent than the installed version.  <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"recent <literal>&testing-codename;</literal> version if that is more recent "
+"than the installed version, otherwise, to the most recent <literal>sid</"
+"literal> version if that is more recent than the installed version.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "O seguinte comando irá fazer com que o APT actualize o pacote especificado "
-"para a versão mais recente da distribuição <literal>sid</literal> "
-"distribution. Posteriormente, <command>apt-get upgrade</command> irá "
-"actualizar o pacote para a versão <literal>squeeze</literal> mais recente se "
-"essa for mais recente que a versão instalada, caso contrário, para a versão "
+"para a versão mais recente da distribuição <literal>sid</literal>. "
+"Posteriormente, <command>apt-get upgrade</command> irá actualizar o pacote "
+"para a versão <literal>&testing-codename;</literal> mais recente se essa for "
+"mais recente que a versão instalada, caso contrário, para a versão "
 "<literal>sid</literal> mais recente se essa for mais recente que a versão "
 "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:638
-msgid "&file-preferences;"
-msgstr "&file-preferences;"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: sources.list.5.xml:22 sources.list.5.xml:29
-msgid "sources.list"
-msgstr "sources.list"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:30
+#: sources.list.5.xml:33
 msgid "Package resource list for APT"
 msgstr "Lista de recursos de pacote para APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:34
+#: sources.list.5.xml:37
 msgid ""
 "The package resource list is used to locate archives of the package "
 "distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system.  "
-"This control file is <filename>/etc/apt/sources.list</filename>."
+"documents only the packaging system used by the Debian system.  This control "
+"file is <filename>/etc/apt/sources.list</filename>."
 msgstr ""
 "A lista de recursos de pacote é usada para localizar arquivos do sistema de "
 "distribuição de pacotes usado no sistema. Neste momento, este manual "
-"documenta apenas o sistema de pacotes usado pelo sistema Debian GNU/Linux. "
-"Este ficheiro de controle é <filename>/etc/apt/sources.list</filename>."
+"documenta apenas o sistema de pacotes usado pelo sistema Debian. Este "
+"ficheiro de controle é <filename>/etc/apt/sources.list</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:39
+#: sources.list.5.xml:42
 msgid ""
 "The source list 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 "
@@ -9232,19 +7820,29 @@ msgstr ""
 "comentário usando um #."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:53
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:51
+#: sources.list.5.xml:54
+#, 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 they 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 they will be silently ignored."
+"Otherwise APT will print a notice that it has ignored a file if the file "
+"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"configuration list - in this 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 "
@@ -9254,22 +7852,34 @@ msgstr ""
 "(_), menos (-) e ponto (.). De outro modo serão ignorados em silêncio."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:60
+#: sources.list.5.xml:65
 msgid "The deb and deb-src types"
 msgstr "Os tipos deb e deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:61
+#: sources.list.5.xml:66
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type describes a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. Typically, "
+#| "<literal>distribution</literal> is generally one of <literal>stable</"
+#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
+#| "component is one of <literal>main</literal> <literal>contrib</literal> "
+#| "<literal>non-free</literal> or <literal>non-us</literal>. The "
+#| "<literal>deb-src</literal> type describes 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 describes a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally one of <literal>stable</"
-"literal> <literal>unstable</literal> or <literal>testing</literal> while "
-"component is one of <literal>main</literal> <literal>contrib</literal> "
-"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-"
-"src</literal> type describes 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."
+"<literal>distribution</literal> is generally an archivename 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 "
+"describes 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."
 msgstr ""
 "O tipo <literal>deb</literal> descreve um arquivo Debian típico de dois "
 "níveis, <filename>distribution/component</filename>. Tipicamente "
@@ -9282,7 +7892,7 @@ msgstr ""
 "necessária para obter índices fonte."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:78
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -9291,13 +7901,14 @@ msgstr ""
 "tipos <literal>deb</literal> e <literal>deb-src</literal> é:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
-#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:81
+#, fuzzy, no-wrap
+#| msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgstr "deb uri distribuição [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:83
 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.  "
@@ -9318,7 +7929,7 @@ msgstr ""
 "menos um <literal>component</literal> tem de estar presente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:87
+#: sources.list.5.xml:92
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
 "</literal> which expands to the Debian architecture (i386, m68k, "
@@ -9336,7 +7947,7 @@ msgstr ""
 "arquitectura actual."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:95
+#: sources.list.5.xml:100
 msgid ""
 "Since only one distribution can be specified per line it may be necessary to "
 "have multiple lines for the same URI, if a subset of all available "
@@ -9362,7 +7973,39 @@ msgstr ""
 "sites com baixa largura de banda."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:107
+#: sources.list.5.xml:112
+msgid ""
+"<literal>options</literal> is always optional and needs to be surounded 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 though that unsupported "
+"settings will be ignored silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> can be used to specify for which architectures "
+"packages information should be downloaded. If this option is not set all "
+"architectures defined by the <literal>APT::Architectures</literal> option "
+"will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+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 ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:128
 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 "
@@ -9376,34 +8019,36 @@ msgstr ""
 "Internet, por exemplo)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:112
+#: sources.list.5.xml:133
 msgid "Some examples:"
 msgstr "Alguns exemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:135
 #, no-wrap
 msgid ""
-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"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://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"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:120
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr "Especificação da URI"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:125
-msgid "file"
-msgstr "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "The currently recognized URI types are:"
+msgstr "tipos de URI mais reconhecíveis"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:147
 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 "
@@ -9414,7 +8059,7 @@ msgstr ""
 "arquivos locais."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:154
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9424,7 +8069,7 @@ msgstr ""
 "fontes."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:161
 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:"
@@ -9441,7 +8086,7 @@ msgstr ""
 "método de autenticação seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:152
+#: sources.list.5.xml:172
 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. "
@@ -9459,13 +8104,8 @@ msgstr ""
 "usando este método e APENAS este método. Os proxies ftp que usam http e seja "
 "especificados no ficheiro de configuração serão ignorados."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:161
-msgid "copy"
-msgstr "copy"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:183
 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.  "
@@ -9476,18 +8116,8 @@ msgstr ""
 "localização. Isto é útil para quem use um disco zip para copiar ficheiros "
 "com o APT."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:168
-msgid "rsh"
-msgstr "rsh"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:168
-msgid "ssh"
-msgstr "ssh"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:190
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -9502,21 +8132,32 @@ msgstr ""
 "para executar as transferências de ficheiros remotos."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:178
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "adding more recognizable URI types"
 msgstr "tipos de URI mais reconhecíveis"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:180
+#: sources.list.5.xml:200
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages "
+#| "which should follow the nameing scheme <literal>apt-transport-"
+#| "<replaceable>method</replaceable></literal>.  The APT team e.g. maintains "
+#| "also the <literal>apt-transport-https</literal> package which provides "
+#| "access methods for https-URIs with features similar to the http method, "
+#| "but other methods for using e.g. debtorrent are also available, see "
+#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
+#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>.  The APT team e.g. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
 "access methods for https-URIs with features similar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see "
-"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
-"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
 msgstr ""
 "O APT pode ser estendido com mais métodos lançados em outros pacotes "
 "opcionais que devem seguir o esquema de nomeação <literal>apt-transport-"
@@ -9529,16 +8170,7 @@ msgstr ""
 "<manvolnum>1</manvolnum></citerefentry>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Os tipos de URI actualmente reconhecidos são cdrom, file, http, ftp, copy, "
-"ssh, rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:212
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -9547,36 +8179,54 @@ msgstr ""
 "para stable/main, stable/contrib, e stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:214
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:216
 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:199
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:219
 msgid "Source line for the above"
 msgstr "Linha de fonte para o referido acima"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:202
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:222
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:224
+#, 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"
+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:227
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -9585,28 +8235,28 @@ msgstr ""
 "hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:229
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:231
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
-"directory, and uses only the stable/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
-"Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório Debian, e "
-"usa apenas a área stable/contrib."
+"Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório debian, e "
+"usa apenas a área &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:233
 #, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
-msgstr "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:235
 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 "
@@ -9619,52 +8269,45 @@ msgstr ""
 "uma única sessão FTP para ambas linhas de recurso."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:216
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
-msgid ""
-"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
-"directory."
-msgstr ""
-"Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório debian-"
-"non-US."
-
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
-#, no-wrap
-msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
-msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
-
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:248
 #, no-wrap
-msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
-msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
-msgid ""
-"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
+#: sources.list.5.xml:241
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
+#| "US directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</"
+#| "filename> on m68k, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; non-"
+#| "us is no longer structured like this]"
+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-m68k</filename> on "
-"m68k, and so forth for other supported architectures. [Note this example "
-"only illustrates how to use the substitution variable; non-us is no longer "
-"structured like this] <placeholder type=\"literallayout\" id=\"0\"/>"
+"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\"/>"
 msgstr ""
 "Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório debian-"
 "non-US, e usa apenas os ficheiros encontrados sob <filename>unstable/binary-"
 "i386</filename> em máquinas i386, <filename>unstable/binary-m68k</filename> "
 "em m68k, e assim por diante para outras arquitecturas suportadas. [Note que "
 "este exemplo apenas mostra como usar a variável de substituição; non-us já "
-"não é mais estruturado desta maneira] <placeholder type=\"literallayout\" id="
-"\"0\"/>"
+"não é mais estruturado desta maneira]"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:253
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
@@ -9712,11 +8355,11 @@ msgstr ""
 #. type: <p></p>
 #: guide.sgml:24 offline.sgml:25
 msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
-"common-licenses/GPL for the full license."
+"For more details, on Debian systems, see the file /usr/share/common-licenses/"
+"GPL for the full license."
 msgstr ""
-"Para mais detalhes em sistemas Debian GNU/Linux, veja o ficheiro /usr/share/"
-"common-licenses/GPL para a licença completa."
+"Para mais detalhes em sistemas Debian, veja o ficheiro /usr/share/common-"
+"licenses/GPL para a licença completa."
 
 #. type: <heading></heading>
 #: guide.sgml:32
@@ -9851,6 +8494,11 @@ msgstr ""
 "problemas com dependências ao disponibilizar um número de algoritmos "
 "automáticos que ajudam a seleccionar os pacotes para instalação."
 
+#. type: <heading></heading>
+#: guide.sgml:96
+msgid "apt-get"
+msgstr "apt-get"
+
 #. type: <p></p>
 #: guide.sgml:102
 msgid ""
@@ -9902,6 +8550,11 @@ msgstr ""
 msgid "Once updated there are several commands that can be used:"
 msgstr "Uma vez actualizado existem vários comandos que podem ser usados:"
 
+#. type: <tag></tag>
+#: guide.sgml:121
+msgid "upgrade"
+msgstr "upgrade"
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -9922,6 +8575,11 @@ msgstr ""
 "outro pacote. <prgn>dselect</prgn> ou <tt>apt-get install</tt> podem ser "
 "usados para forçar estes pacotes a instalar."
 
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr "install"
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -9941,6 +8599,11 @@ msgstr ""
 "com os pacotes listados e irá escrever um sumário e pedir confirmação se "
 "algo mais que os seus argumentos serão alterados."
 
+#. type: <tag></tag>
+#: guide.sgml:140
+msgid "dist-upgrade"
+msgstr "dist-upgrade"
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
@@ -11181,6 +9844,186 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
+#~ msgid ""
+#~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
+#~ "get check</command>. It builds the source and package caches from the "
+#~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
+#~ "filename>."
+#~ msgstr ""
+#~ "<literal>gencaches</literal> executa a mesma operação que o <command>apt-"
+#~ "get check</command>. Constrói as caches de fonte e pacote a partir das "
+#~ "fontes em &sources-list; e a partir de <filename>/var/lib/dpkg/status</"
+#~ "filename>."
+
+#~ msgid ""
+#~ "One setting is provided to control the pipeline depth in cases where the "
+#~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
+#~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
+#~ "5 indicating how many outstanding requests APT should send. A value of "
+#~ "zero MUST be specified if the remote host does not properly linger on TCP "
+#~ "connections - otherwise data corruption will occur. Hosts which require "
+#~ "this are in violation of RFC 2068."
+#~ msgstr ""
+#~ "É disponibilizada uma definição para controlar a profundidade do pipeline "
+#~ "em casos onde o servidor remoto não é compatível com RFC ou é buggy (como "
+#~ "o Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> pode ser "
+#~ "um valor de 0 a 5 que indica quantos requerimentos pendentes o APT deve "
+#~ "enviar. TEM de ser especificado um valor de 0 se a máquina remota não "
+#~ "hesitar propriamente em ligações TCP - de outro modo irá ocorrer "
+#~ "corrupção de dados. As máquinas que requerem isto estão em violação de "
+#~ "RFC 2068."
+
+#~ msgid "add <replaceable>filename</replaceable>"
+#~ msgstr "add <replaceable>nome-de-ficheiro</replaceable>"
+
+#~ msgid "del <replaceable>keyid</replaceable>"
+#~ msgstr "del <replaceable>id de chave</replaceable>"
+
+#~ msgid "export <replaceable>keyid</replaceable>"
+#~ msgstr "export <replaceable>id de chave</replaceable>"
+
+#~ msgid ""
+#~ "Update the local keyring with the keyring of Debian archive keys and "
+#~ "removes from the keyring the archive keys which are no longer valid."
+#~ msgstr ""
+#~ "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
+#~ "remove do chaveiro as chaves de arquivo que já não são válidas."
+
+#~ msgid "--keyring <replaceable>filename</replaceable>"
+#~ msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Seconds the Release file should be considered valid after it was "
+#~| "created. The default is \"for ever\" (0) if the Release file of the "
+#~| "archive doesn't include a <literal>Valid-Until</literal> header.  If it "
+#~| "does then this date is the default. The date from the Release file or "
+#~| "the date specified by the creation time of the Release file "
+#~| "(<literal>Date</literal> header) plus the seconds specified with this "
+#~| "options are used to check if the validation of a file has expired by "
+#~| "using the earlier date of the two. Archive specific settings can be made "
+#~| "by appending the label of the archive to the option name."
+#~ msgid ""
+#~ "Seconds the Release file should be considered valid after it was created. "
+#~ "The default is \"for ever\" (0) if the Release file of the archive "
+#~ "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+#~ "this date is the default. The date from the Release file or the date "
+#~ "specified by the creation time of the Release file (<literal>Date</"
+#~ "literal> header) plus the seconds specified with this options are used to "
+#~ "check if the validation of a file has expired by using the earlier date "
+#~ "of the two. Archive specific settings can be made by appending the label "
+#~ "of the archive to the option name."
+#~ msgstr ""
+#~ "Segundos em que o ficheiro Release deve considerado válido após ser "
+#~ "criado. A predefinição é \"para sempre\" (0) se o ficheiro Release do "
+#~ "arquivo não conter um cabeçalho <literal>Valid-Until</literal>. Se o "
+#~ "tiver então esta data é a predefinida. A data do ficheiro Release ou a "
+#~ "data especificada pela hora de criação do do ficheiro Release (cabeçalho "
+#~ "<literal>Date</literal>) mais os segundos especificados com esta opção "
+#~ "são usados para verificar se a validação de um ficheiro já expirou ao "
+#~ "usar uma data anterior às duas. Definições específicas do Arquivo podem "
+#~ "ser feitas ao adicionar a etiqueta do arquivo ao nome da opção. "
+
+#~ msgid ""
+#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
+#~ "index files will not have MD5Sum fields where possible.  Configuration "
+#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
+#~ msgstr ""
+#~ "Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros "
+#~ "índice gerados não terão campos MD5Sum onde possíveis. Item de "
+#~ "Configuração: <literal>APT::FTPArchive::MD5</literal>"
+
+#~ msgid "Show a short usage summary."
+#~ msgstr "Mostra um curto sumário de utilização."
+
+#~ msgid "Show the program version."
+#~ msgstr "Mostra a versão do programa."
+
+#~ msgid "to the version that is already installed (if any)."
+#~ msgstr "para a versão que já está instalada (se alguma)."
+
+#~ msgid "APT package handling utility -- cache manipulator"
+#~ msgstr ""
+#~ "Utilitário de manuseamento de pacotes do APT -- manipulador de cache"
+
+#~ msgid "add <replaceable>file(s)</replaceable>"
+#~ msgstr "add <replaceable>ficheiro(s)</replaceable>"
+
+#~ msgid ""
+#~ "<literal>add</literal> adds the named package index files to the package "
+#~ "cache.  This is for debugging only."
+#~ msgstr ""
+#~ "<literal>add</literal> adiciona ficheiros índice do pacote nomeado à "
+#~ "cache pacotes. Isto é apenas para depuração."
+
+#~ msgid ""
+#~ "The <literal>release</literal> command generates a Release file from a "
+#~ "directory tree. It recursively searches the given directory for Packages, "
+#~ "Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and "
+#~ "md5sum.txt files.  It then writes to stdout a Release file containing an "
+#~ "MD5 digest and SHA1 digest for each file."
+#~ msgstr ""
+#~ "O comando <literal>release</literal> gera um ficheiro Release a partir "
+#~ "duma árvore de directórios. Procura recursivamente o directório dado por "
+#~ "ficheiros Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, "
+#~ "Sources.bz2, Release e md5sum.txt. Depois escreve para o stdout um "
+#~ "ficheiro Release contendo um sumário MD5 e um sumário SHA1 por cada "
+#~ "ficheiro."
+
+#~ msgid "Also install recommended packages."
+#~ msgstr "Também instala pacotes recomendados."
+
+#~ msgid "Do not install recommended packages."
+#~ msgstr "Não instala pacotes recomendados."
+
+#~ msgid ""
+#~ "While it is possible to add an empty compression type to the order list, "
+#~ "but APT in its current version doesn't understand it correctly and will "
+#~ "display many warnings about not downloaded files - these warnings are "
+#~ "most of the time false negatives. Future versions will maybe include a "
+#~ "way to really prefer uncompressed files to support the usage of local "
+#~ "mirrors."
+#~ msgstr ""
+#~ "Apesar de ser possível de adicionar um tipo de compressão vazio à lista "
+#~ "de ordem, o APT na sua versão actual não o compreende correctamente e irá "
+#~ "mostrar muitos avisos acerca de ficheiros não descarregados - estes "
+#~ "avisos são na maioria vezes falsos positivos. Futuras versões irão talvez "
+#~ "incluir um modo de realmente preferir ficheiros não-comprimidos para "
+#~ "suportar a utilização de mirrors locais."
+
+#~ msgid ""
+#~ "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
+#~ "US directory."
+#~ msgstr ""
+#~ "Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório "
+#~ "debian-non-US."
+
+#~ msgid "OPTIONS"
+#~ msgstr "OPÇÕES"
+
+#~ msgid "None."
+#~ msgstr "Nenhum."
+
+#~ msgid "FILES"
+#~ msgstr "FICHEIROS"
+
+#~ msgid ""
+#~ "Status list of auto-installed packages.  Configuration Item: "
+#~ "<literal>Dir::State</literal> sets the path to the "
+#~ "<filename>extended_states</filename> file."
+#~ msgstr ""
+#~ "Lista de estado de pacotes auto-instalados. Item de Configuração: "
+#~ "<literal>Dir::State</literal> que define o caminho para o ficheiro "
+#~ "<filename>extended_states</filename>."
+
+#~ msgid ""
+#~ "APT uses a fixed size memory mapped cache file to store the 'available' "
+#~ "information. This sets the size of that cache (in bytes)."
+#~ msgstr ""
+#~ "O APT usa um ficheiro de cache de memória mapeada de tamanho fixo para "
+#~ "armazenar a informação 'disponível'. Isto define o tamanho dessa cache "
+#~ "(em bytes)."
+
 #~ msgid ""
 #~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
 #~ "is optional.  If omitted, APT assigns a priority of 1 less than the last "
@@ -11192,9 +10035,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "do último valor especificado numa linha que começa com <literal>Pin-"
 #~ "Priority: release ...</literal>."
 
-#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
-
 #~ msgid "Keyring of local trusted keys, new keys will be added here."
 #~ msgstr ""
 #~ "Chaveiro das chaves de confiança locais, as novas chaves serão "