i18n-pt_BR: synchronized with b19b4c1df066 stable
authorWagner Bruna <wbruna@softwareexpress.com.br>
Mon, 01 Nov 2010 16:04:15 -0200
branchstable
changeset 12908 7406d3b6ae37
parent 12905 593ee3a2a098
child 12909 333421b9e0f9
i18n-pt_BR: synchronized with b19b4c1df066
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"