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

Conflicts:

	Documentation/de/user/templates.itely

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

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

diff --cc Documentation/es/user/expressive.itely
Simple merge

diff --cc Documentation/es/user/fundamental.itely
Simple merge

diff --cc Documentation/es/user/rhythms.itely
Simple merge

diff --cc Documentation/es/user/running.itely
Simple merge