new po file.

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index fc67ae86c647de16de3c7096675aeed539681f98..8071829a27699b08ad88a14ddb4c4fa23100dfda 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -65,13 +65,14 @@
 
  @c ***** HTML *****
 
- @macro internalsref{NAME}
- @c makeinfo-4.7 encodes html names
- @c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
- @inforef{\NAME\,,lilypond-internals}@c
- @c should we do this? 
- @cindex @code{\NAME\}
- @end macro
+@macro internalsref{NAME}@c
+@c makeinfo-4.7 encodes html names
+@uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+@c @inforef{} adds ``See'' to the sentence.
+@c @inforef{\NAME\,,lilypond-internals}@c
+@c should we do this? 
+@cindex @code{\NAME\}
+@end macro
 
  @macro hyphenatedinternalsref{NAME,NODENAME}
  @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\}@c

diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly
index 6e0f44731a55e2924922c5d04a9fc4a3266aa218..675c4f903a4585fd9dcc4493ed2196dfb0bedb65 100644 (file)
--- a/input/regression/system-extents.ly
+++ b/input/regression/system-extents.ly
@@ -16,7 +16,9 @@
 
 \new Voice
 {
-    \unset Staff.minimumVerticalExtent 
+    \unset Staff.minimumVerticalExtent
+    \override Score.RehearsalMark #'font-size = #20
+    
     \slurDown c4 ( g4  c''4)
 }
 

diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc
index 13b7686c3fc3d689a39786db25fabae19f0e5a9e..0911781be2fa76fe0a6d0a59ca1e247748f13e5c 100644 (file)
--- a/lily/dynamic-text-spanner.cc
+++ b/lily/dynamic-text-spanner.cc
@@ -146,5 +146,5 @@ Dynamic_text_spanner::print (SCM smob)
 ADD_INTERFACE (Dynamic_text_spanner,
               "dynamic-text-spanner-interface",
               "A text spanner for crescendo texts",
-              "dash-period dash-fraction edge-text style thickness");
+              "bound-padding dash-period dash-fraction edge-text style thickness");
 

diff --git a/po/fr.po b/po/fr.po
index 96d4929c1b37890fbde9d1acf4f7cb9d3dbc4ca1..51c6bdd3615839145b001e62706b2febbc8af6dc 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.2.0\n"
+"Project-Id-Version: lilypond 2.3.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-31 16:22+0200\n"
-"PO-Revision-Date: 2004-05-10 08:00-0500\n"
+"POT-Creation-Date: 2004-10-09 03:01+0200\n"
+"PO-Revision-Date: 2004-10-10 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,114 +15,113 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: lilylib.py:60
+#: lilylib.py:62
 msgid "lilylib module"
 msgstr "module lilylib"
 
-#: lilylib.py:63 lilypond-book.py:84 lilypond.py:127 midi2ly.py:100
-#: mup2ly.py:75 old-lilypond-book.py:129 main.cc:140
+#: lilylib.py:65 lilypond-book.py:91 lilypond-latex.py:109 midi2ly.py:100
+#: mup2ly.py:75 ps2png.py:40 main.cc:131 lily/main.cc:131
 msgid "print this help"
 msgstr "afficher l'aide-mémoire"
 
-#: lilylib.py:110 midi2ly.py:136 mup2ly.py:130
+#: lilylib.py:112 midi2ly.py:136 mup2ly.py:130
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s écrit par"
 
-#: lilylib.py:114 midi2ly.py:141 mup2ly.py:135
+#: lilylib.py:116 midi2ly.py:141 mup2ly.py:135
 msgid "Distributed under terms of the GNU General Public License."
 msgstr "Distribué selon les termes de la GNU General Public License."
 
-#: lilylib.py:116 midi2ly.py:142 mup2ly.py:136
+#: lilylib.py:118 midi2ly.py:142 mup2ly.py:136
 msgid "It comes with NO WARRANTY."
 msgstr "Le logiciel est distribué SANS GARANTIE."
 
-#: lilylib.py:123 warn.cc:25
+#: lilylib.py:125 warn.cc:24
 #, c-format, python-format
 msgid "warning: %s"
 msgstr "AVERTISSEMENT: %s"
 
-#: lilylib.py:126 warn.cc:31
+#: lilylib.py:128 warn.cc:30
 #, c-format, python-format
 msgid "error: %s"
 msgstr "Erreur: %s"
 
-#: lilylib.py:130
+#: lilylib.py:132
 #, python-format
 msgid "Exiting (%d)..."
 msgstr "Fin d'exécution (%d)... "
 
-#: lilylib.py:190 midi2ly.py:223 mup2ly.py:219
+#: lilylib.py:192 midi2ly.py:223 mup2ly.py:219
 #, python-format
 msgid "Usage: %s [OPTIONS]... FILE"
 msgstr "Usage: %s [OPTIONS]... FICHIER"
 
-#: lilylib.py:194 midi2ly.py:227 mup2ly.py:223 main.cc:205
+#: lilylib.py:196 midi2ly.py:227 mup2ly.py:223 main.cc:200 lily/main.cc:200
 #, c-format
 msgid "Options:"
 msgstr "Options:"
 
-#: lilylib.py:198 midi2ly.py:231 mup2ly.py:227 main.cc:209
+#: lilylib.py:200 midi2ly.py:231 mup2ly.py:227 main.cc:204 lily/main.cc:204
 #, c-format, python-format
 msgid "Report bugs to %s."
 msgstr "Rapporter toutes anomalies à %s."
 
-#: lilylib.py:218
+#: lilylib.py:220
 #, python-format
 msgid "Binary %s has version %s, looking for version %s"
 msgstr "Binaire %s de version %s, recherche de la version %s"
 
-#: lilylib.py:252
+#: lilylib.py:254
 #, python-format
 msgid "Opening pipe `%s'"
 msgstr "Ouverture du pipe `%s'"
 
-#: lilylib.py:267 lilypond-book.py:767
+#: lilylib.py:269 lilypond-book.py:812
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr "`%s' échec (%d)"
 
-#: lilylib.py:272 lilylib.py:331 lilypond-book.py:768 lilypond.py:530
-#: old-lilypond-book.py:228
+#: lilylib.py:274 lilylib.py:333 lilypond-book.py:813 lilypond-latex.py:466
 msgid "The error log is as follows:"
 msgstr "Le journal d'erreurs est comme suit:"
 
-#: lilylib.py:303 midi2ly.py:259 mup2ly.py:255
+#: lilylib.py:305 midi2ly.py:259 mup2ly.py:255
 #, python-format
 msgid "Invoking `%s'"
 msgstr "Invocation de « %s »"
 
-#: lilylib.py:305
+#: lilylib.py:307
 #, python-format
 msgid "Running %s..."
 msgstr "Exécution de %s..."
 
-#: lilylib.py:324
+#: lilylib.py:326
 #, python-format
 msgid "`%s' failed (%s)"
 msgstr "`%s' a échoué (%s)"
 
-#: lilylib.py:327 midi2ly.py:265 mup2ly.py:263
+#: lilylib.py:329 midi2ly.py:265 mup2ly.py:263
 msgid "(ignored)"
 msgstr "(ignoré)"
 
-#: lilylib.py:345 midi2ly.py:275 mup2ly.py:273
+#: lilylib.py:347 midi2ly.py:275 mup2ly.py:273
 #, python-format
 msgid "Cleaning %s..."
 msgstr "Nettoyage de %s..."
 
-#: lilylib.py:509
+#: lilylib.py:518
 msgid "Removing output file"
 msgstr "Destruction du fichier de sortie"
 
-#: lilypond-book.py:69
+#: lilypond-book.py:76
 msgid ""
 "Process LilyPond snippets in hybrid HTML, LaTeX or texinfo document.\n"
 "Example usage:\n"
 "\n"
 "   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
 "   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-"   lilypond-book --process='lilypond-bin -I include' BOOK\n"
+"   lilypond-book --process='lilypond -I include' BOOK\n"
 "\n"
 msgstr ""
 "Traiter les snippets LilyPond dans un document hybride HTML, LaTeX ou TexInfo.\n"
@@ -130,129 +129,142 @@ msgstr ""
 "\n"
 "   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" LIVRE\n"
 "   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" LIVRE\n"
-"   lilypond-book --process='lilypond-bin -I include' LIVRE\n"
+"   lilypond-book --process='lilypond -I include' LIVRE\n"
 "\n"
 
 #. Bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format.
-#: lilypond-book.py:82 old-lilypond-book.py:123 main.cc:139
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
+#: lilypond-book.py:89 main.cc:130 lily/main.cc:130
 msgid "EXT"
 msgstr "EXT"
 
-#: lilypond-book.py:82 old-lilypond-book.py:123
+#: lilypond-book.py:89
 msgid "use output format EXT (texi [default], texi-html, latex, html)"
 msgstr "utiliser le format de sortie EXT (texi (par défaut), texi-html, latex, html)"
 
-#: lilypond-book.py:83
+#: lilypond-book.py:90
 msgid "FILTER"
 msgstr "FILTRE"
 
-#: lilypond-book.py:83
+#: lilypond-book.py:90
 msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr "ouvrir un pipe de snippets à travers le FILTRE [convert-ly -n -]"
 
-#: lilypond-book.py:85 lilypond-book.py:87 lilypond.py:131
-#: old-lilypond-book.py:130 main.cc:142 main.cc:147
+#: lilypond-book.py:92 lilypond-book.py:94 lilypond-latex.py:114 main.cc:133
+#: lily/main.cc:133
 msgid "DIR"
 msgstr "RÉP"
 
-#: lilypond-book.py:85
+#: lilypond-book.py:92
 msgid "add DIR to include path"
 msgstr "ajouter le RÉPERTOIRE à inclure au chemin de recherche"
 
-#: lilypond-book.py:86
+#: lilypond-book.py:93
 msgid "COMMAND"
 msgstr "COMMANDE"
 
-#: lilypond-book.py:86
+#: lilypond-book.py:93
 msgid "process ly_files using COMMAND FILE..."
 msgstr "traitre ly_files en utilisant la COMMANDE FICHIER..."
 
-#: lilypond-book.py:87
+#: lilypond-book.py:94
 msgid "write output to DIR"
 msgstr "produire la sortie dans le RÉPERTOIRE"
 
-#: lilypond-book.py:88 lilypond.py:149 midi2ly.py:105 mup2ly.py:78
-#: old-lilypond-book.py:140 main.cc:150
+#: lilypond-book.py:95 lilypond-latex.py:133 midi2ly.py:105 mup2ly.py:78
+#: ps2png.py:41 main.cc:145 lily/main.cc:145
 msgid "be verbose"
 msgstr "passer en mode explicatif"
 
-#: lilypond-book.py:89 old-lilypond-book.py:141
+#: lilypond-book.py:96
 msgid "print version information"
 msgstr "afficher les informations de version"
 
-#: lilypond-book.py:90 lilypond.py:151 midi2ly.py:107 mup2ly.py:80
-#: old-lilypond-book.py:142 main.cc:151
+#: lilypond-book.py:97 lilypond-latex.py:135 midi2ly.py:107 mup2ly.py:80
+#: main.cc:146 lily/main.cc:146
 msgid "show warranty and copyright"
 msgstr "afficher la notice de garantie et du droit d'auteur"
 
-#: lilypond-book.py:373
+#: lilypond-book.py:400
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr "option ly-option dépréciée: %s"
 
-#: lilypond-book.py:374
+#: lilypond-book.py:401
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr "traduction en mode de compatibilité: %s"
 
-#: lilypond-book.py:394
+#: lilypond-book.py:423
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr "option ly inconnue et ignorée: %s"
 
-#: lilypond-book.py:448
+#: lilypond-book.py:480
 #, python-format
 msgid "file not found: %s"
 msgstr "fichier non repéré: %s"
 
-#: lilypond-book.py:750
+#: lilypond-book.py:795
 #, python-format
 msgid "Opening filter `%s'"
 msgstr "Filtre d'ouverture `%s'"
 
-#: lilypond-book.py:862
+#: lilypond-book.py:913
 #, python-format
 msgid "cannot determine format for: %s"
 msgstr "ne peut déterminer le format pour: %s"
 
-#: lilypond-book.py:903
+#: lilypond-book.py:954
 msgid "Output would overwrite input file; use --output."
 msgstr "La sortie va écraser le fichier d'entrée; utiliser --output"
 
-#: lilypond-book.py:910
+#: lilypond-book.py:961
 #, python-format
 msgid "Reading %s..."
 msgstr "Lecture en cours de %s..."
 
-#: lilypond-book.py:924
+#: lilypond-book.py:975
 msgid "Dissecting..."
 msgstr "Dissection en cours..."
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1006
 msgid "Writing snippets..."
 msgstr "Écriture de snipplets..."
 
-#: lilypond-book.py:957
+#: lilypond-book.py:1011
 msgid "Processing..."
 msgstr "Traitement..."
 
-#: lilypond-book.py:960
+#: lilypond-book.py:1014
 msgid "All snippets are up to date..."
 msgstr "Tous les snipplets sont à jour..."
 
-#: lilypond-book.py:963
+#: lilypond-book.py:1017
 #, python-format
 msgid "Compiling %s..."
 msgstr "Compilation en cours %s..."
 
-#: lilypond-book.py:971
+#: lilypond-book.py:1025
 #, python-format
 msgid "Processing include: %s"
 msgstr "Traitement d'inclustion: %s"
 
-#: lilypond-book.py:987 lilypond.py:693 midi2ly.py:1017
-#: old-lilypond-book.py:1570
+#: lilypond-book.py:1041 lilypond-latex.py:576 midi2ly.py:1017 ps2png.py:51
 #, python-format
 msgid "getopt says: `%s'"
 msgstr "getopt() indique: « %s »"
@@ -260,156 +272,139 @@ msgstr "getopt() indique: 
 #. # FIXME
 #. # do -P or -p by default?
 #. #help_summary = _ ("Run LilyPond using LaTeX for titling")
-#: lilypond.py:120
-msgid "Run LilyPond, add titles, generate printable document."
-msgstr "Exéctuer LilyPond, ajouter des titres et générer les documents imprimables"
+#: lilypond-latex.py:104
+msgid "Run LilyPond, generate printable document."
+msgstr "Exéctuer LilyPond, générer les documents imprimables."
 
-#: lilypond.py:126
-msgid "write Makefile dependencies for every input file"
-msgstr "produire les dépendances pour Makefile concernant chaque fichier d'entrée"
+#: lilypond-latex.py:110
+msgid "use LaTeX for formatting"
+msgstr "utiliser LaTeX pour le formattage"
 
-#: lilypond.py:128
+#: lilypond-latex.py:111
 msgid "print even more output"
 msgstr "afficher encore plus de sortie"
 
-#: lilypond.py:129 lilypond.py:136 midi2ly.py:102 old-lilypond-book.py:136
-#: old-lilypond-book.py:137 main.cc:143 main.cc:146
+#: lilypond-latex.py:112 lilypond-latex.py:123 midi2ly.py:102 main.cc:134
+#: main.cc:136 lily/main.cc:134 lily/main.cc:136
 msgid "FILE"
 msgstr "FICHIER"
 
-#: lilypond.py:129
+#: lilypond-latex.py:112
 msgid "find pfa fonts used in FILE"
 msgstr "repérer les fontes pfa utilisées dans le FICHIER"
 
-#: lilypond.py:130
-msgid "make HTML file with links to all output"
-msgstr "générer les fichier HTML avec des liens sur toutes les sorties"
-
-#: lilypond.py:131
+#: lilypond-latex.py:114
 msgid "add DIR to LilyPond's search path"
 msgstr "ajouter le RÉPERTOIRE au chemin de recherche de LilyPond"
 
-#: lilypond.py:133
+#: lilypond-latex.py:116
 #, python-format
 msgid "keep all output, output to directory %s.dir"
 msgstr "conserver toutes les sorties dans le répertoire %s.dir"
 
-#: lilypond.py:134
+#. junkme?
+#: lilypond-latex.py:119
 msgid "don't run LilyPond"
 msgstr "ne pas exécuter LilyPond"
 
-#: lilypond.py:135 main.cc:145
+#. junkme?
+#: lilypond-latex.py:121 main.cc:135 lily/main.cc:135
 msgid "produce MIDI output only"
 msgstr "produire une sortie MIDI seulement"
 
-#: lilypond.py:136 midi2ly.py:102 mup2ly.py:76 main.cc:146
+#: lilypond-latex.py:123 midi2ly.py:102 mup2ly.py:76 main.cc:136
+#: lily/main.cc:136
 msgid "write output to FILE"
 msgstr "produire la sortie dans le FICHIER"
 
-#: lilypond.py:137 old-lilypond-book.py:138
+#: lilypond-latex.py:124 ps2png.py:42
 msgid "RES"
 msgstr "RES"
 
-#: lilypond.py:138 old-lilypond-book.py:139
+#: lilypond-latex.py:125 ps2png.py:43
 msgid "set the resolution of the preview to RES"
 msgstr "utiliser la RÉSOLUTION pour la prévisualitation"
 
-#: lilypond.py:139
-msgid "do not generate PDF output"
-msgstr "ne pas générer de sortie en format PDF"
-
-#: lilypond.py:140
-msgid "do not generate PostScript output"
-msgstr "ne pas générer de sortie en format PostScript"
-
-#: lilypond.py:141
+#: lilypond-latex.py:126
 msgid "generate PDF output"
 msgstr "générer une sortie en format PDF"
 
-#: lilypond.py:142
+#: lilypond-latex.py:127
 msgid "generate PostScript output"
 msgstr "générer une sortie en format PostScript"
 
-#: lilypond.py:143
-msgid "use pdflatex to generate PDF output"
-msgstr "utiliser pdflatex pour générer la sortie en format PDF"
-
-#: lilypond.py:144
+#: lilypond-latex.py:128
 msgid "generate PNG page images"
 msgstr "générer les pages images en format PNG"
 
-#: lilypond.py:145
+#: lilypond-latex.py:129
 msgid "make a picture of the first system"
 msgstr "produire une image de ce premier système"
 
-#: lilypond.py:146
+#: lilypond-latex.py:130
 msgid "generate PS.GZ"
 msgstr "générer PS.GZ"
 
-#: lilypond.py:147
+#: lilypond-latex.py:131
 msgid "run in safe-mode"
 msgstr "exécuter en mode sécuritaire"
 
-#: lilypond.py:148
+#: lilypond-latex.py:132
 msgid "KEY=VAL"
 msgstr "CLÉ=VALEUR"
 
-#: lilypond.py:148
+#: lilypond-latex.py:132
 msgid "change global setting KEY to VAL"
 msgstr "modifier le paramètre global de la CLÉ à VALEUR"
 
-#: lilypond.py:150 midi2ly.py:106 mup2ly.py:79 main.cc:149
+#: lilypond-latex.py:134 midi2ly.py:106 mup2ly.py:79 main.cc:144
+#: lily/main.cc:144
 msgid "print version number"
 msgstr "afficher le numéro de version"
 
-#: lilypond.py:234
+#: lilypond-latex.py:203
 #, python-format
 msgid "no such setting: `%s'"
 msgstr "pas de telle configuration: « %s »"
 
-#: lilypond.py:284
+#: lilypond-latex.py:247
 #, python-format
 msgid "LilyPond crashed (signal %d)."
 msgstr "Lilypond a planté (signal %d)."
 
-#: lilypond.py:285
+#: lilypond-latex.py:248
 msgid "Please submit a bug report to bug-lilypond@gnu.org"
 msgstr "SVP soumettre un rapport d'anomalies à bug-lilypond@gnu.org"
 
-#: lilypond.py:291
+#: lilypond-latex.py:255
 #, python-format
 msgid "LilyPond failed on input file %s (exit status %d)"
 msgstr "Échec de lilypond sur le fichier d'entrée %s (statut d'exécution %d)."
 
-#: lilypond.py:294
+#: lilypond-latex.py:259
 #, python-format
 msgid "LilyPond failed on an input file (exit status %d)"
 msgstr "Échec de lilypond sur le fichier d'entrée (statut d'exécution %d)."
 
-#: lilypond.py:295
+#: lilypond-latex.py:260
 msgid "Continuing..."
 msgstr "Poursuite..."
 
-#: lilypond.py:306
+#: lilypond-latex.py:270
 #, python-format
 msgid "Analyzing %s..."
 msgstr "Analyse de %s..."
 
-#: lilypond.py:364
+#: lilypond-latex.py:324
 #, python-format
 msgid "no LilyPond output found for `%s'"
 msgstr "aucune sortie de Lilypond n'a été trouvée pour « %s »"
 
-#: lilypond.py:431
-#, python-format
-msgid "invalid value: `%s'"
-msgstr "valeur invalide: « %s »"
-
-#: lilypond.py:529
+#: lilypond-latex.py:465
 msgid "LaTeX failed on the output file."
 msgstr "Échec de LaTex sur le fichier de sortie."
 
-#: lilypond.py:586
+#: lilypond-latex.py:513
 msgid ""
 "Trying create PDF, but no PFA fonts found.\n"
 "Using bitmap fonts instead. This will look bad."
@@ -418,67 +413,54 @@ msgstr ""
 "Utilisation des fontes bitmap à la place. L'apparence sera moins bonne."
 
 #. no ps header?
-#: lilypond.py:635
+#: lilypond-latex.py:556
 #, python-format
 msgid "not a PostScript file: `%s'"
 msgstr "n'est pas un fichier PostScript: « %s »"
 
-#: lilypond.py:680
-#, python-format
-msgid "Writing HTML menu `%s'"
-msgstr "Écriture du menu HTML « %s »"
-
-#: lilypond.py:800
+#: lilypond-latex.py:666
 msgid "pseudo filter"
 msgstr "pseudo filtre"
 
-#: lilypond.py:803
+#: lilypond-latex.py:669
 msgid "pseudo filter only for single input file"
 msgstr "pseudo filtre seulement pour le seul fichier d'entrée"
 
-#: lilypond.py:808 old-lilypond-book.py:1643
+#: lilypond-latex.py:674
 msgid "no files specified on command line"
 msgstr "aucun fichier spéficié sur la ligne de commande"
 
-#: lilypond.py:840
+#: lilypond-latex.py:706
 #, python-format
 msgid "filename should not contain spaces: `%s'"
 msgstr "le nom de fichier ne peut contenir des espaces: « %s »"
 
-#: lilypond.py:880
+#: lilypond-latex.py:744
 msgid "Running LilyPond failed. Rerun with --verbose for a trace."
 msgstr "Échec d'exécution de LilyPond. Réxécuter avec --verbose pour obtenir une trace."
 
-#: lilypond.py:921
+#: lilypond-latex.py:786
 msgid "Failed to make PS file. Rerun with --verbose for a trace."
 msgstr "Échec de génération du fichier PS. Réexécuter avec --verbose pour obtenir une trace."
 
-#: lilypond.py:951
-msgid "Running LaTeX failed. Rerun with --verbose for a trace."
-msgstr "Échec de l'exécution de LaTeX. Ré-exécuter avec --verbose pour obtenir une trace."
-
-#: lilypond.py:963 input-file-results.cc:74
-#, c-format, python-format
-msgid "dependencies output to `%s'..."
-msgstr "dépendances produites dans « %s »"
-
-#: lilypond.py:974
+#: lilypond-latex.py:815
 #, python-format
 msgid "%s output to <stdout>..."
 msgstr "%s sortie vers <stdout>»..."
 
-#: lilypond.py:979 includable-lexer.cc:57 input-file-results.cc:217
-#: input-file-results.cc:224 lily-guile.cc:86
+#: lilypond-latex.py:820 includable-lexer.cc:57 kpath.cc:134 lily-guile.cc:89
+#: lily-parser.cc:275 lily/includable-lexer.cc:57 lily/kpath.cc:134
+#: lily/lily-guile.cc:89 lily/lily-parser.cc:275
 #, c-format, python-format
 msgid "can't find file: `%s'"
 msgstr "ne peut repérer le fichier: « %s »"
 
-#: lilypond.py:1002
+#: lilypond-latex.py:843
 #, python-format
 msgid "%s output to %s..."
 msgstr "%s sortie vers  %s..."
 
-#: lilypond.py:1005
+#: lilypond-latex.py:846
 #, python-format
 msgid "can't find file: `%s.%s'"
 msgstr "ne peut repérer le fichier: « %s.%s »"
@@ -530,12 +512,12 @@ msgstr "permettre un tuplet de dur
 msgid "treat every text as a lyric"
 msgstr "traiter chaque texte comme des paroles"
 
-#: midi2ly.py:149 mup2ly.py:143 input.cc:88
+#: midi2ly.py:149 mup2ly.py:143 input.cc:88 lily/input.cc:88
 msgid "warning: "
 msgstr "AVERTISSEMENT: "
 
 #: midi2ly.py:164 midi2ly.py:1017 midi2ly.py:1082 mup2ly.py:146 mup2ly.py:160
-#: input.cc:93
+#: input.cc:93 lily/input.cc:93
 msgid "error: "
 msgstr "Erreur: "
 
@@ -592,81 +574,16 @@ msgstr "Traitement de 
 msgid "Writing `%s'..."
 msgstr "Écriture de « %s »..."
 
-#. # FIXME
-#. # do -P or -p by default?
-#. #help_summary = _ ("Run LilyPond using LaTeX for titling")
-#: old-lilypond-book.py:118
-msgid "Process LilyPond snippets in hybrid HTML, LaTeX or texinfo document"
-msgstr "Traiter les snippets LilyPond dans un document hybride en HTML, LaTeX ou texinfo"
-
-#: old-lilypond-book.py:124 old-lilypond-book.py:125 old-lilypond-book.py:127
-#: old-lilypond-book.py:128
-msgid "DIM"
-msgstr "DIM"
-
-#: old-lilypond-book.py:124
-msgid "default fontsize for music.  DIM is assumed to be in points"
-msgstr "taille de la fonte par défaut pour music. DIM est assumé être en points"
-
-#: old-lilypond-book.py:125
-msgid "deprecated, use --default-music-fontsize"
-msgstr "déprécié, utiliser --default-music-fontsize"
-
-#: old-lilypond-book.py:126
-msgid "OPT"
-msgstr "OPT"
-
-#: old-lilypond-book.py:126
-msgid "pass OPT quoted to the lilypond command line"
-msgstr "passer OPT entre guillemets à la ligne de commande à lilypond"
-
-#: old-lilypond-book.py:127
-msgid "force fontsize for all inline lilypond. DIM is assumed to be in points"
-msgstr "forcer la taille de fonte pour les enligne lilypond. DIM est assumé être en points"
-
-#: old-lilypond-book.py:128
-msgid "deprecated, use --force-music-fontsize"
-msgstr "déprécié, utilise --force-music-fontsize"
-
-#: old-lilypond-book.py:130
-msgid "include path"
-msgstr "inclure le chemin (path)"
-
-#: old-lilypond-book.py:131
-msgid "write dependencies"
-msgstr "écrire les dépendances"
-
-#: old-lilypond-book.py:132
-msgid "PREF"
-msgstr "PRÉF"
-
-#: old-lilypond-book.py:132
-msgid "prepend PREF before each -M dependency"
-msgstr "ajouter les PRÉFérence en préfixe pour chaque dépendance -M"
-
-#: old-lilypond-book.py:133
-msgid "don't run lilypond"
-msgstr "ne pas exécuter lilypond"
-
-#: old-lilypond-book.py:134
-msgid "don't generate pictures"
-msgstr "ne pas générer de photos"
-
-#: old-lilypond-book.py:135
-msgid "strip all lilypond blocks from output"
-msgstr "éliminer chaque bloc lilypond de la sortie"
+#. ugr.
+#: ps2png.py:35
+msgid "Convert PostScript to PNG image."
+msgstr "Convertir le Postscript en image PNG"
 
-#: old-lilypond-book.py:136
-msgid "filename main output file"
-msgstr "nom du fichier principal de sortie"
-
-#: old-lilypond-book.py:137
-msgid "where to place generated files"
-msgstr "où seront placés les fichiers générés"
-
-#: old-lilypond-book.py:227
-msgid "LaTeX failed."
-msgstr "Échec de LaTeX"
+#. # FIXME: silly message containing %d
+#: ps2png.py:71
+#, python-format
+msgid "Wrote `%s'"
+msgstr "A écrit « %s »"
 
 #: getopt-long.cc:146
 #, c-format
@@ -688,132 +605,163 @@ msgstr "option non reconnue: 
 msgid "invalid argument `%s' to option `%s'"
 msgstr "argument invalide « %s » pour l'option « %s »"
 
-#: warn.cc:44
+#: warn.cc:43
 #, c-format
 msgid "programming error: %s"
 msgstr "erreur de programmation: %s"
 
-#: warn.cc:45
+#: warn.cc:44
 msgid "Continuing; crossing fingers"
 msgstr "Poursuite; croisons les doigts"
 
-#: accidental.cc:219 key-signature-interface.cc:139
-#, c-format
-msgid "accidental `%s' not found"
-msgstr "accidentel `%s' non repéré"
-
-#: accidental-engraver.cc:167
+#: accidental-engraver.cc:194 lily/accidental-engraver.cc:201
+#: lily/accidental-engraver.cc:243
 #, c-format
 msgid "Accidental typesetting list must begin with context-name: %s"
 msgstr "Liste de mise en page accidentelle doit débuter avec un nom de contexte: %s"
 
-#: accidental-engraver.cc:194
+#: accidental-engraver.cc:222 lily/accidental-engraver.cc:229
+#: lily/accidental-engraver.cc:271
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr "option inconnue et accidentelle: %s"
 
-#: accidental-engraver.cc:211
+#: accidental-engraver.cc:239 lily/accidental-engraver.cc:246
+#: lily/accidental-engraver.cc:288
 #, c-format
 msgid "Accidental rule must be pair or context-name; Found %s"
 msgstr "Règle accidentelle doit être pair ou un nom de contexte; a obtenu: %s"
 
-#: afm.cc:145
+#: accidental.cc:221 key-signature-interface.cc:137 lily/accidental.cc:221
+#: lily/key-signature-interface.cc:137 lily/accidental.cc:222
+#, c-format
+msgid "accidental `%s' not found"
+msgstr "accidentel `%s' non repéré"
+
+#: afm.cc:143 lily/afm.cc:143
 #, c-format
 msgid "Error parsing AFM file: `%s'"
 msgstr "Erreur d'analyse syntaxique du fichier AFM: « %s »"
 
-#: all-font-metrics.cc:100
+#. FIXME: broken sentence
+#. FIXME: broken sentence
+#. FIXME: broken sentence
+#. FIXME: broken sentence
+#. FIXME: broken sentence
+#. FIXME: broken sentence
+#. FIXME: broken sentence
+#. FIXME: broken sentence
+#: all-font-metrics.cc:95 lily/all-font-metrics.cc:95
 #, c-format
 msgid "checksum mismatch for font file: `%s'"
 msgstr "somme de contrôle ne concorde pas pour le fichier de fontes: « %s »"
 
-#: all-font-metrics.cc:102
+#: all-font-metrics.cc:97 lily/all-font-metrics.cc:97
 #, c-format
 msgid "does not match: `%s'"
 msgstr "ne concorde pas: « %s »"
 
-#: all-font-metrics.cc:107
+#: all-font-metrics.cc:103 lily/all-font-metrics.cc:103
 msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
 msgstr "Reconstruire tous les fichiers .afm et enlever tous les fichiers .pk et .tfm."
 
-#: all-font-metrics.cc:109
+#: all-font-metrics.cc:105 lily/all-font-metrics.cc:105
 msgid "Rerun with -V to show font paths."
 msgstr "Ré-exécuter avec l'option -V pour afficher les chemins vers les fontes."
 
-#: all-font-metrics.cc:111
+#: all-font-metrics.cc:107 lily/all-font-metrics.cc:107
 msgid "A script for removing font-files is delivered with the source-code:"
 msgstr "Un script pour enlever les fichiers de fontes est livré avec le code source:"
 
-#: all-font-metrics.cc:192
+#: all-font-metrics.cc:184 lily/all-font-metrics.cc:184
 #, c-format
 msgid "can't find font: `%s'"
 msgstr "ne peut repérer la fonte: « %s »"
 
-#: all-font-metrics.cc:193
+#: all-font-metrics.cc:185 lily/all-font-metrics.cc:185
 msgid "Loading default font"
 msgstr "Chargement de la fonte par défaut"
 
-#: all-font-metrics.cc:208
+#: all-font-metrics.cc:200 lily/all-font-metrics.cc:200
 #, c-format
 msgid "can't find default font: `%s'"
 msgstr "ne peut reprérer la fonte par défaut: « %s »"
 
-#: all-font-metrics.cc:209 includable-lexer.cc:59 input-file-results.cc:218
+#: all-font-metrics.cc:201 includable-lexer.cc:59 lily-parser.cc:268
+#: lily/all-font-metrics.cc:201 lily/includable-lexer.cc:59
+#: lily/lily-parser.cc:268
 #, c-format
 msgid "(search path: `%s')"
 msgstr "(chemin de recherche: « %s »)"
 
-#: all-font-metrics.cc:210
+#: all-font-metrics.cc:202 lily/all-font-metrics.cc:202
 msgid "Giving up"
 msgstr "Abandon"
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: apply-context-iterator.cc:35 lily/apply-context-iterator.cc:35
+msgid "\\applycontext argument is not a procedure"
+msgstr "\\applycontext l'argument n'est pas une procédure"
+
+#: auto-change-iterator.cc:67 change-iterator.cc:61
+#: lily/auto-change-iterator.cc:67 lily/change-iterator.cc:61
 msgid "Can't switch translators, I'm there already"
 msgstr "Ne peut commuter d'un traducteur à l'autre, je suis là déjà"
 
-#: bar-check-iterator.cc:68
+#: axis-group-engraver.cc:117 lily/axis-group-engraver.cc:117
+msgid ""
+"Axis_group_engraver: vertical group already has a parent.\n"
+"Do you have two Axis_group_engravers?\n"
+"Killing this vertical group."
+msgstr ""
+"Axis_group_engraver: le groupe vertical a déjà un parent.\n"
+"Avez-vous deux Axis_group_engravers?\n"
+"Abandon de ce groupe vertical."
+
+#: bar-check-iterator.cc:68 lily/bar-check-iterator.cc:68
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr "échec du barcheck à: %s"
 
-#: beam.cc:151
-msgid "beam has less than two visible stems"
-msgstr "faisceau a moins que deux queues visibles"
-
-#: beam.cc:156
-msgid "removing beam with less than two stems"
-msgstr "retrait du faisceau ayant moins que deux tiges"
-
-#: beam.cc:1040
-msgid "no viable initial configuration found: may not find good beam slope"
-msgstr "pas de configuration initiale viable repérée: peut ne pas repérer une pente de faisceau"
-
-#: beam-engraver.cc:139
+#: beam-engraver.cc:139 lily/beam-engraver.cc:139
 msgid "already have a beam"
 msgstr "faisceau déjà présent"
 
-#: beam-engraver.cc:212
+#: beam-engraver.cc:211 lily/beam-engraver.cc:211
 msgid "unterminated beam"
 msgstr "faisceau non terminé"
 
-#: beam-engraver.cc:245 chord-tremolo-engraver.cc:179
+#: beam-engraver.cc:244 chord-tremolo-engraver.cc:174
+#: lily/beam-engraver.cc:244 lily/chord-tremolo-engraver.cc:174
 msgid "stem must have Rhythmic structure"
 msgstr "la queue doit avoir une structure rythmiique"
 
-#: beam-engraver.cc:259
+#: beam-engraver.cc:258 lily/beam-engraver.cc:258
 msgid "stem doesn't fit in beam"
 msgstr "la queue ne s'insère pas dans le faisceau"
 
-#: beam-engraver.cc:260
+#: beam-engraver.cc:259 lily/beam-engraver.cc:259
 msgid "beam was started here"
 msgstr "faisceau a débuté ici"
 
-#: break-align-interface.cc:214
+#: beam.cc:149 lily/beam.cc:149 lily/beam.cc:150
+msgid "beam has less than two visible stems"
+msgstr "faisceau a moins que deux queues visibles"
+
+#: beam.cc:154 lily/beam.cc:154 lily/beam.cc:155
+msgid "removing beam with less than two stems"
+msgstr "retrait du faisceau ayant moins que deux tiges"
+
+#: beam.cc:1038 lily/beam.cc:1038 lily/beam.cc:1063 lily/beam.cc:1065
+#: lily/beam.cc:1007
+msgid "no viable initial configuration found: may not find good beam slope"
+msgstr "pas de configuration initiale viable repérée: peut ne pas repérer une pente de faisceau"
+
+#: break-align-interface.cc:214 lily/break-align-interface.cc:214
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Pas d'espacement des entrées à partir de %s à « %s »"
 
-#: change-iterator.cc:22
+#: change-iterator.cc:22 lily/change-iterator.cc:22
 #, c-format
 msgid "can't change `%s' to `%s'"
 msgstr "ne peut changer de « %s » à « %s »"
@@ -822,275 +770,358 @@ msgstr "ne peut changer de 
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
 #.
-#. last->translator_id_string_  = get_change ()->change_to_id_string_;
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
 #.
-#: change-iterator.cc:87
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
+#: change-iterator.cc:93 lily/change-iterator.cc:93
 msgid "I'm one myself"
 msgstr "J'en suis un moi-même"
 
-#: change-iterator.cc:90
+#: change-iterator.cc:96 lily/change-iterator.cc:96
 msgid "none of these in my family"
 msgstr "aucun de ceux-ci dans ma famille"
 
-#: chord-tremolo-engraver.cc:100
+#: chord-tremolo-engraver.cc:100 lily/chord-tremolo-engraver.cc:100
 #, c-format
 msgid "Chord tremolo with %d elements. Must have two elements."
 msgstr "Accord de tremolo avec %d éléments. Doit avoir 2 éléments."
 
-#: chord-tremolo-engraver.cc:141
+#: chord-tremolo-engraver.cc:140 lily/chord-tremolo-engraver.cc:140
 msgid "unterminated chord tremolo"
 msgstr "accord de tremolo non terminé"
 
-#: chord-tremolo-iterator.cc:64
+#: chord-tremolo-iterator.cc:64 lily/chord-tremolo-iterator.cc:64
 msgid "no one to print a tremolos"
 msgstr "aucun pour l'impression de tremolos"
 
-#: clef.cc:64
+#: clef.cc:64 lily/clef.cc:64
 #, c-format
 msgid "clef `%s' not found"
 msgstr "clé `%s' non repéré"
 
-#: cluster.cc:123
+#: cluster.cc:123 lily/cluster.cc:123
 #, c-format
 msgid "unknown cluster style `%s'"
 msgstr "style de groupement inconnu « %s »"
 
-#: coherent-ligature-engraver.cc:84
+#: coherent-ligature-engraver.cc:84 lily/coherent-ligature-engraver.cc:84
 #, c-format
 msgid "gotcha: ptr=%ul"
 msgstr "obtenu: ptr=%ul"
 
-#: coherent-ligature-engraver.cc:96
+#: coherent-ligature-engraver.cc:96 lily/coherent-ligature-engraver.cc:96
 #, c-format
 msgid "distance=%f"
 msgstr "distance=%f"
 
-#: coherent-ligature-engraver.cc:139
+#: coherent-ligature-engraver.cc:139 lily/coherent-ligature-engraver.cc:139
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment = 0.01': ptr=%ul"
 msgstr "Coherent_ligature_engraver: fixé `spacing-increment = 0.01': ptr=%ul"
 
-#: context.cc:180
+#: context-def.cc:111 lily/context-def.cc:111
+#, c-format
+msgid "Program has no such type: `%s'"
+msgstr "Programme n'a pas un tel type: « %s »"
+
+#: context-def.cc:285 lily/context-def.cc:286
+#, c-format
+msgid "can't find: `%s'"
+msgstr "ne peut trouver: « %s »"
+
+#: context.cc:164 lily/context.cc:164 lily/context.cc:163
 #, c-format
 msgid "Cannot find or create `%s' called `%s'"
 msgstr "Ne peut trouver ou créer « %s » qui a appelé « %s »"
 
-#: context.cc:217
+#: context.cc:201 lily/context.cc:201 lily/context.cc:200
 #, c-format
 msgid "can't find or create: `%s'"
 msgstr "ne peut trouver ou créer: « %s »"
 
-#: context-def.cc:115
-#, c-format
-msgid "Program has no such type: `%s'"
-msgstr "Programme n'a pas un tel type: « %s »"
-
-#: custos.cc:85
+#: custos.cc:85 lily/custos.cc:85
 #, c-format
 msgid "custos `%s' not found"
 msgstr "custos `%s' non repéré"
 
-#: dimensions.cc:13
+#: dimensions.cc:13 lily/dimensions.cc:13
 msgid "NaN"
 msgstr "NaN"
 
-#: dynamic-engraver.cc:183 span-dynamic-performer.cc:86
+#: dynamic-engraver.cc:186 span-dynamic-performer.cc:86
+#: lily/dynamic-engraver.cc:186 lily/span-dynamic-performer.cc:86
+#: lily/dynamic-engraver.cc:185
 msgid "can't find start of (de)crescendo"
 msgstr "ne peut repérer le début du (de)crescendo"
 
-#: dynamic-engraver.cc:193
+#: dynamic-engraver.cc:196 lily/dynamic-engraver.cc:196
+#: lily/dynamic-engraver.cc:195
 msgid "already have a decrescendo"
 msgstr "decrescendo déjà présent"
 
-#: dynamic-engraver.cc:195
+#: dynamic-engraver.cc:198 lily/dynamic-engraver.cc:198
+#: lily/dynamic-engraver.cc:197
 msgid "already have a crescendo"
 msgstr "crescendo déjà présent"
 
-#: dynamic-engraver.cc:198
+#: dynamic-engraver.cc:201 lily/dynamic-engraver.cc:201
+#: lily/dynamic-engraver.cc:200
 msgid "Cresc started here"
 msgstr "Crescendo a débuté ici"
 
-#: dynamic-engraver.cc:305
+#: dynamic-engraver.cc:307 lily/dynamic-engraver.cc:317
+#: lily/dynamic-engraver.cc:321
 msgid "unterminated (de)crescendo"
 msgstr "(de)crescendo n'est pas terminé"
 
-#: event.cc:49
+#: event-chord-iterator.cc:56 output-property-music-iterator.cc:29
+#: lily/event-chord-iterator.cc:56 lily/output-property-music-iterator.cc:29
+#, c-format
+msgid "Junking event: `%s'"
+msgstr "Événement rebut: « %s »"
+
+#: event.cc:49 lily/event.cc:49 lily/music.cc:184
 #, c-format
 msgid "Transposition by %s makes alteration larger than two"
 msgstr "Transposition faite par %s crée des altérations plus grande que deux"
 
-#: event.cc:72
+#: event.cc:72 lily/event.cc:72 lily/event.cc:50
 #, c-format
 msgid "octave check failed; expected %s, found: %s"
 msgstr "vérification de l'octave a échoué; attendait %s, a obtenu: %s"
 
-#: event-chord-iterator.cc:56 output-property-music-iterator.cc:29
-#, c-format
-msgid "Junking event: `%s'"
-msgstr "Événement rebut: « %s »"
-
-#: extender-engraver.cc:143 extender-engraver.cc:153
+#: extender-engraver.cc:141 extender-engraver.cc:150
+#: lily/extender-engraver.cc:141 lily/extender-engraver.cc:150
+#: lily/extender-engraver.cc:140 lily/extender-engraver.cc:149
 msgid "unterminated extender"
 msgstr "prolongation non terminée"
 
-#: folded-repeat-iterator.cc:65
+#: folded-repeat-iterator.cc:65 lily/folded-repeat-iterator.cc:65
 msgid "no one to print a repeat brace"
 msgstr "aucun pour l'impression d'accolades répétées"
 
-#: glissando-engraver.cc:102
+#: glissando-engraver.cc:100 lily/glissando-engraver.cc:100
 msgid "Unterminated glissando."
 msgstr "glissando non terminée"
 
-#: global-context.cc:151
+#: global-context.cc:150 lily/global-context.cc:150 lily/global-context.cc:157
 #, c-format
 msgid "can't find `%s' context"
 msgstr "ne peut repérer le contexte « %s »"
 
-#: gourlay-breaking.cc:195
+#: gourlay-breaking.cc:199 lily/gourlay-breaking.cc:199
 #, c-format
 msgid "Optimal demerits: %f"
 msgstr "Démérites optionnels: %f"
 
-#: gourlay-breaking.cc:200
+#: gourlay-breaking.cc:204 lily/gourlay-breaking.cc:204
 msgid "No feasible line breaking found"
 msgstr "Aucun morcèlement de ligne faisable repéré"
 
-#: gregorian-ligature-engraver.cc:59
+#: gregorian-ligature-engraver.cc:59 lily/gregorian-ligature-engraver.cc:59
 #, c-format
 msgid "\\%s ignored"
 msgstr "\\%s ignoré"
 
-#: gregorian-ligature-engraver.cc:64
+#: gregorian-ligature-engraver.cc:64 lily/gregorian-ligature-engraver.cc:64
 #, c-format
 msgid "implied \\%s added"
 msgstr "\\%s implicite ajouté"
 
-#: hairpin.cc:98
+#: grob-interface.cc:73 lily/grob-interface.cc:73
+#, c-format
+msgid "Unknown interface `%s'"
+msgstr "Interface inconnue « %s »"
+
+#: grob-interface.cc:84 lily/grob-interface.cc:84
+#, c-format
+msgid "Grob `%s' has no interface for property `%s'"
+msgstr "Grob `%s' n'a pas d'interface pour la propriété `%s'"
+
+#: hairpin.cc:92 lily/hairpin.cc:107 lily/hairpin.cc:106
 msgid "decrescendo too small"
 msgstr "decrescendo trop petit"
 
-#: hairpin.cc:99
+#: hairpin.cc:93 lily/hairpin.cc:108 lily/hairpin.cc:107
 msgid "crescendo too small"
 msgstr "crescendo trop petit"
 
-#: horizontal-bracket-engraver.cc:57
+#: horizontal-bracket-engraver.cc:57 lily/horizontal-bracket-engraver.cc:57
 msgid "Don't have that many brackets."
 msgstr "N'a pas autant de crochets."
 
-#: horizontal-bracket-engraver.cc:66
+#: horizontal-bracket-engraver.cc:66 lily/horizontal-bracket-engraver.cc:66
 msgid "Conflicting note group events."
 msgstr "Événements de groupe de notes conflictuels."
 
-#: hyphen-engraver.cc:96
+#: hyphen-engraver.cc:96 lily/hyphen-engraver.cc:96
 msgid "removing unterminated hyphen"
 msgstr "retrait du trait d'union non terminé"
 
-#: hyphen-engraver.cc:110
+#: hyphen-engraver.cc:109 lily/hyphen-engraver.cc:109
 msgid "unterminated hyphen; removing"
 msgstr "retrait du trait d'union non terminé"
 
-#: includable-lexer.cc:50
+#: includable-lexer.cc:50 lily/includable-lexer.cc:50
 msgid "include files are not allowed"
 msgstr "fichiers d'inclusion ne sont pas permis"
 
-#: input.cc:99
+#: input.cc:99 lily/input.cc:99
 msgid "non fatal error: "
 msgstr "pas une erreur fatale: "
 
-#: input.cc:107 source-file.cc:147 source-file.cc:240
+#: input.cc:107 source-file.cc:135 source-file.cc:228 lily/input.cc:107
+#: lily/source-file.cc:135 lily/source-file.cc:228
 msgid "position unknown"
 msgstr "position inconnue"
 
-#: input-file-results.cc:78 source-file.cc:55
-#, c-format
-msgid "can't open file: `%s'"
-msgstr "ne peut ouvrir le fichier: « %s »"
-
-#: input-file-results.cc:142
-#, c-format
-msgid "Now processing `%s'"
-msgstr "« %s » maintenant en traitement"
-
-#: key-performer.cc:90
+#: key-performer.cc:90 lily/key-performer.cc:90
 msgid "FIXME: key change merge"
 msgstr "FIXME: changement de fusion de clés"
 
-#: kpath.cc:75
+#: kpath.cc:83 lily/kpath.cc:83
 #, c-format
 msgid "kpathsea can not find TFM file: `%s'"
 msgstr "Kpathsea ne peut repérer le fichier TFM: « %s »"
 
-#: ligature-engraver.cc:152
+#: kpath.cc:129 lily/kpath.cc:129
+#, c-format
+msgid "kpathsea can not find file: `%s'"
+msgstr "Kpathsea ne peut repérer le fichier: « %s »"
+
+#: ligature-engraver.cc:152 lily/ligature-engraver.cc:152
 msgid "can't find start of ligature"
 msgstr "ne peut repérer le début d'une ligature"
 
-#: ligature-engraver.cc:158
+#: ligature-engraver.cc:158 lily/ligature-engraver.cc:158
 msgid "no right bound"
 msgstr "pas de borne à droite"
 
-#: ligature-engraver.cc:184
+#: ligature-engraver.cc:184 lily/ligature-engraver.cc:184
 msgid "already have a ligature"
 msgstr "a déjà une ligature"
 
-#: ligature-engraver.cc:200
+#: ligature-engraver.cc:200 lily/ligature-engraver.cc:200
 msgid "no left bound"
 msgstr "pas de borne à gauche"
 
-#: ligature-engraver.cc:255
+#: ligature-engraver.cc:256 lily/ligature-engraver.cc:256
 msgid "unterminated ligature"
 msgstr "ligature non terminée"
 
-#: ligature-engraver.cc:279
+#: ligature-engraver.cc:280 lily/ligature-engraver.cc:280
 msgid "ignoring rest: ligature may not contain rest"
 msgstr "le reste est ignoré: la ligature ne peut contenir le reste"
 
-#: ligature-engraver.cc:280
+#: ligature-engraver.cc:281 lily/ligature-engraver.cc:281
 msgid "ligature was started here"
 msgstr "ligature a débuté ici"
 
-#: lily-guile.cc:88
+#: lily-guile.cc:91 lily/lily-guile.cc:91
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(chemin de chargement: « %s »)"
 
-#: lily-guile.cc:584
+#: lily-guile.cc:559 lily/lily-guile.cc:559 lily/lily-guile.cc:575
 #, c-format
 msgid "Can't find property type-check for `%s' (%s)."
 msgstr "Ne peut repérer la propriété de vérification de type pour « %s » (%s)."
 
-#: lily-guile.cc:587
+#: lily-guile.cc:562 lily/lily-guile.cc:562 lily/lily-guile.cc:578
 msgid "Perhaps you made a typing error?"
 msgstr "Peut-être avez-vous commis une erreur?"
 
-#: lily-guile.cc:593
+#: lily-guile.cc:568 lily/lily-guile.cc:568 lily/lily-guile.cc:584
 msgid "Doing assignment anyway."
 msgstr "Affectation faite malgré tout."
 
-#: lily-guile.cc:607
+#: lily-guile.cc:582 lily/lily-guile.cc:582 lily/lily-guile.cc:598
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr "Vérification de type pour « %s » a échoué; la valeur « %s » doit être de type « %s »"
 
-#: lookup.cc:169
-msgid "round filled box horizontal extent smaller than blot; decreasing blot"
-msgstr "largeur horizontale de la boîte plus petite que le diamètre du coin; réduction du diamètre du coin"
+#: lily-lexer.cc:220 lily/lily-lexer.cc:220 lily/lily-lexer.cc:224
+#, c-format
+msgid "Identifier name is a keyword: `%s'"
+msgstr "Le nom de l'identificateur est un mot clé: « %s »"
 
-#: lookup.cc:174
-msgid "round filled box vertical extent smaller than blot; decreasing blot"
-msgstr "hauteur verticale de la boîte plus petite que le diamètre du coin; réduction du diamètre du coin"
+#: lily-lexer.cc:237 lily/lily-lexer.cc:237 lily/lily-lexer.cc:241
+#, c-format
+msgid "error at EOF: %s"
+msgstr "erreur à la fin du fichier (EOF): %s"
+
+#: lily-parser.cc:97 lily/lily-parser.cc:97
+msgid "Parsing..."
+msgstr "Analyse..."
+
+#: lily-parser.cc:110 lily-parser.cc:143 lily/lily-parser.cc:110
+#: lily/lily-parser.cc:143
+msgid "Braces don't match"
+msgstr "Accolades non pairées"
+
+#: lily-parser.cc:267 lily/lily-parser.cc:267
+#, c-format
+msgid "can't find init file: `%s'"
+msgstr "ne peut repérer le fichier d'initialisation: « %s »"
+
+#: lily-parser.cc:284 lily/lily-parser.cc:284
+#, c-format
+msgid "Now processing `%s'"
+msgstr "« %s » maintenant en traitement"
 
-#: main.cc:100
+#: main.cc:91 lily/main.cc:91
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
 "License and you are welcome to change it and/or distribute copies of it\n"
-"under certain conditions.  Invoke as `lilypond-bin --warranty' for more\n"
+"under certain conditions.  Invoke as `lilypond --warranty' for more\n"
 "information.\n"
 msgstr ""
 "Ce logiciel est libre. Il est couvert par la licence GNU General Public License,\n"
-"et vous êtes libre de le modifier et/ou distribuer sous certaines conditions\n"
-"Invoquez « lilypond-bin  --warranty » pour plus de détails.\n"
+"et vous êtes libre de le modifier et/ou d'en distribuer des copies sous certaines conditions\n"
+"Invoquez « lilypond-bin  --warranty » pour plus d'informations.\n"
 
-#: main.cc:106
+#: main.cc:97 lily/main.cc:97
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -1120,47 +1151,63 @@ msgstr ""
 "la Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
 "USA.\n"
 
-#: main.cc:135
+#: main.cc:126 lily/main.cc:126
 msgid "EXPR"
 msgstr "EXPR"
 
-#: main.cc:136
-msgid "set options, use -e '(ly-option-usage)' for help"
-msgstr "options d'initialisation: utiliser -e '(ly-option-usage)' pour de l'aide"
+#: main.cc:127 lily/main.cc:127
+msgid "set options, use -e '(ly:option-usage)' for help"
+msgstr "options d'initialisation, utiliser -e '(ly:option-usage)' pour obtenir de l'aide"
 
-#: main.cc:139
-msgid "use output format EXT"
-msgstr "utiliser le format de sortie EXT"
+#: main.cc:130 lily/main.cc:130
+msgid "select back-end to use"
+msgstr "sélectionne le back-end à utiliser"
 
-#: main.cc:141
+#: main.cc:132 lily/main.cc:132
 msgid "FIELD"
 msgstr "CHAMP"
 
-#: main.cc:141
+#: main.cc:132 lily/main.cc:132
 msgid "write header field to BASENAME.FIELD"
 msgstr "écrire un champ d'en-tête dans BASENAME.FIELD"
 
-#: main.cc:142
+#: main.cc:133 lily/main.cc:133
 msgid "add DIR to search path"
 msgstr "ajouter le RÉPERTOIRE au chemin de recherche"
 
-#: main.cc:143
+#: main.cc:134 lily/main.cc:134
 msgid "use FILE as init file"
 msgstr "utiliser le FICHIER comme fichier d'initialisation"
 
-#: main.cc:144
-msgid "write Makefile dependencies"
-msgstr "écrire les dépendances pour Makefile"
+#: main.cc:137 lily/main.cc:137
+msgid "generate a preview"
+msgstr "générer une prévisualisation"
 
-#: main.cc:147
-msgid "prepend DIR to dependencies"
-msgstr "ajouter en préfixe le RÉPERTOIRE aux dépendances"
+#: main.cc:138 lily/main.cc:138
+msgid "generate PNG"
+msgstr "générer le PNG"
 
-#: main.cc:148
+#: main.cc:139 lily/main.cc:139
+msgid "generate PostScript"
+msgstr "générer le PostScript"
+
+#: main.cc:140 lily/main.cc:140
+msgid "generate DVI"
+msgstr "générer le DVI"
+
+#: main.cc:141 lily/main.cc:141
+msgid "generate PDF (default)"
+msgstr "générer le PDF (par défaut)"
+
+#: main.cc:142 lily/main.cc:142
+msgid "generate TeX"
+msgstr "générer le TeX"
+
+#: main.cc:143 lily/main.cc:143
 msgid "run in safe mode"
 msgstr "exécuter en mode sécuritaire"
 
-#: main.cc:171
+#: main.cc:166 lily/main.cc:166
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1170,573 +1217,852 @@ msgstr ""
 "%s et autres."
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:197
+#. No version number or newline here.  It confuses help2man.
+#. No version number or newline here.  It confuses help2man.
+#. No version number or newline here.  It confuses help2man.
+#. No version number or newline here.  It confuses help2man.
+#. No version number or newline here.  It confuses help2man.
+#. No version number or newline here.  It confuses help2man.
+#. No version number or newline here.  It confuses help2man.
+#: main.cc:192 lily/main.cc:192
 #, c-format
 msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr "Usage: %s [OPTIONS]... FICHIER..."
 
-#: main.cc:199
+#: main.cc:194 lily/main.cc:194
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Composer la musique et/ou jouer en format MIDI à partir du FICHIER"
 
-#: main.cc:201
+#: main.cc:196 lily/main.cc:196
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr "LilyPond produit une jolie notation musicale"
 
-#: main.cc:203
+#: main.cc:198 lily/main.cc:198
 #, c-format
 msgid "For more information, see %s"
 msgstr "Pour plus d'informations, voir %s"
 
-#: main.cc:369
+#: main.cc:410 lily/main.cc:410 lily/main.cc:412
 #, c-format
 msgid "This option is for developers only."
 msgstr "Cette option n'est disponible que pour les développeurs seulement."
 
-#: main.cc:370
+#: main.cc:411 lily/main.cc:411 lily/main.cc:413
 #, c-format
 msgid "Read the sources for more information."
 msgstr "Lire les fichiers source pour plus d'information."
 
-#: mensural-ligature.cc:183
-msgid "Mensural_ligature:unexpected case fall-through"
-msgstr "Mensural_ligature: cas inattendu sans interception"
-
-#: mensural-ligature.cc:193
-msgid "Mensural_ligature: (join_left == 0)"
-msgstr "Mensural_liguture: (joint_left == 0)"
-
 #: mensural-ligature-engraver.cc:248 mensural-ligature-engraver.cc:383
+#: lily/mensural-ligature-engraver.cc:248
+#: lily/mensural-ligature-engraver.cc:383
 msgid "unexpected case fall-through"
 msgstr "cas inattendu non intercepté"
 
-#: mensural-ligature-engraver.cc:259
+#: mensural-ligature-engraver.cc:259 lily/mensural-ligature-engraver.cc:259
 msgid "ligature with less than 2 heads -> skipping"
 msgstr "ligature avec moins que 2 tête -> escamoté"
 
-#: mensural-ligature-engraver.cc:279
+#: mensural-ligature-engraver.cc:279 lily/mensural-ligature-engraver.cc:279
 msgid "can not determine pitch of ligature primitive -> skipping"
 msgstr "ne peut déterminer le ton de la primitive de la ligature -> escamoté"
 
-#: mensural-ligature-engraver.cc:302
+#: mensural-ligature-engraver.cc:302 lily/mensural-ligature-engraver.cc:302
 msgid "prime interval within ligature -> skipping"
 msgstr "premier interval dans la ligature -> escamoté"
 
-#: mensural-ligature-engraver.cc:312
+#: mensural-ligature-engraver.cc:312 lily/mensural-ligature-engraver.cc:312
 msgid "mensural ligature: duration none of L, B, S -> skipping"
 msgstr "Mensural_ligature: aucune durée parmie L, B, S -> escomatée"
 
-#: midi-item.cc:153
+#: mensural-ligature.cc:161 lily/mensural-ligature.cc:161
+msgid "Mensural_ligature:unexpected case fall-through"
+msgstr "Mensural_ligature: cas inattendu sans interception"
+
+#: mensural-ligature.cc:171 lily/mensural-ligature.cc:171
+msgid "Mensural_ligature: (join_left == 0)"
+msgstr "Mensural_liguture: (joint_left == 0)"
+
+#: midi-item.cc:153 lily/midi-item.cc:153
 #, c-format
 msgid "no such MIDI instrument: `%s'"
 msgstr "pas un tel instrument MIDI: « %s »"
 
-#: midi-item.cc:257
+#: midi-item.cc:257 lily/midi-item.cc:257
 msgid "silly pitch"
 msgstr "ton bizarre"
 
-#: midi-item.cc:273
+#: midi-item.cc:273 lily/midi-item.cc:273
 #, c-format
 msgid "Experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr "Expérimental: mise au point fine temporaire (de %d cents) du canal."
 
-#: midi-stream.cc:40
+#: midi-stream.cc:40 lily/midi-stream.cc:40
 #, c-format
 msgid "could not write file: `%s'"
 msgstr "ne peut écrire dans le fichier: « %s »"
 
-#: my-lily-lexer.cc:185
-#, c-format
-msgid "Identifier name is a keyword: `%s'"
-msgstr "Le nom de l'identificateur est un mot clé: « %s »"
-
-#: my-lily-lexer.cc:207
-#, c-format
-msgid "error at EOF: %s"
-msgstr "erreur à la fin du fichier (EOF): %s"
-
-#: my-lily-parser.cc:45
-msgid "Parsing..."
-msgstr "Analyse..."
-
-#: my-lily-parser.cc:57
-msgid "Braces don't match"
-msgstr "Accolades non pairées"
-
 #.
 #. music for the softenon children?
 #.
-#: new-fingering-engraver.cc:155
+#.
+#. music for the softenon children?
+#.
+#.
+#. music for the softenon children?
+#.
+#.
+#. music for the softenon children?
+#.
+#.
+#. music for the softenon children?
+#.
+#.
+#. music for the softenon children?
+#.
+#.
+#. music for the softenon children?
+#.
+#.
+#. music for the softenon children?
+#.
+#: new-fingering-engraver.cc:155 lily/new-fingering-engraver.cc:155
 msgid "music for the martians."
 msgstr "musique pour les martiens."
 
-#: new-fingering-engraver.cc:235
+#: new-fingering-engraver.cc:235 lily/new-fingering-engraver.cc:235
 msgid "Fingerings are also not down?! Putting them down anyway."
 msgstr "Les doigtés ne sont pas aussi abaissées?! On les abaisse de toutes manières."
 
-#: new-lyric-combine-music-iterator.cc:172
+#: new-lyric-combine-music-iterator.cc:245
+#: lily/new-lyric-combine-music-iterator.cc:245
 #, c-format
-msgid "cannot find Voice: %s"
-msgstr "ne peut repérer les Voix: %s"
+msgid "cannot find Voice `%s'"
+msgstr "ne peut repérer les Voix %s"
 
-#: note-collision.cc:384
+#: note-collision.cc:413 lily/note-collision.cc:413
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "Trop de note-colonnes qui se heurtent. On les ignore."
 
-#: note-head.cc:139
+#: note-head.cc:45 lily/note-head.cc:45
 #, c-format
 msgid "note head `%s' not found"
 msgstr "tête de note `%s' non repérée"
 
-#: paper-def.cc:73
+#: paper-outputter.cc:116 lily/paper-outputter.cc:116
 #, c-format
-msgid "paper output to `%s'..."
-msgstr "sortie sur papier vers « %s »..."
+msgid "Paper output to `%s'..."
+msgstr "Sortie papier vers « %s »..."
 
-#: paper-score.cc:72
+#: paper-score.cc:68 lily/paper-score.cc:68
 #, c-format
 msgid "Element count %d (spanners %d) "
 msgstr "Éléments dénombrés %d (spanners %d) "
 
-#: paper-score.cc:76
+#: paper-score.cc:72 lily/paper-score.cc:72
 msgid "Preprocessing graphical objects..."
 msgstr "Pré-traitement des éléments graphiques..."
 
-#: parse-scm.cc:81
+#: parse-scm.cc:77 lily/parse-scm.cc:77 lily/parse-scm.cc:84
 msgid "GUILE signaled an error for the expression beginning here"
 msgstr "GUILE a signalé une erreur pour l'expression débutant ici"
 
-#: percent-repeat-engraver.cc:110
+#: percent-repeat-engraver.cc:110 lily/percent-repeat-engraver.cc:110
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "Ne sait comment traiter la répétition de pourcent de cette longueur."
 
-#: percent-repeat-engraver.cc:164
+#: percent-repeat-engraver.cc:170 lily/percent-repeat-engraver.cc:170
 msgid "unterminated percent repeat"
 msgstr "pourcentage de répétition non terminé"
 
-#: percent-repeat-iterator.cc:53
+#: percent-repeat-iterator.cc:53 lily/percent-repeat-iterator.cc:53
 msgid "no one to print a percent"
 msgstr "aucun pour l'impression de pourcent"
 
-#: performance.cc:51
+#: performance.cc:50 lily/performance.cc:50
 msgid "Track ... "
 msgstr "Piste ... "
 
-#: performance.cc:94
+#: performance.cc:93 lily/performance.cc:93
 msgid "Creator: "
 msgstr "Créateur: "
 
-#: performance.cc:114
+#: performance.cc:113 lily/performance.cc:113
 msgid "at "
 msgstr "à "
 
-#: performance.cc:172
+#: performance.cc:167 lily/performance.cc:167
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "Sortie MIDI vers « %s »..."
 
-#: phrasing-slur-engraver.cc:105
-msgid "unterminated phrasing slur"
-msgstr "phrase de liaison non terminée"
-
-#: phrasing-slur-engraver.cc:123
-msgid "can't find start of phrasing slur"
-msgstr "ne peut repérer le début d'une phrase de liaison"
+#: phrasing-slur-engraver.cc:99 slur-engraver.cc:114
+#: lily/phrasing-slur-engraver.cc:99 lily/slur-engraver.cc:114
+msgid "unterminated slur"
+msgstr "liaison non terminée"
 
-#: piano-pedal-engraver.cc:238
+#: piano-pedal-engraver.cc:237 lily/piano-pedal-engraver.cc:237
 msgid "Need 3 strings for piano pedals. No pedal made. "
 msgstr "Nécessite 3 cordes pour les pédales du piano. Aucune pédale n'a été créée."
 
-#: piano-pedal-engraver.cc:253 piano-pedal-engraver.cc:268
-#: piano-pedal-performer.cc:82
+#: piano-pedal-engraver.cc:252 piano-pedal-engraver.cc:267
+#: piano-pedal-performer.cc:82 lily/piano-pedal-engraver.cc:252
+#: lily/piano-pedal-engraver.cc:267 lily/piano-pedal-performer.cc:82
 #, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr "ne peut repérer le début de la pédale de piano: « %s »"
 
-#: piano-pedal-engraver.cc:321
+#: piano-pedal-engraver.cc:318 lily/piano-pedal-engraver.cc:318
 #, c-format
 msgid "can't find start of piano pedal bracket: `%s'"
 msgstr "ne peut repérer le début du crochet de la pédale de piano: « %s »"
 
-#: property-iterator.cc:94
+#: property-iterator.cc:94 lily/property-iterator.cc:94
 #, c-format
 msgid "Not a grob name, `%s'."
 msgstr "N'est pas un nom de type grob, « %s »"
 
-#: quote-iterator.cc:181
+#: quote-iterator.cc:108 lily/quote-iterator.cc:124 lily/quote-iterator.cc:125
+msgid "No events found for \\quote"
+msgstr "Aucun événement repéré pour \\quote"
+
+#: quote-iterator.cc:183 lily/quote-iterator.cc:199 lily/quote-iterator.cc:204
 #, c-format
 msgid "In quotation: junking event %s"
 msgstr "Entre guillemets: événement rebut « %s »"
 
-#: relative-octave-check.cc:25
+#: relative-octave-check.cc:25 lily/relative-octave-check.cc:25
 msgid "Failed octave check, got: "
 msgstr "échec de la vérification de l'octave, a obtenu: "
 
-#: rest.cc:137
-#, c-format
-msgid "rest `%s' not found"
-msgstr "reste « %s » non repéré"
-
-#: rest-collision.cc:145
+#: rest-collision.cc:132 lily/rest-collision.cc:132
 msgid "rest direction not set.  Cannot resolve collision."
 msgstr "le reste de la direction n'a pas été initialisé. Ne peut résoudre la collision."
 
-#: rest-collision.cc:193
+#: rest-collision.cc:144 rest-collision.cc:187 lily/rest-collision.cc:144
+#: lily/rest-collision.cc:187
 msgid "too many colliding rests"
 msgstr "trop de pauses en collision"
 
-#: scm-option.cc:52
+#: rest.cc:136 lily/rest.cc:136
+#, c-format
+msgid "rest `%s' not found"
+msgstr "reste « %s » non repéré"
+
+#: scm-option.cc:56 lily/scm-option.cc:56
 #, c-format
 msgid "lilypond -e EXPR means:"
 msgstr "lilypond -e EXPRESSION signifie:"
 
-#: scm-option.cc:54
+#: scm-option.cc:58 lily/scm-option.cc:58
 #, c-format
 msgid "  Evalute the Scheme EXPR before parsing any .ly files."
 msgstr "Evaluer l'EXPRESSION Scheme avant d'analyser les fichiers .ly"
 
-#: scm-option.cc:56
+#: scm-option.cc:60 lily/scm-option.cc:60
 #, c-format
 msgid "  Multiple -e options may be given, they will be evaluated sequentially."
 msgstr "Les options multiples -e peuvent être fournis, elles seront évaluées séquentiellement."
 
-#: scm-option.cc:58
+#: scm-option.cc:62 lily/scm-option.cc:62
 #, c-format
-msgid "  The function ly-set-option allows for access to some internal variables."
-msgstr "L'option de la fonction ly-set-option permet l'accès à quelques variables internes."
+msgid "  The function ly:set-option allows for access to some internal variables."
+msgstr "  La fonction ly:set-option permet l'accès de quelques variables internes."
 
-#: scm-option.cc:60
+#: scm-option.cc:64 lily/scm-option.cc:64
 #, c-format
-msgid "Usage: lilypond-bin -e \"(ly-set-option SYMBOL VAL)\""
-msgstr "Usage: lilypond-bin -e \"(ly-set-option SYMBOLE VALEUR)\""
+msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
+msgstr "Usage: lilypond -e \"(ly-set-option SYMBOLE VALEUR)\""
 
-#: scm-option.cc:62
+#: scm-option.cc:66 lily/scm-option.cc:66
 #, c-format
-msgid "Where SYMBOL VAL pair is any of:"
-msgstr "Où la paire SYMBOLE VALEUR peut prendre les options suivantes:"
-
-#: scm-option.cc:143 scm-option.cc:176
-msgid "Unknown internal option!"
-msgstr "Option interne inconnue!"
-
-#: score.cc:125
-msgid "Interpreting music... "
-msgstr "Interprétation en cours de la musique..."
+msgid "Use help as  SYMBOL to get online help."
+msgstr "Utiliser help comme SYMBOLE pour obtenir de l'aide en ligne."
 
-#: score.cc:135
-msgid "Need music in a score"
-msgstr "Musique manquante pour produire la feuille de musique"
-
-#: score.cc:145
+#: scm-option.cc:132 scm-option.cc:160 lily/scm-option.cc:132
+#: lily/scm-option.cc:160
 #, c-format
-msgid "elapsed time: %.2f seconds"
-msgstr "temps écoulé: %.2f seconds"
+msgid "No such internal option: %s"
+msgstr "Pas de telle option interne: %s"
 
-#: score-engraver.cc:103
+#: score-engraver.cc:103 score-engraver.cc:108 lily/score-engraver.cc:103
+#: lily/score-engraver.cc:108
 #, c-format
 msgid "can't find `%s'"
 msgstr "ne peut trouver « %s »"
 
-#: score-engraver.cc:104
-msgid "Fonts have not been installed properly.  Aborting"
-msgstr "Les fontes n'ont pas été installées correctement. Abandon"
+#: score-engraver.cc:104 lily/score-engraver.cc:104
+msgid "Music font has not been installed properly.  Aborting"
+msgstr "Les fontes Musicales n'ont pas été installées correctement. Abandon"
 
-#: score-engraver.cc:189
+#: score-engraver.cc:109 lily/score-engraver.cc:109
 #, c-format
-msgid "unbound spanner `%s'"
-msgstr "clef sans borne « %s »"
+msgid "Install the ec-mftraced package from %s. Aborting"
+msgstr "Installer le package ec-mftraced à partir de %s. Abandon"
+
+#: score.cc:100 score.cc:126 lily/score.cc:100 lily/score.cc:126
+#: lily/score.cc:102 lily/score.cc:128
+msgid "Need music in a score"
+msgstr "Musique manquante pour produire la feuille de musique"
+
+#: score.cc:116 lily/score.cc:116 lily/score.cc:118
+msgid "Interpreting music... "
+msgstr "Interprétation en cours de la musique..."
 
-#: script-engraver.cc:96
-msgid "Don't know how to interpret articulation:"
-msgstr "Ne sait comment interpréter l'articulation:"
+#: score.cc:137 lily/score.cc:137 lily/score.cc:139
+#, c-format
+msgid "elapsed time: %.2f seconds"
+msgstr "temps écoulé: %.2f seconds"
 
-#: script-engraver.cc:97
+#: score.cc:312 lily/score.cc:312 lily/score.cc:322
+msgid "Already have music in score"
+msgstr "Musique est déjà présente dans la feuille de musique"
+
+#: score.cc:313 lily/score.cc:313 lily/score.cc:323
+msgid "This is the previous music"
+msgstr "Ceci est la musique précédente"
+
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#: script-engraver.cc:102 lily/script-engraver.cc:102
+msgid "Do not know how to interpret articulation: "
+msgstr "Ne sait comment interpréter l'articulation: "
+
+#: script-engraver.cc:103 lily/script-engraver.cc:103
 msgid "Scheme encoding: "
 msgstr "Schème d'encodage: "
 
 #. this shouldn't happen, but let's continue anyway.
-#: separation-item.cc:53 separation-item.cc:97
+#. this shouldn't happen, but let's continue anyway.
+#. this shouldn't happen, but let's continue anyway.
+#. this shouldn't happen, but let's continue anyway.
+#. this shouldn't happen, but let's continue anyway.
+#. this shouldn't happen, but let's continue anyway.
+#. this shouldn't happen, but let's continue anyway.
+#. this shouldn't happen, but let's continue anyway.
+#: separation-item.cc:53 separation-item.cc:97 lily/separation-item.cc:53
+#: lily/separation-item.cc:97
 msgid "Separation_item:  I've been drinking too much"
-msgstr "Separation_item:  cela ne devrait pas se produire mais..."
+msgstr "Separation_item:  J'ai dû trop boire..."
 
-#: simple-spacer.cc:248
+#: simple-spacer.cc:489 lily/simple-spacer.cc:489 lily/simple-spacer.cc:484
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr "Pas de tension entre la colonne %d et la suivante"
 
-#: slur-engraver.cc:121
-msgid "unterminated slur"
-msgstr "liaison non terminée"
+#: slur-engraver.cc:124 lily/slur-engraver.cc:124
+msgid "No slur to end"
+msgstr "Aucune liaison pour terminer"
 
-#. How to shut up this warning, when Voice_devnull_engraver has
-#. eaten start event?
-#: slur-engraver.cc:139
-msgid "can't find start of slur"
-msgstr "ne peut repérer le début d'une liaison"
+#: source-file.cc:50 lily/source-file.cc:50
+#, c-format
+msgid "can't open file: `%s'"
+msgstr "ne peut ouvrir le fichier: « %s »"
 
-#: source-file.cc:68
+#: source-file.cc:63 lily/source-file.cc:63
 #, c-format
 msgid "Huh?  Got %d, expected %d characters"
 msgstr "Euh?  Obtenu %d caractères, on s'attendait à %d"
 
-#: spacing-spanner.cc:385
+#: spacing-spanner.cc:388 lily/spacing-spanner.cc:388
 #, c-format
 msgid "Global shortest duration is %s"
 msgstr "La plus courte durée globale est %s"
 
-#: spring-smob.cc:32
+#: stem-engraver.cc:88 lily/stem-engraver.cc:88
+msgid "tremolo duration is too long"
+msgstr "durée du tremolo est trop longue"
+
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#. FIXME:
+#: stem-engraver.cc:125 lily/stem-engraver.cc:125
 #, c-format
-msgid "#<spring smob d= %f>"
-msgstr "#<spring smob d= %f>"
+msgid "Adding note head to incompatible stem (type = %d)"
+msgstr "Ajout d'une note de tête à une hampe incompatible (type = %d)"
 
-#: stem.cc:119
+#: stem-engraver.cc:127 lily/stem-engraver.cc:127
+msgid "Don't you want polyphonic voices instead?"
+msgstr "Ne désirez-vous pas de voix polyphoniques à la place?"
+
+#: stem.cc:126 lily/stem.cc:126
 msgid "Weird stem size; check for narrow beams"
 msgstr "Taille bizarre de hampe de not; vérifier pour des faisceaux étroits"
 
-#: stem.cc:648
+#: stem.cc:575 lily/stem.cc:575 lily/stem.cc:574
 #, c-format
 msgid "flag `%s' not found"
 msgstr "fanion `%s' non repéré"
 
-#: stem.cc:661
+#: stem.cc:586 lily/stem.cc:586 lily/stem.cc:585
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr "force du fanion `%s' non repéré"
 
-#: stem-engraver.cc:97
-msgid "tremolo duration is too long"
-msgstr "durée du tremolo est trop longue"
-
-#: stem-engraver.cc:128
-#, c-format
-msgid "Adding note head to incompatible stem (type = %d)"
-msgstr "Ajout d'une note de tête à une hampe incompatible (type = %d)"
-
-#: stem-engraver.cc:129
-msgid "Don't you want polyphonic voices instead?"
-msgstr "Ne désirez-vous pas de voix polyphoniques à la place?"
-
-#: system.cc:181
+#: system.cc:134 lily/system.cc:134
 #, c-format
 msgid "Element count %d."
 msgstr "Éléments dénombrés %d."
 
-#: system.cc:335
+#: system.cc:272 lily/system.cc:272
 #, c-format
 msgid "Grob count %d"
 msgstr "Compteur grob %d"
 
-#: system.cc:349
+#: system.cc:286 lily/system.cc:286
 msgid "Calculating line breaks..."
 msgstr "Calcul des bris de lignes..."
 
-#: text-spanner-engraver.cc:65
+#: text-spanner-engraver.cc:63 lily/text-spanner-engraver.cc:63
 msgid "can't find start of text spanner"
 msgstr "ne peut repérer le début du texte de clef"
 
-#: text-spanner-engraver.cc:79
+#: text-spanner-engraver.cc:77 lily/text-spanner-engraver.cc:77
 msgid "already have a text spanner"
 msgstr "a déjà un texte de clef"
 
-#: text-spanner-engraver.cc:143
+#: text-spanner-engraver.cc:139 lily/text-spanner-engraver.cc:139
 msgid "unterminated text spanner"
 msgstr "texte de clef non terminé"
 
-#: tfm.cc:83
-#, c-format
-msgid "can't find ascii character: %d"
-msgstr "ne peut repérer le caractère ascii: %d"
-
 #. Not using ngettext's plural feature here, as this message is
 #. more of a programming error.
-#: tfm-reader.cc:108
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
+#: tfm-reader.cc:108 lily/tfm-reader.cc:108
 #, c-format
 msgid "TFM header of `%s' has only %u word (s)"
 msgstr "L'en-tête TFM de « %s » n'a seulement que %u mot(s)"
 
-#: tfm-reader.cc:142
+#: tfm-reader.cc:142 lily/tfm-reader.cc:142
 #, c-format
 msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
 msgstr "%s: le fichier TFM a %u paramètres qui sont plus que %u pouvant être traités"
 
-#: tie-engraver.cc:164
+#: tfm.cc:73 lily/tfm.cc:73
+#, c-format
+msgid "can't find ascii character: %d"
+msgstr "ne peut repérer le caractère ascii: %d"
+
+#: tie-engraver.cc:165 lily/tie-engraver.cc:173
 msgid "lonely tie"
 msgstr "lien isolé"
 
-#: time-scaled-music-iterator.cc:24
+#: time-scaled-music-iterator.cc:24 lily/time-scaled-music-iterator.cc:24
 msgid "no one to print a tuplet start bracket"
 msgstr "aucun pour l'impression d'un tuplet d'accolades de départ"
 
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#: time-signature.cc:95
-#, c-format
-msgid "time signature symbol `%s' not found; reverting to numbered style"
-msgstr "symbole de la signature du temps `%s' non repéré; retour à un style numéroté"
-
 #.
 #. Todo: should make typecheck?
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:57
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
+#: time-signature-engraver.cc:57 lily/time-signature-engraver.cc:57
 #, c-format
 msgid "Found strange time signature %d/%d."
 msgstr "Repérage d'étranges signature de temps %d/%d."
 
-#: translator-ctors.cc:53
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#: time-signature.cc:91 lily/time-signature.cc:91
+#, c-format
+msgid "time signature symbol `%s' not found; reverting to numbered style"
+msgstr "symbole de la signature du temps `%s' non repéré; retour à un style numéroté"
+
+#: translator-ctors.cc:53 lily/translator-ctors.cc:53
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr "traducteur inconnu: « %s »"
 
-#: translator-group.cc:108
-#, c-format
-msgid "can't find: `%s'"
-msgstr "ne peut trouver: « %s »"
+#: trill-spanner-engraver.cc:71 lily/trill-spanner-engraver.cc:71
+#, fuzzy
+msgid "can't find start of trill spanner"
+msgstr "ne peut repérer le début du texte de clef"
 
-#: tuplet-bracket.cc:448
-msgid "Killing tuplet bracket across linebreak."
-msgstr "Abandon des accolades de tuples à travers le bris de ligne."
+#: trill-spanner-engraver.cc:85 lily/trill-spanner-engraver.cc:85
+#, fuzzy
+msgid "already have a trill spanner"
+msgstr "a déjà un texte de clef"
 
-#: vaticana-ligature.cc:92
-msgid "ascending vaticana style flexa"
-msgstr "vaticana ascendant de style flexa"
+#: trill-spanner-engraver.cc:145 lily/trill-spanner-engraver.cc:145
+#, fuzzy
+msgid "unterminated trill spanner"
+msgstr "texte de clef non terminé"
 
-#: vaticana-ligature.cc:181
-msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
-msgstr "Vaticana_liguture: aucun joint (delta_pitch == 0)"
+#: tuplet-bracket.cc:448 lily/tuplet-bracket.cc:447
+msgid "Killing tuplet bracket across linebreak."
+msgstr "Abandon des accolades de tuples à travers le bris de ligne."
 
-#: vaticana-ligature-engraver.cc:342
+#: vaticana-ligature-engraver.cc:342 lily/vaticana-ligature-engraver.cc:342
 #, c-format
 msgid "ignored prefix (es) `%s' of this head according to restrictions of the selected ligature style"
 msgstr "préfixe ignoré (es) « %s » de la tête selon les restrictions du style de ligature sélectionné"
 
-#: vaticana-ligature-engraver.cc:572
+#: vaticana-ligature-engraver.cc:572 lily/vaticana-ligature-engraver.cc:572
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr=%ul"
 msgstr "Vaticana_ligature_engraver: fixé `spacing-increment = %f': ptr=%ul"
 
-#: volta-engraver.cc:140
+#: vaticana-ligature.cc:92 lily/vaticana-ligature.cc:92
+msgid "ascending vaticana style flexa"
+msgstr "vaticana ascendant de style flexa"
+
+#: vaticana-ligature.cc:181 lily/vaticana-ligature.cc:181
+msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
+msgstr "Vaticana_liguture: aucun joint (delta_pitch == 0)"
+
+#: volta-engraver.cc:141 lily/volta-engraver.cc:141
 msgid "No volta spanner to end"
 msgstr "Aucune clef volta pour terminer"
 
-#: volta-engraver.cc:151
+#: volta-engraver.cc:152 lily/volta-engraver.cc:152
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr "A déjà une clef volta. Arrêt de celle-ci prématurément."
 
-#: volta-engraver.cc:155
+#: volta-engraver.cc:156 lily/volta-engraver.cc:156
 msgid "Also have a stopped spanner.  Giving up."
 msgstr "A aussi une clef arrêtée. Abandon."
 
-#: parser.yy:114
+#: parser.yy:79
 msgid "Tag must be symbol or list of symbols."
 msgstr "L'étiquette doit être un symbole ou une liste de symboles."
 
-#: parser.yy:513
+#: parser.yy:534
 msgid "Identifier should have alphabetic characters only"
 msgstr "L'identificateur doit contenir des caractères alphabétiques seulement"
 
-#: parser.yy:776
+#: parser.yy:707
+msgid "Need \\bookpaper for bookpaper block."
+msgstr "A besoin de \\bookpaper pour un bloc de type bookpaper"
+
+#: parser.yy:844
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr "Plus d'alternatives que de répétitions. Rebuts dépasse la limite des alternatives."
 
-#: parser.yy:857 parser.yy:864
-msgid "\\applycontext takes function argument"
-msgstr "\\applycontext nécessite un argument de fonction"
+#: parser.yy:1016
+#, c-format
+msgid "Argument %d failed typecheck"
+msgstr "Argument %d a échoué la vérification de type"
 
-#: parser.yy:1014
-msgid "\\apply takes function argument"
-msgstr "\\apply nécessite un argument de fonction"
+#: parser.yy:1032
+msgid "Music head function should return Music object."
+msgstr "La fonction de tête Musical devrait retourner un objet Musical"
 
-#: parser.yy:1377
-msgid "Can't find music"
-msgstr "ne peut trouver la musique"
+#: parser.yy:1278
+msgid "Grob name should be alphanumeric"
+msgstr "Nom Grob devrait être alphanumérique"
 
-#: parser.yy:1495
+#: parser.yy:1639
 msgid "Second argument must be pitch list."
 msgstr "Le second argument doit être une liste de tons."
 
-#: parser.yy:1532 parser.yy:1537 parser.yy:2070
+#: parser.yy:1676 parser.yy:1681 parser.yy:2210
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "Doit être en mode Lyric pour les paroles"
 
-#: parser.yy:1622
+#: parser.yy:1766
 msgid "Expecting string as script definition"
 msgstr "Chaîne attendue comme définition de script"
 
-#: parser.yy:1829 parser.yy:1884
+#: parser.yy:1975 parser.yy:2025
 #, c-format
 msgid "not a duration: %d"
 msgstr "n'est pas une durée: %d"
 
-#: parser.yy:1980
+#: parser.yy:2120
 msgid "Have to be in Note mode for notes"
 msgstr "Doit être en mode Note pour les notes"
 
-#: parser.yy:2085
+#: parser.yy:2225
 msgid "Have to be in Chord mode for chords"
 msgstr "Doit être en mode Chord pour les choeurs"
 
-#: parser.yy:2232
+#: parser.yy:2377
 msgid "need integer number arg"
 msgstr "A besoin d'un nombre entier pour l'argument"
 
-#: parser.yy:2383
+#: parser.yy:2520
 msgid "Suspect duration found following this beam"
 msgstr "Durée suspecte repéré après ce faisceau"
 
-#: lexer.ll:184
+#: lexer.ll:194
 #, c-format
 msgid "input renamed to: `%s'"
 msgstr "l'entrée a été renommée à: « %s »"
 
+#: lexer.ll:202
+msgid "No quoted string found after \\encoding"
+msgstr "Aucun chaîne entre guillements n'a été répérée après \\encoding"
+
+#: lexer.ll:206
+msgid "No quoted string found after \\version"
+msgstr "Aucun chaîne entre guillements n'a été répérée après \\version"
+
 #: lexer.ll:210
+msgid "No quoted string found after \\renameinput"
+msgstr "Aucun chaîne entre guillements n'a été répérée après \\renameinput"
+
+#: lexer.ll:223
 msgid "EOF found inside a comment"
 msgstr "Fin de fichier (EOF) à l'intérieur du commentaire"
 
-#: lexer.ll:225
+#: lexer.ll:238
 msgid "\\maininput not allowed outside init files"
-msgstr "\\maininput n,est pas permis en dehord des fichiers init"
+msgstr "\\maininput n'est pas permis en dehord des fichiers d'initialisation"
 
-#: lexer.ll:249
+#: lexer.ll:264
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "identificateur erroné ou non défini: « %s »"
 
 #. backup rule
-#: lexer.ll:258
+#: lexer.ll:273
 msgid "Missing end quote"
 msgstr "Caractère de fin de citation manquant"
 
-#: lexer.ll:400
+#: lexer.ll:436
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr "Accolade repérée à la fin des paroles. Avez-vous oublié un espace?"
 
-#: lexer.ll:501
+#: lexer.ll:541
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr "Accolade repérée à la fin du marquage. Avez-vous oublié un espace?"
 
-#: lexer.ll:584
+#: lexer.ll:630
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "caractère invalide: « %c »"
 
-#: lexer.ll:656 lexer.ll:657
+#: lexer.ll:716 lexer.ll:717
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "chaîne d'échappement inconnue: « \\%s »"
 
-#: lexer.ll:754 lexer.ll:755
+#: lexer.ll:814 lexer.ll:815
 #, c-format
 msgid "Incorrect lilypond version: %s (%s, %s)"
 msgstr "Version de lilypond incorrecte: %s (%s, %s)"
 
-#: lexer.ll:755 lexer.ll:756
+#: lexer.ll:815 lexer.ll:816
 msgid "Consider updating the input with the convert-ly script"
 msgstr "Considérer la mise à jour de l'entrée à l'aide du script convert-ly"
 
+#: lily.scm:574
+#, lisp-format
+msgid "Converting to `~a'..."
+msgstr "Conversion à « ~a »..."
+
+#: lily.scm:596
+#, lisp-format
+msgid "Invoking `~a'..."
+msgstr "Invocation de « ~a »..."
+
+#: lily.scm:614
+msgid "error: failed files: "
+msgstr "Erreur: fichiers en échec: "
+
+#: lily/includable-lexer.cc:50
+msgid "include files are not allowed in safe mode"
+msgstr "fichiers d'inclusion ne sont pas permis en mode sécuritaire"
+
+#: lily/phrasing-slur-engraver.cc:116
+msgid "unterminated phrasing slur"
+msgstr "phrase de liaison non terminée"
+
+#: lily/score.cc:328
+msgid "Error found in this music expression. Ignoring it"
+msgstr "Erreur repérée dans l'expression musicale. Elle sera ignorée."
+
+#~ msgid "write Makefile dependencies for every input file"
+#~ msgstr "produire les dépendances pour Makefile concernant chaque fichier d'entrée"
+
+#~ msgid "make HTML file with links to all output"
+#~ msgstr "générer les fichier HTML avec des liens sur toutes les sorties"
+
+#~ msgid "do not generate PDF output"
+#~ msgstr "ne pas générer de sortie en format PDF"
+
+#~ msgid "do not generate PostScript output"
+#~ msgstr "ne pas générer de sortie en format PostScript"
+
+#~ msgid "use pdflatex to generate PDF output"
+#~ msgstr "utiliser pdflatex pour générer la sortie en format PDF"
+
+#~ msgid "invalid value: `%s'"
+#~ msgstr "valeur invalide: « %s »"
+
+#~ msgid "Writing HTML menu `%s'"
+#~ msgstr "Écriture du menu HTML « %s »"
+
+#~ msgid "Running LaTeX failed. Rerun with --verbose for a trace."
+#~ msgstr "Échec de l'exécution de LaTeX. Ré-exécuter avec --verbose pour obtenir une trace."
+
+#~ msgid "dependencies output to `%s'..."
+#~ msgstr "dépendances produites dans « %s »"
+
+#~ msgid "Process LilyPond snippets in hybrid HTML, LaTeX or texinfo document"
+#~ msgstr "Traiter les snippets LilyPond dans un document hybride en HTML, LaTeX ou texinfo"
+
+#~ msgid "DIM"
+#~ msgstr "DIM"
+
+#~ msgid "default fontsize for music.  DIM is assumed to be in points"
+#~ msgstr "taille de la fonte par défaut pour music. DIM est assumé être en points"
+
+#~ msgid "deprecated, use --default-music-fontsize"
+#~ msgstr "déprécié, utiliser --default-music-fontsize"
+
+#~ msgid "OPT"
+#~ msgstr "OPT"
+
+#~ msgid "pass OPT quoted to the lilypond command line"
+#~ msgstr "passer OPT entre guillemets à la ligne de commande à lilypond"
+
+#~ msgid "force fontsize for all inline lilypond. DIM is assumed to be in points"
+#~ msgstr "forcer la taille de fonte pour les enligne lilypond. DIM est assumé être en points"
+
+#~ msgid "deprecated, use --force-music-fontsize"
+#~ msgstr "déprécié, utilise --force-music-fontsize"
+
+#~ msgid "include path"
+#~ msgstr "inclure le chemin (path)"
+
+#~ msgid "write dependencies"
+#~ msgstr "écrire les dépendances"
+
+#~ msgid "PREF"
+#~ msgstr "PRÉF"
+
+#~ msgid "prepend PREF before each -M dependency"
+#~ msgstr "ajouter les PRÉFérence en préfixe pour chaque dépendance -M"
+
+#~ msgid "don't run lilypond"
+#~ msgstr "ne pas exécuter lilypond"
+
+#~ msgid "don't generate pictures"
+#~ msgstr "ne pas générer de photos"
+
+#~ msgid "strip all lilypond blocks from output"
+#~ msgstr "éliminer chaque bloc lilypond de la sortie"
+
+#~ msgid "filename main output file"
+#~ msgstr "nom du fichier principal de sortie"
+
+#~ msgid "where to place generated files"
+#~ msgstr "où seront placés les fichiers générés"
+
+#~ msgid "LaTeX failed."
+#~ msgstr "Échec de LaTeX"
+
+#~ msgid "round filled box horizontal extent smaller than blot; decreasing blot"
+#~ msgstr "largeur horizontale de la boîte plus petite que le diamètre du coin; réduction du diamètre du coin"
+
+#~ msgid "round filled box vertical extent smaller than blot; decreasing blot"
+#~ msgstr "hauteur verticale de la boîte plus petite que le diamètre du coin; réduction du diamètre du coin"
+
+#~ msgid "use output format EXT"
+#~ msgstr "utiliser le format de sortie EXT"
+
+#~ msgid "write Makefile dependencies"
+#~ msgstr "écrire les dépendances pour Makefile"
+
+#~ msgid "prepend DIR to dependencies"
+#~ msgstr "ajouter en préfixe le RÉPERTOIRE aux dépendances"
+
+#~ msgid "can't find start of phrasing slur"
+#~ msgstr "ne peut repérer le début d'une phrase de liaison"
+
+#~ msgid "Where SYMBOL VAL pair is any of:"
+#~ msgstr "Où la paire SYMBOLE VALEUR peut prendre les options suivantes:"
+
+#~ msgid "unbound spanner `%s'"
+#~ msgstr "clef sans borne « %s »"
+
+#~ msgid "can't find start of slur"
+#~ msgstr "ne peut repérer le début d'une liaison"
+
+#~ msgid "#<spring smob d= %f>"
+#~ msgstr "#<spring smob d= %f>"
+
+#~ msgid "\\apply takes function argument"
+#~ msgstr "\\apply nécessite un argument de fonction"
+
+#~ msgid "Can't find music"
+#~ msgstr "ne peut trouver la musique"
+
 #~ msgid " 1998--2003"
 #~ msgstr " 1998--2003"
 
@@ -1888,9 +2214,6 @@ msgstr "Consid
 #~ msgid "Can't evaluate Scheme in safe mode"
 #~ msgstr "Ne peut évaluer le Schème de façon sûre"
 
-#~ msgid "Run LilyPond using LaTeX for titling"
-#~ msgstr "Exécuter LilyPond en utilisant LaTeX pour le « titling »"
-
 #~ msgid "Fetch and rebuild from latest source package"
 #~ msgstr "Repérer et reconstruire depuis les sources du dernier package"