| Re: [translations] Moving translation branch to 2.17 |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
Francisco Vila <paconet.org@xxxxxxxxx> writes:
> 2012/11/29 David Kastrup <dak@xxxxxxx>:
>>
>> Hi,
>>
>> is there any objection of moving the translation branch over to 2.17? I
>> think it is about time: syntax and documentation of 2.17 have by now
>> diverged from stable to a degree where significant parts can't be moved
>> between 2.16 and 2.17, and the translations should focus on getting this
>> new work out to non-English speakers as well.
>>
>> I also noticed that in the statistics of commits, translations have
>> dropped precariously (previously Francisco being more or less tieing
>> with me regarding numbers of commits, mostly due to translation merges).
>> So it appears that further staying with 2.16 would block a significant
>> part of work on LilyPond.
>
> Definitely. I speak for myself: I can not work on translations unless
> we are on 2.17. So, I have been waiting this moment to arrive.
I have tried the obvious of checking out the translations branch and
merging current master into it.
Four files are in conflict, Documentation/changes.tely (with obvious
diverging work, where we would just want to get the new version), but
also
Documentation/fr/notation/input.itely
Documentation/fr/notation/rhythms.itely
Documentation/fr/notation/spacing.itely
where apparently parallel work has happened on both the translation
branch as well as on master.
The resolution appears non-trivial for me and my French really is not up
to figuring out which of the versions would be considered canonical in
each case. In the case of code examples, one can try using the version
from the untranslated English documentation. I am not sure this is
always the right choice, though.
--
David Kastrup