Merge pull request #2152 from runningwater/master

翻译完成
翻译中 by runningwater