Mercurial > hg-stable
changeset 12908:7406d3b6ae37 stable
i18n-pt_BR: synchronized with b19b4c1df066
| author | Wagner Bruna <wbruna@softwareexpress.com.br> |
|---|---|
| date | Mon, 01 Nov 2010 16:04:15 -0200 |
| parents | 593ee3a2a098 |
| children | 333421b9e0f9 |
| files | i18n/pt_BR.po |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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"