Merge pull request #133 from 5150Joker/dev

Localized all these files