Mercurial > hg > compact-paper

changeset 12909:333421b9e0f9 stable 1.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with i18n
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Nov 2010 14:45:27 -0500
parents e255a5dc29e6 (current diff) 7406d3b6ae37 (diff)
children d0b08dcbcf0b
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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"