Stable branch S2_2 will be branched from trunk late August and first 2.2 beta will be released soon after.
Since S2_1 has more up to date translations than trunk, translations have to be merged to trunk before the S2_2 branching. I suggest you check that you update your S2_1 translation (there will be 2.1.10 at some point) and after that you have three merging options. 1) Merge yourself 2) Request that I'll do the merge 3) Do nothing before July 25. at which point I assume that your translation has no active translator, and I just do the merge. Of course you can also request that I don't do the merge yet at that point After the merge you may want to update translation at trunk so that after branching S2_2 both the new S2_2 branch and trunk are up to date. I'll try to run update-po regularly and upload those updated .po files to http://www.cazfi.net/freeciv/translations/ - ML _______________________________________________ Freeciv-i18n mailing list [email protected] https://mail.gna.org/listinfo/freeciv-i18n
