translations
Merge pull request #147 from gioman/master

translations