get translating done
Merge remote-tracking branch 'upstream/master'
Merge pull request #483 from thinkinglk/master

翻译完成
很好~