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

Conflicts:
	Documentation/de/learning/tweaks.itely
	Documentation/de/notation/changing-defaults.itely

diff --cc Documentation/de/learning/fundamental.itely
Simple merge

diff --cc Documentation/de/learning/templates.itely
Simple merge

diff --cc Documentation/de/learning/tweaks.itely
Simple merge

diff --cc Documentation/de/notation/ancient.itely
Simple merge

diff --cc Documentation/de/notation/changing-defaults.itely
Simple merge

diff --cc Documentation/de/notation/chords.itely
Simple merge

diff --cc Documentation/de/notation/editorial.itely
Simple merge

diff --cc Documentation/de/notation/fretted-strings.itely
Simple merge

diff --cc Documentation/de/notation/input.itely
Simple merge

diff --cc Documentation/de/notation/keyboards.itely
Simple merge

diff --cc Documentation/de/notation/notation-appendices.itely
Simple merge

diff --cc Documentation/de/notation/pitches.itely
Simple merge

diff --cc Documentation/de/notation/repeats.itely
Simple merge

diff --cc Documentation/de/notation/rhythms.itely
Simple merge

diff --cc Documentation/de/notation/simultaneous.itely
Simple merge

diff --cc Documentation/de/notation/spacing.itely
Simple merge

diff --cc Documentation/de/notation/staff.itely
Simple merge

diff --cc Documentation/de/notation/vocal.itely
Simple merge

diff --cc Documentation/de/notation/wind.itely
Simple merge

diff --cc Documentation/de/notation/world.itely
Simple merge

diff --cc Documentation/de/usage/suggestions.itely
Simple merge