More changes to the build system; make i18n generation nicer