Bug 966511 - port string changes to holly, r=gavin