Ned/i18n xmodule

These are i18n changes, mostly to the i18n tools.  But it includes the changes in #2077, don't worry about those.