Merge branch 'master' into lilypond/translation

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

diff --git a/Documentation/fr/macros.itexi b/Documentation/fr/macros.itexi
index 2fac04da6968cf6aa6d9da448fda9ab264025d20..e7408d1e6d8d330e32e0ae12a0604b0b82160258 100644 (file)
--- a/Documentation/fr/macros.itexi
+++ b/Documentation/fr/macros.itexi
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: cb2cd4b74f545f1d0a25725ffac6ce0c01b45c50
+    Translation of GIT committish: 1edbbc7f5a6ad81f24421470f81786fc614d1c96
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  For details, see the Contributors'
@@ -16,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).
 
@@ -84,6 +84,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
 Pour connaître la place qu'occupe ce manuel dans la
@@ -432,12 +462,12 @@ Pour LilyPond version @version{}
 
 @macro rcontrib{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,contributor,Guide des contributeurs}
+@ref{\TEXT\,,,contributor,Guide du contributeur}
 @end macro
 
 @macro rcontribnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,contributor,Guide des contributeurs}
+@ref{\TEXT\,,\DISPLAY\,contributor,Guide du contributeur}
 @end macro
 
 @macro rweb{TEXT}
@@ -544,12 +574,12 @@ Pour LilyPond version @version{}
 
 @macro rcontrib{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-contributor,Guide des contributeurs}
+@ref{\TEXT\,,,lilypond-contributor,Guide du contributeur}
 @end macro
 
 @macro rcontribnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-contributor,Guide des contributeurs}
+@ref{\TEXT\,,\DISPLAY\,lilypond-contributor,Guide du contributeur}
 @end macro
 
 @macro rweb{TEXT}
@@ -673,12 +703,12 @@ Pour LilyPond version @version{}
 
 @macro rcontrib{TEXT}
 @vindex{\TEXT\}
-@ref{\TEXT\,,,contributor,Guide des contributeurs}
+@ref{\TEXT\,,,contributor,Guide du contributeur}
 @end macro
 
 @macro rcontribnamed{TEXT,DISPLAY}
 @vindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,contributor,Guide des contributeurs}
+@ref{\TEXT\,,\DISPLAY\,contributor,Guide du contributeur}
 @end macro
 
 @macro rweb{TEXT}
@@ -750,7 +780,7 @@ Pour LilyPond version @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}