Merged and resolved conflicts from JA translation pull requests

Merged and resolved conflicts from JA translation pull requests