henryfour's translating
Merge pull request #1600 from henryfour/master

henryfour's translating