Big commit => i18n + new header