-Finish menu support for i18n