Merge pull request #5 from LCTT/master

2014.10.12
2q1w2007翻译中

20141009 How to convert image audio and video formats on Ubuntu
Merge pull request #1845 from 2q1w2007/master

2q1w2007翻译中