Merge branch 'master' into lilypond/translation

diff --combined Documentation/fr/notation/world.itely
index 6d4323d04fcae1decb74f990049c09271a09e2f0,860253d297ca5578fafe085428e64a79cce16c05..1c8c78637eefbf4c630636dd2a5395fdaf644ddd
--- 1/Documentation/fr/notation/world.itely
--- 2/Documentation/fr/notation/world.itely
+++ b/Documentation/fr/notation/world.itely
@@@ -1,6 -1,6 +1,6 @@@
  @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
  @ignore
-     Translation of GIT committish: 4c1851bab1e5e5d4aa4465eb20de2b2694aaf37a
+     Translation of GIT committish: 15886a3b94fd3cfc90314e60f1a0412af42e61ec
  
      When revising a translation, copy the HEAD committish of the
      version that you are working on.  For details, see the Contributors'
@@@ -9,8 -9,8 +9,8 @@@
  
  @c \version "2.12.0"
  
 -@c Translators: Jean-Jacques Gerbaud
 -@c Translation checkers: Jean-Charles Malahieude, Valentin Villenave
 +@c Translators: Jean-Jacques Gerbaud, Valentin Villenave
 +@c Translation checkers: Jean-Charles Malahieude
  
  @node Musiques du monde
  @section Musiques du monde