Merge pull request #3408 from b4n/tm-i18n