more work on i18n consolidation