Le samedi 01 septembre 2007 à 12:01 +0300, Till Rettig a écrit : > John Mandereau wrote: > > "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. > > > ok, I found the mistake: I have this "documentlanguage" in all untranslated > files. No idea how it came there > and why it is not in git.
It's autogenerated by texi-langutils.py when skeletons are created or updated. It seems that some Eamcs versions/configs keep this local variable, whereas other don't. I don't mind whether we keep it or not as long as it does not prevent anybody to make clean patches. > What can we do? Would it work that I send you the rest of the updates as a > diff and > after you applied then do > git reset <head of current git>? Is that enough to get me back to a copy of > git without my own changes? Yes, approximately. git-reset is the good command to use, use it with - the name of lilypond/translation remote branch in your git repository as <head of current git> - --hard option, to also apply changes to your working tree. > Yes, I merged that and send you now the output of git diff. Hope it works now > this way. > index.html.in seems now clean. However, PDF compilation fails on German manual with your patch, see comments below. I pushed fixes to lilypond/translation. > #. @node in ../../../Documentation/user/instrument-notation.itely > #. @subsection in ../../../Documentation/user/instrument-notation.itely > @@ -1600,7 +1587,6 @@ msgstr "Überblick über Textbeschriftungsbefehle" > > #. @node in ../../../Documentation/user/advanced-notation.itely > #. @subsection in ../../../Documentation/user/advanced-notation.itely > -#, fuzzy > msgid "Overview of text markup list commands" > msgstr "Überblick über Textbeschriftungsbefehle" Pay attention to these slightly different titles! The identical translation you provide for different titles makes pdfetex complain. I fixed the second title as "Überblick über Textbeschriftungslistenbefehle", please provide a patch if it's not correct (it's certainly not, as I've not written in German for ages :-p). There were other various @commands typos and oddities, fixed in 7c9ff05e82902b3357f8a2ac0354d8971539a15a and 718cc970304f6b9a3bb990259a048c06e56f4e48 (lilypond/translation). Your recent 2 patches and all fixes are also on master. Cheers, John _______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
