Error message changes and re-location of en_UK errors