translations
Merge pull request #158 from gioman/master

translations