| Re: [translations] Web-it update patch |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Federico Bruni <fedelogy@xxxxxxxxx>
- Subject: Re: [translations] Web-it update patch
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Mon, 22 Nov 2010 19:57:38 +0100
- Cc: John Mandereau <john.mandereau@xxxxxxxxx>, 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:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=I1LygRcUVFmJA/V5y7MrDlNts3R+TpKJWN0FO7a2fXI=; b=aL0rccRkBxCFhObvEwuzsD+SLI5b+oh/8mGiSV4ru1CIMWam2S4Mzi6x/Cy/X4ZFuW IJ1l8DxDCrieZqZQzth7R5zoNi+tXuq0n3sgs9pw/FTbyUhN1yegPgVWBKgGvm6PKYDJ zq3GzQJwtPoyvGnFlTFduxk0sB8Hq09p3DBKY=
- 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=Lnq4RW1JvHh67mjS/FeFQKUkIpHs60BEnWVhlYe26O8vXGFebwJyeOO5s09T6aPbUq 48OmVFrQuMxT8pL1qD0Dl9/e2yytI+5SY3j+5chEwxWhwK+R85EgqiYbupEX0g0y5IPU 6YA2mNVDUmwcQJj/V92AtjsOYjkikeBjEnGZ0=
2010/11/22 Federico Bruni <fedelogy@xxxxxxxxx>:
> git diff origin/lilypond/translation gives no output
This would mean that your tree is in sync with origin; to my understanding only.
> three last commits given by 'git log -p':
> commit 9fd0d13c081d482922dbc5eb4747cde6bd965ea7
> Merge: 4ad45c8 92190ad
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date: Mon Nov 22 08:38:14 2010 +0100
>
> Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
> into li
>
> Conflicts:
> Documentation/it/web/community.itexi
This is new and it is currently not in origin.
> commit 92190ad98deac78cf32837078741296205072119
> Author: John Mandereau <john.mandereau@xxxxxxxxx>
> Date: Sun Nov 21 22:48:49 2010 +0100
>
> Docs-de: update syntax with convert-ly to fix doc build
>
> commit 69068a797fa36f51f487c62754729a82d5e8bb99
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date: Sun Nov 21 20:28:41 2010 +0100
>
> Web-it: update italian translation of website
These two are actually in origin. I think you can safely push, but
let's see what John says.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com