bookjoy translating
Merge pull request #1297 from bookjoy/master

bookjoy translating