Merge branch 'ja/clean-confirm-i18n'