some translations and a fix from previous push
Merge branch 'master' of https://github.com/sildar/TASER