Merge branch 'ja/i18n-similar-messages'