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

diff --cc Documentation/es/learning.tely
index 33c00602c39ed2050b98e6f58120d3cae0976227,7f5d115df8af017ba5b3ab4b1eb08e77ddf77ac6..c38d8e85bd82f28c7b5fcb7e1a6d72cbe14bac7c
--- 1/Documentation/es/learning.tely
--- 2/Documentation/es/learning.tely
+++ b/Documentation/es/learning.tely
@@@ -1,19 -1,30 +1,31 @@@
  \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
  @ignore
-     Translation of GIT committish: c7d6848e128f461a4cec093f7a71a34b2dc314eb
+     Translation of GIT committish: a24a4a1926380eaaee1a1da5373c33b2c5d8f784
  
      When revising a translation, copy the HEAD committish of the
 -    version that you are working on.  See TRANSLATION for details.
 +    version that you are working on.  For details, see the Contributors'
 +    Guide, node Updating translation committishes..
  @end ignore
- @documentencoding UTF-8
- @documentlanguage es
+ 
  @setfilename lilypond-learning.info
  @settitle Manual de aprendizaje de GNU LilyPond
+ @documentencoding UTF-8
+ @documentlanguage es
+ @afourpaper
+ 
+ @macro manualIntro
+ Este archivo ofrece una introducción al programa LilyPond versión
+ @version{}.
+ @end macro
+ 
+ @c `Learning Manual' was born 1999-10-10 with git commit b9abaac...
+ @macro copyrightDeclare
+ Copyright @copyright{} 1999--2009 por los autores.
+ @end macro
  
+ @set FDL
  @include macros.itexi
  
- @afourpaper
  
  @c don't remove this comment.
  @ignore

diff --cc Documentation/es/learning/tutorial.itely
index edb327f8312dec5cc5acadef8239d194004ca1d0,e8547304a47b9b7949b5d14e0e7d95c3be1663de..5b14a0ae413fcd9f403e39e19ecb26ec50c1e424
--- 1/Documentation/es/learning/tutorial.itely
--- 2/Documentation/es/learning/tutorial.itely
+++ b/Documentation/es/learning/tutorial.itely
@@@ -1,11 -1,10 +1,11 @@@
  @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
  
  @ignore
-     Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
+     Translation of GIT committish: 026f42338e84f338277db948717b58140317a72e
  
      When revising a translation, copy the HEAD committish of the
 -    version that you are working on.  See TRANSLATION for details.
 +    version that you are working on.  For details, see the Contributors'
 +    Guide, node Updating translation committishes..
  @end ignore
  
  @c \version "2.12.0"

diff --cc Documentation/learning/tutorial.itely
Simple merge