Merge branch 'master' into nested-bookparts

[lilypond.git] / Documentation / fr / user / simultaneous.itely

diff --git a/Documentation/fr/user/simultaneous.itely b/Documentation/fr/user/simultaneous.itely
index dcd3237bfa9a6312a5c2190ab2b28d47bf95b87d..463c00031b9d542f073283f2d56c74c64a1a5098 100644 (file)
--- a/Documentation/fr/user/simultaneous.itely
+++ b/Documentation/fr/user/simultaneous.itely
@@ -1,12 +1,12 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: f7420240e4ce1fe2217646482a47d00f566af52c
+    Translation of GIT committish: 33ba8d40c3493011a4b39ab8b1369701f8013bd6
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.38"
+@c \version "2.11.51"
 
 @c Translators: Frédéric Chiasson, Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
@@ -88,7 +88,7 @@ seront pas imprimées de façon acceptable.  utilisez plutôt
 
 @menu
 * Basic polyphony::             
-* Collision Resolution::        
+* Collision resolution::        
 * Automatic part combining::    
 * Writing music in parallel::   
 @end menu
@@ -175,8 +175,8 @@ qui la précède immédiatement, sans tenir compte des différentes voix.
 pas à @code{noteB} ou @code{noteA}.
 
 
-@node Collision Resolution
-@unnumberedsubsubsec Collision Resolution
+@node Collision resolution
+@unnumberedsubsubsec Collision resolution
 
 D'ordinaire, les têtes de notes pointées et non-pointées ne sont pas
 fusionnées, mais lorsque la propriété @code{merge-differently-dotted} de