From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sat, 23 Aug 2008 17:43:02 +0000 (+0200)
Subject: Merge branch 'master' into dev/texi2html
X-Git-Tag: release/2.11.58-1~32^2~22
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cb2a453c1957c882e2941de7eaccc351a8cf6d3b;hp=5a8abd5f8e97bf20566a068cf5d50c9a0e711243;p=lilypond.git

Merge branch 'master' into dev/texi2html
---

diff --git a/Documentation/fr/user/changing-defaults.itely b/Documentation/fr/user/changing-defaults.itely
index ab3b48dff5..d7fc97767b 100644
--- a/Documentation/fr/user/changing-defaults.itely
+++ b/Documentation/fr/user/changing-defaults.itely
@@ -81,7 +81,8 @@ des listes, des chaînes de caractères ou des symboles, en Scheme.}
 Cette section traite des contextes.
 
 @menu
-* Changing context properties on the fly::  
+* Contexts explained::          
+* The set command::             
 * Modifying context plug-ins::  
 * Layout tunings within contexts::  
 * Changing context default settings::  
@@ -91,8 +92,14 @@ Cette section traite des contextes.
 @end menu
 
 
-@node Changing context properties on the fly
-@subsection Changing context properties on the fly
+@node Contexts explained
+@subsection Contexts explained
+
+@untranslated
+
+
+@node The set command
+@subsection The @code{\set} command
 
 @cindex propriétés
 @funindex \set
@@ -444,8 +451,8 @@ de ce fait interrompre, ou faire planter le programme -- ou bien les deux.
 @node Changing context default settings
 @subsection Changing context default settings
 
-Les réglages montrés dans les sous-sections @ref{Changing context
-properties on the fly}, @ref{Modifying context plug-ins} et
+Les réglages montrés dans les sous-sections @ref{The
+set command}, @ref{Modifying context plug-ins} et
 @ref{Layout tunings within contexts} peuvent également être saisis indépendamment
 de la musique dans le bloc @code{\layout}, au moyen de la commande @code{\context} :
 
diff --git a/Documentation/fr/user/fundamental.itely b/Documentation/fr/user/fundamental.itely
index 6dbe855075..5a58567818 100644
--- a/Documentation/fr/user/fundamental.itely
+++ b/Documentation/fr/user/fundamental.itely
@@ -9,18 +9,22 @@
 
 @c \version "2.11.51"
 
-@c Translators: Valentin Villenave
-@c Translation checkers: Jean-Charles Malahieude, John Mandereau
+@c Translators: Valentin Villenave, Jean-Charles Malahieude
+@c Translation checkers: John Mandereau
 
 @node Fundamental concepts
 @chapter Fundamental concepts
 
+Le tutoriel nous a montré comment obtenir une édition de toute beauté à
+partir d'un simple fichier texte.  Nous nous intéresserons dans cette
+partie aux concepts et techniques qui permettent d'obtenir des
+partitions complexes de même qualité.
 
 @menu
-* How LilyPond input files work::
-* Voices contain music::
-* Contexts and engravers::
-* Extending the templates::
+* How LilyPond input files work::  
+* Voices contain music::        
+* Contexts and engravers::      
+* Extending the templates::     
 @end menu
 
 @node How LilyPond input files work
@@ -35,93 +39,179 @@ sommairement l'organisation du code LilyPond, en privilégiant
 la simplicité au détriment de certains détails.  Vous trouverez une
 description plus complète dans @ruser{File structure}.
 
-@menu 
-* Introduction to the LilyPond file structure::
-* Score is a (single) compound musical expression::
-* Nesting music expressions::
-* On the un-nestedness of brackets and ties::
+@menu
+* Introduction to the LilyPond file structure::  
+* Score is a (single) compound musical expression::  
+* Nesting music expressions::   
+* On the un-nestedness of brackets and ties::  
 @end menu
 
 @node Introduction to the LilyPond file structure
 @subsection Introduction to the LilyPond file structure
 
-@c FIXME this subsection translation is very outdated
-@c but wait until it is in a stable state in English
+@cindex format d'entrée
+@cindex structure de ficher
 
-La plupart des exemples de ce manuel sont de courts fragments, par exemple
+Un fichier d'entrée LilyPond ressemble à :
 
 @example
-c4 a b c
+\version @w{"@version{}"}
+\score @{
+  @var{...expression musicale composite...}  % c'est là qu'est la musique !
+  \header @{ @}
+  \layout @{ @}
+  \midi @{ @}
+@}
 @end example
 
-Comme vous le savez maintenant (du moins nous l'espèrons), ceci ne
-peut pas être traité en tant que tel. Il s'agit de formes abrégées des
-exemples complets ; pour pouvoir être traitées, ces formeulations
-doivent au moins être encadrées par des accolades :
+@noindent
+Il existe de nombreuses variantes à ce schéma simpliste, mais cet
+exemple est un préambule à notre propos.
+
+@funindex \book
+@funindex \score
+@cindex book, livre, ouvrage
+@cindex livre
+@cindex score, partition
+@cindex partition
+
+Jusqu'à présent, les exemples que nous avons pu voir ne faisaient pas
+appel à la commande @code{\score@{@}}.  En fait, LilyPond ajoute
+automatiquement les commandes nécessaires au traitement d'un code
+simpliste.  LilyPond considère
 
 @example
-@{
-  c4 a b c
+\relative c'' @{
+  c4 a d c
 @}
 @end example
 
-La plupart des exemples font aussi intervenir la commande
-@code{\relative}, suivie de @code{c'} ou @code{c''}.  Elle n'est pas à
-proprement parler nécessaire pour le traitement des exemples, mais
-dans la plupart des cas le résultat sera vraiment déplorable si vous
-l'oubliez.
-
-@lilypond[quote,fragment,ragged-right,verbatim]
-\relative c'' {
-  c4 a b c
-}
-@end lilypond
-
-C'est ici que nous passons aux choses sérieuses : le code LilyPond,
-sous cette forme, est en réalité un @emph{autre} raccourci. Même s'il
-est traité sans problème, et aboutit au bon résultat, c'est une forme
-abrégée de :
+@noindent
+comme un racourci de
 
 @example
-\score @{
-  \relative c'' @{
-    c4 a b c
+\book @{
+  \score @{
+    \new Staff @{
+      \new Voice @{
+        \relative c'' @{
+          c4 a b c
+        @}
+      @}
+    @}
+    \layout @{ @}
   @}
 @}
 @end example
 
-Un bloc @code{\score} doit commencer par une et une seule expression
-musicale. Rappelez-vous que cette expression peut être ce que vous
-voulez, d'une note toute seule à un gigantesque
+En d'autres termes, si le code n'est constitué que d'une expression
+musicale simple, LilyPond interprètera le fichier tout comme si cette
+expression était incluse dans les commandes de notre premier exemple.
+
+@cindex implicit contexts
+
+@strong{Attention :}  de nombreux exemples, dans la documentation de
+LilyPond, ne font pas apparaître les commandes @code{\new Staff} ou
+@code{\new Voice}, même si elles seront créées implicitement.  Ce qui
+n'est pas primordial pour des exemples simples le devient dès que la
+situation devient un peu plus complexe.  Le fait de ne pas déclarer
+explicitement un contexte peut alors amener à des résultats quelque peu
+surprenants, comme la création d'une portée supplémentaire et
+indésirable.  La manière de créer explicitement des contextes est
+vue plus en détails au chapitre @ref{Contexts and engravers}.
+
+@warning{Dès lors que votre musique dépasse quelques lignes, nous vous
+engageons fortement à créer explicitement les voix et portées.}
+
+Mais revenons à notre premier exemple, et penchons nous tout d'abord sur
+la commande @code{\score}.
+
+Un bloc @code{\score} doit contenir une et une seule expression
+musicale, exprimée immédiatement à la suite de la commande
+@code{\score}.  Rappelez-vous que cette expression peut être n'importe
+quoi, d'une note isolée à un gigantesque
 
 @example
 @{
   \new GrandStaff <<
-    collez ici la partition complète de votre opéra de Wagner préféré
+    @var{...collez ici la partition complète d'un opéra de Wagner...}
   >>
 @}
 @end example
 
 @noindent
-Dès lors que tout cela est entre accolades : @code{@{ ... @}}, c'est
-une et une seule expression musicale.
+Dès lors que tout cela est entre accolades : @code{@{ ... @}}, LilyPond
+le considère comme une et une seule expression musicale.
 
-Le bloc @code{\score} peut contenir d'autres éléments, tels que
+Comme nous l'avons vu précédemment, un bloc @code{\score} peut contenir
+d'autres informations :
 
 @example
 \score @{
   @{ c'4 a b c' @}
+  \header @{ @}
   \layout @{ @}
   \midi @{ @}
-  \header @{ @}
 @}
 @end example
 
-@noindent
-Certains préfèrent mettre ces commandes en dehors du bloc 
-@code{\score} --- par exemple, on met souvent le @code{\header}
-au-dessus. C'est juste là une autre forme abrégée que LilyPond
-accepte.
+@funindex \header
+@funindex \layout
+@funindex \midi
+@cindex header
+@cindex en-tête
+@cindex layout
+@cindex mise en forme
+@cindex midi
+
+Gardez à l'esprit que ces trois commandes -- @code{\header},
+@code{\layout} et @code{\midi} -- sont spécifiques :  à l'inverse de
+toutes les commandes débutant par une oblique inversée (@emph{backshash}
+pour @code{\}), @emph{elles ne constituent pas} des expressions
+musicales et ne seront donc pas interprétées comme telles.    Elles
+peuvent de ce fait être mentionnées à l'intérieur du bloc @code{\score},
+tout comme à l'extérieur.  En réalité, ces commandes sont la plupart du
+temps indépendantes du bloc @code{\score} -- la commande @code{\header}
+intervient bien souvent avant le bloc @code{\score} tout simplement
+parce que les en-têtes apparaissent au début de la partition.  C'est
+donc l'un des raccourcis que LilyPond prendra en considération.
+
+Les deux autres commandes -- @code{\layout @{ @}} et @code{\midi @{@}}
+-- que nous n'avons pas détaillées pour l'instant, auront respectivement
+pour effet lorsqu'elles interviennent de produire une sortie
+imprimable et un fichier MIDI.  Nous nous y intéressons plus
+particulièrement dans le manuel de notation, aux chapitres @ruser{Score
+layout} et @ruser{Creating MIDI files}.
+
+@cindex scores, multiples
+
+Vous pouvez tout à fait mentionner plusieurs blocs @code{\score}.  Ils
+seront traités comme autant de partitions indépendantes qui seront
+regroupées dans un seul fichier résultant.  La commande @code{\book} 
+(@emph{recueil} ou @emph{ouvrage}) pas obligatoire -- elle sera
+créée implicitement.  Néanmoins, le recours à la commande @code{\book}
+vous permettra d'obtenir des fichiers résultants distincts à partir
+d'un même fichier source @code{.ly} -- par exemple un fichier par pupitre.
+
+En résumé :
+
+Dès que LilyPond rencontre un bloc @code{\book}, il crée un
+fichier distinct (.pdf par exemple).  Dans le cas où il n'est pas
+mentionné explicitement, LilyPond regroupera l'intégralité du code dans
+un bloc @code{\book}.
+
+Tout bloc @code{\score} inclus dans un bloc @code{\book} constitue un
+fragment de musique.
+
+Tout bloc @code{\layout} affecte le bloc @code{\score} ou @code{\book}
+au sein duquel il intervient : si c'est à l'intérieur d'un bloc
+@code{\score}, seul celui-ci en sera affecté.  Dans le cas où le bloc
+@code{\layout} se trouve à l'extérieur du bloc @code{\score}, que le
+bloc @code{\book} soit explicite ou non, il affectera chacun des
+@code{\score} compris dans ce @code{\book}.
+
+Pour plus de détail à ce sujet, consultez 
+@ruser{Multiple scores in a book}.
 
 @cindex variables
 @cindex identificateurs
@@ -145,10 +235,12 @@ variable @code{melodie}, c'est-à-dire tout ce qui suit le signe @code{=},
 et l'insérer partout où il rencontrera @code{\melodie}.  Vous êtes
 libre de choisir comment dénommer vos variables@footnote{Les noms de
 variables sont sensibles à la casse, et ne peuvent contenir ni
-chiffre, ni tiret, ni caractère accentué.} ; ce peut être
+chiffre, ni ponctuation, ni caractère accentué, ni espace.} ; ce peut être
 @code{melodie}, @code{global}, @code{maindroitepiano}, ou
-@code{laTeteAToto}.  Pour plus de détails, voir @ref{Saving
-typing with variables and functions}.
+@code{laTeteAToto}, tant qu'il ne s'agit pas de @qq{mot réservé}.  Pour
+plus de détails, voir @ref{Saving typing with variables and functions}. 
+
+@seealso
 
 Pour une description complète du format des fichiers d'entrée, voir 
 @ruser{File structure}.
@@ -157,10 +249,15 @@ Pour une description complète du format des fichiers d'entrée, voir
 @node Score is a (single) compound musical expression
 @subsection Score is a (single) compound musical expression
 
-Dans la section précédente, nous avons vu l'organisation générale des
-fichiers d'entrée de LilyPond.  Mais c'est comme si nous avions éludé la
-question essentielle : comment diable peut-on savoir quoi mettre après
-@code{\score} ?
+@funindex \score
+@cindex partition
+@cindex Expression musicale composite
+
+Dans la section précédente, 
+@ref{Introduction to the LilyPond file structure},  nous
+avons vu l'organisation générale des fichiers d'entrée de LilyPond.
+Mais c'est comme si nous avions éludé la question essentielle : comment
+diable peut-on savoir quoi mettre après @code{\score} ?
 
 En fait, nous ne l'avons pas éludée du tout : le grand mystère est
 tout simplement qu'il n'y a @emph{pas} de mystère.  Allez,
@@ -183,7 +280,7 @@ et remonter la pente.
 \score @{
   @{   % cette accolade marque le début de l'expression musicale
     \new GrandStaff <<
-    insérez ici votre opéra de Wagner préféré
+    @var{...insérez ici l'intégralité d'un opéra de Wagner...}
     >>
   @}   % cette accolade marque la fin de l'expression musicale
   \layout @{ @}
@@ -210,28 +307,31 @@ laissons cela de côté.  Par contre, un chanteur et un piano
 @}
 @end example
 
-Vous vous souvenez que nous avons recours à @code{<<} et @code{>>}
-pour mettre en place des musiques simultanées.  Et, pour le
-coup, on aimerait @emph{vraiment} que la partie vocale et l'accompagnement
-soient imprimés ensemble...
-
-@example
-\score @{
-  @{
-    <<
-      \new Staff = "chanteur" <<
-        \new Voice = "chant" @{ @}
-      >>
-      \new Lyrics \lyricsto chant \new Lyrics @{ @}
-      \new PianoStaff = "piano" <<
-        \new Staff = "mainDroite" @{ @}
-        \new Staff = "mainGauche" @{ @}
-      >>
+Vous vous souvenez que nous avons recours à @code{<<} et @code{>>} 
+en lieu et place de @code{@{ ... @}} pour gérer des musiques
+simultanées.  Et,  pour le coup, on aimerait @emph{vraiment} que la
+partie vocale et l'accompagnement soient imprimés ensemble...  Bien que
+faire appel à @code{<< ... >>} ne soit pas réellement nécessaire pour la
+portée du chanteur, dans la mesure où elle ne contient qu'une seule
+expression musicale, nous vous recommandons de prendre l'habitude de
+l'encadrer ainsi plutôt que par de simples accolades --- une portée peut
+en effet contenir plusieurs voix. 
+
+@lilypond[verbatim,quote,ragged-right]
+\score {
+  <<
+    \new Staff = "singer" <<
+      \new Voice = "vocal" { c'1 }
+      \addlyrics { And }
     >>
-  @}
-  \layout @{ @}
-@}
-@end example
+    \new PianoStaff = "piano" <<
+      \new Staff = "upper" { c'1 }
+      \new Staff = "lower" { c'1 }
+    >>
+  >>
+  \layout { }
+}
+@end lilypond
 
 On y voit nettement plus clair maintenant.  Nous voici donc avec la
 partie du chanteur, qui contient un ensemble @code{Voice}, ce qui dans
@@ -249,40 +349,44 @@ accolades qui suivent @code{\new Voice = chant}, on pourrait commencer
 
 @example
 \relative c'' @{
-  a4 b c d
+  r4 d8\noBeam g, c4 r
 @}
 @end example
 
 Mais si l'on procédait ainsi, la section @code{\score} deviendrait
 vite assez touffue, et très rapidement on ne s'y retrouverait plus.
-C'est pourquoi on utilisera plutôt des variables, ou identificateurs :
+C'est pourquoi on utilisera plutôt des variables, ou identificateurs.
+avec quelques notes de plus, nous pourrins avoir :
 
-@example
-melodie = @{ @}
-texte = @{ @}
-mainDroite = @{ @}
-mainGauche = @{ @}
-\score @{
-  @{
-    <<
-      \new Staff = "chanteur" <<
-        \new Voice = "chant" @{ \melodie @}
-      >>
-      \new Lyrics \lyricsto chant \new Lyrics @{ \texte @}
-      \new PianoStaff = "piano" <<
-        \new Staff = "mainDroite" @{ \mainDroite @}
-        \new Staff = "mainGauche" @{ \mainGauche @}
-      >>
+@lilypond[verbatim,quote,ragged-right]
+melody = \relative c'' { r4 d8\noBeam g, c4 r }
+text   = \lyricmode { And God said, }
+upper  = \relative c'' { <g d g,>2~ <g d g,> }
+lower  = \relative c { b2 e2 }
+
+\score {
+  <<
+    \new Staff = "singer" <<
+      \new Voice = "vocal" { \melody }
+      \addlyrics { \text }
     >>
-  @}
-  \layout @{ @}
-@}
-@end example
+    \new PianoStaff = "piano" <<
+      \new Staff = "upper" { \upper }
+      \new Staff = "lower" {
+        \clef "bass"
+        \lower
+      }
+    >>
+  >>
+  \layout { }
+}
+@end lilypond
 
-@noindent
-Souvenez-vous que vous pouvez donner aux variables le nom que vous
-voulez, à condition de respecter les caractères autorisés. Ces
-limitations sont décrites dans @ruser{File structure}.
+Respectez bien la différence entre les notes -- introduites par
+@code{\relative} --,  et les paroles -- introduites par
+@code{\lyricmode}.  Cette distinction est primordiale afin que LilyPond
+puisse interpréter ce qui les suit comme étant respectivemen de la
+musique ou du texte.
 
 Quand on écrit, ou que l'on lit, une section @code{\score}, mieux vaut
 y aller lentement et soigneusement. Commencez par le niveau le plus
@@ -291,202 +395,1148 @@ une indentation stricte et propre est vraiment d'une aide précieuse :
 assurez-vous que chaque élément d'un même niveau a le même décalage
 horizontal dans votre éditeur de texte !
 
+@seealso
+
+Manuel de notation : @ruser{Structure of a score}.
 
 
 @node Nesting music expressions
 @subsection Nesting music expressions
 
-@untranslated
+@cindex portées, temporaires
+@cindex ossias
+
+Déclarer toutes les portées dès le départ n'est pas une obligation ;
+elles peuvent intervenir temporairement n'importe où dans la partition.
+Ceci est tout à fait indiqué pour créer des sections @rglos{ossia}.
+L'exemple suivant illustre la manière de créer temporairement une
+nouvelle portée, l'espace de trois notes :
+
+@lilypond[verbatim,quote,ragged-right]
+\new Staff {
+  \relative g' {
+    r4 g8 g c4 c8 d |
+    e4 r8
+    <<
+      { f c c }
+      \new Staff {
+        f8 f c
+      }
+    >>
+    r4 |
+  }
+}
+@end lilypond
+
+@noindent
+Vous noterez la taille de la clef, identique à celle que l'on trouve
+lors d'un changement en cours de ligne --- légèrement plus petite que
+celle imprimée en tête de ligne.
+
+@cindex portée, positionnement
+
+Une section ossia se placera au dessus de la portée en procédant ainsi :
+
+@lilypond[verbatim,quote,ragged-right]
+\new Staff ="main" {
+  \relative g' {
+    r4 g8 g c4 c8 d |
+    e4 r8
+    <<
+      { f c c }
+      \new Staff \with {
+        alignAboveContext = "main" }
+      { f8 f c }
+    >>
+    r4 |
+  }
+}
+@end lilypond
+
+Cet exemple recourt à @code{\with}, que nous verrons en détail plus
+avant.  C'est un moyen de modifier le comportement par défaut d'une
+portée individuelle.  Nous indiquons ici que la nouvelle portée doit se
+placer au dessus de la portée @qq{main} plutôt qu'en dessous, ce
+qui est le comportement par défaut.
+
+Les ossia apparaissent souvent sans clef ni métrique, et dans une police
+plus petite.  Ceci requiert des commandes dont nous n'avons pas encore
+parlé.  Voir @ref{Size of objects} et @ruser{Ossia staves}.
+
 
 @node On the un-nestedness of brackets and ties
 @subsection On the un-nestedness of brackets and ties
 
-@untranslated
+@cindex crochets, imbrication
+
+Nous avons déjà rencontré plusieurs types de crochets au fil de nos
+fichiers LilyPond.  Ils obéissent à des règles différentes qui peuvent
+paraître déroutantes.  Avant d'examiner ces règles, voici une liste des 
+différents types de crochet :
+
+@c attempt to force this onto a new page
+@need 50
+@multitable @columnfractions .3 .7
+@headitem Type de crochet
+  @tab Fonction
+@item @code{@{ .. @}}
+  @tab Délimite un segment de musique séquentielle
+@item @code{< .. >}
+  @tab Délimite les notes d'un accord
+@item @code{<< .. >>}
+  @tab Délimite des sections simultanées
+@item @code{( .. )}
+  @tab Marquent le début et la fin d'une liaison
+@item @code{\( .. \)}
+  @tab Marquent le début et la fin d'une liaison de phrasé
+@item @code{[ .. ]}
+  @tab Marquent le début et la fin d'une ligature manuelle
+@end multitable
+
+D'autres constructions permettent d'obtenir des lignes regroupant ou en
+travers des notes :  les liaisons de prolongation (indiquées par un
+tilde, @code{~}), les marques de nolet avec 
+@code{\times@tie{}x/y@tie{}@{..@}} ou
+encore les notes d'ornement avec @code{\grace@{..@}}.
+
+En dehors de LilyPond, l'imbrication correcte de différents types de
+crochets exige un strict respect des conventions, telles que 
+@code{<< [ @{ ( .. ) @} ] >>}, où les marques de fermeture interviennent
+obligatoirement dans l'ordre exactement inverse à celles d'ouverture.
+Ceci @strong{doit} être rigoureusement respecté pour les trois
+types de crochets utilisés pour @emph{délimiter} comme l'indique le
+tableau ci-dessus.  
+Une telle rigueur dans l'imbrication n'est @strong{pas} requise pour les
+types de crochets dont la fonction est de @emph{marquer}, selon le
+tableau ci-dessus, lorsqu'il sont utilisés en combinaison avec des
+liaisons de prolongation ou des nolets.  En effet, il ne s'agit pas
+de crochets ayant pour fonction de borner quelque chose ; ils agissent
+plutôt comme marquant le début de quelque chose et sa fin.
+
+Ainsi, et bien que ce ne soit pas très musical, une liaison de phrasé
+peut débuter avant l'insertion d'une ligature manuelle et s'arrêter
+avant la fin de la ligature :
+
+@lilypond[quote,verbatim,fragment,ragged-right,relative=2]
+ { g8\( a b[ c b\) a] }
+@end lilypond
+
+De manière générale, différents types de crochets, notamment s'ils
+indiquent des nolets, liaisons de prolongation ou notes d'ornements,
+peuvent se mélanger entre eux.  L'exemple suivant montre une ligature
+qui se prolonge sur un triolet (ligne 1), puis une liaison qui se
+prolonge sur un triolet (ligne 2) et enfin une ligature et une liaison
+qui s'étendent sur un triolet, lui-même lié à un quintolet agrémenté
+d'une liaison de phrasé se poursuivant (lignes 3 et 4).
+
+@lilypond[quote,verbatim,fragment,ragged-right]
+{
+  r16[ g16 \times 2/3 {r16 e'8] }
+  g16( a \times 2/3 {b d) e' }
+  g8[( a \times 2/3 {b d') e'~]}
+  \times 4/5 {e'32\( a b d' e'} a'4.\)
+}
+@end lilypond
+
 
 @node Voices contain music
 @section Voices contain music
 
-@untranslated
+Les chanteurs utilisent leur voix pour chanter ; il en va de même pour 
+LilyPond.  En fait, la musique de chacun des instruments d'une partition
+est contenue dans des voix (@emph{Voices} en anglais) et qui se trouve
+être le concept fondamental de LilyPond.
 
 @menu
-* I'm hearing Voices::
-* Explicitly instantiating voices::
-* Voices and vocals::
+* I'm hearing Voices::          
+* Explicitly instantiating voices::  
+* Voices and vocals::           
 @end menu
 
 @node I'm hearing Voices
 @subsection I'm hearing Voices
 
-@untranslated
+@cindex polyphonie
+@cindex calques (layers)
+@cindex voix multiples
+@cindex Voice, contexte
+@cindex contexte de voix
+@cindex musique simultanée
+@cindex musique concurrente
+
+Dans une partition gérée par LilyPond, le niveau le plus bas, ou bien
+élémentaire ou fondamental, est le @q{contexte de voix} -- @emph{Voice
+context} en anglais --.  Pour d'autres logiciels, on fait tantôt
+référence à la notion de @q{couche} ou de @q{calque}.
+
+En réalité, le contexte de voix est le seul à pouvoir contenir de la
+musique.  S'il n'est pas déclaré explicitement, il sera créé
+automatiquement comme nous l'avons vu au début de ce chapitre.  Certains
+instruments, le hautbois par exemple, ne peuvent jouer qu'une seule note
+à la fois.  On dit en pareil cas qu'il s'agit de musique monophonique,
+et nous n'aurons alors besoin que d'une seule voix.  Les intruments qui,
+comme le piano, peuvent émettre plusieurs sons en même temps, nécessitent
+de recourir à plusieurs voix pour gérer efficacement l'alignement des
+notes et rythmes différents.
+
+Si une voix unique peut tout à fat contenir plusieurs notes dans un
+accord, à partir de quand aurons-nous vraiment besoin de plusieurs 
+voix ?  Considérons déjà ces quatre accords :
+
+@lilypond[quote,verbatim,fragment,ragged-right,relative=1]
+\key g \major
+<d g>4 <d fis> <d a'> <d g>
+@end lilypond
+
+Nous exprimons ici chacun des accords par l'utilisation de 
+symboles inférieur et supérieur simples, @code{< ... >}, puisque nous
+n'avons besoin que d'une seule voix.  Supposons maintenant que le fa
+dièse soit une croche, suivie d'un sol croche -- une note de passage
+vers le la ?  Nous avons alors deux notes qui débutent au même moment,
+mais dont la durée est différente : un ré noire et un fa dièse croche.
+Comment coder cela ?  Dans la mesure où toutes les notes d'un accord
+doivent avoir la même durée, nous ne pouvons pas écrire un accord.  Nous
+ne pouvons pas non plus écrire deux notes séparées, puisqu'elles
+débutent en même temps.  Nous avons alors besoin de deux voix.
+
+Voyons comment cela se pratique selon la grammaire de LilyPond.
+
+@funindex << \\ >>
+@funindex \\
+
+Le plus sûr moyen de saisir un fragment où plusieurs voix cohabitent
+sur la même portée, consiste à saisir chacune des voix séquentiellement
+(avec @code{@{...@}}), puis à les combiner en simultané à l'aide de
+symboles supérieur et inférieur doubles, @code{<<...>>}.  Les fragments
+devront être séparés par une double oblique inversée, @code{\\}, pour
+les affecter à des voix séparées.  Dans le cas contraire, les notes
+seraient toutes affectées à une même voix, ce qui pourait générer des
+erreurs.  Cette manière de procéder est tout à fait indiquée dans le cas
+d'une pièce ne comportant que quelques courts passages de polyphonie.
+
+Voici comment éclater les accords en deux voix, avec la note de passage
+et la liaison :
+
+@lilypond[quote,verbatim,fragment,ragged-right,relative=2]
+\key g \major
+%    Voice "1"                  Voice "2"
+<< { g4 fis8( g) a4 g }    \\ { d4 d d d }  >> |
+@end lilypond
+
+Notez que les hampes de la seconde voix sont dirigées vers le bas.
+
+Autre exemple :
+
+@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
+mesure n'est pas nécessaire.  Bien qu'on y gagne en lisibilité si chaque
+mesure ne contient que quelques notes, il est plus judicieux de
+carrément séparer chaque voix :
+
+@lilypond[quote,verbatim,fragment,ragged-right,relative=2]
+\key d \minor
+<< {
+  % Voice "1"
+  r4 g g4. a8 |
+  bes4 bes c bes |
+  a2. r4 |
+} \\ {
+  % Voice "2"
+  d,2 d4 g |
+  g4 g g8( a) g4 |
+  fis2. s4 |
+} >>
+@end lilypond
+
+
+Cet exemple ne comporte que deux voix, mais il peut être étendu pour
+traiter trois voix ou plus en ajoutant autant de séparateurs @code{\\}
+que de besoin.
+
+Les contextes @code{Voice} portent les noms @code{"1"}, @code{"2"}, etc.
+Pour chacun de ces contextes, la direction et l'orientation des
+liaisons, hampes, nuances, etc. est définie automatiquement.
+
+@lilypond[quote,verbatim,fragment]
+\new Staff \relative c' {
+  % Main voice
+  c16 d e f
+  %    Voice "1"     Voice "2"                 Voice "3"
+  << { g4 f e } \\ { r8 e4 d c8 ~ } >> |
+  << { d2 e2 }  \\ { c8 b16 a b8 g ~ g2 } \\ { s4 b4 c2 } >> |
+}
+@end lilypond
+
+Ces voix sont séparées de la voix principale qui contient les notes en 
+dehors de la construction @code{<< .. >>} -- que nous appellerons
+@emph{construction simultanée}.  Les liaisons, de prolongation ou non,
+ne peuvent relier des notes que si elles appartiennent à la même voix ;
+elles ne peuvent ni pénétrer une contruction simultanée, ni en sortir.  
+Inversement, les voix parallèles issues de constructions
+simultanées apparaissant sur une même portée appartiennent à la même
+voix.  Les autres propriétés liées au contexte de voix  s'appliquent
+tout au long des constructions simultanées.  Reprenons notre exemple, en
+affectant une couleur et une allure différentes aux notes de chacune des
+voix.  Vous noterez qu'un changement apporté à une voix ne se propage
+pas aux autres, et qu'il se reporte jusqu'au bout, et que la voix aux
+triangles bleus comporte une liaison de prolongation entre deux
+constructions.
+
+@lilypond[quote,verbatim]
+\new Staff \relative c' {
+  % Main voice
+  c16 d e f
+  << % Bar 1
+    {
+      \voiceOneStyle
+      g4 f e
+    }
+  \\
+    {
+      \voiceTwoStyle
+      r8 e4 d c8 ~
+    }
+  >>
+  << % Bar 2
+     % Voice 1 continues
+    { d2 e2 }
+  \\
+     % Voice 2 continues
+    { c8 b16 a b8 g ~ g2 }
+  \\
+    {
+      \voiceThreeStyle
+      s4 b4 c2
+    }
+  >>
+}
+@end lilypond
+
+@funindex \voiceOneStyle
+@funindex \voiceTwoStyle
+@funindex \voiceThreeStyle
+@funindex \voiceFourStyle
+@funindex \voiceNeutralStyle
+
+Les commandes @code{\voiceXXXStyle} sont principalement dédiées à une
+utilisation pédagogique, comme l'est ce document.  Elles modifient la
+couleur des hampes et ligatures et le style de tête des notes, pour
+permettre une meilleure distinction entre les différentes voix.   La
+première voix comporte des têtes en losange rouge, la deuxième en
+triangle bleu, la troisième en cercles barré vert, la quatrième (non
+utilisée ici) en croix magenta ;  @code{\voiceNeutralStyle} (non utilisé
+ici) revient au style par défaut.  Nous verrons plus tard comment créer
+de telles commandes.
+Voir @ref{Visibility and color of objects} et
+@ref{Using variables for tweaks}.
+
+La polyphonie ne modifie en rien la relation entre les notes au sein
+d'un bloc @code{\relative @{ @}}.  Chaque note est calculée par rapport
+à celle qui la précède, ou bien par rapport à la première note de
+l'accord qui précède.  Ainsi, dans
+
+@example
+\relative c' @{ noteA << < noteB noteC > \\ noteD >> noteE @}
+@end example
+
+@noindent
+@code{noteB} est relative à @code{noteA}                        @*
+@code{noteC} est relative à @code{noteB}, pas à @code{noteA}    @*
+@code{noteD} est relative à @code{noteB}, pas à @code{noteA} ni
+@code{noteC}                                                    @*
+@code{noteE} est relative à @code{noteD}, pas à @code{noteA}
+
+Une méthode alternative, et qui peut simplifier les choses si les notes 
+des différentes voix sont espacées, consiste à placer une commande
+@code{\relative} au début de chacune des voix :
+
+@example
+\relative c' @{ noteA ... @}
+<<
+  \relative c'' @{ < noteB noteC > ... @}
+\\
+  \relative g' @{ noteD ... @}
+>>
+\relative c' @{ noteE ... @}
+@end example
+
+Pour finir, analysons le principe d'utilisation des voix dans une pièce
+complexe.  Nous allons nous concentrer sur les deux premières mesures du
+second des Deux nocturnes, opus 32 de Chopin.  Cet exemple nous servira
+à plusieurs reprises, y compris dans le chapitre suivant, pour illustrer
+certaines techniques de notation.  Aussi, ne prétez pas trop d'attention
+à ce qui pour l'instant pourrait vous paraître vraiment mystérieux dans
+le code, et intéressons-nous uniquement à ce qui concerne la musique et
+les voix -- ce qui est plus compliqué sera décortiqué plus tard.
+
+@c The following should appear as music without code
+@lilypond[quote,ragged-right]
+\new Staff \relative c'' {
+  \key aes \major
+  << % Voice one
+    { c2 aes4. bes8 }
+  \\ % Voice two
+    { aes2 f4 fes }
+  \\ % No voice three
+  \\ % Voice four
+    {
+      % Ignore these for now - they are explained in Ch 4
+      \once \override NoteColumn #'force-hshift = #0
+      <ees c>2
+      \once \override NoteColumn #'force-hshift = #0.5
+      des2
+    }
+  >> |
+  <c ees aes c>1 |
+}
+@end lilypond
+
+La direction des hampes sert souvent à indiquer dans la continuité deux
+lignes mélodiques simultanées.  Ici, les hampes des notes les plus
+hautes vont vers le haut, et celles des notes plus basses vers le
+bas.  C'est une première incation que nous avons eu recours à plus d'une
+voix.
+
+Mais le réel besoin de multiples voix se fait sentir dès lors que
+plusieurs notes qui débutent en même temps ont des durées différentes.
+C'est évident au troisième temps de la première mesure : le la bémol est
+une noire pointée, le fa une noire, et le ré bémol une blanche.  On ne
+peut les grouper dans un accord, puisque toutes les notes composant un
+accord doivent être de même durée.  On ne peut non plus les ecrire
+séquentiellement, puisqu'elles débutent toutes au même instant.  Ce
+fragment de mesure nécessite trois voix, et une bonne pratique voudrait
+que l'intégralité de la mesure soit sur trois voix, comme ci-dessous où
+nous avons une allure et une couleur différentes aux motes de chacune
+d'entre elles.  Une fois de plus, nous reviendrons plus tard sur le code
+que vous ne comprendriez pas.
+
+@c The following should appear as music without code
+@c The three voice styles should be defined in -init
+@lilypond[quote,ragged-right]
+\new Staff \relative c'' {
+  \key aes \major
+  <<
+    { % Voice one
+      \voiceOneStyle
+      c2 aes4. bes8
+    }
+  \\  % Voice two
+    { \voiceTwoStyle
+      aes2 f4 fes
+    }
+  \\  % No Voice three (we want stems down)
+  \\  % Voice four
+    { \voiceThreeStyle
+      % Ignore these for now - they are explained in Ch 4
+      \once \override NoteColumn #'force-hshift = #0
+      <ees c>2
+      \once \override NoteColumn #'force-hshift = #0.5
+      des2
+    }
+  >> |
+  <c ees aes c>1 |
+}
+@end lilypond
+
+Essayons à présent de coder cette musique en partant de zéro.  Comme
+nous le verrons, certaines difficultés vont se présenter.  Partons de ce
+que nous avons appris : utilisons la construction @code{<< \\  >>} pour
+saisir la première mesure dans trois voix :
+
+@lilypond[quote,verbatim,fragment,ragged-right]
+\new Staff \relative c'' {
+  \key aes \major
+  <<
+    { c2 aes4. bes8 } \\ { aes2 f4 fes } \\ { <ees c>2 des2 }
+  >>
+  <c ees aes c>1
+}
+@end lilypond
+
+@cindex stem down
+@cindex hampes en bas
+@cindex stem up
+@cindex hampes en haut
+
+La direction des hampes est attribuée automatiquement : les voix
+impaires portent des hampes vers le haut, les voix paires des hampes
+vers le bas.  Les hampes des voix 1 et 2 sont orientées comme il faut
+mais celles de la voix 3 devraient, dans le cas qui nous occupe, aller
+vers le bas.  Nous pouvons corriger cela en sautant la voix 3 et en
+plaçant la musique dans la voix 4 :
+
+@lilypond[quote,verbatim,fragment,ragged-right]
+\new Staff \relative c'' {
+  \key aes \major
+  << % Voice one
+    { c2 aes4. bes8 }
+  \\ % Voice two
+    { aes2 f4 fes   }
+  \\ % Omit Voice three
+  \\ % Voice four
+    { <ees c>2 des2 }
+  >> |
+  <c ees aes c>1 |
+}
+@end lilypond
+
+@noindent
+Cette manipulation nous permet de régler la direction des hampes, mais
+engendre un problème que l'on rencontre parfois avec de multiples voix,
+à savoir que les hampes d'une voix peuvent chevaucher les têtes de note
+des autres voix.  En matière de mise en forme des notes, LilyPond
+tolère que des notes ou accords appartenant à deux voix se retrouvent
+dans le même empilement de notes (@emph{note column} en anglais) si tant
+est que ces hampes vont dans des directions opposées ; néanmoins les
+notes des troisième et quatrième voix seront décalées si nécessaire pour
+éviter que les têtes ne se chevauchent.  Cela marche plutôt bien, mais
+dans notre exemple, les notes de la voix la plus basse ne sont vraiment
+pas correctement placées.  LilyPond met à notre disposition plusieurs
+moyens d'ajuster le positionnement horizontal des notes.  Nous ne sommes
+pas encore tout à fait prêts pour voir comment corriger cela, aussi nous
+examinerons ce problème dans un autre chapitre (voir la propriété
+force-hshift  dans @ref{Fixing overlapping notation}).
+
+@seealso
+
+Manuel de notation : @ruser{Multiple voices}.
+
 
 @node Explicitly instantiating voices
 @subsection Explicitly instantiating voices
 
+@funindex \voiceOne
+@funindex \voiceTwo
+@funindex \voiceThree
+@funindex \voiceFour
+@funindex \oneVoice
+@funindex \new Voice
+@cindex Voice, création de contextes
+
 Les contextes @rinternals{Voice} peuvent être déclarés manuellement
 dans un bloc @code{<< >>} pour créer de la musique polyphonique, en
 utilisant @code{\voiceOne}, @dots{} jusqu'à @code{\voiceFour} pour
 assigner des directions de hampes et un déplacement horizontal pour
-chaque partie.
+chaque partie.  Cette méthode apporte de la clarté pour des partitions
+plus importantes puisqu'elle permet de bien séparer les voix et de leur
+affecter un nom plus parlant.
+
+En particulier, la construction @code{<< \\ >>} que nous avons vue
+précédemment :
 
-En particulier,
 @example
-<< \upper \\ \lower >>
+\new Staff @{
+  \relative c' @{
+    << @{ e4 f g a @} \\ @{ c,4 d e f @} >>
+  @}
+@}
 @end example
 
 @noindent
 équivaut à
 
 @example
-<<
- \new Voice = "1" @{ \voiceOne \upper @}
- \new Voice = "2" @{ \voiceTwo \lower @}
+\new Staff <<
+  \new Voice = "1" @{ \voiceOne \relative c' @{ e4 f g a @} @}
+  \new Voice = "2" @{ \voiceTwo \relative c' @{ c4 d e f @} @}
 >>
 @end example
 
+Toutes deux produiront
+
+@c The following example should not display the code
+@lilypond[ragged-right,quote]
+\new Staff <<
+  \new Voice = "1" { \voiceOne \relative c' { e4 f g a } }
+  \new Voice = "2" { \voiceTwo \relative c' { c4 d e f } }
+>>
+@end lilypond
+
 Les commandes @code{\voiceXXX} fixent la direction des hampes, des
-liaisons de prolongations et de phrasé, des articulations, des
+liaisons de prolongation et de phrasé, des articulations, des
 annotations, des points d'augmentation des notes pointées et des
 doigtés.  @code{\voiceOne} et @code{\voiceThree} font pointer ces objets
 vers le haut, alors que @code{\voiceTwo} et @code{\voiceFour} les font
-pointer vers le bas.  La commande @code{\oneVoice} les ramène aux
+pointer vers le bas.  Ces commandes génèrent par ailleurs un décalage
+horizontal de chacune des voix pour éviter tout risque de chevauchement
+entre plusieurs notes.  La commande @code{\oneVoice} les ramène aux
 critères normaux.
 
-Une expression séquentielle qui apparaît en premier dans un @code{<< >>}
-appartient à la voix principale.  Ceci est utile lorsque des voix
-supplémentaires apparaissent pendant que la voix principale est jouée.
-Voici une meilleure réalisation de l'exemple de la section précédente.
-Les notes colorées et en croix mettent en évidence le fait que la mélodie principale
-est maintenant dans un seul contexte de voix.
+Voyons, à l'aide de ces exemples simples, les effets respectifs de
+@code{\oneVoice}, @code{\voiceOne} et @code{voiceTwo} sur les
+annotations, liaisons de prolongation ou de phrasé, et sur les nuances.
 
 @lilypond[quote,ragged-right,verbatim]
-\new Staff \relative c' {
-  \override NoteHead #'style = #'cross
-  \override NoteHead #'color = #red
-  c16 d e f
+\relative c'{
+  % Default behavior or behavior after \oneVoice
+  c d8 ~ d e4 ( f g a ) b-> c
+}
+@end lilypond
+
+@lilypond[quote,ragged-right,verbatim]
+\relative c'{
   \voiceOne
-  <<
-    { g4 f e | d2 e2 }
-    \new Voice="1" { \voiceTwo
-      r8 e4 d c8 ~ | c8 b16 a b8 g ~ g2
-      \oneVoice
-    }
-    \new Voice { \voiceThree
-      s2. | s4 b4 c2
-      \oneVoice
-    }
-  >>
+  c d8 ~ d e4 ( f g a ) b-> c
+  \oneVoice
+  c, d8 ~ d e4 ( f g a ) b-> c
+}
+@end lilypond
+
+@lilypond[quote,ragged-right,verbatim]
+\relative c'{
+  \voiceTwo
+  c d8 ~ d e4 ( f g a ) b-> c
   \oneVoice
+  c, d8 ~ d e4 ( f g a ) b-> c
 }
 @end lilypond
 
-La définition correcte des voix permet à la mélodie d'être liée.
+Voyons à présent trois différentes façons d'exprimer un passage
+polyhonique, à partir d'un exemple de la section précédente.  Chacune
+d'elles aura ses avantages selon les circonstances.
+
+Une expression séquentielle qui apparaît en premier dans un @code{<< >>}
+-- attention, @strong{pas} dans une construction @code{<< \\ >>} --
+appartient à la voix principale.  Ceci est utile lorsque des voix
+supplémentaires apparaissent pendant que la voix principale est jouée.
+Voici une meilleure réalisation de notre exemple.
+Les notes colorées et en croix mettent en évidence le fait que la
+mélodie principale est maintenant dans un seul contexte de voix, ce qui
+permet d'ajouter une liaison de phrasé à l'ensemble.
+
 @lilypond[quote,ragged-right,verbatim]
 \new Staff \relative c' {
+  \voiceOneStyle
+  % The following notes are monophonic
   c16^( d e f
-  \voiceOne
+  % Start simultaneous section of three voices
   <<
+    % Continue the main voice in parallel
     { g4 f e | d2 e2) }
-    \context Voice="1" { \voiceTwo
+    % Initiate second voice
+    \new Voice {
+      % Set stems, etc, down
+      \voiceTwo
       r8 e4 d c8 ~ | c8 b16 a b8 g ~ g2
-      \oneVoice
     }
-    \new Voice { \voiceThree
-      s2. s4 b4 c2
-      \oneVoice
+    % Initiate third voice
+    \new Voice {
+      % Set stems, etc, up
+      \voiceThree
+      s2. | s4 b4 c2
     }
   >>
-  \oneVoice
 }
 @end lilypond
 
-Le fait d'éviter le séparateur @code{\\} permet aussi d'imbriquer des
-constructions polyphoniques, ce qui peut être une manière plus naturelle
-de saisir la musique.
+@cindex imbrication d'expressions musicales
+@cindex imbrication de constructions simultanées
+
+@cindex voix temporaires
+@cindex voix, imbrication
+
+
+Dans certaines circonstances de polyphonie complexe, vous pourrez être
+amené à recourir à une voix temporaire, ce qui peut être une manière
+plus naturelle de saisir la musique :
 
 @lilypond[quote,ragged-right,verbatim]
 \new Staff \relative c' {
   c16^( d e f
-  \voiceOne
   <<
     { g4 f e | d2 e2) }
-    \context Voice="1" { \voiceTwo
+    \new Voice {
+      \voiceTwo
       r8 e4 d c8 ~ |
       <<
         {c8 b16 a b8 g ~ g2}
-        \new Voice { \voiceThree
+        \new Voice {
+          \voiceThree
           s4 b4 c2
-          \oneVoice
         }
       >>
-    \oneVoice
     }
   >>
-  \oneVoice
 }
 @end lilypond
 
-Dans certaines circonstances de polyphonie complexe, vous pourrez être
-amené à recourir à des voix supplémentaires afin d'éviter des collisions
-de notes.  Ces voix additionnelles s'ajoutent en définissant un
-identificateur, comme le montre l'exemple suivant :
+@cindex spacing notes
 
-@lilypond[quote,verbatim,ragged-right]
-voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
+Cette manière de brièvement imbriquer des voix est bien utile pour de
+courts fragments de musique polyphonique.  Mais lorsqu'une portée est
+très souvent polyphonique, on peut y gagner en clarté si l'on utilise
+plusieurs voix sur l'ensemble de cette portée et que l'on positionne des 
+silences invisibles pour sauter les moments où il n'y a rien dans cette
+voix. 
 
-\relative c''' <<
-  { \voiceOne g4 ~  \stemDown g32[ f( es d c b a b64 )g] } \\
-  { \voiceThree  b4} \\
-  { \voiceFive d,} \\
-  { \voiceTwo g,}
+@lilypond[quote,ragged-right,verbatim]
+\new Staff \relative c' <<
+  % Initiate first voice
+  \new Voice {
+    \voiceOne
+    c16^( d e f g4 f e | d2 e2) |
+  }
+  % Initiate second voice
+  \new Voice {
+    % Set stems, etc, down
+    \voiceTwo
+    s4 r8 e4 d c8 ~ | c8 b16 a b8 g ~ g2 |
+  }
+  % Initiate third voice
+  \new Voice {
+    % Set stems, etc, up
+    \voiceThree
+    s1 | s4 b4 c2 |
+  }
 >>
 @end lilypond
 
+@subsubheading Note columns
+
+@cindex note column
+@cindex empilement de notes
+@cindex shift, commandes
+@cindex décalage, commandes
+@funindex \shiftOff
+@funindex \shiftOn
+@funindex \shiftOnn
+@funindex \shiftOnnn
+
+Les notes rapprochées d'un accord, ou des notes de différentes voix qui
+tombent ensemble, seront rangées sur deux colonnes, voire plus, pour
+palier d'éventuels chevauchements des têtes.  On appelle cela des
+empilements de notes.  Chaque voix dispose de plusieurs empilements, et 
+l'attribution d'un décalage à une voix en particulier s'appliquera à
+l'empilement en question s'il y avait risque de collision.
+Nous en avons une illustration à la deuxième mesure de l'exemple
+ci-dessus :  le do de la deuxième voix est décalé à droite du ré de la
+première voix et, dans l'accord final, le do de la troisième voix est
+lui aussi décalé à droite des autres notes.
+
+Les commandes @code{\shiftOn}, @code{\shiftOnn}, @code{\shiftOnnn}, et 
+@code{\shiftOff} spécifient le degré nécessaire de décalage qui sera
+appliqué aux notes au accords de la voix en question afin d'éviter une
+collision.  Par défaut, les voix extérieures -- normalement les
+première et deuxième -- se verront attribuer @code{\shiftOff}, alors que
+les voix intérieures -- trois et quatre -- se verront attribuer
+@code{\shiftOn}.  Lorsqu'un décalage s'applique, les voix un et trois
+iront vers la droite, et les voix deux et quatre vers la gauche.
+
+@code{\shiftOnn} et @code{\shiftOnnn} définissent des degrés augmentés
+de décalage auquel on peut devoir temporairement recourir dans des
+situations complexes -- voir Real music example
+@ref{Real music example}.
+
+Un empilement peut ne contenir qu'une note ou un accord dans une voix
+aux hampes vers le haut, et une note ou un accord dans une voix
+aux hampes vers le bas.  Dans le cas où des notes, issues de deux voix
+ayant toutes deux des hampes dans la même direction, se retrouvent au
+même moment et qu'aucun décalage n'a été spécifié ou qu'ils sont
+identiques, LilyPond vous le signalera par le message @qq{Trop
+d'empilements en conflit}.
+
+@seealso
+
+Manuel de notation : @ruser{Multiple voices}.
+
 
 @node Voices and vocals
 @subsection Voices and vocals
 
-@untranslated
+La musique vocale est une gageure en soi : il nous faut combiner deux
+expressions différentes -- des notes et des paroles.
+
+@funindex \new Lyrics
+@funindex \lyricsto
+@cindex Lyrics, création d'un contexte
+@cindex paroles, affectation à une voix
+
+Nous avons déjà abordé la commande @code{\addlyrics}, qui permet de
+gérer des partitions simples.  Cette technique est cependant
+relativement limitée.  Pour de la musique un peu plus compliquée, il
+vous faudra contenir les paroles dans un contexte @code{Lyrics}, créé
+par la commande @code{\new Lyrics} ; vous relierez ensuite ces paroles
+aux notes grace à la commande @code{\lyricsto@{@}} et au nom assigné à
+la voix en question.
+
+@lilypond[quote,verbatim,fragment]
+<<
+  \new Voice = "one" \relative c'' {
+    \autoBeamOff
+    \time 2/4
+    c4 b8. a16 g4. f8 e4 d c2
+  }
+  \new Lyrics \lyricsto "one" {
+    No more let sins and sor -- rows grow.
+  }
+>>
+@end lilypond
+
+Notez bien que les paroles sont liées à un contexte de voix
+(@code{Voice}), @emph{non} à un contexte de portée (@code{Staff}).  Il
+est donc nécessaire de créer explicitement les contextes @code{Staff}
+et @code{Voice}.
+
+@cindex paroles et ligatures
+@cindex ligatures et paroles
+@funindex \autoBeamOff
+
+Si la ligature automatique que LilyPond applique par défaut
+est pleinement adaptée en matière de musique instrumentale, il
+n'en va pas de même dans le cas d'une musique associée à des paroles,
+et pour laquelle soit les ligatures sont carrément absentes, soit elles
+servent à indiquer un mélisme -- plusieurs notes pour une même syllabe.  
+Dans l'exemple qui suit, nous utilisons la commande @code{\autoBeamOff}
+afin de désactiver les ligatures automatiques.
+
+@funindex \new ChoirStaff
+@funindex \lyricmode
+@cindex structure d'une partition vocale
+
+Nous allons reprendre un extrait de Judas Maccabæus pour illustrer ce
+que cette technique apporte en flexibilité.  Nous commençons par
+utiliser des variables afin de séparer aussi bien la musique que les
+paroles, de la structure d'une portée.  Nous ajoutons par la même
+occasion un crochet spécifique aux portées pour chœur
+(@code{ChoirStaff}).  Quant aux blocs de paroles, nous les faisons
+précéder de la commande @code{\lyricmode} pour nous assurer qu'elles
+seront interprétées comme telles, et non comme de la musique.
+
+@lilypond[quote,verbatim]
+global = { \time 6/8 \partial 8 \key f \major}
+SopOneMusic = \relative c'' {
+  c8 | c([ bes)] a a([ g)] f | f'4. b, | c4.~ c4 }
+SopTwoMusic = \relative c' {
+  r8 | r4. r4 c8 | a'([ g)] f f([ e)] d | e([ d)] c bes' }
+SopOneLyrics = \lyricmode {
+  Let | flee -- cy flocks the | hills a -- dorn, __ }
+SopTwoLyrics = \lyricmode {
+  Let | flee -- cy flocks the | hills a -- dorn, }
+
+\score {
+  \new ChoirStaff <<
+    \new Staff <<
+      \new Voice = "SopOne" {
+        \global
+        \SopOneMusic
+      }
+      \new Lyrics \lyricsto "SopOne" {
+        \SopOneLyrics
+      }
+    >>
+    \new Staff <<
+      \new Voice = "SopTwo" {
+        \global
+        \SopTwoMusic
+      }
+      \new Lyrics \lyricsto "SopTwo" {
+        \SopTwoLyrics
+      }
+    >>
+  >>
+}
+@end lilypond
+
+Voici donc la structure de base valable pour toute partition vocale.  On
+peut y ajouter d'autres portées si besoin est, d'autres voix à
+chaque portée, plusieurs couplets aux paroles, et les variables
+contenant la musique peuvent même être stockées dans des fichiers
+indépendants dès lors que leur longueur devient conséquente. 
+
+@cindex structure d'hymne
+
+Voici maintenant la première ligne d'une hymne pour chœur à quatre voix
+mixtes, comportant quatre couplets.  Les paroles sont ici identiques
+pour les quatre voix.  Vous remarquerez le recours aux variables afin de
+séparer les notes et les paroles, de la structure de portée.  Vous
+noterez aussi une variable particulière, que nous avons appelée
+@q{MetriqueArmure}, et qui contient plusieurs commandes que nous
+utiliserons dans les deux portées.  Dans de nombreux autres exemples,
+elle s'appelle @q{global}.
+
+@lilypond[quote,verbatim]
+TimeKey = { \time 4/4 \partial 4 \key c \major}
+SopMusic   = \relative c' { c4 | e4. e8 g4  g  | a a g }
+AltoMusic  = \relative c' { c4 | c4. c8 e4  e  | f f e }
+TenorMusic = \relative c  { e4 | g4. g8 c4. b8 | a8 b c d e4 }
+BassMusic  = \relative c  { c4 | c4. c8 c4  c  | f8 g a b c4 }
+VerseOne   = \lyricmode {
+  E -- | ter -- nal fa -- ther, | strong to save, }
+VerseTwo   = \lyricmode {
+  O | Christ, whose voice the | wa -- ters heard, }
+VerseThree = \lyricmode {
+  O | Ho -- ly Spi -- rit, | who didst brood }
+VerseFour  = \lyricmode {
+  O | Tri -- ni -- ty of | love and pow'r }
+
+\score {
+  \new ChoirStaff <<
+    \new Staff <<
+      \clef "treble"
+      \new Voice = "Sop"  { \voiceOne \TimeKey \SopMusic }
+      \new Voice = "Alto" { \voiceTwo \AltoMusic }
+      \new Lyrics \lyricsto "Sop" { \VerseOne   }
+      \new Lyrics \lyricsto "Sop" { \VerseTwo   }
+      \new Lyrics \lyricsto "Sop" { \VerseThree }
+      \new Lyrics \lyricsto "Sop" { \VerseFour  }
+    >>
+    \new Staff <<
+      \clef "bass"
+      \new Voice = "Tenor" { \voiceOne \TimeKey \TenorMusic }
+      \new Voice = "Bass"  { \voiceTwo \BassMusic  }
+    >>
+  >>
+}
+@end lilypond
+
+@cindex couplet et refrain
+
+Nous allons terminer en voyant comment coder un couplet pour soliste
+suivi d'un refrain à deux voix sur deux portées.  Les explications sont
+importantes, dans la mesure où les moyens mis en œuvre pour arriver à
+enchaîner le solo et la polyphonie dans une seule et même partition sont
+quelque peu tirés par les cheveux.
+
+Commençons par ouvrir un bloc @code{score} qui contiendra un
+@code{ChoirStaff}, puisque nous aimerions voir un crochet au début du
+système choral.  Nous devrions avoir, après @code{\new ChoirStaff}, un
+double inférieur pour synchroniser les portées ; mais comme nous
+reportons le parallélisme après le solo, nous utilisons des accolades --
+un double inférieur ne serait cependant pas génant.  À l'intérieur du
+@code{ChoirStaff}, nous voulons en premier la portée avec le couplet.
+Puisqu'elle englobe parallèlement des notes et des paroles, nous devons
+encadrer les @code{\new Voice} et @code{\new Lyrics} de doubles
+inférieur/supérieur pour les faire démarrer de concert : 
+
+@lilypond[quote,verbatim,ragged-right]
+versenotes = \relative c'' {
+  \clef "treble"
+  \key g \major
+  \time 3/4 g g g b b b
+}
+versewords = \lyricmode {
+  One two three four five six
+}
+\score {
+  \new Choirstaff {
+    \new Staff <<
+      \new Voice = "verse" {
+        \versenotes \break
+      }
+      \new Lyrics \lyricsto verse {
+        \versewords
+      }
+    >>
+  }
+}
+@end lilypond
+
+Voici la ligne du couplet réalisée.
+
+Nous poursuivons avec refrainA, sur la même portée, alors même qu'une 
+deuxième portée s'amorce en parallèle pour contenir refrainB.  Cette
+section parallèle doit s'enchaîner directement à la suite du
+@code{\break} de la voix contenant le couplet -- il s'agit bien de la
+@emph{même} voix.  Voici cette section parallèle.  On pourrait tout à
+fait ajouter encore d'autres portées ici, toujours de la même manière.
+
+@example
+<<
+  \refrainnotesA
+  \new Lyrics \lyricsto verse @{
+    \refrainwordsA
+  @}
+  \new Staff <<
+    \new Voice = "refrainB" @{
+      \refrainnotesB
+    @}
+    \new Lyrics \lyricsto "refrainB" @{
+      \refrainwordsB
+    @}
+  >>
+>>
+@end example
+
+Et voici le résultat final, avec ses deux portées pour la partie
+chorale, et qui montre comment la section en parallèle s'enchaîne avec
+la voix du couplet :
+
+@lilypond[quote,verbatim, ragged-right]
+versenotes = \relative c'' {
+  \clef "treble"
+  \key g \major
+  \time 3/4 g g g b b b
+}
+refrainnotesA = \relative c'' {
+  \time 2/4
+  c c g g \bar "|."
+}
+refrainnotesB = \relative c {
+  \clef "bass"
+  \key g \major
+  c e d d
+}
+versewords = \lyricmode {
+  One two three four five six
+}
+refrainwordsA = \lyricmode {
+  la la la la
+}
+refrainwordsB = \lyricmode {
+  dum dum dum dum
+}
+\score {
+  \new ChoirStaff {
+    \new Staff <<
+      \new Voice = "verse" {
+        \versenotes \break
+        <<
+          \refrainnotesA
+          \new Lyrics \lyricsto "verse" {
+            \refrainwordsA
+          }
+          \new Staff <<
+            \new Voice = "refrainB" {
+              \refrainnotesB
+            }
+            \new Lyrics \lyricsto "refrainB" {
+              \refrainwordsB
+            }
+          >>
+        >>
+      }
+      \new Lyrics \lyricsto "verse" {
+        \versewords
+      }
+    >>
+  }
+}
+@end lilypond
+
+@cindex book, exemple d'utilisation
+@cindex recueil, exemple d'utilisation
+@funindex \book
+
+Bien que ce que nous venons de voir constitue un exercice intéressant et
+fort utile pour comprendre comment s'articulent des blocs séquentiels et
+simultanés, nous aurions aussi pu coder notre exemple sous la forme de
+deux blocs @code{\score} au sein d'un bloc @code{\book} implicite :
+
+@lilypond[quote,verbatim,ragged-right]
+versenotes = \relative c'' {
+  \clef "treble"
+  \key g \major
+  \time 3/4 g g g b b b
+}
+refrainnotesA = \relative c'' {
+  \time 2/4
+  c c g g \bar "|."
+}
+refrainnotesB = \relative c {
+  \clef "bass"
+  \key g \major
+  c e d d
+}
+versewords = \lyricmode {
+  One two three four five six
+}
+refrainwordsA = \lyricmode {
+  la la la la
+}
+refrainwordsB = \lyricmode {
+  dum dum dum dum
+}
+\score {
+  \new Staff <<
+    \new Voice = "verse" {
+      \versenotes
+    }
+    \new Lyrics \lyricsto "verse" {
+      \versewords
+    }
+  >>
+}
+
+\score {
+  \new ChoirStaff <<
+    \new Staff <<
+      \new Voice = "refrainA" {
+        \refrainnotesA
+      }
+      \new Lyrics \lyricsto "refrainA" {
+        \refrainwordsA
+      }
+    >>
+    \new Staff <<
+      \new Voice = "refrainB" {
+        \refrainnotesB
+      }
+      \new Lyrics \lyricsto "refrainB" {
+        \refrainwordsB
+      }
+    >>
+  >>
+}
+@end lilypond
+
+@seealso
+
+Manuel de notation : @ruser{Vocal music}.
+
 
 @node Contexts and engravers
 @section Contexts and engravers
 
-Nous avons évoqué rapidement les contextes et graveurs dans les sections
-précédentes ; examinons en détail ces concepts essentiels dans la
+Nous avons évoqué rapidement les contextes et graveurs dans les chapitres
+précédents ; examinons en détail ces concepts essentiels à la
 maîtrise de LilyPond.
 
 @menu
-* Contexts explained::
-* Creating contexts::
-* Engravers explained::
-* Modifying context properties::
-* Adding and removing engravers::
+* Contexts explained::          
+* Creating contexts::           
+* Engravers explained::         
+* Modifying context properties::  
+* Adding and removing engravers::  
 @end menu
 
 @node Contexts explained
 @subsection Contexts explained
 
-Imprimer de la musique impose d'ajouter un certain nombre d'éléments de notation.
-Par exemple, voici un fragment de partition, précédé du code qui l'engendre :
+@cindex contextes, les différents
+
+Imprimer de la musique impose d'ajouter un certain nombre d'éléments de
+notation.  Par exemple, voici un fragment de partition, précédé du code
+qui l'engendre :
 
 @lilypond[quote,verbatim,relative=2,fragment]
 cis4 cis2. g4
 @end lilypond
 
-Si le code est assez austère, dans la parition ont été ajoutés un chiffre de mesure,
-des barres de mesure, des altérations et une clé.  Pour une bonne raison : LilyPond
-@emph{interprète} le code.  Il le compulse dans l'ordre chronologique, de même qu'on
-lit une partition de gauche à droite ; et pendant ce traitement, le logiciel garde en
-mémoire les limites des mesures, ou encore quelles hauteurs de notes demandent des
-altérations accidentelles.  Ces informations se présentent à plusieurs niveaux : ainsi,
-une altération n'a d'effet que sur une seule portée, tandis qu'une barre de mesure doit
-être synchronisée sur toute l'étendue verticale de la partition.
+Si le code est assez austère, dans la parition ont été ajoutés un
+chiffre de mesure, des barres de mesure, des altérations et une clé.
+Pour une bonne raison : LilyPond @emph{interprète} le code.  Il le
+compulse dans l'ordre chronologique, de même qu'on lit une partition de
+gauche à droite ; et pendant ce traitement, le logiciel garde en
+mémoire les limites des mesures, ou encore quelles hauteurs de note
+demandent des altérations accidentelles.  Ces informations se présentent
+à plusieurs niveaux : ainsi, une altération n'a d'effet que sur une
+seule portée, tandis qu'une barre de mesure doit être synchronisée sur
+toute l'étendue verticale de la partition.
 
 LilyPond regroupe ces règles et ces fragments d'information dans des
 @emph{Contextes}.  Certains contextes sont les voix (contexte @code{Voice}),
 les portées (contexte @code{Staff}), ou la partition dans son ensemble
 (contexte @code{Score}).  Ils sont ordonnés hiérarchiquement : ainsi un
-contexte @code{Staff} peut contenir plusieurs contextes @code{Voice}, et un
-contexte @code{Score} peut contenir plusieurs contextes @code{Staff}.
+contexte @code{Staff} peut contenir plusieurs contextes
+@code{Voice}, et un contexte @code{Score} peut contenir plusieurs
+contextes @code{Staff}.
 
 @quotation
 @image{context-example,5cm,,}
@@ -495,189 +1545,658 @@ contexte @code{Score} peut contenir plusieurs contextes @code{Staff}.
 Chaque contexte est chargé de faire appliquer certaines règles de gravure,
 de créer certains objets, et de prendre en compte les propriétés qui leur
 sont associées.  Ainsi, le contexte @code{Voice} peut faire intervenir une
-altération accidentelle, puis le contexte @code{Staff} devra déterminer si
-cette dernière devra être imprimée ou non dans la suite de la mesure.  Les barres
-de mesure, enfin, sont alignées verticalement grâce au contexte @code{Score}.
-
-En revanche, dans une musique polymétrique, par exemple mélant une portée à 3/4
-et une autre à 4/4, les barres de mesures n'ont plus à être alignées : il faut alors 
-modifier les comportement par défaut des contextes @code{Score} et @code{Staff}.
-
-Dans une partition très simple, les contextes sont créés implicitement, et peuvent
-être ignorés.  Mais lorsqu'il s'agit de morceaux plus amples -- entendons par là tout
-ce qui s'écrit sur plus d'une portée -- il faut les créer explicitement pour être sûr
-d'obtenir toutes les portées nécessaires, et dans le bon ordre.  Enfin pour des
-morceaux impliquant une notation spéciale, modifier les contextes ou en créer de nouveaux
+altération accidentelle, puis le contexte @code{Staff} devra déterminer s'il
+faudra imprimer ou non cette dernière dans la suite de la mesure.
+
+Les barres de mesure, quant à elles, sont alignées verticalement grâce au
+contexte @code{Score} par défaut. 
+En revanche, dans une musique polymétrique, par exemple mélant une
+portée à 3/4 et une autre à 4/4, les barres de mesures n'ont plus à être
+alignées : il faut alors modifier les comportement par défaut des
+contextes @code{Score} et @code{Staff}.
+
+Dans une partition très simple, les contextes sont créés implicitement,
+et peuvent être ignorés.  Mais lorsqu'il s'agit de morceaux plus amples
+-- entendons par là tout ce qui s'écrit sur plus d'une portée -- il faut
+les créer explicitement pour être sûr d'obtenir toutes les portées
+nécessaires, et dans le bon ordre.  Enfin pour des morceaux impliquant
+une notation spéciale, modifier les contextes ou en créer de nouveaux
 devient extrêment utile.
 
-Une description exhaustive de tous les contextes disponibles peut être trouvée dans la
-référence du programme : voir
-@ifhtml
-@rinternals{Contexts}.
-@end ifhtml
-@ifnothtml
-Translation @expansion{} Context.
-@end ifnothtml
+En plus des contextes @code{Score,} @code{Staff} et @code{Voice}, sont
+disponibles d'autres contextes intermédiaires entre les niveaux 
+partition et portée, chargés de gèrer certains regroupement, tels que
+@code{PianoStaff} ou @code{ChoirStaff}.  Vous disposez aussi d'autres
+contextes de portée ou de voix alternatifs, ainsi que des contextes
+spécifiques pour les paroles, les percussions, les tablatures
+d'instruments frettés, la basse chifrée, etc.
 
-@c [TODO: describe propagation]
+Le nom de chacun des contextes est formé d'un ou plusieurs mots aux
+initiales en majuscule et directements accolés les uns aux autres sans
+ponctuation, comme par exemple @code{GregorianTranscriptionStaff}.
 
+@seealso
 
-@node Creating contexts
-@subsection Creating contexts
+Manuel de notation : @ruser{Contexts explained}.
 
-Dans une partition contenant une seule voix sur une seule portée,
-les contextes sont automatiquement créés.  Dans une partition plus complexe,
-il faut les crééer à la main.  Trois commandes le permettent :
 
-@itemize @bullet
-
-@item
-La plus facile, et la plus rapide à saisir, est @code{\new} -- @qq{nouveau} en français.
-Elle introduit une expression musicale, comme suit :
+@node Creating contexts
+@subsection Creating contexts
 
 @funindex \new
 @cindex nouveaux contextes
 @cindex Contextes, création de
 
+Il en va des contextes comme de toute hiérarchie : il faut un sommet -- 
+le contexte @code{Score} en l'occurence.  La commande @code{\score} est
+chargée de le créer, mais pour des partitions simples, il le sera
+automatiquement. 
+
+Lorsqu'une partition ne comporte qu'une voix et une seule portée, vous
+pouvez laisser LilyPond créer automatiquement les contextes @code{Voice} 
+et @code{Staff} ; mais leur présence explicite devient indispenssable dès
+que la situation se complique.  
+Le moyen le plus simple est d'utiliser la commande @code{\new}.  Elle
+doit intervenir avant une expression musicale, ainsi :
+
 @example
-\new @var{Contexte} @var{expression musicale}
+\new @var{type} @var{expression-musicale}
 @end example
 
 @noindent
-le choix du @var{Contexte} pouvant être, par exemple, @code{Staff} ou
-@code{Voice}.  Cette commande crée un contexte, puis interprète 
-l'@var{expression musicale} dans ledit contexte.
+où @var{type} correspond au nom du contexte (tels @code{Staff} ou
+@code{Voice}).  Cette commande crée un nouveau contexte, puis 
+interprète l'@var{expression-musicale} contenue dans ledit
+contexte.  
 
-En pratique, la commande @code{\new} peut servir dans une partition
-comprenant plusieurs portées.  Comme chaque partie doit se trouver sur sa propre
-portée, il faut la faire précéder de @code{\new Staff}.
+Notez bien qu'il n'existe pas de commande @code{\new Score}, puisque le
+contexte premier que constitue @code{Score} est créé par @code{\score}. 
 
-@lilypond[quote,verbatim,relative=2,ragged-right,fragment]
-<<
-  \new Staff { c4 c }
-  \new Staff { d4 d }
->>
+Nous avons déjà vu au cours des chapitres précédents de nombreux
+exemples où des contextes @code{Staff} ou @code{Voice} étaient créés au
+besoin.  Dans un but didactique, voici maintenant une application
+complète et largement commentée : 
+
+@lilypond[quote,verbatim,ragged-right]
+\score {  % start of single compound music expression
+  <<  % start of simultaneous staves section
+    \time 2/4
+    \new Staff {  % create RH staff
+      \key g \minor
+      \clef "treble"
+      \new Voice {  % create voice for RH notes
+        \relative c'' {  % start of RH notes
+          d4 ees16 c8. |
+          d4 ees16 c8. |
+        }  % end of RH notes
+      }  % end of RH voice
+    }  % end of RH staff
+    \new Staff <<  % create LH staff; needs two simultaneous voices
+      \key g \minor
+      \clef "bass"
+      \new Voice {  % create LH voice one
+        \voiceOne
+        \relative g {  % start of LH voice one notes
+          g8 <bes d> ees, <g c> |
+          g8 <bes d> ees, <g c> |
+        }  % end of LH voice one notes
+      }  % end of LH voice one
+      \new Voice {  % create LH voice two
+        \voiceTwo
+        \relative g {  % start of LH voice two notes
+          g4 ees |
+          g4 ees |
+        }  % end of LH voice two notes
+      }  % end of LH voice two
+    >>  % end of LH staff
+  >>  % end of simultaneous staves section
+}  % end of single compound music expression
 @end lilypond
 
-La commande @code{\new} peut aussi permettre de nommer le contexte créé :
+Notez comment toute déclaration qui ouvre un bloc par une
+accolade, @code{@{}, ou un double signe inférieur, @code{<<}, est
+indentée de deux espaces supplémentaires, et de deux autres pour sa
+marque de fermeture.  Bien que ceci ne soit pas obligatoire, nous vous
+invitons à adopter cette pratique qui vous évitera nombre d'erreurs
+@qq{accolades non pairées}.  La structure de la musique apparaît ainsi
+au premier coup d'œil, et les défauts de parité plus facilement
+repérables.  Vous remarquerez que la portée MG est créée à l'aide d'un
+inférieur double -- nécessaire pour gérer ses deux voix -- alors que la
+portée MD ne contient qu'une seule expression musicale -- il n'y a
+qu'une voix -- bornée par des accolades simples.
+
+@cindex contexte, noms de
+@cindex nommage des contextes
+
+La commande @code{\new} peut aussi permettre de nommer le contexte créé,
+et ainsi le distinguer des autres contextes déjà existants :
 
 @example
-\new @var{Contexte} = @var{"inventezUnNom"} @var{musique}
+\new @var{type} = @var{"UnNom"} @var{expression-musicale}
 @end example
-Le nom que vous choisirez ne pourra être attribué que si aucun autre contexte
-n'a été créé précédemment avec le même nom.
 
+Vous noterez la distinction entre le nom du type de contexte,
+@code{Staff}, @code{Voice}, etc, et le nom -- une simple suite de
+lettres au bon gré de l'utilisateur -- permettant d'identifier une
+instance particulière du type en question.  Comme nous l'avons déjà vu
+dans le chapitre consacré aux paroles (@ref{Voices and vocals}),
+cet identifiant permettra ensuite de se référer à ce contexte particulier.
 
-@funindex \context
 
-@item
-Tout comme @code{\new}, la commande @code{\context} envoie une expression musicale
-vers un contexte donné, mais attribue nécessairement un nom à ce contexte.  La
-syntaxe est la suivante :
+@node Engravers explained
+@subsection Engravers explained
 
-@example
-\context @var{Contexte} = @var{unNom} @var{musique}
-@end example
+@cindex engravers
+@cindex graveurs
+
+Tout point qui compose une partition générée par LilyPond est
+produit par un graveur (@emph{Engraver} en anglais).   Ainsi, il y en a
+un qui imprime les portées, un autre les têtes de note, un autre les
+hampes, un autre encore pour les ligatures, etc.  LilyPond dispose de
+plus de 120 graveurs ! La plupart des partitions ne requièrent de
+s'intéresser qu'à quelques uns seulement, et pour des partitions
+simples, vous n'aurez même pas à vous en préoccuper.
+
+Les graveurs résident et opèrent au sein des contextes.
+Les graveurs tels que le @code{Metronome_mark_engraver}, dont les effets 
+s'appliquent à la partition dans son intégralité, opèrent au sein du
+contexte de plus haut niveau -- le contexte @code{Score}. 
+
+Les graveurs @code{Clef_engraver} et @code{Key_engraver} seront logés
+dans chacun des contextes @code{Staff} ; deux portées peuvent requérir
+des clefs et des armures différentes.
+
+Les graveurs @code{Note_heads_engraver} et @code{Stem_engraver} résident
+dans chacun des contextes @code{Voice}, contexte du plus bas niveau.
+
+Chaque graveur confectionne les objets spécifiquement associés à sa
+fonction et traite les propriétés attachées à cette fonction.  Ces
+propriétés, tout comme celles relatives aux contextes, peuvent être
+modifiées afin d'influencer le comportement du graveur et par voie de
+conséquence le rendu des éléments dont il a la charge.
+
+Les graveurs ont tous un nom composé, formé des différents mots
+décrivant leur fonction. Seule l'initiale du premier mot est en
+majuscule, et les mots qui le composent sont joints par un caractère
+souligné.  Ainsi, le @code{Staff_symbol_engraver} est chargé de créer
+les lignes de la portée, et le @code{Clef_engraver} détermine la hauteur
+de référence de la portée en dessinant le symbole de la clef.
+
+Voici quelques uns des graveurs les plus courants, ainsi que leur
+fonction.  Vous noterez qu'il est facile d'en connaître la fonction à
+partir du nom, et vice versa.
+
+@multitable @columnfractions .3 .7
+@headitem Graveur
+  @tab Fonction
+@item Accidental_engraver
+  @tab Crée les altérations, y compris de précaution, accidentelles ou suggérées
+@item Beam_engraver
+  @tab Grave les ligatures
+@item Clef_engraver
+  @tab Grave les clefs
+@item Completion_heads_engraver
+  @tab Divise les notes qui dépassent de la mesure
+@item Dynamic_engraver
+  @tab Crée les soufflets et textes de nuance
+@item Forbid_line_break_engraver
+  @tab Empêche un saut de ligne si un élément musiocal est toujours actif
+@item Key_engraver
+  @tab Crée l'armure
+@item Metronome_mark_engraver
+  @tab Grave les indications métronomiques
+@item Note_heads_engraver
+  @tab Grave les têtes de note
+@item Rest_engraver
+  @tab Grave les silences
+@item Staff_symbol_engraver
+  @tab Grave les cinq lignes (par défaut) de la portée
+@item Stem_engraver
+  @tab Crée les hampes et les trémolos sur une hampe unique
+@item Time_signature_engraver
+  @tab Crée les métriques
+@end multitable
+
+@smallspace
+
+Nous verrons plus avant comment le résultat de LilyPond peut changer
+lorsqu'on modifie l'action des graveurs.
+
+@seealso
+
+Références internes : @rinternals{Engravers and performers}.
 
-Cette commande va partir à la recherche d'un contexte déjà existant, de type
-@var{Contexte}, et portant le nom @var{unNom}.  Ce qui peut être fort utile 
-pour se référer à un contexte existant.  S'il s'avère que le contexte en question
-n'existe pas encore, il est créé.  Dans le cas de musique vocale avec des paroles,
-cela donne :
 
-@example
-\context Voice = "@b{tenor}" @var{musique}
-@end example
+@node Modifying context properties
+@subsection Modifying context properties
 
-@noindent
-et (pour que le texte soit aligné correctement avec les notes) :
+@cindex contexte, propriétés
+@cindex propriétés d'un contexte, modification
+@cindex modification des propriétés d'un contexte
+@funindex \set
+@funindex \unset
+
+Les contextes gèrent les différentes valeurs des nombreuses
+@emph{propriétés} qui leur sont attachées.  Beaucoup d'entre elles
+sont susceptibles d'être modifiées afin d'influer sur l'interprétation
+de l'input et ainsi changer l'apparence du résultat.  On les modifie 
+grace à la commande @code{\set}, qui s'utilise ainsi :
 
 @example
-\new Lyrics \lyricsto "@b{tenor}" @var{paroles}
+\set @emph{ContexteNommé}.@emph{propriétéNommée} = #@emph{valeur}
 @end example
 
-@noindent
+Où @emph{ContexteNommé} est habituellement @code{Score},
+@code{Staff} ou @code{Voice}.  S'il n'est pas mentionné, il sera
+considéré comme étant @code{Voice}.
+
+Les noms des propriétés de contexte sont composés de mots accolés sans
+trait d'union ni caractère souligné, et dont seul le premier n'aura pas
+d'initiale en majuscule.  Voici quelques exemples de celles les plus
+communément utilisées.
+
+@c attempt to force this onto a new page
+@need 50
+@multitable @columnfractions .25 .15 .45 .15
+@headitem propriétéNommée
+  @tab Type
+  @tab Fonction
+  @tab Exemple de valeur
+@item extraNatural
+  @tab Booléen
+  @tab Si vrai, ajoute un bécarre avant une altération accidentelle
+  @tab @code{#t}, @code{#f}
+@item currentBarNumber
+  @tab Entier
+  @tab Détermine le numéro de la mesure en cours
+  @tab @code{50}
+@item doubleSlurs
+  @tab Booléen
+  @tab Si vrai, imprime les liaisons au dessous et au dessus des notes
+  @tab @code{#t}, @code{#f}
+@item instrumentName
+  @tab Texte
+  @tab Détermine le nom à afficher en début de portée
+  @tab @code{"Cello I"}
+@item fontSize
+  @tab Réel
+  @tab Augmente ou diminue la taille de la fonte
+  @tab @code{2.4}
+@item stanza
+  @tab Texte
+  @tab Détermine le texte à imprimer avant le début d'un couplet
+  @tab @code{"2"}
+@end multitable
 
-Une autre utilité de dénommer les contextes est de superposer en un même
-contexte différentes expressions musicales.  Dans l'exemple suivant, les
-notes et les ponctuations ont été saisies séparément :
+@noindent
+où un boléen correspond soit à vrai (@code{#t} pour @emph{True} en
+anglais) ou faux (@code{#f} pour @emph{False} en anglais), un entier est
+un nombre entier positif, un réel est en nombre décimal positif ou
+négatif, et texte correspond à une suite de caractères encadrée par des
+apostrophes doubles.  Attention à la présence des dièses (@code{#}) dans
+deux cas particuliers : il sont partie intégrante des valeurs boléennes
+et précèdent les @code{t} ou @code{f}, mais doivent aussi précéder
+@emph{valeur} dans le libellé de la commande @code{\set}. Il faudra
+donc, dans le cas d'une valeur boléenne, ne pas oublier de saisir un
+double dièse -- par exemple @code{##t}.
+
+Avant de déterminer l'une de ces propriétés, nous devons savoir dans
+quel contexte elles interviennent.  Si cela est bien souvent évident, il
+peut arriver que cela tourne au cauchemar.  Lorsque vous ne spécifiez
+pas le bon contexte, aucun message d'erreur ne s'affiche et l'effet
+attendu n'est pas au rendez-vous.  Par exemple, le @code{instrumentName}
+est de manière incontestable membre du contexte @code{Staff}, puisque
+c'est bien la portée que l'on va nommer.
+Dans l'exemple suivant, la première portée affiche effectivement un nom,
+alors que ce n'est pas le cas pour la deuxième dans la mesure où le
+contexte n'a pas été spécifié.
 
-@example
-musique = @{ c4 c4 @}
-ponctuation = @{ s4-. s4-> @}
-@end example
+@lilypond[quote,verbatim,ragged-right]
+<<
+  \new Staff \relative c'' {
+    \set Staff.instrumentName = #"Soprano"
+    c4 c
+ }
+  \new Staff \relative c' {
+  \set instrumentName = #"Alto"  % Wrong!
+  d4 d
+ }
+>>
+@end lilypond
 
-En les envoyant toutes deux dans le même contexte @code{Voice}, on les combine :
+Dans la mesure où le nom de contexte par défaut est @code{Voice}, la
+deuxième commande @code{\set} a défini @qq{Alto} comme propriété
+@code{instrumentName} du contexte de voix.  Puisque LilyPond n'ira pas
+chercher une telle propriété dans la contexte @code{Voice}, celle-ci ne
+sera pas interpétée.  Il ne s'agit pas d'une erreur, aucun message
+d'erreur ne sera ni émis ni enregistré. 
+
+De la même manière, une faute d'orthographe dans le nom de la propriété
+ne génèrera aucun message d'erreur et l'action escomptée ne se produira
+pas.  Vous pourriez déterminer par la commande @code{\set} n'importe
+quelle @q{propriété}, même fictive, à partir de n'importe quel nom et
+dans n'importe lequel des contextes disponibles.  Mais tant que ce nom
+est inconnu de LilyPond, rien ne se passera.  Certains éditeurs de texte
+disposent d'une prise en charge spécifique aux fichiers source LilyPond,
+à l'instar de LilyPondTool couplé à JEdit et qui documente les noms des
+pripriétés dans une infobulle lorsque vous les survolez à la souris, ou 
+les souligne différemment s'ils sont inconnus, comme ConTEXT.  Dans le
+cas où votre éditeur ne dispose pas de ces fonctionnalités, nous vous
+recommandons de vérifier le nom des propriétés que vous manipulez dans
+le Manuel de références internes -- voir 
+@rinternals{Tunable context properties}, ou @rinternals{Contexts}.
+
+La propriété @code{instrumentName} ne sera prise en compte que si elle
+est définie dans un contexte @code{Staff} ; d'autres propriétés peuvent
+par contre être définies dans plusieurs contextes différents.  C'est le
+cas de la propriété @code{extraNatural} qui est définie par défaut à ##t 
+(vrai) pour toutes les portées.  Si vous lui attribuez la valeur ##f
+(faux) dans un contexte @code{Staff} particulier, elle ne s'appliquera
+qu'aux altérations de la portée en question ; si vous lui attribuez la
+valeur @q{faux} au niveau du contexte @code{Score}, cela s'appliquera
+alors à toutes les portées.
+
+Voici comment supprimer les bécarres supplémentaires pour une portée :
 
-@example
+@lilypond[quote,verbatim,ragged-right]
 <<
-  \new Staff \context Voice = "A" \musique
-  \context Voice = "A" \ponctuation
+  \new Staff \relative c'' {
+    ais4 aes
+ }
+  \new Staff \relative c'' {
+    \set Staff.extraNatural = ##f
+    ais4 aes
+ }
 >>
-@end example
-@lilypond[quote,ragged-right]
-music = { c4 c4 }
-arts = { s4-. s4-> }
-\relative c'' <<
-  \new Staff \context Voice = "A" \music
-  \context Voice = "A" \arts
+@end lilypond
+
+@noindent
+et pour toutes les portées :
+
+@lilypond[quote,verbatim,ragged-right]
+<<
+  \new Staff \relative c'' {
+    ais4 aes
+ }
+  \new Staff \relative c'' {
+    \set Score.extraNatural = ##f
+    ais4 aes
+ }
 >>
 @end lilypond
 
-De cette façon, il est possible d'élaborer une édition Urtext (c'est-à-dire originale,
-la plupart du temps sans ponctuations), en laissant la possibilité d'ajouter différentes
-ponctuations sur les mêmes notes.
+Autre exemple, si la propriété @code{clefOctavation} est déterminée au
+niveau du contexte @code{Score}, elle modifiera la valeur de l'octave en
+cours pour toutes les portées actives ; cette valeur sera considérée
+comme étant la nouvelle valeur par défaut pour toutes les portées à
+venir.
+
+La commande opposée, @code{\unset}, efface la propriété du contexte ; la
+plupart des propriétés reviennent de ce fait à leur valeur par défaut.
+En règle générale, la commande @code{\unset} n'est pas nécessaire dès
+lors que vous faites appel à une nouvelle commande @code{\set} pour
+modifier le réglage.
+
+Les commandes @code{\set} et @code{\unset} peuvent intervenir n'importe
+où dans votre fichier source.  Elles seront effectives dès leur
+apparition et jusqu'à la fin de la partition, à moins d'être affectée
+par un @code{\unset} ou un nouveau @code{\set}.  À titre d'exemple, nous
+allons modifier jouer avec la taille des fontes, ce qui affecte entre
+autres la grosseur des tes de note.  Les modifications s'appliquent
+toujours par rapport à la valeur par défaut, non par rapport à la
+dernière valeur.
+
+@lilypond[quote,verbatim,ragged-right,relative=1,fragment]
+c4
+% make note heads smaller
+\set fontSize = #-4
+d e
+% make note heads larger
+\set fontSize = #2.5
+f g
+% return to default size
+\unset fontSize
+a b
+@end lilypond
+
+Nous venons de voir comment déterminer la valeur de différents types de
+propriétés.  N'oubliez pas que les nombres, entiers ou réels, doivent
+être précédés d'un dièse (@code{#}) et les valeurs vrai ou faux de deux
+dièses -- respectivement ##t et ##f --. Une valeur textuelle doit être
+encadrée de guillemets anglais, @code{``@dots{ }''}, bien que, comme
+nous le constaterons plus tard, la commande @code{\markup} permet aussi
+de spécifier du texte.
+
+@unnumberedsubsubsec Setting context properties with @code{\with}
 
-@cindex crééer des contextes
+@funindex \with
+@cindex propriétés d'un contexte, définition avec \with
+
+Les propriétés d'un contexte peuvent aussi être réglées lors de la
+création de ce contexte.  Ceci constitue parfois une façon plus claire
+de spécifier les valeurs d'une propriété pour la durée de vie du
+contexte.  Lorsque vous créez un contexte à l'aide de la commande
+@code{\new}, vous pouvez la faire suivre immédiatement d'un bloc
+@code{\with @{ .. @}} qui contiendra les réglages des différentes
+propriétés.  Ainsi, si nous voulons par exemple annuler l'impression des
+bécarres supplémentaires sur la durée d'une portée, nous écririons :
 
-@item
-La dernière commande pour créer des contextes est
 @example
-\context @var{Contexte} @var{musique}
+\new Staff \with @{ extraNatural = ##f @}
 @end example
 
+@noindent
+ce qui donnerait :
+
+@lilypond[quote,verbatim,ragged-right]
+<<
+  \new Staff
+  \relative c'' {
+    gis ges aes ais
+  }
+  \new Staff \with { extraNatural = ##f }
+  \relative c'' {
+    gis ges aes ais
+  }
+>>
+@end lilypond
+
+Les propriétés réglées de cette manière peuvent néanmoins être modifiées
+de façon dynamique grace à @code{\set} ; un @code{\unset} les ramènera à
+leur valeur par défaut.
+
+La propriété @code{fontSize} constitue une exception : lorsqu'elle est
+déterminée au sein d'un bloc @code{\with}, cela redéfinit la valeur par
+défaut de la taille de fonte.  Une modification est possible par la
+commande @code{\set}, mais la commande @code{\unset fontSize} fera
+revenir à la nouvelle valeur par défaut.
+
+@unnumberedsubsubsec Setting context properties with @code{\context}
+
+Vous pouvez régler les valeurs des propriétés de contexte en une seule
+fois pour tous les contextes d'un même type, par exemple tous les
+contextes @code{Staff}.  Le type du contexte doit être donné
+explicitement d'après son nom, par exemple @code{Staff}, prédédé d'une
+oblique inverse, donc nous saisirons @code{\Staff}.  La manière de
+régler la valeur des propriétés est la même que ce que nous avons vu
+avec la commande @code{\with}, puisqu'on se place dans un bloc
+@code{\context} inclus dans un bloc @code{\layout}.  Chaque bloc
+@code{\context} affectera tous les contextes concernés par le bloc
+@code{\score} ou @code{\book} au sein duquel apparaît ce bloc
+@code{\layout}.  Voici comment le mettre en place :
+
+@lilypond[verbatim,quote]
+\score {
+  \new Staff {
+    \relative c'' {
+      cis4 e d ces
+    }
+  }
+  \layout {
+    \context {
+      \Staff
+      extraNatural = ##t
+    }
+  }
+}
+@end lilypond
 
 @noindent
-Elle ressemble à l'emploi de @code{\context} avec @code{= @var{unNom}}, mais
-cette fois elle se considèrera chez elle partout où elle trouvera un contexte
-de type @var{Contexte}, quel que puisse être son nom.
+Les propriétés de contextes ainsi définies peuvent être adaptées pour
+chacun des contextes en particulier grace à un bloc @code{\with} ou bien
+une commande @code{\set} au fil des notes.
 
-@c Au secours ! --vv
+@seealso
 
-Cette variante sert à des expressions musicales qui peuvent être interprétées à
-plusieurs niveaux.  Par exemple, une commande telle que @code{\applyOutput} (voir
-@c FIXME: broken link
-@c @ruser{Running a function on all layout objects}) : si elle n'est pas associée avec
-@code{\context}, elle s'applique par défaut dans le contexte @code{Voice}.
+Manuel de notation : @ruser{Changing context default settings},
+@ruser{The set command}.
 
-@example
-\applyOutput #'@var{Contexte} #@var{fonction}   % s'applique dans le contexte Voice
-@end example
+Références internes : @rinternals{Contexts},
+@rinternals{Tunable context properties}.
+
+@node Adding and removing engravers
+@subsection Adding and removing engravers
 
-Pour l'appliquer au contexte @code{Score} ou @code{Staff}, il faut utiliser :
+@cindex graveurs, ajout
+@cindex graveurs, suppression
 
-@example
-\applyOutput #'Score #@var{fonction}
-\applyOutput #'Staff #@var{fonction}
-@end example
+@funindex \consists
+@funindex \remove
 
-@end itemize
+Nous avons vu que chacun des différents contextes contient plusieurs 
+graveurs, et que chacun de ces graveurs est chargé de générer une
+part spécifique du résultat, qui les barres de mesure, qui la portée,
+qui les têtes de note, les hampes, etc.  Le fait de suprimer un graveur
+d'un contexte éliminera sa contribution à l'œuvre résultante.  Bien que
+ce soit là un moyen radical de modifier le résultat, cette pratique est
+dans quelques cas fort utile.
 
+@subsubheading Changing a single context
 
-@node Engravers explained
-@subsection Engravers explained
+Nous utilisons, pour supprimer un graveur d'un contexte, la commande
+@code{\with} dès la création dudit contexte, comme nous l'avons vu dans
+la section précédente.
 
-@untranslated
+Illustrons notre propose en reprenant un exemple du chapitre précédant,
+puor lui suprimer les lignes de la portée.  Pour mémoire, les lignes
+d'une portée sont générées par le Staff_symbol_engraver.
 
-@node Modifying context properties
-@subsection Modifying context properties
+@lilypond[quote,verbatim,ragged-right]
+\new Staff \with {
+  \remove Staff_symbol_engraver
+}
+\relative c' {
+  c4
+  \set fontSize = #-4  % make note heads smaller
+  d e
+  \set fontSize = #2.5  % make note heads larger
+  f g
+  \unset fontSize  % return to default size
+  a b
+}
+@end lilypond
 
-@untranslated
+@cindex ambitus, graveur
 
-@node Adding and removing engravers
-@subsection Adding and removing engravers
+Vous pouvez aussi ajouter individuellement un graveur à un contexte. La
+commande se formule ainsi :
+
+@code{\consists @emph{Nom_du_graveur}}
+
+et se place dans un bloc @code{\with}.  Certianes partitions vocales
+font apparaître un @rglos{ambitus} au début de la portée, afin
+d'indiquer ses notes extrèmes.  L'ambitus est généré par
+l'@code{Ambitus_engraver}, que l'on peut adjoindre à n'importe quel
+contexte.  Si nous l'ajoutons au contexte @code{Voice}, seule la
+tessiture de cette voix sera calculée :
+
+@lilypond[quote,verbatim,ragged-right]
+\new Staff <<
+  \new Voice \with {
+    \consists Ambitus_engraver
+  }
+  \relative c'' {
+    \voiceOne
+    c a b g
+  }
+  \new Voice
+  \relative c' {
+    \voiceTwo
+    c e d f
+  }
+>>
+@end lilypond
+
+@noindent
+alors que si nous l'ajoutons au contexte @code{Staff},
+l'@code{Ambitus_engraver} calculera l'écart maximal à partir de toutes
+les notes de toutes les voix de la portée :
+
+@lilypond[quote,verbatim,ragged-right]
+\new Staff \with {
+    \consists Ambitus_engraver
+  }
+  <<
+  \new Voice
+  \relative c'' {
+    \voiceOne
+    c a b g
+  }
+  \new Voice
+  \relative c' {
+    \voiceTwo
+    c e d f
+  }
+>>
+@end lilypond
+
+@subsubheading Changing all contexts of the same type
+
+@funindex \layout
+
+Les exemples ci-dessus nous ont montré comment ajouter ou retirer des
+graveurs à des contextes individuels.  Nous pourrions aussi ajouter ou
+suprimer des graveurs à tous les contextes d'un même type en insérant
+les commandes pour le contexte approprié, au sein d'un bloc
+@code{\layout}.  Si nous voulions afficher un ambitus pour chacune des
+portées d'un système à quatre portées, il nous suffirait d'écrire :
+
+@lilypond[quote,verbatim,ragged-right]
+\score {
+  <<
+    \new Staff <<
+      \relative c'' { c a b g }
+    >>
+    \new Staff <<
+      \relative c' { c a b g }
+    >>
+    \new Staff <<
+      \clef "G_8"
+      \relative c' { c a b g }
+    >>
+    \new Staff <<
+      \clef "bass"
+      \relative c { c a b g }
+    >>
+  >>
+  \layout {
+    \context {
+      \Staff
+      \consists Ambitus_engraver
+    }
+  }
+}
+@end lilypond
 
-@untranslated
+@noindent
+Vous réglerez de la même manière les propriétés de tous les contextes
+d'un type particulier si vous insérez les commandes @code{\set} dans un
+bloc @code{\context}.
+
+@seealso
+
+Manuel de notation : @ruser{Modifying context plug-ins}, 
+@ruser{Changing context default settings}.
 
 
 @node Extending the templates
@@ -692,14 +2211,16 @@ Les exemples qui suivent vous donneront des méthodes générales pour
 adapter des modèles.
 
 @menu
-* Soprano and cello::
-* Four-part SATB vocal score::
-* Building a score from scratch::
+* Soprano and cello::           
+* Four-part SATB vocal score::  
+* Building a score from scratch::  
 @end menu
 
 @node Soprano and cello
 @subsection Soprano and cello
 
+@cindex modèles, modification des
+
 Commencez par le modèle qui vous semblera le plus proche de ce à quoi
 vous voulez aboutir.  Disons par exemple que vous voulez écrire une pièce
 pour soprano et violoncelle : dans ce cas l'on pourrait commencer par les
@@ -716,16 +2237,16 @@ melodie = \relative c' @{
 @}
 
 texte = \lyricmode @{
-  Laaa Siii Dooo Rééé
+  Aaa Bee Cee Dee
 @}
 
 \score@{
   <<
-    \new Voice = "voixUn" @{
+    \new Voice = "un" @{
       \autoBeamOff
       \melodie
     @}
-    \new Lyrics \lyricsto "voixUn" \texte
+    \new Lyrics \lyricsto "un" \texte
   >>
   \layout @{ @}
   \midi @{ @}
@@ -752,7 +2273,6 @@ melodie = \relative c' @{
 @}
 @end example
 
-
 On n'a pas besoin de deux commandes @code{\version}.  Ce dont on a besoin,
 c'est la section @code{melodie}. De même, on n'a pas besoin de deux sections
 @code{\score} --- si nous les gardions toutes les deux, on obtiendrait deux
@@ -762,11 +2282,11 @@ non plus de deux @code{\layout} ni de deux @code{\midi}.
 
 Si on se contente de couper et coller les sections @code{melodie}, on se
 retrouvera avec deux sections de ce nom ; il nous faut donc les renommer.
-Appelons la section pour la soprano @code{musiqueSoprano} et celle pour le
-violoncelle @code{musiqueVioloncelle}.  Tant qu'on y est, renommons 
-@code{texte} en @code{parolesSoprano}.  Attention à bien renommer les
+Appelons la section pour la soprano @code{sopranoMusique} et celle pour le
+violoncelle @code{violoncelleMusique}.  Tant qu'on y est, renommons 
+@code{texte} en @code{sopranoParoles}.  Attention à bien renommer les
 deux occurrences de chacune de ces dénominations : c'est-à-dire la
-définition de départ, où l'on trouve @code{mélodie = relative c' @{ },
+définition de départ, où l'on trouve @code{melodie = relative c' @{ },
 et l'endroit où cette dénomination est utilisée, dans la section 
 @code{\score}.
 
@@ -775,7 +2295,7 @@ le veut l'usage, et donnons-lui d'autres notes.
 
 @example
 \version @w{"@version{}"}
-musiqueSoprano = \relative c' @{
+sopranoMusique = \relative c' @{
   \clef treble
   \key c \major
   \time 4/4
@@ -783,11 +2303,11 @@ musiqueSoprano = \relative c' @{
   a4 b c d
 @}
 
-parolesSoprano = \lyricmode @{
+sopranoParoles = \lyricmode @{
   Laaa Siii Dooo Rééé
 @}
 
-musiqueVioloncelle = \relative c @{
+violoncelleMusique = \relative c @{
   \clef bass
   \key c \major
   \time 4/4
@@ -797,11 +2317,11 @@ musiqueVioloncelle = \relative c @{
 
 \score@{
   <<
-    \new Voice = "voixUn" @{
+    \new Voice = "un" @{
       \autoBeamOff
-      \musiqueSoprano
+      \sopranoMusique
     @}
-    \new Lyrics \lyricsto "voixUn" \parolesSoprano
+    \new Lyrics \lyricsto "un" \sopranoParoles
   >>
   \layout @{ @}
   \midi @{ @}
@@ -823,17 +2343,18 @@ encadrer la musique par des @code{<<} et @code{>>}, qui feront comprendre
 à LilyPond que plusieurs évènements --- ici, des objets @code{Staff} ---
 se déroulent en même temps.  Le bloc @code{\score} ressemble maintenant à
 
+@c Indentation in this example is deliberately poor
 @example
-\score@{
+\score @{
   <<
-    <<
-      \new Voice = "voixUn" @{
-        \autoBeamOff
-        \musiqueSoprano
-      @}
-      \new Lyrics \lyricsto "voixUn" \parolesSoprano
-    >>
-    \new Staff \musiqueVioloncelle
+  <<
+    \new Voice = "un" @{
+      \autoBeamOff
+      \sopranoMusique
+    @}
+    \new Lyrics \lyricsto "un" \sopranoParoles
+  >>
+  \new Staff \violoncelleMusique
   >>
   \layout @{ @}
   \midi @{ @}
@@ -882,14 +2403,451 @@ celloMusic = \relative c {
 }
 @end lilypond
 
+@seealso
+
+Les patrons originaux sont disponibles à l'annexe @qq{Modèles}, voir
+@ref{Single staff}. 
+
 
 @node Four-part SATB vocal score
 @subsection Four-part SATB vocal score
 
-@untranslated
+@cindex exemple, SATB
+@cindex SATB, squelette
+
+La plupart des œuvres écrites pour chœur à quatre voix mixtes et
+orchestre, comme Elias de Mendelssohn ou le Messie de Haendel, disposent
+la musique et les paroles du chœur sur quatre portées -- soprano, alto,
+ténor et basse -- surmontant une réduction pour piano de
+l'accompagnement orchestral.  En voici un exemple, tiré du Messie de
+Haendel :
+
+@c The following should appear as music without code
+@lilypond[quote,ragged-right]
+global = { \key d \major \time 4/4 }
+sopranoMusic = \relative c'' {
+  \clef "treble"
+  r4 d2 a4 | d4. d8 a2 | cis4 d cis2 |
+}
+sopranoWords = \lyricmode {
+  Wor -- thy is the lamb that was slain
+}
+altoMusic = \relative a' {
+  \clef "treble"
+  r4 a2 a4 | fis4. fis8 a2 | g4 fis e2 |
+}
+altoWords = \sopranoWords
+tenorMusic = \relative c' {
+  \clef "G_8"
+  r4 fis2 e4 | d4. d8 d2 | e4 a, cis2 |
+}
+tenorWords = \sopranoWords
+bassMusic = \relative c' {
+  \clef "bass"
+  r4 d2 cis4 | b4. b8 fis2 | e4 d a'2 |
+}
+bassWords = \sopranoWords
+upper = \relative a' {
+  \clef "treble"
+  \global
+  r4 <a d fis>2 <a e' a>4 |
+  <d fis d'>4. <d fis d'>8 <a d a'>2 |
+  <g cis g'>4 <a d fis> <a cis e>2 |
+}
+lower = \relative c, {
+  \clef "bass"
+  \global
+  <d d'>4 <d d'>2 <cis cis'>4 |
+  <b b'>4. <b' b'>8 <fis fis'>2 |
+  <e e'>4 <d d'> <a' a'>2 |
+}
+
+\score {
+  <<  % combine ChoirStaff and PianoStaff in parallel
+    \new ChoirStaff <<
+      \new Staff = "sopranos" <<
+        \set Staff.instrumentName = "Soprano"
+        \new Voice = "sopranos" { \global \sopranoMusic }
+      >>
+      \new Lyrics \lyricsto "sopranos" { \sopranoWords }
+      \new Staff = "altos" <<
+        \set Staff.instrumentName = "Alto"
+        \new Voice = "altos" { \global \altoMusic }
+      >>
+      \new Lyrics \lyricsto "altos" { \altoWords }
+      \new Staff = "tenors" <<
+        \set Staff.instrumentName = "Tenor"
+        \new Voice = "tenors" { \global \tenorMusic }
+      >>
+      \new Lyrics \lyricsto "tenors" { \tenorWords }
+      \new Staff = "basses" <<
+        \set Staff.instrumentName = "Bass"
+        \new Voice = "basses" { \global \bassMusic }
+      >>
+      \new Lyrics \lyricsto "basses" { \bassWords }
+    >>  % end ChoirStaff
+
+    \new PianoStaff <<
+      \set PianoStaff.instrumentName = "Piano"
+      \new Staff = "upper" \upper
+      \new Staff = "lower" \lower
+    >>
+  >>
+}
+@end lilypond
+
+Aucun des modèles ne permet d'arriver exactement à cette mise en forme.
+Celui qui s'en rapprocherait le plus est @q{SATB vocal score and
+automatic piano reduction} -- voir @ref{Vocal ensembles} -- mais encore
+faudrait-t-il en modifier la mise en forme et refaire la partie de
+piano qui n'est plus une simple reprise des parties vocales.  Les
+variables qui gèrent la musique et les paroles du chœur ne nécessitent
+pas de modification, mais il nous faut d'autres variables pour la
+réduction de piano.
+
+L'ordre dans lequel apparaissent les contextes dans le @code{ChoirStaff}
+du modèle ne correspond pas à ce que nous voyons ci-dessus.  Il nous
+faudra y revenir pour obtenir quatre portées avec des paroles en dessous
+de chacune d'elles.  Toutes les voix devraient être @code{\voiceOne},
+ce qui est la postition par défaut ; il nous faudra donc éliminer toutes
+les commandes @code{\voiceXXX}.  Les ténors auront besoin d'une clé
+spécifique.  Enfin, nous n'avons pas encore abordé la façon dont les
+paroles sont présentées dans le modèle ; nous procèderons donc comme
+nous en avons l'habitude.  Il faudra aussi ajouter un nom à chaque portée.
+
+Une fois tout ceci accompli, voici notre @code{ChoirStaff} :
+
+@example
+    \new ChoirStaff <<
+      \new Staff = "sopranos" <<
+        \set Staff.instrumentName = "Soprano"
+        \new Voice = "sopranos" @{ \global \sopranoMusique @}
+      >>
+      \new Lyrics \lyricsto "sopranos" @{ \sopranoParoless @}
+      \new Staff = "altos" <<
+        \set Staff.instrumentName = "Alto"
+        \new Voice = "altos" @{ \global \altoMusique @}
+      >>
+      \new Lyrics \lyricsto "altos" @{ \altoParoles @}
+      \new Staff = "tenors" <<
+        \set Staff.instrumentName = "Tenor"
+        \new Voice = "tenors" @{ \global \tenorMusique @}
+      >>
+      \new Lyrics \lyricsto "tenors" @{ \tenorParoless @}
+      \new Staff = "basses" <<
+        \set Staff.instrumentName = "Bass"
+        \new Voice = "basses" @{ \global \basseMusique @}
+      >>
+      \new Lyrics \lyricsto "basses" @{ \basseParoles @}
+    >>  % fin du ChoirStaff
+@end example
+
+Il nous faut maintenant nous occuper de la partie de piano.  Nous allons
+nous contenter de simplement récupérer la partie de piano du modèle
+@q{Solo piano} :
+
+@example
+\new PianoStaff <<
+  \set PianoStaff.instrumentName = "Piano  "
+  \new Staff = "upper" \superieur
+  \new Staff = "lower" \inferieur
+>>
+@end example
+
+puis d'ajouter les définitions de variable pour @code{supérieur} et
+@code{inferieur}. 
+
+Les systèmes pour chœur et pour piano doivent être combinés à l'aide de
+doubles inférieur/supérieur puisqu'ils doivent s'empiler :
+
+@example
+<<  % combine ChoirStaff and PianoStaff one above the other
+  \new ChoirStaff <<
+    \new Staff = "sopranos" <<
+      \new Voice = "sopranos" @{ \global \sopranoMusique @}
+    >>
+    \new Lyrics \lyricsto "sopranos" @{ \sopranoParoless @}
+    \new Staff = "altos" <<
+      \new Voice = "altos" @{ \global \altoMusique @}
+    >>
+    \new Lyrics \lyricsto "altos" @{ \altoParoles @}
+    \new Staff = "tenors" <<
+      \clef "G_8"  % tenor clef
+      \new Voice = "tenors" @{ \global \tenorMusique @}
+    >>
+    \new Lyrics \lyricsto "tenors" @{ \tenorParoles @}
+    \new Staff = "basses" <<
+      \clef "bass"
+      \new Voice = "basses" @{ \global \bassesMusique @}
+    >>
+    \new Lyrics \lyricsto "basses" @{ \bassesParoles @}
+  >>  % end ChoirStaff
+
+  \new PianoStaff <<
+    \set PianoStaff.instrumentName = "Piano"
+    \new Staff = "upper" \superieur
+    \new Staff = "lower" \inferieur
+  >>
+>>
+@end example
+
+Une fois tout cela mis en place, et après avoir ajouté les notes et les
+paroles de ces trois mesures du Messie, nous obtenon :
+
+@lilypond[quote,verbatim,ragged-right,addversion]
+global = { \key d \major \time 4/4 }
+sopranoMusic = \relative c'' {
+  \clef "treble"
+  r4 d2 a4 | d4. d8 a2 | cis4 d cis2 |
+}
+sopranoWords = \lyricmode {
+  Wor -- thy is the lamb that was slain
+}
+altoMusic = \relative a' {
+  \clef "treble"
+  r4 a2 a4 | fis4. fis8 a2 | g4 fis fis2 |
+}
+altoWords = \sopranoWords
+tenorMusic = \relative c' {
+  \clef "G_8"
+  r4 fis2 e4 | d4. d8 d2 | e4 a, cis2 |
+}
+tenorWords = \sopranoWords
+bassMusic = \relative c' {
+  \clef "bass"
+  r4 d2 cis4 | b4. b8 fis2 | e4 d a'2 |
+}
+bassWords = \sopranoWords
+upper = \relative a' {
+  \clef "treble"
+  \global
+  r4 <a d fis>2 <a e' a>4 |
+  <d fis d'>4. <d fis d'>8 <a d a'>2 |
+  <g cis g'>4 <a d fis> <a cis e>2 |
+}
+lower = \relative c, {
+  \clef "bass"
+  \global
+  <d d'>4 <d d'>2 <cis cis'>4 |
+  <b b'>4. <b' b'>8 <fis fis'>2 |
+  <e e'>4 <d d'> <a' a'>2 |
+}
+
+\score {
+  <<  % combine ChoirStaff and PianoStaff in parallel
+    \new ChoirStaff <<
+      \new Staff = "sopranos" <<
+        \set Staff.instrumentName = "Soprano"
+        \new Voice = "sopranos" { \global \sopranoMusic }
+      >>
+      \new Lyrics \lyricsto "sopranos" { \sopranoWords }
+      \new Staff = "altos" <<
+        \set Staff.instrumentName = "Alto"
+        \new Voice = "altos" { \global \altoMusic }
+      >>
+      \new Lyrics \lyricsto "altos" { \altoWords }
+      \new Staff = "tenors" <<
+        \set Staff.instrumentName = "Tenor"
+        \new Voice = "tenors" { \global \tenorMusic }
+      >>
+      \new Lyrics \lyricsto "tenors" { \tenorWords }
+      \new Staff = "basses" <<
+        \set Staff.instrumentName = "Bass"
+        \new Voice = "basses" { \global \bassMusic }
+      >>
+      \new Lyrics \lyricsto "basses" { \bassWords }
+    >>  % end ChoirStaff
+
+    \new PianoStaff <<
+      \set PianoStaff.instrumentName = "Piano  "
+      \new Staff = "upper" \upper
+      \new Staff = "lower" \lower
+    >>
+  >>
+}
+@end lilypond
+
 
 @node Building a score from scratch
 @subsection Building a score from scratch
 
-@untranslated
+@cindex modèles, création
+
+Après avoir acquis une certaine dextérité dans l'écriture de code
+LilyPond, vous devez vous sentir suffisament pret à vous lancer dans
+la création d'une partition à partir de zéro, autrement dit en ne
+partant pas d'un exemple.  Vous pourrez ainsi vous construire vos
+propres patrons selon le type de musique que vous affectionnez plus
+particulièrement.  Pour voir comment procéder, nous allons monter la
+partition d'un prélude pour orgue.
+
+Nous débutons par une section d'en-tête ; nous y mettrons entre autres
+le titre et le nom du compositeur.  Puis viennent toutes les définitions
+de toutes les variables. Nous treminons par le bloc @code{\score}.
+Attelons-nous pour cette aventure, en gardant bien à l'esprit ce que
+nous venons de dire ; nous nous occuperons des détails en temps voulu.
+
+Nous nous appuyons sur les deux premières mesures du prélude sur
+@emph{Jesu, meine Freude}, écrit pour orgue avec pédalier.  Vous pouvez
+voir ces deux mesures au bas de cette page.  La main droite comporte
+deux voix, la main gauche et le pédalier une seule.  Il nous faut donc
+quatre définitions de musique, plus une qui contiendra la métrique et
+l'armure :
+
+@example
+\version @w{"@version{}"}
+\header @{
+  title = "Jesu, meine Freude"
+  composer = "J S Bach"
+@}
+MetriqueArmure = @{ \time 4/4 \key c \minor @}
+ManuelUnVoixUnMusique = @{s1@}
+ManuelUnVoixDeuxMusique = @{s1@}
+ManuelDeuxMusique = @{s1@}
+PedalierOrgueMusique = @{s1@}
+
+\score @{
+@}
+@end example
+
+Pour l'instant, nous utilisons des silences invisibles, @code{s1}, en
+lieu et place des notes réelles.  On verra plus tard.
+
+Passons maintenant au bloc @code{\score} et à ce qu'il devrait contenir.
+Nous y recopions simplement la structure des portées que nous voulons.
+La musique pour orgue se présente généralement sous la forme de trois
+portées, une pour chaque main et une pour le pédalier.  Les portées du
+manuel sont regroupées, nous utiliserons donc un @code{PianoStaff}.  La
+première partie du manuel requiert deux voix et la seconde une seule.
+
+@example
+  \new PianoStaff <<
+    \new Staff = "ManualOne" <<
+      \new Voice @{ \ManuelUnVoixUnMusique @}
+      \new Voice @{ \ManuelUnVoixDeuxMusique @}
+    >>  % fin du contexte de portée ManuelUn
+    \new Staff = "ManualTwo" <<
+      \new Voice @{ \ManuelDeuxMusique @}
+    >>  % fin du contexte de portée ManuelDeux 
+  >>  % fin du contexte PianoStaff 
+@end example
+
+Il nous faut ajouter à cela une portée pour le pédalier.  Elle se place
+sous le système de piano, mais puisqu'elle doît rester synchrone avec
+lui, nous utilisons un double inférieur/supérieur pour les regrouper.
+Négliger ceci nous renverrait une erreur, et personne n'est à l'abri de
+cette faute ! Pour preuve, il vous suffit de copier l'exemple complet en
+fin de chapitre, de supprimer ces @code{<<} et @code{>>}, et de le
+compiler, pour savoir de quoi il retourne.
+
+@example
+<<  % Système pianistique et portée de pédalier sont synchrones 
+  \new PianoStaff <<
+    \new Staff = "ManualOne" <<
+      \new Voice @{ \ManuelUnVoixUnMusique @}
+      \new Voice @{ \ManuelUnVoixDeuxMusique @}
+    >>  % fin du contexte de portée ManuelUn
+    \new Staff = "ManualTwo" <<
+      \new Voice @{ \ManuelDeuxMusique @}
+    >>  % fin du contexte de portée ManuelDeux 
+  >>  % fin du contexte PianoStaff 
+  \new Staff = "PedalOrgan" <<
+    \new Voice @{ \PedalierOrgueMusique @}
+  >>
+>>
+@end example
+
+La construction en simultané -- @code{<< .. >>} -- n'est pas strictement
+obligatoire pour les portées manuel deux et pédalier, qui ne contiennent
+chacune qu'une seule expression musicale ; mais cela ne mange pas de
+pain, et c'est une bonne habitude que de toujours encadrer par un double
+inférieur/supérieur ce qui suit une sommande @code{\new Staff} au cas où
+il y aurait plusieurs voix.  Il en va autrement pour les contextes
+@code{Voice} : ils doivent être toujours suivis d'accolades -- 
+@code{@{ .. @}} --  au cas où vous avez employé plusieurs variables qui
+doivent intervenir consécutivement.
+
+Ajoutons donc cette structure au bloc @code{\score}, tout en fignolant
+l'indentation.  Nous en profitons pour ajouter les clés appropriées,
+effectuer les réglages concernant les hampes et liaisons de la portée
+supérieure grace à @code{\voiceOne} et @code{\voiceTwo}, et mettre en
+place la métrique et l'armure de chaque portée grace à notre variable
+@code{\MetriqueArmure}. 
+
+@example
+\score @{
+  <<  % Système pianistique et portée de pédalier sont synchrones 
+    \new PianoStaff <<
+      \new Staff = "ManualOne" <<
+        \TimeKey  % définition de la métrique et de l'armure
+        \clef "treble"
+        \new Voice @{ \voiceOne \ManuelUnVoixUnMusique @}
+        \new Voice @{ \voiceTwo \ManuelUnVoixDeuxMusique @}
+      >>  % fin du contexte de la portée ManuelUn
+      \new Staff = "ManualTwo" <<
+        \TimeKey
+        \clef "bass"
+        \new Voice @{ \ManuelDeuxMusique @}
+      >>  % fin du contexte de la portée ManuelDeux
+    >>  % fin du contexte PianoStaff
+    \new Staff = "PedalOrgan" <<
+      \TimeKey
+      \clef "bass"
+      \new Voice @{ \PedalierOrgueMusique @}
+    >>  % fin du contexte de la portée PedalOrgan
+  >>
+@}  % fin du contexte Score
+@end example
+
+Nous en avons fini avec la structure.  Toutes les partitions pour orgue
+auront cette structure, même si le nombre de voix peut chager.  Tout ce
+qui nous reste à faire maintenant consiste à saisir la musique et à
+regrouper toutes les parties.
+
+@lilypond[quote,verbatim,ragged-right,addversion]
+\header {
+  title = "Jesu, meine Freude"
+  composer = "J S Bach"
+}
+TimeKey = { \time 4/4 \key c \minor }
+ManualOneVoiceOneMusic = \relative g' {
+  g4 g f ees | d2 c2 |
+}
+ManualOneVoiceTwoMusic = \relative c' {
+  ees16 d ees8~ ees16 f ees d c8 d~ d c~ |
+  c c4 b8 c8. g16 c b c d |
+}
+ManualTwoMusic = \relative c' {
+  c16 b c8~ c16 b c g a8 g~ g16 g aes ees |
+  f ees f d g aes g f ees d e8~ ees16 f ees d |
+}
+PedalOrganMusic = \relative c {
+  r8 c16 d ees d ees8~ ees16 a, b g c b c8 |
+  r16 g ees f g f g8 c,2 |
+  }
+
+\score {
+  <<  % PianoStaff and Pedal Staff must be simultaneous
+    \new PianoStaff <<
+      \new Staff = "ManualOne" <<
+        \TimeKey  % set time signature and key
+        \clef "treble"
+        \new Voice { \voiceOne \ManualOneVoiceOneMusic }
+        \new Voice { \voiceTwo \ManualOneVoiceTwoMusic }
+      >>  % end ManualOne Staff context
+      \new Staff = "ManualTwo" <<
+        \TimeKey
+        \clef "bass"
+        \new Voice { \ManualTwoMusic }
+      >>  % end ManualTwo Staff context
+    >>  % end PianoStaff context
+    \new Staff = "PedalOrgan" <<
+      \TimeKey
+      \clef "bass"
+      \new Voice { \PedalOrganMusic }
+    >>  % end PedalOrgan Staff context
+  >>
+}  % end Score context
+@end lilypond
+
 
diff --git a/Documentation/fr/user/percussion.itely b/Documentation/fr/user/percussion.itely
index 5ce10829ae..48df7fbaee 100644
--- a/Documentation/fr/user/percussion.itely
+++ b/Documentation/fr/user/percussion.itely
@@ -302,8 +302,8 @@ grâce à la commande @code{\parenthesize} décrite dans
 @ref{Parentheses}. Cependant, le mode @code{\drummode} n'inclut pas par
 défaut le graveur @code{Parenthesis_engraver} qui permet d'imprimer ces
 signes.  Il faut donc l'ajouter explicitement dans la définition du
-contexte, suivant la manœuvre indiquée dans @ref{Changing context
-properties on the fly}.
+contexte, suivant la manœuvre indiquée dans @ref{The
+set command}.
 
 @lilypond[quote,ragged-right,verbatim,fragment]
 \new DrumStaff \with {
diff --git a/Documentation/fr/user/rhythms.itely b/Documentation/fr/user/rhythms.itely
index 1136b9d2c2..d94c1ef94f 100644
--- a/Documentation/fr/user/rhythms.itely
+++ b/Documentation/fr/user/rhythms.itely
@@ -1521,7 +1521,7 @@ reprises. Voyez à ce sujet @ref{Repeats}.
 
 @seealso
 
-Dans ce manuel : @ref{Repeats}, @ref{System start delimiters}.
+Dans ce manuel : @ref{Repeats}, @ref{Grouping staves}.
 
 Référence du programme : @rinternals{BarLine} (faisant partie du
 contexte @rinternals{Staff}), @rinternals{SpanBar} (sur plusieurs
diff --git a/Documentation/fr/user/staff.itely b/Documentation/fr/user/staff.itely
index 842fd9fde6..448b656cff 100644
--- a/Documentation/fr/user/staff.itely
+++ b/Documentation/fr/user/staff.itely
@@ -23,6 +23,7 @@ seulement.
 
 @menu
 * Displaying staves::           
+* Modifying single staves::     
 * Writing parts::               
 @end menu
 
@@ -31,13 +32,19 @@ seulement.
 @subsection Displaying staves
 
 @menu
-* System start delimiters::     
-* Staff symbol::                
-* Hiding staves::               
+* Instantiating new staves::    
+* Grouping staves::             
+* Deeper nested staff groups::  
 @end menu
 
-@node System start delimiters
-@unnumberedsubsubsec System start delimiters
+@node Instantiating new staves
+@unnumberedsubsubsec Instantiating new staves
+
+@untranslated
+
+
+@node Grouping staves
+@unnumberedsubsubsec Grouping staves
 
 @cindex système, début de
 @cindex crochet vertical
@@ -126,6 +133,24 @@ en profondeur,
 >>
 @end lilypond
 
+@node Deeper nested staff groups
+@unnumberedsubsubsec Deeper nested staff groups
+
+@untranslated
+
+@node Modifying single staves
+@subsection Modifying single staves
+
+Cette section explique le réglage de la gravure de chaque portée,
+comme la taille de portée ou le nombre de lignes ; sont aussi décrits
+la suspension et la reprise de portées et les portées d'@emph{ossia}.
+
+
+@menu
+* Staff symbol::                
+* Ossia staves::                
+* Hiding staves::               
+@end menu
 
 @node Staff symbol
 @unnumberedsubsubsec Staff symbol
@@ -182,6 +207,12 @@ Référence du programme : @rinternals{StaffSymbol}.
 Exemples : @rlsr{Staff notation}.
 
 
+@node Ossia staves
+@unnumberedsubsubsec Ossia staves
+
+@untranslated
+
+
 @node Hiding staves
 @unnumberedsubsubsec Hiding staves
 
diff --git a/Documentation/fr/user/working.itely b/Documentation/fr/user/working.itely
index 0dfe61fd97..0fbd30cfe7 100644
--- a/Documentation/fr/user/working.itely
+++ b/Documentation/fr/user/working.itely
@@ -814,4 +814,4 @@ et de parties séparées se trouvent dans le manuel : voir
 @ruser{Writing parts}.
 
 Les variables (@q{propriétés}) réglables sont abordées en détail dans
-@ruser{Changing context properties on the fly}.
+@ruser{The set command}.
diff --git a/Documentation/po/de.po b/Documentation/po/de.po
index 4e3ed29fb7..6cbadf5743 100644
--- a/Documentation/po/de.po
+++ b/Documentation/po/de.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2006 Han-Wen Nienhuys, Jan Nieuwenhuizen
 # This file is distributed under the same license as the lilypond package.
 # Till Rettig <till.rettig@gmx.de>, 2007,2008
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-11 18:05+0200\n"
+"POT-Creation-Date: 2008-08-23 18:33+0200\n"
 "PO-Revision-Date: 2008-08-18 22:18+0300\n"
 "Last-Translator: Till Rettig <till.rettig@gmx.de>\n"
 "Language-Team: de\n"
@@ -16,19 +16,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: add_html_footer.py:44
+#: add_html_footer.py:47
 #, python-format
 msgid "This page is for %(package_name)s-%(package_version)s (%(branch_str)s)."
 msgstr ""
 "Diese Seite ist für %(package_name)s-%(package_version)s (%(branch_str)s)."
 
-#: add_html_footer.py:45
+#: add_html_footer.py:48
 #, python-format
 msgid "Report errors to <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
 msgstr ""
 "Fehler bitte an <a href=\"%(mail_address_url)s\">%(mail_address)s</a> melden."
 
-#: add_html_footer.py:47
+#: add_html_footer.py:50
 #, python-format
 msgid ""
 "Your <a href=\"%(suggest_Docs_url)s\">suggestions for the documentation</a> "
@@ -37,21 +37,21 @@ msgstr ""
 "Ihre <a href=\"%(suggest_Docs_url)s\">Vorschläge für die Dokumentation</a> "
 "sind willkommen."
 
-#: add_html_footer.py:55
+#: add_html_footer.py:58
 #, python-format
 msgid "Other languages: %s."
 msgstr "Andere Sprachen: %s."
 
-#: add_html_footer.py:56
+#: add_html_footer.py:59
 #, python-format
 msgid "About <A HREF=\"%s\">automatic language selection</A>."
 msgstr "Über die <A HREF=\"%s\">automatische Sprachauswahl</A>."
 
-#: add_html_footer.py:262
+#: add_html_footer.py:265
 msgid "stable-branch"
 msgstr "stabiler Zweig"
 
-#: add_html_footer.py:264
+#: add_html_footer.py:267
 msgid "development-branch"
 msgstr "Entwicklungszweig"
 
@@ -327,7 +327,7 @@ msgstr "Andere Dokumentation"
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
 #, fuzzy
-msgid "About the Learning Manual (LM)"
+msgid "About the Learning Manual"
 msgstr "Handbuch zum Lernen (LH)"
 
 #. @node in Documentation/user/introduction.itely
@@ -336,7 +336,8 @@ msgstr "Handbuch zum Lernen (LH)"
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Music Glossary (MG)"
+#, fuzzy
+msgid "About the Music Glossary"
 msgstr "Über das Glossar musikalischer Begriffe (MG)"
 
 #. @node in Documentation/user/introduction.itely
@@ -346,7 +347,7 @@ msgstr "Über das Glossar musikalischer Begriffe (MG)"
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
 #, fuzzy
-msgid "About the Notation Reference (NR)"
+msgid "About the Notation Reference"
 msgstr "Notationsreferenz (NR)"
 
 #. @node in Documentation/user/introduction.itely
@@ -355,7 +356,8 @@ msgstr "Notationsreferenz (NR)"
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Application Usage (AU)"
+#, fuzzy
+msgid "About the Application Usage"
 msgstr "Über die Anwendungsbenutzung (AU)"
 
 #. @node in Documentation/user/introduction.itely
@@ -364,7 +366,8 @@ msgstr "Über die Anwendungsbenutzung (AU)"
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Snippet List (SL)"
+#, fuzzy
+msgid "About the Snippet List"
 msgstr "Über die Schnipselliste (SL)"
 
 #. @node in Documentation/user/introduction.itely
@@ -374,7 +377,7 @@ msgstr "Über die Schnipselliste (SL)"
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
 #, fuzzy
-msgid "About the Internals Reference (IR)"
+msgid "About the Internals Reference"
 msgstr "Die Referenz der Programminterna"
 
 #. @node in Documentation/user/introduction.itely
@@ -691,6 +694,8 @@ msgstr "Alles zusammen"
 
 #. @node in Documentation/user/tutorial.itely
 #. @subsection in Documentation/user/tutorial.itely
+#. @node in Documentation/fr/user/tutorial.itely
+#. @subsection in Documentation/fr/user/tutorial.itely
 #. @node in Documentation/es/user/tutorial.itely
 #. @subsection in Documentation/es/user/tutorial.itely
 msgid "Working on input files"
@@ -863,8 +868,8 @@ msgstr "Bindebögen und Legatobögen"
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
 #. @subheading in Documentation/de/user/tutorial.itely
-#. @node in Documentation/de/user/expressive.itely
-#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Ties"
 msgstr "Bindebögen"
 
@@ -958,9 +963,17 @@ msgid "Articulations"
 msgstr "Artikulationszeichen"
 
 #. @subheading in Documentation/user/tutorial.itely
+#. @node in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @subheading in Documentation/fr/user/tutorial.itely
+#. @node in Documentation/fr/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely
 #. @subheading in Documentation/es/user/tutorial.itely
+#. @node in Documentation/es/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/es/user/wind.itely
 #. @subheading in Documentation/de/user/tutorial.itely
+#. @node in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Fingerings"
 msgstr "Fingersatz"
 
@@ -1394,426 +1407,440 @@ msgstr "Absolute Notenbezeichnungen"
 msgid "After the tutorial"
 msgstr "Nach der Übung"
 
-#. Documentation/user/fundamental.itely:352 (variable)
-#. Documentation/user/vocal.itely:1165 (variable)
-#. Documentation/user/vocal.itely:1207 (variable)
+#. Documentation/user/fundamental.itely:346 (variable)
+#. Documentation/user/vocal.itely:1162 (variable)
+#. Documentation/user/vocal.itely:1204 (variable)
 msgid "melody"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:353 (variable)
-#. Documentation/user/vocal.itely:989 (variable)
-#. Documentation/user/vocal.itely:1170 (variable)
-#. Documentation/user/vocal.itely:1211 (variable)
+#. Documentation/user/fundamental.itely:347 (variable)
+#. Documentation/user/vocal.itely:986 (variable)
+#. Documentation/user/vocal.itely:1167 (variable)
+#. Documentation/user/vocal.itely:1208 (variable)
 msgid "text"
 msgstr "Text"
 
-#. Documentation/user/fundamental.itely:354 (variable)
-#. Documentation/user/fundamental.itely:2520 (variable)
+#. Documentation/user/fundamental.itely:348 (variable)
+#. Documentation/user/fundamental.itely:2602 (variable)
 msgid "upper"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:355 (variable)
-#. Documentation/user/fundamental.itely:2527 (variable)
+#. Documentation/user/fundamental.itely:349 (variable)
+#. Documentation/user/fundamental.itely:2609 (variable)
 msgid "lower"
 msgstr "unten"
 
-#. Documentation/user/fundamental.itely:613 (comment)
-#. Documentation/user/fundamental.itely:623 (comment)
-#. Documentation/user/fundamental.itely:638 (comment)
-#. Documentation/user/fundamental.itely:643 (comment)
-#. Documentation/user/fundamental.itely:663 (comment)
-msgid "Voice "
+#. Documentation/user/fundamental.itely:614 (comment)
+msgid "Voice \\\"1\\\"                  Voice \\\"2\\\""
+msgstr ""
+
+#. Documentation/user/fundamental.itely:624 (comment)
+msgid "Voice \\\"1\\\"             Voice \\\"2\\\""
 msgstr ""
 
-#. Documentation/user/fundamental.itely:661 (comment)
-#. Documentation/user/fundamental.itely:685 (comment)
+#. Documentation/user/fundamental.itely:639 (comment)
+#, fuzzy
+msgid "Voice \\\"1\\\""
+msgstr "Stimme 1"
+
+#. Documentation/user/fundamental.itely:644 (comment)
+#, fuzzy
+msgid "Voice \\\"2\\\""
+msgstr "Stimme 1"
+
+#. Documentation/user/fundamental.itely:662 (comment)
+#. Documentation/user/fundamental.itely:686 (comment)
 msgid "Main voice"
 msgstr "Hauptstimme"
 
-#. Documentation/user/fundamental.itely:687 (comment)
-#. Documentation/user/simultaneous.itely:593 (comment)
-#. Documentation/user/simultaneous.itely:618 (comment)
-#. Documentation/user/simultaneous.itely:645 (comment)
+#. Documentation/user/fundamental.itely:664 (comment)
+msgid "Voice \\\"1\\\"     Voice \\\"2\\\"                 Voice \\\"3\\\""
+msgstr ""
+
+#. Documentation/user/fundamental.itely:688 (comment)
+#. Documentation/user/simultaneous.itely:653 (comment)
+#. Documentation/user/simultaneous.itely:678 (comment)
+#. Documentation/user/simultaneous.itely:705 (comment)
 msgid "Bar 1"
 msgstr "Takt 1"
 
-#. Documentation/user/fundamental.itely:698 (comment)
-#. Documentation/user/simultaneous.itely:598 (comment)
-#. Documentation/user/simultaneous.itely:623 (comment)
-#. Documentation/user/simultaneous.itely:651 (comment)
+#. Documentation/user/fundamental.itely:699 (comment)
+#. Documentation/user/simultaneous.itely:658 (comment)
+#. Documentation/user/simultaneous.itely:683 (comment)
+#. Documentation/user/simultaneous.itely:711 (comment)
 msgid "Bar 2"
 msgstr "Takt 2"
 
-#. Documentation/user/fundamental.itely:699 (comment)
+#. Documentation/user/fundamental.itely:700 (comment)
 msgid "Voice 1 continues"
 msgstr "Stimme 1 geht weiter"
 
-#. Documentation/user/fundamental.itely:702 (comment)
+#. Documentation/user/fundamental.itely:703 (comment)
 msgid "Voice 2 continues"
 msgstr "Stimme 2 geht weiter"
 
-#. Documentation/user/fundamental.itely:873 (comment)
+#. Documentation/user/fundamental.itely:874 (comment)
 msgid "Voice one"
 msgstr "Stimme 1"
 
-#. Documentation/user/fundamental.itely:875 (comment)
+#. Documentation/user/fundamental.itely:876 (comment)
 msgid "Voice two"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:877 (comment)
+#. Documentation/user/fundamental.itely:878 (comment)
 msgid "Omit Voice three"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:878 (comment)
+#. Documentation/user/fundamental.itely:879 (comment)
 msgid "Voice four"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:966 (comment)
+#. Documentation/user/fundamental.itely:970 (comment)
 msgid "Default behavior or behavior after \\oneVoice"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1004 (comment)
+#. Documentation/user/fundamental.itely:1008 (comment)
 msgid "The following notes are monophonic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1006 (comment)
+#. Documentation/user/fundamental.itely:1010 (comment)
 msgid "Start simultaneous section of three voices"
 msgstr "Beginn von drei Stimmen gleichzeitig"
 
-#. Documentation/user/fundamental.itely:1008 (comment)
+#. Documentation/user/fundamental.itely:1012 (comment)
 msgid "Continue the main voice in parallel"
 msgstr "Die Hauptstimme weiterlaufen lassen"
 
-#. Documentation/user/fundamental.itely:1010 (comment)
-#. Documentation/user/fundamental.itely:1072 (comment)
+#. Documentation/user/fundamental.itely:1014 (comment)
+#. Documentation/user/fundamental.itely:1076 (comment)
 msgid "Initiate second voice"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1012 (comment)
-#. Documentation/user/fundamental.itely:1074 (comment)
+#. Documentation/user/fundamental.itely:1016 (comment)
+#. Documentation/user/fundamental.itely:1078 (comment)
 msgid "Set stems, etc, down"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1016 (comment)
-#. Documentation/user/fundamental.itely:1078 (comment)
+#. Documentation/user/fundamental.itely:1020 (comment)
+#. Documentation/user/fundamental.itely:1082 (comment)
 msgid "Initiate third voice"
 msgstr "Die dritte Stimme beginnen"
 
-#. Documentation/user/fundamental.itely:1018 (comment)
-#. Documentation/user/fundamental.itely:1080 (comment)
+#. Documentation/user/fundamental.itely:1022 (comment)
+#. Documentation/user/fundamental.itely:1084 (comment)
 msgid "Set stems, etc, up"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1067 (comment)
+#. Documentation/user/fundamental.itely:1071 (comment)
 msgid "Initiate first voice"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1187 (variable)
-#. Documentation/user/fundamental.itely:2497 (variable)
-#. Documentation/user/tweaks.itely:3168 (variable)
-#. Documentation/user/simultaneous.itely:639 (variable)
+#. Documentation/user/fundamental.itely:1196 (variable)
+#. Documentation/user/fundamental.itely:2579 (variable)
+#. Documentation/user/tweaks.itely:3170 (variable)
+#. Documentation/user/simultaneous.itely:699 (variable)
 msgid "global"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1188 (variable)
+#. Documentation/user/fundamental.itely:1197 (variable)
 msgid "SopOneMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1190 (variable)
+#. Documentation/user/fundamental.itely:1199 (variable)
 msgid "SopTwoMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1192 (variable)
+#. Documentation/user/fundamental.itely:1201 (variable)
 msgid "SopOneLyrics"
 msgstr "SopEinsText"
 
-#. Documentation/user/fundamental.itely:1194 (variable)
+#. Documentation/user/fundamental.itely:1203 (variable)
 msgid "SopTwoLyrics"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1238 (variable)
-#. Documentation/user/fundamental.itely:2712 (variable)
+#. Documentation/user/fundamental.itely:1247 (variable)
+#. Documentation/user/fundamental.itely:2794 (variable)
 msgid "TimeKey"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1239 (variable)
+#. Documentation/user/fundamental.itely:1248 (variable)
 msgid "SopMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1240 (variable)
-#. Documentation/user/tweaks.itely:3170 (variable)
+#. Documentation/user/fundamental.itely:1249 (variable)
+#. Documentation/user/tweaks.itely:3172 (variable)
 msgid "AltoMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1241 (variable)
-#. Documentation/user/tweaks.itely:3171 (variable)
+#. Documentation/user/fundamental.itely:1250 (variable)
+#. Documentation/user/tweaks.itely:3173 (variable)
 msgid "TenorMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1242 (variable)
-#. Documentation/user/tweaks.itely:3172 (variable)
+#. Documentation/user/fundamental.itely:1251 (variable)
+#. Documentation/user/tweaks.itely:3174 (variable)
 msgid "BassMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1243 (variable)
-#. Documentation/user/tweaks.itely:3173 (variable)
+#. Documentation/user/fundamental.itely:1252 (variable)
+#. Documentation/user/tweaks.itely:3175 (variable)
 msgid "VerseOne"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1245 (variable)
-#. Documentation/user/tweaks.itely:3174 (variable)
+#. Documentation/user/fundamental.itely:1254 (variable)
+#. Documentation/user/tweaks.itely:3176 (variable)
 msgid "VerseTwo"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1247 (variable)
-#. Documentation/user/tweaks.itely:3175 (variable)
+#. Documentation/user/fundamental.itely:1256 (variable)
+#. Documentation/user/tweaks.itely:3177 (variable)
 msgid "VerseThree"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1249 (variable)
-#. Documentation/user/tweaks.itely:3176 (variable)
+#. Documentation/user/fundamental.itely:1258 (variable)
+#. Documentation/user/tweaks.itely:3178 (variable)
 msgid "VerseFour"
 msgstr "StropheVier"
 
-#. Documentation/user/fundamental.itely:1292 (variable)
-#. Documentation/user/fundamental.itely:1344 (variable)
-#. Documentation/user/fundamental.itely:1405 (variable)
+#. Documentation/user/fundamental.itely:1301 (variable)
+#. Documentation/user/fundamental.itely:1353 (variable)
+#. Documentation/user/fundamental.itely:1414 (variable)
 #, fuzzy
 msgid "versenotes"
 msgstr "Verzierungen"
 
-#. Documentation/user/fundamental.itely:1297 (variable)
-#. Documentation/user/fundamental.itely:1358 (variable)
-#. Documentation/user/fundamental.itely:1419 (variable)
+#. Documentation/user/fundamental.itely:1306 (variable)
+#. Documentation/user/fundamental.itely:1367 (variable)
+#. Documentation/user/fundamental.itely:1428 (variable)
 #, fuzzy
 msgid "versewords"
 msgstr "StropheVier"
 
-#. Documentation/user/fundamental.itely:1349 (variable)
-#. Documentation/user/fundamental.itely:1410 (variable)
+#. Documentation/user/fundamental.itely:1358 (variable)
+#. Documentation/user/fundamental.itely:1419 (variable)
 #, fuzzy
 msgid "refrainnotesA"
 msgstr "Umgebungen erstellen"
 
-#. Documentation/user/fundamental.itely:1353 (variable)
-#. Documentation/user/fundamental.itely:1414 (variable)
+#. Documentation/user/fundamental.itely:1362 (variable)
+#. Documentation/user/fundamental.itely:1423 (variable)
 #, fuzzy
 msgid "refrainnotesB"
 msgstr "Umgebungen erstellen"
 
-#. Documentation/user/fundamental.itely:1361 (variable)
-#. Documentation/user/fundamental.itely:1422 (variable)
+#. Documentation/user/fundamental.itely:1370 (variable)
+#. Documentation/user/fundamental.itely:1431 (variable)
 msgid "refrainwordsA"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1364 (variable)
-#. Documentation/user/fundamental.itely:1425 (variable)
+#. Documentation/user/fundamental.itely:1373 (variable)
+#. Documentation/user/fundamental.itely:1434 (variable)
 msgid "refrainwordsB"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1589 (comment)
+#. Documentation/user/fundamental.itely:1608 (comment)
 #, fuzzy
 msgid "start of single compound music expression"
 msgstr "Score ist ein (einziger)  zusammengesetzter musikalischer Ausdruck"
 
-#. Documentation/user/fundamental.itely:1590 (comment)
+#. Documentation/user/fundamental.itely:1609 (comment)
 #, fuzzy
 msgid "start of simultaneous staves section"
 msgstr "Beginn von drei Stimmen gleichzeitig"
 
-#. Documentation/user/fundamental.itely:1592 (comment)
+#. Documentation/user/fundamental.itely:1611 (comment)
 #, fuzzy
 msgid "create RH staff"
 msgstr "Verkleinerte Systeme"
 
-#. Documentation/user/fundamental.itely:1595 (comment)
+#. Documentation/user/fundamental.itely:1614 (comment)
 msgid "create voice for RH notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1596 (comment)
+#. Documentation/user/fundamental.itely:1615 (comment)
 msgid "start of RH notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1599 (comment)
+#. Documentation/user/fundamental.itely:1618 (comment)
 #, fuzzy
 msgid "end of RH notes"
 msgstr "An Noten angehängt"
 
-#. Documentation/user/fundamental.itely:1600 (comment)
+#. Documentation/user/fundamental.itely:1619 (comment)
 msgid "end of RH voice"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1601 (comment)
+#. Documentation/user/fundamental.itely:1620 (comment)
 #, fuzzy
 msgid "end of RH staff"
 msgstr "Verkleinerte Systeme"
 
-#. Documentation/user/fundamental.itely:1602 (comment)
+#. Documentation/user/fundamental.itely:1621 (comment)
 msgid "create LH staff; needs two simultaneous voices"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1605 (comment)
+#. Documentation/user/fundamental.itely:1624 (comment)
 msgid "create LH voice one"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1607 (comment)
+#. Documentation/user/fundamental.itely:1626 (comment)
 msgid "start of LH voice one notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1610 (comment)
+#. Documentation/user/fundamental.itely:1629 (comment)
 msgid "end of LH voice one notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1611 (comment)
+#. Documentation/user/fundamental.itely:1630 (comment)
 #, fuzzy
 msgid "end of LH voice one"
 msgstr "An Noten angehängt"
 
-#. Documentation/user/fundamental.itely:1612 (comment)
+#. Documentation/user/fundamental.itely:1631 (comment)
 msgid "create LH voice two"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1614 (comment)
+#. Documentation/user/fundamental.itely:1633 (comment)
 msgid "start of LH voice two notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1617 (comment)
+#. Documentation/user/fundamental.itely:1636 (comment)
 msgid "end of LH voice two notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1618 (comment)
+#. Documentation/user/fundamental.itely:1637 (comment)
 msgid "end of LH voice two"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1619 (comment)
+#. Documentation/user/fundamental.itely:1638 (comment)
 #, fuzzy
 msgid "end of LH staff"
 msgstr "Verkleinerte Systeme"
 
-#. Documentation/user/fundamental.itely:1620 (comment)
+#. Documentation/user/fundamental.itely:1639 (comment)
 msgid "end of simultaneous staves section"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1621 (comment)
+#. Documentation/user/fundamental.itely:1640 (comment)
 #, fuzzy
 msgid "end of single compound music expression"
 msgstr "Score ist ein (einziger)  zusammengesetzter musikalischer Ausdruck"
 
-#. Documentation/user/fundamental.itely:1824 (comment)
+#. Documentation/user/fundamental.itely:1851 (comment)
 msgid "Wrong!"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1908 (comment)
-#. Documentation/user/fundamental.itely:2003 (comment)
+#. Documentation/user/fundamental.itely:1937 (comment)
+#. Documentation/user/fundamental.itely:2078 (comment)
 msgid "make note heads smaller"
 msgstr "Notenköpfe verkleinern"
 
-#. Documentation/user/fundamental.itely:1911 (comment)
-#. Documentation/user/fundamental.itely:2005 (comment)
+#. Documentation/user/fundamental.itely:1940 (comment)
+#. Documentation/user/fundamental.itely:2080 (comment)
 msgid "make note heads larger"
 msgstr "Notenköpfe vergrößern"
 
-#. Documentation/user/fundamental.itely:1914 (comment)
-#. Documentation/user/fundamental.itely:2007 (comment)
+#. Documentation/user/fundamental.itely:1943 (comment)
+#. Documentation/user/fundamental.itely:2082 (comment)
 msgid "return to default size"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2274 (variable)
-#. Documentation/user/fundamental.itely:2498 (variable)
+#. Documentation/user/fundamental.itely:2352 (variable)
+#. Documentation/user/fundamental.itely:2580 (variable)
 #. Documentation/user/input.itely:907 (variable)
 msgid "sopranoMusic"
 msgstr "SopranNoten"
 
-#. Documentation/user/fundamental.itely:2281 (variable)
+#. Documentation/user/fundamental.itely:2359 (variable)
 msgid "sopranoLyrics"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2285 (variable)
+#. Documentation/user/fundamental.itely:2363 (variable)
 msgid "celloMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2502 (variable)
+#. Documentation/user/fundamental.itely:2584 (variable)
 #, fuzzy
 msgid "sopranoWords"
 msgstr "SopranNoten"
 
-#. Documentation/user/fundamental.itely:2505 (variable)
+#. Documentation/user/fundamental.itely:2587 (variable)
 #. Documentation/user/input.itely:908 (variable)
 msgid "altoMusic"
 msgstr "AltNoten"
 
-#. Documentation/user/fundamental.itely:2509 (variable)
+#. Documentation/user/fundamental.itely:2591 (variable)
 msgid "altoWords"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2510 (variable)
+#. Documentation/user/fundamental.itely:2592 (variable)
 #. Documentation/user/input.itely:909 (variable)
 msgid "tenorMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2514 (variable)
+#. Documentation/user/fundamental.itely:2596 (variable)
 msgid "tenorWords"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2515 (variable)
+#. Documentation/user/fundamental.itely:2597 (variable)
 #. Documentation/user/input.itely:910 (variable)
 msgid "bassMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2519 (variable)
+#. Documentation/user/fundamental.itely:2601 (variable)
 msgid "bassWords"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2536 (comment)
+#. Documentation/user/fundamental.itely:2618 (comment)
 msgid "combine ChoirStaff and PianoStaff in parallel"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2558 (comment)
+#. Documentation/user/fundamental.itely:2640 (comment)
 msgid "end ChoirStaff"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2713 (variable)
+#. Documentation/user/fundamental.itely:2795 (variable)
 msgid "ManualOneVoiceOneMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2716 (variable)
+#. Documentation/user/fundamental.itely:2798 (variable)
 msgid "ManualOneVoiceTwoMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2720 (variable)
+#. Documentation/user/fundamental.itely:2802 (variable)
 msgid "ManualTwoMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2724 (variable)
+#. Documentation/user/fundamental.itely:2806 (variable)
 msgid "PedalOrganMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2730 (comment)
+#. Documentation/user/fundamental.itely:2812 (comment)
 msgid "PianoStaff and Pedal Staff must be simultaneous"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2733 (comment)
+#. Documentation/user/fundamental.itely:2815 (comment)
 msgid "set time signature and key"
 msgstr "Taktangabe und Tonart setzen"
 
-#. Documentation/user/fundamental.itely:2737 (comment)
+#. Documentation/user/fundamental.itely:2819 (comment)
 msgid "end ManualOne Staff context"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2742 (comment)
+#. Documentation/user/fundamental.itely:2824 (comment)
 msgid "end ManualTwo Staff context"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2743 (comment)
+#. Documentation/user/fundamental.itely:2825 (comment)
 msgid "end PianoStaff context"
 msgstr "Klaviersystem beenden"
 
-#. Documentation/user/fundamental.itely:2748 (comment)
+#. Documentation/user/fundamental.itely:2830 (comment)
 #, fuzzy
 msgid "end PedalOrgan Staff context"
 msgstr "Klaviersystem beenden"
 
-#. Documentation/user/fundamental.itely:2750 (comment)
+#. Documentation/user/fundamental.itely:2832 (comment)
 msgid "end Score context"
 msgstr "Partitur-Kontext beenden"
 
@@ -1830,6 +1857,8 @@ msgstr "Grundbegriffe"
 
 #. @node in Documentation/user/fundamental.itely
 #. @section in Documentation/user/fundamental.itely
+#. @node in Documentation/fr/user/fundamental.itely
+#. @section in Documentation/fr/user/fundamental.itely
 msgid "How LilyPond input files work"
 msgstr "Wie eine LilyPond-Eingabe-Datei funktioniert"
 
@@ -1869,6 +1898,7 @@ msgstr "Musikalische Ausdrücke ineinander verschachteln"
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
 #. @rglos in Documentation/user/staff.itely
+#. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 msgid "ossia"
@@ -1921,6 +1951,7 @@ msgid "Explicitly instantiating voices"
 msgstr "Stimmen explizit beginnen"
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 #, fuzzy
 msgid "Note columns"
 msgstr "Nur Noten"
@@ -1953,6 +1984,8 @@ msgstr "Kontexte und Engraver"
 #. @subsection in Documentation/user/changing-defaults.itely
 #. @node in Documentation/fr/user/fundamental.itely
 #. @subsection in Documentation/fr/user/fundamental.itely
+#. @node in Documentation/fr/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/fundamental.itely
 #. @subsection in Documentation/es/user/fundamental.itely
 #. @node in Documentation/es/user/changing-defaults.itely
@@ -2003,6 +2036,18 @@ msgstr "Was sind Engraver?"
 msgid "Modifying context properties"
 msgstr "Umgebungs-Eignschaften verändern"
 
+#. @unnumberedsubsubsec in Documentation/user/fundamental.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fundamental.itely
+#, fuzzy
+msgid "Setting context properties with @code{\\with}"
+msgstr "Umgebungseigenschaften lokal ändern"
+
+#. @unnumberedsubsubsec in Documentation/user/fundamental.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fundamental.itely
+#, fuzzy
+msgid "Setting context properties with @code{\\context}"
+msgstr "Umgebungseigenschaften lokal ändern"
+
 #. @node in Documentation/user/fundamental.itely
 #. @subsection in Documentation/user/fundamental.itely
 #. @node in Documentation/fr/user/fundamental.itely
@@ -2015,18 +2060,21 @@ msgid "Adding and removing engravers"
 msgstr "Engraver hinzufügen und entfernen"
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 #. @subsubheading in Documentation/es/user/fundamental.itely
 msgid "Changing a single context"
 msgstr "Einen einzelnen Kontext verändern"
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/pitches.itely
+#. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/pitches.itely
 msgid "ambitus"
 msgstr "Tonumfang"
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 #. @subsubheading in Documentation/es/user/fundamental.itely
 msgid "Changing all contexts of the same type"
 msgstr "Alle Kontexte des gleichen Typs verändern"
@@ -2075,197 +2123,197 @@ msgstr "Vierstimmige SATB-Partitur"
 msgid "Building a score from scratch"
 msgstr "Eine Partitur von Grund auf erstellen"
 
-#. Documentation/user/tweaks.itely:540 (comment)
-#. Documentation/user/tweaks.itely:664 (comment)
+#. Documentation/user/tweaks.itely:541 (comment)
+#. Documentation/user/tweaks.itely:665 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:605 (comment)
-#. Documentation/user/tweaks.itely:639 (comment)
-#. Documentation/user/tweaks.itely:642 (comment)
+#. Documentation/user/tweaks.itely:606 (comment)
+#. Documentation/user/tweaks.itely:640 (comment)
+#. Documentation/user/tweaks.itely:643 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:668 (comment)
+#. Documentation/user/tweaks.itely:669 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1265 (comment)
+#. Documentation/user/tweaks.itely:1267 (comment)
 msgid "Don't print clefs in this staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1267 (comment)
+#. Documentation/user/tweaks.itely:1269 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr "Keine Taktangabe in diesem System"
 
-#. Documentation/user/tweaks.itely:1328 (comment)
+#. Documentation/user/tweaks.itely:1330 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1384 (comment)
+#. Documentation/user/tweaks.itely:1386 (comment)
 msgid "Reduce stem length and line spacing to match"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1758 (comment)
-#. Documentation/user/tweaks.itely:1819 (comment)
+#. Documentation/user/tweaks.itely:1760 (comment)
+#. Documentation/user/tweaks.itely:1821 (comment)
 msgid "Set details for later Text Spanner"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1761 (comment)
-#. Documentation/user/tweaks.itely:1822 (comment)
+#. Documentation/user/tweaks.itely:1763 (comment)
+#. Documentation/user/tweaks.itely:1824 (comment)
 msgid "Place dynamics above staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1763 (comment)
-#. Documentation/user/tweaks.itely:1826 (comment)
+#. Documentation/user/tweaks.itely:1765 (comment)
+#. Documentation/user/tweaks.itely:1828 (comment)
 msgid "Start Ottava Bracket"
 msgstr "Beginn der Oktavierungsklammer"
 
-#. Documentation/user/tweaks.itely:1766 (comment)
-#. Documentation/user/tweaks.itely:1773 (comment)
-#. Documentation/user/tweaks.itely:1829 (comment)
-#. Documentation/user/tweaks.itely:1836 (comment)
-msgid "Add Dynamic Text"
-msgstr ""
-
 #. Documentation/user/tweaks.itely:1768 (comment)
+#. Documentation/user/tweaks.itely:1775 (comment)
 #. Documentation/user/tweaks.itely:1831 (comment)
-msgid "Add Dynamic Line Spanner"
+#. Documentation/user/tweaks.itely:1838 (comment)
+msgid "Add Dynamic Text"
 msgstr ""
 
 #. Documentation/user/tweaks.itely:1770 (comment)
 #. Documentation/user/tweaks.itely:1833 (comment)
+msgid "Add Dynamic Line Spanner"
+msgstr ""
+
+#. Documentation/user/tweaks.itely:1772 (comment)
+#. Documentation/user/tweaks.itely:1835 (comment)
 msgid "Add Text Script"
 msgstr "Textbeschriftung hinzufügen"
 
-#. Documentation/user/tweaks.itely:1775 (comment)
-#. Documentation/user/tweaks.itely:1838 (comment)
+#. Documentation/user/tweaks.itely:1777 (comment)
+#. Documentation/user/tweaks.itely:1840 (comment)
 msgid "Stop Ottava Bracket"
 msgstr "Ende der Oktavierungsklammer"
 
-#. Documentation/user/tweaks.itely:1824 (comment)
+#. Documentation/user/tweaks.itely:1826 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1880 (comment)
+#. Documentation/user/tweaks.itely:1882 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1898 (comment)
+#. Documentation/user/tweaks.itely:1900 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1902 (comment)
+#. Documentation/user/tweaks.itely:1904 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1906 (comment)
-#. Documentation/user/tweaks.itely:1911 (comment)
+#. Documentation/user/tweaks.itely:1908 (comment)
+#. Documentation/user/tweaks.itely:1913 (comment)
 msgid "Turn off collision avoidance"
 msgstr "Abschalten der automatischen Vermeidung von Zusammenstößen"
 
-#. Documentation/user/tweaks.itely:1913 (comment)
+#. Documentation/user/tweaks.itely:1915 (comment)
 msgid "and turn on textLengthOn"
 msgstr "und Textlänge berücksichtigen"
 
-#. Documentation/user/tweaks.itely:1914 (comment)
+#. Documentation/user/tweaks.itely:1916 (comment)
 msgid "Spaces at end are honored"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2017 (comment)
+#. Documentation/user/tweaks.itely:2019 (comment)
 msgid "Extend width by 1 staff space"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2283 (comment)
+#. Documentation/user/tweaks.itely:2285 (comment)
 msgid "This will not work, see below:"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2287 (comment)
+#. Documentation/user/tweaks.itely:2289 (comment)
 msgid "This works:"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2332 (variable)
+#. Documentation/user/tweaks.itely:2334 (variable)
 msgid "naturalplusflat"
 msgstr "AuflösungB"
 
-#. Documentation/user/tweaks.itely:2367 (comment)
+#. Documentation/user/tweaks.itely:2369 (comment)
 msgid "Extend width by 1 unit"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2369 (comment)
+#. Documentation/user/tweaks.itely:2371 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2647 (variable)
-#. Documentation/user/tweaks.itely:2698 (variable)
-#. Documentation/user/tweaks.itely:2760 (variable)
-#. Documentation/user/tweaks.itely:2831 (variable)
-#. Documentation/user/tweaks.itely:2893 (variable)
-#. Documentation/user/tweaks.itely:2948 (variable)
+#. Documentation/user/tweaks.itely:2649 (variable)
+#. Documentation/user/tweaks.itely:2700 (variable)
+#. Documentation/user/tweaks.itely:2762 (variable)
+#. Documentation/user/tweaks.itely:2833 (variable)
+#. Documentation/user/tweaks.itely:2895 (variable)
+#. Documentation/user/tweaks.itely:2950 (variable)
 msgid "rhMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2652 (comment)
-#. Documentation/user/tweaks.itely:2703 (comment)
-#. Documentation/user/tweaks.itely:2767 (comment)
-#. Documentation/user/tweaks.itely:2840 (comment)
-#. Documentation/user/tweaks.itely:2902 (comment)
+#. Documentation/user/tweaks.itely:2654 (comment)
+#. Documentation/user/tweaks.itely:2705 (comment)
+#. Documentation/user/tweaks.itely:2769 (comment)
+#. Documentation/user/tweaks.itely:2842 (comment)
+#. Documentation/user/tweaks.itely:2904 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2665 (variable)
-#. Documentation/user/tweaks.itely:2716 (variable)
-#. Documentation/user/tweaks.itely:2780 (variable)
-#. Documentation/user/tweaks.itely:2855 (variable)
-#. Documentation/user/tweaks.itely:2919 (variable)
-#. Documentation/user/tweaks.itely:2976 (variable)
+#. Documentation/user/tweaks.itely:2667 (variable)
+#. Documentation/user/tweaks.itely:2718 (variable)
+#. Documentation/user/tweaks.itely:2782 (variable)
+#. Documentation/user/tweaks.itely:2857 (variable)
+#. Documentation/user/tweaks.itely:2921 (variable)
+#. Documentation/user/tweaks.itely:2978 (variable)
 msgid "lhMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2906 (comment)
-#. Documentation/user/tweaks.itely:2963 (comment)
+#. Documentation/user/tweaks.itely:2908 (comment)
+#. Documentation/user/tweaks.itely:2965 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2909 (comment)
-#. Documentation/user/tweaks.itely:2966 (comment)
+#. Documentation/user/tweaks.itely:2911 (comment)
+#. Documentation/user/tweaks.itely:2968 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2961 (comment)
+#. Documentation/user/tweaks.itely:2963 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3089 (comment)
-#. Documentation/user/tweaks.itely:3108 (comment)
+#. Documentation/user/tweaks.itely:3091 (comment)
+#. Documentation/user/tweaks.itely:3110 (comment)
 msgid "Visible tempo marking"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3093 (comment)
-#. Documentation/user/tweaks.itely:3112 (comment)
+#. Documentation/user/tweaks.itely:3095 (comment)
+#. Documentation/user/tweaks.itely:3114 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3096 (comment)
-#. Documentation/user/tweaks.itely:3115 (comment)
+#. Documentation/user/tweaks.itely:3098 (comment)
+#. Documentation/user/tweaks.itely:3117 (comment)
 msgid "New tempo for next section"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3159 (variable)
+#. Documentation/user/tweaks.itely:3161 (variable)
 msgid "emphasize"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3163 (variable)
+#. Documentation/user/tweaks.itely:3165 (variable)
 #, fuzzy
 msgid "normal"
 msgstr "normal"
 
-#. Documentation/user/tweaks.itely:3169 (variable)
+#. Documentation/user/tweaks.itely:3171 (variable)
 #, fuzzy
 msgid "SopranoMusic"
 msgstr "SopranNoten"
 
-#. Documentation/user/tweaks.itely:3385 (comment)
+#. Documentation/user/tweaks.itely:3387 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
 msgstr ""
 
@@ -2282,50 +2330,78 @@ msgstr "Die Ausgabe verändern"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Tweaking basics"
 msgstr "Grundlagen für die Optimierung"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Introduction to tweaks"
 msgstr "Grundlagen zur Optimierung"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Objects and interfaces"
 msgstr "Objekte und Schnittstellen"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Naming conventions of objects and properties"
 msgstr "Regeln zur Benennung von Objekten und Eigenschaften"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Tweaking methods"
 msgstr "Optimierungsmethoden"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "The Internals Reference manual"
 msgstr "Die Referenz der Programminterna"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Properties of layout objects"
 msgstr "Eigenschaften von Layoutobjekten"
 
@@ -2346,8 +2422,12 @@ msgstr "Rückgängig machen"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Properties found in interfaces"
 msgstr "Eigenschaften, die Schnittstellen besitzen können"
 
@@ -2358,22 +2438,34 @@ msgstr "Den Kontext im Liedtextmodus bestimmen"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Types of properties"
 msgstr "Typen von Eigenschaften"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Appearance of objects"
 msgstr "Erscheinung von Objekten"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Visibility and color of objects"
 msgstr "Sichtbarkeit und Farbe von Objekten"
 
@@ -2399,34 +2491,54 @@ msgstr "color (Farbe)"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Size of objects"
 msgstr "Größe von Objekten"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Length and thickness of objects"
 msgstr "Länge und Dicke von Objekten"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Placement of objects"
 msgstr "Positionierung von Objekten"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Automatic behavior"
 msgstr "Automatisches Verhalten"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Within-staff objects"
 msgstr "withing-staff (Objekte innerhalb des Notensystems)"
 
@@ -2437,8 +2549,12 @@ msgstr "Fingersatz"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Outside staff objects"
 msgstr "Objekte außerhalb des Notensystems"
 
@@ -2454,30 +2570,34 @@ msgstr "Verändern der Größe von grobs"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Collisions of objects"
 msgstr "Kollision von Objekten"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Moving objects"
 msgstr "Verschieben von Objekten"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Fixing overlapping notation"
 msgstr "Überlappende Notation in Ordnung bringen"
 
@@ -2525,22 +2645,34 @@ msgstr "force-hshift (vertikale Verschiebunseigenschaft)"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Real music example"
 msgstr "Beispiele aus dem Leben"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Further tweaking"
 msgstr "Weitere Optimierungen"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Other uses for tweaks"
 msgstr "Andere Benutzung von Optimierungen"
 
@@ -2556,37 +2688,45 @@ msgstr "Eine Fermate simulieren"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Using variables for tweaks"
 msgstr "Variablen für Optimierungen einsetzen"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Other sources of information"
 msgstr "Mehr Information"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Avoiding tweaks with slower processing"
 msgstr "Vermeiden von Optimierungen durch langsamere Übersetzung"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Advanced tweaks with Scheme"
 msgstr "Fortgeschrittene Optimierungen mit Scheme"
 
@@ -3086,6 +3226,7 @@ msgid "Running requirements"
 msgstr "Voraussetzungen zur Programmbenutzung"
 
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 #, fuzzy
 msgid "Requirements for building documentation"
@@ -3113,6 +3254,7 @@ msgid "Compiling for multiple platforms"
 msgstr "Für mehrere Plattformen kompilieren"
 
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 #, fuzzy
 msgid "Compiling outside the source tree"
@@ -3121,6 +3263,8 @@ msgstr "Aus den Quellen übersetzen"
 #. @node in Documentation/user/install.itely
 #. @subsection in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/es/user/install.itely
+#. @node in Documentation/es/user/install.itely
+#. @subsection in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @subsection in Documentation/de/user/install.itely
 msgid "Building documentation"
@@ -3128,6 +3272,8 @@ msgstr "Die Dokumentation übersetzen"
 
 #. @node in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @node in Documentation/es/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 #, fuzzy
@@ -3137,7 +3283,7 @@ msgstr "Die Dokumentation übersetzen"
 #. @node in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/user/install.itely
 #. @node in Documentation/es/user/install.itely
-#. @subsection in Documentation/es/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Building documentation without compiling LilyPond"
@@ -3768,15 +3914,23 @@ msgstr "Tonhöhen setzen"
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
+#. @node in Documentation/de/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
 msgid "Absolute octave entry"
 msgstr "Absolute Oktavenbezeichnung"
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
+#. @node in Documentation/de/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
 msgid "Relative octave entry"
 msgstr "Relative Oktavenbezeichnung"
 
@@ -3813,8 +3967,12 @@ msgstr "Viele Tonhöhen gleichzeitig verändern"
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
+#. @node in Documentation/de/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
 msgid "Octave checks"
 msgstr "Oktavenüberprüfung"
 
@@ -3900,8 +4058,8 @@ msgstr "Transponierende Instrumente"
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
 #. @node in Documentation/de/user/pitches.itely
@@ -3911,8 +4069,8 @@ msgstr "Automatische Versetzungszeichen"
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
-#. @node in Documentation/fr/user/editorial.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
 #. @node in Documentation/de/user/pitches.itely
@@ -4049,110 +4207,110 @@ msgstr ""
 msgid "This is correct and works"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:919 (comment)
+#. Documentation/user/rhythms.itely:916 (comment)
 msgid "Default style"
 msgstr "Standardstil"
 
-#. Documentation/user/rhythms.itely:922 (comment)
+#. Documentation/user/rhythms.itely:919 (comment)
 msgid "Change to numeric style"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:926 (comment)
+#. Documentation/user/rhythms.itely:923 (comment)
 msgid "Revert to default style"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1129 (comment)
+#. Documentation/user/rhythms.itely:1115 (comment)
 msgid "Show all bar numbers"
 msgstr "Alle Taknummern anzeigen"
 
-#. Documentation/user/rhythms.itely:1193 (comment)
+#. Documentation/user/rhythms.itely:1225 (comment)
+msgid "Now each staff has its own time signature."
+msgstr ""
+
+#. Documentation/user/rhythms.itely:1261 (comment)
 msgid "Create 9/8 split into 2/4 + 5/8"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1194 (variable)
+#. Documentation/user/rhythms.itely:1262 (variable)
 msgid "tsMarkup"
 msgstr "Taktangabe"
 
-#. Documentation/user/rhythms.itely:1274 (comment)
-msgid "Now each staff has its own time signature."
-msgstr ""
-
-#. Documentation/user/rhythms.itely:1480 (comment)
+#. Documentation/user/rhythms.itely:1558 (comment)
 msgid "Set beam sub-group length to an eighth note"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1483 (comment)
+#. Documentation/user/rhythms.itely:1561 (comment)
 msgid "Set beam sub-group length to a sixteenth note"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1615 (comment)
+#. Documentation/user/rhythms.itely:1698 (comment)
 msgid "end 1/16 beams for all time signatures at the 1/16 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1619 (comment)
+#. Documentation/user/rhythms.itely:1702 (comment)
 msgid "end 1/32 beams for all time signatures at the 1/16 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1629 (comment)
+#. Documentation/user/rhythms.itely:1712 (comment)
 msgid "end beams of all durations in 5/8 time signature at the 2/8 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1658 (comment)
+#. Documentation/user/rhythms.itely:1741 (comment)
 msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1671 (comment)
+#. Documentation/user/rhythms.itely:1754 (comment)
 msgid "this won't revert it!"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1673 (comment)
+#. Documentation/user/rhythms.itely:1756 (comment)
 msgid "this will"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1852 (comment)
+#. Documentation/user/rhythms.itely:1935 (comment)
 msgid "revert to non-feathered beams"
 msgstr "in nichtgespreizte Balken zurückverwandeln"
 
-#. Documentation/user/rhythms.itely:2081 (comment)
-#. Documentation/user/rhythms.itely:2097 (comment)
+#. Documentation/user/rhythms.itely:2164 (comment)
+#. Documentation/user/rhythms.itely:2180 (comment)
 msgid "Permit first bar number to be printed"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2098 (comment)
-#. Documentation/user/rhythms.itely:2146 (comment)
+#. Documentation/user/rhythms.itely:2181 (comment)
+#. Documentation/user/rhythms.itely:2229 (comment)
 msgid "Print a bar number every second measure"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2114 (comment)
+#. Documentation/user/rhythms.itely:2197 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2118 (comment)
-#. Documentation/user/rhythms.itely:2144 (comment)
+#. Documentation/user/rhythms.itely:2201 (comment)
+#. Documentation/user/rhythms.itely:2227 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2122 (comment)
+#. Documentation/user/rhythms.itely:2205 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2127 (comment)
+#. Documentation/user/rhythms.itely:2210 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2149 (comment)
+#. Documentation/user/rhythms.itely:2232 (comment)
 msgid "Center-align bar numbers"
 msgstr "Taktnummern zentrieren"
 
-#. Documentation/user/rhythms.itely:2152 (comment)
+#. Documentation/user/rhythms.itely:2235 (comment)
 msgid "Right-align bar numbers"
 msgstr "Taktnummern rechtsbündig"
 
-#. Documentation/user/rhythms.itely:2255 (variable)
+#. Documentation/user/rhythms.itely:2338 (variable)
 msgid "pipeSymbol"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2626 (variable)
+#. Documentation/user/rhythms.itely:2725 (variable)
 #. @rglos in Documentation/user/rhythms.itely
 msgid "cadenza"
 msgstr "Kadenz"
@@ -4245,14 +4403,24 @@ msgstr "Pausen eingeben"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
+#. @node in Documentation/es/user/rhythms.itely
+#. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 #, fuzzy
 msgid "Invisible rests"
 msgstr "Pausen Alter Musik"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Full measure rests"
 msgstr "Ganztaktige Pausen"
 
@@ -4358,8 +4526,8 @@ msgstr "Automatische Balken"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
 #. @node in Documentation/de/user/rhythms.itely
@@ -4424,8 +4592,12 @@ msgstr "Taktzahlen"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Bar and bar number checks"
 msgstr "Takt- und Taktzahlüberprüfung"
 
@@ -4560,7 +4732,7 @@ msgstr "Portato"
 #. @node in Documentation/es/user/expressive.itely
 #. @subsubsection in Documentation/es/user/expressive.itely
 #. @node in Documentation/de/user/expressive.itely
-#. @subsubsection in Documentation/de/user/expressive.itely
+#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely
 msgid "New dynamic marks"
 msgstr "Neue Lautstärkezeichen"
 
@@ -4733,7 +4905,7 @@ msgstr "Kurze Wiederholungen"
 #. @node in Documentation/es/user/repeats.itely
 #. @subsubsection in Documentation/es/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Percent repeats"
 msgstr "Prozent-Wiederholungen"
 
@@ -4754,21 +4926,21 @@ msgstr "kleiner"
 #. @node in Documentation/es/user/repeats.itely
 #. @subsubsection in Documentation/es/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Tremolo repeats"
 msgstr "Tremolo-Wiederholung"
 
-#. Documentation/user/simultaneous.itely:482 (variable)
+#. Documentation/user/simultaneous.itely:542 (variable)
 #, fuzzy
 msgid "instrumentOne"
 msgstr "Instrumentenbezeichnungn"
 
-#. Documentation/user/simultaneous.itely:490 (variable)
+#. Documentation/user/simultaneous.itely:550 (variable)
 #, fuzzy
 msgid "instrumentTwo"
 msgstr "Blasinstrumente"
 
-#. Documentation/user/simultaneous.itely:657 (comment)
+#. Documentation/user/simultaneous.itely:717 (comment)
 msgid "Bar 3 ..."
 msgstr ""
 
@@ -4887,37 +5059,28 @@ msgstr "Wiederholungen"
 msgid "Writing music in parallel"
 msgstr "Musik parallel notieren"
 
-#. Documentation/user/staff.itely:536 (comment)
-msgid "No time signature in the ossia staff"
-msgstr ""
-
-#. Documentation/user/staff.itely:678 (comment)
-msgid "To use the setting globally, uncomment the following line:"
-msgstr ""
-
-#. Documentation/user/staff.itely:679 (comment)
-msgid "\\override VerticalAxisGroup #'remove-first = ##t"
-msgstr ""
-
-#. Documentation/user/staff.itely:687 (comment)
-msgid ""
-"To use the setting globally, comment this line, uncomment the line above"
-msgstr ""
+#. Documentation/user/staff.itely:1048 (variable)
+#. Documentation/user/staff.itely:1063 (variable)
+#, fuzzy
+msgid "flute"
+msgstr "B"
 
-#. Documentation/user/staff.itely:1079 (variable)
-msgid "smaller"
-msgstr "kleiner"
+#. Documentation/user/staff.itely:1078 (variable)
+#, fuzzy
+msgid "clarinet"
+msgstr "Linie"
 
-#. Documentation/user/staff.itely:1094 (comment)
-msgid "setup a context for cue notes."
+#. Documentation/user/staff.itely:1173 (variable)
+msgid "oboe"
 msgstr ""
 
-#. Documentation/user/staff.itely:1135 (variable)
-msgid "picc"
+#. Documentation/user/staff.itely:1215 (variable)
+#, fuzzy
+msgid "piccolo"
 msgstr "picc"
 
-#. Documentation/user/staff.itely:1143 (variable)
-msgid "cbsn"
+#. Documentation/user/staff.itely:1223 (variable)
+msgid "cbassoon"
 msgstr ""
 
 #. @node in Documentation/user/staff.itely
@@ -4944,6 +5107,8 @@ msgstr "Systeme anzeigen lassen"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Instantiating new staves"
 msgstr "Neue Notensysteme erstellen"
 
@@ -4957,6 +5122,8 @@ msgstr "Systeme"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Grouping staves"
 msgstr "Systeme gruppieren"
 
@@ -4970,11 +5137,15 @@ msgstr "Akkolade"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Deeper nested staff groups"
 msgstr "Tief verschachtelte Notensysteme"
 
 #. @node in Documentation/user/staff.itely
 #. @subsection in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @subsection in Documentation/fr/user/staff.itely
 msgid "Modifying single staves"
 msgstr "Einzelne Systeme verändern"
 
@@ -4999,6 +5170,8 @@ msgstr "Hilfslinie"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Ossia staves"
 msgstr "Ossia-Systeme"
 
@@ -5092,7 +5265,7 @@ msgstr "Stichnoten"
 msgid "Formatting cue notes"
 msgstr "Stichnoten formatieren"
 
-#. Documentation/user/editorial.itely:323 (comment)
+#. Documentation/user/editorial.itely:321 (comment)
 msgid "this is deliberate nonsense; note that the stems remain black"
 msgstr ""
 
@@ -5228,7 +5401,7 @@ msgstr "Gitternetzlinien"
 msgid "Analysis brackets"
 msgstr "Analyseklammern"
 
-#. Documentation/user/text.itely:410 (variable)
+#. Documentation/user/text.itely:411 (variable)
 #, fuzzy
 msgid "allegro"
 msgstr "kleiner"
@@ -5417,49 +5590,49 @@ msgstr "Tondauern skalieren"
 msgid "correct"
 msgstr ""
 
-#. Documentation/user/vocal.itely:786 (variable)
+#. Documentation/user/vocal.itely:783 (variable)
 msgid "voice"
 msgstr ""
 
-#. Documentation/user/vocal.itely:793 (variable)
+#. Documentation/user/vocal.itely:790 (variable)
 msgid "lyr"
 msgstr "Text"
 
-#. Documentation/user/vocal.itely:1056 (comment)
-msgid "applies to "
+#. Documentation/user/vocal.itely:1053 (comment)
+msgid "applies to \\\"fas\\\""
 msgstr ""
 
-#. Documentation/user/vocal.itely:1225 (comment)
+#. Documentation/user/vocal.itely:1222 (comment)
 msgid "moves the column off the left margin; "
 msgstr ""
 
-#. Documentation/user/vocal.itely:1226 (comment)
+#. Documentation/user/vocal.itely:1223 (comment)
 msgid "can be removed if space on the page is tight"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1234 (comment)
-#. Documentation/user/vocal.itely:1252 (comment)
+#. Documentation/user/vocal.itely:1231 (comment)
+#. Documentation/user/vocal.itely:1249 (comment)
 msgid "adds vertical spacing between verses"
 msgstr "Vertikaler Abstand zwischen Strophen"
 
-#. Documentation/user/vocal.itely:1242 (comment)
+#. Documentation/user/vocal.itely:1239 (comment)
 #, fuzzy
 msgid "adds horizontal spacing between columns; "
 msgstr "Vertikaler Abstand zwischen Strophen"
 
-#. Documentation/user/vocal.itely:1243 (comment)
-msgid "if they are still too close, add more  pairs  "
+#. Documentation/user/vocal.itely:1240 (comment)
+msgid "if they are still too close, add more \\\" \\\" pairs  "
 msgstr ""
 
-#. Documentation/user/vocal.itely:1244 (comment)
+#. Documentation/user/vocal.itely:1241 (comment)
 msgid "until the result looks good"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1260 (comment)
+#. Documentation/user/vocal.itely:1257 (comment)
 msgid "gives some extra space on the right margin; "
 msgstr ""
 
-#. Documentation/user/vocal.itely:1261 (comment)
+#. Documentation/user/vocal.itely:1258 (comment)
 msgid "can be removed if page space is tight"
 msgstr ""
 
@@ -5791,55 +5964,55 @@ msgstr "Übliche Notation für Tasteninstrumente"
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "References for keyboards"
 msgstr "Referenz für Tasteninstrumente"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Changing staff manually"
 msgstr "Notensysteme manuell verändern"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Changing staff automatically"
 msgstr "Automatischer Systemwechsel"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Staff-change lines"
 msgstr "Stimmführungslinien"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Cross-staff stems"
 msgstr "Hälse über beide Systeme"
 
@@ -5861,7 +6034,7 @@ msgstr "Klavier"
 #. @node in Documentation/es/user/keyboards.itely
 #. @subsubsection in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Piano pedals"
 msgstr "Klavierpedal"
 
@@ -5879,11 +6052,11 @@ msgstr "Akkordion"
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Discant symbols"
 msgstr ""
 
@@ -5965,35 +6138,40 @@ msgstr "Zupfinstrumente"
 msgid "Harp"
 msgstr "Harfe"
 
-#. Documentation/user/fretted-strings.itely:210 (variable)
+#. Documentation/user/fretted-strings.itely:223 (variable)
 #, fuzzy
 msgid "melodia"
 msgstr "Melisma"
 
-#. Documentation/user/fretted-strings.itely:376 (comment)
+#. Documentation/user/fretted-strings.itely:297 (variable)
+#, fuzzy
+msgid "mynotes"
+msgstr "HornNoten"
+
+#. Documentation/user/fretted-strings.itely:412 (comment)
 msgid "A chord for ukelele"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:665 (variable)
-#. Documentation/user/fretted-strings.itely:684 (variable)
-#. Documentation/user/fretted-strings.itely:713 (variable)
-#. Documentation/user/fretted-strings.itely:738 (variable)
-#. Documentation/user/fretted-strings.itely:762 (variable)
-#. Documentation/user/fretted-strings.itely:798 (variable)
+#. Documentation/user/fretted-strings.itely:704 (variable)
+#. Documentation/user/fretted-strings.itely:723 (variable)
+#. Documentation/user/fretted-strings.itely:752 (variable)
+#. Documentation/user/fretted-strings.itely:777 (variable)
+#. Documentation/user/fretted-strings.itely:801 (variable)
+#. Documentation/user/fretted-strings.itely:837 (variable)
 #, fuzzy
 msgid "mychords"
 msgstr "Akkorde"
 
-#. Documentation/user/fretted-strings.itely:688 (variable)
+#. Documentation/user/fretted-strings.itely:727 (variable)
 #, fuzzy
 msgid "mychordlist"
 msgstr "Akkorde"
 
-#. Documentation/user/fretted-strings.itely:785 (comment)
+#. Documentation/user/fretted-strings.itely:824 (comment)
 msgid "add a new chord shape"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:789 (comment)
+#. Documentation/user/fretted-strings.itely:828 (comment)
 msgid "add some new chords based on the power chord shape"
 msgstr ""
 
@@ -6020,69 +6198,76 @@ msgid "Common notation for fretted strings"
 msgstr "Übliche Notation für gebundene Saiteninstrumente"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "References for fretted strings"
 msgstr "Referenz für gebundene Saiteninstrumente"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "String number indications"
 msgstr "Seitennummerbezeichnung"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Default tablatures"
 msgstr "Standardtabulaturen"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Custom tablatures"
 msgstr "Angepasste Tabulaturen"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @node in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
+#. @node in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 #, fuzzy
 msgid "Fret diagram markups"
 msgstr "Bund-Diagramme"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #, fuzzy
 msgid "Predefined fret diagrams"
 msgstr "Vordefinierte Optimierungen"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #, fuzzy
 msgid "Automatic fret diagrams"
 msgstr "Automatische Balken"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #, fuzzy
 msgid "Right-hand fingerings"
 msgstr "Fingersatz der rechten Hand"
@@ -6099,18 +6284,22 @@ msgid "Guitar"
 msgstr "Gitarre"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Indicating position and barring"
 msgstr "Position und Barret anzeigen"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @node in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
+#. @node in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 msgid "Indicating harmonics and dampened notes"
 msgstr ""
 
@@ -6126,26 +6315,85 @@ msgid "Banjo"
 msgstr "Banjo"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
 #. @subsubsection in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Banjo tablatures"
 msgstr "Banjo-Tabulaturen"
 
-#. Documentation/user/percussion.itely:214 (variable)
-#. Documentation/user/percussion.itely:394 (variable)
+#. Documentation/user/percussion.itely:175 (variable)
+#. Documentation/user/percussion.itely:365 (variable)
 msgid "up"
 msgstr ""
 
-#. Documentation/user/percussion.itely:215 (variable)
-#. Documentation/user/percussion.itely:395 (variable)
+#. Documentation/user/percussion.itely:178 (variable)
+#. Documentation/user/percussion.itely:366 (variable)
 msgid "down"
 msgstr ""
 
+#. Documentation/user/percussion.itely:388 (comment)
+msgid ""
+"These lines define the position of the woodblocks in the stave, if You like, "
+"You can change it "
+msgstr ""
+
+#. Documentation/user/percussion.itely:389 (comment)
+msgid "or You can use  special note heads for the woodblocks."
+msgstr ""
+
+#. Documentation/user/percussion.itely:391 (comment)
+msgid ""
+"this defines a staff with only two lines. It also defines the positions of "
+"the two lines"
+msgstr ""
+
+#. Documentation/user/percussion.itely:393 (comment)
+msgid "this is neccessary. If not entered, the barline wuld be too short!"
+msgstr ""
+
+#. Documentation/user/percussion.itely:397 (comment)
+msgid "with this You load Your new drum style table"
+msgstr ""
+
+#. Documentation/user/percussion.itely:419 (comment)
+msgid "tambourine-music is entered with \\\"tamb\\\""
+msgstr ""
+
+#. Documentation/user/percussion.itely:425 (comment)
+#, fuzzy
+msgid "broken"
+msgstr "gebrochener Akkord"
+
+#. Documentation/user/percussion.itely:426 (comment)
+msgid "\\set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) "
+msgstr ""
+
+#. Documentation/user/percussion.itely:430 (comment)
+msgid ""
+"the trick with the scaled duration and the shorter rest is neccessary for "
+"the correct ending of the trill-span!"
+msgstr ""
+
+#. Documentation/user/percussion.itely:454 (comment)
+msgid "bells are enterd with:"
+msgstr ""
+
+#. Documentation/user/percussion.itely:455 (comment)
+msgid "\\\"cb\\\" (cowbell) and \\\"rb\\\" (ridebell)\\\" "
+msgstr ""
+
+#. Documentation/user/percussion.itely:484 (variable)
+msgid "drumsA"
+msgstr ""
+
+#. Documentation/user/percussion.itely:493 (variable)
+msgid "drumsB"
+msgstr ""
+
 #. @node in Documentation/user/percussion.itely
 #. @section in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6190,6 +6438,17 @@ msgstr "Referenz für Schlagzeug"
 msgid "Basic percussion notation"
 msgstr "Grundlagen der Schlagzeugnotation"
 
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+msgid "Drum rolls"
+msgstr ""
+
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+#, fuzzy
+msgid "Pitched percussion"
+msgstr "Schlagzeug"
+
 #. @node in Documentation/user/percussion.itely
 #. @subsubsection in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6201,6 +6460,12 @@ msgstr "Grundlagen der Schlagzeugnotation"
 msgid "Percussion staves"
 msgstr "Schlagzeugsysteme"
 
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+#, fuzzy
+msgid "Custom percussion staves"
+msgstr "Schlagzeugsysteme"
+
 #. @node in Documentation/user/percussion.itely
 #. @subsubsection in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6236,27 +6501,16 @@ msgid "Common notation for wind instruments"
 msgstr "Übliche Notation für nichtgebundene Saiteninstrumente"
 
 #. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
-#. @subsubsection in Documentation/fr/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely
 #. @node in Documentation/es/user/wind.itely
-#. @subsubsection in Documentation/es/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "References for wind instruments"
 msgstr "Referenz für Blasinstrumente"
 
-#. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
-#. @node in Documentation/fr/user/wind.itely
-#. @subsubsection in Documentation/fr/user/wind.itely
-#. @node in Documentation/es/user/wind.itely
-#. @subsubsection in Documentation/es/user/wind.itely
-#. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
-msgid "Half-holes"
-msgstr "Halbgeschlossene Löcher"
-
 #. @node in Documentation/user/wind.itely
 #. @subsection in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
@@ -6269,42 +6523,42 @@ msgid "Bagpipes"
 msgstr "Dudelsack"
 
 #. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
 #. @subsubsection in Documentation/fr/user/wind.itely
 #. @node in Documentation/es/user/wind.itely
 #. @subsubsection in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Bagpipe definitions"
 msgstr "Dudelsack-Defintionen"
 
 #. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
 #. @subsubsection in Documentation/fr/user/wind.itely
 #. @node in Documentation/es/user/wind.itely
 #. @subsubsection in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Bagpipe example"
 msgstr "Dudelsack-Beispiele"
 
-#. Documentation/user/chords.itely:651 (variable)
+#. Documentation/user/chords.itely:654 (variable)
 #, fuzzy
 msgid "myChords"
 msgstr "Akkorde"
 
-#. Documentation/user/chords.itely:974 (comment)
-#. Documentation/user/chords.itely:995 (comment)
+#. Documentation/user/chords.itely:981 (comment)
+#. Documentation/user/chords.itely:1002 (comment)
 msgid "Put notes on same Staff as figures"
 msgstr ""
 
-#. Documentation/user/chords.itely:1054 (comment)
+#. Documentation/user/chords.itely:1061 (comment)
 msgid "The extenders are correct here, with the same rhythm as the bass"
 msgstr ""
 
-#. Documentation/user/chords.itely:1066 (comment)
+#. Documentation/user/chords.itely:1073 (comment)
 msgid "The extenders are incorrect here, even though the timing is the same"
 msgstr ""
 
@@ -6424,6 +6678,11 @@ msgstr "Generalbass"
 msgid "Introduction to figured bass"
 msgstr "Grundlagen des Bezifferten Basses"
 
+#. @rglos in Documentation/user/chords.itely
+#, fuzzy
+msgid "figured bass"
+msgstr "Generalbass"
+
 #. @node in Documentation/user/chords.itely
 #. @unnumberedsubsubsec in Documentation/user/chords.itely
 #. @node in Documentation/fr/user/chords.itely
@@ -7171,6 +7430,12 @@ msgstr ""
 msgid "Equalizing different instruments (ii)"
 msgstr ""
 
+#. @node in Documentation/user/input.itely
+#. @subsection in Documentation/user/input.itely
+#, fuzzy
+msgid "Percussion in MIDI"
+msgstr "Schlagzeug"
+
 #. Documentation/user/spacing.itely:684 (comment)
 msgid "this does nothing"
 msgstr ""
@@ -7514,14 +7779,10 @@ msgstr "Proportionale Notation"
 
 #. @node in Documentation/user/spacing.itely
 #. @section in Documentation/user/spacing.itely
-#. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/fr/user/spacing.itely
 #. @section in Documentation/fr/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @section in Documentation/es/user/spacing.itely
-#. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
 #. @node in Documentation/de/user/spacing.itely
 #. @section in Documentation/de/user/spacing.itely
 msgid "Fitting music onto fewer pages"
@@ -7550,14 +7811,18 @@ msgstr "Abstände anzeigen lassen"
 msgid "Changing spacing"
 msgstr "Horizontale Abstände verändern"
 
-#. Documentation/user/changing-defaults.itely:1947 (comment)
+#. Documentation/user/changing-defaults.itely:1940 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:1993 (comment)
+#. Documentation/user/changing-defaults.itely:1986 (comment)
 msgid "Try to remove all key signatures"
 msgstr ""
 
+#. Documentation/user/changing-defaults.itely:2368 (variable)
+msgid "XinO"
+msgstr ""
+
 #. @node in Documentation/user/changing-defaults.itely
 #. @chapter in Documentation/user/changing-defaults.itely
 #. @node in Documentation/fr/user/changing-defaults.itely
@@ -7726,13 +7991,15 @@ msgid "Overview of modifying properties"
 msgstr "Überblick über musikalische Funktionen"
 
 #. @node in Documentation/user/changing-defaults.itely
+#. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
 #, fuzzy
-msgid "The \\set command"
+msgid "The set command"
 msgstr "Der \\override-Befehl"
 
 #. @subsection in Documentation/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @subsection in Documentation/es/user/changing-defaults.itely
 #. @subsection in Documentation/de/user/changing-defaults.itely
 #, fuzzy
@@ -7743,7 +8010,8 @@ msgstr "Der \\override-Befehl"
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
-msgid "The \\override command"
+#, fuzzy
+msgid "The override command"
 msgstr "Der \\override-Befehl"
 
 #. @subsection in Documentation/user/changing-defaults.itely
@@ -7757,7 +8025,8 @@ msgstr "Der \\override-Befehl"
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
-msgid "\\set versus \\override"
+#, fuzzy
+msgid "set versus override"
 msgstr "\\set versus \\override"
 
 #. @subsection in Documentation/user/changing-defaults.itely
@@ -7768,15 +8037,20 @@ msgid "@code{\\set} vs. @code{\\override}"
 msgstr "@code{\\set} versus @code{\\override}"
 
 #. @node in Documentation/user/changing-defaults.itely
-#. @subsection in Documentation/user/changing-defaults.itely
 #. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
-#. @subsection in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
+#, fuzzy
+msgid "The tweak command"
+msgstr "Der \\override-Befehl"
+
+#. @subsection in Documentation/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
+#. @subsection in Documentation/es/user/changing-defaults.itely
 #. @subsection in Documentation/de/user/changing-defaults.itely
-msgid "Objects connected to the input"
-msgstr "Objekte, die mit der Eingabe verbunden sind"
+#, fuzzy
+msgid "The @code{\\tweak} command"
+msgstr "Der \\override-Befehl"
 
 #. @node in Documentation/user/changing-defaults.itely
 #. @section in Documentation/user/changing-defaults.itely
@@ -7906,6 +8180,18 @@ msgstr "Zeilenstile"
 msgid "Rotating objects"
 msgstr "Verschieben von Objekten"
 
+#. @node in Documentation/user/changing-defaults.itely
+#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely
+#, fuzzy
+msgid "Rotating layout objects"
+msgstr "Verschieben von Objekten"
+
+#. @node in Documentation/user/changing-defaults.itely
+#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely
+#, fuzzy
+msgid "Rotating markup"
+msgstr "Textbeschriftung über mehrere Seiten"
+
 #. @node in Documentation/user/changing-defaults.itely
 #. @subsection in Documentation/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
@@ -7965,6 +8251,12 @@ msgstr "Einzelne Systeme verändern"
 msgid "Modifying shapes"
 msgstr "Einzelne Systeme verändern"
 
+#. @node in Documentation/user/changing-defaults.itely
+#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely
+#, fuzzy
+msgid "Modifying ties and slurs"
+msgstr "Einzelne Systeme verändern"
+
 #. @node in Documentation/user/changing-defaults.itely
 #. @section in Documentation/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
@@ -8304,7 +8596,6 @@ msgid "TODO moved into scheme"
 msgstr ""
 
 #. @node in Documentation/user/programming-interface.itely
-#. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/programming-interface.itely
 #. @node in Documentation/de/user/programming-interface.itely
 msgid "Using Scheme code instead of \\tweak"
@@ -8463,6 +8754,12 @@ msgstr "Notenkopfstile"
 msgid "List of articulations"
 msgstr "Liste der Arktikulationszeichen"
 
+#. @node in Documentation/user/notation-appendices.itely
+#. @appendixsec in Documentation/user/notation-appendices.itely
+#, fuzzy
+msgid "Percussion notes"
+msgstr "Schlagzeugsysteme"
+
 #. @node in Documentation/user/notation-appendices.itely
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/fr/user/notation-appendices.itely
@@ -8550,26 +8847,10 @@ msgstr ""
 msgid "Tout ensemble"
 msgstr "Vokalensemble"
 
-#. @node in Documentation/fr/user/tutorial.itely
-#. @subsection in Documentation/fr/user/tutorial.itely
-#. @node in Documentation/de/user/tutorial.itely
-#. @subsection in Documentation/de/user/tutorial.itely
-msgid "Working on text files"
-msgstr "Arbeiten an Text-Dateien"
-
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Exemples cliquables"
 msgstr ""
 
-#. @node in Documentation/fr/user/fundamental.itely
-#. @section in Documentation/fr/user/fundamental.itely
-#. @node in Documentation/es/user/fundamental.itely
-#. @section in Documentation/es/user/fundamental.itely
-#. @node in Documentation/de/user/fundamental.itely
-#. @section in Documentation/de/user/fundamental.itely
-msgid "How LilyPond files work"
-msgstr "Wie eine LilyPond-Datei funktioniert"
-
 #. @node in Documentation/fr/user/tweaks.itely
 #. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
@@ -8577,13 +8858,6 @@ msgstr "Wie eine LilyPond-Datei funktioniert"
 msgid "Common tweaks"
 msgstr "Übliche Optimierungen"
 
-#. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
-#. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
-msgid "Default files"
-msgstr "Standarddateien"
-
 #. @node in Documentation/fr/user/working.itely
 #. @subsection in Documentation/fr/user/working.itely
 #. @node in Documentation/es/user/working.itely
@@ -8602,87 +8876,6 @@ msgstr "GNU LilyPond -- Die Programmbenutzung"
 msgid "GNU LilyPond --- manuel de notation"
 msgstr "GNU LilyPond -- Das Handbuch zum Lernen"
 
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Normal pitches"
-msgstr "Normale Tonhöhen"
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Cautionary accidentals"
-msgstr "Warnungsversetzungszeichen"
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Micro tones"
-msgstr "Mikrotöne"
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Relative octaves"
-msgstr "Relative Oktavenbezeichnung"
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Octave check"
-msgstr "Oktavenüberprüfung"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Augmentation dots"
-msgstr "Punktierung"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/es/user/rhythms.itely
-#. @subsubsection in Documentation/es/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Skips"
-msgstr "Überspringen von Zeichen"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Multi measure rests"
-msgstr "Mehrtaktige Pausen"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Bar check"
-msgstr "Taktüberprüfung"
-
-#
-#
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Barnumber check"
-msgstr "Taktzahlüberprüfung"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Proportional notation (introduction)"
-msgstr "Proportionale Notation (Einleitung)"
-
 #. @node in Documentation/fr/user/repeats.itely
 #. @subsection in Documentation/fr/user/repeats.itely
 msgid "Writing repeats"
@@ -8691,21 +8884,21 @@ msgstr "Wiederholungen eingeben"
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Repeat types"
 msgstr "Wiederholungtypen"
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Repeat syntax"
 msgstr "Die Syntax der Wiederholungen"
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Manual repeat commands"
 msgstr "Manuelle Wiederholungsbefehle"
 
@@ -8717,7 +8910,7 @@ msgstr "Andere Wiederholungen"
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Tremolo subdivisions"
 msgstr "Tremolo-Unterteilung"
 
@@ -8740,15 +8933,6 @@ msgstr "Einfache Mehrstimmigkeit"
 msgid "Collision Resolution"
 msgstr "Auflösung von Zusammenstößen"
 
-#. @node in Documentation/fr/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
-#. @node in Documentation/es/user/staff.itely
-#. @subsubsection in Documentation/es/user/staff.itely
-#. @node in Documentation/de/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
-msgid "System start delimiters"
-msgstr "Klammern am Systemanfang"
-
 #. @node in Documentation/fr/user/editorial.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely
 msgid "Blank music sheet"
@@ -8778,51 +8962,22 @@ msgid "Basculer vers une mélodie alternative"
 msgstr ""
 
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "The piano staff"
 msgstr "Das Klaviersystem"
 
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
-msgid "Fret diagrams"
-msgstr "Bund-Diagramme"
-
-#. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
-#. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
-#. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Right hand fingerings"
 msgstr "Fingersatz der rechten Hand"
 
-#. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
-#. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
-#. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
-msgid "Guitar tablatures"
-msgstr "Gitarren-Tabulaturen"
-
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @section in Documentation/fr/user/changing-defaults.itely
-msgid "Automatic notation"
-msgstr "Automatische Notation"
-
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
-msgid "Changing context properties on the fly"
-msgstr "Umgebungseigenschaften lokal ändern"
-
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @subsection in Documentation/fr/user/changing-defaults.itely
 msgid "Layout tunings within contexts"
@@ -8833,6 +8988,11 @@ msgstr "Layouteinstellungen mit Umgebungen"
 msgid "Constructing a tweak"
 msgstr "Eine Korrektur konstruieren"
 
+#. @node in Documentation/fr/user/changing-defaults.itely
+#, fuzzy
+msgid "Using Scheme code instead of tweak"
+msgstr "Scheme-Code anstelle von \\tweak verwenden"
+
 #. @subsubheading in Documentation/es/user/macros.itexi
 msgid "Instrucciones predefinidas"
 msgstr ""
@@ -8853,6 +9013,13 @@ msgstr ""
 msgid "Advertencias y problemas conocidos"
 msgstr ""
 
+#. @node in Documentation/es/user/fundamental.itely
+#. @section in Documentation/es/user/fundamental.itely
+#. @node in Documentation/de/user/fundamental.itely
+#. @section in Documentation/de/user/fundamental.itely
+msgid "How LilyPond files work"
+msgstr "Wie eine LilyPond-Datei funktioniert"
+
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 msgid "Automatic behaviour"
@@ -8889,6 +9056,13 @@ msgstr ""
 msgid "Writing long repeats"
 msgstr "Lange Wiederholungen eingeben"
 
+#. @node in Documentation/es/user/staff.itely
+#. @subsubsection in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
+msgid "System start delimiters"
+msgstr "Klammern am Systemanfang"
+
 #. @rglos in Documentation/es/user/chords.itely
 msgid "  "
 msgstr ""
@@ -8940,6 +9114,11 @@ msgstr "Mehr Information"
 msgid "Unix"
 msgstr "Unix"
 
+#. @node in Documentation/de/user/tutorial.itely
+#. @subsection in Documentation/de/user/tutorial.itely
+msgid "Working on text files"
+msgstr "Arbeiten an Text-Dateien"
+
 #. @rglos in Documentation/de/user/tutorial.itely
 msgid "legato"
 msgstr "Legato"
@@ -8967,6 +9146,11 @@ msgstr "Laissez-vibrer-Bögen"
 msgid "Chords"
 msgstr "Akkorde"
 
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
+msgid "Guitar tablatures"
+msgstr "Gitarren-Tabulaturen"
+
 msgid "Up:"
 msgstr "Nach oben:"
 
@@ -8985,6 +9169,59 @@ msgstr "Fußnoten"
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
+#~ msgid "smaller"
+#~ msgstr "kleiner"
+
+#~ msgid "Half-holes"
+#~ msgstr "Halbgeschlossene Löcher"
+
+#~ msgid "Objects connected to the input"
+#~ msgstr "Objekte, die mit der Eingabe verbunden sind"
+
+#~ msgid "Default files"
+#~ msgstr "Standarddateien"
+
+#~ msgid "Normal pitches"
+#~ msgstr "Normale Tonhöhen"
+
+#~ msgid "Cautionary accidentals"
+#~ msgstr "Warnungsversetzungszeichen"
+
+#~ msgid "Micro tones"
+#~ msgstr "Mikrotöne"
+
+#~ msgid "Relative octaves"
+#~ msgstr "Relative Oktavenbezeichnung"
+
+#~ msgid "Octave check"
+#~ msgstr "Oktavenüberprüfung"
+
+#~ msgid "Augmentation dots"
+#~ msgstr "Punktierung"
+
+#~ msgid "Skips"
+#~ msgstr "Überspringen von Zeichen"
+
+#~ msgid "Multi measure rests"
+#~ msgstr "Mehrtaktige Pausen"
+
+#~ msgid "Bar check"
+#~ msgstr "Taktüberprüfung"
+
+#
+#
+#~ msgid "Barnumber check"
+#~ msgstr "Taktzahlüberprüfung"
+
+#~ msgid "Proportional notation (introduction)"
+#~ msgstr "Proportionale Notation (Einleitung)"
+
+#~ msgid "Fret diagrams"
+#~ msgstr "Bund-Diagramme"
+
+#~ msgid "Automatic notation"
+#~ msgstr "Automatische Notation"
+
 #, fuzzy
 #~ msgid "Microtones in MIDI"
 #~ msgstr "Mikrotöne"
@@ -9194,9 +9431,6 @@ msgstr "Inhaltsverzeichnis"
 #~ msgid "hairpin"
 #~ msgstr "Gabel"
 
-#~ msgid "broken chord"
-#~ msgstr "gebrochener Akkord"
-
 #~ msgid "Modern chords"
 #~ msgstr "Moderne Akkorde"
 
diff --git a/Documentation/po/es.po b/Documentation/po/es.po
index f1057ed514..49e4e3f882 100644
--- a/Documentation/po/es.po
+++ b/Documentation/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-18 00:28+0200\n"
+"POT-Creation-Date: 2008-08-23 18:33+0200\n"
 "PO-Revision-Date: 2008-08-18 01:46+0200\n"
 "Last-Translator: Francisco Vila <francisco.vila@hispalinux.es>\n"
 "Language-Team: Español\n"
@@ -28,7 +28,10 @@ msgstr ""
 #: add_html_footer.py:48
 #, python-format
 msgid "Report errors to <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
-msgstr "Informe de los fallos a través de la lista en español <a href=\"http://es.groups.yahoo.com/group/lilypond-es/\">lilypond-es</a>, o en inglés a través de <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
+msgstr ""
+"Informe de los fallos a través de la lista en español <a href=\"http://es."
+"groups.yahoo.com/group/lilypond-es/\">lilypond-es</a>, o en inglés a través "
+"de <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
 
 #: add_html_footer.py:50
 #, python-format
@@ -313,31 +316,55 @@ msgstr "Sobre la documentación"
 
 #. @node in Documentation/user/introduction.itely
 #. @unnumberedsubsec in Documentation/user/introduction.itely
+#. @node in Documentation/fr/user/introduction.itely
+#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
+#. @node in Documentation/es/user/introduction.itely
+#. @unnumberedsubsec in Documentation/es/user/introduction.itely
 msgid "About the Learning Manual"
 msgstr "Sobre el Manual de aprendizaje"
 
 #. @node in Documentation/user/introduction.itely
 #. @unnumberedsubsec in Documentation/user/introduction.itely
+#. @node in Documentation/fr/user/introduction.itely
+#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
+#. @node in Documentation/es/user/introduction.itely
+#. @unnumberedsubsec in Documentation/es/user/introduction.itely
 msgid "About the Music Glossary"
 msgstr "Sobre el Glosario Musical"
 
 #. @node in Documentation/user/introduction.itely
 #. @unnumberedsubsec in Documentation/user/introduction.itely
+#. @node in Documentation/fr/user/introduction.itely
+#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
+#. @node in Documentation/es/user/introduction.itely
+#. @unnumberedsubsec in Documentation/es/user/introduction.itely
 msgid "About the Notation Reference"
 msgstr "Sobre la Referencia de la notación"
 
 #. @node in Documentation/user/introduction.itely
 #. @unnumberedsubsec in Documentation/user/introduction.itely
+#. @node in Documentation/fr/user/introduction.itely
+#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
+#. @node in Documentation/es/user/introduction.itely
+#. @unnumberedsubsec in Documentation/es/user/introduction.itely
 msgid "About the Application Usage"
 msgstr "Sobre el manual de Utilización del programa"
 
 #. @node in Documentation/user/introduction.itely
 #. @unnumberedsubsec in Documentation/user/introduction.itely
+#. @node in Documentation/fr/user/introduction.itely
+#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
+#. @node in Documentation/es/user/introduction.itely
+#. @unnumberedsubsec in Documentation/es/user/introduction.itely
 msgid "About the Snippet List"
 msgstr "Sobre la lista de fragmentos de código"
 
 #. @node in Documentation/user/introduction.itely
 #. @unnumberedsubsec in Documentation/user/introduction.itely
+#. @node in Documentation/fr/user/introduction.itely
+#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
+#. @node in Documentation/es/user/introduction.itely
+#. @unnumberedsubsec in Documentation/es/user/introduction.itely
 msgid "About the Internals Reference"
 msgstr "Sobre el Manual de Referencia de Funcionamiento Interno"
 
@@ -654,6 +681,8 @@ msgstr "Todo junto"
 
 #. @node in Documentation/user/tutorial.itely
 #. @subsection in Documentation/user/tutorial.itely
+#. @node in Documentation/fr/user/tutorial.itely
+#. @subsection in Documentation/fr/user/tutorial.itely
 #. @node in Documentation/es/user/tutorial.itely
 #. @subsection in Documentation/es/user/tutorial.itely
 msgid "Working on input files"
@@ -826,8 +855,8 @@ msgstr "Ligaduras de unión y de expresión"
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
 #. @subheading in Documentation/de/user/tutorial.itely
-#. @node in Documentation/de/user/expressive.itely
-#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Ties"
 msgstr "Ligaduras de unión"
 
@@ -924,8 +953,14 @@ msgstr "Articulaciones"
 #. @node in Documentation/user/wind.itely
 #. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @subheading in Documentation/fr/user/tutorial.itely
+#. @node in Documentation/fr/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely
 #. @subheading in Documentation/es/user/tutorial.itely
+#. @node in Documentation/es/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/es/user/wind.itely
 #. @subheading in Documentation/de/user/tutorial.itely
+#. @node in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Fingerings"
 msgstr "Digitaciones"
 
@@ -1383,11 +1418,21 @@ msgid "lower"
 msgstr "inferior"
 
 #. Documentation/user/fundamental.itely:614 (comment)
+msgid "Voice \\\"1\\\"                  Voice \\\"2\\\""
+msgstr ""
+
 #. Documentation/user/fundamental.itely:624 (comment)
+msgid "Voice \\\"1\\\"             Voice \\\"2\\\""
+msgstr ""
+
 #. Documentation/user/fundamental.itely:639 (comment)
+#, fuzzy
+msgid "Voice \\\"1\\\""
+msgstr "Voz "
+
 #. Documentation/user/fundamental.itely:644 (comment)
-#. Documentation/user/fundamental.itely:664 (comment)
-msgid "Voice "
+#, fuzzy
+msgid "Voice \\\"2\\\""
 msgstr "Voz "
 
 #. Documentation/user/fundamental.itely:662 (comment)
@@ -1395,18 +1440,22 @@ msgstr "Voz "
 msgid "Main voice"
 msgstr "Voz principal"
 
+#. Documentation/user/fundamental.itely:664 (comment)
+msgid "Voice \\\"1\\\"     Voice \\\"2\\\"                 Voice \\\"3\\\""
+msgstr ""
+
 #. Documentation/user/fundamental.itely:688 (comment)
-#. Documentation/user/simultaneous.itely:646 (comment)
-#. Documentation/user/simultaneous.itely:671 (comment)
-#. Documentation/user/simultaneous.itely:698 (comment)
+#. Documentation/user/simultaneous.itely:653 (comment)
+#. Documentation/user/simultaneous.itely:678 (comment)
+#. Documentation/user/simultaneous.itely:705 (comment)
 msgid "Bar 1"
 msgstr "Compás 1"
 
 # También Líneas divisorias. FVD
 #. Documentation/user/fundamental.itely:699 (comment)
-#. Documentation/user/simultaneous.itely:651 (comment)
-#. Documentation/user/simultaneous.itely:676 (comment)
-#. Documentation/user/simultaneous.itely:704 (comment)
+#. Documentation/user/simultaneous.itely:658 (comment)
+#. Documentation/user/simultaneous.itely:683 (comment)
+#. Documentation/user/simultaneous.itely:711 (comment)
 msgid "Bar 2"
 msgstr "Compás 2"
 
@@ -1477,7 +1526,7 @@ msgstr "Iniciar la primera voz"
 #. Documentation/user/fundamental.itely:1196 (variable)
 #. Documentation/user/fundamental.itely:2579 (variable)
 #. Documentation/user/tweaks.itely:3170 (variable)
-#. Documentation/user/simultaneous.itely:692 (variable)
+#. Documentation/user/simultaneous.itely:699 (variable)
 msgid "global"
 msgstr "global"
 
@@ -1784,6 +1833,8 @@ msgstr "Conceptos fundamentales"
 
 #. @node in Documentation/user/fundamental.itely
 #. @section in Documentation/user/fundamental.itely
+#. @node in Documentation/fr/user/fundamental.itely
+#. @section in Documentation/fr/user/fundamental.itely
 msgid "How LilyPond input files work"
 msgstr "Cómo funcionan los archivos de entrada de LilyPond"
 
@@ -1823,6 +1874,7 @@ msgstr "Anidado de expresiones musicales"
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
 #. @rglos in Documentation/user/staff.itely
+#. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 msgid "ossia"
@@ -1875,6 +1927,7 @@ msgid "Explicitly instantiating voices"
 msgstr "Voces explícitas"
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 msgid "Note columns"
 msgstr "Columnas de notas"
 
@@ -1906,6 +1959,8 @@ msgstr "Contextos y grabadores"
 #. @subsection in Documentation/user/changing-defaults.itely
 #. @node in Documentation/fr/user/fundamental.itely
 #. @subsection in Documentation/fr/user/fundamental.itely
+#. @node in Documentation/fr/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/fundamental.itely
 #. @subsection in Documentation/es/user/fundamental.itely
 #. @node in Documentation/es/user/changing-defaults.itely
@@ -1957,10 +2012,12 @@ msgid "Modifying context properties"
 msgstr "Modificar las propiedades de los contextos"
 
 #. @unnumberedsubsubsec in Documentation/user/fundamental.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fundamental.itely
 msgid "Setting context properties with @code{\\with}"
 msgstr "Cambiar las propiedades de un contexto con @code{\\with}"
 
 #. @unnumberedsubsubsec in Documentation/user/fundamental.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fundamental.itely
 msgid "Setting context properties with @code{\\context}"
 msgstr "Cambiar las propiedades de un contexto con @code{\\context}"
 
@@ -1976,18 +2033,21 @@ msgid "Adding and removing engravers"
 msgstr "Añadir y eliminar grabadores"
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 #. @subsubheading in Documentation/es/user/fundamental.itely
 msgid "Changing a single context"
 msgstr "Cambiar un solo contexto"
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/pitches.itely
+#. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/pitches.itely
 msgid "ambitus"
 msgstr "tesitura"
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 #. @subsubheading in Documentation/es/user/fundamental.itely
 msgid "Changing all contexts of the same type"
 msgstr "Cambiar todos los contextos del mismo tipo"
@@ -2049,7 +2109,8 @@ msgstr "Aumentar solamente el grosor de la ligadura siguiente"
 
 #. Documentation/user/tweaks.itely:669 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
-msgstr "Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2"
+msgstr ""
+"Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2"
 
 #. Documentation/user/tweaks.itely:1267 (comment)
 msgid "Don't print clefs in this staff"
@@ -2065,7 +2126,8 @@ msgstr "Reducir el tamaño de la fuente en un 24% aprox."
 
 #. Documentation/user/tweaks.itely:1386 (comment)
 msgid "Reduce stem length and line spacing to match"
-msgstr "Reducir la longitud de la plica y el espaciado de la línea en coincidencia"
+msgstr ""
+"Reducir la longitud de la plica y el espaciado de la línea en coincidencia"
 
 #. Documentation/user/tweaks.itely:1760 (comment)
 #. Documentation/user/tweaks.itely:1821 (comment)
@@ -2107,7 +2169,8 @@ msgstr "Detener el corchete de octava"
 
 #. Documentation/user/tweaks.itely:1826 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
-msgstr "Situar el corchete de octava ulterior por debajo de los extensores de texto"
+msgstr ""
+"Situar el corchete de octava ulterior por debajo de los extensores de texto"
 
 #. Documentation/user/tweaks.itely:1882 (comment)
 msgid "Cause notes to space out to accommodate text"
@@ -2524,7 +2587,8 @@ msgstr "la propiedad padding (relleno)"
 #. @subheading in Documentation/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 msgid "left-padding and right-padding"
-msgstr "left-padding y right-padding (relleno por la izquierda y por la derecha)"
+msgstr ""
+"left-padding y right-padding (relleno por la izquierda y por la derecha)"
 
 #. @subheading in Documentation/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
@@ -3138,6 +3202,7 @@ msgid "Running requirements"
 msgstr "Requisitos para la ejecución"
 
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Requirements for building documentation"
 msgstr "Requisitos para construir la documentación"
@@ -3164,6 +3229,7 @@ msgid "Compiling for multiple platforms"
 msgstr "Compilar para distintas plataformas"
 
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Compiling outside the source tree"
 msgstr "Compilar fuera del árbol del código fuente"
@@ -3171,6 +3237,8 @@ msgstr "Compilar fuera del árbol del código fuente"
 #. @node in Documentation/user/install.itely
 #. @subsection in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/es/user/install.itely
+#. @node in Documentation/es/user/install.itely
+#. @subsection in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @subsection in Documentation/de/user/install.itely
 msgid "Building documentation"
@@ -3178,6 +3246,8 @@ msgstr "Construir la documentación"
 
 #. @node in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @node in Documentation/es/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Commands for building documentation"
@@ -3186,7 +3256,7 @@ msgstr "Instrucciones para construir la documentación"
 #. @node in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/user/install.itely
 #. @node in Documentation/es/user/install.itely
-#. @subsection in Documentation/es/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Building documentation without compiling LilyPond"
@@ -4150,7 +4220,8 @@ msgstr "Establecer longitud de barra del subgrupo a semicorchea"
 
 #. Documentation/user/rhythms.itely:1698 (comment)
 msgid "end 1/16 beams for all time signatures at the 1/16 moment"
-msgstr "finalizar barras de semicorchea para todos los compases en el momento 1/16"
+msgstr ""
+"finalizar barras de semicorchea para todos los compases en el momento 1/16"
 
 #. Documentation/user/rhythms.itely:1702 (comment)
 msgid "end 1/32 beams for all time signatures at the 1/16 moment"
@@ -4192,7 +4263,8 @@ msgstr "Imprimir el número de compás cada dos compases"
 
 #. Documentation/user/rhythms.itely:2197 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
-msgstr "No poner números de compás al final de la línea, pero sí en otros lugares"
+msgstr ""
+"No poner números de compás al final de la línea, pero sí en otros lugares"
 
 #. Documentation/user/rhythms.itely:2201 (comment)
 #. Documentation/user/rhythms.itely:2227 (comment)
@@ -4313,13 +4385,23 @@ msgstr "Escritura de silencios"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
+#. @node in Documentation/es/user/rhythms.itely
+#. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Invisible rests"
 msgstr "Silencios invisibles"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Full measure rests"
 msgstr "Silencios de compás completo"
 
@@ -4425,8 +4507,8 @@ msgstr "Barras automáticas"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
 #. @node in Documentation/de/user/rhythms.itely
@@ -4493,8 +4575,12 @@ msgstr "Numeración de compases"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Bar and bar number checks"
 msgstr "Comprobación de compás y de número de compás"
 
@@ -4627,7 +4713,7 @@ msgstr "portato"
 #. @node in Documentation/es/user/expressive.itely
 #. @subsubsection in Documentation/es/user/expressive.itely
 #. @node in Documentation/de/user/expressive.itely
-#. @subsubsection in Documentation/de/user/expressive.itely
+#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely
 msgid "New dynamic marks"
 msgstr "Indicaciones dinámicas contemporáneas"
 
@@ -4799,7 +4885,7 @@ msgstr "Repeticiones cortas"
 #. @node in Documentation/es/user/repeats.itely
 #. @subsubsection in Documentation/es/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Percent repeats"
 msgstr "Repeticiones de compás o parte de ellos"
 
@@ -4818,19 +4904,19 @@ msgstr "simile"
 #. @node in Documentation/es/user/repeats.itely
 #. @subsubsection in Documentation/es/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Tremolo repeats"
 msgstr "Repeticiones de trémolo"
 
-#. Documentation/user/simultaneous.itely:535 (variable)
+#. Documentation/user/simultaneous.itely:542 (variable)
 msgid "instrumentOne"
 msgstr "instrumentoUno"
 
-#. Documentation/user/simultaneous.itely:543 (variable)
+#. Documentation/user/simultaneous.itely:550 (variable)
 msgid "instrumentTwo"
 msgstr "instrumentoDos"
 
-#. Documentation/user/simultaneous.itely:710 (comment)
+#. Documentation/user/simultaneous.itely:717 (comment)
 msgid "Bar 3 ..."
 msgstr "Compás 3 ..."
 
@@ -4945,40 +5031,29 @@ msgstr "parte"
 msgid "Writing music in parallel"
 msgstr "Escribir música en paralelo"
 
-#. Documentation/user/staff.itely:536 (comment)
-msgid "No time signature in the ossia staff"
-msgstr "El ossia no tiene compás"
-
-#. Documentation/user/staff.itely:678 (comment)
-msgid "To use the setting globally, uncomment the following line:"
-msgstr ""
-"Para emplear el ajuste globalmente, quite el comentario de la línea "
-"siguiente:"
+#. Documentation/user/staff.itely:1048 (variable)
+#. Documentation/user/staff.itely:1063 (variable)
+#, fuzzy
+msgid "flute"
+msgstr "bemol"
 
-#. Documentation/user/staff.itely:679 (comment)
-msgid "\\override VerticalAxisGroup #'remove-first = ##t"
-msgstr "\\override VerticalAxisGroup #'remove-first = ##t"
+#. Documentation/user/staff.itely:1078 (variable)
+#, fuzzy
+msgid "clarinet"
+msgstr "línea"
 
-#. Documentation/user/staff.itely:687 (comment)
-msgid "To use the setting globally, comment this line, uncomment the line above"
+#. Documentation/user/staff.itely:1173 (variable)
+msgid "oboe"
 msgstr ""
-"Para emplear el ajuste globalmente, comente esta línea, descomente la "
-"anterior"
-
-#. Documentation/user/staff.itely:1079 (variable)
-msgid "smaller"
-msgstr "menor"
 
-#. Documentation/user/staff.itely:1094 (comment)
-msgid "setup a context for cue notes."
-msgstr "preparar un contexto para las notas guía"
-
-#. Documentation/user/staff.itely:1135 (variable)
-msgid "picc"
+#. Documentation/user/staff.itely:1215 (variable)
+#, fuzzy
+msgid "piccolo"
 msgstr "fltin"
 
-#. Documentation/user/staff.itely:1143 (variable)
-msgid "cbsn"
+#. Documentation/user/staff.itely:1223 (variable)
+#, fuzzy
+msgid "cbassoon"
 msgstr "cbjo"
 
 #. @node in Documentation/user/staff.itely
@@ -5005,6 +5080,8 @@ msgstr "Impresión de los pentagramas"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Instantiating new staves"
 msgstr "Crear instancias de pentagramas nuevos"
 
@@ -5018,6 +5095,8 @@ msgstr "pentagramas"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Grouping staves"
 msgstr "Agrupar pentagramas"
 
@@ -5031,11 +5110,15 @@ msgstr "sistema de piano"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Deeper nested staff groups"
 msgstr "Grupos de pentagramas más complejos"
 
 #. @node in Documentation/user/staff.itely
 #. @subsection in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @subsection in Documentation/fr/user/staff.itely
 msgid "Modifying single staves"
 msgstr "Modificación de pentagramas sueltos"
 
@@ -5060,6 +5143,8 @@ msgstr "línea adicional"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Ossia staves"
 msgstr "Pentagramas de Ossia"
 
@@ -5155,7 +5240,8 @@ msgstr "Formateo de las notas de aviso"
 
 #. Documentation/user/editorial.itely:321 (comment)
 msgid "this is deliberate nonsense; note that the stems remain black"
-msgstr "esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras"
+msgstr ""
+"esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras"
 
 #. @node in Documentation/user/editorial.itely
 #. @section in Documentation/user/editorial.itely
@@ -5289,7 +5375,7 @@ msgstr "Líneas de rejilla"
 msgid "Analysis brackets"
 msgstr "Corchetes de análisis"
 
-#. Documentation/user/text.itely:410 (variable)
+#. Documentation/user/text.itely:411 (variable)
 msgid "allegro"
 msgstr "allegro"
 
@@ -5487,7 +5573,8 @@ msgid "lyr"
 msgstr "letra"
 
 #. Documentation/user/vocal.itely:1053 (comment)
-msgid "applies to "
+#, fuzzy
+msgid "applies to \\\"fas\\\""
 msgstr "se aplica a"
 
 #. Documentation/user/vocal.itely:1222 (comment)
@@ -5508,7 +5595,8 @@ msgid "adds horizontal spacing between columns; "
 msgstr "añade espaciado horizontal entre columnas; "
 
 #. Documentation/user/vocal.itely:1240 (comment)
-msgid "if they are still too close, add more  pairs  "
+#, fuzzy
+msgid "if they are still too close, add more \\\" \\\" pairs  "
 msgstr "si aún están muy juntas, añada más parejas "
 
 #. Documentation/user/vocal.itely:1241 (comment)
@@ -5852,55 +5940,55 @@ msgstr "Notación usual para instrumentos de teclado"
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "References for keyboards"
 msgstr "Referencias para teclados"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Changing staff manually"
 msgstr "Cambiar de pentagrama manualmente"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Changing staff automatically"
 msgstr "Cambiar de pentagrama automáticamente"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Staff-change lines"
 msgstr "Líneas de cambio de pentagrama"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Cross-staff stems"
 msgstr "Plicas de pentagrama cruzado"
 
@@ -5922,7 +6010,7 @@ msgstr "Piano"
 #. @node in Documentation/es/user/keyboards.itely
 #. @subsubsection in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Piano pedals"
 msgstr "Pedales de piano"
 
@@ -5940,11 +6028,11 @@ msgstr "Acordeón"
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Discant symbols"
 msgstr "Símbolos de Discanto"
 
@@ -6083,49 +6171,55 @@ msgstr "Notación usual para cuerdas con trastes"
 #. @node in Documentation/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "References for fretted strings"
 msgstr "Referencias para cuerdas con trastes"
 
 #. @node in Documentation/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "String number indications"
 msgstr "Indicación de los números de cuerda"
 
 #. @node in Documentation/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Default tablatures"
 msgstr "Tablaturas predeterminadas"
 
 #. @node in Documentation/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Custom tablatures"
 msgstr "Tablaturas personalizadas"
 
 #. @node in Documentation/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @node in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
+#. @node in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Fret diagram markups"
 msgstr "Marcas de diagramas de trastes"
 
@@ -6141,6 +6235,7 @@ msgstr "Diagramas de traste automáticos"
 
 #. @node in Documentation/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 msgid "Right-hand fingerings"
 msgstr "Digitaciones de la mano derecha"
 
@@ -6158,16 +6253,20 @@ msgstr "Guitarra"
 #. @node in Documentation/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Indicating position and barring"
 msgstr "Indicar la posición y la cejilla"
 
 #. @node in Documentation/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @node in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
+#. @node in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 msgid "Indicating harmonics and dampened notes"
 msgstr "Indicar armónicos y notas tapadas"
 
@@ -6187,22 +6286,81 @@ msgstr "Banjo"
 #. @node in Documentation/fr/user/fretted-strings.itely
 #. @subsubsection in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Banjo tablatures"
 msgstr "Tablaturas de banjo"
 
-#. Documentation/user/percussion.itely:214 (variable)
-#. Documentation/user/percussion.itely:394 (variable)
+#. Documentation/user/percussion.itely:175 (variable)
+#. Documentation/user/percussion.itely:365 (variable)
 msgid "up"
 msgstr "arriba"
 
-#. Documentation/user/percussion.itely:215 (variable)
-#. Documentation/user/percussion.itely:395 (variable)
+#. Documentation/user/percussion.itely:178 (variable)
+#. Documentation/user/percussion.itely:366 (variable)
 msgid "down"
 msgstr "abajo"
 
+#. Documentation/user/percussion.itely:388 (comment)
+msgid ""
+"These lines define the position of the woodblocks in the stave, if You like, "
+"You can change it "
+msgstr ""
+
+#. Documentation/user/percussion.itely:389 (comment)
+msgid "or You can use  special note heads for the woodblocks."
+msgstr ""
+
+#. Documentation/user/percussion.itely:391 (comment)
+msgid ""
+"this defines a staff with only two lines. It also defines the positions of "
+"the two lines"
+msgstr ""
+
+#. Documentation/user/percussion.itely:393 (comment)
+msgid "this is neccessary. If not entered, the barline wuld be too short!"
+msgstr ""
+
+#. Documentation/user/percussion.itely:397 (comment)
+msgid "with this You load Your new drum style table"
+msgstr ""
+
+#. Documentation/user/percussion.itely:419 (comment)
+msgid "tambourine-music is entered with \\\"tamb\\\""
+msgstr ""
+
+#. Documentation/user/percussion.itely:425 (comment)
+#, fuzzy
+msgid "broken"
+msgstr "llave o corchete"
+
+#. Documentation/user/percussion.itely:426 (comment)
+msgid "\\set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) "
+msgstr ""
+
+#. Documentation/user/percussion.itely:430 (comment)
+msgid ""
+"the trick with the scaled duration and the shorter rest is neccessary for "
+"the correct ending of the trill-span!"
+msgstr ""
+
+#. Documentation/user/percussion.itely:454 (comment)
+msgid "bells are enterd with:"
+msgstr ""
+
+#. Documentation/user/percussion.itely:455 (comment)
+msgid "\\\"cb\\\" (cowbell) and \\\"rb\\\" (ridebell)\\\" "
+msgstr ""
+
+#. Documentation/user/percussion.itely:484 (variable)
+msgid "drumsA"
+msgstr ""
+
+#. Documentation/user/percussion.itely:493 (variable)
+msgid "drumsB"
+msgstr ""
+
 #. @node in Documentation/user/percussion.itely
 #. @section in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6247,6 +6405,17 @@ msgstr "Referencias para percusión"
 msgid "Basic percussion notation"
 msgstr "Notación básica de percusión"
 
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+msgid "Drum rolls"
+msgstr ""
+
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+#, fuzzy
+msgid "Pitched percussion"
+msgstr "Percusión"
+
 #. @node in Documentation/user/percussion.itely
 #. @subsubsection in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6258,6 +6427,12 @@ msgstr "Notación básica de percusión"
 msgid "Percussion staves"
 msgstr "Pautas de percusión"
 
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+#, fuzzy
+msgid "Custom percussion staves"
+msgstr "Pautas de percusión"
+
 #. @node in Documentation/user/percussion.itely
 #. @subsubsection in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6294,11 +6469,11 @@ msgstr "Notación usual para instrumentos de viento"
 #. @node in Documentation/user/wind.itely
 #. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
-#. @subsubsection in Documentation/fr/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely
 #. @node in Documentation/es/user/wind.itely
-#. @subsubsection in Documentation/es/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "References for wind instruments"
 msgstr "Referencias para instrumentos de viento"
 
@@ -6320,7 +6495,7 @@ msgstr "Gaita"
 #. @node in Documentation/es/user/wind.itely
 #. @subsubsection in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Bagpipe definitions"
 msgstr "Definiciones para la gaita"
 
@@ -6331,7 +6506,7 @@ msgstr "Definiciones para la gaita"
 #. @node in Documentation/es/user/wind.itely
 #. @subsubsection in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Bagpipe example"
 msgstr "Ejemplo de música de gaita"
 
@@ -7197,6 +7372,12 @@ msgstr "Balance entre instrumentos (i)"
 msgid "Equalizing different instruments (ii)"
 msgstr "Balance entre instrumentos (i)"
 
+#. @node in Documentation/user/input.itely
+#. @subsection in Documentation/user/input.itely
+#, fuzzy
+msgid "Percussion in MIDI"
+msgstr "Percusión"
+
 #. Documentation/user/spacing.itely:684 (comment)
 msgid "this does nothing"
 msgstr "esto no hace nada"
@@ -7219,7 +7400,8 @@ msgstr "esta vez el texto estará más cerca del pentagrama"
 
 #. Documentation/user/spacing.itely:1462 (comment)
 msgid "by setting outside-staff-priority to a non-number, "
-msgstr "ajustando el valor de outside-staff-priority a algo que no sea un número, "
+msgstr ""
+"ajustando el valor de outside-staff-priority a algo que no sea un número, "
 
 #. Documentation/user/spacing.itely:1463 (comment)
 msgid "we disable the automatic collision avoidance"
@@ -7747,12 +7929,14 @@ msgid "Overview of modifying properties"
 msgstr "Panorámica de la modificación de las propiedades"
 
 #. @node in Documentation/user/changing-defaults.itely
+#. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
 msgid "The set command"
 msgstr "La instrucción set"
 
 #. @subsection in Documentation/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @subsection in Documentation/es/user/changing-defaults.itely
 #. @subsection in Documentation/de/user/changing-defaults.itely
 msgid "The @code{\\set} command"
@@ -8482,6 +8666,12 @@ msgstr "Estilos de cabezas de nota"
 msgid "List of articulations"
 msgstr "Lista de articulaciones"
 
+#. @node in Documentation/user/notation-appendices.itely
+#. @appendixsec in Documentation/user/notation-appendices.itely
+#, fuzzy
+msgid "Percussion notes"
+msgstr "Pautas de percusión"
+
 #. @node in Documentation/user/notation-appendices.itely
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/fr/user/notation-appendices.itely
@@ -8547,48 +8737,6 @@ msgstr "GNU LilyPond --- manual de aprendizaje"
 msgid "Commonly tweaked properties"
 msgstr "Propiedades trucadas frecuentemente"
 
-#. @node in Documentation/fr/user/introduction.itely
-#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
-#. @node in Documentation/es/user/introduction.itely
-#. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Learning Manual (LM)"
-msgstr "Sobre el Manual de aprendizaje (MA)"
-
-#. @node in Documentation/fr/user/introduction.itely
-#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
-#. @node in Documentation/es/user/introduction.itely
-#. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Music Glossary (MG)"
-msgstr "Sobre el Glosario Musical (GM)"
-
-#. @node in Documentation/fr/user/introduction.itely
-#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
-#. @node in Documentation/es/user/introduction.itely
-#. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Notation Reference (NR)"
-msgstr "Sobre la Referencia de la notación (RN)"
-
-#. @node in Documentation/fr/user/introduction.itely
-#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
-#. @node in Documentation/es/user/introduction.itely
-#. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Application Usage (AU)"
-msgstr "Sobre el manual de Utilización del programa (UP)"
-
-#. @node in Documentation/fr/user/introduction.itely
-#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
-#. @node in Documentation/es/user/introduction.itely
-#. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Snippet List (SL)"
-msgstr "Sobre la lista de fragmentos de código (FC)"
-
-#. @node in Documentation/fr/user/introduction.itely
-#. @unnumberedsubsec in Documentation/fr/user/introduction.itely
-#. @node in Documentation/es/user/introduction.itely
-#. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Internals Reference (IR)"
-msgstr "Sobre el Manual de Referencia de Funcionamiento Interno (RFI)"
-
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Hauteurs"
 msgstr ""
@@ -8609,26 +8757,10 @@ msgstr ""
 msgid "Tout ensemble"
 msgstr ""
 
-#. @node in Documentation/fr/user/tutorial.itely
-#. @subsection in Documentation/fr/user/tutorial.itely
-#. @node in Documentation/de/user/tutorial.itely
-#. @subsection in Documentation/de/user/tutorial.itely
-msgid "Working on text files"
-msgstr "Trabajar sobre archivos de texto"
-
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Exemples cliquables"
 msgstr ""
 
-#. @node in Documentation/fr/user/fundamental.itely
-#. @section in Documentation/fr/user/fundamental.itely
-#. @node in Documentation/es/user/fundamental.itely
-#. @section in Documentation/es/user/fundamental.itely
-#. @node in Documentation/de/user/fundamental.itely
-#. @section in Documentation/de/user/fundamental.itely
-msgid "How LilyPond files work"
-msgstr "Cómo funcionan los archivos de LilyPond"
-
 #. @node in Documentation/fr/user/tweaks.itely
 #. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
@@ -8653,61 +8785,6 @@ msgstr "GNU LilyPond --- utilisation des programmes"
 msgid "GNU LilyPond --- manuel de notation"
 msgstr ""
 
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Micro tones"
-msgstr "Microtonos"
-
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Cautionary accidentals"
-msgstr "Alteraciones de precaución"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Augmentation dots"
-msgstr "Puntillos"
-
-# Saltos? FVD
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/es/user/rhythms.itely
-#. @subsubsection in Documentation/es/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Skips"
-msgstr "Desplazamientos"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Multi measure rests"
-msgstr "Silencios multicompás"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Bar check"
-msgstr "Comprobación del compás"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Barnumber check"
-msgstr "Comprobación del número de compás"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Proportional notation (introduction)"
-msgstr "Notación proporcional (introducción)"
-
 #. @node in Documentation/fr/user/repeats.itely
 #. @subsection in Documentation/fr/user/repeats.itely
 msgid "Writing repeats"
@@ -8716,21 +8793,21 @@ msgstr "Escritura de las repeticiones"
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Repeat types"
 msgstr "Tipos de repetición"
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Repeat syntax"
 msgstr "Sintaxis de las repeticiones"
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Manual repeat commands"
 msgstr "Instrucciones de repetición manual"
 
@@ -8742,7 +8819,7 @@ msgstr "Otras repeticiones"
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Tremolo subdivisions"
 msgstr "Subdivisiones del trémolo"
 
@@ -8765,15 +8842,6 @@ msgstr "Polifonía básica"
 msgid "Collision Resolution"
 msgstr "Resolución de colisiones"
 
-#. @node in Documentation/fr/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
-#. @node in Documentation/es/user/staff.itely
-#. @subsubsection in Documentation/es/user/staff.itely
-#. @node in Documentation/de/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
-msgid "System start delimiters"
-msgstr "Delimitadores del comienzo de un sistema"
-
 #. @node in Documentation/fr/user/editorial.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely
 msgid "Blank music sheet"
@@ -8804,61 +8872,22 @@ msgid "Basculer vers une mélodie alternative"
 msgstr ""
 
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "The piano staff"
 msgstr "El sistema de piano"
 
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
-msgid "Fret diagrams"
-msgstr "Diagramas de trastes"
-
-#. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
-#. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
-#. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Right hand fingerings"
 msgstr "Digitaciones de la mano derecha"
 
-# ¡Distintos a la guitarra!. FVD
-#. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
-#. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
-#. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
-msgid "Guitar tablatures"
-msgstr "Tablaturas de guitarra"
-
-#. @node in Documentation/fr/user/wind.itely
-#. @subsubsection in Documentation/fr/user/wind.itely
-#. @node in Documentation/es/user/wind.itely
-#. @subsubsection in Documentation/es/user/wind.itely
-#. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
-msgid "Half-holes"
-msgstr "Medios agujeros"
-
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @section in Documentation/fr/user/changing-defaults.itely
-msgid "Automatic notation"
-msgstr "Notación automática"
-
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
-msgid "Changing context properties on the fly"
-msgstr "Cambiar las propiedades de un contexto al vuelo"
-
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @subsection in Documentation/fr/user/changing-defaults.itely
 msgid "Layout tunings within contexts"
@@ -8894,6 +8923,13 @@ msgstr "Véase también"
 msgid "Advertencias y problemas conocidos"
 msgstr "Advertencias y problemas conocidos"
 
+#. @node in Documentation/es/user/fundamental.itely
+#. @section in Documentation/es/user/fundamental.itely
+#. @node in Documentation/de/user/fundamental.itely
+#. @section in Documentation/de/user/fundamental.itely
+msgid "How LilyPond files work"
+msgstr "Cómo funcionan los archivos de LilyPond"
+
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 msgid "Automatic behaviour"
@@ -8929,6 +8965,13 @@ msgstr "semitono"
 msgid "Writing long repeats"
 msgstr "Escribir repeticiones largas"
 
+#. @node in Documentation/es/user/staff.itely
+#. @subsubsection in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
+msgid "System start delimiters"
+msgstr "Delimitadores del comienzo de un sistema"
+
 #. @rglos in Documentation/es/user/chords.itely
 msgid "  "
 msgstr "  "
@@ -8980,6 +9023,11 @@ msgstr "Más información"
 msgid "Unix"
 msgstr "Unix"
 
+#. @node in Documentation/de/user/tutorial.itely
+#. @subsection in Documentation/de/user/tutorial.itely
+msgid "Working on text files"
+msgstr "Trabajar sobre archivos de texto"
+
 #. @rglos in Documentation/de/user/tutorial.itely
 msgid "legato"
 msgstr ""
@@ -9007,6 +9055,12 @@ msgstr "Ligaduras Laissez vibrer"
 msgid "Chords"
 msgstr ""
 
+# ¡Distintos a la guitarra!. FVD
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
+msgid "Guitar tablatures"
+msgstr "Tablaturas de guitarra"
+
 msgid "Up:"
 msgstr "Arriba:"
 
@@ -9026,3 +9080,80 @@ msgstr "Notas al pie"
 msgid "Table of Contents"
 msgstr "Índice general"
 
+#~ msgid "No time signature in the ossia staff"
+#~ msgstr "El ossia no tiene compás"
+
+#~ msgid "To use the setting globally, uncomment the following line:"
+#~ msgstr ""
+#~ "Para emplear el ajuste globalmente, quite el comentario de la línea "
+#~ "siguiente:"
+
+#~ msgid "\\override VerticalAxisGroup #'remove-first = ##t"
+#~ msgstr "\\override VerticalAxisGroup #'remove-first = ##t"
+
+#~ msgid ""
+#~ "To use the setting globally, comment this line, uncomment the line above"
+#~ msgstr ""
+#~ "Para emplear el ajuste globalmente, comente esta línea, descomente la "
+#~ "anterior"
+
+#~ msgid "smaller"
+#~ msgstr "menor"
+
+#~ msgid "setup a context for cue notes."
+#~ msgstr "preparar un contexto para las notas guía"
+
+#~ msgid "About the Learning Manual (LM)"
+#~ msgstr "Sobre el Manual de aprendizaje (MA)"
+
+#~ msgid "About the Music Glossary (MG)"
+#~ msgstr "Sobre el Glosario Musical (GM)"
+
+#~ msgid "About the Notation Reference (NR)"
+#~ msgstr "Sobre la Referencia de la notación (RN)"
+
+#~ msgid "About the Application Usage (AU)"
+#~ msgstr "Sobre el manual de Utilización del programa (UP)"
+
+#~ msgid "About the Snippet List (SL)"
+#~ msgstr "Sobre la lista de fragmentos de código (FC)"
+
+#~ msgid "About the Internals Reference (IR)"
+#~ msgstr "Sobre el Manual de Referencia de Funcionamiento Interno (RFI)"
+
+#~ msgid "Micro tones"
+#~ msgstr "Microtonos"
+
+#~ msgid "Cautionary accidentals"
+#~ msgstr "Alteraciones de precaución"
+
+#~ msgid "Augmentation dots"
+#~ msgstr "Puntillos"
+
+# Saltos? FVD
+#~ msgid "Skips"
+#~ msgstr "Desplazamientos"
+
+#~ msgid "Multi measure rests"
+#~ msgstr "Silencios multicompás"
+
+#~ msgid "Bar check"
+#~ msgstr "Comprobación del compás"
+
+#~ msgid "Barnumber check"
+#~ msgstr "Comprobación del número de compás"
+
+#~ msgid "Proportional notation (introduction)"
+#~ msgstr "Notación proporcional (introducción)"
+
+#~ msgid "Fret diagrams"
+#~ msgstr "Diagramas de trastes"
+
+#~ msgid "Half-holes"
+#~ msgstr "Medios agujeros"
+
+#~ msgid "Automatic notation"
+#~ msgstr "Notación automática"
+
+#~ msgid "Changing context properties on the fly"
+#~ msgstr "Cambiar las propiedades de un contexto al vuelo"
diff --git a/Documentation/po/fr.po b/Documentation/po/fr.po
index c9c179870a..d78aff9a8f 100644
--- a/Documentation/po/fr.po
+++ b/Documentation/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-11 18:05+0200\n"
+"POT-Creation-Date: 2008-08-23 18:33+0200\n"
 "PO-Revision-Date: 2008-07-16 18:51+0200\n"
 "Last-Translator: Jean-Charles Malahieude <lolyfan-AT-wanadoo-DOT-fr>\n"
 "Language-Team: Français <lilypond-user-fr@gnu.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: add_html_footer.py:44
+#: add_html_footer.py:47
 #, python-format
 msgid "This page is for %(package_name)s-%(package_version)s (%(branch_str)s)."
 msgstr ""
 "Cette page documente %(package_name)s-%(package_version)s (%(branch_str)s)."
 
-#: add_html_footer.py:45
+#: add_html_footer.py:48
 #, python-format
 msgid "Report errors to <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
 msgstr ""
@@ -31,7 +31,7 @@ msgstr ""
 "org\">lilypond-user-fr@gnu.org</a> ou en anglais à <a href=\"%"
 "(mail_address_url)s\">%(mail_address)s</a>"
 
-#: add_html_footer.py:47
+#: add_html_footer.py:50
 #, python-format
 msgid ""
 "Your <a href=\"%(suggest_Docs_url)s\">suggestions for the documentation</a> "
@@ -40,21 +40,21 @@ msgstr ""
 "Vos <a href=\"%(suggest_Docs_url)s\">suggestions à propos de la "
 "documentation</a> sont les bienvenues."
 
-#: add_html_footer.py:55
+#: add_html_footer.py:58
 #, python-format
 msgid "Other languages: %s."
 msgstr "Autres langues&nbsp;: %s."
 
-#: add_html_footer.py:56
+#: add_html_footer.py:59
 #, python-format
 msgid "About <A HREF=\"%s\">automatic language selection</A>."
 msgstr "À propos de la <A HREF=\"%s\">sélection automatique de la langue</A>."
 
-#: add_html_footer.py:262
+#: add_html_footer.py:265
 msgid "stable-branch"
 msgstr "branche stable"
 
-#: add_html_footer.py:264
+#: add_html_footer.py:267
 msgid "development-branch"
 msgstr "branche de développement"
 
@@ -321,7 +321,8 @@ msgstr "À propos de la documentation"
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Learning Manual (LM)"
+#, fuzzy
+msgid "About the Learning Manual"
 msgstr "À propos du manuel d'initiation (LM)"
 
 #. @node in Documentation/user/introduction.itely
@@ -330,7 +331,8 @@ msgstr "À propos du manuel d'initiation (LM)"
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Music Glossary (MG)"
+#, fuzzy
+msgid "About the Music Glossary"
 msgstr "À propos du glossaire musicologique (MG)"
 
 #. @node in Documentation/user/introduction.itely
@@ -339,7 +341,8 @@ msgstr "À propos du glossaire musicologique (MG)"
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Notation Reference (NR)"
+#, fuzzy
+msgid "About the Notation Reference"
 msgstr "À propos du manuel de notation (NR)"
 
 #. @node in Documentation/user/introduction.itely
@@ -348,7 +351,8 @@ msgstr "À propos du manuel de notation (NR)"
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Application Usage (AU)"
+#, fuzzy
+msgid "About the Application Usage"
 msgstr "À propos du manuel d'utilisation (AU)"
 
 #. @node in Documentation/user/introduction.itely
@@ -357,7 +361,8 @@ msgstr "À propos du manuel d'utilisation (AU)"
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Snippet List (SL)"
+#, fuzzy
+msgid "About the Snippet List"
 msgstr "À propos des morceaux choisis (SL)"
 
 #. @node in Documentation/user/introduction.itely
@@ -366,7 +371,8 @@ msgstr "À propos des morceaux choisis (SL)"
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Internals Reference (IR)"
+#, fuzzy
+msgid "About the Internals Reference"
 msgstr "À propos des références du programme (IR)"
 
 #. @node in Documentation/user/introduction.itely
@@ -685,6 +691,8 @@ msgstr "Assemblage"
 
 #. @node in Documentation/user/tutorial.itely
 #. @subsection in Documentation/user/tutorial.itely
+#. @node in Documentation/fr/user/tutorial.itely
+#. @subsection in Documentation/fr/user/tutorial.itely
 #. @node in Documentation/es/user/tutorial.itely
 #. @subsection in Documentation/es/user/tutorial.itely
 msgid "Working on input files"
@@ -857,8 +865,8 @@ msgstr "Liaisons"
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
 #. @subheading in Documentation/de/user/tutorial.itely
-#. @node in Documentation/de/user/expressive.itely
-#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Ties"
 msgstr "Liaisons de prolongation"
 
@@ -952,9 +960,17 @@ msgid "Articulations"
 msgstr "Articulations"
 
 #. @subheading in Documentation/user/tutorial.itely
+#. @node in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @subheading in Documentation/fr/user/tutorial.itely
+#. @node in Documentation/fr/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely
 #. @subheading in Documentation/es/user/tutorial.itely
+#. @node in Documentation/es/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/es/user/wind.itely
 #. @subheading in Documentation/de/user/tutorial.itely
+#. @node in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Fingerings"
 msgstr "Doigtés"
 
@@ -1390,416 +1406,430 @@ msgstr "Noms de note absolus"
 msgid "After the tutorial"
 msgstr "Après le tutoriel"
 
-#. Documentation/user/fundamental.itely:352 (variable)
-#. Documentation/user/vocal.itely:1165 (variable)
-#. Documentation/user/vocal.itely:1207 (variable)
+#. Documentation/user/fundamental.itely:346 (variable)
+#. Documentation/user/vocal.itely:1162 (variable)
+#. Documentation/user/vocal.itely:1204 (variable)
 msgid "melody"
 msgstr "melodie"
 
-#. Documentation/user/fundamental.itely:353 (variable)
-#. Documentation/user/vocal.itely:989 (variable)
-#. Documentation/user/vocal.itely:1170 (variable)
-#. Documentation/user/vocal.itely:1211 (variable)
+#. Documentation/user/fundamental.itely:347 (variable)
+#. Documentation/user/vocal.itely:986 (variable)
+#. Documentation/user/vocal.itely:1167 (variable)
+#. Documentation/user/vocal.itely:1208 (variable)
 msgid "text"
 msgstr "texte"
 
-#. Documentation/user/fundamental.itely:354 (variable)
-#. Documentation/user/fundamental.itely:2520 (variable)
+#. Documentation/user/fundamental.itely:348 (variable)
+#. Documentation/user/fundamental.itely:2602 (variable)
 msgid "upper"
 msgstr "superieur"
 
-#. Documentation/user/fundamental.itely:355 (variable)
-#. Documentation/user/fundamental.itely:2527 (variable)
+#. Documentation/user/fundamental.itely:349 (variable)
+#. Documentation/user/fundamental.itely:2609 (variable)
 msgid "lower"
 msgstr "inferieur"
 
-#. Documentation/user/fundamental.itely:613 (comment)
-#. Documentation/user/fundamental.itely:623 (comment)
-#. Documentation/user/fundamental.itely:638 (comment)
-#. Documentation/user/fundamental.itely:643 (comment)
-#. Documentation/user/fundamental.itely:663 (comment)
-msgid "Voice "
+#. Documentation/user/fundamental.itely:614 (comment)
+msgid "Voice \\\"1\\\"                  Voice \\\"2\\\""
+msgstr ""
+
+#. Documentation/user/fundamental.itely:624 (comment)
+msgid "Voice \\\"1\\\"             Voice \\\"2\\\""
+msgstr ""
+
+#. Documentation/user/fundamental.itely:639 (comment)
+#, fuzzy
+msgid "Voice \\\"1\\\""
+msgstr "Voix"
+
+#. Documentation/user/fundamental.itely:644 (comment)
+#, fuzzy
+msgid "Voice \\\"2\\\""
 msgstr "Voix"
 
-#. Documentation/user/fundamental.itely:661 (comment)
-#. Documentation/user/fundamental.itely:685 (comment)
+#. Documentation/user/fundamental.itely:662 (comment)
+#. Documentation/user/fundamental.itely:686 (comment)
 msgid "Main voice"
 msgstr "Voix principale"
 
-#. Documentation/user/fundamental.itely:687 (comment)
-#. Documentation/user/simultaneous.itely:593 (comment)
-#. Documentation/user/simultaneous.itely:618 (comment)
-#. Documentation/user/simultaneous.itely:645 (comment)
+#. Documentation/user/fundamental.itely:664 (comment)
+msgid "Voice \\\"1\\\"     Voice \\\"2\\\"                 Voice \\\"3\\\""
+msgstr ""
+
+#. Documentation/user/fundamental.itely:688 (comment)
+#. Documentation/user/simultaneous.itely:653 (comment)
+#. Documentation/user/simultaneous.itely:678 (comment)
+#. Documentation/user/simultaneous.itely:705 (comment)
 msgid "Bar 1"
 msgstr "Mesure 1"
 
-#. Documentation/user/fundamental.itely:698 (comment)
-#. Documentation/user/simultaneous.itely:598 (comment)
-#. Documentation/user/simultaneous.itely:623 (comment)
-#. Documentation/user/simultaneous.itely:651 (comment)
+#. Documentation/user/fundamental.itely:699 (comment)
+#. Documentation/user/simultaneous.itely:658 (comment)
+#. Documentation/user/simultaneous.itely:683 (comment)
+#. Documentation/user/simultaneous.itely:711 (comment)
 msgid "Bar 2"
 msgstr "Mesure 2"
 
-#. Documentation/user/fundamental.itely:699 (comment)
+#. Documentation/user/fundamental.itely:700 (comment)
 msgid "Voice 1 continues"
 msgstr "La voix 1 continue"
 
-#. Documentation/user/fundamental.itely:702 (comment)
+#. Documentation/user/fundamental.itely:703 (comment)
 msgid "Voice 2 continues"
 msgstr "La voix 2 continue"
 
-#. Documentation/user/fundamental.itely:873 (comment)
+#. Documentation/user/fundamental.itely:874 (comment)
 msgid "Voice one"
 msgstr "Voix un"
 
-#. Documentation/user/fundamental.itely:875 (comment)
+#. Documentation/user/fundamental.itely:876 (comment)
 msgid "Voice two"
 msgstr "Voix deux"
 
-#. Documentation/user/fundamental.itely:877 (comment)
+#. Documentation/user/fundamental.itely:878 (comment)
 msgid "Omit Voice three"
 msgstr "Pas de Voix trois"
 
-#. Documentation/user/fundamental.itely:878 (comment)
+#. Documentation/user/fundamental.itely:879 (comment)
 msgid "Voice four"
 msgstr "Voix quatre"
 
-#. Documentation/user/fundamental.itely:966 (comment)
+#. Documentation/user/fundamental.itely:970 (comment)
 msgid "Default behavior or behavior after \\oneVoice"
 msgstr "Comportement par défaut ou après \\oneVoice"
 
-#. Documentation/user/fundamental.itely:1004 (comment)
+#. Documentation/user/fundamental.itely:1008 (comment)
 msgid "The following notes are monophonic"
 msgstr "Les notes qui suivent sont monophoniques"
 
-#. Documentation/user/fundamental.itely:1006 (comment)
+#. Documentation/user/fundamental.itely:1010 (comment)
 msgid "Start simultaneous section of three voices"
 msgstr "Début d'une section de trois voix simultanées"
 
-#. Documentation/user/fundamental.itely:1008 (comment)
+#. Documentation/user/fundamental.itely:1012 (comment)
 msgid "Continue the main voice in parallel"
 msgstr "Poursuite de la voix principale en parallèle"
 
-#. Documentation/user/fundamental.itely:1010 (comment)
-#. Documentation/user/fundamental.itely:1072 (comment)
+#. Documentation/user/fundamental.itely:1014 (comment)
+#. Documentation/user/fundamental.itely:1076 (comment)
 msgid "Initiate second voice"
 msgstr "Initialisation de la seconde voix"
 
-#. Documentation/user/fundamental.itely:1012 (comment)
-#. Documentation/user/fundamental.itely:1074 (comment)
+#. Documentation/user/fundamental.itely:1016 (comment)
+#. Documentation/user/fundamental.itely:1078 (comment)
 msgid "Set stems, etc, down"
 msgstr "Hampes et autres attributs iront vers le bas"
 
-#. Documentation/user/fundamental.itely:1016 (comment)
-#. Documentation/user/fundamental.itely:1078 (comment)
+#. Documentation/user/fundamental.itely:1020 (comment)
+#. Documentation/user/fundamental.itely:1082 (comment)
 msgid "Initiate third voice"
 msgstr "Initialisation de la troisième voix"
 
-#. Documentation/user/fundamental.itely:1018 (comment)
-#. Documentation/user/fundamental.itely:1080 (comment)
+#. Documentation/user/fundamental.itely:1022 (comment)
+#. Documentation/user/fundamental.itely:1084 (comment)
 msgid "Set stems, etc, up"
 msgstr "Hampes et autres attributs iront vers le haut"
 
-#. Documentation/user/fundamental.itely:1067 (comment)
+#. Documentation/user/fundamental.itely:1071 (comment)
 msgid "Initiate first voice"
 msgstr "Initialisation de la première voix"
 
-#. Documentation/user/fundamental.itely:1187 (variable)
-#. Documentation/user/fundamental.itely:2497 (variable)
-#. Documentation/user/tweaks.itely:3168 (variable)
-#. Documentation/user/simultaneous.itely:639 (variable)
+#. Documentation/user/fundamental.itely:1196 (variable)
+#. Documentation/user/fundamental.itely:2579 (variable)
+#. Documentation/user/tweaks.itely:3170 (variable)
+#. Documentation/user/simultaneous.itely:699 (variable)
 msgid "global"
 msgstr "glogal"
 
-#. Documentation/user/fundamental.itely:1188 (variable)
+#. Documentation/user/fundamental.itely:1197 (variable)
 msgid "SopOneMusic"
 msgstr "SopUnMusique"
 
-#. Documentation/user/fundamental.itely:1190 (variable)
+#. Documentation/user/fundamental.itely:1199 (variable)
 msgid "SopTwoMusic"
 msgstr "SopDeuxMusique"
 
-#. Documentation/user/fundamental.itely:1192 (variable)
+#. Documentation/user/fundamental.itely:1201 (variable)
 msgid "SopOneLyrics"
 msgstr "SopUnParoles"
 
-#. Documentation/user/fundamental.itely:1194 (variable)
+#. Documentation/user/fundamental.itely:1203 (variable)
 msgid "SopTwoLyrics"
 msgstr "SopDeuxParoles"
 
-#. Documentation/user/fundamental.itely:1238 (variable)
-#. Documentation/user/fundamental.itely:2712 (variable)
+#. Documentation/user/fundamental.itely:1247 (variable)
+#. Documentation/user/fundamental.itely:2794 (variable)
 msgid "TimeKey"
 msgstr "MetriqueArmure"
 
-#. Documentation/user/fundamental.itely:1239 (variable)
+#. Documentation/user/fundamental.itely:1248 (variable)
 msgid "SopMusic"
 msgstr "SopMusique"
 
-#. Documentation/user/fundamental.itely:1240 (variable)
-#. Documentation/user/tweaks.itely:3170 (variable)
+#. Documentation/user/fundamental.itely:1249 (variable)
+#. Documentation/user/tweaks.itely:3172 (variable)
 msgid "AltoMusic"
 msgstr "AltoMusique"
 
-#. Documentation/user/fundamental.itely:1241 (variable)
-#. Documentation/user/tweaks.itely:3171 (variable)
+#. Documentation/user/fundamental.itely:1250 (variable)
+#. Documentation/user/tweaks.itely:3173 (variable)
 msgid "TenorMusic"
 msgstr "TenorMusique"
 
-#. Documentation/user/fundamental.itely:1242 (variable)
-#. Documentation/user/tweaks.itely:3172 (variable)
+#. Documentation/user/fundamental.itely:1251 (variable)
+#. Documentation/user/tweaks.itely:3174 (variable)
 msgid "BassMusic"
 msgstr "BasseMusique"
 
-#. Documentation/user/fundamental.itely:1243 (variable)
-#. Documentation/user/tweaks.itely:3173 (variable)
+#. Documentation/user/fundamental.itely:1252 (variable)
+#. Documentation/user/tweaks.itely:3175 (variable)
 msgid "VerseOne"
 msgstr "CoupletUn"
 
-#. Documentation/user/fundamental.itely:1245 (variable)
-#. Documentation/user/tweaks.itely:3174 (variable)
+#. Documentation/user/fundamental.itely:1254 (variable)
+#. Documentation/user/tweaks.itely:3176 (variable)
 msgid "VerseTwo"
 msgstr "CoupletDeux"
 
-#. Documentation/user/fundamental.itely:1247 (variable)
-#. Documentation/user/tweaks.itely:3175 (variable)
+#. Documentation/user/fundamental.itely:1256 (variable)
+#. Documentation/user/tweaks.itely:3177 (variable)
 msgid "VerseThree"
 msgstr "CoupletTrois"
 
-#. Documentation/user/fundamental.itely:1249 (variable)
-#. Documentation/user/tweaks.itely:3176 (variable)
+#. Documentation/user/fundamental.itely:1258 (variable)
+#. Documentation/user/tweaks.itely:3178 (variable)
 msgid "VerseFour"
 msgstr "CoupletQuatre"
 
-#. Documentation/user/fundamental.itely:1292 (variable)
-#. Documentation/user/fundamental.itely:1344 (variable)
-#. Documentation/user/fundamental.itely:1405 (variable)
+#. Documentation/user/fundamental.itely:1301 (variable)
+#. Documentation/user/fundamental.itely:1353 (variable)
+#. Documentation/user/fundamental.itely:1414 (variable)
 msgid "versenotes"
 msgstr "coupletnotes"
 
-#. Documentation/user/fundamental.itely:1297 (variable)
-#. Documentation/user/fundamental.itely:1358 (variable)
-#. Documentation/user/fundamental.itely:1419 (variable)
+#. Documentation/user/fundamental.itely:1306 (variable)
+#. Documentation/user/fundamental.itely:1367 (variable)
+#. Documentation/user/fundamental.itely:1428 (variable)
 msgid "versewords"
 msgstr "coupletparoles"
 
-#. Documentation/user/fundamental.itely:1349 (variable)
-#. Documentation/user/fundamental.itely:1410 (variable)
+#. Documentation/user/fundamental.itely:1358 (variable)
+#. Documentation/user/fundamental.itely:1419 (variable)
 msgid "refrainnotesA"
 msgstr "refrainnotesA"
 
-#. Documentation/user/fundamental.itely:1353 (variable)
-#. Documentation/user/fundamental.itely:1414 (variable)
+#. Documentation/user/fundamental.itely:1362 (variable)
+#. Documentation/user/fundamental.itely:1423 (variable)
 msgid "refrainnotesB"
 msgstr "refrainnotesB"
 
-#. Documentation/user/fundamental.itely:1361 (variable)
-#. Documentation/user/fundamental.itely:1422 (variable)
+#. Documentation/user/fundamental.itely:1370 (variable)
+#. Documentation/user/fundamental.itely:1431 (variable)
 msgid "refrainwordsA"
 msgstr "refrainparolesA"
 
-#. Documentation/user/fundamental.itely:1364 (variable)
-#. Documentation/user/fundamental.itely:1425 (variable)
+#. Documentation/user/fundamental.itely:1373 (variable)
+#. Documentation/user/fundamental.itely:1434 (variable)
 msgid "refrainwordsB"
 msgstr "refrainparolesB"
 
-#. Documentation/user/fundamental.itely:1589 (comment)
+#. Documentation/user/fundamental.itely:1608 (comment)
 #, fuzzy
 msgid "start of single compound music expression"
 msgstr "début de l'unique expression musicale composée"
 
-#. Documentation/user/fundamental.itely:1590 (comment)
+#. Documentation/user/fundamental.itely:1609 (comment)
 msgid "start of simultaneous staves section"
 msgstr "début d'une section de portées simultanées"
 
-#. Documentation/user/fundamental.itely:1592 (comment)
+#. Documentation/user/fundamental.itely:1611 (comment)
 msgid "create RH staff"
 msgstr "création de la portée MD"
 
-#. Documentation/user/fundamental.itely:1595 (comment)
+#. Documentation/user/fundamental.itely:1614 (comment)
 msgid "create voice for RH notes"
 msgstr "création d'une voix pour les notes de MD"
 
-#. Documentation/user/fundamental.itely:1596 (comment)
+#. Documentation/user/fundamental.itely:1615 (comment)
 msgid "start of RH notes"
 msgstr "début des notes de MD"
 
-#. Documentation/user/fundamental.itely:1599 (comment)
+#. Documentation/user/fundamental.itely:1618 (comment)
 msgid "end of RH notes"
 msgstr "fin des notes de MD"
 
-#. Documentation/user/fundamental.itely:1600 (comment)
+#. Documentation/user/fundamental.itely:1619 (comment)
 msgid "end of RH voice"
 msgstr "fin de la voix MD"
 
-#. Documentation/user/fundamental.itely:1601 (comment)
+#. Documentation/user/fundamental.itely:1620 (comment)
 msgid "end of RH staff"
 msgstr "fin de la portée MD"
 
-#. Documentation/user/fundamental.itely:1602 (comment)
+#. Documentation/user/fundamental.itely:1621 (comment)
 msgid "create LH staff; needs two simultaneous voices"
 msgstr "création de la portée MG ; nécessite deux voix simultanées"
 
-#. Documentation/user/fundamental.itely:1605 (comment)
+#. Documentation/user/fundamental.itely:1624 (comment)
 msgid "create LH voice one"
 msgstr "création de la voix un de MG"
 
-#. Documentation/user/fundamental.itely:1607 (comment)
+#. Documentation/user/fundamental.itely:1626 (comment)
 msgid "start of LH voice one notes"
 msgstr "début des notes de la voix un de MG"
 
-#. Documentation/user/fundamental.itely:1610 (comment)
+#. Documentation/user/fundamental.itely:1629 (comment)
 msgid "end of LH voice one notes"
 msgstr "fin des notes de la voix un de MG"
 
-#. Documentation/user/fundamental.itely:1611 (comment)
+#. Documentation/user/fundamental.itely:1630 (comment)
 #, fuzzy
 msgid "end of LH voice one"
 msgstr "fin de la voix deux de MG"
 
-#. Documentation/user/fundamental.itely:1612 (comment)
+#. Documentation/user/fundamental.itely:1631 (comment)
 msgid "create LH voice two"
 msgstr "création de la voix deux de MG"
 
-#. Documentation/user/fundamental.itely:1614 (comment)
+#. Documentation/user/fundamental.itely:1633 (comment)
 msgid "start of LH voice two notes"
 msgstr "début des notes de la voix deux de MG"
 
-#. Documentation/user/fundamental.itely:1617 (comment)
+#. Documentation/user/fundamental.itely:1636 (comment)
 msgid "end of LH voice two notes"
 msgstr "fin des notes de la voix deux de MG"
 
-#. Documentation/user/fundamental.itely:1618 (comment)
+#. Documentation/user/fundamental.itely:1637 (comment)
 msgid "end of LH voice two"
 msgstr "fin de la voix deux de MG"
 
-#. Documentation/user/fundamental.itely:1619 (comment)
+#. Documentation/user/fundamental.itely:1638 (comment)
 msgid "end of LH staff"
 msgstr "fin de la portée MG"
 
-#. Documentation/user/fundamental.itely:1620 (comment)
+#. Documentation/user/fundamental.itely:1639 (comment)
 msgid "end of simultaneous staves section"
 msgstr "fin de la section de portées simultanées"
 
-#. Documentation/user/fundamental.itely:1621 (comment)
+#. Documentation/user/fundamental.itely:1640 (comment)
 msgid "end of single compound music expression"
 msgstr "fin de l'unique expression musicale composée"
 
-#. Documentation/user/fundamental.itely:1824 (comment)
+#. Documentation/user/fundamental.itely:1851 (comment)
 msgid "Wrong!"
 msgstr "Mauvais !"
 
-#. Documentation/user/fundamental.itely:1908 (comment)
-#. Documentation/user/fundamental.itely:2003 (comment)
+#. Documentation/user/fundamental.itely:1937 (comment)
+#. Documentation/user/fundamental.itely:2078 (comment)
 msgid "make note heads smaller"
 msgstr "pour obtenir des têtes de note plus petites"
 
-#. Documentation/user/fundamental.itely:1911 (comment)
-#. Documentation/user/fundamental.itely:2005 (comment)
+#. Documentation/user/fundamental.itely:1940 (comment)
+#. Documentation/user/fundamental.itely:2080 (comment)
 msgid "make note heads larger"
 msgstr "pour obtenir des têtes de note plus grosses"
 
-#. Documentation/user/fundamental.itely:1914 (comment)
-#. Documentation/user/fundamental.itely:2007 (comment)
+#. Documentation/user/fundamental.itely:1943 (comment)
+#. Documentation/user/fundamental.itely:2082 (comment)
 msgid "return to default size"
 msgstr "retour à la taille par défaut"
 
-#. Documentation/user/fundamental.itely:2274 (variable)
-#. Documentation/user/fundamental.itely:2498 (variable)
+#. Documentation/user/fundamental.itely:2352 (variable)
+#. Documentation/user/fundamental.itely:2580 (variable)
 #. Documentation/user/input.itely:907 (variable)
 msgid "sopranoMusic"
 msgstr "sopranoMusique"
 
-#. Documentation/user/fundamental.itely:2281 (variable)
+#. Documentation/user/fundamental.itely:2359 (variable)
 msgid "sopranoLyrics"
 msgstr "sopranoParoles"
 
-#. Documentation/user/fundamental.itely:2285 (variable)
+#. Documentation/user/fundamental.itely:2363 (variable)
 msgid "celloMusic"
 msgstr "violoncelleMusique"
 
-#. Documentation/user/fundamental.itely:2502 (variable)
+#. Documentation/user/fundamental.itely:2584 (variable)
 #, fuzzy
 msgid "sopranoWords"
 msgstr "sopParoles"
 
-#. Documentation/user/fundamental.itely:2505 (variable)
+#. Documentation/user/fundamental.itely:2587 (variable)
 #. Documentation/user/input.itely:908 (variable)
 msgid "altoMusic"
 msgstr "altoMusique"
 
-#. Documentation/user/fundamental.itely:2509 (variable)
+#. Documentation/user/fundamental.itely:2591 (variable)
 msgid "altoWords"
 msgstr "altoParoles"
 
-#. Documentation/user/fundamental.itely:2510 (variable)
+#. Documentation/user/fundamental.itely:2592 (variable)
 #. Documentation/user/input.itely:909 (variable)
 msgid "tenorMusic"
 msgstr "tenorMusique"
 
-#. Documentation/user/fundamental.itely:2514 (variable)
+#. Documentation/user/fundamental.itely:2596 (variable)
 msgid "tenorWords"
 msgstr "tenorParoles"
 
-#. Documentation/user/fundamental.itely:2515 (variable)
+#. Documentation/user/fundamental.itely:2597 (variable)
 #. Documentation/user/input.itely:910 (variable)
 msgid "bassMusic"
 msgstr "bassMusique"
 
-#. Documentation/user/fundamental.itely:2519 (variable)
+#. Documentation/user/fundamental.itely:2601 (variable)
 msgid "bassWords"
 msgstr "bassParoles"
 
-#. Documentation/user/fundamental.itely:2536 (comment)
+#. Documentation/user/fundamental.itely:2618 (comment)
 msgid "combine ChoirStaff and PianoStaff in parallel"
 msgstr "combinaison en parallèle du ChoirStaff et du PianoStaff"
 
-#. Documentation/user/fundamental.itely:2558 (comment)
+#. Documentation/user/fundamental.itely:2640 (comment)
 msgid "end ChoirStaff"
 msgstr "fin du ChoirStaff (système pour choeur)"
 
-#. Documentation/user/fundamental.itely:2713 (variable)
+#. Documentation/user/fundamental.itely:2795 (variable)
 msgid "ManualOneVoiceOneMusic"
 msgstr "ManuelUnVoixUnMusique"
 
-#. Documentation/user/fundamental.itely:2716 (variable)
+#. Documentation/user/fundamental.itely:2798 (variable)
 msgid "ManualOneVoiceTwoMusic"
 msgstr "ManuelUnVoixDeuxMusique"
 
-#. Documentation/user/fundamental.itely:2720 (variable)
+#. Documentation/user/fundamental.itely:2802 (variable)
 msgid "ManualTwoMusic"
 msgstr "ManuelDeuxMusique"
 
-#. Documentation/user/fundamental.itely:2724 (variable)
+#. Documentation/user/fundamental.itely:2806 (variable)
 msgid "PedalOrganMusic"
 msgstr "PedalierOrgueMusique"
 
-#. Documentation/user/fundamental.itely:2730 (comment)
+#. Documentation/user/fundamental.itely:2812 (comment)
 msgid "PianoStaff and Pedal Staff must be simultaneous"
 msgstr "Système pianistique et portée de pédalier sont synchrones"
 
-#. Documentation/user/fundamental.itely:2733 (comment)
+#. Documentation/user/fundamental.itely:2815 (comment)
 msgid "set time signature and key"
 msgstr "définition de la métrique et de l'armure"
 
-#. Documentation/user/fundamental.itely:2737 (comment)
+#. Documentation/user/fundamental.itely:2819 (comment)
 msgid "end ManualOne Staff context"
 msgstr "fin du contexte de la portée ManuelUn"
 
-#. Documentation/user/fundamental.itely:2742 (comment)
+#. Documentation/user/fundamental.itely:2824 (comment)
 msgid "end ManualTwo Staff context"
 msgstr "fin du contexte de la portée ManuelDeux"
 
-#. Documentation/user/fundamental.itely:2743 (comment)
+#. Documentation/user/fundamental.itely:2825 (comment)
 msgid "end PianoStaff context"
 msgstr "fin du contexte PianoStaff"
 
-#. Documentation/user/fundamental.itely:2748 (comment)
+#. Documentation/user/fundamental.itely:2830 (comment)
 #, fuzzy
 msgid "end PedalOrgan Staff context"
 msgstr "fin du contexte de la portée PedalOrgan"
 
-#. Documentation/user/fundamental.itely:2750 (comment)
+#. Documentation/user/fundamental.itely:2832 (comment)
 msgid "end Score context"
 msgstr "fin du contexte Score"
 
@@ -1816,6 +1846,8 @@ msgstr "Concepts fondamentaux"
 
 #. @node in Documentation/user/fundamental.itely
 #. @section in Documentation/user/fundamental.itely
+#. @node in Documentation/fr/user/fundamental.itely
+#. @section in Documentation/fr/user/fundamental.itely
 msgid "How LilyPond input files work"
 msgstr "Organisation des fichiers LilyPond"
 
@@ -1855,6 +1887,7 @@ msgstr "Expressions musicales imbriquées"
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
 #. @rglos in Documentation/user/staff.itely
+#. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 msgid "ossia"
@@ -1907,6 +1940,7 @@ msgid "Explicitly instantiating voices"
 msgstr "Instantiation explicite des voix"
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 msgid "Note columns"
 msgstr "Empilement des notes"
 
@@ -1938,6 +1972,8 @@ msgstr "Contextes et graveurs"
 #. @subsection in Documentation/user/changing-defaults.itely
 #. @node in Documentation/fr/user/fundamental.itely
 #. @subsection in Documentation/fr/user/fundamental.itely
+#. @node in Documentation/fr/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/fundamental.itely
 #. @subsection in Documentation/es/user/fundamental.itely
 #. @node in Documentation/es/user/changing-defaults.itely
@@ -1988,6 +2024,18 @@ msgstr "Tout savoir sur les graveurs"
 msgid "Modifying context properties"
 msgstr "Modification des propriétés d'un contexte"
 
+#. @unnumberedsubsubsec in Documentation/user/fundamental.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fundamental.itely
+#, fuzzy
+msgid "Setting context properties with @code{\\with}"
+msgstr "Changer à la volée les propriétés de contexte"
+
+#. @unnumberedsubsubsec in Documentation/user/fundamental.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fundamental.itely
+#, fuzzy
+msgid "Setting context properties with @code{\\context}"
+msgstr "Changer à la volée les propriétés de contexte"
+
 #. @node in Documentation/user/fundamental.itely
 #. @subsection in Documentation/user/fundamental.itely
 #. @node in Documentation/fr/user/fundamental.itely
@@ -2000,18 +2048,21 @@ msgid "Adding and removing engravers"
 msgstr "Ajout et suppression de graveurs"
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 #. @subsubheading in Documentation/es/user/fundamental.itely
 msgid "Changing a single context"
 msgstr "Modification d'un seul contexte"
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/pitches.itely
+#. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/pitches.itely
 msgid "ambitus"
 msgstr "ambitus"
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 #. @subsubheading in Documentation/es/user/fundamental.itely
 msgid "Changing all contexts of the same type"
 msgstr "Modification de tous les contextes d'un même type"
@@ -2060,201 +2111,201 @@ msgstr "Partition pour chœur à quatre voix mixtes"
 msgid "Building a score from scratch"
 msgstr "Écriture d'une partition à partir de zéro"
 
-#. Documentation/user/tweaks.itely:540 (comment)
-#. Documentation/user/tweaks.itely:664 (comment)
+#. Documentation/user/tweaks.itely:541 (comment)
+#. Documentation/user/tweaks.itely:665 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr "L'épaisseur de toutes les liaisons à venir passe de 1,2 à 5,0"
 
-#. Documentation/user/tweaks.itely:605 (comment)
-#. Documentation/user/tweaks.itely:639 (comment)
-#. Documentation/user/tweaks.itely:642 (comment)
+#. Documentation/user/tweaks.itely:606 (comment)
+#. Documentation/user/tweaks.itely:640 (comment)
+#. Documentation/user/tweaks.itely:643 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr "Épaississement de la prochaine liaison seulement"
 
-#. Documentation/user/tweaks.itely:668 (comment)
+#. Documentation/user/tweaks.itely:669 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
 msgstr "Retour à l'épaisseur par défaut de 1,2 pour les prochaines liaisons"
 
-#. Documentation/user/tweaks.itely:1265 (comment)
+#. Documentation/user/tweaks.itely:1267 (comment)
 msgid "Don't print clefs in this staff"
 msgstr "pas de clef pour cette portée"
 
-#. Documentation/user/tweaks.itely:1267 (comment)
+#. Documentation/user/tweaks.itely:1269 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr "pas de métrique pour cette portée"
 
-#. Documentation/user/tweaks.itely:1328 (comment)
+#. Documentation/user/tweaks.itely:1330 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr "Réduction d'environ 24 % de toutes les tailles de fonte"
 
-#. Documentation/user/tweaks.itely:1384 (comment)
+#. Documentation/user/tweaks.itely:1386 (comment)
 msgid "Reduce stem length and line spacing to match"
 msgstr ""
 "Réduction de la taille des hampes et de l'interligne pour ne pas déborder"
 
-#. Documentation/user/tweaks.itely:1758 (comment)
-#. Documentation/user/tweaks.itely:1819 (comment)
+#. Documentation/user/tweaks.itely:1760 (comment)
+#. Documentation/user/tweaks.itely:1821 (comment)
 msgid "Set details for later Text Spanner"
 msgstr "Réglage des détails du texte avec extension"
 
-#. Documentation/user/tweaks.itely:1761 (comment)
-#. Documentation/user/tweaks.itely:1822 (comment)
+#. Documentation/user/tweaks.itely:1763 (comment)
+#. Documentation/user/tweaks.itely:1824 (comment)
 msgid "Place dynamics above staff"
 msgstr "Positionnement des nuances au dessus de la portée"
 
-#. Documentation/user/tweaks.itely:1763 (comment)
-#. Documentation/user/tweaks.itely:1826 (comment)
+#. Documentation/user/tweaks.itely:1765 (comment)
+#. Documentation/user/tweaks.itely:1828 (comment)
 msgid "Start Ottava Bracket"
 msgstr "Début du crochet d'octavation"
 
-#. Documentation/user/tweaks.itely:1766 (comment)
-#. Documentation/user/tweaks.itely:1773 (comment)
-#. Documentation/user/tweaks.itely:1829 (comment)
-#. Documentation/user/tweaks.itely:1836 (comment)
+#. Documentation/user/tweaks.itely:1768 (comment)
+#. Documentation/user/tweaks.itely:1775 (comment)
+#. Documentation/user/tweaks.itely:1831 (comment)
+#. Documentation/user/tweaks.itely:1838 (comment)
 msgid "Add Dynamic Text"
 msgstr "Ajout d'une nuance textuelle"
 
-#. Documentation/user/tweaks.itely:1768 (comment)
-#. Documentation/user/tweaks.itely:1831 (comment)
+#. Documentation/user/tweaks.itely:1770 (comment)
+#. Documentation/user/tweaks.itely:1833 (comment)
 msgid "Add Dynamic Line Spanner"
 msgstr "Ajout d'une nuance graphique"
 
-#. Documentation/user/tweaks.itely:1770 (comment)
-#. Documentation/user/tweaks.itely:1833 (comment)
+#. Documentation/user/tweaks.itely:1772 (comment)
+#. Documentation/user/tweaks.itely:1835 (comment)
 msgid "Add Text Script"
 msgstr "Ajout d'un commentaire textuel"
 
-#. Documentation/user/tweaks.itely:1775 (comment)
-#. Documentation/user/tweaks.itely:1838 (comment)
+#. Documentation/user/tweaks.itely:1777 (comment)
+#. Documentation/user/tweaks.itely:1840 (comment)
 msgid "Stop Ottava Bracket"
 msgstr "Fin du crochet d'octavation"
 
-#. Documentation/user/tweaks.itely:1824 (comment)
+#. Documentation/user/tweaks.itely:1826 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
 msgstr "Positionnement du crochet d'octavation sous le texte avec extension"
 
-#. Documentation/user/tweaks.itely:1880 (comment)
+#. Documentation/user/tweaks.itely:1882 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr "Force les notes à s'espacer selon le texte"
 
-#. Documentation/user/tweaks.itely:1898 (comment)
+#. Documentation/user/tweaks.itely:1900 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr "Cette étiquette est assez courte pour ne pas risquer de chevauchement"
 
-#. Documentation/user/tweaks.itely:1902 (comment)
+#. Documentation/user/tweaks.itely:1904 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr "Celle-ci est trop longue pour tenir, elle est déplacée plus haut"
 
-#. Documentation/user/tweaks.itely:1906 (comment)
-#. Documentation/user/tweaks.itely:1911 (comment)
+#. Documentation/user/tweaks.itely:1908 (comment)
+#. Documentation/user/tweaks.itely:1913 (comment)
 msgid "Turn off collision avoidance"
 msgstr "Désactivation du processus d'évitement de collision"
 
-#. Documentation/user/tweaks.itely:1913 (comment)
+#. Documentation/user/tweaks.itely:1915 (comment)
 msgid "and turn on textLengthOn"
 msgstr "activation de textLengthOn"
 
-#. Documentation/user/tweaks.itely:1914 (comment)
+#. Documentation/user/tweaks.itely:1916 (comment)
 msgid "Spaces at end are honored"
 msgstr "Les espaces de la fin sont pris en compte"
 
-#. Documentation/user/tweaks.itely:2017 (comment)
+#. Documentation/user/tweaks.itely:2019 (comment)
 msgid "Extend width by 1 staff space"
 msgstr "Élargissement d'un espace"
 
-#. Documentation/user/tweaks.itely:2283 (comment)
+#. Documentation/user/tweaks.itely:2285 (comment)
 msgid "This will not work, see below:"
 msgstr "La commande suivante est sans résultat ; voir plus loin."
 
-#. Documentation/user/tweaks.itely:2287 (comment)
+#. Documentation/user/tweaks.itely:2289 (comment)
 msgid "This works:"
 msgstr "Celle-ci donne le résultat escompté"
 
-#. Documentation/user/tweaks.itely:2332 (variable)
+#. Documentation/user/tweaks.itely:2334 (variable)
 msgid "naturalplusflat"
 msgstr "becarreplusbemol"
 
-#. Documentation/user/tweaks.itely:2367 (comment)
+#. Documentation/user/tweaks.itely:2369 (comment)
 msgid "Extend width by 1 unit"
 msgstr "Élargissement d'une unité"
 
-#. Documentation/user/tweaks.itely:2369 (comment)
+#. Documentation/user/tweaks.itely:2371 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr ""
 "Alignement des nuances sur une ligne de base à 2 unités au dessus de la "
 "portée"
 
-#. Documentation/user/tweaks.itely:2647 (variable)
-#. Documentation/user/tweaks.itely:2698 (variable)
-#. Documentation/user/tweaks.itely:2760 (variable)
-#. Documentation/user/tweaks.itely:2831 (variable)
-#. Documentation/user/tweaks.itely:2893 (variable)
-#. Documentation/user/tweaks.itely:2948 (variable)
+#. Documentation/user/tweaks.itely:2649 (variable)
+#. Documentation/user/tweaks.itely:2700 (variable)
+#. Documentation/user/tweaks.itely:2762 (variable)
+#. Documentation/user/tweaks.itely:2833 (variable)
+#. Documentation/user/tweaks.itely:2895 (variable)
+#. Documentation/user/tweaks.itely:2950 (variable)
 msgid "rhMusic"
 msgstr "mdMusique"
 
-#. Documentation/user/tweaks.itely:2652 (comment)
-#. Documentation/user/tweaks.itely:2703 (comment)
-#. Documentation/user/tweaks.itely:2767 (comment)
-#. Documentation/user/tweaks.itely:2840 (comment)
-#. Documentation/user/tweaks.itely:2902 (comment)
+#. Documentation/user/tweaks.itely:2654 (comment)
+#. Documentation/user/tweaks.itely:2705 (comment)
+#. Documentation/user/tweaks.itely:2769 (comment)
+#. Documentation/user/tweaks.itely:2842 (comment)
+#. Documentation/user/tweaks.itely:2904 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr "Début d'un section polyphonique de quatre voix"
 
-#. Documentation/user/tweaks.itely:2665 (variable)
-#. Documentation/user/tweaks.itely:2716 (variable)
-#. Documentation/user/tweaks.itely:2780 (variable)
-#. Documentation/user/tweaks.itely:2855 (variable)
-#. Documentation/user/tweaks.itely:2919 (variable)
-#. Documentation/user/tweaks.itely:2976 (variable)
+#. Documentation/user/tweaks.itely:2667 (variable)
+#. Documentation/user/tweaks.itely:2718 (variable)
+#. Documentation/user/tweaks.itely:2782 (variable)
+#. Documentation/user/tweaks.itely:2857 (variable)
+#. Documentation/user/tweaks.itely:2921 (variable)
+#. Documentation/user/tweaks.itely:2978 (variable)
 msgid "lhMusic"
 msgstr "mgMusique"
 
-#. Documentation/user/tweaks.itely:2906 (comment)
-#. Documentation/user/tweaks.itely:2963 (comment)
+#. Documentation/user/tweaks.itely:2908 (comment)
+#. Documentation/user/tweaks.itely:2965 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr "Déplace le do2 pour que la fusion puisse fonctionner"
 
-#. Documentation/user/tweaks.itely:2909 (comment)
-#. Documentation/user/tweaks.itely:2966 (comment)
+#. Documentation/user/tweaks.itely:2911 (comment)
+#. Documentation/user/tweaks.itely:2968 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr "la hampe du ré2 ira vers le bas pour permettre la fusion"
 
-#. Documentation/user/tweaks.itely:2961 (comment)
+#. Documentation/user/tweaks.itely:2963 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr "Repositionnement du do2 à droite de la note fusionnée"
 
-#. Documentation/user/tweaks.itely:3089 (comment)
-#. Documentation/user/tweaks.itely:3108 (comment)
+#. Documentation/user/tweaks.itely:3091 (comment)
+#. Documentation/user/tweaks.itely:3110 (comment)
 msgid "Visible tempo marking"
 msgstr "Indication de tempo visible"
 
-#. Documentation/user/tweaks.itely:3093 (comment)
-#. Documentation/user/tweaks.itely:3112 (comment)
+#. Documentation/user/tweaks.itely:3095 (comment)
+#. Documentation/user/tweaks.itely:3114 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr "Indication de tempo invisible ; utilisée pour le MIDI"
 
-#. Documentation/user/tweaks.itely:3096 (comment)
-#. Documentation/user/tweaks.itely:3115 (comment)
+#. Documentation/user/tweaks.itely:3098 (comment)
+#. Documentation/user/tweaks.itely:3117 (comment)
 msgid "New tempo for next section"
 msgstr "Nouveau tempo pour la section suivante"
 
-#. Documentation/user/tweaks.itely:3159 (variable)
+#. Documentation/user/tweaks.itely:3161 (variable)
 #, fuzzy
 msgid "emphasize"
 msgstr "emphase"
 
-#. Documentation/user/tweaks.itely:3163 (variable)
+#. Documentation/user/tweaks.itely:3165 (variable)
 #, fuzzy
 msgid "normal"
 msgstr "normal"
 
-#. Documentation/user/tweaks.itely:3169 (variable)
+#. Documentation/user/tweaks.itely:3171 (variable)
 #, fuzzy
 msgid "SopranoMusic"
 msgstr "sopranoMusique"
 
-#. Documentation/user/tweaks.itely:3385 (comment)
+#. Documentation/user/tweaks.itely:3387 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
 msgstr "Arranger pour obtenir une couleur par la procédure color-notehead"
 
@@ -2271,50 +2322,78 @@ msgstr "Retouche des partitions"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Tweaking basics"
 msgstr "Retouches élémentaires"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Introduction to tweaks"
 msgstr "Introduction aux retouches"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Objects and interfaces"
 msgstr "Objets et interfaces"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Naming conventions of objects and properties"
 msgstr "Conventions de nom des objets et propriétés"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Tweaking methods"
 msgstr "Méthodes de retouche"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "The Internals Reference manual"
 msgstr "Le manuel des références internes"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Properties of layout objects"
 msgstr "Propriétés des objets de rendu"
 
@@ -2335,8 +2414,12 @@ msgstr "Rétablissement"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Properties found in interfaces"
 msgstr "Propriétés listées par interface"
 
@@ -2347,22 +2430,34 @@ msgstr "Specification du contexte en mode lyrique"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Types of properties"
 msgstr "Types de propriétés"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Appearance of objects"
 msgstr "Apparence des objets"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Visibility and color of objects"
 msgstr "Visibilité et couleur des objets"
 
@@ -2388,34 +2483,54 @@ msgstr "couleur"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Size of objects"
 msgstr "Taille des objets"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Length and thickness of objects"
 msgstr "Longueur et épaisseur des objets"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Placement of objects"
 msgstr "Positionnement des objets"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Automatic behavior"
 msgstr "Comportement automatique"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Within-staff objects"
 msgstr "Objets inclus dans la portée"
 
@@ -2426,8 +2541,12 @@ msgstr "Doigtés"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Outside staff objects"
 msgstr "Objets hors de la portée"
 
@@ -2443,30 +2562,34 @@ msgstr "Dimensionnement des objets graphiques"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Collisions of objects"
 msgstr "Collisions d'objets"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Moving objects"
 msgstr "Déplacement d'objets"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Fixing overlapping notation"
 msgstr "Correction des collisions d'objets"
 
@@ -2512,22 +2635,34 @@ msgstr "la propriété force-hshift"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Real music example"
 msgstr "Exemple concret"
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Further tweaking"
 msgstr "Autres retouches"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Other uses for tweaks"
 msgstr "Autres utilisations des retouches"
 
@@ -2543,37 +2678,45 @@ msgstr "Rendu MIDI d'un point d'orgue"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Using variables for tweaks"
 msgstr "Utilisation de variables dans les retouches"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Other sources of information"
 msgstr "Autres sources de documentation"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Avoiding tweaks with slower processing"
 msgstr "Options ralentissant le traitement"
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Advanced tweaks with Scheme"
 msgstr "Retouches avancées avec Scheme"
 
@@ -3075,6 +3218,7 @@ msgid "Running requirements"
 msgstr "Logiciels nécessaires à l'exécution"
 
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Requirements for building documentation"
 msgstr "Prérequis pour générer la documentation"
@@ -3101,6 +3245,7 @@ msgid "Compiling for multiple platforms"
 msgstr "Compilation pour plusieurs plateformes"
 
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Compiling outside the source tree"
 msgstr "Compilation en dehors de l'arborescence des sources"
@@ -3108,6 +3253,8 @@ msgstr "Compilation en dehors de l'arborescence des sources"
 #. @node in Documentation/user/install.itely
 #. @subsection in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/es/user/install.itely
+#. @node in Documentation/es/user/install.itely
+#. @subsection in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @subsection in Documentation/de/user/install.itely
 msgid "Building documentation"
@@ -3115,6 +3262,8 @@ msgstr "Compilation de la documentation"
 
 #. @node in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @node in Documentation/es/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Commands for building documentation"
@@ -3123,7 +3272,7 @@ msgstr "Commandes pour générer la documentation"
 #. @node in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/user/install.itely
 #. @node in Documentation/es/user/install.itely
-#. @subsection in Documentation/es/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Building documentation without compiling LilyPond"
@@ -3754,15 +3903,23 @@ msgstr "Écriture des hauteurs de note"
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
+#. @node in Documentation/de/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
 msgid "Absolute octave entry"
 msgstr "Hauteurs avec octave absolue"
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
+#. @node in Documentation/de/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
 msgid "Relative octave entry"
 msgstr "Octaves relatives"
 
@@ -3799,8 +3956,12 @@ msgstr "Modification de plusieurs hauteurs"
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
+#. @node in Documentation/de/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
 msgid "Octave checks"
 msgstr "Vérification d'octave"
 
@@ -3886,8 +4047,8 @@ msgstr "instrument transpositeur"
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
 #. @node in Documentation/de/user/pitches.itely
@@ -3897,8 +4058,8 @@ msgstr "Altérations accidentelles automatiques"
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
-#. @node in Documentation/fr/user/editorial.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
 #. @node in Documentation/de/user/pitches.itely
@@ -4035,110 +4196,110 @@ msgstr "Ceci échouera, il y a erreur sur l'objet spécifié"
 msgid "This is correct and works"
 msgstr "La formulation correcte, qui fonctionnera"
 
-#. Documentation/user/rhythms.itely:919 (comment)
+#. Documentation/user/rhythms.itely:916 (comment)
 msgid "Default style"
 msgstr "Style par défaut"
 
-#. Documentation/user/rhythms.itely:922 (comment)
+#. Documentation/user/rhythms.itely:919 (comment)
 msgid "Change to numeric style"
 msgstr "Adoption du style numérique"
 
-#. Documentation/user/rhythms.itely:926 (comment)
+#. Documentation/user/rhythms.itely:923 (comment)
 msgid "Revert to default style"
 msgstr "Retour au style par défaut"
 
-#. Documentation/user/rhythms.itely:1129 (comment)
+#. Documentation/user/rhythms.itely:1115 (comment)
 msgid "Show all bar numbers"
 msgstr "Affichage de tous les numéros de mesure"
 
-#. Documentation/user/rhythms.itely:1193 (comment)
+#. Documentation/user/rhythms.itely:1225 (comment)
+msgid "Now each staff has its own time signature."
+msgstr "Chaque portée dispose désormais de sa propre métrique."
+
+#. Documentation/user/rhythms.itely:1261 (comment)
 msgid "Create 9/8 split into 2/4 + 5/8"
 msgstr "mise en évidence de la décomposition de 9/8 en 2/4 + 5/8"
 
-#. Documentation/user/rhythms.itely:1194 (variable)
+#. Documentation/user/rhythms.itely:1262 (variable)
 msgid "tsMarkup"
 msgstr "tsEtiquette"
 
-#. Documentation/user/rhythms.itely:1274 (comment)
-msgid "Now each staff has its own time signature."
-msgstr "Chaque portée dispose désormais de sa propre métrique."
-
-#. Documentation/user/rhythms.itely:1480 (comment)
+#. Documentation/user/rhythms.itely:1558 (comment)
 msgid "Set beam sub-group length to an eighth note"
 msgstr "Subdivision des ligatures à la croche"
 
-#. Documentation/user/rhythms.itely:1483 (comment)
+#. Documentation/user/rhythms.itely:1561 (comment)
 msgid "Set beam sub-group length to a sixteenth note"
 msgstr "Subdivision des ligatures à la double-croche"
 
-#. Documentation/user/rhythms.itely:1615 (comment)
+#. Documentation/user/rhythms.itely:1698 (comment)
 msgid "end 1/16 beams for all time signatures at the 1/16 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1619 (comment)
+#. Documentation/user/rhythms.itely:1702 (comment)
 msgid "end 1/32 beams for all time signatures at the 1/16 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1629 (comment)
+#. Documentation/user/rhythms.itely:1712 (comment)
 msgid "end beams of all durations in 5/8 time signature at the 2/8 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1658 (comment)
+#. Documentation/user/rhythms.itely:1741 (comment)
 msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1671 (comment)
+#. Documentation/user/rhythms.itely:1754 (comment)
 msgid "this won't revert it!"
 msgstr "ceci n'est pas en concordance"
 
-#. Documentation/user/rhythms.itely:1673 (comment)
+#. Documentation/user/rhythms.itely:1756 (comment)
 msgid "this will"
 msgstr "ceci est conforme"
 
-#. Documentation/user/rhythms.itely:1852 (comment)
+#. Documentation/user/rhythms.itely:1935 (comment)
 msgid "revert to non-feathered beams"
 msgstr "retour à des liens de croches rectilignes"
 
-#. Documentation/user/rhythms.itely:2081 (comment)
-#. Documentation/user/rhythms.itely:2097 (comment)
+#. Documentation/user/rhythms.itely:2164 (comment)
+#. Documentation/user/rhythms.itely:2180 (comment)
 msgid "Permit first bar number to be printed"
 msgstr "Le numéro de la première mesure sera affiché"
 
-#. Documentation/user/rhythms.itely:2098 (comment)
-#. Documentation/user/rhythms.itely:2146 (comment)
+#. Documentation/user/rhythms.itely:2181 (comment)
+#. Documentation/user/rhythms.itely:2229 (comment)
 msgid "Print a bar number every second measure"
 msgstr "Affichage du numéro toutes les deux mesures"
 
-#. Documentation/user/rhythms.itely:2114 (comment)
+#. Documentation/user/rhythms.itely:2197 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
 msgstr "Affichage du numéro à chaque mesure, hormis en fin de ligne"
 
-#. Documentation/user/rhythms.itely:2118 (comment)
-#. Documentation/user/rhythms.itely:2144 (comment)
+#. Documentation/user/rhythms.itely:2201 (comment)
+#. Documentation/user/rhythms.itely:2227 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr "Augmentation de la taille des numéros de mesure au double"
 
-#. Documentation/user/rhythms.itely:2122 (comment)
+#. Documentation/user/rhythms.itely:2205 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr "Numéros de mesure encadrés dans un rectangle"
 
-#. Documentation/user/rhythms.itely:2127 (comment)
+#. Documentation/user/rhythms.itely:2210 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr "Numéros de mesure encadrés dans un cercle"
 
-#. Documentation/user/rhythms.itely:2149 (comment)
+#. Documentation/user/rhythms.itely:2232 (comment)
 msgid "Center-align bar numbers"
 msgstr "Alignement au centre des numéros de mesure"
 
-#. Documentation/user/rhythms.itely:2152 (comment)
+#. Documentation/user/rhythms.itely:2235 (comment)
 msgid "Right-align bar numbers"
 msgstr "Alignement à droite des numéros de mesure"
 
-#. Documentation/user/rhythms.itely:2255 (variable)
+#. Documentation/user/rhythms.itely:2338 (variable)
 msgid "pipeSymbol"
 msgstr "pipeSymbole"
 
-#. Documentation/user/rhythms.itely:2626 (variable)
+#. Documentation/user/rhythms.itely:2725 (variable)
 #. @rglos in Documentation/user/rhythms.itely
 msgid "cadenza"
 msgstr "cadence"
@@ -4231,14 +4392,24 @@ msgstr "Écriture des silences"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
+#. @node in Documentation/es/user/rhythms.itely
+#. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 #, fuzzy
 msgid "Invisible rests"
 msgstr "Silences anciens"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Full measure rests"
 msgstr "Silences valant une mesure"
 
@@ -4344,8 +4515,8 @@ msgstr "Barres de ligature automatiques"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
 #. @node in Documentation/de/user/rhythms.itely
@@ -4410,8 +4581,12 @@ msgstr "Numéros de mesure"
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Bar and bar number checks"
 msgstr "Vérification des limites et numéros de mesure"
 
@@ -4548,7 +4723,7 @@ msgstr "portato"
 #. @node in Documentation/es/user/expressive.itely
 #. @subsubsection in Documentation/es/user/expressive.itely
 #. @node in Documentation/de/user/expressive.itely
-#. @subsubsection in Documentation/de/user/expressive.itely
+#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely
 msgid "New dynamic marks"
 msgstr "Personnalisation des indications de nuance"
 
@@ -4720,7 +4895,7 @@ msgstr "Répétition d'un fragment court"
 #. @node in Documentation/es/user/repeats.itely
 #. @subsubsection in Documentation/es/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Percent repeats"
 msgstr "Répétitions en pourcent"
 
@@ -4739,19 +4914,19 @@ msgstr "simile"
 #. @node in Documentation/es/user/repeats.itely
 #. @subsubsection in Documentation/es/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Tremolo repeats"
 msgstr "Répétitions en trémolo"
 
-#. Documentation/user/simultaneous.itely:482 (variable)
+#. Documentation/user/simultaneous.itely:542 (variable)
 msgid "instrumentOne"
 msgstr "instrumentUn"
 
-#. Documentation/user/simultaneous.itely:490 (variable)
+#. Documentation/user/simultaneous.itely:550 (variable)
 msgid "instrumentTwo"
 msgstr "instrumentDeux"
 
-#. Documentation/user/simultaneous.itely:657 (comment)
+#. Documentation/user/simultaneous.itely:717 (comment)
 msgid "Bar 3 ..."
 msgstr "Mesure 3..."
 
@@ -4868,40 +5043,29 @@ msgstr "partie"
 msgid "Writing music in parallel"
 msgstr "Saisie la musique en parallèle"
 
-#. Documentation/user/staff.itely:536 (comment)
-msgid "No time signature in the ossia staff"
-msgstr "pas de métrique pour la portée d'ossia"
-
-#. Documentation/user/staff.itely:678 (comment)
-msgid "To use the setting globally, uncomment the following line:"
-msgstr ""
-"Pour une application à toutes les portées, décommenter la ligne suivante"
+#. Documentation/user/staff.itely:1048 (variable)
+#. Documentation/user/staff.itely:1063 (variable)
+#, fuzzy
+msgid "flute"
+msgstr "bémol"
 
-#. Documentation/user/staff.itely:679 (comment)
-msgid "\\override VerticalAxisGroup #'remove-first = ##t"
-msgstr "\\override VerticalAxisGroup #'remove-first = ##t"
+#. Documentation/user/staff.itely:1078 (variable)
+#, fuzzy
+msgid "clarinet"
+msgstr "ligne"
 
-#. Documentation/user/staff.itely:687 (comment)
-msgid ""
-"To use the setting globally, comment this line, uncomment the line above"
+#. Documentation/user/staff.itely:1173 (variable)
+msgid "oboe"
 msgstr ""
-"Pour une application à toutes les portées, commenter la ligne suivante, et "
-"décommenter celle du bloc \\layout"
 
-#. Documentation/user/staff.itely:1079 (variable)
-msgid "smaller"
-msgstr "moinsgros"
-
-#. Documentation/user/staff.itely:1094 (comment)
-msgid "setup a context for cue notes."
-msgstr "définition d'un contexte pour la citation"
-
-#. Documentation/user/staff.itely:1135 (variable)
-msgid "picc"
+#. Documentation/user/staff.itely:1215 (variable)
+#, fuzzy
+msgid "piccolo"
 msgstr "picc"
 
-#. Documentation/user/staff.itely:1143 (variable)
-msgid "cbsn"
+#. Documentation/user/staff.itely:1223 (variable)
+#, fuzzy
+msgid "cbassoon"
 msgstr "cbsn"
 
 #. @node in Documentation/user/staff.itely
@@ -4928,6 +5092,8 @@ msgstr "Gravure des portées"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Instantiating new staves"
 msgstr "Initialisation de nouvelles portées"
 
@@ -4941,6 +5107,8 @@ msgstr "portées"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Grouping staves"
 msgstr "Regroupement de portées"
 
@@ -4954,11 +5122,15 @@ msgstr "système"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Deeper nested staff groups"
 msgstr "Regroupements imbriqués de portées"
 
 #. @node in Documentation/user/staff.itely
 #. @subsection in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @subsection in Documentation/fr/user/staff.itely
 msgid "Modifying single staves"
 msgstr "Modification de portées individuelles"
 
@@ -4983,6 +5155,8 @@ msgstr "ligne supplémentaire"
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Ossia staves"
 msgstr "Portées d'ossia"
 
@@ -5076,7 +5250,7 @@ msgstr "Citation d'autres voix"
 msgid "Formatting cue notes"
 msgstr "Mise en forme d'une citation"
 
-#. Documentation/user/editorial.itely:323 (comment)
+#. Documentation/user/editorial.itely:321 (comment)
 msgid "this is deliberate nonsense; note that the stems remain black"
 msgstr "pour cette erreur manifeste, notez que les hampes restent en noir"
 
@@ -5212,7 +5386,7 @@ msgstr "Quadrillage temporel"
 msgid "Analysis brackets"
 msgstr "Crochets d'analyse"
 
-#. Documentation/user/text.itely:410 (variable)
+#. Documentation/user/text.itely:411 (variable)
 msgid "allegro"
 msgstr "allegro"
 
@@ -5400,50 +5574,51 @@ msgstr "Changement d'échelle des durées"
 msgid "correct"
 msgstr ""
 
-#. Documentation/user/vocal.itely:786 (variable)
+#. Documentation/user/vocal.itely:783 (variable)
 msgid "voice"
 msgstr "voix"
 
-#. Documentation/user/vocal.itely:793 (variable)
+#. Documentation/user/vocal.itely:790 (variable)
 msgid "lyr"
 msgstr "paroles"
 
-#. Documentation/user/vocal.itely:1056 (comment)
-msgid "applies to "
+#. Documentation/user/vocal.itely:1053 (comment)
+#, fuzzy
+msgid "applies to \\\"fas\\\""
 msgstr "s'applique à"
 
-#. Documentation/user/vocal.itely:1225 (comment)
+#. Documentation/user/vocal.itely:1222 (comment)
 msgid "moves the column off the left margin; "
 msgstr ""
 
-#. Documentation/user/vocal.itely:1226 (comment)
+#. Documentation/user/vocal.itely:1223 (comment)
 msgid "can be removed if space on the page is tight"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1234 (comment)
-#. Documentation/user/vocal.itely:1252 (comment)
+#. Documentation/user/vocal.itely:1231 (comment)
+#. Documentation/user/vocal.itely:1249 (comment)
 msgid "adds vertical spacing between verses"
 msgstr "ajout d'espace vertical entre les couplets"
 
-#. Documentation/user/vocal.itely:1242 (comment)
+#. Documentation/user/vocal.itely:1239 (comment)
 #, fuzzy
 msgid "adds horizontal spacing between columns; "
 msgstr "ajout d'espace horizontal entre les colonnes ; si elles sont"
 
-#. Documentation/user/vocal.itely:1243 (comment)
+#. Documentation/user/vocal.itely:1240 (comment)
 #, fuzzy
-msgid "if they are still too close, add more  pairs  "
+msgid "if they are still too close, add more \\\" \\\" pairs  "
 msgstr "toujours trop proches, ajouter d'autres paires de  jusqu'à"
 
-#. Documentation/user/vocal.itely:1244 (comment)
+#. Documentation/user/vocal.itely:1241 (comment)
 msgid "until the result looks good"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1260 (comment)
+#. Documentation/user/vocal.itely:1257 (comment)
 msgid "gives some extra space on the right margin; "
 msgstr ""
 
-#. Documentation/user/vocal.itely:1261 (comment)
+#. Documentation/user/vocal.itely:1258 (comment)
 msgid "can be removed if page space is tight"
 msgstr ""
 
@@ -5776,55 +5951,55 @@ msgstr "Vue d'ensemble des claviers"
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "References for keyboards"
 msgstr "Généralités sur les instruments à clavier"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Changing staff manually"
 msgstr "Changement de portée manuel"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Changing staff automatically"
 msgstr "Changement de portée automatique"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Staff-change lines"
 msgstr "Lignes de changement de portée"
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Cross-staff stems"
 msgstr "Hampes et changements de portée"
 
@@ -5846,7 +6021,7 @@ msgstr "Piano"
 #. @node in Documentation/es/user/keyboards.itely
 #. @subsubsection in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Piano pedals"
 msgstr "Pédales de piano"
 
@@ -5864,11 +6039,11 @@ msgstr "Accordéon"
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Discant symbols"
 msgstr "Symboles de jeux"
 
@@ -5949,34 +6124,39 @@ msgstr "Instruments à cordes pincées"
 msgid "Harp"
 msgstr "Harpe"
 
-#. Documentation/user/fretted-strings.itely:210 (variable)
+#. Documentation/user/fretted-strings.itely:223 (variable)
 msgid "melodia"
 msgstr "melodie"
 
-#. Documentation/user/fretted-strings.itely:376 (comment)
+#. Documentation/user/fretted-strings.itely:297 (variable)
+#, fuzzy
+msgid "mynotes"
+msgstr "corNotes"
+
+#. Documentation/user/fretted-strings.itely:412 (comment)
 msgid "A chord for ukelele"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:665 (variable)
-#. Documentation/user/fretted-strings.itely:684 (variable)
-#. Documentation/user/fretted-strings.itely:713 (variable)
-#. Documentation/user/fretted-strings.itely:738 (variable)
-#. Documentation/user/fretted-strings.itely:762 (variable)
-#. Documentation/user/fretted-strings.itely:798 (variable)
+#. Documentation/user/fretted-strings.itely:704 (variable)
+#. Documentation/user/fretted-strings.itely:723 (variable)
+#. Documentation/user/fretted-strings.itely:752 (variable)
+#. Documentation/user/fretted-strings.itely:777 (variable)
+#. Documentation/user/fretted-strings.itely:801 (variable)
+#. Documentation/user/fretted-strings.itely:837 (variable)
 #, fuzzy
 msgid "mychords"
 msgstr "mesAccords"
 
-#. Documentation/user/fretted-strings.itely:688 (variable)
+#. Documentation/user/fretted-strings.itely:727 (variable)
 #, fuzzy
 msgid "mychordlist"
 msgstr "mesAccords"
 
-#. Documentation/user/fretted-strings.itely:785 (comment)
+#. Documentation/user/fretted-strings.itely:824 (comment)
 msgid "add a new chord shape"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:789 (comment)
+#. Documentation/user/fretted-strings.itely:828 (comment)
 msgid "add some new chords based on the power chord shape"
 msgstr ""
 
@@ -6003,69 +6183,76 @@ msgid "Common notation for fretted strings"
 msgstr "Vue d'ensemble des cordes frettées"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "References for fretted strings"
 msgstr "Références en matière de cordes frettées"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "String number indications"
 msgstr "Indications de numéro de corde"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Default tablatures"
 msgstr "Tablatures par défaut"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Custom tablatures"
 msgstr "Tablatures personnalisées"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @node in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
+#. @node in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 #, fuzzy
 msgid "Fret diagram markups"
 msgstr "Tablatures"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #, fuzzy
 msgid "Predefined fret diagrams"
 msgstr "Tablatures"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #, fuzzy
 msgid "Automatic fret diagrams"
 msgstr "Barres de ligature automatiques"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #, fuzzy
 msgid "Right-hand fingerings"
 msgstr "Doigtés pour la main droite"
@@ -6082,18 +6269,22 @@ msgid "Guitar"
 msgstr "Guitare"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Indicating position and barring"
 msgstr "Indication de la position et du barré"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @node in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
+#. @node in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 msgid "Indicating harmonics and dampened notes"
 msgstr ""
 
@@ -6109,26 +6300,85 @@ msgid "Banjo"
 msgstr "Banjo"
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
 #. @subsubsection in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Banjo tablatures"
 msgstr "Tablatures pour banjo"
 
-#. Documentation/user/percussion.itely:214 (variable)
-#. Documentation/user/percussion.itely:394 (variable)
+#. Documentation/user/percussion.itely:175 (variable)
+#. Documentation/user/percussion.itely:365 (variable)
 msgid "up"
 msgstr "haut"
 
-#. Documentation/user/percussion.itely:215 (variable)
-#. Documentation/user/percussion.itely:395 (variable)
+#. Documentation/user/percussion.itely:178 (variable)
+#. Documentation/user/percussion.itely:366 (variable)
 msgid "down"
 msgstr "bas"
 
+#. Documentation/user/percussion.itely:388 (comment)
+msgid ""
+"These lines define the position of the woodblocks in the stave, if You like, "
+"You can change it "
+msgstr ""
+
+#. Documentation/user/percussion.itely:389 (comment)
+msgid "or You can use  special note heads for the woodblocks."
+msgstr ""
+
+#. Documentation/user/percussion.itely:391 (comment)
+msgid ""
+"this defines a staff with only two lines. It also defines the positions of "
+"the two lines"
+msgstr ""
+
+#. Documentation/user/percussion.itely:393 (comment)
+msgid "this is neccessary. If not entered, the barline wuld be too short!"
+msgstr ""
+
+#. Documentation/user/percussion.itely:397 (comment)
+msgid "with this You load Your new drum style table"
+msgstr ""
+
+#. Documentation/user/percussion.itely:419 (comment)
+msgid "tambourine-music is entered with \\\"tamb\\\""
+msgstr ""
+
+#. Documentation/user/percussion.itely:425 (comment)
+#, fuzzy
+msgid "broken"
+msgstr "crochet"
+
+#. Documentation/user/percussion.itely:426 (comment)
+msgid "\\set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) "
+msgstr ""
+
+#. Documentation/user/percussion.itely:430 (comment)
+msgid ""
+"the trick with the scaled duration and the shorter rest is neccessary for "
+"the correct ending of the trill-span!"
+msgstr ""
+
+#. Documentation/user/percussion.itely:454 (comment)
+msgid "bells are enterd with:"
+msgstr ""
+
+#. Documentation/user/percussion.itely:455 (comment)
+msgid "\\\"cb\\\" (cowbell) and \\\"rb\\\" (ridebell)\\\" "
+msgstr ""
+
+#. Documentation/user/percussion.itely:484 (variable)
+msgid "drumsA"
+msgstr ""
+
+#. Documentation/user/percussion.itely:493 (variable)
+msgid "drumsB"
+msgstr ""
+
 #. @node in Documentation/user/percussion.itely
 #. @section in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6173,6 +6423,17 @@ msgstr "Références en matière de notation pour percussions"
 msgid "Basic percussion notation"
 msgstr "Notation de base pour percussions"
 
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+msgid "Drum rolls"
+msgstr ""
+
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+#, fuzzy
+msgid "Pitched percussion"
+msgstr "Percussions"
+
 #. @node in Documentation/user/percussion.itely
 #. @subsubsection in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6184,6 +6445,12 @@ msgstr "Notation de base pour percussions"
 msgid "Percussion staves"
 msgstr "Portée de percussions"
 
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+#, fuzzy
+msgid "Custom percussion staves"
+msgstr "Portée de percussions"
+
 #. @node in Documentation/user/percussion.itely
 #. @subsubsection in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6218,27 +6485,16 @@ msgid "Common notation for wind instruments"
 msgstr "Vue d'ensemble des instruments à vent"
 
 #. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
-#. @subsubsection in Documentation/fr/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely
 #. @node in Documentation/es/user/wind.itely
-#. @subsubsection in Documentation/es/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "References for wind instruments"
 msgstr "Références en matière d'instruments à vent"
 
-#. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
-#. @node in Documentation/fr/user/wind.itely
-#. @subsubsection in Documentation/fr/user/wind.itely
-#. @node in Documentation/es/user/wind.itely
-#. @subsubsection in Documentation/es/user/wind.itely
-#. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
-msgid "Half-holes"
-msgstr "Demi-trous"
-
 #. @node in Documentation/user/wind.itely
 #. @subsection in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
@@ -6251,42 +6507,42 @@ msgid "Bagpipes"
 msgstr "Cornemuse"
 
 #. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
 #. @subsubsection in Documentation/fr/user/wind.itely
 #. @node in Documentation/es/user/wind.itely
 #. @subsubsection in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Bagpipe definitions"
 msgstr "Définitions pour la cornemuse"
 
 #. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
 #. @subsubsection in Documentation/fr/user/wind.itely
 #. @node in Documentation/es/user/wind.itely
 #. @subsubsection in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Bagpipe example"
 msgstr "Exemple pour la cornemuse"
 
-#. Documentation/user/chords.itely:651 (variable)
+#. Documentation/user/chords.itely:654 (variable)
 msgid "myChords"
 msgstr "mesAccords"
 
-#. Documentation/user/chords.itely:974 (comment)
-#. Documentation/user/chords.itely:995 (comment)
+#. Documentation/user/chords.itely:981 (comment)
+#. Documentation/user/chords.itely:1002 (comment)
 msgid "Put notes on same Staff as figures"
 msgstr "Assemblage des notes et de la basse chifrée sur une même portée"
 
-#. Documentation/user/chords.itely:1054 (comment)
+#. Documentation/user/chords.itely:1061 (comment)
 msgid "The extenders are correct here, with the same rhythm as the bass"
 msgstr ""
 "Les prolongateurs sont corrects, ils suivent bien le rythme de la basse"
 
-#. Documentation/user/chords.itely:1066 (comment)
+#. Documentation/user/chords.itely:1073 (comment)
 msgid "The extenders are incorrect here, even though the timing is the same"
 msgstr "Les prolongateurs sont erronés, bien que le rythme soit le même"
 
@@ -6400,6 +6656,11 @@ msgstr "Basse chiffrée"
 msgid "Introduction to figured bass"
 msgstr "Introduction à la basse chiffrée"
 
+#. @rglos in Documentation/user/chords.itely
+#, fuzzy
+msgid "figured bass"
+msgstr "Basse chiffrée"
+
 #. @node in Documentation/user/chords.itely
 #. @unnumberedsubsubsec in Documentation/user/chords.itely
 #. @node in Documentation/fr/user/chords.itely
@@ -7141,6 +7402,12 @@ msgstr ""
 msgid "Equalizing different instruments (ii)"
 msgstr ""
 
+#. @node in Documentation/user/input.itely
+#. @subsection in Documentation/user/input.itely
+#, fuzzy
+msgid "Percussion in MIDI"
+msgstr "Percussions"
+
 #. Documentation/user/spacing.itely:684 (comment)
 msgid "this does nothing"
 msgstr "ceci est sans effet"
@@ -7485,14 +7752,10 @@ msgstr "Notation proportionnelle"
 
 #. @node in Documentation/user/spacing.itely
 #. @section in Documentation/user/spacing.itely
-#. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/fr/user/spacing.itely
 #. @section in Documentation/fr/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @section in Documentation/es/user/spacing.itely
-#. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
 #. @node in Documentation/de/user/spacing.itely
 #. @section in Documentation/de/user/spacing.itely
 msgid "Fitting music onto fewer pages"
@@ -7521,14 +7784,18 @@ msgstr "Mise en évidence de l'espacement"
 msgid "Changing spacing"
 msgstr "Modification de l'espacement horizontal"
 
-#. Documentation/user/changing-defaults.itely:1947 (comment)
+#. Documentation/user/changing-defaults.itely:1940 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:1993 (comment)
+#. Documentation/user/changing-defaults.itely:1986 (comment)
 msgid "Try to remove all key signatures"
 msgstr ""
 
+#. Documentation/user/changing-defaults.itely:2368 (variable)
+msgid "XinO"
+msgstr ""
+
 #. @node in Documentation/user/changing-defaults.itely
 #. @chapter in Documentation/user/changing-defaults.itely
 #. @node in Documentation/fr/user/changing-defaults.itely
@@ -7693,12 +7960,15 @@ msgid "Overview of modifying properties"
 msgstr "Vue d'ensemble de la modification des propriétés"
 
 #. @node in Documentation/user/changing-defaults.itely
+#. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
-msgid "The \\set command"
+#, fuzzy
+msgid "The set command"
 msgstr "La commande \\set"
 
 #. @subsection in Documentation/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @subsection in Documentation/es/user/changing-defaults.itely
 #. @subsection in Documentation/de/user/changing-defaults.itely
 msgid "The @code{\\set} command"
@@ -7708,7 +7978,8 @@ msgstr "La commande @code{\\set}"
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
-msgid "The \\override command"
+#, fuzzy
+msgid "The override command"
 msgstr "La commande \\override"
 
 #. @subsection in Documentation/user/changing-defaults.itely
@@ -7722,7 +7993,8 @@ msgstr "La commande @code{\\override}"
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
-msgid "\\set versus \\override"
+#, fuzzy
+msgid "set versus override"
 msgstr "\\set ou \\override"
 
 #. @subsection in Documentation/user/changing-defaults.itely
@@ -7733,15 +8005,20 @@ msgid "@code{\\set} vs. @code{\\override}"
 msgstr "@code{\\set} ou @code{\\override}"
 
 #. @node in Documentation/user/changing-defaults.itely
-#. @subsection in Documentation/user/changing-defaults.itely
 #. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
-#. @subsection in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
+#, fuzzy
+msgid "The tweak command"
+msgstr "La commande \\set"
+
+#. @subsection in Documentation/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
+#. @subsection in Documentation/es/user/changing-defaults.itely
 #. @subsection in Documentation/de/user/changing-defaults.itely
-msgid "Objects connected to the input"
-msgstr "Objets liés à la source"
+#, fuzzy
+msgid "The @code{\\tweak} command"
+msgstr "La commande @code{\\set}"
 
 #. @node in Documentation/user/changing-defaults.itely
 #. @section in Documentation/user/changing-defaults.itely
@@ -7864,6 +8141,18 @@ msgstr "Styles de ligne"
 msgid "Rotating objects"
 msgstr "Rotation des objets"
 
+#. @node in Documentation/user/changing-defaults.itely
+#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely
+#, fuzzy
+msgid "Rotating layout objects"
+msgstr "Rotation des objets"
+
+#. @node in Documentation/user/changing-defaults.itely
+#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely
+#, fuzzy
+msgid "Rotating markup"
+msgstr "Bloc de texte étendu"
+
 #. @node in Documentation/user/changing-defaults.itely
 #. @subsection in Documentation/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
@@ -7919,6 +8208,12 @@ msgstr "Modification des stencils"
 msgid "Modifying shapes"
 msgstr "Modification des stencils"
 
+#. @node in Documentation/user/changing-defaults.itely
+#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely
+#, fuzzy
+msgid "Modifying ties and slurs"
+msgstr "Modification des stencils"
+
 #. @node in Documentation/user/changing-defaults.itely
 #. @section in Documentation/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
@@ -8257,7 +8552,6 @@ msgid "TODO moved into scheme"
 msgstr ""
 
 #. @node in Documentation/user/programming-interface.itely
-#. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/programming-interface.itely
 #. @node in Documentation/de/user/programming-interface.itely
 msgid "Using Scheme code instead of \\tweak"
@@ -8416,6 +8710,12 @@ msgstr "Styles de tête de note"
 msgid "List of articulations"
 msgstr "Liste des signes d'articulation"
 
+#. @node in Documentation/user/notation-appendices.itely
+#. @appendixsec in Documentation/user/notation-appendices.itely
+#, fuzzy
+msgid "Percussion notes"
+msgstr "Portée de percussions"
+
 #. @node in Documentation/user/notation-appendices.itely
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/fr/user/notation-appendices.itely
@@ -8503,26 +8803,10 @@ msgstr ""
 msgid "Tout ensemble"
 msgstr "Ensemble vocal"
 
-#. @node in Documentation/fr/user/tutorial.itely
-#. @subsection in Documentation/fr/user/tutorial.itely
-#. @node in Documentation/de/user/tutorial.itely
-#. @subsection in Documentation/de/user/tutorial.itely
-msgid "Working on text files"
-msgstr "Travail sur des fichiers texte"
-
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Exemples cliquables"
 msgstr ""
 
-#. @node in Documentation/fr/user/fundamental.itely
-#. @section in Documentation/fr/user/fundamental.itely
-#. @node in Documentation/es/user/fundamental.itely
-#. @section in Documentation/es/user/fundamental.itely
-#. @node in Documentation/de/user/fundamental.itely
-#. @section in Documentation/de/user/fundamental.itely
-msgid "How LilyPond files work"
-msgstr "Organisation des fichiers LilyPond"
-
 #. @node in Documentation/fr/user/tweaks.itely
 #. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
@@ -8530,13 +8814,6 @@ msgstr "Organisation des fichiers LilyPond"
 msgid "Common tweaks"
 msgstr "Retouches courantes"
 
-#. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
-#. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
-msgid "Default files"
-msgstr "Fichiers fournis avec le logiciel"
-
 #. @node in Documentation/fr/user/working.itely
 #. @subsection in Documentation/fr/user/working.itely
 #. @node in Documentation/es/user/working.itely
@@ -8555,85 +8832,6 @@ msgstr "GNU LilyPond --- utilisation du programme"
 msgid "GNU LilyPond --- manuel de notation"
 msgstr "GNU LilyPond --- manuel d'initiation"
 
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Normal pitches"
-msgstr "Hauteurs courantes"
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Cautionary accidentals"
-msgstr "Altérations de précaution"
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Micro tones"
-msgstr "Altérations microtonales"
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Relative octaves"
-msgstr "Octaves relatives"
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Octave check"
-msgstr "Vérification d'octave"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Augmentation dots"
-msgstr "Points d'augmentation"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/es/user/rhythms.itely
-#. @subsubsection in Documentation/es/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Skips"
-msgstr "Silences invisibles"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Multi measure rests"
-msgstr "Silences multi-mesures"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Bar check"
-msgstr "Vérification des limites de mesure"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Barnumber check"
-msgstr "Vérification des numéros de mesure"
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Proportional notation (introduction)"
-msgstr "Introduction à la notation proportionnelle"
-
 #. @node in Documentation/fr/user/repeats.itely
 #. @subsection in Documentation/fr/user/repeats.itely
 msgid "Writing repeats"
@@ -8642,21 +8840,21 @@ msgstr "Écriture de répétitions"
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Repeat types"
 msgstr "Types de répétitions"
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Repeat syntax"
 msgstr "Syntaxe des répétitions"
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Manual repeat commands"
 msgstr "Commandes de reprise manuelles"
 
@@ -8668,7 +8866,7 @@ msgstr "Autres types de répétition"
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Tremolo subdivisions"
 msgstr "Subdivision de trémolos"
 
@@ -8691,15 +8889,6 @@ msgstr "Polyphonie basique"
 msgid "Collision Resolution"
 msgstr "Résolution des collisions"
 
-#. @node in Documentation/fr/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
-#. @node in Documentation/es/user/staff.itely
-#. @subsubsection in Documentation/es/user/staff.itely
-#. @node in Documentation/de/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
-msgid "System start delimiters"
-msgstr "Délimitations en début de système"
-
 #. @node in Documentation/fr/user/editorial.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely
 msgid "Blank music sheet"
@@ -8729,51 +8918,22 @@ msgid "Basculer vers une mélodie alternative"
 msgstr ""
 
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "The piano staff"
 msgstr "La double portée pour piano"
 
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
-#. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
-#. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
-msgid "Fret diagrams"
-msgstr "Tablatures"
-
-#. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Right hand fingerings"
 msgstr "Doigtés pour la main droite"
 
-#. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
-#. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
-#. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
-msgid "Guitar tablatures"
-msgstr "Tablatures pour la guitare"
-
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @section in Documentation/fr/user/changing-defaults.itely
-msgid "Automatic notation"
-msgstr "Notation automatique"
-
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
-msgid "Changing context properties on the fly"
-msgstr "Changer à la volée les propriétés de contexte"
-
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @subsection in Documentation/fr/user/changing-defaults.itely
 msgid "Layout tunings within contexts"
@@ -8784,6 +8944,11 @@ msgstr "Retouches de mise en forme au sein des contextes"
 msgid "Constructing a tweak"
 msgstr "Élaboration d'une retouche"
 
+#. @node in Documentation/fr/user/changing-defaults.itely
+#, fuzzy
+msgid "Using Scheme code instead of tweak"
+msgstr "Utilisation de code Scheme au lieu de \\tweak"
+
 #. @subsubheading in Documentation/es/user/macros.itexi
 msgid "Instrucciones predefinidas"
 msgstr ""
@@ -8804,6 +8969,13 @@ msgstr ""
 msgid "Advertencias y problemas conocidos"
 msgstr ""
 
+#. @node in Documentation/es/user/fundamental.itely
+#. @section in Documentation/es/user/fundamental.itely
+#. @node in Documentation/de/user/fundamental.itely
+#. @section in Documentation/de/user/fundamental.itely
+msgid "How LilyPond files work"
+msgstr "Organisation des fichiers LilyPond"
+
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 msgid "Automatic behaviour"
@@ -8839,6 +9011,13 @@ msgstr ""
 msgid "Writing long repeats"
 msgstr "Écriture de répétitions longues"
 
+#. @node in Documentation/es/user/staff.itely
+#. @subsubsection in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
+msgid "System start delimiters"
+msgstr "Délimitations en début de système"
+
 #. @rglos in Documentation/es/user/chords.itely
 msgid "  "
 msgstr ""
@@ -8890,6 +9069,11 @@ msgstr "Autres sources de documentation"
 msgid "Unix"
 msgstr "Unix"
 
+#. @node in Documentation/de/user/tutorial.itely
+#. @subsection in Documentation/de/user/tutorial.itely
+msgid "Working on text files"
+msgstr "Travail sur des fichiers texte"
+
 #. @rglos in Documentation/de/user/tutorial.itely
 msgid "legato"
 msgstr "legato"
@@ -8917,6 +9101,11 @@ msgstr "Liaisons ``laissez vibrer''"
 msgid "Chords"
 msgstr "Accords"
 
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
+msgid "Guitar tablatures"
+msgstr "Tablatures pour la guitare"
+
 msgid "Up:"
 msgstr "Haut&nbsp;:"
 
@@ -8935,6 +9124,76 @@ msgstr "Notes de bas de page"
 msgid "Table of Contents"
 msgstr "Table des matières"
 
+#~ msgid "No time signature in the ossia staff"
+#~ msgstr "pas de métrique pour la portée d'ossia"
+
+#~ msgid "To use the setting globally, uncomment the following line:"
+#~ msgstr ""
+#~ "Pour une application à toutes les portées, décommenter la ligne suivante"
+
+#~ msgid "\\override VerticalAxisGroup #'remove-first = ##t"
+#~ msgstr "\\override VerticalAxisGroup #'remove-first = ##t"
+
+#~ msgid ""
+#~ "To use the setting globally, comment this line, uncomment the line above"
+#~ msgstr ""
+#~ "Pour une application à toutes les portées, commenter la ligne suivante, "
+#~ "et décommenter celle du bloc \\layout"
+
+#~ msgid "smaller"
+#~ msgstr "moinsgros"
+
+#~ msgid "setup a context for cue notes."
+#~ msgstr "définition d'un contexte pour la citation"
+
+#~ msgid "Half-holes"
+#~ msgstr "Demi-trous"
+
+#~ msgid "Objects connected to the input"
+#~ msgstr "Objets liés à la source"
+
+#~ msgid "Default files"
+#~ msgstr "Fichiers fournis avec le logiciel"
+
+#~ msgid "Normal pitches"
+#~ msgstr "Hauteurs courantes"
+
+#~ msgid "Cautionary accidentals"
+#~ msgstr "Altérations de précaution"
+
+#~ msgid "Micro tones"
+#~ msgstr "Altérations microtonales"
+
+#~ msgid "Relative octaves"
+#~ msgstr "Octaves relatives"
+
+#~ msgid "Octave check"
+#~ msgstr "Vérification d'octave"
+
+#~ msgid "Augmentation dots"
+#~ msgstr "Points d'augmentation"
+
+#~ msgid "Skips"
+#~ msgstr "Silences invisibles"
+
+#~ msgid "Multi measure rests"
+#~ msgstr "Silences multi-mesures"
+
+#~ msgid "Bar check"
+#~ msgstr "Vérification des limites de mesure"
+
+#~ msgid "Barnumber check"
+#~ msgstr "Vérification des numéros de mesure"
+
+#~ msgid "Proportional notation (introduction)"
+#~ msgstr "Introduction à la notation proportionnelle"
+
+#~ msgid "Fret diagrams"
+#~ msgstr "Tablatures"
+
+#~ msgid "Automatic notation"
+#~ msgstr "Notation automatique"
+
 #, fuzzy
 #~ msgid "Microtones in MIDI"
 #~ msgstr "Altérations microtonales"
diff --git a/Documentation/po/lilypond-doc.pot b/Documentation/po/lilypond-doc.pot
index ef6ce1d04a..e61b941138 100644
--- a/Documentation/po/lilypond-doc.pot
+++ b/Documentation/po/lilypond-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-11 18:05+0200\n"
+"POT-Creation-Date: 2008-08-23 18:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,38 +16,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: add_html_footer.py:44
+#: add_html_footer.py:47
 #, python-format
 msgid "This page is for %(package_name)s-%(package_version)s (%(branch_str)s)."
 msgstr ""
 
-#: add_html_footer.py:45
+#: add_html_footer.py:48
 #, python-format
 msgid "Report errors to <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
 msgstr ""
 
-#: add_html_footer.py:47
+#: add_html_footer.py:50
 #, python-format
 msgid ""
 "Your <a href=\"%(suggest_Docs_url)s\">suggestions for the documentation</a> "
 "are welcome."
 msgstr ""
 
-#: add_html_footer.py:55
+#: add_html_footer.py:58
 #, python-format
 msgid "Other languages: %s."
 msgstr ""
 
-#: add_html_footer.py:56
+#: add_html_footer.py:59
 #, python-format
 msgid "About <A HREF=\"%s\">automatic language selection</A>."
 msgstr ""
 
-#: add_html_footer.py:262
+#: add_html_footer.py:265
 msgid "stable-branch"
 msgstr ""
 
-#: add_html_footer.py:264
+#: add_html_footer.py:267
 msgid "development-branch"
 msgstr ""
 
@@ -311,7 +311,7 @@ msgstr ""
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Learning Manual (LM)"
+msgid "About the Learning Manual"
 msgstr ""
 
 #. @node in Documentation/user/introduction.itely
@@ -320,7 +320,7 @@ msgstr ""
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Music Glossary (MG)"
+msgid "About the Music Glossary"
 msgstr ""
 
 #. @node in Documentation/user/introduction.itely
@@ -329,7 +329,7 @@ msgstr ""
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Notation Reference (NR)"
+msgid "About the Notation Reference"
 msgstr ""
 
 #. @node in Documentation/user/introduction.itely
@@ -338,7 +338,7 @@ msgstr ""
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Application Usage (AU)"
+msgid "About the Application Usage"
 msgstr ""
 
 #. @node in Documentation/user/introduction.itely
@@ -347,7 +347,7 @@ msgstr ""
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Snippet List (SL)"
+msgid "About the Snippet List"
 msgstr ""
 
 #. @node in Documentation/user/introduction.itely
@@ -356,7 +356,7 @@ msgstr ""
 #. @unnumberedsubsec in Documentation/fr/user/introduction.itely
 #. @node in Documentation/es/user/introduction.itely
 #. @unnumberedsubsec in Documentation/es/user/introduction.itely
-msgid "About the Internals Reference (IR)"
+msgid "About the Internals Reference"
 msgstr ""
 
 #. @node in Documentation/user/introduction.itely
@@ -672,6 +672,8 @@ msgstr ""
 
 #. @node in Documentation/user/tutorial.itely
 #. @subsection in Documentation/user/tutorial.itely
+#. @node in Documentation/fr/user/tutorial.itely
+#. @subsection in Documentation/fr/user/tutorial.itely
 #. @node in Documentation/es/user/tutorial.itely
 #. @subsection in Documentation/es/user/tutorial.itely
 msgid "Working on input files"
@@ -844,8 +846,8 @@ msgstr ""
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
 #. @subheading in Documentation/de/user/tutorial.itely
-#. @node in Documentation/de/user/expressive.itely
-#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Ties"
 msgstr ""
 
@@ -939,9 +941,17 @@ msgid "Articulations"
 msgstr ""
 
 #. @subheading in Documentation/user/tutorial.itely
+#. @node in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @subheading in Documentation/fr/user/tutorial.itely
+#. @node in Documentation/fr/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely
 #. @subheading in Documentation/es/user/tutorial.itely
+#. @node in Documentation/es/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/es/user/wind.itely
 #. @subheading in Documentation/de/user/tutorial.itely
+#. @node in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Fingerings"
 msgstr ""
 
@@ -1375,412 +1385,424 @@ msgstr ""
 msgid "After the tutorial"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:352 (variable)
-#. Documentation/user/vocal.itely:1165 (variable)
-#. Documentation/user/vocal.itely:1207 (variable)
+#. Documentation/user/fundamental.itely:346 (variable)
+#. Documentation/user/vocal.itely:1162 (variable)
+#. Documentation/user/vocal.itely:1204 (variable)
 msgid "melody"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:353 (variable)
-#. Documentation/user/vocal.itely:989 (variable)
-#. Documentation/user/vocal.itely:1170 (variable)
-#. Documentation/user/vocal.itely:1211 (variable)
+#. Documentation/user/fundamental.itely:347 (variable)
+#. Documentation/user/vocal.itely:986 (variable)
+#. Documentation/user/vocal.itely:1167 (variable)
+#. Documentation/user/vocal.itely:1208 (variable)
 msgid "text"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:354 (variable)
-#. Documentation/user/fundamental.itely:2520 (variable)
+#. Documentation/user/fundamental.itely:348 (variable)
+#. Documentation/user/fundamental.itely:2602 (variable)
 msgid "upper"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:355 (variable)
-#. Documentation/user/fundamental.itely:2527 (variable)
+#. Documentation/user/fundamental.itely:349 (variable)
+#. Documentation/user/fundamental.itely:2609 (variable)
 msgid "lower"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:613 (comment)
-#. Documentation/user/fundamental.itely:623 (comment)
-#. Documentation/user/fundamental.itely:638 (comment)
-#. Documentation/user/fundamental.itely:643 (comment)
-#. Documentation/user/fundamental.itely:663 (comment)
-msgid "Voice "
+#. Documentation/user/fundamental.itely:614 (comment)
+msgid "Voice \\\"1\\\"                  Voice \\\"2\\\""
+msgstr ""
+
+#. Documentation/user/fundamental.itely:624 (comment)
+msgid "Voice \\\"1\\\"             Voice \\\"2\\\""
+msgstr ""
+
+#. Documentation/user/fundamental.itely:639 (comment)
+msgid "Voice \\\"1\\\""
 msgstr ""
 
-#. Documentation/user/fundamental.itely:661 (comment)
-#. Documentation/user/fundamental.itely:685 (comment)
+#. Documentation/user/fundamental.itely:644 (comment)
+msgid "Voice \\\"2\\\""
+msgstr ""
+
+#. Documentation/user/fundamental.itely:662 (comment)
+#. Documentation/user/fundamental.itely:686 (comment)
 msgid "Main voice"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:687 (comment)
-#. Documentation/user/simultaneous.itely:593 (comment)
-#. Documentation/user/simultaneous.itely:618 (comment)
-#. Documentation/user/simultaneous.itely:645 (comment)
+#. Documentation/user/fundamental.itely:664 (comment)
+msgid "Voice \\\"1\\\"     Voice \\\"2\\\"                 Voice \\\"3\\\""
+msgstr ""
+
+#. Documentation/user/fundamental.itely:688 (comment)
+#. Documentation/user/simultaneous.itely:653 (comment)
+#. Documentation/user/simultaneous.itely:678 (comment)
+#. Documentation/user/simultaneous.itely:705 (comment)
 msgid "Bar 1"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:698 (comment)
-#. Documentation/user/simultaneous.itely:598 (comment)
-#. Documentation/user/simultaneous.itely:623 (comment)
-#. Documentation/user/simultaneous.itely:651 (comment)
+#. Documentation/user/fundamental.itely:699 (comment)
+#. Documentation/user/simultaneous.itely:658 (comment)
+#. Documentation/user/simultaneous.itely:683 (comment)
+#. Documentation/user/simultaneous.itely:711 (comment)
 msgid "Bar 2"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:699 (comment)
+#. Documentation/user/fundamental.itely:700 (comment)
 msgid "Voice 1 continues"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:702 (comment)
+#. Documentation/user/fundamental.itely:703 (comment)
 msgid "Voice 2 continues"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:873 (comment)
+#. Documentation/user/fundamental.itely:874 (comment)
 msgid "Voice one"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:875 (comment)
+#. Documentation/user/fundamental.itely:876 (comment)
 msgid "Voice two"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:877 (comment)
+#. Documentation/user/fundamental.itely:878 (comment)
 msgid "Omit Voice three"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:878 (comment)
+#. Documentation/user/fundamental.itely:879 (comment)
 msgid "Voice four"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:966 (comment)
+#. Documentation/user/fundamental.itely:970 (comment)
 msgid "Default behavior or behavior after \\oneVoice"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1004 (comment)
+#. Documentation/user/fundamental.itely:1008 (comment)
 msgid "The following notes are monophonic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1006 (comment)
+#. Documentation/user/fundamental.itely:1010 (comment)
 msgid "Start simultaneous section of three voices"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1008 (comment)
+#. Documentation/user/fundamental.itely:1012 (comment)
 msgid "Continue the main voice in parallel"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1010 (comment)
-#. Documentation/user/fundamental.itely:1072 (comment)
+#. Documentation/user/fundamental.itely:1014 (comment)
+#. Documentation/user/fundamental.itely:1076 (comment)
 msgid "Initiate second voice"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1012 (comment)
-#. Documentation/user/fundamental.itely:1074 (comment)
+#. Documentation/user/fundamental.itely:1016 (comment)
+#. Documentation/user/fundamental.itely:1078 (comment)
 msgid "Set stems, etc, down"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1016 (comment)
-#. Documentation/user/fundamental.itely:1078 (comment)
+#. Documentation/user/fundamental.itely:1020 (comment)
+#. Documentation/user/fundamental.itely:1082 (comment)
 msgid "Initiate third voice"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1018 (comment)
-#. Documentation/user/fundamental.itely:1080 (comment)
+#. Documentation/user/fundamental.itely:1022 (comment)
+#. Documentation/user/fundamental.itely:1084 (comment)
 msgid "Set stems, etc, up"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1067 (comment)
+#. Documentation/user/fundamental.itely:1071 (comment)
 msgid "Initiate first voice"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1187 (variable)
-#. Documentation/user/fundamental.itely:2497 (variable)
-#. Documentation/user/tweaks.itely:3168 (variable)
-#. Documentation/user/simultaneous.itely:639 (variable)
+#. Documentation/user/fundamental.itely:1196 (variable)
+#. Documentation/user/fundamental.itely:2579 (variable)
+#. Documentation/user/tweaks.itely:3170 (variable)
+#. Documentation/user/simultaneous.itely:699 (variable)
 msgid "global"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1188 (variable)
+#. Documentation/user/fundamental.itely:1197 (variable)
 msgid "SopOneMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1190 (variable)
+#. Documentation/user/fundamental.itely:1199 (variable)
 msgid "SopTwoMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1192 (variable)
+#. Documentation/user/fundamental.itely:1201 (variable)
 msgid "SopOneLyrics"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1194 (variable)
+#. Documentation/user/fundamental.itely:1203 (variable)
 msgid "SopTwoLyrics"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1238 (variable)
-#. Documentation/user/fundamental.itely:2712 (variable)
+#. Documentation/user/fundamental.itely:1247 (variable)
+#. Documentation/user/fundamental.itely:2794 (variable)
 msgid "TimeKey"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1239 (variable)
+#. Documentation/user/fundamental.itely:1248 (variable)
 msgid "SopMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1240 (variable)
-#. Documentation/user/tweaks.itely:3170 (variable)
+#. Documentation/user/fundamental.itely:1249 (variable)
+#. Documentation/user/tweaks.itely:3172 (variable)
 msgid "AltoMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1241 (variable)
-#. Documentation/user/tweaks.itely:3171 (variable)
+#. Documentation/user/fundamental.itely:1250 (variable)
+#. Documentation/user/tweaks.itely:3173 (variable)
 msgid "TenorMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1242 (variable)
-#. Documentation/user/tweaks.itely:3172 (variable)
+#. Documentation/user/fundamental.itely:1251 (variable)
+#. Documentation/user/tweaks.itely:3174 (variable)
 msgid "BassMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1243 (variable)
-#. Documentation/user/tweaks.itely:3173 (variable)
+#. Documentation/user/fundamental.itely:1252 (variable)
+#. Documentation/user/tweaks.itely:3175 (variable)
 msgid "VerseOne"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1245 (variable)
-#. Documentation/user/tweaks.itely:3174 (variable)
+#. Documentation/user/fundamental.itely:1254 (variable)
+#. Documentation/user/tweaks.itely:3176 (variable)
 msgid "VerseTwo"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1247 (variable)
-#. Documentation/user/tweaks.itely:3175 (variable)
+#. Documentation/user/fundamental.itely:1256 (variable)
+#. Documentation/user/tweaks.itely:3177 (variable)
 msgid "VerseThree"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1249 (variable)
-#. Documentation/user/tweaks.itely:3176 (variable)
+#. Documentation/user/fundamental.itely:1258 (variable)
+#. Documentation/user/tweaks.itely:3178 (variable)
 msgid "VerseFour"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1292 (variable)
-#. Documentation/user/fundamental.itely:1344 (variable)
-#. Documentation/user/fundamental.itely:1405 (variable)
+#. Documentation/user/fundamental.itely:1301 (variable)
+#. Documentation/user/fundamental.itely:1353 (variable)
+#. Documentation/user/fundamental.itely:1414 (variable)
 msgid "versenotes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1297 (variable)
-#. Documentation/user/fundamental.itely:1358 (variable)
-#. Documentation/user/fundamental.itely:1419 (variable)
+#. Documentation/user/fundamental.itely:1306 (variable)
+#. Documentation/user/fundamental.itely:1367 (variable)
+#. Documentation/user/fundamental.itely:1428 (variable)
 msgid "versewords"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1349 (variable)
-#. Documentation/user/fundamental.itely:1410 (variable)
+#. Documentation/user/fundamental.itely:1358 (variable)
+#. Documentation/user/fundamental.itely:1419 (variable)
 msgid "refrainnotesA"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1353 (variable)
-#. Documentation/user/fundamental.itely:1414 (variable)
+#. Documentation/user/fundamental.itely:1362 (variable)
+#. Documentation/user/fundamental.itely:1423 (variable)
 msgid "refrainnotesB"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1361 (variable)
-#. Documentation/user/fundamental.itely:1422 (variable)
+#. Documentation/user/fundamental.itely:1370 (variable)
+#. Documentation/user/fundamental.itely:1431 (variable)
 msgid "refrainwordsA"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1364 (variable)
-#. Documentation/user/fundamental.itely:1425 (variable)
+#. Documentation/user/fundamental.itely:1373 (variable)
+#. Documentation/user/fundamental.itely:1434 (variable)
 msgid "refrainwordsB"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1589 (comment)
+#. Documentation/user/fundamental.itely:1608 (comment)
 msgid "start of single compound music expression"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1590 (comment)
+#. Documentation/user/fundamental.itely:1609 (comment)
 msgid "start of simultaneous staves section"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1592 (comment)
+#. Documentation/user/fundamental.itely:1611 (comment)
 msgid "create RH staff"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1595 (comment)
+#. Documentation/user/fundamental.itely:1614 (comment)
 msgid "create voice for RH notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1596 (comment)
+#. Documentation/user/fundamental.itely:1615 (comment)
 msgid "start of RH notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1599 (comment)
+#. Documentation/user/fundamental.itely:1618 (comment)
 msgid "end of RH notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1600 (comment)
+#. Documentation/user/fundamental.itely:1619 (comment)
 msgid "end of RH voice"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1601 (comment)
+#. Documentation/user/fundamental.itely:1620 (comment)
 msgid "end of RH staff"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1602 (comment)
+#. Documentation/user/fundamental.itely:1621 (comment)
 msgid "create LH staff; needs two simultaneous voices"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1605 (comment)
+#. Documentation/user/fundamental.itely:1624 (comment)
 msgid "create LH voice one"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1607 (comment)
+#. Documentation/user/fundamental.itely:1626 (comment)
 msgid "start of LH voice one notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1610 (comment)
+#. Documentation/user/fundamental.itely:1629 (comment)
 msgid "end of LH voice one notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1611 (comment)
+#. Documentation/user/fundamental.itely:1630 (comment)
 msgid "end of LH voice one"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1612 (comment)
+#. Documentation/user/fundamental.itely:1631 (comment)
 msgid "create LH voice two"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1614 (comment)
+#. Documentation/user/fundamental.itely:1633 (comment)
 msgid "start of LH voice two notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1617 (comment)
+#. Documentation/user/fundamental.itely:1636 (comment)
 msgid "end of LH voice two notes"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1618 (comment)
+#. Documentation/user/fundamental.itely:1637 (comment)
 msgid "end of LH voice two"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1619 (comment)
+#. Documentation/user/fundamental.itely:1638 (comment)
 msgid "end of LH staff"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1620 (comment)
+#. Documentation/user/fundamental.itely:1639 (comment)
 msgid "end of simultaneous staves section"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1621 (comment)
+#. Documentation/user/fundamental.itely:1640 (comment)
 msgid "end of single compound music expression"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1824 (comment)
+#. Documentation/user/fundamental.itely:1851 (comment)
 msgid "Wrong!"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1908 (comment)
-#. Documentation/user/fundamental.itely:2003 (comment)
+#. Documentation/user/fundamental.itely:1937 (comment)
+#. Documentation/user/fundamental.itely:2078 (comment)
 msgid "make note heads smaller"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1911 (comment)
-#. Documentation/user/fundamental.itely:2005 (comment)
+#. Documentation/user/fundamental.itely:1940 (comment)
+#. Documentation/user/fundamental.itely:2080 (comment)
 msgid "make note heads larger"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:1914 (comment)
-#. Documentation/user/fundamental.itely:2007 (comment)
+#. Documentation/user/fundamental.itely:1943 (comment)
+#. Documentation/user/fundamental.itely:2082 (comment)
 msgid "return to default size"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2274 (variable)
-#. Documentation/user/fundamental.itely:2498 (variable)
+#. Documentation/user/fundamental.itely:2352 (variable)
+#. Documentation/user/fundamental.itely:2580 (variable)
 #. Documentation/user/input.itely:907 (variable)
 msgid "sopranoMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2281 (variable)
+#. Documentation/user/fundamental.itely:2359 (variable)
 msgid "sopranoLyrics"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2285 (variable)
+#. Documentation/user/fundamental.itely:2363 (variable)
 msgid "celloMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2502 (variable)
+#. Documentation/user/fundamental.itely:2584 (variable)
 msgid "sopranoWords"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2505 (variable)
+#. Documentation/user/fundamental.itely:2587 (variable)
 #. Documentation/user/input.itely:908 (variable)
 msgid "altoMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2509 (variable)
+#. Documentation/user/fundamental.itely:2591 (variable)
 msgid "altoWords"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2510 (variable)
+#. Documentation/user/fundamental.itely:2592 (variable)
 #. Documentation/user/input.itely:909 (variable)
 msgid "tenorMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2514 (variable)
+#. Documentation/user/fundamental.itely:2596 (variable)
 msgid "tenorWords"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2515 (variable)
+#. Documentation/user/fundamental.itely:2597 (variable)
 #. Documentation/user/input.itely:910 (variable)
 msgid "bassMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2519 (variable)
+#. Documentation/user/fundamental.itely:2601 (variable)
 msgid "bassWords"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2536 (comment)
+#. Documentation/user/fundamental.itely:2618 (comment)
 msgid "combine ChoirStaff and PianoStaff in parallel"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2558 (comment)
+#. Documentation/user/fundamental.itely:2640 (comment)
 msgid "end ChoirStaff"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2713 (variable)
+#. Documentation/user/fundamental.itely:2795 (variable)
 msgid "ManualOneVoiceOneMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2716 (variable)
+#. Documentation/user/fundamental.itely:2798 (variable)
 msgid "ManualOneVoiceTwoMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2720 (variable)
+#. Documentation/user/fundamental.itely:2802 (variable)
 msgid "ManualTwoMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2724 (variable)
+#. Documentation/user/fundamental.itely:2806 (variable)
 msgid "PedalOrganMusic"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2730 (comment)
+#. Documentation/user/fundamental.itely:2812 (comment)
 msgid "PianoStaff and Pedal Staff must be simultaneous"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2733 (comment)
+#. Documentation/user/fundamental.itely:2815 (comment)
 msgid "set time signature and key"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2737 (comment)
+#. Documentation/user/fundamental.itely:2819 (comment)
 msgid "end ManualOne Staff context"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2742 (comment)
+#. Documentation/user/fundamental.itely:2824 (comment)
 msgid "end ManualTwo Staff context"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2743 (comment)
+#. Documentation/user/fundamental.itely:2825 (comment)
 msgid "end PianoStaff context"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2748 (comment)
+#. Documentation/user/fundamental.itely:2830 (comment)
 msgid "end PedalOrgan Staff context"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:2750 (comment)
+#. Documentation/user/fundamental.itely:2832 (comment)
 msgid "end Score context"
 msgstr ""
 
@@ -1797,6 +1819,8 @@ msgstr ""
 
 #. @node in Documentation/user/fundamental.itely
 #. @section in Documentation/user/fundamental.itely
+#. @node in Documentation/fr/user/fundamental.itely
+#. @section in Documentation/fr/user/fundamental.itely
 msgid "How LilyPond input files work"
 msgstr ""
 
@@ -1836,6 +1860,7 @@ msgstr ""
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
 #. @rglos in Documentation/user/staff.itely
+#. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 msgid "ossia"
@@ -1888,6 +1913,7 @@ msgid "Explicitly instantiating voices"
 msgstr ""
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 msgid "Note columns"
 msgstr ""
 
@@ -1919,6 +1945,8 @@ msgstr ""
 #. @subsection in Documentation/user/changing-defaults.itely
 #. @node in Documentation/fr/user/fundamental.itely
 #. @subsection in Documentation/fr/user/fundamental.itely
+#. @node in Documentation/fr/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/fundamental.itely
 #. @subsection in Documentation/es/user/fundamental.itely
 #. @node in Documentation/es/user/changing-defaults.itely
@@ -1969,6 +1997,16 @@ msgstr ""
 msgid "Modifying context properties"
 msgstr ""
 
+#. @unnumberedsubsubsec in Documentation/user/fundamental.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fundamental.itely
+msgid "Setting context properties with @code{\\with}"
+msgstr ""
+
+#. @unnumberedsubsubsec in Documentation/user/fundamental.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fundamental.itely
+msgid "Setting context properties with @code{\\context}"
+msgstr ""
+
 #. @node in Documentation/user/fundamental.itely
 #. @subsection in Documentation/user/fundamental.itely
 #. @node in Documentation/fr/user/fundamental.itely
@@ -1981,18 +2019,21 @@ msgid "Adding and removing engravers"
 msgstr ""
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 #. @subsubheading in Documentation/es/user/fundamental.itely
 msgid "Changing a single context"
 msgstr ""
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/pitches.itely
+#. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/pitches.itely
 msgid "ambitus"
 msgstr ""
 
 #. @subsubheading in Documentation/user/fundamental.itely
+#. @subsubheading in Documentation/fr/user/fundamental.itely
 #. @subsubheading in Documentation/es/user/fundamental.itely
 msgid "Changing all contexts of the same type"
 msgstr ""
@@ -2041,195 +2082,195 @@ msgstr ""
 msgid "Building a score from scratch"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:540 (comment)
-#. Documentation/user/tweaks.itely:664 (comment)
+#. Documentation/user/tweaks.itely:541 (comment)
+#. Documentation/user/tweaks.itely:665 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:605 (comment)
-#. Documentation/user/tweaks.itely:639 (comment)
-#. Documentation/user/tweaks.itely:642 (comment)
+#. Documentation/user/tweaks.itely:606 (comment)
+#. Documentation/user/tweaks.itely:640 (comment)
+#. Documentation/user/tweaks.itely:643 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:668 (comment)
+#. Documentation/user/tweaks.itely:669 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1265 (comment)
+#. Documentation/user/tweaks.itely:1267 (comment)
 msgid "Don't print clefs in this staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1267 (comment)
+#. Documentation/user/tweaks.itely:1269 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1328 (comment)
+#. Documentation/user/tweaks.itely:1330 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1384 (comment)
+#. Documentation/user/tweaks.itely:1386 (comment)
 msgid "Reduce stem length and line spacing to match"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1758 (comment)
-#. Documentation/user/tweaks.itely:1819 (comment)
+#. Documentation/user/tweaks.itely:1760 (comment)
+#. Documentation/user/tweaks.itely:1821 (comment)
 msgid "Set details for later Text Spanner"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1761 (comment)
-#. Documentation/user/tweaks.itely:1822 (comment)
+#. Documentation/user/tweaks.itely:1763 (comment)
+#. Documentation/user/tweaks.itely:1824 (comment)
 msgid "Place dynamics above staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1763 (comment)
-#. Documentation/user/tweaks.itely:1826 (comment)
+#. Documentation/user/tweaks.itely:1765 (comment)
+#. Documentation/user/tweaks.itely:1828 (comment)
 msgid "Start Ottava Bracket"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1766 (comment)
-#. Documentation/user/tweaks.itely:1773 (comment)
-#. Documentation/user/tweaks.itely:1829 (comment)
-#. Documentation/user/tweaks.itely:1836 (comment)
-msgid "Add Dynamic Text"
-msgstr ""
-
 #. Documentation/user/tweaks.itely:1768 (comment)
+#. Documentation/user/tweaks.itely:1775 (comment)
 #. Documentation/user/tweaks.itely:1831 (comment)
-msgid "Add Dynamic Line Spanner"
+#. Documentation/user/tweaks.itely:1838 (comment)
+msgid "Add Dynamic Text"
 msgstr ""
 
 #. Documentation/user/tweaks.itely:1770 (comment)
 #. Documentation/user/tweaks.itely:1833 (comment)
+msgid "Add Dynamic Line Spanner"
+msgstr ""
+
+#. Documentation/user/tweaks.itely:1772 (comment)
+#. Documentation/user/tweaks.itely:1835 (comment)
 msgid "Add Text Script"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1775 (comment)
-#. Documentation/user/tweaks.itely:1838 (comment)
+#. Documentation/user/tweaks.itely:1777 (comment)
+#. Documentation/user/tweaks.itely:1840 (comment)
 msgid "Stop Ottava Bracket"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1824 (comment)
+#. Documentation/user/tweaks.itely:1826 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1880 (comment)
+#. Documentation/user/tweaks.itely:1882 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1898 (comment)
+#. Documentation/user/tweaks.itely:1900 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1902 (comment)
+#. Documentation/user/tweaks.itely:1904 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1906 (comment)
-#. Documentation/user/tweaks.itely:1911 (comment)
+#. Documentation/user/tweaks.itely:1908 (comment)
+#. Documentation/user/tweaks.itely:1913 (comment)
 msgid "Turn off collision avoidance"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1913 (comment)
+#. Documentation/user/tweaks.itely:1915 (comment)
 msgid "and turn on textLengthOn"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1914 (comment)
+#. Documentation/user/tweaks.itely:1916 (comment)
 msgid "Spaces at end are honored"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2017 (comment)
+#. Documentation/user/tweaks.itely:2019 (comment)
 msgid "Extend width by 1 staff space"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2283 (comment)
+#. Documentation/user/tweaks.itely:2285 (comment)
 msgid "This will not work, see below:"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2287 (comment)
+#. Documentation/user/tweaks.itely:2289 (comment)
 msgid "This works:"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2332 (variable)
+#. Documentation/user/tweaks.itely:2334 (variable)
 msgid "naturalplusflat"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2367 (comment)
+#. Documentation/user/tweaks.itely:2369 (comment)
 msgid "Extend width by 1 unit"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2369 (comment)
+#. Documentation/user/tweaks.itely:2371 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2647 (variable)
-#. Documentation/user/tweaks.itely:2698 (variable)
-#. Documentation/user/tweaks.itely:2760 (variable)
-#. Documentation/user/tweaks.itely:2831 (variable)
-#. Documentation/user/tweaks.itely:2893 (variable)
-#. Documentation/user/tweaks.itely:2948 (variable)
+#. Documentation/user/tweaks.itely:2649 (variable)
+#. Documentation/user/tweaks.itely:2700 (variable)
+#. Documentation/user/tweaks.itely:2762 (variable)
+#. Documentation/user/tweaks.itely:2833 (variable)
+#. Documentation/user/tweaks.itely:2895 (variable)
+#. Documentation/user/tweaks.itely:2950 (variable)
 msgid "rhMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2652 (comment)
-#. Documentation/user/tweaks.itely:2703 (comment)
-#. Documentation/user/tweaks.itely:2767 (comment)
-#. Documentation/user/tweaks.itely:2840 (comment)
-#. Documentation/user/tweaks.itely:2902 (comment)
+#. Documentation/user/tweaks.itely:2654 (comment)
+#. Documentation/user/tweaks.itely:2705 (comment)
+#. Documentation/user/tweaks.itely:2769 (comment)
+#. Documentation/user/tweaks.itely:2842 (comment)
+#. Documentation/user/tweaks.itely:2904 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2665 (variable)
-#. Documentation/user/tweaks.itely:2716 (variable)
-#. Documentation/user/tweaks.itely:2780 (variable)
-#. Documentation/user/tweaks.itely:2855 (variable)
-#. Documentation/user/tweaks.itely:2919 (variable)
-#. Documentation/user/tweaks.itely:2976 (variable)
+#. Documentation/user/tweaks.itely:2667 (variable)
+#. Documentation/user/tweaks.itely:2718 (variable)
+#. Documentation/user/tweaks.itely:2782 (variable)
+#. Documentation/user/tweaks.itely:2857 (variable)
+#. Documentation/user/tweaks.itely:2921 (variable)
+#. Documentation/user/tweaks.itely:2978 (variable)
 msgid "lhMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2906 (comment)
-#. Documentation/user/tweaks.itely:2963 (comment)
+#. Documentation/user/tweaks.itely:2908 (comment)
+#. Documentation/user/tweaks.itely:2965 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2909 (comment)
-#. Documentation/user/tweaks.itely:2966 (comment)
+#. Documentation/user/tweaks.itely:2911 (comment)
+#. Documentation/user/tweaks.itely:2968 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2961 (comment)
+#. Documentation/user/tweaks.itely:2963 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3089 (comment)
-#. Documentation/user/tweaks.itely:3108 (comment)
+#. Documentation/user/tweaks.itely:3091 (comment)
+#. Documentation/user/tweaks.itely:3110 (comment)
 msgid "Visible tempo marking"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3093 (comment)
-#. Documentation/user/tweaks.itely:3112 (comment)
+#. Documentation/user/tweaks.itely:3095 (comment)
+#. Documentation/user/tweaks.itely:3114 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3096 (comment)
-#. Documentation/user/tweaks.itely:3115 (comment)
+#. Documentation/user/tweaks.itely:3098 (comment)
+#. Documentation/user/tweaks.itely:3117 (comment)
 msgid "New tempo for next section"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3159 (variable)
+#. Documentation/user/tweaks.itely:3161 (variable)
 msgid "emphasize"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3163 (variable)
+#. Documentation/user/tweaks.itely:3165 (variable)
 msgid "normal"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3169 (variable)
+#. Documentation/user/tweaks.itely:3171 (variable)
 msgid "SopranoMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3385 (comment)
+#. Documentation/user/tweaks.itely:3387 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
 msgstr ""
 
@@ -2246,50 +2287,78 @@ msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Tweaking basics"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Introduction to tweaks"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Objects and interfaces"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Naming conventions of objects and properties"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Tweaking methods"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "The Internals Reference manual"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Properties of layout objects"
 msgstr ""
 
@@ -2310,8 +2379,12 @@ msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Properties found in interfaces"
 msgstr ""
 
@@ -2322,22 +2395,34 @@ msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Types of properties"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Appearance of objects"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Visibility and color of objects"
 msgstr ""
 
@@ -2363,34 +2448,54 @@ msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Size of objects"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Length and thickness of objects"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Placement of objects"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Automatic behavior"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Within-staff objects"
 msgstr ""
 
@@ -2401,8 +2506,12 @@ msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Outside staff objects"
 msgstr ""
 
@@ -2418,30 +2527,34 @@ msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Collisions of objects"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Moving objects"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Fixing overlapping notation"
 msgstr ""
 
@@ -2487,22 +2600,34 @@ msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Real music example"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @section in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @section in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @section in Documentation/de/user/tweaks.itely
 msgid "Further tweaking"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Other uses for tweaks"
 msgstr ""
 
@@ -2517,37 +2642,45 @@ msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Using variables for tweaks"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
+#. @node in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Other sources of information"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Avoiding tweaks with slower processing"
 msgstr ""
 
 #. @node in Documentation/user/tweaks.itely
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
+#. @subsection in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Advanced tweaks with Scheme"
 msgstr ""
 
@@ -3047,6 +3180,7 @@ msgid "Running requirements"
 msgstr ""
 
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Requirements for building documentation"
 msgstr ""
@@ -3073,6 +3207,7 @@ msgid "Compiling for multiple platforms"
 msgstr ""
 
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Compiling outside the source tree"
 msgstr ""
@@ -3080,6 +3215,8 @@ msgstr ""
 #. @node in Documentation/user/install.itely
 #. @subsection in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/es/user/install.itely
+#. @node in Documentation/es/user/install.itely
+#. @subsection in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @subsection in Documentation/de/user/install.itely
 msgid "Building documentation"
@@ -3087,6 +3224,8 @@ msgstr ""
 
 #. @node in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/user/install.itely
+#. @node in Documentation/es/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Commands for building documentation"
@@ -3095,7 +3234,7 @@ msgstr ""
 #. @node in Documentation/user/install.itely
 #. @unnumberedsubsubsec in Documentation/user/install.itely
 #. @node in Documentation/es/user/install.itely
-#. @subsection in Documentation/es/user/install.itely
+#. @unnumberedsubsubsec in Documentation/es/user/install.itely
 #. @node in Documentation/de/user/install.itely
 #. @unnumberedsubsubsec in Documentation/de/user/install.itely
 msgid "Building documentation without compiling LilyPond"
@@ -3725,15 +3864,23 @@ msgstr ""
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
+#. @node in Documentation/de/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
 msgid "Absolute octave entry"
 msgstr ""
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
+#. @node in Documentation/de/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
 msgid "Relative octave entry"
 msgstr ""
 
@@ -3770,8 +3917,12 @@ msgstr ""
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
+#. @node in Documentation/de/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
 msgid "Octave checks"
 msgstr ""
 
@@ -3857,8 +4008,8 @@ msgstr ""
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
 #. @node in Documentation/de/user/pitches.itely
@@ -3868,8 +4019,8 @@ msgstr ""
 
 #. @node in Documentation/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/user/pitches.itely
-#. @node in Documentation/fr/user/editorial.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely
+#. @node in Documentation/fr/user/pitches.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
 #. @node in Documentation/es/user/pitches.itely
 #. @unnumberedsubsubsec in Documentation/es/user/pitches.itely
 #. @node in Documentation/de/user/pitches.itely
@@ -4006,110 +4157,110 @@ msgstr ""
 msgid "This is correct and works"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:919 (comment)
+#. Documentation/user/rhythms.itely:916 (comment)
 msgid "Default style"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:922 (comment)
+#. Documentation/user/rhythms.itely:919 (comment)
 msgid "Change to numeric style"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:926 (comment)
+#. Documentation/user/rhythms.itely:923 (comment)
 msgid "Revert to default style"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1129 (comment)
+#. Documentation/user/rhythms.itely:1115 (comment)
 msgid "Show all bar numbers"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1193 (comment)
-msgid "Create 9/8 split into 2/4 + 5/8"
+#. Documentation/user/rhythms.itely:1225 (comment)
+msgid "Now each staff has its own time signature."
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1194 (variable)
-msgid "tsMarkup"
+#. Documentation/user/rhythms.itely:1261 (comment)
+msgid "Create 9/8 split into 2/4 + 5/8"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1274 (comment)
-msgid "Now each staff has its own time signature."
+#. Documentation/user/rhythms.itely:1262 (variable)
+msgid "tsMarkup"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1480 (comment)
+#. Documentation/user/rhythms.itely:1558 (comment)
 msgid "Set beam sub-group length to an eighth note"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1483 (comment)
+#. Documentation/user/rhythms.itely:1561 (comment)
 msgid "Set beam sub-group length to a sixteenth note"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1615 (comment)
+#. Documentation/user/rhythms.itely:1698 (comment)
 msgid "end 1/16 beams for all time signatures at the 1/16 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1619 (comment)
+#. Documentation/user/rhythms.itely:1702 (comment)
 msgid "end 1/32 beams for all time signatures at the 1/16 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1629 (comment)
+#. Documentation/user/rhythms.itely:1712 (comment)
 msgid "end beams of all durations in 5/8 time signature at the 2/8 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1658 (comment)
+#. Documentation/user/rhythms.itely:1741 (comment)
 msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1671 (comment)
+#. Documentation/user/rhythms.itely:1754 (comment)
 msgid "this won't revert it!"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1673 (comment)
+#. Documentation/user/rhythms.itely:1756 (comment)
 msgid "this will"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1852 (comment)
+#. Documentation/user/rhythms.itely:1935 (comment)
 msgid "revert to non-feathered beams"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2081 (comment)
-#. Documentation/user/rhythms.itely:2097 (comment)
+#. Documentation/user/rhythms.itely:2164 (comment)
+#. Documentation/user/rhythms.itely:2180 (comment)
 msgid "Permit first bar number to be printed"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2098 (comment)
-#. Documentation/user/rhythms.itely:2146 (comment)
+#. Documentation/user/rhythms.itely:2181 (comment)
+#. Documentation/user/rhythms.itely:2229 (comment)
 msgid "Print a bar number every second measure"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2114 (comment)
+#. Documentation/user/rhythms.itely:2197 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2118 (comment)
-#. Documentation/user/rhythms.itely:2144 (comment)
+#. Documentation/user/rhythms.itely:2201 (comment)
+#. Documentation/user/rhythms.itely:2227 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2122 (comment)
+#. Documentation/user/rhythms.itely:2205 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2127 (comment)
+#. Documentation/user/rhythms.itely:2210 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2149 (comment)
+#. Documentation/user/rhythms.itely:2232 (comment)
 msgid "Center-align bar numbers"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2152 (comment)
+#. Documentation/user/rhythms.itely:2235 (comment)
 msgid "Right-align bar numbers"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2255 (variable)
+#. Documentation/user/rhythms.itely:2338 (variable)
 msgid "pipeSymbol"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2626 (variable)
+#. Documentation/user/rhythms.itely:2725 (variable)
 #. @rglos in Documentation/user/rhythms.itely
 msgid "cadenza"
 msgstr ""
@@ -4202,13 +4353,23 @@ msgstr ""
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
+#. @node in Documentation/es/user/rhythms.itely
+#. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Invisible rests"
 msgstr ""
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Full measure rests"
 msgstr ""
 
@@ -4314,8 +4475,8 @@ msgstr ""
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
 #. @node in Documentation/de/user/rhythms.itely
@@ -4380,8 +4541,12 @@ msgstr ""
 
 #. @node in Documentation/user/rhythms.itely
 #. @subsubsection in Documentation/user/rhythms.itely
+#. @node in Documentation/fr/user/rhythms.itely
+#. @subsubsection in Documentation/fr/user/rhythms.itely
 #. @node in Documentation/es/user/rhythms.itely
 #. @subsubsection in Documentation/es/user/rhythms.itely
+#. @node in Documentation/de/user/rhythms.itely
+#. @subsubsection in Documentation/de/user/rhythms.itely
 msgid "Bar and bar number checks"
 msgstr ""
 
@@ -4514,7 +4679,7 @@ msgstr ""
 #. @node in Documentation/es/user/expressive.itely
 #. @subsubsection in Documentation/es/user/expressive.itely
 #. @node in Documentation/de/user/expressive.itely
-#. @subsubsection in Documentation/de/user/expressive.itely
+#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely
 msgid "New dynamic marks"
 msgstr ""
 
@@ -4685,7 +4850,7 @@ msgstr ""
 #. @node in Documentation/es/user/repeats.itely
 #. @subsubsection in Documentation/es/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Percent repeats"
 msgstr ""
 
@@ -4704,19 +4869,19 @@ msgstr ""
 #. @node in Documentation/es/user/repeats.itely
 #. @subsubsection in Documentation/es/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Tremolo repeats"
 msgstr ""
 
-#. Documentation/user/simultaneous.itely:482 (variable)
+#. Documentation/user/simultaneous.itely:542 (variable)
 msgid "instrumentOne"
 msgstr ""
 
-#. Documentation/user/simultaneous.itely:490 (variable)
+#. Documentation/user/simultaneous.itely:550 (variable)
 msgid "instrumentTwo"
 msgstr ""
 
-#. Documentation/user/simultaneous.itely:657 (comment)
+#. Documentation/user/simultaneous.itely:717 (comment)
 msgid "Bar 3 ..."
 msgstr ""
 
@@ -4831,37 +4996,25 @@ msgstr ""
 msgid "Writing music in parallel"
 msgstr ""
 
-#. Documentation/user/staff.itely:536 (comment)
-msgid "No time signature in the ossia staff"
-msgstr ""
-
-#. Documentation/user/staff.itely:678 (comment)
-msgid "To use the setting globally, uncomment the following line:"
-msgstr ""
-
-#. Documentation/user/staff.itely:679 (comment)
-msgid "\\override VerticalAxisGroup #'remove-first = ##t"
-msgstr ""
-
-#. Documentation/user/staff.itely:687 (comment)
-msgid ""
-"To use the setting globally, comment this line, uncomment the line above"
+#. Documentation/user/staff.itely:1048 (variable)
+#. Documentation/user/staff.itely:1063 (variable)
+msgid "flute"
 msgstr ""
 
-#. Documentation/user/staff.itely:1079 (variable)
-msgid "smaller"
+#. Documentation/user/staff.itely:1078 (variable)
+msgid "clarinet"
 msgstr ""
 
-#. Documentation/user/staff.itely:1094 (comment)
-msgid "setup a context for cue notes."
+#. Documentation/user/staff.itely:1173 (variable)
+msgid "oboe"
 msgstr ""
 
-#. Documentation/user/staff.itely:1135 (variable)
-msgid "picc"
+#. Documentation/user/staff.itely:1215 (variable)
+msgid "piccolo"
 msgstr ""
 
-#. Documentation/user/staff.itely:1143 (variable)
-msgid "cbsn"
+#. Documentation/user/staff.itely:1223 (variable)
+msgid "cbassoon"
 msgstr ""
 
 #. @node in Documentation/user/staff.itely
@@ -4888,6 +5041,8 @@ msgstr ""
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Instantiating new staves"
 msgstr ""
 
@@ -4901,6 +5056,8 @@ msgstr ""
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Grouping staves"
 msgstr ""
 
@@ -4914,11 +5071,15 @@ msgstr ""
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Deeper nested staff groups"
 msgstr ""
 
 #. @node in Documentation/user/staff.itely
 #. @subsection in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @subsection in Documentation/fr/user/staff.itely
 msgid "Modifying single staves"
 msgstr ""
 
@@ -4943,6 +5104,8 @@ msgstr ""
 
 #. @node in Documentation/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/user/staff.itely
+#. @node in Documentation/fr/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 msgid "Ossia staves"
 msgstr ""
 
@@ -5036,7 +5199,7 @@ msgstr ""
 msgid "Formatting cue notes"
 msgstr ""
 
-#. Documentation/user/editorial.itely:323 (comment)
+#. Documentation/user/editorial.itely:321 (comment)
 msgid "this is deliberate nonsense; note that the stems remain black"
 msgstr ""
 
@@ -5172,7 +5335,7 @@ msgstr ""
 msgid "Analysis brackets"
 msgstr ""
 
-#. Documentation/user/text.itely:410 (variable)
+#. Documentation/user/text.itely:411 (variable)
 msgid "allegro"
 msgstr ""
 
@@ -5359,48 +5522,48 @@ msgstr ""
 msgid "correct"
 msgstr ""
 
-#. Documentation/user/vocal.itely:786 (variable)
+#. Documentation/user/vocal.itely:783 (variable)
 msgid "voice"
 msgstr ""
 
-#. Documentation/user/vocal.itely:793 (variable)
+#. Documentation/user/vocal.itely:790 (variable)
 msgid "lyr"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1056 (comment)
-msgid "applies to "
+#. Documentation/user/vocal.itely:1053 (comment)
+msgid "applies to \\\"fas\\\""
 msgstr ""
 
-#. Documentation/user/vocal.itely:1225 (comment)
+#. Documentation/user/vocal.itely:1222 (comment)
 msgid "moves the column off the left margin; "
 msgstr ""
 
-#. Documentation/user/vocal.itely:1226 (comment)
+#. Documentation/user/vocal.itely:1223 (comment)
 msgid "can be removed if space on the page is tight"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1234 (comment)
-#. Documentation/user/vocal.itely:1252 (comment)
+#. Documentation/user/vocal.itely:1231 (comment)
+#. Documentation/user/vocal.itely:1249 (comment)
 msgid "adds vertical spacing between verses"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1242 (comment)
+#. Documentation/user/vocal.itely:1239 (comment)
 msgid "adds horizontal spacing between columns; "
 msgstr ""
 
-#. Documentation/user/vocal.itely:1243 (comment)
-msgid "if they are still too close, add more  pairs  "
+#. Documentation/user/vocal.itely:1240 (comment)
+msgid "if they are still too close, add more \\\" \\\" pairs  "
 msgstr ""
 
-#. Documentation/user/vocal.itely:1244 (comment)
+#. Documentation/user/vocal.itely:1241 (comment)
 msgid "until the result looks good"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1260 (comment)
+#. Documentation/user/vocal.itely:1257 (comment)
 msgid "gives some extra space on the right margin; "
 msgstr ""
 
-#. Documentation/user/vocal.itely:1261 (comment)
+#. Documentation/user/vocal.itely:1258 (comment)
 msgid "can be removed if page space is tight"
 msgstr ""
 
@@ -5732,55 +5895,55 @@ msgstr ""
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "References for keyboards"
 msgstr ""
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Changing staff manually"
 msgstr ""
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Changing staff automatically"
 msgstr ""
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Staff-change lines"
 msgstr ""
 
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Cross-staff stems"
 msgstr ""
 
@@ -5802,7 +5965,7 @@ msgstr ""
 #. @node in Documentation/es/user/keyboards.itely
 #. @subsubsection in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Piano pedals"
 msgstr ""
 
@@ -5820,11 +5983,11 @@ msgstr ""
 #. @node in Documentation/user/keyboards.itely
 #. @unnumberedsubsubsec in Documentation/user/keyboards.itely
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "Discant symbols"
 msgstr ""
 
@@ -5905,32 +6068,36 @@ msgstr ""
 msgid "Harp"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:210 (variable)
+#. Documentation/user/fretted-strings.itely:223 (variable)
 msgid "melodia"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:376 (comment)
+#. Documentation/user/fretted-strings.itely:297 (variable)
+msgid "mynotes"
+msgstr ""
+
+#. Documentation/user/fretted-strings.itely:412 (comment)
 msgid "A chord for ukelele"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:665 (variable)
-#. Documentation/user/fretted-strings.itely:684 (variable)
-#. Documentation/user/fretted-strings.itely:713 (variable)
-#. Documentation/user/fretted-strings.itely:738 (variable)
-#. Documentation/user/fretted-strings.itely:762 (variable)
-#. Documentation/user/fretted-strings.itely:798 (variable)
+#. Documentation/user/fretted-strings.itely:704 (variable)
+#. Documentation/user/fretted-strings.itely:723 (variable)
+#. Documentation/user/fretted-strings.itely:752 (variable)
+#. Documentation/user/fretted-strings.itely:777 (variable)
+#. Documentation/user/fretted-strings.itely:801 (variable)
+#. Documentation/user/fretted-strings.itely:837 (variable)
 msgid "mychords"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:688 (variable)
+#. Documentation/user/fretted-strings.itely:727 (variable)
 msgid "mychordlist"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:785 (comment)
+#. Documentation/user/fretted-strings.itely:824 (comment)
 msgid "add a new chord shape"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:789 (comment)
+#. Documentation/user/fretted-strings.itely:828 (comment)
 msgid "add some new chords based on the power chord shape"
 msgstr ""
 
@@ -5957,66 +6124,73 @@ msgid "Common notation for fretted strings"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "References for fretted strings"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "String number indications"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Default tablatures"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Custom tablatures"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @node in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
+#. @node in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Fret diagram markups"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 msgid "Predefined fret diagrams"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 msgid "Automatic fret diagrams"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 msgid "Right-hand fingerings"
 msgstr ""
 
@@ -6032,18 +6206,22 @@ msgid "Guitar"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Indicating position and barring"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
+#. @node in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
+#. @node in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 msgid "Indicating harmonics and dampened notes"
 msgstr ""
 
@@ -6059,26 +6237,84 @@ msgid "Banjo"
 msgstr ""
 
 #. @node in Documentation/user/fretted-strings.itely
-#. @subsubsection in Documentation/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/fr/user/fretted-strings.itely
 #. @subsubsection in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Banjo tablatures"
 msgstr ""
 
-#. Documentation/user/percussion.itely:214 (variable)
-#. Documentation/user/percussion.itely:394 (variable)
+#. Documentation/user/percussion.itely:175 (variable)
+#. Documentation/user/percussion.itely:365 (variable)
 msgid "up"
 msgstr ""
 
-#. Documentation/user/percussion.itely:215 (variable)
-#. Documentation/user/percussion.itely:395 (variable)
+#. Documentation/user/percussion.itely:178 (variable)
+#. Documentation/user/percussion.itely:366 (variable)
 msgid "down"
 msgstr ""
 
+#. Documentation/user/percussion.itely:388 (comment)
+msgid ""
+"These lines define the position of the woodblocks in the stave, if You like, "
+"You can change it "
+msgstr ""
+
+#. Documentation/user/percussion.itely:389 (comment)
+msgid "or You can use  special note heads for the woodblocks."
+msgstr ""
+
+#. Documentation/user/percussion.itely:391 (comment)
+msgid ""
+"this defines a staff with only two lines. It also defines the positions of "
+"the two lines"
+msgstr ""
+
+#. Documentation/user/percussion.itely:393 (comment)
+msgid "this is neccessary. If not entered, the barline wuld be too short!"
+msgstr ""
+
+#. Documentation/user/percussion.itely:397 (comment)
+msgid "with this You load Your new drum style table"
+msgstr ""
+
+#. Documentation/user/percussion.itely:419 (comment)
+msgid "tambourine-music is entered with \\\"tamb\\\""
+msgstr ""
+
+#. Documentation/user/percussion.itely:425 (comment)
+msgid "broken"
+msgstr ""
+
+#. Documentation/user/percussion.itely:426 (comment)
+msgid "\\set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) "
+msgstr ""
+
+#. Documentation/user/percussion.itely:430 (comment)
+msgid ""
+"the trick with the scaled duration and the shorter rest is neccessary for "
+"the correct ending of the trill-span!"
+msgstr ""
+
+#. Documentation/user/percussion.itely:454 (comment)
+msgid "bells are enterd with:"
+msgstr ""
+
+#. Documentation/user/percussion.itely:455 (comment)
+msgid "\\\"cb\\\" (cowbell) and \\\"rb\\\" (ridebell)\\\" "
+msgstr ""
+
+#. Documentation/user/percussion.itely:484 (variable)
+msgid "drumsA"
+msgstr ""
+
+#. Documentation/user/percussion.itely:493 (variable)
+msgid "drumsB"
+msgstr ""
+
 #. @node in Documentation/user/percussion.itely
 #. @section in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6123,6 +6359,16 @@ msgstr ""
 msgid "Basic percussion notation"
 msgstr ""
 
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+msgid "Drum rolls"
+msgstr ""
+
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+msgid "Pitched percussion"
+msgstr ""
+
 #. @node in Documentation/user/percussion.itely
 #. @subsubsection in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6134,6 +6380,11 @@ msgstr ""
 msgid "Percussion staves"
 msgstr ""
 
+#. @node in Documentation/user/percussion.itely
+#. @subsubsection in Documentation/user/percussion.itely
+msgid "Custom percussion staves"
+msgstr ""
+
 #. @node in Documentation/user/percussion.itely
 #. @subsubsection in Documentation/user/percussion.itely
 #. @node in Documentation/fr/user/percussion.itely
@@ -6168,27 +6419,16 @@ msgid "Common notation for wind instruments"
 msgstr ""
 
 #. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
-#. @subsubsection in Documentation/fr/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely
 #. @node in Documentation/es/user/wind.itely
-#. @subsubsection in Documentation/es/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "References for wind instruments"
 msgstr ""
 
-#. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
-#. @node in Documentation/fr/user/wind.itely
-#. @subsubsection in Documentation/fr/user/wind.itely
-#. @node in Documentation/es/user/wind.itely
-#. @subsubsection in Documentation/es/user/wind.itely
-#. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
-msgid "Half-holes"
-msgstr ""
-
 #. @node in Documentation/user/wind.itely
 #. @subsection in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
@@ -6201,41 +6441,41 @@ msgid "Bagpipes"
 msgstr ""
 
 #. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
 #. @subsubsection in Documentation/fr/user/wind.itely
 #. @node in Documentation/es/user/wind.itely
 #. @subsubsection in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Bagpipe definitions"
 msgstr ""
 
 #. @node in Documentation/user/wind.itely
-#. @subsubsection in Documentation/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/user/wind.itely
 #. @node in Documentation/fr/user/wind.itely
 #. @subsubsection in Documentation/fr/user/wind.itely
 #. @node in Documentation/es/user/wind.itely
 #. @subsubsection in Documentation/es/user/wind.itely
 #. @node in Documentation/de/user/wind.itely
-#. @subsubsection in Documentation/de/user/wind.itely
+#. @unnumberedsubsubsec in Documentation/de/user/wind.itely
 msgid "Bagpipe example"
 msgstr ""
 
-#. Documentation/user/chords.itely:651 (variable)
+#. Documentation/user/chords.itely:654 (variable)
 msgid "myChords"
 msgstr ""
 
-#. Documentation/user/chords.itely:974 (comment)
-#. Documentation/user/chords.itely:995 (comment)
+#. Documentation/user/chords.itely:981 (comment)
+#. Documentation/user/chords.itely:1002 (comment)
 msgid "Put notes on same Staff as figures"
 msgstr ""
 
-#. Documentation/user/chords.itely:1054 (comment)
+#. Documentation/user/chords.itely:1061 (comment)
 msgid "The extenders are correct here, with the same rhythm as the bass"
 msgstr ""
 
-#. Documentation/user/chords.itely:1066 (comment)
+#. Documentation/user/chords.itely:1073 (comment)
 msgid "The extenders are incorrect here, even though the timing is the same"
 msgstr ""
 
@@ -6349,6 +6589,10 @@ msgstr ""
 msgid "Introduction to figured bass"
 msgstr ""
 
+#. @rglos in Documentation/user/chords.itely
+msgid "figured bass"
+msgstr ""
+
 #. @node in Documentation/user/chords.itely
 #. @unnumberedsubsubsec in Documentation/user/chords.itely
 #. @node in Documentation/fr/user/chords.itely
@@ -7075,6 +7319,11 @@ msgstr ""
 msgid "Equalizing different instruments (ii)"
 msgstr ""
 
+#. @node in Documentation/user/input.itely
+#. @subsection in Documentation/user/input.itely
+msgid "Percussion in MIDI"
+msgstr ""
+
 #. Documentation/user/spacing.itely:684 (comment)
 msgid "this does nothing"
 msgstr ""
@@ -7417,14 +7666,10 @@ msgstr ""
 
 #. @node in Documentation/user/spacing.itely
 #. @section in Documentation/user/spacing.itely
-#. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/fr/user/spacing.itely
 #. @section in Documentation/fr/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @section in Documentation/es/user/spacing.itely
-#. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
 #. @node in Documentation/de/user/spacing.itely
 #. @section in Documentation/de/user/spacing.itely
 msgid "Fitting music onto fewer pages"
@@ -7452,14 +7697,18 @@ msgstr ""
 msgid "Changing spacing"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:1947 (comment)
+#. Documentation/user/changing-defaults.itely:1940 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:1993 (comment)
+#. Documentation/user/changing-defaults.itely:1986 (comment)
 msgid "Try to remove all key signatures"
 msgstr ""
 
+#. Documentation/user/changing-defaults.itely:2368 (variable)
+msgid "XinO"
+msgstr ""
+
 #. @node in Documentation/user/changing-defaults.itely
 #. @chapter in Documentation/user/changing-defaults.itely
 #. @node in Documentation/fr/user/changing-defaults.itely
@@ -7624,12 +7873,14 @@ msgid "Overview of modifying properties"
 msgstr ""
 
 #. @node in Documentation/user/changing-defaults.itely
+#. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
-msgid "The \\set command"
+msgid "The set command"
 msgstr ""
 
 #. @subsection in Documentation/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @subsection in Documentation/es/user/changing-defaults.itely
 #. @subsection in Documentation/de/user/changing-defaults.itely
 msgid "The @code{\\set} command"
@@ -7639,7 +7890,7 @@ msgstr ""
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
-msgid "The \\override command"
+msgid "The override command"
 msgstr ""
 
 #. @subsection in Documentation/user/changing-defaults.itely
@@ -7653,7 +7904,7 @@ msgstr ""
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
-msgid "\\set versus \\override"
+msgid "set versus override"
 msgstr ""
 
 #. @subsection in Documentation/user/changing-defaults.itely
@@ -7664,14 +7915,17 @@ msgid "@code{\\set} vs. @code{\\override}"
 msgstr ""
 
 #. @node in Documentation/user/changing-defaults.itely
-#. @subsection in Documentation/user/changing-defaults.itely
 #. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
-#. @subsection in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
+msgid "The tweak command"
+msgstr ""
+
+#. @subsection in Documentation/user/changing-defaults.itely
+#. @subsection in Documentation/fr/user/changing-defaults.itely
+#. @subsection in Documentation/es/user/changing-defaults.itely
 #. @subsection in Documentation/de/user/changing-defaults.itely
-msgid "Objects connected to the input"
+msgid "The @code{\\tweak} command"
 msgstr ""
 
 #. @node in Documentation/user/changing-defaults.itely
@@ -7790,6 +8044,16 @@ msgstr ""
 msgid "Rotating objects"
 msgstr ""
 
+#. @node in Documentation/user/changing-defaults.itely
+#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely
+msgid "Rotating layout objects"
+msgstr ""
+
+#. @node in Documentation/user/changing-defaults.itely
+#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely
+msgid "Rotating markup"
+msgstr ""
+
 #. @node in Documentation/user/changing-defaults.itely
 #. @subsection in Documentation/user/changing-defaults.itely
 #. @node in Documentation/es/user/changing-defaults.itely
@@ -7844,6 +8108,11 @@ msgstr ""
 msgid "Modifying shapes"
 msgstr ""
 
+#. @node in Documentation/user/changing-defaults.itely
+#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely
+msgid "Modifying ties and slurs"
+msgstr ""
+
 #. @node in Documentation/user/changing-defaults.itely
 #. @section in Documentation/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
@@ -8182,7 +8451,6 @@ msgid "TODO moved into scheme"
 msgstr ""
 
 #. @node in Documentation/user/programming-interface.itely
-#. @node in Documentation/fr/user/changing-defaults.itely
 #. @node in Documentation/es/user/programming-interface.itely
 #. @node in Documentation/de/user/programming-interface.itely
 msgid "Using Scheme code instead of \\tweak"
@@ -8339,6 +8607,11 @@ msgstr ""
 msgid "List of articulations"
 msgstr ""
 
+#. @node in Documentation/user/notation-appendices.itely
+#. @appendixsec in Documentation/user/notation-appendices.itely
+msgid "Percussion notes"
+msgstr ""
+
 #. @node in Documentation/user/notation-appendices.itely
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/fr/user/notation-appendices.itely
@@ -8423,26 +8696,10 @@ msgstr ""
 msgid "Tout ensemble"
 msgstr ""
 
-#. @node in Documentation/fr/user/tutorial.itely
-#. @subsection in Documentation/fr/user/tutorial.itely
-#. @node in Documentation/de/user/tutorial.itely
-#. @subsection in Documentation/de/user/tutorial.itely
-msgid "Working on text files"
-msgstr ""
-
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Exemples cliquables"
 msgstr ""
 
-#. @node in Documentation/fr/user/fundamental.itely
-#. @section in Documentation/fr/user/fundamental.itely
-#. @node in Documentation/es/user/fundamental.itely
-#. @section in Documentation/es/user/fundamental.itely
-#. @node in Documentation/de/user/fundamental.itely
-#. @section in Documentation/de/user/fundamental.itely
-msgid "How LilyPond files work"
-msgstr ""
-
 #. @node in Documentation/fr/user/tweaks.itely
 #. @section in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/de/user/tweaks.itely
@@ -8450,13 +8707,6 @@ msgstr ""
 msgid "Common tweaks"
 msgstr ""
 
-#. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
-#. @node in Documentation/de/user/tweaks.itely
-#. @section in Documentation/de/user/tweaks.itely
-msgid "Default files"
-msgstr ""
-
 #. @node in Documentation/fr/user/working.itely
 #. @subsection in Documentation/fr/user/working.itely
 #. @node in Documentation/es/user/working.itely
@@ -8474,85 +8724,6 @@ msgstr ""
 msgid "GNU LilyPond --- manuel de notation"
 msgstr ""
 
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Normal pitches"
-msgstr ""
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Cautionary accidentals"
-msgstr ""
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Micro tones"
-msgstr ""
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Relative octaves"
-msgstr ""
-
-#. @node in Documentation/fr/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely
-#. @node in Documentation/de/user/pitches.itely
-#. @unnumberedsubsubsec in Documentation/de/user/pitches.itely
-msgid "Octave check"
-msgstr ""
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Augmentation dots"
-msgstr ""
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/es/user/rhythms.itely
-#. @subsubsection in Documentation/es/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Skips"
-msgstr ""
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Multi measure rests"
-msgstr ""
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Bar check"
-msgstr ""
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Barnumber check"
-msgstr ""
-
-#. @node in Documentation/fr/user/rhythms.itely
-#. @subsubsection in Documentation/fr/user/rhythms.itely
-#. @node in Documentation/de/user/rhythms.itely
-#. @subsubsection in Documentation/de/user/rhythms.itely
-msgid "Proportional notation (introduction)"
-msgstr ""
-
 #. @node in Documentation/fr/user/repeats.itely
 #. @subsection in Documentation/fr/user/repeats.itely
 msgid "Writing repeats"
@@ -8561,21 +8732,21 @@ msgstr ""
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Repeat types"
 msgstr ""
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Repeat syntax"
 msgstr ""
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Manual repeat commands"
 msgstr ""
 
@@ -8587,7 +8758,7 @@ msgstr ""
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
 #. @node in Documentation/de/user/repeats.itely
-#. @subsubsection in Documentation/de/user/repeats.itely
+#. @unnumberedsubsubsec in Documentation/de/user/repeats.itely
 msgid "Tremolo subdivisions"
 msgstr ""
 
@@ -8610,15 +8781,6 @@ msgstr ""
 msgid "Collision Resolution"
 msgstr ""
 
-#. @node in Documentation/fr/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
-#. @node in Documentation/es/user/staff.itely
-#. @subsubsection in Documentation/es/user/staff.itely
-#. @node in Documentation/de/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
-msgid "System start delimiters"
-msgstr ""
-
 #. @node in Documentation/fr/user/editorial.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely
 msgid "Blank music sheet"
@@ -8648,59 +8810,34 @@ msgid "Basculer vers une mélodie alternative"
 msgstr ""
 
 #. @node in Documentation/fr/user/keyboards.itely
-#. @subsubsection in Documentation/fr/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/keyboards.itely
 #. @node in Documentation/es/user/keyboards.itely
-#. @subsubsection in Documentation/es/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely
 #. @node in Documentation/de/user/keyboards.itely
-#. @subsubsection in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
 msgid "The piano staff"
 msgstr ""
 
 #. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
-#. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
-#. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
-msgid "Fret diagrams"
-msgstr ""
-
-#. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
 #. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Right hand fingerings"
 msgstr ""
 
-#. @node in Documentation/fr/user/fretted-strings.itely
-#. @subsubsection in Documentation/fr/user/fretted-strings.itely
-#. @node in Documentation/es/user/fretted-strings.itely
-#. @subsubsection in Documentation/es/user/fretted-strings.itely
-#. @node in Documentation/de/user/fretted-strings.itely
-#. @subsubsection in Documentation/de/user/fretted-strings.itely
-msgid "Guitar tablatures"
-msgstr ""
-
-#. @node in Documentation/fr/user/changing-defaults.itely
-#. @section in Documentation/fr/user/changing-defaults.itely
-msgid "Automatic notation"
-msgstr ""
-
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @subsection in Documentation/fr/user/changing-defaults.itely
-msgid "Changing context properties on the fly"
+msgid "Layout tunings within contexts"
 msgstr ""
 
 #. @node in Documentation/fr/user/changing-defaults.itely
 #. @subsection in Documentation/fr/user/changing-defaults.itely
-msgid "Layout tunings within contexts"
+msgid "Constructing a tweak"
 msgstr ""
 
 #. @node in Documentation/fr/user/changing-defaults.itely
-#. @subsection in Documentation/fr/user/changing-defaults.itely
-msgid "Constructing a tweak"
+msgid "Using Scheme code instead of tweak"
 msgstr ""
 
 #. @subsubheading in Documentation/es/user/macros.itexi
@@ -8723,6 +8860,13 @@ msgstr ""
 msgid "Advertencias y problemas conocidos"
 msgstr ""
 
+#. @node in Documentation/es/user/fundamental.itely
+#. @section in Documentation/es/user/fundamental.itely
+#. @node in Documentation/de/user/fundamental.itely
+#. @section in Documentation/de/user/fundamental.itely
+msgid "How LilyPond files work"
+msgstr ""
+
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
 msgid "Automatic behaviour"
@@ -8758,6 +8902,13 @@ msgstr ""
 msgid "Writing long repeats"
 msgstr ""
 
+#. @node in Documentation/es/user/staff.itely
+#. @subsubsection in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
+msgid "System start delimiters"
+msgstr ""
+
 #. @rglos in Documentation/es/user/chords.itely
 msgid "  "
 msgstr ""
@@ -8809,6 +8960,11 @@ msgstr ""
 msgid "Unix"
 msgstr ""
 
+#. @node in Documentation/de/user/tutorial.itely
+#. @subsection in Documentation/de/user/tutorial.itely
+msgid "Working on text files"
+msgstr ""
+
 #. @rglos in Documentation/de/user/tutorial.itely
 msgid "legato"
 msgstr ""
@@ -8836,6 +8992,11 @@ msgstr ""
 msgid "Chords"
 msgstr ""
 
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
+msgid "Guitar tablatures"
+msgstr ""
+
 msgid "Up:"
 msgstr ""
 
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index a6a4087d97..17becfb177 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1116,12 +1116,17 @@ LP-specific?
 @node Modifying properties
 @section Modifying properties
 
+@c TODO change the menu and subsection node names to use
+@c backslash once the new macro to handle the refs
+@c is available.  Need to find and change all refs at
+@c the same time. -td
+
 @menu
-* Overview of modifying properties::  
-* The set command::             
-* The override command::        
-* set versus override::         
-* The tweak command::           
+* Overview of modifying properties::
+* The set command::
+* The override command::
+* The tweak command::
+* set versus override::
 @end menu
 
 
@@ -1406,6 +1411,56 @@ We demonstrate how to glean this information from the notation manual
 and the program reference.
 
 
+@node The tweak command
+@subsection The @code{\tweak} command
+
+FIXME expand to include all uses of \tweak
+TODO: can't use \tweak in a variable
+
+@funindex \tweak
+
+In some cases, it is possible to take a short-cut for tuning graphical
+objects.  For objects that result directly from a piece of the input,
+you can use the @code{\tweak} function, for example
+
+@lilypond[relative=2,fragment,verbatim,ragged-right]
+<
+  c
+  \tweak #'color #red d
+  g
+  \tweak #'duration-log #1  a
+>4-\tweak #'padding #10 -.
+@end lilypond
+
+As you can see, properties are set in the objects directly,
+without mentioning the grob name or context where this should be
+applied.
+
+This technique only works for objects that are directly connected to
+an @rinternals{Event} from the input, for example
+
+@itemize
+@item note heads, caused by chord-pitch (i.e., notes inside a chord)
+@item articulation signs, caused by articulation instructions
+@end itemize
+
+It notably does not work for stems and accidentals (these are caused
+by note heads, not by music events) or clefs (these are not caused by
+music inputs, but rather by the change of a property value).
+
+There are very few objects which are @emph{directly} connected to
+output.  A normal note (like @code{c4}) is not directly connected
+to output, so
+
+@example
+\tweak #'color #red c4
+@end example
+
+@noindent
+does not change color.  See @ref{Displaying music expressions}, for
+details.
+
+
 @node set versus override
 @subsection @code{\set} vs. @code{\override}
 
@@ -1457,64 +1512,15 @@ objects.  Since this is a common change, the special
 property (modified with @code{\set}) was created.
 
 
-@node The tweak command
-@subsection The @code{\tweak} command
-
-TODO: can't use \tweak in a variable
-
-@funindex \tweak
-
-In some cases, it is possible to take a short-cut for tuning graphical
-objects.  For objects that result directly from a piece of the input,
-you can use the @code{\tweak} function, for example
-
-@lilypond[relative=2,fragment,verbatim,ragged-right]
-<
-  c
-  \tweak #'color #red d
-  g
-  \tweak #'duration-log #1  a
->4-\tweak #'padding #10 -.
-@end lilypond
-
-As you can see, properties are set in the objects directly,
-without mentioning the grob name or context where this should be
-applied.
-
-This technique only works for objects that are directly connected to
-an @rinternals{Event} from the input, for example
-
-@itemize
-@item note heads, caused by chord-pitch (i.e., notes inside a chord)
-@item articulation signs, caused by articulation instructions
-@end itemize
-
-It notably does not work for stems and accidentals (these are caused
-by note heads, not by music events) or clefs (these are not caused by
-music inputs, but rather by the change of a property value).
-
-There are very few objects which are @emph{directly} connected to
-output.  A normal note (like @code{c4}) is not directly connected
-to output, so
-
-@example
-\tweak #'color #red c4
-@end example
-
-@noindent
-does not change color.  See @ref{Displaying music expressions}, for
-details.
-
-
 @node Useful concepts and properties
 @section Useful concepts and properties
 
 
 @menu
-* Input modes::                 
-* Direction and placement::     
-* Distances and measurements::  
-* Spanners::                    
+* Input modes::
+* Direction and placement::
+* Distances and measurements::
+* Spanners::
 @end menu
 
 @node Input modes
diff --git a/buildscripts/texi-langutils.py b/buildscripts/texi-langutils.py
index 844e2ef868..7486ebee01 100644
--- a/buildscripts/texi-langutils.py
+++ b/buildscripts/texi-langutils.py
@@ -89,7 +89,8 @@ def process_texi (texifilename, i_blurb, n_blurb, write_skeleton, topfile, outpu
                                                str (i + 1) + ' (variable)\n_(r"' + var + '")\n')
                         elif comment:
                             output_file.write ('# ' + printedfilename + ':' + \
-                                               str (i + 1) + ' (comment)\n_(r"' + comment + '")\n')
+                                               str (i + 1) + ' (comment)\n_(r"' + \
+                                               comment.replace ('"', '\\"') + '")\n')
 
         # process Texinfo node names and section titles
         if write_skeleton:
@@ -139,7 +140,7 @@ def process_texi (texifilename, i_blurb, n_blurb, write_skeleton, topfile, outpu
             for item in includes:
                 process_texi (os.path.join (dir, item.strip ()), i_blurb, n_blurb, write_skeleton, topfile, output_file, scan_ly)
     except IOError, (errno, strerror):
-        sys.stderr.write ("I/O error(%s): %s: %s" % (errno, texifilename, strerror))
+        sys.stderr.write ("I/O error(%s): %s: %s\n" % (errno, texifilename, strerror))
 
 
 if intro_blurb != '':
diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps
index 713d997f37..aa8cfa6527 100644
--- a/ps/music-drawing-routines.ps
+++ b/ps/music-drawing-routines.ps
@@ -128,7 +128,7 @@ bind def
 	closepath fill
 } bind def
 
-% this is for drawing slurs.
+% this is for drawing slurs and barre-indicators.
 /draw_bezier_sandwich  % thickness controls
 {
 	gsave
@@ -165,6 +165,19 @@ bind def
 	ifelse
 } bind def
 
+/draw_ellipse % filled? x-radius y-radius thickness draw_ellipse
+{
+  setlinewidth % f? x-r y-r
+  /savematrix matrix currentmatrix def
+  scale % f?
+  currentpoint
+  1 0 rmoveto
+  1 0 360  arc closepath
+  savematrix setmatrix
+             { stroke_and_fill}
+             { stroke }
+  ifelse
+} bind def
 
 /draw_line % dx dy x1 y1 thickness draw_line
 {
diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm
index fac14b3d6b..9a5bed1a9e 100644
--- a/scm/define-stencil-commands.scm
+++ b/scm/define-stencil-commands.scm
@@ -17,6 +17,7 @@
        dashed-slur
        dot
        draw-line
+       ellipse
        embedded-ps
        glyph-string
        named-glyph
diff --git a/scm/harp-pedals.scm b/scm/harp-pedals.scm
index 8f7756acba..9fd4c84c9a 100644
--- a/scm/harp-pedals.scm
+++ b/scm/harp-pedals.scm
@@ -150,20 +150,27 @@ divider) and @code{space-after-divider} (box spacing after the divider).
                         (stencil (make-filled-box-stencil
                                    (box-x-dimensions prev-x p space)
                                    (box-y-dimensions prev-x p space)))
-                                   ;(circle-stencil (if circled (rounded-box-stencil stencil 0.05 0.3 0.1 ) stencil))
-                                   (circle-stencil (if circled (circle-stencil stencil 0.05 0.2 ) stencil))
+                        (pedal-stencil 
+                          (if circled 
+                              (ellipse-stencil stencil 0.05 0.1 ) 
+                              stencil))
                         (new-prev-x (+ prev-x space box-width)))
-                      (process-pedal (cdr remaining) new-prev-x (cons circle-stencil stencils) #f space)))
+                    (process-pedal (cdr remaining) new-prev-x 
+                                   (cons pedal-stencil stencils) #f space)))
               ((#\|)  ; Divider line
                   (let* ((xpos (+ prev-x space))
                          (stencil (divider-stencil xpos))
                          (new-prev-x (+ prev-x space)))
-                    (process-pedal (cdr remaining) new-prev-x (cons stencil stencils) circled spaceafterdivider)))
+                    (process-pedal (cdr remaining) new-prev-x 
+                                   (cons stencil stencils) 
+                                   circled spaceafterdivider)))
               ((#\o)  ; Next pedal should be circled
                   (process-pedal (cdr remaining) prev-x stencils #t space))
               (else
-                  (ly:warning "Unhandled entry in harp-pedal: ~a" (car remaining))
-                  (process-pedal (cdr remaining) prev-x stencils circled space))))))
+                  (ly:warning "Unhandled entry in harp-pedal: ~a" 
+                              (car remaining))
+                  (process-pedal (cdr remaining) 
+                                 prev-x stencils circled space))))))
         (final-x (car result))
         (stencils (cdr result)))
     ; Add the horizontal line and combine all stencils:
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 5b5217868c..aef4802eb7 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -26,6 +26,7 @@
 	    dashed-slur
 	    dot
 	    draw-line
+            ellipse
 	    embedded-ps
 	    named-glyph
 	    no-origin
@@ -116,6 +117,14 @@
 	  (- x2 x1) (- y2 y1)
 	  x1 y1 thick))
 
+(define (ellipse x-radius y-radius thick fill)
+  (ly:format
+   "~a ~4f ~4f ~4f draw_ellipse"
+   (if fill
+     "true"
+     "false")
+   x-radius y-radius thick))
+
 (define (embedded-ps string)
   string)
 
diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index 8a8960e6d3..93b27a68b1 100644
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -336,6 +336,17 @@
    `(stroke-width . ,thick)
    `(r . ,radius)))
 
+(define (ellipse x-radius y-radius thick is-filled)
+  (entity
+   'ellipse ""
+   '(stroke-linejoin . "round")
+   '(stroke-linecap . "round")
+   `(fill . ,(if is-filled "currentColor" "none"))
+   `(stroke . "currentColor")
+   `(stroke-width . ,thick)
+   `(rx . ,x-radius)
+   `(ry . ,y-radius)))
+
 (define (text font string)
   (dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
 
diff --git a/scm/stencil.scm b/scm/stencil.scm
index 19303ae691..8ae5ffab06 100644
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -99,6 +99,18 @@
    (cons (- out-radius) out-radius)
    (cons (- out-radius) out-radius))))
 
+(define-public (make-ellipse-stencil x-radius y-radius thickness fill)
+  "Make an ellipse of x radius @var{x-radius}, y radius @code{y-radius},
+    and thickness @var{thickness} with fill defined by @code{fill}."
+  (let*
+      ((x-out-radius (+ x-radius (/ thickness 2.0))) 
+       (y-out-radius (+ y-radius (/ thickness 2.0))) )
+    
+  (ly:make-stencil
+   (list 'ellipse x-radius y-radius thickness fill) 
+   (cons (- x-out-radius) x-out-radius)
+   (cons (- y-out-radius) y-out-radius))))
+
 (define-public (box-grob-stencil grob)
   "Make a box of exactly the extents of the grob.  The box precisely
 encloses the contents.
@@ -129,10 +141,10 @@ encloses the contents.
 
 (define-public (circle-stencil stencil thickness padding)
   "Add a circle around STENCIL, producing a new stencil."
-  (let* ((x-ext (ly:stencil-extent stencil 0))
-	 (y-ext (ly:stencil-extent stencil 1))
-	 (diameter (max (- (cdr x-ext) (car x-ext))
-			(- (cdr y-ext) (car y-ext))))
+  (let* ((x-ext (ly:stencil-extent stencil X))
+	 (y-ext (ly:stencil-extent stencil Y))
+	 (diameter (max (interval-length x-ext)
+                        (interval-length y-ext))) 
 	 (radius (+ (/ diameter 2) padding thickness))
 	 (circle (make-circle-stencil radius thickness #f)))
 
@@ -143,6 +155,27 @@ encloses the contents.
 			    (interval-center x-ext)
 			    (interval-center y-ext))))))
 
+(define-public (ellipse-stencil stencil thickness padding)
+  "Add an ellipse around STENCIL, producing a new stencil."
+  (let* ((x-ext (ly:stencil-extent stencil X))
+	 (y-ext (ly:stencil-extent stencil Y))
+         (x-length (+ (interval-length x-ext) padding thickness))
+         (y-length (+ (interval-length y-ext) padding thickness))
+         ;(aspect-ratio (/ x-length y-length))
+         (x-radius (* 0.707 x-length) )
+         (y-radius (* 0.707 y-length) )
+	 ;(diameter (max (- (cdr x-ext) (car x-ext))
+	 ;		(- (cdr y-ext) (car y-ext))))
+	 ;(radius (+ (/ diameter 2) padding thickness))
+	 (ellipse (make-ellipse-stencil x-radius y-radius thickness #f)))
+
+    (ly:stencil-add
+     stencil
+     (ly:stencil-translate ellipse
+			   (cons
+			    (interval-center x-ext)
+			    (interval-center y-ext))))))
+
 (define-public (rounded-box-stencil stencil thickness padding blot)
    "Add a rounded box around STENCIL, producing a new stencil."  
 
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index b69dc9c23b..d692776da2 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -452,7 +452,7 @@ AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [
 using namespace std;
 #include <FlexLexer.h>
 EOF
-	FLEXLEXER_FILE=`$CXX -E conftest.cc | \
+	FLEXLEXER_FILE=`eval $ac_cpp conftest.cc | \
 	  sed 's!# 1 "\(.*FlexLexer.h\)"!@FLEXLEXER@\1@@!g' | grep '@@' | \
 	  sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` 1> /dev/null 2> /dev/null
 	rm conftest.cc
diff --git a/stepmake/stepmake/c++-vars.make b/stepmake/stepmake/c++-vars.make
index fdc8b57af4..923377ddc4 100644
--- a/stepmake/stepmake/c++-vars.make
+++ b/stepmake/stepmake/c++-vars.make
@@ -6,7 +6,7 @@ EXTRA_CXXFLAGS = -W -Wall -Wconversion
 #EXTRA_CXXFLAGS += -Werror
 #endif
 
-ALL_CXXPPFLAGS = $(DEFINES) $(INCLUDES:%=-I%)
+ALL_CXXPPFLAGS = $(CPPFLAGS) $(CONFIG_CPPFLAGS) $(DEFINES) $(INCLUDES:%=-I%)
 ALL_CXXFLAGS = $(CXXFLAGS) $(ALL_CXXPPFLAGS) $($(PACKAGE)_CXXFLAGS) $(CONFIG_CXXFLAGS) $(MODULE_CXXFLAGS) $(EXTRA_CXXFLAGS)
 
 TCC_FILES := $(call src-wildcard,*.tcc)