Merge pull request #612 from runningwater/master

翻译完成
saved