translated
Merge pull request #653 from SteveArcher/master

translated