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.
--
---- __o
---- _`\<,_
---- (*)/ (*)
Em Wed, Nov 07, 2012 at 10:30:45AM +0100, intrigeri escreveu:
> drebs wrote (06 Nov 2012 18:29:18 GMT) :
> > Hello, what follows is a pull request for the amnesia repo with some
> > more translation for portuguese.
>
> Done, pushing.
>
> > So next steps for me are reviewing the status of pt translation for
> > applications and then continuing with website translation.
>
> Looks good!
>
> Another thing that would be most welcome is to merge the current
> master branch into the testing one, and resolve any conflict that
> arose (if any) from the updating of traslations in master, while at
> the same time English source changes in testing. Merging such
> conflicts in PO files is tricky a task when one does not speak the
> target language.
>
> To entirely avoid the need to solve these conflicts, during freeze
> time (RC1 -> final release), I suggest you focus your translation
> efforts on the changes brought by the testing branch, both on the
> documentation side and on the custom applications one. Alternatively,
> going on translation work in master during freeze time is fine too, as
> long as one makes sure they don't touch pages that were changed in
> testing too.
>
> Cheers,
> --
> intrigeri
> | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
> | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc
> _______________________________________________
> Tails-l10n mailing list
> Tails-l10n@???
> https://mailman.boum.org/listinfo/tails-l10n
