Implementing t2
Merge pull request #863 from mlocati/better-translations-with-t2

Implementing t2