已翻译-------Luox
Merge branch 'master' of https://github.com/LCTT/TranslateProject

Conflicts:
	sources/Calibre 1.6 released with handy mark-book feature.md
已翻译----Luox
Merge branch 'master' of https://github.com/LCTT/TranslateProject
已翻译Luox
Merge pull request #206 from Luoxcat/master

已翻译-------Luox