Move __ function to I18n::translate()
Merge pull request #527 from lenton/3.4/bugfix/526-i18n-function

Move the `__` function to `I18n::translate`