Re: some more patches updating the German translation

[John Mandereau]

Le jeudi 30 août 2007 à 17:50 +0300, Till Rettig a écrit :
> 
> John Mandereau wrote:
> > Le mardi 28 août 2007 à 22:52 +0300, Till Rettig a écrit :
> >   
> >  I don't know all the
> > reasons, but there is clearly one: your patches don't include all the
> > changes you made to German translations, for example adding
> > "documentlanguage: de" to working.itely. 
> This is strange, what do you mean? I don't find this in my version of 
> working.ly

Neither do I, but here's an excerpt of your patch:

diff --git a/Documentation/de/user/advanced-notation.itely
b/Documentation/de/user/advanced-notation.itely
index 79d2b61..dd02d2c 100644
--- a/Documentation/de/user/advanced-notation.itely
+++ b/Documentation/de/user/advanced-notation.itely
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish:
9634340429eb0518432b152fe4aaf7471b67b013
+    Translation of GIT committish:
3121682025660b6c85fbf3f22bb9cd8396699ad1

"documentlanguage: de" appears in a context of the patch; it's very
strange, isn't it?  I really don't know where this comes from.



> >  The easiest way of sending me
> > your changes at this point is to pull then send me the output of
> >
> > git diff remote_branch your_local_branch
> >   
> I did now this diff anyways and attach it to the mail. Hopefully it 
> works with that one and after that
> I can just use git format-patch again.

Yes, you're right.  The big patch applied succesufully excepted
index.html.in, which I edited by hand to apply your changes, so expect
to encounter a conflict for this file next time you pull; if this
happens, always resolve conflicts in favor of git.sv.gnu.org branch, so
you avoid future conflicts.

Sorry for the delay for applying your updates; they will be included in
2.11.32
Cheers,
John