On 4 April 2013 20:58, Rob Weir <robw...@apache.org> wrote: > On Thu, Apr 4, 2013 at 11:21 AM, janI <j...@apache.org> wrote: > > > Hi. > > > > Since we are now putting a lot of positive energy into 4.0, we have a lot > > of changes in trunk and at the same time I have made language changes in > > the l10n branch. This is a bad combination, that gives me quite some > extra > > manual work. Furthermore I would like the 4.0 language files to be clean > > (whether we make them as po for sdf). > > > > If there are no objections I will merge the language changes (NO code > > changes) back into trunk. > > > > The changes in trunk will primarely be in .src files, where language > > different from en-US, as discussed in an earlier thread. This will not in > > any way affect the modules or the build system. All changes are committed > > in l10n branch. > > > > If no objections I will merge into trunk, monday april 8 using lazy > > consensus. > > > > > So we had translations in Pootle, in the 3.4 branch and in the trunk. I > assume you're able to get us all back together? If so, this is a big step > forward. Thanks! >
Yes if you look in branches/l10n/solenv/lang you will find a consolidated set of po files (which cannot be used for 4.0, before I get genLang integrated in build) A message with a non en-US languages in the source code "overrule" a real translation (comming from pootle or elsewhere) of that message (by simple order of presence). These messages are wrong, and the new genLang does not allow them. rgds jan I > > -Rob > > > > > rgds > > Jan I. > > >
