Re: [Tails-l10n] [fr](review) wiki/src/install/inc/steps/dow…

Poista viesti

Vastaa
Lähettäjä: Chre
Päiväys:  
Vastaanottaja: Tails localization discussion
Aihe: Re: [Tails-l10n] [fr](review) wiki/src/install/inc/steps/download


xin:
>> Hello, I update your branch and fix a conflict with the current master.
>> Please review.
>>
>> Repo : https://git-tails.immerda.ch/xin/tails/
>> Branch : review/chre/installdownload
>> Last Commit : 84f37204fc6d9e835bff18c9e625230a009e6d28
>
> Hello, I update this branch to not fuzzy the pt.po file.
> Please review.
>
> Repo : https://git-tails.immerda.ch/xin/tails/
> Branch : review/chre/installdownload
> Last Commit : 115df24846c979b83414c43391ee4d234d5fdd05
>
> Cheers.
> xin
>


Sorry, but some troubles here:

> $ git merge xin/review/chre/installdownload
> Fusion automatique de wiki/src/install/inc/steps/download.inline.pt.po
> Fusion automatique de wiki/src/install/inc/steps/download.inline.html
> Fusion automatique de wiki/src/install/inc/steps/download.inline.fr.po
> CONFLIT (contenu) : Conflit de fusion dans wiki/src/install/inc/steps/download.inline.fr.po
> La fusion automatique a échoué ; réglez les conflits et validez le résultat.


Any idea?

Thanks.

--
Chre