| Re: [translations] Catalan translation priority II |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: walter.garcia@xxxxxxx
- Subject: Re: [translations] Catalan translation priority II
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Sun, 27 Jul 2014 18:35:36 +0200
- Cc: Translations Lilypond <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=NhneKGZJZsoyjE4Zn6onYbnPFpLdGxZiCriS0kZLFts=; b=c5Ddsl2MFyRwRdpHdz0vhgnrxb45/XscslO288sSnz32zMhI0QNKEMyZkDZuiOaDSr B1VWHztzELvIRAWhe6r2q1I8cQLlctETRDXD4+VH7ERn3Fb1va/ej0/YfYiJYtefPR76 OArBTuq9U9V72en83VshY2d5m6E6GThPkp/KGXC4W5x3xB/H2Ir2zrcF8wvrcP+ZuN4l gM5Y+ynF5X4QwB8p6UcPk5e0gZMnSDkoPu20puJT88V4owWVvX4dujvt3HMI0kHyXwpf Qzam7yS8pCE9em55tMle/hum42BVU5+ixjfmThOvghMC2B4g1TEOQ8Y6pZ2PnQs3w91e 2hag==
2014-07-27 18:26 GMT+02:00 Walter Garcia-Fontes <walter.garcia@xxxxxxx>:
> * Francisco Vila, paconet.org@xxxxxxxxx [27/07/14 18:00]:
>> 2014-07-26 13:34 GMT+02:00 Walter Garcia-Fontes <walter.garcia@xxxxxxx>:
>> > I have finished the translation of the priority II files, here are my
>> > patches:
>> >
>> > http://puna.upf.edu/catalan_patch.zip
>> >
>> > It builds in my local repository.
>> >
>> > A doubt: I have rebased my repository against "master", so these
>> > patches are against master, should I have done everything using the
>> > "translation" branch?
>>
>> Yes, but if we get master merged into translations soon there should
>> not be much difference. CC'ing to David.
>
> Thanks Francisco. Two more doubts:
>
> 1) Should I then try to get my patches against translation and submit
> them again, or these (against master) are fine?
As long as your files have not changed in the meantime in either
branch, patches will apply to both. I have not tested it, though. What
I'm sure about is, a patch does not have the name of a branch in it.
Patches apply to currently checked-out branch.
> 2) The master branch seems to have some conflicts marked in some files
> (for instance in Documenta/ca/web.itexi, with >>>>>>> HEAD and
>>>>>>>> such). I have fixed them in these patches. Why are they
>>>>>>>> there? I checked in the translation branch and I didn't see
>>>>>>>> those conflicts there.
I think a conflicting merge was not properly finished on your side and
you committed these as valid changes (they aren't).
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com