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