Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
中文翻譯新增
Merge pull request #14 from colorbook/master

中文翻譯新增