| [translations] Re: Convert-ly on translations |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Lilyfan <lilyfan@xxxxxxxxx>
- Subject: [translations] Re: Convert-ly on translations
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Tue, 16 Nov 2010 09:14:34 +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:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=OtdfIVPtSkW/0bx5TNbLatRSbego19SxwpUbGGj+lvA=; b=LiB88S82bL7mANZq9ycvzRMuhSMDzbNXbK08JzPD3b1MPmsNXvQDuGohhrJY+TKdPo X3dImraENoQq7WcZtMJSLzUOdZrngLsBvkMKw29lve+Lhppn9BXJo4uz8MkLy4Mun3PY y/4X5xavKadBciAaYv2eSu5RDbRuyPYrxASK8=
- 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; b=oxv6TvqQrJqj4J3QUngDVA2haiMKPuc6pRGJoMKYEXsJUtAaXOATGWkRPCBvnJHGVT wDfeDRSxgRUpCXpmcicbcQnfSgn16xczNKSrO7/uS+L6nXaMCLhoMuaGeLPvfBbdp09B 794K/k4Xh7yj69OIuIH4p+ZqzNtK5Mvt4Yjyc=
2010/11/16 Lilyfan <lilyfan@xxxxxxxxx>:
>> 2010/11/15 Francisco Vila :
>> Jean-Charles: I can not merge lilypond/translation into master because
>> you have edited spacing.itely on both branches. When you have the
>> time, please try to solve the merge conflicts and commit the result,
>> thanks.
>>
>
> I won't be able to do anything before this evening, since I'm at the office
> (lostdoze & nothing for anything else than /work/).
> The culprit is "Doc: trim leading spaces."
I could be wrong, but trying to solve the conflicts by myself I found
much more complex editings than leading spaces.
- ea09091569 Doc-fr: apply changes to vertical spacing is in master
- ebed0ba28c Doc-fr: spacing is in lilypond/translation
both are yours, and both are huge.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com