Translated
Translated
Merge pull request #1039 from JonathanKang/master

translated