merge in and fix portuguese translation