Merge branch 'ja/l10n-fixes'