improved error message
improve translations
Merge branch 'master' into config-cache