Re: [translations] Moving translation branch to 2.17

[Jean-Charles Malahieude <lilyfan@xxxxxxxxx>]

Le 06/12/2012 16:02, David Kastrup disait :
> Jean-Charles Malahieude <lilyfan@xxxxxxxxx> writes:
>
> > This looks strange, since I have (on my fresh repo) only input and
> > spacing that diverge, plus changes.
>
> I get
> git diff --stat translation origin
>   Documentation/fr/notation/input.itely   |  715 ++++++++++++-------------------
>   Documentation/fr/notation/rhythms.itely |   65 +--
>   Documentation/fr/notation/spacing.itely |   33 +-
>   3 files changed, 306 insertions(+), 507 deletions(-)
>
> after the merge.  Pushed to translation as
>
> commit 01df8ad908c92687d0c352e5ad5f067e52809423
> Merge: 9022059 d03ae37
> Author: David Kastrup <dak@xxxxxxx>
> Date:   Thu Dec 6 15:53:14 2012 +0100
>
>      Merge remote-tracking branch 'origin/master' into translation
>
>      Conflicts:
>          Documentation/changes.tely
>
>      has been resolved by taking the version in master
>
>          Documentation/fr/notation/input.itely
>          Documentation/fr/notation/spacing.itely
>
>      Code conflicts (possibly from use of convert-ly) have been resolved by
>      taking the code corresponding to the current English translation.

As far as I have checked after having backed up those three files, it 
seems to be the effect of convert-ly.

> It would be worth for the French translator to check the diff between
> this merge commit 01df8ad908c92687d0c352e5ad5f067e52809423 and
> corresponding master d03ae375a34eaac79b224c4d01bd24749c4c6787 to make
> sure that there has been no loss of valid content on master.

I'm now on my way with check-translation.

Thanks David for letting us go forward.

Cheers,
Jean-Charles