translated
Merge pull request #956 from linuhap/master

translated