Various: pull from Pootle
Various: update against TM
Templates: minor reflow
Fix file locations