translating
Merge pull request #830 from crowner/master

translating