[af] pull from Pootle (master)
[es] pull from Pootle (master)