[gd] pull from Pootle (2.1)