cocos2d/core/CCDrawingPrimitivesCanvas.js
Merge pull request #25 from samael65535/develop

update CCTransition.js
Merge pull request #26 from dazhaode/develop

cocos2d/core/CCDrawingPrimitivesCanvas.js
Correct some errors of translation
Update 2 files

API translation
Merge pull request #27 from samael65535/develop

修改翻译
Merge pull request #28 from win80x486/develop

Correct some errors of translation
Merge pull request #29 from gagugagu/develop

Update 2 files
1. 翻译CCTransitionProgress.js
2. 翻译CCTransitionPageTurn.j
3. 修改翻译格式