Re: [Tails-l10n] [fr](pull) 3.13

Delete this message

Reply to this message
Autor: xin
Data:  
Para: Tails localization discussion
Assunto: Re: [Tails-l10n] [fr](pull) 3.13
intrigeri:
> Chre:
>> So quickly xin! Thanks :)
>
>> Le 19/03/2019 à 18:55, xin a écrit :
>>> It's for web/release-3.13 or master after the release.
>>>
>>> Repo: https://git-tails.immerda.ch/xin/tails/
>>> Branch: translate/3.13
>>> Last Commit: ecc1f3c76cdcf1eab49b5b7492a0fd7cc0bbd009
>
>> It is ok, please pull.
>
> Unfortunately, it seems that the original English text and/or PO files
> have changed in the meantime, so this branch now has merge conflicts.
> Please merge current master branch, resolve merge conflicts,
> and resubmit. Thanks for your patience :)


Hello, I resolve conflicts, please merge.

Last Commit: 4e02dc635b749d4ec77276d0d45c175aefa556fc