I would love to keep this new code, as I really dislike HTML in translation strings and that way it's much cleaner.
Anyway I'm fine with reverting the other two changes ``Total Amount %1`` and ``Invalid payment address %1``.
Does this make you ACK this pull?