翻译完成
translating
Merge pull request #949 from linuhap/master

translated