translations intl
Merge branch 'template'