i18n-pt_BR: synchronized with 802dffd62de5

--HG--
branch : stable
merge with i18n

--HG--
branch : stable
i18n-pt_BR: synchronized with c712238c4f9b

--HG--
branch : stable
i18n-pt_BR: minor fixes and rewording on histedit help text

--HG--
branch : stable
diff: document the nobinary option

Since 3fbef7ac26f0, we have a diff.nobinary option. This is handy, but
the only way I found out about it was by looking at the release notes
for 3.1, which is not something I normally do.

--HG--
branch : stable
extra : rebase_source : 3f98a7f21b857e21ecd33a93fdfb2bfc17293de0
merge with i18n

--HG--
branch : stable
Added tag 3.1.2 for changeset f768c888aaa6

--HG--
branch : stable
Added signature for changeset f768c888aaa6

--HG--
branch : stable
merge with stable