[fr] a few minor corrections + simplified some regexps.