translated
Merge pull request #1049 from linuhap/master

translated