Update fr.js (mix)

A mix of my version and the @colok version