Great, thanks for the explanation.
--
---- __o
---- _`\<,_
---- (*)/ (*)
Em Tue, Nov 13, 2012 at 03:03:50PM +0000, mercedes508 escreveu:
> Hi,
>
> I'll give a try to this.
>
> During the freeze period, which usually starts with a "call for
> translations", you should base your work on testing branch.
> If your work is merged in the amnesia testing branch, it'll be
> merged in master branch when the release is out. And in between two
> freeze periods, which should be most of the time, base your work on
> master branch.
>
> This may be a little simplified, but frankly you should find your way
> out this way.
>
> For further information on the freeze period see :
>
> https://tails.boum.org/contribute/release_schedule/
>
> Cheers
>
> > Hello, intrigeri. I would like to make sure I understand correctly.
> >
> > We are currently basing our translations in the master branch, which
> > we forked to be a branch named doc/pt in our repo.
> >
> > What you are suggesting is during freeze time we locally merge our
> > doc/pt branch with testing branch from upstream and base our
> > translations in this one, right?
> >
> > Then after release we can locally merge back our branch with master.
> > Is that it?
> >
> > Thanks!
> > drebs.
> >
>
> _______________________________________________
> Tails-l10n mailing list
> Tails-l10n@???
> https://mailman.boum.org/listinfo/tails-l10n
