Re: [translations] snippets in LM

[Francisco Vila <paconet.org@xxxxxxxxx>]

2011/7/11 Federico Bruni <fedelogy@xxxxxxxxx>:
> 2011/7/11 Francisco Vila <paconet.org@xxxxxxxxx>
>>
>> So, after all, maybe the only way we have for applying those changes
>> to both branches would be to apply normally to lilypond/translation
>> and then to craft a patch which takes care of those conflicting blank
>> lines and ask Carl to apply it directly on 2.14.  Tricky and risky.
>>
>
>
> I thought that the blank lines were removed on lilypond/translation (if I
> pull),
> but I didn't check.
>
>
>
>
>>
>> This can be done by checking remotes/stable/2.14 out,
>> saving/renaming/backing the files up, and making a patch from the
>> result.  Indeed it looks tricky and risky! but let's remember this is
>> only a matter of conflicting blank lines.
>>
>> >> 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.
>>
>> If this applies to lilypond/translation, please push it and give Carl
>> the resulting ID of the commit.  Trying to port that onto 2.14 could
>> cause conflicts but at least we have something done.
>>
>
> ??
> I don't have push access.

Sorry.  Patches 0001 and 0002 applied cleanly on lilypond/translation.
Thanks! Commits are

commit 34607d3e36a93030690ccd780a7ffce621ca1e0f
Author: Federico Bruni <fedelogy@xxxxxxxxx>
Date:   Mon Jul 11 00:33:08 2011 +0200
    Doc: run makelsr.py after adding italian translation of snippets in LM

commit 9b2aaea69cc2edf5fd023db2d6d0843f69d75131
Author: Federico Bruni <fedelogy@xxxxxxxxx>
Date:   Sun Jul 10 00:43:06 2011 +0200
    Doc-it: add the chapter "Templates" of LM, plus some updates and fixes

Now testing doc build. Will try a local cherry-pick for testing.

-- 
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com