Re: [Tails-l10n] [fr](merge) Call for translations: 1.7~rc1 …

Delete this message

Reply to this message
Autor: anonym
Data:  
Para: Tails localization discussion
Tópicos Antigos: Re: [Tails-l10n] [fr] Call for translations: 1.7~rc1 announcement [Was: Call for translations: 1.7]
Novos Tópicos: Re: [Tails-l10n] [fr] Call for translations: 1.7~rc1 announcement [Was: Call for translations: 1.7]
Assunto: Re: [Tails-l10n] [fr](merge) Call for translations: 1.7~rc1 announcement [Was: Call for translations: 1.7]
mercedes508:
> Hi,
>
>> Fait, merci de relire elouann / web/test_1.7-rc1 / 1c7551e :
>
> Reviewed and fixed, to be merged from here:
>
> mercedes508 web/test_1.7-rc1 df78c894ae1


There are some weird stuff in your branch, e.g.:

    330bf4a adding untracked files


So I merged elouann's 1c7551e but cherry-picked your df78c89 (so it
became be3d4d5). You may want to have a look at your master, possibly
resetting it (with --hard) to the state of origin's master.

Cheers!