Update fr.js
Fixed merge conflicts on french translation