Re: [Tails-l10n] [fr][review] Fixes in wiki/src/news/version…

Poista viesti

Vastaa
Lähettäjä: sajolida
Päiväys:  
Vastaanottaja: Tails localization discussion
Aihe: Re: [Tails-l10n] [fr][review] Fixes in wiki/src/news/version_1.6.fr.po

mercedes508:
>> please review elouann / translation / eee4f04487930
>>
>> It fixes the broken links news/version_1.6.fr.po
>
> Reviewed, can be merged from there.


Cherry-picked, thanks!

I couldn't merge the whole branch as it was probably rebased at some
point. I suggest resetting it to mast.

For example, if I look at the differences between your branch and
origin/master:

git log -p ...elouann/translation

I see other commits like:

commit c7b72f4
Author: elouann <elouann+repo@???>
Date: Fri Jul 24 15:57:31 2015 +0000

    Use plain link instead of bit.ly.


Which are already applied to master with a different commit number:

commit c7cd8da
Author: elouann <elouann+repo@???>
Date: Fri Jul 24 15:57:31 2015 +0000

    Use plain link instead of bit.ly.


So you should make sure you have no important local changes to your
branch and then do `git reset --hard origin/master` or something like
this to clean it.