[ja] apply 3 commits of en to ja

Hunk1: apply @8526500 to ja
Hunk2: apply @a8d1e03 to ja
Hunk3: apply @67bc107 to ja
Merge branch 'progit_ja' of https://github.com/harupong/progit into progit_ja