Message handling for i18n

Tried to preserve as much consolidation of message generation as possible while remaining i18n friendly.