| [translations] Re: Where to merge Translations now? |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Carl Sorensen <c_sorensen@xxxxxxx>
- Subject: [translations] Re: Where to merge Translations now?
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Thu, 12 May 2011 20:28:10 +0200
- Cc: Translations list at lilynet <translations@xxxxxxxxxxx>, LilyPond-Devel list <lilypond-devel@xxxxxxx>
- 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=Fe78yYTvF6JZsWD0N580mYQ8JEsjAt2M2hHUg/qkj9E=; b=tZH/TnUaSH10jFjZICNZ96PoNQoCMK6MzlRLkODZKqndQoMkt4SYoWTT+mIfYGsMwK F6nPVv2rNjhjRoxm6WQiLULqgi1gX95TTcgZVp5XwVr7MqAZwwbq+qYtHudfLEIHefxk wYL3dUvOxRk67wUrju8GL8qOe8s9rS33KlcsQ=
- 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=j3nWAXDA0U5w5BtgmtzbpC6CY3gJxqxkh7U8VqjmV7vV1UVN6aNONlDhzBAJwflgSO 8Hpfs2t/oVDFxhAXRn8wbH2zpyQZViBdpU30F7zeBLvkjhm3DnwkxMsEJPpcgkWVbRKS W1Wt/c3AxDWA6yiqYBvM8eufE2qUGGmuYtB2w=
2011/5/12 Carl Sorensen <c_sorensen@xxxxxxx>:
>
>
>
> On 5/10/11 1:30 AM, "Francisco Vila" <paconet.org@xxxxxxxxx> wrote:
>
>> Well. Here is my list. Carl, please, cherry-pick these commits from
>> lilypond/translation to stable/2.14.
>
> I have cherry-picked the commits. I'm a bit concerned that
> Documentation/es/changes.tely may be wrong as a result of some merge
> conflicts I had. Can you please check that?
It looks as if you applied two patches in reverse order. It is my
fault, because I put the same info line on both of them (namely
'Doc-es: update CHANGES'). One is from 2011-04-19 and other from
2011-04-28. Now they are in the stable/2.14 branch but the 2011-04-28
is now older in history than 2011-04-19, which is latest in history.
Aside of how could you manage to do this, the fact is that the
resulting es/changes.itely file looks in perfect sync with English
changes.itely file of the same stable/2.14 branch, so finally I think
there is no problem at all.
Thank you!
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com