Use named parameters in translation strings
Remove HTML from translated strings
Fixing up i18n issues