完成翻译
Merge pull request #296 from coolpigs/master

完成翻译