Merge branch 'master' into nested-bookparts

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

diff --git a/Documentation/de/user/text.itely b/Documentation/de/user/text.itely
index 2ae725a461e31ad03162a3865923ed7922b95c38..4a1d30ed96d955186f08265c1ffab84304210e87 100644 (file)
--- a/Documentation/de/user/text.itely
+++ b/Documentation/de/user/text.itely
@@ -1,107 +1,135 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: d9b4bfc69674eb4ed7b8c6eaa0b646f00eae6c8d
+    Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e
 
     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.38"
-
 
 @node Text
 @section Text
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
-@menu 
+@menu
 * Writing text::
-* Text markup::
-* Special text concerns::
-@end menu 
+* Formatting text::
+* Fonts::
+@end menu
+
 @node Writing text
 @subsection Writing text
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
-@menu 
-* Overview of text entry::
+@menu
 * Text scripts::
 * Text spanners::
 * Text marks::
-@end menu 
-@node Overview of text entry
-@subsubsection Overview of text entry
-
-UNTRANSLATED NODE: IGNORE ME
+* Separate text::
+@end menu
 
 @node Text scripts
 @subsubsection Text scripts
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
 @node Text spanners
 @subsubsection Text spanners
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
 @node Text marks
 @subsubsection Text marks
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
-@node Text markup
-@subsection Text markup
 
-UNTRANSLATED NODE: IGNORE ME
+@node Separate text
+@subsubsection Separate text
 
-@menu 
+@untranslated
+
+
+@node Formatting text
+@subsection Formatting text
+
+@untranslated
+
+
+@menu
 * Text markup introduction::
-* Nested scores::
-* Page wrapping text::
-* Font selection::
-@end menu 
+* Selecting font and font size::
+* Text alignment::
+* Graphic notation inside markup::
+* Music notation inside markup::
+* Multi-page markup::
+@end menu
+
 @node Text markup introduction
 @subsubsection Text markup introduction
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
+
+@node Selecting font and font size
+@subsubsection Selecting font and font size
+
+@untranslated
+
+
+@node Text alignment
+@subsubsection Text alignment
+
+@untranslated
+
+
+@node Graphic notation inside markup
+@subsubsection Graphic notation inside markup
+
+@untranslated
+
+
+@node Music notation inside markup
+@subsubsection Music notation inside markup
+
+@untranslated
+
+
+@node Multi-page markup
+@subsubsection Multi-page markup
 
-@node Nested scores
-@subsubsection Nested scores
+@untranslated
 
-UNTRANSLATED NODE: IGNORE ME
 
-@node Page wrapping text
-@subsubsection Page wrapping text
+@node Fonts
+@subsection Fonts
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
-@node Font selection
-@subsubsection Font selection
 
-UNTRANSLATED NODE: IGNORE ME
+@menu
+* Entire document fonts::
+* Single entry fonts::
+@end menu
 
-@node Special text concerns
-@subsection Special text concerns
+@node Entire document fonts
+@subsubsection Entire document fonts
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
-@menu 
-* New dynamic marks::
-* Text and line spanners::
-@end menu 
-@node New dynamic marks
-@subsubsection New dynamic marks
 
-UNTRANSLATED NODE: IGNORE ME
+@node Single entry fonts
+@subsubsection Single entry fonts
 
-@node Text and line spanners
-@subsubsection Text and line spanners
+@untranslated
 
-UNTRANSLATED NODE: IGNORE ME
 
 
--- SKELETON FILE --
-When you actually translate this file, please remove these lines as
-well as all `UNTRANSLATED NODE: IGNORE ME' lines.
+@c -- SKELETON FILE --