X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=po%2Flilypond.pot;h=5df28854d1e512146f672af3febc6bf50402e451;hb=47573b7ca53ef9efc57d5271182660ad1e264126;hp=206fe9d31c4e8af47fb6a9fc0f84c3d74fa76673;hpb=9876c67550ff67fc5d9f50fbf4769b00b40dcc15;p=lilypond.git

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 206fe9d31c..5df28854d1 100644
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -1,18 +1,17 @@
 # Translation of LilyPond.
-# Copyright (C) 2007 Han-Wen Nienhuys, Jan Nieuwenhuizen
-# This file is distributed under the same license as the lilypond package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Copyright (C) 2008 Han-Wen Nienhuys, Jan Nieuwenhuizen
+# This file is distributed under the same license as lilypond package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.11.20\n"
-"Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs"
-"POT-Creation-Date: 2007-02-25 22:11+0100\n"
+"Project-Id-Version: lilypond 2.11.57\n"
+"Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs\n"
+"POT-Creation-Date: 2008-08-23 18:49+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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: convertrules.py:12
@@ -29,178 +28,552 @@ msgstr ""
 msgid "%s has been replaced by %s"
 msgstr ""
 
-#: convertrules.py:2408
+#: convertrules.py:24 musicexp.py:16 convert-ly.py:48 lilypond-book.py:82
+#: warn.cc:48 input.cc:90
+#, c-format, python-format
+msgid "warning: %s"
+msgstr ""
+
+#: convertrules.py:49 convertrules.py:99
+msgid "\\header { key = concat + with + operator }"
+msgstr ""
+
+#: convertrules.py:58
+#, python-format
+msgid "deprecated %s"
+msgstr ""
+
+#: convertrules.py:70
+msgid "deprecated \\textstyle, new \\key syntax"
+msgstr ""
+
+#: convertrules.py:86 convertrules.py:1906 convertrules.py:2085
+#: convertrules.py:2237 convertrules.py:2567
+msgid "bump version for release"
+msgstr ""
+
+#: convertrules.py:103
+msgid "new \\header format"
+msgstr ""
+
+#: convertrules.py:132
+msgid "\\translator syntax"
+msgstr ""
+
+#: convertrules.py:184
+msgid "\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative"
+msgstr ""
+
+#: convertrules.py:216 convertrules.py:699 convertrules.py:1383
+#: convertrules.py:2379
+#, python-format
+msgid "deprecate %s"
+msgstr ""
+
+#: convertrules.py:290
+#, python-format
+msgid "deprecate %s "
+msgstr ""
+
+#: convertrules.py:319
+msgid "new \\notenames format"
+msgstr ""
+
+#: convertrules.py:337
+msgid "new tremolo format"
+msgstr ""
+
+#: convertrules.py:342
+msgid "Staff_margin_engraver deprecated, use Instrument_name_engraver"
+msgstr ""
+
+#: convertrules.py:395
+msgid "change property definiton case (eg. onevoice -> oneVoice)"
+msgstr ""
+
+#: convertrules.py:457
+msgid "new \\textscript markup text"
+msgstr ""
+
+#: convertrules.py:530
+#, python-format
+msgid "identifier names: %s"
+msgstr ""
+
+#: convertrules.py:569
+msgid "point-and-click argument changed to procedure."
+msgstr ""
+
+#: convertrules.py:611
+msgid "semicolons removed"
+msgstr ""
+
+#. 40 ?
+#: convertrules.py:654
+#, python-format
+msgid "%s property names"
+msgstr ""
+
+#: convertrules.py:724
+msgid "automaticMelismata turned on by default"
+msgstr ""
+
+#: convertrules.py:963 convertrules.py:1682 convertrules.py:1943
+#: convertrules.py:2190
+#, python-format
+msgid "remove %s"
+msgstr ""
+
+#: convertrules.py:1001 convertrules.py:1005
+msgid "cluster syntax"
+msgstr ""
+
+#: convertrules.py:1014
+msgid "new Pedal style syntax"
+msgstr ""
+
+#: convertrules.py:1273
+msgid ""
+"New relative mode,\n"
+"Postfix articulations, new text markup syntax, new chord syntax."
+msgstr ""
+
+#: convertrules.py:1286
+msgid "Remove - before articulation"
+msgstr ""
+
+#: convertrules.py:1324
+#, python-format
+msgid "%s misspelling"
+msgstr ""
+
+#: convertrules.py:1346
+msgid "Swap < > and << >>"
+msgstr ""
+
+#: convertrules.py:1349
+msgid "attempting automatic \\figures conversion.  Check results!"
+msgstr ""
+
+#: convertrules.py:1400
+msgid "Use Scheme code to construct arbitrary note events."
+msgstr ""
+
+#: convertrules.py:1407
+msgid ""
+"use symbolic constants for alterations,\n"
+"remove \\outputproperty, move ly:verbose into ly:get-option"
+msgstr ""
+
+#: convertrules.py:1432
+#, python-format
+msgid ""
+"\\outputproperty found,\n"
+"Please hand-edit, using\n"
+"\n"
+"  \\applyoutput #(outputproperty-compatibility %s '%s <GROB PROPERTY "
+"VALUE>)\n"
+"\n"
+"as a substitution text."
+msgstr ""
+
+#: convertrules.py:1446
+msgid ""
+"The alteration field of Scheme pitches was multiplied by 2\n"
+"to support quarter tone accidentals.  You must update the following "
+"constructs manually:\n"
+"\n"
+"* calls of ly:make-pitch and ly:pitch-alteration\n"
+"* keySignature settings made with \\property\n"
+msgstr ""
+
+#: convertrules.py:1493
+msgid "removal of automaticMelismata; use melismaBusyProperties instead."
+msgstr ""
+
+#: convertrules.py:1600
+msgid "\\partcombine syntax change to \\newpartcombine"
+msgstr ""
+
+#: convertrules.py:1628
+msgid ""
+"Drum notation changes, Removing \\chordmodifiers, \\notenames.\n"
+"Harmonic notes. Thread context removed. Lyrics context removed."
+msgstr ""
+
+#: convertrules.py:1632
+msgid "Drums found. Enclose drum notes in \\drummode"
+msgstr ""
+
+#: convertrules.py:1643 convertrules.py:1650 convertrules.py:1661
+#, python-format
+msgid ""
+"\n"
+"%s found. Check file manually!\n"
+msgstr ""
+
+#: convertrules.py:1643
+msgid "Drum notation"
+msgstr ""
+
+#: convertrules.py:1702
+msgid "new syntax for property settings:"
+msgstr ""
+
+#: convertrules.py:1728
+msgid "Property setting syntax in \\translator{ }"
+msgstr ""
+
+#: convertrules.py:1767
+msgid "Scheme grob function renaming"
+msgstr ""
+
+#: convertrules.py:1780
+#, python-format
+msgid "use %s"
+msgstr ""
+
+#: convertrules.py:1797
+msgid "More Scheme function renaming"
+msgstr ""
+
+#: convertrules.py:1925
+msgid ""
+"Page layout has been changed, using paper size and margins.\n"
+"textheight is no longer used.\n"
+msgstr ""
+
+#: convertrules.py:2011
+msgid ""
+"\\foo -> \\foomode (for chords, notes, etc.)\n"
+"fold \\new FooContext \\foomode into \\foo."
+msgstr ""
+
+#: convertrules.py:2049
+msgid ""
+"staff size should be changed at top-level\n"
+"with\n"
+"\n"
+"  #(set-global-staff-size <STAFF-HEIGHT-IN-POINT>)\n"
+"\n"
+msgstr ""
+
+#: convertrules.py:2069
+msgid "regularize other identifiers"
+msgstr ""
+
+#: convertrules.py:2137
+msgid "\\encoding: smart recode latin1..utf-8. Remove ly:point-and-click"
+msgstr ""
+
+#: convertrules.py:2150
 msgid "LilyPond source must be UTF-8"
 msgstr ""
 
-#: convertrules.py:2411
+#: convertrules.py:2153
 msgid "Try the texstrings backend"
 msgstr ""
 
-#: convertrules.py:2414
+#: convertrules.py:2156
 #, python-format
 msgid "Do something like: %s"
 msgstr ""
 
-#: convertrules.py:2417
+#: convertrules.py:2159
 msgid "Or save as UTF-8 in your editor"
 msgstr ""
 
-#: fontextract.py:26
+#: convertrules.py:2213
+msgid "warn about auto beam settings"
+msgstr ""
+
+#: convertrules.py:2218
+msgid "auto beam settings"
+msgstr ""
+
+#: convertrules.py:2220
+msgid ""
+"\n"
+"Auto beam settings must now specify each interesting moment in a measure\n"
+"explicitely; 1/4 is no longer multiplied to cover moments 1/2 and 3/4 too.\n"
+msgstr ""
+
+#: convertrules.py:2334
+msgid "verticalAlignmentChildCallback has been deprecated"
+msgstr ""
+
+#: convertrules.py:2338
+msgid "Remove callbacks property, deprecate XY-extent-callback."
+msgstr ""
+
+#: convertrules.py:2359
+msgid "Use grob closures iso. XY-offset-callbacks."
+msgstr ""
+
+#: convertrules.py:2421
+msgid "foobar -> foo-bar for \\paper, \\layout"
+msgstr ""
+
+#: convertrules.py:2531
+msgid "deprecate \\tempo in \\midi"
+msgstr ""
+
+#: convertrules.py:2578
+msgid "deprecate cautionary-style. Use AccidentalCautionary properties"
+msgstr ""
+
+#: convertrules.py:2591
+msgid "Rename accidental glyphs, use glyph-name-alist."
+msgstr ""
+
+#: convertrules.py:2646
+msgid "edge-text settings for TextSpanner."
+msgstr ""
+
+#: convertrules.py:2647
+#, python-format
+msgid ""
+"Use\n"
+"\n"
+"%s"
+msgstr ""
+
+#: convertrules.py:2686
+msgid "Use #'style not #'dash-fraction to select solid/dashed lines."
+msgstr ""
+
+#: convertrules.py:2692
+msgid "all settings related to dashed lines.\n"
+msgstr ""
+
+#: convertrules.py:2693
+msgid "Use \\override ... #'style = #'line for solid lines and\n"
+msgstr ""
+
+#: convertrules.py:2694
+msgid "\t\\override ... #'style = #'dashed-line for dashed lines."
+msgstr ""
+
+#: convertrules.py:2730
+msgid ""
+"metronomeMarkFormatter uses text markup as second argument,\n"
+"fret diagram properties moved to fret-diagram-details."
+msgstr ""
+
+#: convertrules.py:2735
+msgid "metronomeMarkFormatter got an additional text argument.\n"
+msgstr ""
+
+#: convertrules.py:2736
+#, python-format
+msgid ""
+"The function assigned to Score.metronomeMarkFunction now uses the signature\n"
+"%s"
+msgstr ""
+
+#: convertrules.py:2799
+msgid "\\put-adjacent argument order.\n"
+msgstr ""
+
+#: convertrules.py:2800
+msgid "Axis and direction now come before markups:\n"
+msgstr ""
+
+#: convertrules.py:2801
+msgid "\\put-adjacent axis dir markup markup."
+msgstr ""
+
+#: fontextract.py:25
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: fontextract.py:71
+#: fontextract.py:70
 #, python-format
 msgid "Extracted %s"
 msgstr ""
 
-#: fontextract.py:86
+#: fontextract.py:85
 #, python-format
 msgid "Writing fonts to %s"
 msgstr ""
 
-#: lilylib.py:85 lilylib.py:136
+#: lilylib.py:101 lilylib.py:152
 #, python-format
 msgid "Invoking `%s'"
 msgstr ""
 
-#: lilylib.py:87 lilylib.py:138
+#: lilylib.py:103 lilylib.py:154
 #, python-format
 msgid "Running %s..."
 msgstr ""
 
-#: lilylib.py:203
+#: lilylib.py:219
 #, python-format
 msgid "Usage: %s"
 msgstr ""
 
-#: abc2ly.py:1342 convert-ly.py:71 lilypond-book.py:110 midi2ly.py:858
+#: musicexp.py:585
+#, python-format
+msgid "unable to set the music %(music)s for the repeat %(repeat)s"
+msgstr ""
+
+#: musicexp.py:594
+msgid "encountered repeat without body"
+msgstr ""
+
+#: musicxml.py:13 convert-ly.py:51 lilypond-book.py:85 warn.cc:54 input.cc:96
+#: input.cc:104
+#, c-format, python-format
+msgid "error: %s"
+msgstr ""
+
+#: musicxml.py:298
+msgid "requested time signature, but time sig is unknown"
+msgstr ""
+
+#: musicxml.py:354
+#, python-format
+msgid "Encountered note at %s with %s duration (no <type> element):"
+msgstr ""
+
+#: musicxml.py:388
+#, python-format
+msgid "Unable to find instrument for ID=%s\n"
+msgstr ""
+
+#: abc2ly.py:1342 convert-ly.py:72 lilypond-book.py:109 midi2ly.py:846
 #, python-format
 msgid "%s [OPTION]... FILE"
 msgstr ""
 
-#: abc2ly.py:1344
+#: abc2ly.py:1343
 #, python-format
 msgid ""
 "abc2ly converts ABC music files (see\n"
-"%s) to LilyPond input."
+"%s) to LilyPond input.\n"
+msgstr ""
+
+#: abc2ly.py:1351 convert-ly.py:79 etf2ly.py:1190 lilypond-book.py:195
+#: midi2ly.py:882 musicxml2ly.py:2185 main.cc:161
+msgid "show version number and exit"
 msgstr ""
 
-#: abc2ly.py:1348 etf2ly.py:1184 midi2ly.py:874
+#: abc2ly.py:1355 convert-ly.py:83 etf2ly.py:1186 lilypond-book.py:126
+#: midi2ly.py:861 musicxml2ly.py:2167 main.cc:150
+msgid "show this help and exit"
+msgstr ""
+
+#: abc2ly.py:1357 etf2ly.py:1191 midi2ly.py:865
 msgid "write output to FILE"
 msgstr ""
 
-#: abc2ly.py:1350
-msgid "be strict about succes"
+#: abc2ly.py:1359
+msgid "be strict about success"
 msgstr ""
 
-#: abc2ly.py:1352
+#: abc2ly.py:1361
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
-#: abc2ly.py:1354 convert-ly.py:103 etf2ly.py:1192 lilypond-book.py:161
-#: midi2ly.py:900 musicxml2ly.py:506
+#: abc2ly.py:1363 convert-ly.py:120 etf2ly.py:1199 lilypond-book.py:202
+#: midi2ly.py:894 musicxml2ly.py:2240
 msgid "Report bugs via"
 msgstr ""
 
-#: convert-ly.py:32
+#: convert-ly.py:31
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
 "version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: convert-ly.py:34 lilypond-book.py:59
+#: convert-ly.py:33 lilypond-book.py:59
 msgid "Examples:"
 msgstr ""
 
-#: convert-ly.py:47 lilypond-book.py:83 warn.cc:48 input.cc:90
-#, c-format, python-format
-msgid "warning: %s"
-msgstr ""
-
-#: convert-ly.py:50 lilypond-book.py:86 warn.cc:54 input.cc:96 input.cc:104
-#, c-format, python-format
-msgid "error: %s"
-msgstr ""
-
-#: convert-ly.py:66 etf2ly.py:1174 lilypond-book.py:106 midi2ly.py:87
+#: convert-ly.py:67 etf2ly.py:1173 lilypond-book.py:105 midi2ly.py:77
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:67 etf2ly.py:1175 lilypond-book.py:107 midi2ly.py:88
+#: convert-ly.py:68 etf2ly.py:1174 lilypond-book.py:106 midi2ly.py:78
 msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:77 convert-ly.py:97
+#: convert-ly.py:87 convert-ly.py:114
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:79
+#: convert-ly.py:89
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:82
+#: convert-ly.py:92
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:85
+#: convert-ly.py:96
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:91
-msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:102
+#, python-format
+msgid "force updating \\version number to %s"
 msgstr ""
 
-#: convert-ly.py:96
-msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
+#: convert-ly.py:108
+#, python-format
+msgid "show rules [default: -f 0, -t %s]"
+msgstr ""
+
+#: convert-ly.py:113
+#, python-format
+msgid "convert to VERSION [default: %s]"
 msgstr ""
 
-#: convert-ly.py:144
+#: convert-ly.py:160
 msgid "Applying conversion: "
 msgstr ""
 
-#: convert-ly.py:157
+#: convert-ly.py:173
 msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:159
+#: convert-ly.py:175
 msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:181
+#: convert-ly.py:196
 #, python-format
 msgid "Processing `%s'... "
 msgstr ""
 
-#: convert-ly.py:268 relocate.cc:363 source-file.cc:54
+#: convert-ly.py:286 relocate.cc:362 source-file.cc:59
 #, c-format, python-format
 msgid "cannot open file: `%s'"
 msgstr ""
 
-#: convert-ly.py:275
+#: convert-ly.py:293
 #, python-format
 msgid "cannot determine version for `%s'.  Skipping"
 msgstr ""
 
-#: etf2ly.py:1180
+#: etf2ly.py:1179
 #, python-format
 msgid "%s [OPTION]... ETF-FILE"
 msgstr ""
 
-#: etf2ly.py:1182
+#: etf2ly.py:1180
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
 "Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
-"file."
+"file.\n"
 msgstr ""
 
-#: etf2ly.py:1185 midi2ly.py:875 musicxml2ly.py:499 main.cc:154 main.cc:159
+#: etf2ly.py:1192 midi2ly.py:866 musicxml2ly.py:2233 main.cc:154 main.cc:159
 msgid "FILE"
 msgstr ""
 
-#: etf2ly.py:1187 lilypond-book.py:158 midi2ly.py:888 main.cc:163
+#: etf2ly.py:1194 lilypond-book.py:198 midi2ly.py:883 main.cc:163
 msgid "show warranty and copyright"
 msgstr ""
 
@@ -218,17 +591,17 @@ msgstr ""
 msgid "Exiting (%d)..."
 msgstr ""
 
-#: lilypond-book.py:104
+#: lilypond-book.py:103
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr ""
 
-#: lilypond-book.py:114
+#: lilypond-book.py:113
 msgid "FILTER"
 msgstr ""
 
-#: lilypond-book.py:117
-msgid "pipe snippets through FILTER [convert-ly -n -]"
+#: lilypond-book.py:116
+msgid "pipe snippets through FILTER [default: `convert-ly -n -']"
 msgstr ""
 
 #: lilypond-book.py:120
@@ -236,253 +609,424 @@ msgid ""
 "use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr ""
 
-#: lilypond-book.py:123
+#: lilypond-book.py:121
+msgid "FORMAT"
+msgstr ""
+
+#: lilypond-book.py:128
 msgid "add DIR to include path"
 msgstr ""
 
-#: lilypond-book.py:124 lilypond-book.py:136 main.cc:153
+#: lilypond-book.py:129 lilypond-book.py:136 lilypond-book.py:154
+#: lilypond-book.py:160 lilypond-book.py:166 lilypond-book.py:172 main.cc:153
 msgid "DIR"
 msgstr ""
 
-#: lilypond-book.py:129
+#: lilypond-book.py:134
+msgid "format Texinfo output so that Info will look for images of music in DIR"
+msgstr ""
+
+#: lilypond-book.py:141
+msgid "run executable PROG instead of latex"
+msgstr ""
+
+#: lilypond-book.py:142
+msgid "PROG"
+msgstr ""
+
+#: lilypond-book.py:147
 msgid "PAD"
 msgstr ""
 
-#: lilypond-book.py:135
+#: lilypond-book.py:149
+msgid ""
+"pad left side of music to align music inspite of uneven bar numbers (in mm)"
+msgstr ""
+
+#: lilypond-book.py:153
 msgid "write output to DIR"
 msgstr ""
 
-#: lilypond-book.py:140
-msgid "COMMAND"
+#: lilypond-book.py:159
+msgid "do not fail if no lilypond output is found"
 msgstr ""
 
-#: lilypond-book.py:141
-msgid "process ly_files using COMMAND FILE..."
+#: lilypond-book.py:165
+msgid "do not fail if no PNG images are found for EPS files"
 msgstr ""
 
-#: lilypond-book.py:147
-msgid "Create PDF files for use with PDFTeX"
+#: lilypond-book.py:171
+msgid "write lily-XXX files to DIR, link into --output dir"
 msgstr ""
 
-#: lilypond-book.py:150
-msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
-"must use this with dvips -h INPUT.psfonts"
+#: lilypond-book.py:176
+msgid "COMMAND"
 msgstr ""
 
-#: lilypond-book.py:153 midi2ly.py:885 musicxml2ly.py:490 main.cc:162
+#: lilypond-book.py:177
+msgid "process ly_files using COMMAND FILE..."
+msgstr ""
+
+#: lilypond-book.py:184
+msgid "create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:187 midi2ly.py:876 musicxml2ly.py:2190 main.cc:162
 msgid "be verbose"
 msgstr ""
 
-#: lilypond-book.py:768
+#: lilypond-book.py:825
 #, python-format
 msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:999
+#: lilypond-book.py:1087
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:1002
+#: lilypond-book.py:1089
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:1006
+#: lilypond-book.py:1092
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:1009
+#: lilypond-book.py:1094
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:1028
+#: lilypond-book.py:1112
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1382
+#: lilypond-book.py:1538
 #, python-format
 msgid "Opening filter `%s'"
 msgstr ""
 
-#: lilypond-book.py:1399
+#: lilypond-book.py:1555
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilypond-book.py:1400
+#: lilypond-book.py:1556
 msgid "The error log is as follows:"
 msgstr ""
 
-#: lilypond-book.py:1472
+#: lilypond-book.py:1618
 msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1583
+#: lilypond-book.py:1718
 msgid "Writing snippets..."
 msgstr ""
 
-#: lilypond-book.py:1588
+#: lilypond-book.py:1724
 msgid "Processing..."
 msgstr ""
 
-#: lilypond-book.py:1592
+#: lilypond-book.py:1730
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1602
+#: lilypond-book.py:1764
 #, python-format
 msgid "cannot determine format for: %s"
 msgstr ""
 
-#: lilypond-book.py:1613
+#: lilypond-book.py:1775
 #, python-format
 msgid "%s is up to date."
 msgstr ""
 
-#: lilypond-book.py:1619
+#: lilypond-book.py:1789
 #, python-format
 msgid "Writing `%s'..."
 msgstr ""
 
-#: lilypond-book.py:1674
+#: lilypond-book.py:1847
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1678
+#: lilypond-book.py:1851
 #, python-format
 msgid "Reading %s..."
 msgstr ""
 
-#: lilypond-book.py:1697
+#: lilypond-book.py:1870
 msgid "Dissecting..."
 msgstr ""
 
-#: lilypond-book.py:1713
+#: lilypond-book.py:1886
 #, python-format
 msgid "Compiling %s..."
 msgstr ""
 
-#: lilypond-book.py:1722
+#: lilypond-book.py:1895
 #, python-format
 msgid "Processing include: %s"
 msgstr ""
 
-#: lilypond-book.py:1736
+#: lilypond-book.py:1907
 #, python-format
 msgid "Removing `%s'"
 msgstr ""
 
-#: lilypond-book.py:1769
-msgid "option --psfonts not used"
-msgstr ""
-
-#: lilypond-book.py:1770
-msgid "processing with dvips will have no fonts"
-msgstr ""
-
-#: lilypond-book.py:1773
-msgid "DVIPS usage:"
-msgstr ""
-
-#: lilypond-book.py:1829
-#, python-format
-msgid "Writing fonts to %s..."
-msgstr ""
-
-#: midi2ly.py:95 lily-library.scm:577 lily-library.scm:586
+#: midi2ly.py:85 lily-library.scm:620 lily-library.scm:629
 msgid "warning: "
 msgstr ""
 
-#: midi2ly.py:98 midi2ly.py:913
+#: midi2ly.py:88 midi2ly.py:907
 msgid "error: "
 msgstr ""
 
-#: midi2ly.py:99
-msgid "Exiting ... "
+#: midi2ly.py:89
+msgid "Exiting... "
 msgstr ""
 
-#: midi2ly.py:846
+#: midi2ly.py:834
 #, python-format
 msgid "%s output to `%s'..."
 msgstr ""
 
-#: midi2ly.py:860 musicxml2ly.py:486
+#: midi2ly.py:847
 #, python-format
-msgid "Convert %s to LilyPond input."
+msgid "Convert %s to LilyPond input.\n"
 msgstr ""
 
-#: midi2ly.py:864
+#: midi2ly.py:852
 msgid "print absolute pitches"
 msgstr ""
 
-#: midi2ly.py:866 midi2ly.py:878
+#: midi2ly.py:854 midi2ly.py:869
 msgid "DUR"
 msgstr ""
 
-#: midi2ly.py:867
+#: midi2ly.py:855
 msgid "quantise note durations on DUR"
 msgstr ""
 
-#: midi2ly.py:870
+#: midi2ly.py:858
 msgid "print explicit durations"
 msgstr ""
 
-#: midi2ly.py:871
+#: midi2ly.py:862
 msgid "set key: ALT=+sharps|-flats; MINOR=1"
 msgstr ""
 
-#: midi2ly.py:872
+#: midi2ly.py:863
 msgid "ALT[:MINOR]"
 msgstr ""
 
-#: midi2ly.py:877
+#: midi2ly.py:868
 msgid "quantise note starts on DUR"
 msgstr ""
 
-#: midi2ly.py:880
+#: midi2ly.py:871
 msgid "DUR*NUM/DEN"
 msgstr ""
 
-#: midi2ly.py:883
+#: midi2ly.py:874
 msgid "allow tuplet durations DUR*NUM/DEN"
 msgstr ""
 
-#: midi2ly.py:891
+#: midi2ly.py:886
 msgid "treat every text as a lyric"
 msgstr ""
 
-#: midi2ly.py:894
+#: midi2ly.py:889
 msgid "Examples"
 msgstr ""
 
-#: midi2ly.py:914
+#: midi2ly.py:908
 msgid "no files specified on command line."
 msgstr ""
 
-#: musicxml2ly.py:474
-msgid "musicxml2ly FILE.xml"
+#: musicxml2ly.py:213
+msgid ""
+"Encountered file created by Dolet 3.4 for Sibelius, containing wrong beaming "
+"information. All beaming information in the MusicXML file will be ignored"
 msgstr ""
 
-#: musicxml2ly.py:477
+#: musicxml2ly.py:229 musicxml2ly.py:231
+#, python-format
+msgid "Unprocessed PartGroupInfo %s encountered"
+msgstr ""
+
+#: musicxml2ly.py:471
 #, python-format
 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 `%s --warranty' for more\n"
-"information."
+"Encountered rational duration with denominator %s, unable to convert to "
+"lilypond duration"
+msgstr ""
+
+#: musicxml2ly.py:654
+#, python-format
+msgid "unknown mode %s, expecting 'major' or 'minor'"
+msgstr ""
+
+#: musicxml2ly.py:692
+#, python-format
+msgid "Encountered unprocessed marker %s\n"
+msgstr ""
+
+#: musicxml2ly.py:786
+#, python-format
+msgid "unknown span event %s"
+msgstr ""
+
+#: musicxml2ly.py:796
+#, python-format
+msgid "unknown span type %s for %s"
+msgstr ""
+
+#: musicxml2ly.py:1222
+msgid "Unknown metronome mark, ignoring"
+msgstr ""
+
+#. TODO: Implement the other (more complex) way for tempo marks!
+#: musicxml2ly.py:1227
+msgid ""
+"Metronome marks with complex relations (<metronome-note> in MusicXML) are "
+"not yet implemented."
+msgstr ""
+
+#: musicxml2ly.py:1383
+#, python-format
+msgid "Unable to convert chord type %s to lilypond."
 msgstr ""
 
-#: musicxml2ly.py:496
-msgid "Use lxml.etree; uses less memory and cpu time."
+#: musicxml2ly.py:1529
+#, python-format
+msgid "drum %s type unknown, please add to instrument_drumtype_dict"
+msgstr ""
+
+#: musicxml2ly.py:1533
+msgid "cannot find suitable event"
 msgstr ""
 
-#: musicxml2ly.py:504
-msgid "set output filename to FILE"
+#: musicxml2ly.py:1623
+#, python-format
+msgid "Negative skip %s"
+msgstr ""
+
+#: musicxml2ly.py:1775
+#, python-format
+msgid "Negative skip found: from %s to %s, difference is %s"
+msgstr ""
+
+#: musicxml2ly.py:1802
+#, python-format
+msgid "unexpected %s; expected %s or %s or %s"
+msgstr ""
+
+#: musicxml2ly.py:1912
+msgid "cannot have two simultaneous slurs"
+msgstr ""
+
+#: musicxml2ly.py:2050
+#, python-format
+msgid "cannot simultaneously have more than one mode: %s"
+msgstr ""
+
+#: musicxml2ly.py:2148
+msgid "Converting to LilyPond expressions..."
+msgstr ""
+
+#: musicxml2ly.py:2159
+msgid "musicxml2ly [OPTION]... FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:2161
+msgid ""
+"Convert MusicXML from FILE.xml to LilyPond input.\n"
+"If the given filename is -, musicxml2ly reads from the command line.\n"
+msgstr ""
+
+#: musicxml2ly.py:2171
+msgid ""
+"Copyright (c) 2005--2008 by\n"
+"    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
+"    Jan Nieuwenhuizen <janneke@gnu.org> and\n"
+"    Reinhold Kainhofer <reinhold@kainhofer.com>\n"
+msgstr ""
+
+#: musicxml2ly.py:2196
+msgid "use lxml.etree; uses less memory and cpu time"
+msgstr ""
+
+#: musicxml2ly.py:2202
+msgid "input file is a zip-compressed MusicXML file"
+msgstr ""
+
+#: musicxml2ly.py:2208
+msgid "convert pitches in relative mode (default)"
+msgstr ""
+
+#: musicxml2ly.py:2213
+msgid "convert pitches in absolute mode"
+msgstr ""
+
+#: musicxml2ly.py:2216
+msgid "LANG"
+msgstr ""
+
+#: musicxml2ly.py:2218
+msgid ""
+"use a different language file 'LANG.ly' and corresponding pitch names, e.g. "
+"'deutsch' for deutsch.ly"
+msgstr ""
+
+#: musicxml2ly.py:2224
+msgid "do not convert directions (^, _ or -) for articulations, dynamics, etc."
+msgstr ""
+
+#: musicxml2ly.py:2230
+msgid ""
+"do not convert beaming information, use lilypond's automatic beaming instead"
+msgstr ""
+
+#: musicxml2ly.py:2238
+msgid "set output filename to FILE, stdout if -"
+msgstr ""
+
+#: musicxml2ly.py:2320
+#, python-format
+msgid "unknown part in part-list: %s"
+msgstr ""
+
+#: musicxml2ly.py:2382
+msgid "Input is compressed, extracting raw MusicXML data from stdin"
+msgstr ""
+
+#: musicxml2ly.py:2385
+#, python-format
+msgid "Input file %s is compressed, extracting raw MusicXML data"
+msgstr ""
+
+#: musicxml2ly.py:2415
+msgid "Reading MusicXML from Standard input ..."
+msgstr ""
+
+#: musicxml2ly.py:2417
+#, python-format
+msgid "Reading MusicXML from %s ..."
+msgstr ""
+
+#: musicxml2ly.py:2450
+#, python-format
+msgid "Output to `%s'"
+msgstr ""
+
+#: musicxml2ly.py:2512
+#, python-format
+msgid "Unable to find input file %s"
 msgstr ""
 
 #: getopt-long.cc:140
@@ -505,7 +1049,7 @@ msgstr ""
 msgid "invalid argument `%s' to option `%s'"
 msgstr ""
 
-#: warn.cc:68 grob.cc:557 input.cc:82
+#: warn.cc:68 grob.cc:566 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr ""
@@ -514,37 +1058,31 @@ msgstr ""
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:247
+#: accidental-engraver.cc:249
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:274
+#: accidental-engraver.cc:276
 #, c-format
 msgid "ignoring unknown accidental rule: %s"
 msgstr ""
 
-#: accidental-engraver.cc:290
+#: accidental-engraver.cc:292
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:160
+#: accidental.cc:187
 #, c-format
 msgid "Could not find glyph-name for alteration %s"
 msgstr ""
 
-#: accidental.cc:175
+#: accidental.cc:202
 msgid "natural alteration glyph not found"
 msgstr ""
 
-#: align-interface.cc:191
-msgid ""
-"vertical alignment called before line-breaking.\n"
-"Only do cross-staff spanners with PianoStaff."
-msgstr ""
-
-#: align-interface.cc:324
+#: align-interface.cc:305
 msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
@@ -574,11 +1112,7 @@ msgstr ""
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:109
-msgid "tried to calculate pure-height at a non-breakpoint"
-msgstr ""
-
-#: axis-group-interface.cc:449
+#: axis-group-interface.cc:532
 msgid "an outside-staff object should have a direction, defaulting to up"
 msgstr ""
 
@@ -607,7 +1141,7 @@ msgstr ""
 msgid "beam was started here"
 msgstr ""
 
-#: beam-quanting.cc:314
+#: beam-quanting.cc:307
 msgid "no feasible beam position"
 msgstr ""
 
@@ -615,7 +1149,7 @@ msgstr ""
 msgid "removing beam with no stems"
 msgstr ""
 
-#: beam.cc:1035
+#: beam.cc:1078
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
@@ -672,7 +1206,7 @@ msgstr ""
 msgid "unknown cluster style `%s'"
 msgstr ""
 
-#: cluster.cc:135
+#: cluster.cc:147
 msgid "junking empty cluster"
 msgstr ""
 
@@ -682,7 +1216,7 @@ msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
 
 #. if we get to here, just put everything on one line
-#: constrained-breaking.cc:167 constrained-breaking.cc:184
+#: constrained-breaking.cc:176 constrained-breaking.cc:193
 msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 
@@ -691,26 +1225,26 @@ msgstr ""
 msgid "program has no such type: `%s'"
 msgstr ""
 
-#: context-property.cc:30
+#: context-property.cc:32
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
-#: context.cc:144
+#: context.cc:139
 #, c-format
 msgid "cannot find or create new `%s'"
 msgstr ""
 
-#: context.cc:206
+#: context.cc:197
 #, c-format
 msgid "cannot find or create `%s' called `%s'"
 msgstr ""
 
-#: context.cc:268
+#: context.cc:259
 #, c-format
 msgid "Invalid CreateContext event: Cannot create %s context"
 msgstr ""
 
-#: context.cc:380
+#: context.cc:390
 #, c-format
 msgid "cannot find or create: `%s'"
 msgstr ""
@@ -734,23 +1268,23 @@ msgstr ""
 msgid "dot `%s' not found"
 msgstr ""
 
-#: dynamic-engraver.cc:184
+#: dynamic-engraver.cc:186
 msgid "cannot find start of (de)crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:193
+#: dynamic-engraver.cc:195
 msgid "already have a decrescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:195
+#: dynamic-engraver.cc:197
 msgid "already have a crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:198
+#: dynamic-engraver.cc:200
 msgid "cresc starts here"
 msgstr ""
 
-#: dynamic-engraver.cc:327
+#: dynamic-engraver.cc:328
 msgid "unterminated (de)crescendo"
 msgstr ""
 
@@ -767,25 +1301,25 @@ msgstr ""
 msgid "Rebuilding FontConfig cache %s, this may take a while..."
 msgstr ""
 
-#: font-config.cc:55
+#: font-config.cc:57
 #, c-format
 msgid "failed adding font directory: %s"
 msgstr ""
 
-#: font-config.cc:57
+#: font-config.cc:59
 #, c-format
 msgid "adding font directory: %s"
 msgstr ""
 
-#: general-scheme.cc:198
+#: general-scheme.cc:202
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:199
+#: general-scheme.cc:203
 msgid "setting to zero"
 msgstr ""
 
-#: general-scheme.cc:417 output-ps.scm:61
+#: general-scheme.cc:422 output-ps.scm:62
 msgid "Found infinity or nan in output. Substituting 0.0"
 msgstr ""
 
@@ -793,15 +1327,15 @@ msgstr ""
 msgid "unterminated glissando"
 msgstr ""
 
-#: global-context-scheme.cc:87 global-context-scheme.cc:105
+#: global-context-scheme.cc:85 global-context-scheme.cc:103
 msgid "no music found in score"
 msgstr ""
 
-#: global-context-scheme.cc:95
+#: global-context-scheme.cc:93
 msgid "Interpreting music... "
 msgstr ""
 
-#: global-context-scheme.cc:118
+#: global-context-scheme.cc:116
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr ""
@@ -817,12 +1351,12 @@ msgid "implied \\%s added"
 msgstr ""
 
 #. ligature may not start with 2nd head of pes or flexa
-#: gregorian-ligature-engraver.cc:212
+#: gregorian-ligature-engraver.cc:213
 msgid "cannot apply `\\~' on first head of ligature"
 msgstr ""
 
 #. (pitch == prev_pitch)
-#: gregorian-ligature-engraver.cc:224
+#: gregorian-ligature-engraver.cc:225
 msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
@@ -841,7 +1375,7 @@ msgstr ""
 msgid "%d: %s"
 msgstr ""
 
-#: grob-property.cc:174
+#: grob-property.cc:173
 #, c-format
 msgid "cyclic dependency: calculation-in-progress encountered for #'%s (%s)"
 msgstr ""
@@ -850,19 +1384,15 @@ msgstr ""
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:187
+#: hairpin.cc:186
 msgid "decrescendo too small"
 msgstr ""
 
-#: hairpin.cc:188
-msgid "crescendo too small"
-msgstr ""
-
-#: horizontal-bracket-engraver.cc:59
+#: horizontal-bracket-engraver.cc:68
 msgid "do not have that many brackets"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:68
+#: horizontal-bracket-engraver.cc:77
 msgid "conflicting note group events"
 msgstr ""
 
@@ -874,39 +1404,39 @@ msgstr ""
 msgid "unterminated hyphen; removing"
 msgstr ""
 
-#: includable-lexer.cc:53 lily-guile.cc:76 lily-parser-scheme.cc:117
+#: includable-lexer.cc:53 lily-guile.cc:76 lily-parser-scheme.cc:110
 #, c-format
 msgid "cannot find file: `%s'"
 msgstr ""
 
-#: includable-lexer.cc:55 lily-parser-scheme.cc:108
+#: includable-lexer.cc:55 lily-parser-scheme.cc:101
 #, c-format
 msgid "(search path: `%s')"
 msgstr ""
 
-#: input.cc:112 source-file.cc:168 source-file.cc:183
+#: input.cc:112 source-file.cc:173 source-file.cc:188
 msgid "position unknown"
 msgstr ""
 
-#: key-signature-interface.cc:71
+#: key-signature-interface.cc:74
 #, c-format
 msgid "No glyph found for alteration: %s"
 msgstr ""
 
-#: key-signature-interface.cc:81
+#: key-signature-interface.cc:84
 msgid "alteration not found"
 msgstr ""
 
-#: ligature-engraver.cc:93
+#: ligature-bracket-engraver.cc:62 ligature-engraver.cc:93
 msgid "cannot find start of ligature"
 msgstr ""
 
-#: ligature-engraver.cc:98
-msgid "no right bound"
+#: ligature-bracket-engraver.cc:75 ligature-engraver.cc:120
+msgid "already have a ligature"
 msgstr ""
 
-#: ligature-engraver.cc:120
-msgid "already have a ligature"
+#: ligature-engraver.cc:98
+msgid "no right bound"
 msgstr ""
 
 #: ligature-engraver.cc:129
@@ -930,34 +1460,34 @@ msgstr ""
 msgid "(load path: `%s')"
 msgstr ""
 
-#: lily-guile.cc:438
+#: lily-guile.cc:428
 #, c-format
 msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:441
+#: lily-guile.cc:431
 msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:448
+#: lily-guile.cc:438
 msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:460
+#: lily-guile.cc:450
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:250
+#: lily-lexer.cc:251
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: lily-lexer.cc:269
+#: lily-lexer.cc:270
 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr ""
 
-#: lily-lexer.cc:284
+#: lily-lexer.cc:285
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
@@ -967,17 +1497,17 @@ msgstr ""
 msgid "deprecated function called: %s"
 msgstr ""
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:83
 #, c-format
 msgid "Changing working directory to: `%s'"
 msgstr ""
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:100
 #, c-format
 msgid "cannot find init file: `%s'"
 msgstr ""
 
-#: lily-parser-scheme.cc:126
+#: lily-parser-scheme.cc:119
 #, c-format
 msgid "Processing `%s'"
 msgstr ""
@@ -990,12 +1520,12 @@ msgstr ""
 msgid "braces do not match"
 msgstr ""
 
-#: lyric-combine-music-iterator.cc:327
+#: lyric-combine-music-iterator.cc:329
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr ""
 
-#: lyric-engraver.cc:158
+#: lyric-engraver.cc:162
 msgid "Lyric syllable does not have note. Use \\lyricsto or associatedVoice."
 msgstr ""
 
@@ -1073,10 +1603,6 @@ msgstr ""
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:150
-msgid "show this help and exit"
-msgstr ""
-
 #: main.cc:151
 msgid "FIELD"
 msgstr ""
@@ -1113,11 +1639,7 @@ msgstr ""
 msgid "relocate using directory of lilypond program"
 msgstr ""
 
-#: main.cc:161
-msgid "show version number and exit"
-msgstr ""
-
-#: main.cc:203
+#: main.cc:226
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1125,92 +1647,92 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:230
+#: main.cc:254
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
-#: main.cc:232
+#: main.cc:256
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
-#: main.cc:234
+#: main.cc:258
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:236
+#: main.cc:260
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:238
+#: main.cc:262
 #, c-format
 msgid "Options:"
 msgstr ""
 
-#: main.cc:242
+#: main.cc:266
 #, c-format
 msgid "Report bugs via %s"
 msgstr ""
 
-#: main.cc:288
+#: main.cc:312
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:302
+#: main.cc:326
 #, c-format
 msgid "no such user: %s"
 msgstr ""
 
-#: main.cc:304
+#: main.cc:328
 #, c-format
 msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:319
+#: main.cc:343
 #, c-format
 msgid "no such group: %s"
 msgstr ""
 
-#: main.cc:321
+#: main.cc:345
 #, c-format
 msgid "cannot get group id from group name: %s: %s"
 msgstr ""
 
-#: main.cc:329
+#: main.cc:353
 #, c-format
 msgid "cannot chroot to: %s: %s"
 msgstr ""
 
-#: main.cc:336
+#: main.cc:360
 #, c-format
 msgid "cannot change group id to: %d: %s"
 msgstr ""
 
-#: main.cc:342
+#: main.cc:366
 #, c-format
 msgid "cannot change user id to: %d: %s"
 msgstr ""
 
-#: main.cc:348
+#: main.cc:372
 #, c-format
 msgid "cannot change working directory to: %s: %s"
 msgstr ""
 
-#: main.cc:594
+#: main.cc:619
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
 
 #. FIXME: constant error message.
-#: mark-engraver.cc:154
+#: mark-engraver.cc:129
 msgid "rehearsalMark must have integer value"
 msgstr ""
 
-#: mark-engraver.cc:160
+#: mark-engraver.cc:135
 msgid "mark label must be a markup object"
 msgstr ""
 
@@ -1279,6 +1801,10 @@ msgstr ""
 msgid "cannot write to file: `%s'"
 msgstr ""
 
+#: minimal-page-breaking.cc:42
+msgid "Computing page breaks..."
+msgstr ""
+
 #: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
@@ -1293,6 +1819,13 @@ msgstr ""
 msgid "transposition by %s makes alteration larger than double"
 msgstr ""
 
+#: new-dynamic-engraver.cc:128
+#, c-format
+msgid ""
+"unknown crescendo style: %s\n"
+"defaulting to hairpin."
+msgstr ""
+
 #: new-fingering-engraver.cc:96
 msgid "cannot add text scripts to individual note heads"
 msgstr ""
@@ -1305,7 +1838,7 @@ msgstr ""
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:464
+#: note-collision.cc:484
 msgid "ignoring too many clashing note columns"
 msgstr ""
 
@@ -1318,7 +1851,7 @@ msgstr ""
 msgid "none of note heads `%s' or `%s' found"
 msgstr ""
 
-#: note-heads-engraver.cc:61
+#: note-heads-engraver.cc:64
 msgid "NoteEvent without pitch"
 msgstr ""
 
@@ -1357,47 +1890,67 @@ msgstr ""
 msgid "FT_Get_Glyph_Name () error: %s"
 msgstr ""
 
-#: page-turn-page-breaking.cc:162
+#. find out the ideal number of pages
+#: optimal-page-breaking.cc:56
+msgid "Finding the ideal number of pages..."
+msgstr ""
+
+#: optimal-page-breaking.cc:76
+msgid "Fitting music on 1 page..."
+msgstr ""
+
+#: optimal-page-breaking.cc:78
+#, c-format
+msgid "Fitting music on %d pages..."
+msgstr ""
+
+#: optimal-page-breaking.cc:80
+#, c-format
+msgid "Fitting music on %d or %d pages..."
+msgstr ""
+
+#: optimal-page-breaking.cc:157 page-turn-page-breaking.cc:226
+#: paper-score.cc:146
+msgid "Drawing systems..."
+msgstr ""
+
+#: page-turn-page-breaking.cc:146
 #, c-format
 msgid "page-turn-page-breaking: breaking from %d to %d"
 msgstr ""
 
-#: page-turn-page-breaking.cc:213
+#: page-turn-page-breaking.cc:195
 msgid ""
 "cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:226
+#: page-turn-page-breaking.cc:208
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:244 paper-score.cc:146
-msgid "Drawing systems..."
-msgstr ""
-
-#: page-turn-page-breaking.cc:293
+#: page-turn-page-breaking.cc:275
 #, c-format
 msgid "break starting at page %d"
 msgstr ""
 
-#: page-turn-page-breaking.cc:294
+#: page-turn-page-breaking.cc:276
 #, c-format
 msgid "\tdemerits: %f"
 msgstr ""
 
-#: page-turn-page-breaking.cc:295
+#: page-turn-page-breaking.cc:277
 #, c-format
 msgid "\tsystem count: %d"
 msgstr ""
 
-#: page-turn-page-breaking.cc:296
+#: page-turn-page-breaking.cc:278
 #, c-format
 msgid "\tpage count: %d"
 msgstr ""
 
-#: page-turn-page-breaking.cc:297
+#: page-turn-page-breaking.cc:279
 #, c-format
 msgid "\tprevious break: %d"
 msgstr ""
@@ -1418,7 +1971,7 @@ msgstr ""
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
-#: paper-column-engraver.cc:199
+#: paper-column-engraver.cc:221
 msgid ""
 "forced break was overridden by some other event, should you be using bar "
 "checks?"
@@ -1442,7 +1995,7 @@ msgstr ""
 msgid "Preprocessing graphical objects..."
 msgstr ""
 
-#: parse-scm.cc:87
+#: parse-scm.cc:93
 msgid "GUILE signaled an error for the expression beginning here"
 msgstr ""
 
@@ -1467,27 +2020,27 @@ msgstr ""
 msgid "MIDI output to `%s'..."
 msgstr ""
 
-#: phrasing-slur-engraver.cc:146
+#: phrasing-slur-engraver.cc:139
 msgid "unterminated phrasing slur"
 msgstr ""
 
-#: piano-pedal-engraver.cc:286
+#: piano-pedal-engraver.cc:287
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
+#: piano-pedal-engraver.cc:302 piano-pedal-engraver.cc:313
 #: piano-pedal-performer.cc:93
 #, c-format
 msgid "cannot find start of piano pedal: `%s'"
 msgstr ""
 
-#: piano-pedal-engraver.cc:347
+#: piano-pedal-engraver.cc:348
 #, c-format
 msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr ""
 
-#: program-option-scheme.cc:207
+#: program-option-scheme.cc:215
 #, c-format
 msgid "no such internal option: %s"
 msgstr ""
@@ -1557,12 +2110,12 @@ msgstr ""
 msgid "LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR"
 msgstr ""
 
-#: relocate.cc:357
+#: relocate.cc:356
 #, c-format
 msgid "Relocation file: %s"
 msgstr ""
 
-#: relocate.cc:393
+#: relocate.cc:392
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
@@ -1575,7 +2128,7 @@ msgstr ""
 msgid "too many colliding rests"
 msgstr ""
 
-#: rest.cc:132
+#: rest.cc:148
 #, c-format
 msgid "rest `%s' not found"
 msgstr ""
@@ -1632,17 +2185,17 @@ msgstr ""
 msgid "cannot end slur"
 msgstr ""
 
-#: slur.cc:355
+#: slur.cc:357
 #, c-format
 msgid "Ignoring grob for slur: %s. avoid-slur not set?"
 msgstr ""
 
-#: source-file.cc:74
+#: source-file.cc:79
 #, c-format
 msgid "expected to read %d characters, got %d"
 msgstr ""
 
-#: spaceable-grob.cc:117
+#: spaceable-grob.cc:83
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
@@ -1669,39 +2222,39 @@ msgstr ""
 msgid "weird stem size, check for narrow beams"
 msgstr ""
 
-#: stem.cc:618
+#: stem.cc:627
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:629
+#: stem.cc:638
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:180
+#: system.cc:178
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:266
+#: system.cc:270
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: text-spanner-engraver.cc:60
+#: text-spanner-engraver.cc:62
 msgid "cannot find start of text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:75
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:118
+#: text-spanner-engraver.cc:121
 msgid "unterminated text spanner"
 msgstr ""
 
-#: tie-engraver.cc:267
+#: tie-engraver.cc:262
 msgid "lonely tie"
 msgstr ""
 
@@ -1722,7 +2275,7 @@ msgstr ""
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
 
-#: translator-ctors.cc:52
+#: translator-ctors.cc:53
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr ""
@@ -1737,21 +2290,21 @@ msgstr ""
 msgid "cannot find: `%s'"
 msgstr ""
 
-#: translator.cc:346
+#: translator.cc:347
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:347
+#: translator.cc:348
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:85
 msgid "cannot find start of trill spanner"
 msgstr ""
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:98
 msgid "already have a trill spanner"
 msgstr ""
 
@@ -1759,14 +2312,14 @@ msgstr ""
 msgid "No tuplet to end"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:388
+#: vaticana-ligature-engraver.cc:389
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:714
+#: vaticana-ligature-engraver.cc:718
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
@@ -1784,135 +2337,135 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:100
 msgid "cannot end volta spanner"
 msgstr ""
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:110
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:114
 msgid "also already have an ended spanner"
 msgstr ""
 
-#: volta-engraver.cc:158
+#: volta-engraver.cc:115
 msgid "giving up"
 msgstr ""
 
-#: parser.yy:704
+#: parser.yy:729
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:753
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1187
+#: parser.yy:1224
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1485
+#: parser.yy:1522
 msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1512 parser.yy:1517 parser.yy:1982
+#: parser.yy:1549 parser.yy:1554 parser.yy:2026
 msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1614
+#: parser.yy:1651
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1769 parser.yy:1819
+#: parser.yy:1806 parser.yy:1856
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:1936
+#: parser.yy:1980
 msgid "have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:1997
+#: parser.yy:2041
 msgid "have to be in Chord mode for chords"
 msgstr ""
 
-#: lexer.ll:176
+#: lexer.ll:179
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:180
+#: lexer.ll:183
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:235
+#: lexer.ll:238
 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr ""
 
-#: lexer.ll:252
+#: lexer.ll:255
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:256
+#: lexer.ll:259
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:260
+#: lexer.ll:263
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:273
+#: lexer.ll:276
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:288
+#: lexer.ll:291
 msgid "\\maininput not allowed outside init files"
 msgstr ""
 
-#: lexer.ll:312
+#: lexer.ll:315
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:321
+#: lexer.ll:324
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:466
+#: lexer.ll:469
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:559
+#: lexer.ll:584
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:663
+#: lexer.ll:688
 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 
-#: lexer.ll:778
+#: lexer.ll:803 lexer.ll:804
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:884
+#: lexer.ll:910 lexer.ll:911
 #, c-format
 msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
-#: lexer.ll:885
+#: lexer.ll:911 lexer.ll:912
 msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: lexer.ll:891
+#: lexer.ll:917 lexer.ll:918
 #, c-format
 msgid "program too old: %s (file requires: %s)"
 msgstr ""
 
-#: backend-library.scm:19 lily.scm:753 ps-to-png.scm:58
+#: backend-library.scm:19 lily.scm:777 ps-to-png.scm:58
 #, scheme-format
 msgid "Invoking `~a'..."
 msgstr ""
@@ -1922,11 +2475,13 @@ msgstr ""
 msgid "`~a' failed (~a)"
 msgstr ""
 
-#: backend-library.scm:115 framework-tex.scm:343 framework-tex.scm:368
+#: backend-library.scm:116 framework-tex.scm:344 framework-tex.scm:369
 #, scheme-format
 msgid "Converting to `~a'..."
 msgstr ""
 
+#. Do not try to guess the name of the png file,
+#. GS produces PNG files like BASE-page%d.png.
 #: backend-library.scm:128
 #, scheme-format
 msgid "Converting to ~a..."
@@ -1954,106 +2509,111 @@ msgstr ""
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:273
+#: define-markup-commands.scm:599
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1315
+#: define-markup-commands.scm:2428
+#, scheme-format
+msgid "Cannot find glyph ~a"
+msgstr ""
+
+#: define-markup-commands.scm:2737
 #, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
 
-#: define-music-types.scm:743
+#: define-music-types.scm:670
 #, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:746
+#: define-music-types.scm:673
 #, scheme-format
 msgid "cannot find music object: ~S"
 msgstr ""
 
-#: define-music-types.scm:766
+#: define-music-types.scm:692
 #, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr ""
 
-#: define-music-types.scm:767
+#: define-music-types.scm:693
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
-#: document-backend.scm:91
+#: document-backend.scm:99
 #, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
-#: document-backend.scm:135
+#: document-backend.scm:154
 #, scheme-format
 msgid "cannot find interface for property: ~S"
 msgstr ""
 
-#: document-backend.scm:145
+#: document-backend.scm:164
 #, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr ""
 
-#: documentation-lib.scm:45
+#: documentation-lib.scm:48
 #, scheme-format
 msgid "Processing ~S..."
 msgstr ""
 
-#: documentation-lib.scm:150
+#: documentation-lib.scm:164
 #, scheme-format
 msgid "Writing ~S..."
 msgstr ""
 
-#: documentation-lib.scm:172
+#: documentation-lib.scm:186
 #, scheme-format
 msgid "cannot find description for property ~S (~S)"
 msgstr ""
 
-#: framework-eps.scm:89
+#: framework-eps.scm:90
 #, scheme-format
 msgid "Writing ~a..."
 msgstr ""
 
-#: framework-ps.scm:281
+#: framework-ps.scm:282
 #, scheme-format
 msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:334
+#: framework-ps.scm:335
 #, scheme-format
 msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:351
+#: framework-ps.scm:352
 #, scheme-format
 msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:382
+#: framework-ps.scm:383
 #, scheme-format
 msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: framework-ps.scm:731
+#: framework-ps.scm:753
 #, scheme-format
 msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:750 framework-ps.scm:753
+#: framework-ps.scm:772 framework-ps.scm:775
 #, scheme-format
 msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:760
+#: framework-ps.scm:782
 msgid ""
 "\n"
 "The PostScript backend does not support the system-by-system \n"
 "output. For that, use the EPS backend instead,\n"
 "\n"
-"  lilypond -b eps <file>\n"
+"  lilypond -dbackend=eps FILE\n"
 "\n"
 "If have cut & pasted a lilypond fragment from a webpage, be sure\n"
 "to only remove anything before\n"
@@ -2061,15 +2621,14 @@ msgid ""
 "  %% ****************************************************************\n"
 "  %% Start cut-&-pastable-section\n"
 "  %% ****************************************************************\n"
-"\n"
 msgstr ""
 
-#: framework-tex.scm:360
+#: framework-tex.scm:361
 #, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr ""
 
-#: graphviz.scm:51
+#: graphviz.scm:53
 #, scheme-format
 msgid "Writing graph `~a'..."
 msgstr ""
@@ -2079,61 +2638,61 @@ msgstr ""
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
-#: layout-beam.scm:46
+#: layout-beam.scm:43
 #, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:115
+#: layout-page-layout.scm:124
 msgid "Can't fit systems on page -- ignoring between-system-padding"
 msgstr ""
 
-#: layout-page-layout.scm:449
+#: layout-page-layout.scm:458
 msgid "Calculating page breaks..."
 msgstr ""
 
-#: lily-library.scm:545
+#: lily-library.scm:588
 #, scheme-format
 msgid "unknown unit: ~S"
 msgstr ""
 
-#: lily-library.scm:579
+#: lily-library.scm:622
 #, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:587
+#: lily-library.scm:630
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:173
+#: lily.scm:178
 #, scheme-format
 msgid "cannot find: ~A"
 msgstr ""
 
-#: lily.scm:238
+#: lily.scm:243
 #, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:619
+#: lily.scm:641
 #, scheme-format
 msgid "job ~a terminated with signal: ~a"
 msgstr ""
 
-#: lily.scm:622
+#: lily.scm:644
 #, scheme-format
 msgid ""
 "logfile ~a (exit ~a):\n"
 "~a"
 msgstr ""
 
-#: lily.scm:649 lily.scm:743
+#: lily.scm:669 lily.scm:767
 #, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:733
+#: lily.scm:757
 #, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
@@ -2142,96 +2701,106 @@ msgstr ""
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:139
+#: ly-syntax-constructors.scm:150
 #, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:94
+#: markup.scm:204
 #, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:100
+#: markup.scm:210
 #, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
+#: markup.scm:274
+#, scheme-format
+msgid "Not a markup command: ~A"
+msgstr ""
+
 #: music-functions.scm:228
 msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
-#: music-functions.scm:250
+#: music-functions.scm:240
+#, scheme-format
+msgid "invalid tremolo repeat count: ~a"
+msgstr ""
+
+#: music-functions.scm:248
 #, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:573
+#: music-functions.scm:575
 #, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:623
+#: music-functions.scm:625
 #, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:773
+#: music-functions.scm:793
 #, scheme-format
 msgid "cannot find quoted music: `~S'"
 msgstr ""
 
-#: music-functions.scm:970
+#: music-functions.scm:990
 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 
-#: output-ps.scm:276
+#: output-ps.scm:285
 msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
-#: output-svg.scm:42
+#: output-svg.scm:45
 #, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
-#: output-svg.scm:132
+#: output-svg.scm:135
 #, scheme-format
 msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
-#: output-tex.scm:97
+#: output-tex.scm:96
 #, scheme-format
 msgid "cannot find ~a in ~a"
 msgstr ""
 
-#: paper.scm:84
+#: paper.scm:86
 msgid "set-global-staff-size: not in toplevel scope"
 msgstr ""
 
-#: paper.scm:132
+#: paper.scm:226
 #, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:144
+#: paper.scm:238
 #, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:159
+#: paper.scm:253
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
-#: parser-clef.scm:127
+#: parser-clef.scm:129
 #, scheme-format
 msgid "unknown clef type `~a'"
 msgstr ""
 
-#: parser-clef.scm:128
+#: parser-clef.scm:130
 #, scheme-format
 msgid "supported clefs: ~a"
 msgstr ""