Translated to english
Merge branch 'english'