translating 20140927
translating 20141003
Merge branch 'LCTT/master'
translated by barne-ro
Merge pull request #1771 from barney-ro/master

Translated by barney-ro