# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1310603427 18000
# Node ID ddc4567a3d0b1d9e405e4c7974b8324e1aaf6036
# Parent  3e9a5c3e24d8323e6e9dd6dd5447eedfea4a0b98# Parent  29d324c2bc930b135fd6ee8cc82d1fc29b7a8b08
merge with stable

diff -r 3e9a5c3e24d8 -r ddc4567a3d0b i18n/pt_BR.po
--- a/i18n/pt_BR.po	Wed Jul 13 19:27:56 2011 -0500
+++ b/i18n/pt_BR.po	Wed Jul 13 19:30:27 2011 -0500
@@ -12310,7 +12310,7 @@
 
 msgid ""
 "``binary()``\n"
-"    File that appears to be binary (contails NUL bytes)."
+"    File that appears to be binary (contains NUL bytes)."
 msgstr ""
 "``binary()``\n"
 "    O arquivo parece ser binário (contém bytes NUL)."
@@ -15975,8 +15975,8 @@
 msgid "    hg revert \"set:copied() and binary() and size('>1M')\""
 msgstr "    hg revert \"set:copied() and binary() and size('>1M')\""
 
-msgid "- Remove files listed in files.lst that contain the letter a or b::"
-msgstr "- Remove arquivos listados em files.lst que contêm as letras a ou b::"
+msgid "- Remove files listed in foo.lst that contain the letter a or b::"
+msgstr "- Remove arquivos listados em foo.lst que contêm as letras a ou b::"
 
 msgid "    hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
 msgstr "    hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""