Bad translation merge

[David Kastrup]

Hi, the recent translation merge apparently made some wrong choices when
dealing with merge conflicts.  Changes in staging have been overwritten
in the following files:

Documentation/snippets/centering-markup-on-note-heads-automatically.ly
Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
Documentation/snippets/numbers-as-easy-note-heads.ly
GNUmakefile.in
input/regression/autobeam-3-4-rules.ly
input/regression/multiple-time-sig-settings.ly
lily/book-scheme.cc
lily/parser.yy

and a whole lot of others.

git diff --stat 744709d..9d1520b21710bd22872010ae9aa4c4899014e9d4

shows

 Documentation/contributor/introduction.itexi       |    4 +-
 Documentation/contributor/lsr-work.itexi           |   25 -
 Documentation/de/search-box.ihtml                  |   15 +-
 Documentation/de/usage.tely                        |    2 +-
 Documentation/de/usage/external.itely              |  104 ++-
 Documentation/de/usage/lilypond-book.itely         |  217 ++-
 Documentation/de/usage/running.itely               |  242 ++--
 Documentation/de/usage/updating.itely              |   12 +-
 Documentation/fr/extending.tely                    |   78 +
 .../fr/extending/programming-interface.itely       |  345 +++--
 Documentation/fr/extending/scheme-tutorial.itely   | 1649 ++++++++++++++++++++
 Documentation/included/helpus.itexi                |   11 +-
 Documentation/ja/learning.tely                     |    2 +-
 Documentation/ja/learning/templates.itely          |    3 +-
 Documentation/ja/learning/tweaks.itely             |  294 ++--
 Documentation/ja/notation.tely                     |    4 +-
 Documentation/ja/notation/percussion.itely         |    2 +-
 Documentation/ja/notation/pitches.itely            |   82 +-
 Documentation/ja/notation/rhythms.itely            |  414 ++++--
 Documentation/ja/notation/wind.itely               |    2 +-
 Documentation/ly-examples/GNUmakefile              |    2 +-
 Documentation/notation/rhythms.itely               |   30 +-
 ...centering-markup-on-note-heads-automatically.ly |   44 +-
 .../creating-metronome-marks-in-markup-mode.ly     |    2 +-
 .../customizing-fretboard-fret-diagrams.ly         |    6 +-
 ...ining-an-engraver-in-scheme-ambitus-engraver.ly |   45 +-
 ...play-bracket-with-only-one-staff-in-a-system.ly |    2 +-
 .../snippets/formatting-lyrics-syllables.ly        |    9 -
 Documentation/snippets/hymn-template.ly            |    1 -
 Documentation/snippets/nesting-staves.ly           |    2 +-
 .../snippets/numbers-as-easy-note-heads.ly         |   32 +-
 .../snippets/partcombine-and-autobeamoff.ly        |    2 -
 .../snippets/placement-of-right-hand-fingerings.ly |    4 +-
 .../snippets/printing-marks-on-every-staff.ly      |    2 +-
 ...etronome-and-rehearsal-marks-below-the-staff.ly |    2 +-
 .../snippets/woodwind-diagrams-key-lists.ly        |    2 +-
 Documentation/translations.itexi                   |    3 +-
 Documentation/web/community.itexi                  |    6 +-
 GNUmakefile.in                                     |    5 +-
 input/regression/autobeam-3-4-rules.ly             |   24 -
 input/regression/multiple-time-sig-settings.ly     |    4 +-
 input/regression/rest-on-nonstandard-staff.ly      |    5 -
 lily/book-scheme.cc                                |    4 -
 lily/parser.yy                                     |    2 +
 lily/rest.cc                                       |   31 +-
 ly/engraver-init.ly                                |    7 +-
 ly/event-listener.ly                               |   26 +-
 ly/init.ly                                         |    2 +
 ly/music-functions-init.ly                         |    8 +-
 make/lilypond-book-vars.make                       |    2 +-
 make/ly-rules.make                                 |    2 +-
 make/midi-rules.make                               |    2 +-
 ps/music-drawing-routines.ps                       |   21 +-
 scm/auto-beam.scm                                  |   48 +-
 scm/define-context-properties.scm                  |    4 -
 scm/lily-library.scm                               |   34 +-
 scm/lily.scm                                       |    4 +-
 scm/time-signature-settings.scm                    |   17 +-
 scripts/build/mutopia-index.py                     |  197 +++
 stepmake/stepmake/texinfo-rules.make               |    4 +-
 60 files changed, 3207 insertions(+), 949 deletions(-)

And that affects a lot more than just translations.  I have removed that
commit from origin/staging, and we'll have to investigate what
happened.  Francisco, do you remember the commands you used for merging
translation into staging?  I'll try repeating this on my own and see
whether I can reproduce this.

-- 
David Kastrup