Merge pull request #40 from mantisbt/master

pull updates from origin master
forgot english strings
Merge branch 'hardcoded-strings'
use everywhere
Merge pull request #43 from badfiles/hardcoded-strings

Hardcoded strings