Merge branch 'master' into lilypond/translation

Merge branch 'master' into lilypond/translation

Conflicts:

	Documentation/es/user/chords.itely
	input/lsr/aligning-and-centering-instrument-names.ly
	input/lsr/aligning-marks-with-various-notation-objects.ly
	input/lsr/arabic-improvisation.ly
	input/lsr/book-parts.ly
	input/lsr/broken-crescendo-hairpin.ly
	input/lsr/center-text-below-hairpin-dynamics.ly
	input/lsr/changing-form-of-multi-measure-rests.ly
	input/lsr/changing-properties-for-individual-grobs.ly
	input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly
	input/lsr/changing-the-tempo-without-a-metronome-mark.ly
	input/lsr/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
	input/lsr/chordchanges-for-fretboards.ly
	input/lsr/clip-systems.ly
	input/lsr/coloring-notes-depending-on-their-pitch.ly
	input/lsr/compound-time-signatures.ly
	input/lsr/creating-a-delayed-turn.ly
	input/lsr/creating-metronome-marks-in-markup-mode.ly
	input/lsr/creating-simultaneous-rehearsal-marks.ly
	input/lsr/creating-text-spanners.ly
	input/lsr/customizing-fretboard-fret-diagrams.ly
	input/lsr/customizing-markup-fret-diagrams.ly
	input/lsr/defining-predefined-fretboards-for-other-instruments.ly
	input/lsr/display-bracket-with-only-one-staff-in-a-system.ly
	input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
	input/lsr/dotted-harmonics.ly
	input/lsr/drawing-boxes-around-grobs.ly
	input/lsr/drawing-circles-around-various-objects.ly
	input/lsr/fine-tuning-pedal-brackets.ly
	input/lsr/flute-slap-notation.ly
	input/lsr/fret-diagrams-explained-and-developed.ly
	input/lsr/guitar-strum-rhythms.ly
	input/lsr/heavily-customized-polymetric-time-signatures.ly
	input/lsr/incipit.ly
	input/lsr/inserting-a-caesura.ly
	input/lsr/letter-tablature-formatting.ly
	input/lsr/line-arrows.ly
	input/lsr/makam-example.ly
	input/lsr/making-an-object-invisible-with-the-transparent-property.ly
	input/lsr/making-slurs-with-complex-dash-structure.ly
	input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
	input/lsr/markup-lines.ly
	input/lsr/modern-tab-text-clef.ly
	input/lsr/multi-measure-rest-markup.ly
	input/lsr/non-default-tuplet-numbers.ly
	input/lsr/non-traditional-key-signatures.ly
	input/lsr/orchestra,-choir-and-piano-template.ly
	input/lsr/ottava-text.ly
	input/lsr/page-label.ly
	input/lsr/percent-repeat-count-visibility.ly
	input/lsr/piano-template-with-centered-dynamics.ly
	input/lsr/positioning-multi-measure-rests.ly
	input/lsr/printing-the-bar-number-for-the-first-measure.ly
	input/lsr/quoting-another-voice-with-transposition.ly
	input/lsr/quoting-another-voice.ly
	input/lsr/setting-hairpin-behavior-at-bar-lines.ly
	input/lsr/specifying-context-with-beatgrouping.ly
	input/lsr/suppressing-warnings-for-clashing-note-columns.ly
	input/lsr/table-of-contents.ly
	input/lsr/tick-bar-lines.ly
	input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
	input/lsr/tweaking-grace-layout-within-music.ly
	input/lsr/using-beatlength-and-beatgrouping.ly
	input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly
	input/lsr/utf-8.ly
	input/lsr/volta-below-chords.ly
	input/lsr/volta-multi-staff.ly
	input/lsr/volta-text-markup-using-repeatcommands.ly
	input/texidocs/accordion-discant-symbols.texidoc
	input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc
	input/texidocs/adding-ambitus-per-voice.texidoc
	input/texidocs/adding-an-extra-staff-at-a-line-break.texidoc
	input/texidocs/adding-an-extra-staff.texidoc
	input/texidocs/adding-bar-lines-to-chordnames-context.texidoc
	input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.texidoc
	input/texidocs/adding-drum-parts.texidoc
	input/texidocs/adding-parentheses-around-an-expressive-mark-or-chordal-note.texidoc
	input/texidocs/adding-the-current-date-to-a-score.texidoc
	input/texidocs/adding-volta-brackets-to-additional-staves.texidoc
	input/texidocs/additional-voices-to-avoid-collisions.texidoc
	input/texidocs/adjusting-lyrics-vertical-spacing.texidoc
	input/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc
	input/texidocs/aligning-and-centering-instrument-names.texidoc
	input/texidocs/aligning-bar-numbers.texidoc
	input/texidocs/aligning-lyrics.texidoc
	input/texidocs/aligning-marks-with-various-notation-objects.texidoc
	input/texidocs/alignment-vertical-spacing.texidoc
	input/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
	input/texidocs/ambitus-with-multiple-voices.texidoc
	input/texidocs/analysis-brackets-above-the-staff.texidoc
	input/texidocs/ancient-fonts.texidoc
	input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc
	input/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
	input/texidocs/ancient-time-signatures.texidoc
	input/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc
	input/texidocs/arabic-improvisation.texidoc
	input/texidocs/automatic-beam-subdivisions.texidoc
	input/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc
	input/texidocs/avoiding-collisions-of-chord-fingering-with-beams.texidoc
	input/texidocs/beam-endings-in-score-context.texidoc
	input/texidocs/beam-grouping-in-7-8-time.texidoc
	input/texidocs/beams-across-line-breaks.texidoc
	input/texidocs/blanking-staff-lines-using-the--whiteout-command.texidoc
	input/texidocs/broken-crescendo-hairpin.texidoc
	input/texidocs/caesura-railtracks-with-fermata.texidoc
	input/texidocs/center-text-below-hairpin-dynamics.texidoc
	input/texidocs/changing--flageolet-mark-size.texidoc
	input/texidocs/changing-a-single-notes-size-in-a-chord.texidoc
	input/texidocs/changing-beam-knee-gap.texidoc
	input/texidocs/changing-chord-separator.texidoc
	input/texidocs/changing-form-of-multi-measure-rests.texidoc
	input/texidocs/changing-midi-output-to-one-channel-per-voice.texidoc
	input/texidocs/changing-partcombine-texts.texidoc
	input/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc
	input/texidocs/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.texidoc
	input/texidocs/changing-the-breath-mark-symbol.texidoc
	input/texidocs/changing-the-chord-names-to-german-or-semi-german-notation.texidoc
	input/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc
	input/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc
	input/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
	input/texidocs/changing-the-tuplet-number.texidoc
	input/texidocs/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.texidoc
	input/texidocs/chant-or-psalms-notation.texidoc
	input/texidocs/chord-name-exceptions.texidoc
	input/texidocs/chordchanges-for-fretboards.texidoc
	input/texidocs/clusters.texidoc
	input/texidocs/combining-dynamics-with-markup-texts.texidoc
	input/texidocs/combining-two-parts-on-the-same-staff.texidoc
	input/texidocs/compound-time-signatures.texidoc
	input/texidocs/conducting-signs,-measure-grouping-signs.texidoc
	input/texidocs/contemporary-glissando.texidoc
	input/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
	input/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc
	input/texidocs/creating-a-delayed-turn.texidoc
	input/texidocs/creating-a-sequence-of-notes-on-various-pitches.texidoc
	input/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc
	input/texidocs/creating-blank-staves.texidoc
	input/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc
	input/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc
	input/texidocs/creating-metronome-marks-in-markup-mode.texidoc
	input/texidocs/creating-real-parenthesized-dynamics.texidoc
	input/texidocs/creating-simultaneous-rehearsal-marks.texidoc
	input/texidocs/creating-slurs-across-voices.texidoc
	input/texidocs/creating-text-spanners.texidoc
	input/texidocs/custodes.texidoc
	input/texidocs/customizing-fretboard-fret-diagrams.texidoc
	input/texidocs/customizing-markup-fret-diagrams.texidoc
	input/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc
	input/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
	input/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc
	input/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc
	input/texidocs/embedding-native-postscript-in-a--markup-block.texidoc
	input/texidocs/engravers-one-by-one.texidoc
	input/texidocs/engraving-ties-manually.texidoc
	input/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
	input/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
	input/texidocs/flat-flags-and-beam-nibs.texidoc
	input/texidocs/forcing-horizontal-shift-of-notes.texidoc
	input/texidocs/generating-random-notes.texidoc
	input/texidocs/grid-lines--changing-their-appearance.texidoc
	input/texidocs/grid-lines--emphasizing-rhythms-and-notes-synchronization.texidoc
	input/texidocs/grouping-beats.texidoc
	input/texidocs/guitar-strum-rhythms.texidoc
	input/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc
	input/texidocs/incipit.texidoc
	input/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc
	input/texidocs/inserting-a-caesura.texidoc
	input/texidocs/isolated-percent-repeats.texidoc
	input/texidocs/jazz-combo-template.texidoc
	input/texidocs/line-arrows.texidoc
	input/texidocs/lyrics-alignment.texidoc
	input/texidocs/makam-example.texidoc
	input/texidocs/making-slurs-with-complex-dash-structure.texidoc
	input/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc
	input/texidocs/measure-counter.texidoc
	input/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc
	input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc
	input/texidocs/multi-measure-rest-markup.texidoc
	input/texidocs/nesting-staves.texidoc
	input/texidocs/non-default-tuplet-numbers.texidoc
	input/texidocs/non-traditional-key-signatures.texidoc
	input/texidocs/orchestra,-choir-and-piano-template.texidoc
	input/texidocs/ottava-text.texidoc
	input/texidocs/percent-repeat-count-visibility.texidoc
	input/texidocs/percent-repeat-counter.texidoc
	input/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
	input/texidocs/piano-template-simple.texidoc
	input/texidocs/piano-template-with-centered-dynamics.texidoc
	input/texidocs/piano-template-with-centered-lyrics.texidoc
	input/texidocs/piano-template-with-melody-and-lyrics.texidoc
	input/texidocs/placement-of-right-hand-fingerings.texidoc
	input/texidocs/polyphony-in-tablature.texidoc
	input/texidocs/positioning-grace-notes-with-floating-space.texidoc
	input/texidocs/positioning-multi-measure-rests.texidoc
	input/texidocs/positioning-text-markups-inside-slurs.texidoc
	input/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
	input/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc
	input/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc
	input/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
	input/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
	input/texidocs/printing-hairpins-using-al-niente-notation.texidoc
	input/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc
	input/texidocs/printing-marks-on-every-staff.texidoc
	input/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc
	input/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
	input/texidocs/quoting-another-voice-with-transposition.texidoc
	input/texidocs/quoting-another-voice.texidoc
	input/texidocs/redefining-grace-note-global-defaults.texidoc
	input/texidocs/removing-bar-numbers-from-a-score.texidoc
	input/texidocs/removing-the-first-empty-line.texidoc
	input/texidocs/rest-styles.texidoc
	input/texidocs/reverting-default-beam-endings.texidoc
	input/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc
	input/texidocs/setting-the-minimum-length-of-hairpins.texidoc
	input/texidocs/shortening-volta-brackets.texidoc
	input/texidocs/showing-chords-at-changes.texidoc
	input/texidocs/simple-lead-sheet.texidoc
	input/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
	input/texidocs/single-staff-template-with-notes,-lyrics,-chords-and-frets.texidoc
	input/texidocs/single-staff-template-with-notes-and-chords.texidoc
	input/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
	input/texidocs/single-staff-template-with-only-notes.texidoc
	input/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc
	input/texidocs/specifying-context-with-beatgrouping.texidoc
	input/texidocs/stand-alone-two-column-markup.texidoc
	input/texidocs/stem-and-beam-behavior-in-tablature.texidoc
	input/texidocs/string-quartet-template-simple.texidoc
	input/texidocs/string-quartet-template-with-separate-parts.texidoc
	input/texidocs/sub-dividing-beams.texidoc
	input/texidocs/suppressing-compiler-warnings-when-two-glissandos-intersect.texidoc
	input/texidocs/transcription-of-ancient-music-with-incipit.texidoc
	input/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc
	input/texidocs/tweaking-clef-properties.texidoc
	input/texidocs/tweaking-grace-layout-within-music.texidoc
	input/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc
	input/texidocs/using-beatlength-and-beatgrouping.texidoc
	input/texidocs/using-double-slurs-for-legato-chords.texidoc
	input/texidocs/using-grace-note-slashes-with-normal-heads.texidoc
	input/texidocs/using-ties-with-arpeggios.texidoc
	input/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc
	input/texidocs/vertically-aligning-dynamics-across-multiple-notes.texidoc
	input/texidocs/vertically-aligning-ossias-and-lyrics.texidoc
	input/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
	input/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
	input/texidocs/vocal-ensemble-template.texidoc
	input/texidocs/volta-below-chords.texidoc