Autor: Matsa Data: Para: tails-l10n Asunto: Re: [Tails-l10n] [pull](fr) Updated translations for problematic
USB sticks
Le Sat, 21 Sep 2013 16:31:07 +0200,
intrigeri <intrigeri@???> a écrit :
> Matsa wrote (21 Sep 2013 09:59:04 GMT) :
> >> wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
> >> wiki/src/support/known_issues.fr.po
> >>
> >> commit 101a0f8, master branch, mercedes508 repo.
> >>
>
> > reviewed, ready to be merged.
>
> Unfortunately, mercedes508 translated this new piece of text while it
> was still under review, so the English text has changed a bit since
> then, and the merge fails due to conflicts. Please merge current
> master, resolve the conflicts and come back to me. Thanks in advance!
>
The conflicts should be fixed in matsa/ master/ 23aef3e
I had to cherry-pick, tell me if I did something wrong.
