Improve l10n. This is about half way to grimshaw's version.