Re: [Tails-l10n] [doc][fr] Merge Request

> Please merge the upstream master branch into your own,
> resolve the conflicts as needed, and ask again :)

hopefully it's now fixed.
So please merge master branch from mercedes508 repo, from this state:

commit a2b9324f

It includes as well updated translations according to this email:

[Tails-l10n] Changes to /download and /doc/first_steps/usb_installation

Thanks.