# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1369349618 18000
# Node ID 1bef6f99a12d9062e737bb623da627719a3987e6
# Parent  7bbad79b9542a8a146b215cfeed92f27adf8ff59# Parent  39ea540dc1543b5ed31251ef9f394c7902c65f19
merge with stable

diff -r 7bbad79b9542 -r 1bef6f99a12d i18n/pt_BR.po
--- a/i18n/pt_BR.po	Thu May 23 17:52:21 2013 -0500
+++ b/i18n/pt_BR.po	Thu May 23 17:53:38 2013 -0500
@@ -13914,14 +13914,13 @@
 msgstr ""
 "restaura arquivos para o estado correspondente a uma cópia de trabalho"
 
-msgid "    .. note::"
-msgstr "    .. note::"
-
-msgid ""
+msgid ""
+"    .. note::\n"
 "       To check out earlier revisions, you should use :hg:`update REV`.\n"
-"       To cancel an uncommitted merge (and lose your changes), use\n"
-"       :hg:`update --clean .`."
-msgstr ""
+"       To cancel an uncommitted merge (and lose your changes),\n"
+"       use :hg:`update --clean .`."
+msgstr ""
+"    .. note::\n"
 "       Para obter revisões anteriores, você deve usar :hg:`update REV`.\n"
 "       Para cancelar uma mesclagem não consolidada (e descartar suas\n"
 "       modificações), use :hg:`update --clean .`."
@@ -16027,6 +16026,13 @@
 "    encontrados."
 
 msgid ""
+".. note:: The registry key ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Mercurial``\n"
+"   is used when running 32-bit Python on 64-bit Windows."
+msgstr ""
+".. note:: A chave de registro ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Mercurial``\n"
+"   será usada ao rodar um Python 32 bits em um Windows 64 bits."
+
+msgid ""
 "Syntax\n"
 "======"
 msgstr ""
@@ -22438,8 +22444,8 @@
 
 msgid ""
 "Paths in the local filesystem can either point to Mercurial\n"
-"repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n"
-"incoming --bundle`). See also :hg:`help paths`."
+"repositories or to bundle files (as created by :hg:`bundle` or\n"
+":hg:`incoming --bundle`). See also :hg:`help paths`."
 msgstr ""
 "Caminhos no sistema de arquivos local podem tanto apontar para\n"
 "repositórios do Mercurial como para arquivos bundle (criados por\n"