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

* 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  Update macros in German docs
  Add @version macro to French docs
  Update of Spanish user manual, master file only

diff --git a/Documentation/es/user/lilypond.tely b/Documentation/es/user/lilypond.tely
index c76de7ac1b56d476073015c01c78a95087712146..8486357d6b64423cd77d28ccb43274736989b0f2 100644 (file)
--- a/Documentation/es/user/lilypond.tely
+++ b/Documentation/es/user/lilypond.tely
@@ -1,6 +1,6 @@
 \input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 993fc5189dc039afd51a98df9b71adf59f2ab20f
+    Translation of GIT committish: ef9e465a87b15c4fab12e08337a40b9afe1d3766
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -40,16 +40,21 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 
 @c
-@c Info files are installed in subdirectories to allow images to be present. 
-@c 
-@dircategory LilyPond
+@c Info files are no longer installed in a subdirectory, images are
+@c expected to be found in lilypond/ subdirectory.
+@dircategory GNU LilyPond: el tipografiador de música.
 @direntry
-* LilyPond: (lilypond/lilypond).           El tipografiador de música de GNU.
-* abc2ly: (lilypond/lilypond-program)Invocar abc2ly.           Importar archivos de ABC.      
-* convert-ly: (lilypond/lilypond-program)Invocar  convert-ly.  Versiones de LilyPond antiguas.
-* etf2ly: (lilypond/lilypond-program)Invocar etf2ly.           Importar archivos de Finale.
-* lilypond-book: (lilypond/lilypond-program)LilyPond-book.     Integrar texto y música.
-* midi2ly: (lilypond/lilypond-program)Invocar  midi2ly.        Importar archivos MIDI.
+* LilyPond Learning Manual: (lilypond-learning).        Comience por aquí.
+* Music Glossary: (music-glossary).                     Para usuarios de habla no inglesa.
+* LilyPond: (lilypond).                                 Referencia de la notación con LilyPond.
+* LilyPond Internals Reference: (lilypond-internals).   Definiciones para el trucaje.
+* LilyPond Application Usage: (lilypond-program).       Instalar y ejecutar las aplicaciones.
+* abc2ly: (lilypond-program)Invocar abc2ly.             Importar archivos de ABC.      
+* convert-ly: (lilypond-program)Actualizar archivos mediante convert-ly.  Versiones de LilyPond antiguas.
+* etf2ly: (lilypond-program)Invocar etf2ly.                  Importar archivos de Finale.
+* lilypond-book: (lilypond-program)LilyPond-book.            Integrar texto y música.
+* midi2ly: (lilypond-program)Invocar  midi2ly.               Importar archivos MIDI.
+* musicxml2ly: (lilypond-program)Invocar musicxml2ly.        Importar MusicXML.
 @end direntry
 
 @c don't remove this comment.
@@ -183,7 +188,7 @@ Free Documentation License''.
 @top GNU LilyPond --- El tipografiador de música
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-Éste es el manual del usuario para GNU LilyPond versión @version{}.
+Éste es el manual del usuario del programa GNU LilyPond versión @version{}.
 
 @cindex web, sitio
 @cindex URL
@@ -196,20 +201,18 @@ de la presente documentación y de otras.
 
 @c TRANSLATE ME
 @menu
-* Musical notation::               Musical notation.
-* Specialist notation::            Notation which is only used for
-specicific purposes.
-* Changing defaults::              Ajuste fino de la salida.
+* Musical notation::               Notación musical.
+* Specialist notation::            Notación especializada.
+* Input syntax::                   General information about lilypond input files.
 * Non-musical notation::           Salida que no es notación musical.
 * Spacing issues::                 Presentación de la salida sobre papel.
+* Changing defaults::              Ajuste fino de la salida.
 * Interfaces for programmers::     Utilización por expertos.
 
 Apéndices
 
 * Literature list::                Obras de referencia sobre notación musical.
-* Scheme tutorial::                Programación dentro de LilyPond.
 * Notation manual tables::         Tablas y cuadros.
-* Templates::                      Plantillas ya preparadas.
 * Cheat sheet::                    Resumen de la sintaxis de LilyPond.
 * GNU Free Documentation License:: Licencia de este documento.
 * LilyPond command index::
@@ -223,16 +226,15 @@ Apéndices
 @include notation.itely
 @include specialist.itely
 
-@include changing-defaults.itely
+@include input.itely
 @include non-music.itely
 @include spacing.itely
-@include programming-interface.itely
 
+@include changing-defaults.itely
+@include programming-interface.itely
 
 @include literature.itely
-@include scheme-tutorial.itely
 @include notation-appendices.itely
-@include templates.itely
 @include cheatsheet.itely
 @include fdl.itexi