From kde-i18n-doc Mon Apr 26 19:36:09 2010 From: Albert Astals Cid Date: Mon, 26 Apr 2010 19:36:09 +0000 To: kde-i18n-doc Subject: Re: koffice 2.2 has been branched, trunk is open for commit Message-Id: <201004262036.09855.aacid () kde ! org> X-MARC-Message: https://marc.info/?l=kde-i18n-doc&m=127231062413725 A Diumenge, 25 d'abril de 2010, Kevin Scannell va escriure: > On Fri, Apr 23, 2010 at 12:32 PM, Cyrille Berger wrote: > > Hello, > > > > I have finished the branching of koffice 2.2, meaning that trunk is now > > open for features commits. While translation for the stable release > > should happen in branches/stable. > > > > I expect the final 2.2 release to happen within 5 weeks. > > I have a question about the process involved in branching koffice - > were the PO files from the trunk copied over to the stable branch, or > were the POT files copied and then merged with the existing PO files > on the branch? They were copied. > > I ask because I've only been maintaining the branch translations for > the last couple of months - it's too hard for one person to keep up > with the trunk (at least too hard for me). So I suspect some of my > recent work on the branch was wiped out when koffice 2.2 came over (I > know it's all recoverable, it's just a bit of a pain). > > Are there any other teams who work only on the stable branch who can > suggest a process model that avoids this? Should I be periodically > forward-porting my work to the trunk? How often? In this case, > maybe it would be better if l10n teams had some advanced warning > before a big change is about to be landed in our repos? > > I'm similarly concerned about the creation of the next stable branch. > I assume this is taken from the trunk - will I have enough warning to > copy my translations to the trunk before that's done? I've talked with Cyrille and he will try to remember to give a warning in advance so we can do whatever is needed in advance. Albert > > Thanks > Kevin