translated
Merge pull request #671 from SteveArcher/master

translated