[hsb] pull from Pootle (master)