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

Poista viesti

Vastaa
Lähettäjä: anonym
Päiväys:  
Vastaanottaja: tails-l10n@boum.org
Aihe: Re: [Tails-l10n] [fr](pull) 3.12
intrigeri:
> Hi anonym,
>
> Chre:
>> xin:
>>> based on bugfix/16376-fix-buggy-merge
>>>
>>> Repo: https://git-tails.immerda.ch/xin/tails/
>>> Branch: translate/3.12
>>> Last Commit: b9c341936987c0d995c2af4f976f3f90388b569e
>
>> It is ok, please pull.


When merging into testing I get a massive merge conflict in

wiki/src/install/inc/steps/restart_first_time.inline.fr.po

I am not sure I'll get it right if I try to resolve it myself so, xin, could you give it try? If you don't see this in time for when I start preparing Tails 3.12 (latest 2019-01-28 noon) I'll try myself.

Cheers!