merged with new version and submit zh_CN locale