Templates: update (thunderbird)
All: update against templates (thunderbird)
[gd] pull from Pootle (lightning)