| Re: [translations] snippets in LM |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Carl Sorensen <c_sorensen@xxxxxxx>
- Subject: Re: [translations] snippets in LM
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Mon, 11 Jul 2011 00:49:23 +0200
- Cc: Translations list at lilynet <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer; bh=jAyMnaEiqpr5fiDvN174nLot6+c6RI3MSYFU7ye9/fE=; b=uuVW5GM6jjPnkaoKhaUchzVwGpO7oRos6KI+6g21GQr+ydacoSVJmx2vBs89WrWeGA XbnHQZw882ippnyrQmpPAS/02kCaKLE1NyRwfnFGAkgILZ7e8kWGzN2ag41IhICd7YgI Ie0ciwY/neU8pGdr8bG8IgFUw7LHm/XbDlUNA=
Il giorno dom, 10/07/2011 alle 16.22 -0600, Carl Sorensen ha scritto:
> On 7/10/11 8:59 AM, "Federico Bruni" <fedelogy@xxxxxxxxx> wrote:
>
> > Il giorno sab, 09/07/2011 alle 16.56 -0600, Carl Sorensen ha scritto:
> >> I'm sorry, but I couldn't apply these patches to stable/2.14. They
> >> would
> >> not apply.
> >>
> >> Patch 2 did have some trailing whitespace, but git will take care of
> >> it.
> >>
> >> But the patches don't apply to stable/2.14. They are probably off of
> >> lilypond/translation or something.
> >>
> >> Do you have a git commit that I can cherry-pick?
> >
> > I'm not sure of what you are asking...
>
> There were one or more commits pushed to the lilypond/translations branch
> that did what you wanted. All I need is the SHA1 ID of each of those
> commits. Then I can pull the commits directly, rather than trying to apply
> patches you've made, which are less likely to work.
>
Sorry, I still can't understand.
Are you talking about my commits? My commits were not pushed to
lilypond/translation so IIUC they are useless for you.
If it's not my recent commits I have no clue what you mean.
>
> > Anyway, the last commit of the version I was working on is:
> > 2940cdd12c135ef94e4c95ac815e76014eef9c79
> >
> > I've run git pull right now and I'll try to fix the conflicts and make a
> > new patch, as suggested by Francisco.
>
> When you're done, please don't make a patch. Just give me the commit IDs.
>
Too late :)
I've just made a new patch for the snippets.
I've reverted, pulled, added again my it/texidoc files, run makelsr.py
and committed the edited snippets.
I should change the committish of it/texidoc/*.texidoc files, but I
don't care much about it. Francisco, should I?
I hope this will apply.
Otherwise I'll take it slow and make a new patch with no hurry.
[I've just moved and I have no internet connection at home, just a 3g
usb key which works only outside my home... now my laptop has 20 minutes
of battery left]