Mercurial > hg-stable
changeset 19237:1bef6f99a12d
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 23 May 2013 17:53:38 -0500 |
| parents | 7bbad79b9542 (current diff) 39ea540dc154 (diff) |
| children | 4122de8003e4 |
| files | |
| diffstat | 1 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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"