Merge pull request #2151 from geekpi/master

translated
翻译完成
Merge pull request #2152 from runningwater/master

翻译完成
翻译中 by runningwater
Merge pull request #2153 from runningwater/master

翻译中 by runningwater
translating