Next

These are the changes from my i18n-fr branch, with correction.