All: update against templates (master)
[gd kn ms] pull from Pootle
[kn] fuzzy matching
Templates: update