Re: [Tails-l10n] [merge][fr] Re: Review of the translations …

Hi,

Chre wrote (27 Jul 2015 04:44:25 GMT) :
> I review this commit:
> http://git.tails.boum.org/elouann/tails/commit/?h=translation&id=a2c64014f414d1a7b7c62ffae9b5a264fda7dd40

> That's ok for I. You can merge it.

It doesn't merge cleanly into current master: tons of conflicts.
So please someone (elouann?) merge current master into your
translation branch, and resubmit. Thanks!

Cheers,
--
intrigeri