Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

diff --cc input/texidocs/aligning-bar-numbers.texidoc
Simple merge

diff --cc input/texidocs/making-slurs-with-complex-dash-structure.texidoc
Simple merge

diff --cc input/texidocs/positioning-grace-notes-with-floating-space.texidoc
Simple merge

diff --cc input/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
Simple merge

diff --cc input/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
Simple merge

diff --cc input/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
Simple merge

diff --cc input/texidocs/redefining-grace-note-global-defaults.texidoc
Simple merge

diff --cc input/texidocs/removing-bar-numbers-from-a-score.texidoc
Simple merge

diff --cc input/texidocs/tweaking-grace-layout-within-music.texidoc
Simple merge