make update-po

1 files changed, 53 insertions, 41 deletions

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 79d90d65b..9342b2fda 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,11 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
-=======
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
->>>>>>> upstream/debian/sid
+"POT-Creation-Date: 2013-07-02 17:09+0300\n"
 "PO-Revision-Date: 2012-09-03 01:53+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -813,9 +809,9 @@ msgid ""
 "installation or upgrading.  Each package is a package name, not a fully "
 "qualified filename (for instance, in a Debian system, <package>apt-utils</"
 "package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). 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 "
+"product-version;_amd64.deb</filename>). 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 "
@@ -1576,7 +1572,7 @@ msgstr "Ficheiros"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109
 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
@@ -1596,7 +1592,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
 msgid "Diagnostics"
 msgstr "Diagnóstico"
@@ -2907,6 +2903,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:85
+#, fuzzy
+#| msgid ""
+#| "Mount point; specify the location to mount the CD-ROM. This mount point "
+#| "must be listed in <filename>/etc/fstab</filename> and properly "
+#| "configured.  Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
+msgstr ""
+"Ponto de Montagem; especifica a localização para montar o cdrom. Este ponto "
+"de montagem deve estar listado em <filename>/etc/fstab</filename> e "
+"configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::"
+"mount</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -2918,7 +2931,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2930,7 +2943,7 @@ msgstr ""
 "CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -2941,7 +2954,7 @@ msgstr ""
 "NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
 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 "
@@ -2954,7 +2967,7 @@ msgstr ""
 "configuração: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
 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 "
@@ -2965,7 +2978,7 @@ msgstr ""
 "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -2976,12 +2989,12 @@ msgstr ""
 "configuração: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3796,12 +3809,12 @@ msgid ""
 "be used."
 msgstr ""
 "<literal>http::Proxy</literal> define o proxy http predefinido a usar para "
-"URIs de HTTP. Está no formato standard de <literal>http://[[user][:"
-"pass]@]host[:port]/</literal>. Também podem ser especificados proxies por "
-"máquina ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> com a "
-"palavra chave especial <literal>DIRECT</literal> que significa não usar "
-"proxies. Se nenhuma das definições acima for especificada, será usada a "
-"variável de ambiente <envar>http_proxy</envar>."
+"URIs de HTTP. Está no formato standard de <literal>http://[[user][:pass]@]"
+"host[:port]/</literal>. Também podem ser especificados proxies por máquina "
+"ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> com a palavra "
+"chave especial <literal>DIRECT</literal> que significa não usar proxies. Se "
+"nenhuma das definições acima for especificada, será usada a variável de "
+"ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:366
@@ -3974,9 +3987,8 @@ msgstr ""
 "servidor proxy ao que se ligar. Por favor veja &configureindex; para um "
 "exemplo de como fazer isto. As variáveis de substituição que representam o "
 "componente URI correspondente são <literal>$(PROXY_USER)</literal> <literal>"
-"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
-"$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</"
-"literal>."
+"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)"
+"</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:451
@@ -6604,13 +6616,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 "<literal>distribution</literal> também pode conter uma variável. <literal>"
 "$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como "
@@ -8107,9 +8119,9 @@ msgstr "DESCRIÇÃO"
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as B<aptitude>"
+"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
+"options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 "APT é um sistema de gestão para pacotes de software. Para a gestão de "
 "pacotes normal do dia-a-dia existem vários frontends disponíveis, como o "
@@ -8388,11 +8400,11 @@ msgid ""
 "instance,"
 msgstr ""
 "O primeira <footnote><p>se você está a usar um servidor proxy http você tem "
-"que definir a variável de ambiente http_proxy primeiro, veja sources."
-"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</"
-"prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que "
-"ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get "
-"update</tt>. Por exemplo,"
+"que definir a variável de ambiente http_proxy primeiro, veja sources.list(5)"
+"</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</prgn> "
+"é obter as listas de pacotes a partir das <em>Sources</em> para que ele "
+"saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get update</"
+"tt>. Por exemplo,"
 
 #. type: <example></example>
 #: guide.sgml:116