Templates: update
Various: update against templates
[cy km] pull from Pootle