Bug4988/search strings

-- fixed as per review
-- decided against doing something smarter with the comment box in this bug (i.e. displaying four different strings depending on each situation) as I think it depends on bug 5185.