# HG changeset patch
# User Wagner Bruna <wbruna@softwareexpress.com.br>
# Date 1288634655 7200
# Node ID 7406d3b6ae376ef2eaa3089bc50cb1ef29ad922d
# Parent  593ee3a2a09826fb642cf3693bf3d1cb08e6b82c
i18n-pt_BR: synchronized with b19b4c1df066

diff -r 593ee3a2a098 -r 7406d3b6ae37 i18n/pt_BR.po
--- a/i18n/pt_BR.po	Mon Nov 01 12:45:45 2010 -0500
+++ b/i18n/pt_BR.po	Mon Nov 01 16:04:15 2010 -0200
@@ -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"