Fix #493.

Also removed some HTML markup inside translatable strings so that
translators are less likely to break it.