translations
Merge pull request #159 from gioman/master

translations