Tidy up more complex string formats dealing with merging html fragments into localised resources.