everything in the correct place now
Merged Portuguese translation from dev