Cleaning up i18n a bit.

I'd still like to use placeholders appropriately though.