French translation merged (thanks to gaumondp)