Merge branch 'ja/i18n-fix-for-2.36'