translated
Merge pull request #1906 from JonathanKang/master

translated