merge with i18n stable
authorMatt Mackall <mpm@selenic.com>
Thu, 23 May 2013 17:53:19 -0500
branchstable
changeset 19236 39ea540dc154
parent 19232 b592fd33233a (current diff)
parent 19235 ddfdccc9d5a4 (diff)
child 19237 1bef6f99a12d
child 19253 e078ea9b4ce4
child 19254 6c072c2d09a7
merge with i18n
--- a/i18n/pt_BR.po	Thu May 23 17:39:33 2013 -0500
+++ b/i18n/pt_BR.po	Thu May 23 17:53:19 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"