# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1288640727 18000
# Node ID 333421b9e0f96c7bc788e5667c146a58a9440a55
# Parent  e255a5dc29e6d0baaf9544c1005c7c3c6a9ce164# Parent  7406d3b6ae376ef2eaa3089bc50cb1ef29ad922d
merge with i18n

diff -r e255a5dc29e6 -r 333421b9e0f9 i18n/pt_BR.po
--- a/i18n/pt_BR.po	Mon Nov 01 14:18:42 2010 -0500
+++ b/i18n/pt_BR.po	Mon Nov 01 14:45:27 2010 -0500
@@ -6187,8 +6187,8 @@
 msgid "changesets"
 msgstr "revisões"
 
-msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
-msgstr "corrija conflitos não resolvidos com hg resolve e então execute hg rebase --continue"
+msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)"
+msgstr "conflitos não resolvidos (veja hg resolve, e em seguida hg rebase --continue)"
 
 #, python-format
 msgid "no changes, revision %d skipped\n"