Code

- Partial update of goto to fr for 2.6.1