Update fork with i18n feature