removed hardcoded messages and replaced by translation strings