fr-FR: removed conflict markers.
fr-FR: fixes.
fr-FR: oeu => œu.
fr-FR: Il y'a => Il y a.
fr-FR: fixed punctuation whitespaces.
fr-FR: use an unbreakable space (U+00A0) before punctuation marks.
Merge pull request #405 from Adirelle/fr-FR-updates

fr-FR updates