Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

diff --cc Documentation/fr/essay/engraving.itely
Simple merge

diff --cc Documentation/fr/extending/programming-interface.itely
Simple merge

diff --cc Documentation/fr/extending/scheme-tutorial.itely
Simple merge

diff --cc Documentation/fr/learning/common-notation.itely
Simple merge

diff --cc Documentation/fr/learning/fundamental.itely
Simple merge

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

diff --cc Documentation/fr/learning/tweaks.itely
Simple merge

diff --cc Documentation/fr/notation/ancient.itely
Simple merge

diff --cc Documentation/fr/notation/changing-defaults.itely
Simple merge

diff --cc Documentation/fr/notation/editorial.itely
Simple merge

diff --cc Documentation/fr/notation/fretted-strings.itely
Simple merge

diff --cc Documentation/fr/notation/input.itely
Simple merge

diff --cc Documentation/fr/notation/pitches.itely
index cd65516aa678c12e9edc8ad2bc0a8c0bfc109c77,8393fef11b69035e412d5966d0d42b51ab559103..2142ff86a7d13e359b3dd37f2e7b9e6a55ad3304
--- 1/Documentation/fr/notation/pitches.itely
--- 2/Documentation/fr/notation/pitches.itely
+++ b/Documentation/fr/notation/pitches.itely
@@@ -8,9 -8,9 +8,9 @@@
      Guide, node Updating translation committishes.
  @end ignore
  
- @c \version "2.19.21"
+ @c \version "2.19.22"
  
 -@c Translators: Frédéric Chiasson
 +@c Translators: Frédéric Chiasson, Jean-Charles Malahieude
  @c Translation checkers: Valentin Villenave, Jean-Charles Malahieude
  
  @node Hauteurs

diff --cc Documentation/fr/notation/rhythms.itely
Simple merge

diff --cc Documentation/fr/notation/simultaneous.itely
Simple merge

diff --cc Documentation/fr/notation/spacing.itely
Simple merge

diff --cc Documentation/fr/notation/staff.itely
Simple merge

diff --cc Documentation/fr/notation/vocal.itely
Simple merge

diff --cc Documentation/fr/notation/world.itely
Simple merge

diff --cc Documentation/hu/learning/fundamental.itely
Simple merge

diff --cc Documentation/notation/input.itely
Simple merge