merging i18n message from old pull request