Merge branch 'master' into translation

# Conflicts:
#	Documentation/fr/learning/fundamental.itely

diff --combined Documentation/fr/essay/engraving.itely
index 5e3299c68861664ddc030b362eb95dea7be256a6,5b8be062228e0ec9477e33703782fa446ccf4b00..9a51905af1dfd482131fcf31896951c06db9b705
--- 1/Documentation/fr/essay/engraving.itely
--- 2/Documentation/fr/essay/engraving.itely
+++ b/Documentation/fr/essay/engraving.itely
@@@ -1,14 -1,14 +1,14 @@@
  @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
  
  @ignore
 -    Translation of GIT committish: 958e95822083954cad00e0a598eb9f12ceba67b9
 +    Translation of GIT committish: 2f771b342689e45c55e083da1f835a51a02493b3
  
      When revising a translation, copy the HEAD committish of the
      version that you are working on.  For details, see the Contributors'
      Guide, node Updating translation committishes..
  @end ignore
  
- @c \version "2.19.21"
+ @c \version "2.19.24"
  
  @c Translators: Jean-Charles Malahieude, John Mandereau, Gauvain Pocentek
  
@@@ -1547,11 -1547,11 +1547,11 @@@ musical 
    <d f g>4
    \once \override NoteHead.style = #'cross
    <d f g>4
-   \applyOutput #'Voice #mc-squared
+   \applyOutput Voice #mc-squared
    <d f g>4
    <<
      { d8[ es-( fis^^ g] fis2-) }
-     \repeat unfold 5 { \applyOutput #'Voice #mc-squared s8 }
+     \repeat unfold 5 { \applyOutput Voice #mc-squared s8 }
    >>
  }
  @end lilypond

diff --combined Documentation/fr/learning/fundamental.itely
index 1b3b82b2bb393e7a650f179915b7427fc3c9126f,256dc093cdf63b26f3758150f0c4bd90a28057c1..211347ef6c7102a2778b23a3e6b63c72bc86b28b
--- 1/Documentation/fr/learning/fundamental.itely
--- 2/Documentation/fr/learning/fundamental.itely
+++ b/Documentation/fr/learning/fundamental.itely
@@@ -1,7 -1,7 +1,7 @@@
  @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
  
  @ignore
 -    Translation of GIT committish: f7a3d8cf31367398a1955c50d3c42216d8940989
 +    Translation of GIT committish: 9bdebf27dc4be7cf34976e3f44d9395d611305db
  
      When revising a translation, copy the HEAD committish of the
      version that you are working on.  For details, see the Contributors'
@@@ -657,7 -657,7 +657,7 @@@ et la liaison 
  @lilypond[quote,verbatim,ragged-right]
  \relative {
    \key g \major
-   %    Voice "1"               Voice "2"
+   %    Voice = "1"             Voice = "2"
    << { g'4 fis8( g) a4 g } \\ { d4 d d d }  >>
  }
  @end lilypond
@@@ -666,14 -666,12 +666,12 @@@ Notez que les hampes de la seconde voi
  
  Autre exemple :
  
- @lilypond[quote,verbatim,ragged-right]
- \relative {
-   \key d \minor
-   %    Voice "1"             Voice "2"
-   << { r4 g' g4. a8 }   \\ { d,2 d4 g }       >> |
-   << { bes4 bes c bes } \\ { g4 g g8( a) g4 } >> |
-   << { a2. r4 }         \\ { fis2. s4 }       >> |
- }
+ @lilypond[quote,verbatim,fragment,ragged-right,relative=2]
+ \key d \minor
+ %    Voice = "1"           Voice = "2"
+ << { r4 g g4. a8 }    \\ { d,2 d4 g }       >> |
+ << { bes4 bes c bes } \\ { g4 g g8( a) g4 } >> |
+ << { a2. r4 }         \\ { fis2. s4 }       >> |
  @end lilypond
  
  Le recours à une construction @code{<< \\ >>} particulière à chaque
@@@ -684,12 -682,12 +682,12 @@@ carrément séparer chaque voix 
  @lilypond[quote,verbatim,ragged-right]
  <<
    \key d \minor
-   \relative { % Voice "1"
+   \relative { % Voice = "1"
      r4 g' g4. a8 |
      bes4 bes c bes |
      a2. r4 |
    } \\
-   \relative { % Voice "2"
+   \relative { % Voice = "2"
      d'2 d4 g |
      g4 g g8( a) g4 |
      fis2. s4 |
@@@ -717,7 -715,7 +715,7 @@@ automatiquement
  \new Staff \relative {
    % Main voice
    c'16 d e f
-   %    Voice "1"     Voice "2"                Voice "3"
+   %    Voice = "1"   Voice = "2"              Voice = "3"
    << { g4 f e } \\ { r8 e4 d c8~ } >> |
    << { d2 e }   \\ { c8 b16 a b8 g~ 2 } \\ { s4 b c2 } >> |
  }