[Tails-dev] French translations to merge

Hi,

I pushed some new (french) translations and sent a message on the
tails-l10n list.

If I also post on this list, it's because the stuff I pushed before
was not merged, and I faced some merge conflict I'm not used to manage..
(the same page was also modified by somebody else using the
web-interface)

Can anybody check and eventually merge this?
http://repo.or.cz/w/tails/matsa.git

I'm pretty new with Git, so please tell me if I can improve my
contributions.

Great thanks.


.