Make error messages translatable
Merge pull request #1 from incuna/cleanup

Review initial commit