Merge pull request #2397 from musashino205/l10n/base-fix-ja