Merge pull request #1 from sikroz/master

some fixes
Translate message and comments