On Saturday 05 March 2005 19:07, Joey Hess wrote: > 8 Mar merge updates to sarge branch of svn repository, where > necessary powerpc 2.4 kernel deb is in testing How should translations be handled here? For languages where updates have been done in both branches, merging changes from trunk may result in conflicts (even if only in date fields). Also, for languages that use integrated PO files, a merge from trunk could be undone by the next l10n-sync run from bubulle's scripts. Maybe the best thing would be to disable l10n sync for the Sarge branch until this release has been properly tagged and to just copy the correct revision of all po files from trunk over the ones currently in the Sarge branch?
Attachment:
pgpVAprKC1Xq0.pgp
Description: PGP signature