Better error messages
And of course the language files ;-)
Merge branch 'dev'