I tend to do most of the work in the trunk. The problem, as you say, is that I may do work in vain, if something in the trunk doesn't ever make it to stable. However, it allowed me to advance work on the lots of new nations for 2.2 when I had time to spare. I agree it must have been a pain to merge both trunk and 2.1 into 2.2; in fact, I was a little lazy to download 2.2, and that's why it was not up to date.
But I think you could safely assume that, if someone works on the trunk, he knows what he is doing, and he will eventually propagate changes into stable. Perhaps what should be done is to write down a set of guidelines for translators that explained the pros and cons of each approach, and clarified everyone's duties. Something like: - developers will copy translated strings from one stable to the next (I didn't know that a week ago). - if you work on the trunk, it's your responsibility to propagate strings into stable. - establish who will do make-update-po, and when. We could discuss a set of best practices in the list and post it in the wiki. Joan 2008/2/2, William Allen Simpson <[EMAIL PROTECTED]>: > > I'm not sure this is wise. > > My view is that all translations to trunk would be > prohibited. Translators > should only update branches, instead. > > Update trunk translations just before a branch from trunk. > > Right now, there are a couple of translators that *only* make their > updates > to trunk, as I recently discovered. Sadly, this is a waste of time, as > the > shipping translations are from S2_1. We never update 2.1 from trunk. > > For S2_2, I had to merge from trunk, then merge from S2_1, then re-merge > from > trunk (this was a consequence of the msgmerge internal processing). A > PITA, > requiring much experimentation and line-by-line comparisons. > > Trunk is supposed to change frequently, and programmers shouldn't have to > worry about the translation state. Branches are supposed to be more > stable, > and any changes to translations are (usually) announced. At least, that's > been the practice during my time around here. > > > _______________________________________________ > Freeciv-i18n mailing list > [email protected] > https://mail.gna.org/listinfo/freeciv-i18n >
_______________________________________________ Freeciv-i18n mailing list [email protected] https://mail.gna.org/listinfo/freeciv-i18n
