| [translations] Re: Where to merge Translations now? |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Graham Percival <graham@xxxxxxxxxxxxxxxxx>
- Subject: [translations] Re: Where to merge Translations now?
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Tue, 3 May 2011 15:46:09 +0200
- Cc: LilyPond-Devel list <lilypond-devel@xxxxxxx>, Translations list at lilynet <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=ugloeA6TR+KfY2W5oqAy+BagAUJ/CdtijqPcXXF1AsI=; b=xjxXfC6ly8YPP9hr48QmPplWehPRBsPMU1SoWFXkNAzmk4Pi3g7hmdMRCfKPcKSmu1 gOnQwpJS3d1E+oHJG9/RLnZhjQwUxNiQxT8C/EOlVyHSqU+ZpLj+xWoyuH0eHPgmLyzG nyZuTHGRyWttxwfxla7lKx8FxEXt7m0rzduV8=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=DYuf81xspcrl7g1JcN5zL8isWuEHs1AIlsu43OUU2pTa1lWohwJyRTszWkFEZh/nmj ro3uzsnCwtMxKie9mBp+Qrx5R07J8qFKxxTMiP2ql/arblGFP3eHBgQDJRuVflZ4ohz+ /ajSS47AEm13gPr6KwTwrNbDgZ8K+DLADzETc=
2011/5/3 Graham Percival <graham@xxxxxxxxxxxxxxxxx>:
> On Tue, May 03, 2011 at 01:45:09PM +0200, Francisco Vila wrote:
>> 2011/5/3 Francisco Vila <paconet.org@xxxxxxxxx>:
>> > Hello, I have noticed that master is now 2.15; we on the
>> > lilypond/translation branch have unmerged work and more is to come.
>> > If master is now 2.15, what's the official mechanism planned for
>> > incorporate latest translations to the upcoming 2.12 stable?
>>
>> A possible solution is that I merge into master(2.15) as usual but I
>> make a list of commits for Carl to cherry-pick them onto 2.14 . Sounds
>> right?
>
> I guess so.
>
> Do we really need those updates, though? I mean, that will be a
> lot of commits to cherry-pick. And it'll be much worse when
> translators start using 2.15-only features in their translations;
> backporting any commit with those will break the stable/2.14
> build.
We could already have translated 2.15-only material, but we don't know
when a material is 2.15 only, so we have probably mixed 2.14 and 2.15
translations in the same commits, making a separation very difficult.
I will assume that changes in originals prior to the fork are 2.14 and
translations of these will be cherry picked if I can extract them.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com