translating
Merge pull request #1966 from ggaaooppeenngg/master

translating