Fix bug with translations.
Merge remote-tracking branch 'upstream/master' into l10n_pt-br
Brazilian Portuguese translation update