[ja] Catch up with en/ updates

Applying #750 and #787 was somewhat difficult, due to their frequent changes(squashing at some point would have been nice). I hope other translators can spare some time to go through related commits.