Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond into ralph

[lilypond.git] / Documentation / de / user / fundamental.itely

diff --git a/Documentation/de/user/fundamental.itely b/Documentation/de/user/fundamental.itely
index 66d85e6a2c0611992185f8cecab3978ad990a10e..dd15fc0bdf6fd41ccaeb7b5d3f4114924395cd60 100644 (file)
--- a/Documentation/de/user/fundamental.itely
+++ b/Documentation/de/user/fundamental.itely
@@ -1,13 +1,13 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond-learning.tely
 @ignore
-    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
+    Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.61"
+@c \version "2.12.0"
 @c Translators: Till Rettig, Reinhold Kainhofer
 
 @node Fundamental concepts
@@ -339,7 +339,7 @@ zerlegen lässt.
 @example
 \score @{
   @{   % diese Klammer startet den großen mus. Ausdruck
-    <<
+    \new StaffGroup <<
       @var{...hier eine ganze Wagner-Oper einfügen...}
     >>
   @}   % diese Klammer beendet den Ausdruck
@@ -349,7 +349,8 @@ zerlegen lässt.
 
 Eine Wagner-Oper ist mindestens doppelt so lang wie dieses Handbuch,
 beschränken wir uns also auf einen Sänger und Klavier.  Wir brauchen 
-keine ganze Orchesterpartitur, aber wir brauchen einen Sänger und ein Klavier.
+keine ganze Orchesterpartitur, infolgedessen können wir die Systemgruppe
+(StaffGroup) auslassen, aber wir brauchen einen Sänger und ein Klavier.
 
 @example
 \score @{
@@ -517,7 +518,7 @@ gesetzt werden:
     <<
       { f c c }
       \new Staff \with {
-        alignAboveContext = "Hauptzeile" }
+        alignAboveContext = #"Hauptzeile" }
       { f8 f c }
     >>
     r4 |
@@ -1463,7 +1464,7 @@ versewords = \lyricmode {
   One two three four five six
 }
 \score {
-  \new Choirstaff {
+  \new ChoirStaff {
     \new Staff <<
       \new Voice = "verse" {
         \versenotes \break
@@ -2715,29 +2716,29 @@ lower = \relative c, {
   <<  % combine ChoirStaff and PianoStaff in parallel
     \new ChoirStaff <<
       \new Staff = "sopranos" <<
-        \set Staff.instrumentName = "Soprano"
+        \set Staff.instrumentName = #"Soprano"
         \new Voice = "sopranos" { \global \sopranoMusic }
       >>
       \new Lyrics \lyricsto "sopranos" { \sopranoWords }
       \new Staff = "altos" <<
-        \set Staff.instrumentName = "Alto"
+        \set Staff.instrumentName = #"Alto"
         \new Voice = "altos" { \global \altoMusic }
       >>
       \new Lyrics \lyricsto "altos" { \altoWords }
       \new Staff = "tenors" <<
-        \set Staff.instrumentName = "Tenor"
+        \set Staff.instrumentName = #"Tenor"
         \new Voice = "tenors" { \global \tenorMusic }
       >>
       \new Lyrics \lyricsto "tenors" { \tenorWords }
       \new Staff = "basses" <<
-        \set Staff.instrumentName = "Bass"
+        \set Staff.instrumentName = #"Bass"
         \new Voice = "basses" { \global \bassMusic }
       >>
       \new Lyrics \lyricsto "basses" { \bassWords }
     >>  % end ChoirStaff
 
     \new PianoStaff <<
-      \set PianoStaff.instrumentName = "Piano"
+      \set PianoStaff.instrumentName = #"Piano"
       \new Staff = "upper" \upper
       \new Staff = "lower" \lower
     >>
@@ -2771,22 +2772,22 @@ Damit erhalten wir folgenden @code{ChoirStaff}:
 @example
     \new ChoirStaff <<
       \new Staff = "sopranos" <<
-        \set Staff.instrumentName = "Soprano"
+        \set Staff.instrumentName = #"Soprano"
         \new Voice = "sopranos" @{ \global \SopranNoten @}
       >>
       \new Lyrics \lyricsto "sopranos" @{ \SopranText @}
       \new Staff = "altos" <<
-        \set Staff.instrumentName = "Alto"
+        \set Staff.instrumentName = #"Alto"
         \new Voice = "altos" @{ \global \AltNoten @}
       >>
       \new Lyrics \lyricsto "altos" @{ \AltText @}
       \new Staff = "tenors" <<
-        \set Staff.instrumentName = "Tenor"
+        \set Staff.instrumentName = #"Tenor"
         \new Voice = "tenors" @{ \global \TenorNoten @}
       >>
       \new Lyrics \lyricsto "tenors" @{ \TenorText @}
       \new Staff = "basses" <<
-        \set Staff.instrumentName = "Bass"
+        \set Staff.instrumentName = #"Bass"
         \new Voice = "basses" @{ \global \BassNoten @}
       >>
       \new Lyrics \lyricsto "basses" @{ \BassText @}
@@ -2799,7 +2800,7 @@ aus der @qq{Piano solo}-Vorlage:
 
 @example
 \new PianoStaff <<
-  \set PianoStaff.instrumentName = "Piano  "
+  \set PianoStaff.instrumentName = #"Piano  "
   \new Staff = "oben" \oben
   \new Staff = "unten" \unten
 >>
@@ -2837,7 +2838,7 @@ spitzen Klammern kombiniert werden, damit beide
   >>  % Ende ChoirStaff
 
   \new PianoStaff <<
-    \set PianoStaff.instrumentName = "Piano"
+    \set PianoStaff.instrumentName = #"Piano"
     \new Staff = "oben" \oben
     \new Staff = "unten" \unten
   >>
@@ -2890,29 +2891,29 @@ lower = \relative c, {
   <<  % combine ChoirStaff and PianoStaff in parallel
     \new ChoirStaff <<
       \new Staff = "sopranos" <<
-        \set Staff.instrumentName = "Soprano"
+        \set Staff.instrumentName = #"Soprano"
         \new Voice = "sopranos" { \global \sopranoMusic }
       >>
       \new Lyrics \lyricsto "sopranos" { \sopranoWords }
       \new Staff = "altos" <<
-        \set Staff.instrumentName = "Alto"
+        \set Staff.instrumentName = #"Alto"
         \new Voice = "altos" { \global \altoMusic }
       >>
       \new Lyrics \lyricsto "altos" { \altoWords }
       \new Staff = "tenors" <<
-        \set Staff.instrumentName = "Tenor"
+        \set Staff.instrumentName = #"Tenor"
         \new Voice = "tenors" { \global \tenorMusic }
       >>
       \new Lyrics \lyricsto "tenors" { \tenorWords }
       \new Staff = "basses" <<
-        \set Staff.instrumentName = "Bass"
+        \set Staff.instrumentName = #"Bass"
         \new Voice = "basses" { \global \bassMusic }
       >>
       \new Lyrics \lyricsto "basses" { \bassWords }
     >>  % end ChoirStaff
 
     \new PianoStaff <<
-      \set PianoStaff.instrumentName = "Piano  "
+      \set PianoStaff.instrumentName = #"Piano  "
       \new Staff = "upper" \upper
       \new Staff = "lower" \lower
     >>