Use pre_process to define macros
Upgraded i18n