Hello Muri,
thanks for your answer. I rebased my branch and adapted the translation
to the new base c07f1bfc58d7e1fad169f2f52d8cade75ac2340a from amnesia:
https://github.com/UlrichViefhaus/dev-tails/tree/origin/translation/wiki/src/security/Numerous_security_holes_in_2.4
Kind regards,
Ulrich
Am Samstag, den 06.08.2016, 13:22 +0200 schrieb Muri Nicanor:
> Hello Ulrich,
>
> thanks a lot for contributing to Tails!
> As you can see, in the summertime there is always a bit more lag than
> usual (i still have some reviews on my todo list that are from mid-july ;))
>
> I've fetched your repo and tried to merge your branch, but there was a
> merge conflict. I think you've done everything right, but there where
> some small changes in the Numerous_security_holes_in_2.4.mdwn on
> tuesday, which are not yet included in your branch- which leads to the
> merge conflict. Do you know how to do a rebase of your branch? You could
> then translate the additional few lines and push your branch again...
>
> cheers!
>
> On 08/02/2016 02:22 PM, Ulrich Viefhaus wrote:
> > Hello everybody,
> >
> > I translated the requested file
> > wiki/src/security/Numerous_security_holes_in_2.4.de.po based on the last
> > stable commit 165499c5e61afeeb057b13a52aec98d959285ba6 from intrigeri.
> >
> > The translation is located in this branch of my repo:
> > https://github.com/UlrichViefhaus/dev-tails/tree/origin/translation/wiki/src/security/Numerous_security_holes_in_2.4
> >
> > Could you please review it or post a comment, if I did something wrong.
> > It is my first translation for this list.
> >
> > Kind regards,
> > Ulrich
> >
> >
> >
> > _______________________________________________
> > Tails-l10n mailing list
> > Tails-l10n@???
> > https://mailman.boum.org/listinfo/tails-l10n
> > To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
> >
>
