Added many translations
merge c6f60939880583fb1fffeacdc077a8fb5e6200b3 and resolve conflict
add file for commit c267080df5aa57bb060cf9fd5f36011197e1831f
Merge pull request #125 from chenjiexin/master

merge c6f60939880583fb1fffeacdc077a8fb5e6200b3 and resolve conflict