Re: [Tails-l10n] [Merge](fr) Whole bunch of website translat…

intrigeri wrote (11 Oct 2014 09:49:53 GMT) :
> Note that this branch modifies po/fr.po, which has nothing to do with
> website translations; please make sure it merges nicely into the
> current testing branch, and report back.

FTR: it didn't merge nicely when anonym had to do it today during the
release process, so I've resolved the conflicts myself.