Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / es / macros.itexi

diff --git a/Documentation/es/macros.itexi b/Documentation/es/macros.itexi
index 6557213e25473cae9ec5539594a985036ef9f452..163f64d0a45643e2184e038ca544711c13af0139 100644 (file)
--- a/Documentation/es/macros.itexi
+++ b/Documentation/es/macros.itexi
@@ -1,9 +1,10 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 589e2953e6e0d90a73eafe0b31ba86651c62f6eb
+    Translation of GIT committish: 52f98b4061e0eb74b7c1dbcc29e74538b374752f
 
     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
 
 
@@ -15,7 +16,7 @@
 MACRO DEFINITIONS GUIDELINES
 ****************************
 
-This file should contain macro defintions which are common to all
+This file should contain macro definitions which are common to all
 languages, i.e. all macro definitions which do not contain text that
 should be translated (namely text visible in the output).
 
@@ -23,7 +24,6 @@ Macro definitions which contain text that should be translated in
 translations should be in macros.itexi.
 @end ignore
 
-
 @c   ***** Displaying text *****
 
 @c To get decent quotes in `foo' and ``foo''.
@@ -67,6 +67,36 @@ translations should be in macros.itexi.
 
 @end ifnothtml
 
+@c do not translate the following macro -- it is used in
+@c an untranslated manual.
+
+@ifhtml
+
+@macro advanced{TEXT}
+@html
+<div class="advanced">
+@end html
+@strong{Advanced note:} \TEXT\
+@c keep the space for proper nesting of </p>
+
+@html
+</div>
+@end html
+@end macro
+
+@end ifhtml
+
+@ifnothtml
+
+@macro advanced{TEXT}
+@quotation
+@b{Advanced note:} \TEXT\
+@end quotation
+@end macro
+
+@end ifnothtml
+
+
 @macro docMain
 @cartouche
 Para mayor información sobre la forma en que este manual se relaciona
@@ -164,7 +194,6 @@ Para la versión de LilyPond @version{}
 @end macro
 
 
-
 @c   ***** Headings in a doc subsection *****
 
 @c The next macro is a dummy currently since texinfo doesn't
@@ -718,8 +747,8 @@ Para la versión de LilyPond @version{}
 @macro exampleImage{IMAGE-FILE}
 @html
 <div class="float-center">
-  <a class="clickable" href="examples/\IMAGE-FILE\.png">
-    <img src="examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
+  <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
+    <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>
   <p style="text-align: center">
     (pulse para ver una imagen más grande)
@@ -727,10 +756,10 @@ Para la versión de LilyPond @version{}
 </div>
 @end html
 @iftex
-@image{examples/\IMAGE-FILE\-small,,,\IMAGE-FILE\,png}
+@image{ly-examples/\IMAGE-FILE\,6in,,\IMAGE-FILE\,png}
 @end iftex
 @ifinfo
-@image{lilypond/examples/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
+@image{lilypond/ly-examples/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
 @end ifinfo
 @end macro