[mai] cleanup (master)
[ff] pull from Pootle (master)