| Re: [translations] Web-it update patch |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: John Mandereau <john.mandereau@xxxxxxxxx>
- Subject: Re: [translations] Web-it update patch
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Mon, 22 Nov 2010 08:47:58 +0100
- Cc: Translations list at lilynet <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=OOweONt8zEp/5xhVHZZtC1gu0Xwr183aUeFdQukl6yU=; b=YiPm2/8SzxtAIAYzY/6oe9gj+Y2nfJW/HvrLmh2yRHq9RuIXCkw56032eAnQeOA2Fi S4HDwOuCET+lF5yXHdW5l5tu2wnyDEKb72SYlzrnzMCHWWy8KttLKBLt763HK5X57DXd fGXJb7Th8ueP/kxw+eB51isKE9ctEWK50P4XY=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=aCReE2s41ITwPKij/a3+E528h5B7A8FDoCAMPg3FFqv8CfYPAIYRpO7AZT6obCE0ff tdQ8T1jmuD6ZYT8Bmh1G6jUNNcPGVV+3EhKEOPLYIgmcfPuYZeuzb1MmXivFe65rVbH6 kjFjayPCykaOzwbaMSTOHyoGJTaEyTnECQ7CE=
Il giorno dom, 21/11/2010 alle 23.02 +0100, John Mandereau ha scritto:
> Hi Federico,
> Il giorno dom, 21/11/2010 alle 20.32 +0100, Federico Bruni ha scritto:
> > can anyone please check the attached patch?
> >
> > Thanks!
> >
> > Federico
>
> Applied (I fixed a trailing white space).
>
Thanks.
Last question: I tried to pull and saw the conflict in
it/web/community.itexi.
I've fixed my file, then 'git add file' and 'git commit -a'.
It seems fine, but this output is OK?
fede@debian:~/lilypond-git$ git status
# On branch lilypond/translation
# Your branch is ahead of 'origin/lilypond/translation' by 2 commits.
#
nothing to commit (working directory clean)
My branch is ahead of origin by 2 commits... What does it mean?
Is it normal?
> From Documentation/web/manuals.it.html the link to Essay is broken, but
> that's unrelated to your patch and not your job; I'm struggling with the
> crazy combination of Texinfo macros and html links rewrite by Python
> scripts.
>
Ok, noted.
Good luck! :)