I18n.
I18n.
Merge branch 'master' of github.com:sfermigier/yaka-core
Better error reporting.