Merge branch 'ja/i18n-message-fixes'