Improve internationalized strings by moving wrapping markup outside

While basic markup (including links) inside internationalised strings is fine when it avoids splitting strings up, there's little point in having markup around the outside of the string, since it can just be moved outside.