merge with i18n stable 1.7
authorMatt Mackall <mpm@selenic.com>
Mon, 01 Nov 2010 14:45:27 -0500
branchstable
changeset 12909 333421b9e0f9
parent 12907 e255a5dc29e6 (current diff)
parent 12908 7406d3b6ae37 (diff)
child 12910 d0b08dcbcf0b
merge with i18n
--- 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"