Re: [translations] Git translation branch policy change: merge with and from stable/2.16 |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: David Kastrup <dak@xxxxxxx>
- Subject: Re: [translations] Git translation branch policy change: merge with and from stable/2.16
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Sat, 20 Oct 2012 20:33:28 +0200
- Cc: Jean-Charles Malahieude <lilyfan@xxxxxxxxx>, John Mandereau <john.mandereau@xxxxxxxxx>, Translations list at lilynet <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=zPLT8VVOzojYD7k02QJV5QmcB5V1rwf38fFRnVYKZAQ=; b=iHVa8N/DO82YTQnUvVcc8CeGYToO2yFFkAq7nFkB9r3mC0tY17u2I9fI1nQtnONBtL WPVSFyEuou/pNGC90L1szPlZE+P8QF/7YwHNjdmQiHx4laRLaP/nHM8NI1npd72zeMsh AD3jAX2HrktY9/Blzw20paPcm+YKbH5A2XuPuG1JzqO3iIc93kcA6SLwWmk/dr7ARBVu MpkzO/ULz8Nxyxv5eyB5Engxeh1U4IhoSagchqyRIhOrPQrNL3lM24ULY36vEfFuM0Xh phUxHTIO0Z3G3xhbpynJTkqqDdjv/MWwduHWQg0gKBS4MWA8Y673EfyFsIk1rRkSZ7Ty WkSw==
2012/10/20 David Kastrup <dak@xxxxxxx>:
>
> If it is ok with people, I'd propose the following course in order to
> get the ball rolling again:
>
> I'll merge stable/2.16 into translation. That should be unproblematic.
> Then I'll merge translation into staging. This will require a bit of
> cleanup and conflict resolution.
The only problems I foresee, will come from original English docs. As
we have not translated anything new since the fork, all translated
material is directly dumpable there. Not blindly, though, you know
what I mean.
> I am willing to take care of that and of the translation merges into
> staging when translation is still based on stable.
How is this useful? Here I can see a clear need of two translation
branches. It translation is based on stable, we can not work on devel
branch.
> Since one purpose of
> getting staging up to date with regard to translations is to be able to
> do extensive convert-ly work, the merging might be a bit tricky until
> things move over completely.
My proposal is to move to devel branch, merge master on translation
and forget about stable. We have been freezed for too long. Not a
line of any new material in devel releases has been translated.
> I am not sure when translators will want to move their focus to master
> rather than stable again: it might be possible to create a branch
> translation-stable for working on stable branch translations, but I
> would like to phase out stable branch work eventually and so a separate
> translation-stable can still be left for a time when we feel we really
> need it. Probably cherry-picking will be enough if commits for
> unstable-only material are kept separate well enough.
Agreed. But specifically, you mean cherry-picking
translation-->staging or translation-->stable?
> At any rate, with this plan it is more or less up to the translators to
> decide when they think 2.16.1 is ready. There is not much I
> cherry-picked into the stable branch since the last translation merge,
I think nothing has been, for the translations' sake
> and I'd not like to wait much longer than a week for 2.16.1 in
> consequence, but 2.16.2 will likely take quite longer.
>
> People fine with that?
The question is: translators, do you plan to update yet something for
stable? whe we are reasonably done with stable, let's forget it and
move to staging.
As for Spanish, I am done. Can not speak for others.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com