[am] pull from Pootle (master)
[br] pull from Pootle (master)