Fix wrong variable name
Add some missing translation strings and unify system messages