Re: [Tails-l10n] [pull](fr)Call for translations: 1.3

Hi,

intrigeri <intrigeri@???> a écrit :

> matsa wrote (22 Feb 2015 22:58:19 GMT) :
> > Short version: please pull from matsa / translation / 0911f3c
>
> I tried to merge that into master but there were merge conflicts.
> Please merge current master into the proposed branch, resolve
> conflicts, and ask again. Thanks!

Yes indeed, I forgot to merge with master before pushing, sorry.

I merged and resolved the conflicts in translation/447cc35, but was not
able to review them: "gil log -p" on a merge commit does not show the
detailed changes. I hope this merge is fine.

Thanks, and cheers