Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Update chinese translations of types.
Merge pull request #509 from BramChen/master

Update chinese translations of types