[fr] folow last changes

- follows a2ffbc62
- follows e35f8842
- follows #1830