Merge pull request #7 from ritey/master

Moving text to language files to help localisation
Merge pull request #1 from atrakeur/master

Merge pull request #7 from ritey/master