Merge branch 'translation'
Fix chinese translation
Merge remote-tracking branch 'upstream/master'
Merge pull request #41 from luiges90/master

Fix Chinese Translation