jp -> ja
Merge branch 'dev'