[pt_BR] merging changes from onCase (Henrique Tavares)