Improve I18N. Closes #1688