Merge branch 'master' into dev/texi2html

[lilypond.git] / Documentation / de / user / macros.itexi

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index fb3329078a50e8ca21d77b4ac3e0c9b6485d6864..03751cdace0ec46da6aef6d9a2a21b0b28264e57 100644 (file)
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -1,15 +1,13 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: db57f02c46305a587071dfb73a51bd8250df2482
+    Translation of GIT committish: 1440fffdf8579046cc2033b9c697a190b34b91e5
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
 
-@macro version
-@value{version}
-@end macro
+@include version.itexi
 
 
 @c   ***** Displaying text *****
@@ -112,9 +110,13 @@
 @c obsolete, remove when translation is fully updated
 @macro context{TEXT}
 @vindex \TEXT\
-@code{\TEXT\}@c should use internalsref
+@code{\TEXT\}@c should use rinternals
 @end macro
 
+@macro lydoctitle {TEXT}
+@emph{\TEXT\}
+
+@end macro
 
 @macro funindex {TEXT}
 @findex \TEXT\
@@ -150,7 +152,7 @@
 
 
 @c  Definitions for references:
-@c     @internalsref
+@c     @rinternals
 @c     @rglos
 @c     @rprogram
 @c     @ruser
@@ -161,61 +163,71 @@
 
 @ifset bigpage
 
-@macro internalsref{TEXT}
+@macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page}
+@ref{\TEXT\,,,lilypond-internals-big-page,Programmreferenz}
 @end macro
 
 @macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary-big-page}
+@ref{\TEXT\,,,music-glossary-big-page,Glossar}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page}
+@ref{\TEXT\,,,lilypond-program-big-page,Programmbenutzung}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-big-page}
+@ref{\TEXT\,,,lilypond-big-page,Benutzerhandbuch}
 @end macro
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page}
+@ref{\TEXT\,,,lilypond-learning-big-page,Handbuch zum Lernen}
 @end macro
 
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets-big-page,Beispiele}
+@end macro
+
+
 @end ifset
 
 
 @ifclear bigpage
 
-@macro internalsref{TEXT}
+@macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals}
+@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
 @end macro
 
 @macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary}
+@ref{\TEXT\,,,music-glossary,Glossar}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program}
+@ref{\TEXT\,,,lilypond-program,Programmbenutzung}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond}
+@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
 @end macro
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning}
+@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
+@end macro
+
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Beispiele}
 @end macro
 
+
 @end ifclear
 
 @end ifhtml
@@ -224,91 +236,126 @@
 @ifdocbook
 @c ***** DOCBOOK-XML *****
 
-@macro internalsref{TEXT}
+@macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals}
+@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
 @end macro
 
 @macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary}
+@ref{\TEXT\,,,music-glossary,Glossar}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program}
+@ref{\TEXT\,,,lilypond-program,Programmbenutzung}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond}
+@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
 @end macro
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning}
+@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
+@end macro
+
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Beispiele}
 @end macro
 
+
 @end ifdocbook
 
 
 @ifinfo
 @c **** INFO ****
 
-@macro internalsref{NAME}
+@macro rinternals{NAME}
 @vindex \NAME\
-@inforef{\NAME\,,lilypond-internals}
+@inforef{\NAME\,,lilypond-internals,Programmreferenz}
 @end macro
 
 @macro rglos{NAME}
 @vindex \NAME\
-@inforef{\NAME\,,music-glossary}
+@inforef{\NAME\,,music-glossary,Glossar}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program}
+@ref{\TEXT\,,,lilypond-program,Programmbenutzung}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond}
+@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
 @end macro
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning}
+@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
+@end macro
+
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Beispiele}
 @end macro
 
+
 @end ifinfo
 
 
 @c **** TEX ****
 @iftex
 
-@macro internalsref{TEXT}
+@macro rinternals{TEXT}
 @vindex \TEXT\
 @code{\TEXT\}
 @end macro
 
 @macro rglos {TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary}
+@ref{\TEXT\,,,music-glossary,Glossar}
 @end macro
 
 @macro rprogram{TEXT}
-Programmbenutzung, @ref{\TEXT\,,,lilypond-program.de}
+@ref{\TEXT\,,,lilypond-program.de,Programmbenutzung}
 @end macro
 
 @macro ruser{TEXT}
-Benutzerhandbuch, @ref{\TEXT\,,,lilypond.de}
+@ref{\TEXT\,,,lilypond.de,Benutzerhandbuch}
 @end macro
 
 @macro rlearning{TEXT}
-Handbuch zum Lernen, @ref{\TEXT\,,,lilypond-learning.de}
+@ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen}
+@end macro
+
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Beispiele}
 @end macro
 
+
+@end iftex
+
+@c Commands specific to translated docs
+
+@c ugh, cannot set/define global variable 'translationof' in some way?
+@iftex
+@macro translationof{TEXT}
+@end macro
 @end iftex
 
+@ifinfo
+@macro
+@macro translationof{TEXT}
+@set translationof \TEXT\
+@end macro
+@end ifinfo
+
+@c TODO when @translationof is used in translated docs
+@c see if it's feasible to say @value{translationof}
+@macro englishref
+Dieser Abschnitt wurde noch nicht übersetzt, bitte lesen Sie den
+Abschnitt im englischen Benutzerhandbuch.
+@end macro
 
-@c EOF