[fr] ajustements: regex -> tokens