X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=po%2Flilypond.pot;h=8caa983b729bfb5b5b25bcfc52643b1940b41840;hb=19a89e01b2fdab5ff6c9965f294f702f21bbe998;hp=94a5c7469382fbe0f96d973c2287d8941f04d2f9;hpb=e8192418cfb44d43ae82754004de39dfbc389d71;p=lilypond.git

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 94a5c74693..8caa983b72 100644
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-17 18:18+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,746 +16,620 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fontextract.py:25
+#: convertrules.py:12
 #, python-format
-msgid "Scanning %s"
+msgid "Not smart enough to convert %s"
 msgstr ""
 
-#: fontextract.py:70
-#, python-format
-msgid "Extracted %s"
+#: convertrules.py:13
+msgid "Please refer to the manual for details, and update manually."
 msgstr ""
 
-#: fontextract.py:86
+#: convertrules.py:14
 #, python-format
-msgid "Writing fonts to %s"
+msgid "%s has been replaced by %s"
 msgstr ""
 
-#: lilylib.py:62
-msgid "lilylib module"
+#: convertrules.py:2398
+msgid "LilyPond source must be UTF-8"
 msgstr ""
 
-#: lilylib.py:65 lilypond-book.py:89 midi2ly.py:100 mup2ly.py:75 ps2png.py:41
-#: main.cc:145 lily/main.cc:145
-msgid "print this help"
+#: convertrules.py:2401
+msgid "Try the texstrings backend"
 msgstr ""
 
-#: lilylib.py:112 midi2ly.py:136 mup2ly.py:130
+#: convertrules.py:2404
 #, python-format
-msgid "Copyright (c) %s by"
-msgstr ""
-
-#: lilylib.py:116 midi2ly.py:141 mup2ly.py:135
-msgid "Distributed under terms of the GNU General Public License."
+msgid "Do something like: %s"
 msgstr ""
 
-#: lilylib.py:118 midi2ly.py:142 mup2ly.py:136
-msgid "It comes with NO WARRANTY."
+#: convertrules.py:2407
+msgid "Or save as UTF-8 in your editor"
 msgstr ""
 
-#: lilylib.py:125 warn.cc:44 input.cc:79 lily/input.cc:79
-#, c-format, python-format
-msgid "warning: %s"
+#: fontextract.py:26
+#, python-format
+msgid "Scanning %s"
 msgstr ""
 
-#: lilylib.py:128 warn.cc:50 input.cc:85 input.cc:93 lily/input.cc:85
-#: lily/input.cc:93
-#, c-format, python-format
-msgid "error: %s"
+#: fontextract.py:71
+#, python-format
+msgid "Extracted %s"
 msgstr ""
 
-#: lilylib.py:132
+#: fontextract.py:86
 #, python-format
-msgid "Exiting (%d)..."
+msgid "Writing fonts to %s"
 msgstr ""
 
-#: lilylib.py:200 midi2ly.py:223 mup2ly.py:219
+#: lilylib.py:85 lilylib.py:136
 #, python-format
-msgid "Usage: %s [OPTIONS]... FILE"
+msgid "Invoking `%s'"
 msgstr ""
 
-#: lilylib.py:204 convert-ly.py:57 midi2ly.py:227 mup2ly.py:223 main.cc:211
-#: lily/main.cc:211
-#, c-format
-msgid "Options:"
+#: lilylib.py:87 lilylib.py:138
+#, python-format
+msgid "Running %s..."
 msgstr ""
 
-#: lilylib.py:208 convert-ly.py:68 lilypond-pdfpc-helper.py:28 midi2ly.py:231
-#: mup2ly.py:227 main.cc:215 lily/main.cc:215
-#, c-format, python-format
-msgid "Report bugs to %s."
+#: lilylib.py:203
+#, python-format
+msgid "Usage: %s"
 msgstr ""
 
-#: lilylib.py:228
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
 #, python-format
-msgid "Binary %s has version %s, looking for version %s"
+msgid "%s [OPTION]... FILE"
 msgstr ""
 
-#: lilylib.py:262
+#: abc2ly.py:1351
 #, python-format
-msgid "Opening pipe `%s'"
+msgid ""
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: lilylib.py:277 lilypond-book.py:1162
-#, python-format
-msgid "`%s' failed (%d)"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr ""
 
-#: lilylib.py:282 lilylib.py:341 lilypond-book.py:1163
-msgid "The error log is as follows:"
+#: abc2ly.py:1357
+msgid "be strict about succes"
 msgstr ""
 
-#: lilylib.py:313 midi2ly.py:259 mup2ly.py:255
-#, python-format
-msgid "Invoking `%s'"
+#: abc2ly.py:1359
+msgid "preserve ABC's notion of beams"
 msgstr ""
 
-#: lilylib.py:315
-#, python-format
-msgid "Running %s..."
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+msgid "Report bugs via"
 msgstr ""
 
-#: lilylib.py:334
-#, python-format
-msgid "`%s' failed (%s)"
+#: convert-ly.py:41
+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 ""
 
-#: lilylib.py:337 midi2ly.py:265 mup2ly.py:263
-msgid "(ignored)"
+#: convert-ly.py:43 lilypond-book.py:73
+msgid "Examples:"
 msgstr ""
 
-#: lilylib.py:355 midi2ly.py:275 mup2ly.py:273
-#, python-format
-msgid "Cleaning %s..."
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
+#, c-format, python-format
+msgid "warning: %s"
 msgstr ""
 
-#: lilylib.py:518
-#, python-format
-msgid "%s exited with status: %d"
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
+#, c-format, python-format
+msgid "error: %s"
 msgstr ""
 
-#: convert-ly.py:32
-#, python-format
-msgid "%s has been replaced by %s"
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
+msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:33
-#, python-format
-msgid "Not smart enough to convert %s"
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
+msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:34
-msgid "Please refer to the manual for details, and update manually."
+#: convert-ly.py:86 convert-ly.py:106
+msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:50
-#, python-format
-msgid "Usage: %s [OPTION]... [FILE]..."
+#: convert-ly.py:88
+msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:53
-msgid ""
-"Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version."
+#: convert-ly.py:91
+msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:59
-msgid ""
-"  -e, --edit             edit in place\n"
-"  -f, --from=VERSION     start from VERSION [default: \\version found in "
-"file]\n"
-"  -h, --help             print this help\n"
-"  -n, --no-version       do not add \\version command if missing\n"
-"  -s, --show-rules       print rules [default: --from=0, --"
-"to=@TOPLEVEL_VERSION@]\n"
-"  -t, --to=VERSION       convert to VERSION [default: @TOPLEVEL_VERSION@]\n"
-"  -v, --version          print program version"
-msgstr ""
-
-#: convert-ly.py:75 lilypond-pdfpc-helper.py:34 main.cc:98 lily/main.cc:98
-#, c-format, 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.\n"
+#: convert-ly.py:94
+msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:2407
-msgid "LilyPond source must be UTF-8"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:2410
-msgid "Try the texstrings backend"
+#: convert-ly.py:105
+msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:2413
-#, python-format
-msgid "Do something like: %s"
+#: convert-ly.py:153
+msgid "Applying conversion: "
 msgstr ""
 
-#: convert-ly.py:2416
-msgid "Or save as UTF-8 in your editor"
+#: convert-ly.py:166
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:2494
-msgid "Applying conversion: "
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:2506
+#: convert-ly.py:190
 #, python-format
-msgid "%s: error while converting"
+msgid "Processing `%s'... "
 msgstr ""
 
-#: convert-ly.py:2509 score-engraver.cc:111 lily/score-engraver.cc:111
-msgid "Aborting"
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
+#, c-format, python-format
+msgid "cannot open file: `%s'"
 msgstr ""
 
-#: convert-ly.py:2530
+#: convert-ly.py:284
 #, python-format
-msgid "Processing `%s'... "
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr ""
 
-#: convert-ly.py:2632
+#: etf2ly.py:1196
 #, python-format
-msgid "%s: can't determine version for `%s'"
+msgid "%s [OPTION]... ETF-FILE"
 msgstr ""
 
-#: convert-ly.py:2641
-#, python-format
-msgid "%s: skipping: `%s'"
+#: etf2ly.py:1198
+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."
+msgstr ""
+
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
+msgid "FILE"
+msgstr ""
+
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr ""
 
 #: lilypond-book.py:71
 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 -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
 msgstr ""
 
-#: lilypond-book.py:83
-msgid "FMT"
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
 
-#: lilypond-book.py:84
-msgid ""
-"use output format FMT (texi [default], texi-html,\n"
-"\t\tlatex, html)"
+#: lilypond-book.py:87
+#, python-format
+msgid "Exiting (%d)..."
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:119
+#, python-format
+msgid "Copyright (c) %s by"
+msgstr ""
+
+#: lilypond-book.py:129
 msgid "FILTER"
 msgstr ""
 
-#: lilypond-book.py:87
+#: lilypond-book.py:132
 msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr ""
 
-#: lilypond-book.py:90 lilypond-book.py:92 main.cc:147 lily/main.cc:147
-msgid "DIR"
+#: lilypond-book.py:135
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr ""
 
-#: lilypond-book.py:91
+#: lilypond-book.py:138
 msgid "add DIR to include path"
 msgstr ""
 
-#: lilypond-book.py:93
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr ""
+
+#: lilypond-book.py:143
 msgid "write output to DIR"
 msgstr ""
 
-#: lilypond-book.py:94
+#: lilypond-book.py:147
 msgid "COMMAND"
 msgstr ""
 
-#: lilypond-book.py:95
+#: lilypond-book.py:148
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:96 midi2ly.py:102 main.cc:148 main.cc:149 lily/main.cc:148
-#: lily/main.cc:149
-msgid "FILE"
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
 msgstr ""
 
-#: lilypond-book.py:97
-msgid "extract all PS snippet fonts into FILE"
+#: lilypond-book.py:157
+msgid ""
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:99 midi2ly.py:105 mup2ly.py:78 ps2png.py:42 main.cc:155
-#: lily/main.cc:155
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr ""
 
-#: lilypond-book.py:101
-msgid "print version information"
-msgstr ""
-
-#: lilypond-book.py:103 midi2ly.py:107 mup2ly.py:80 main.cc:156
-#: lily/main.cc:156
-msgid "show warranty and copyright"
-msgstr ""
-
-#: lilypond-book.py:609
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:807
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:810
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:814
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:817
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:836
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1145
+#: lilypond-book.py:1388
 #, python-format
 msgid "Opening filter `%s'"
 msgstr ""
 
-#: lilypond-book.py:1308
+#: lilypond-book.py:1405
+#, python-format
+msgid "`%s' failed (%d)"
+msgstr ""
+
+#: lilypond-book.py:1406
+msgid "The error log is as follows:"
+msgstr ""
+
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
+msgstr ""
+
+#: lilypond-book.py:1586
 msgid "Writing snippets..."
 msgstr ""
 
-#: lilypond-book.py:1313
+#: lilypond-book.py:1591
 msgid "Processing..."
 msgstr ""
 
-#: lilypond-book.py:1317
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1327
+#: lilypond-book.py:1605
 #, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr ""
 
-#: lilypond-book.py:1338
-msgid "Output file is up to date."
+#: lilypond-book.py:1616
+#, python-format
+msgid "%s is up to date."
 msgstr ""
 
-#: lilypond-book.py:1343
-msgid "Writing output file."
+#: lilypond-book.py:1622
+#, python-format
+msgid "Writing `%s'..."
 msgstr ""
 
-#: lilypond-book.py:1383
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1387
+#: lilypond-book.py:1681
 #, python-format
 msgid "Reading %s..."
 msgstr ""
 
-#: lilypond-book.py:1403
+#: lilypond-book.py:1700
 msgid "Dissecting..."
 msgstr ""
 
-#: lilypond-book.py:1433
+#: lilypond-book.py:1716
 #, python-format
 msgid "Compiling %s..."
 msgstr ""
 
-#: lilypond-book.py:1444
+#: lilypond-book.py:1725
 #, python-format
 msgid "Processing include: %s"
 msgstr ""
 
-#: lilypond-book.py:1458
+#: lilypond-book.py:1739
 #, python-format
 msgid "Removing `%s'"
 msgstr ""
 
-#: lilypond-book.py:1471 midi2ly.py:1016 ps2png.py:52
-#, python-format
-msgid "getopt says: `%s'"
-msgstr ""
-
-#: lilypond-pdfpc-helper.py:72
-msgid "Not in FILE:LINE:COL format: "
-msgstr ""
-
-#: lilypond-pdfpc-helper.py:100
+#: lilypond-book.py:1815
 #, python-format
-msgid "Command failed: `%s' (status %d)"
-msgstr ""
-
-#. temp_dir = os.path.join (original_dir,  '%s.dir' % program_name)
-#. original_dir = os.getcwd ()
-#. keep_temp_dir_p = 0
-#: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source."
-msgstr ""
-
-#: midi2ly.py:97
-msgid "print absolute pitches"
+msgid "Writing fonts to %s..."
 msgstr ""
 
-#: midi2ly.py:98 midi2ly.py:103
-msgid "DUR"
-msgstr ""
-
-#: midi2ly.py:98
-msgid "quantise note durations on DUR"
-msgstr ""
-
-#: midi2ly.py:99
-msgid "print explicit durations"
-msgstr ""
-
-#: midi2ly.py:101
-msgid "ALT[:MINOR]"
+#: lilypond-book.py:1830
+msgid "option --psfonts not used"
 msgstr ""
 
-#: midi2ly.py:101
-msgid "set key: ALT=+sharps|-flats; MINOR=1"
+#: lilypond-book.py:1831
+msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: midi2ly.py:102 mup2ly.py:76
-msgid "write output to FILE"
+#: lilypond-book.py:1834
+msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:103
-msgid "quantise note starts on DUR"
-msgstr ""
-
-#: midi2ly.py:104
-msgid "DUR*NUM/DEN"
-msgstr ""
-
-#: midi2ly.py:104
-msgid "allow tuplet durations DUR*NUM/DEN"
-msgstr ""
-
-#: midi2ly.py:106 mup2ly.py:79 main.cc:154 lily/main.cc:154
-msgid "print version number"
-msgstr ""
-
-#: midi2ly.py:108
-msgid "treat every text as a lyric"
-msgstr ""
-
-#: midi2ly.py:149 mup2ly.py:143 lily-library.scm:345 lily-library.scm:353
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr ""
 
-#: midi2ly.py:164 midi2ly.py:1016 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr ""
 
-#: midi2ly.py:165 mup2ly.py:161
+#: midi2ly.py:110
 msgid "Exiting ... "
 msgstr ""
 
-#: midi2ly.py:263 mup2ly.py:260
+#: midi2ly.py:857
 #, python-format
-msgid "command exited with value %d"
+msgid "%s output to `%s'..."
 msgstr ""
 
-#: midi2ly.py:1000
+#: midi2ly.py:871 musicxml2ly.py:485
 #, python-format
-msgid "%s output to `%s'..."
+msgid "Convert %s to LilyPond input."
 msgstr ""
 
-#: midi2ly.py:1031
-msgid "Example:"
+#: midi2ly.py:875
+msgid "print absolute pitches"
 msgstr ""
 
-#: midi2ly.py:1081
-msgid "no files specified on command line."
+#: midi2ly.py:877 midi2ly.py:889
+msgid "DUR"
 msgstr ""
 
-#: mup2ly.py:70
-msgid "Convert mup to LilyPond source."
+#: midi2ly.py:878
+msgid "quantise note durations on DUR"
 msgstr ""
 
-#: mup2ly.py:73
-msgid "debug"
+#: midi2ly.py:881
+msgid "print explicit durations"
 msgstr ""
 
-#: mup2ly.py:74
-msgid "define macro NAME [optional expansion EXP]"
+#: midi2ly.py:882
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
 msgstr ""
 
-#: mup2ly.py:77
-msgid "only pre-process"
+#: midi2ly.py:883
+msgid "ALT[:MINOR]"
 msgstr ""
 
-#: mup2ly.py:1075
-#, python-format
-msgid "no such context: %s"
+#: midi2ly.py:888
+msgid "quantise note starts on DUR"
 msgstr ""
 
-#: mup2ly.py:1300
-#, python-format
-msgid "Processing `%s'..."
+#: midi2ly.py:891
+msgid "DUR*NUM/DEN"
 msgstr ""
 
-#: mup2ly.py:1319
-#, python-format
-msgid "Writing `%s'..."
+#: midi2ly.py:894
+msgid "allow tuplet durations DUR*NUM/DEN"
 msgstr ""
 
-#. ugr.
-#: ps2png.py:36
-msgid "Convert PostScript to PNG image."
+#: midi2ly.py:902
+msgid "treat every text as a lyric"
+msgstr ""
+
+#: midi2ly.py:905
+msgid "Examples"
 msgstr ""
 
-#: ps2png.py:43
-msgid "PAPER"
+#: midi2ly.py:925
+msgid "no files specified on command line."
 msgstr ""
 
-#: ps2png.py:43
-msgid "use papersize PAPER"
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
 msgstr ""
 
-#: ps2png.py:44
-msgid "RES"
+#: musicxml2ly.py:476
+#, 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."
 msgstr ""
 
-#: ps2png.py:44
-msgid "set the resolution of the preview to RES"
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
 msgstr ""
 
-#: ps2png.py:76
-#, python-format
-msgid "Wrote `%s'"
+#: musicxml2ly.py:503
+msgid "set output filename to FILE"
 msgstr ""
 
-#: getopt-long.cc:143
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr ""
 
-#: getopt-long.cc:147
+#: getopt-long.cc:144
 #, c-format
-msgid "option `%s' doesn't allow an argument"
+msgid "option `%s' does not allow an argument"
 msgstr ""
 
-#: getopt-long.cc:151
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr ""
 
-#: getopt-long.cc:158
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr ""
 
-#: warn.cc:64 grob.cc:632 lily/grob.cc:632
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr ""
 
-#: warn.cc:65
+#: warn.cc:69 input.cc:83
 msgid "continuing, cross fingers"
 msgstr ""
 
-#.
-#. todo i18n.
-#.
-#: kpath.c:142
-#, c-format
-msgid "can't dlopen: %s: %s"
-msgstr ""
-
-#: kpath.c:143
-#, c-format
-msgid "install package: %s or %s"
-msgstr ""
-
-#: kpath.c:156
-#, c-format
-msgid "no such symbol: %s: %s"
-msgstr ""
-
-#: kpath.c:179
-#, c-format
-msgid "error opening kpathsea library"
-msgstr ""
-
-#: kpath.c:180
-#, c-format
-msgid "aborting"
-msgstr ""
-
-#: accidental-engraver.cc:235 lily/accidental-engraver.cc:235
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:263 lily/accidental-engraver.cc:263
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:279 lily/accidental-engraver.cc:279
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:233 key-signature-interface.cc:127 lily/accidental.cc:233
-#: lily/key-signature-interface.cc:127
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
 
-#: afm.cc:142 lily/afm.cc:142
-#, c-format
-msgid "parsing AFM file: `%s'"
+#: align-interface.cc:222
+msgid ""
+"vertical alignment called before line-breaking.\n"
+"Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#. FIXME: broken sentence
-#. FIXME: broken sentence
-#. FIXME: broken sentence
-#. FIXME: broken sentence
-#. FIXME: broken sentence
-#. FIXME: broken sentence
-#: all-font-metrics.cc:176 lily/all-font-metrics.cc:176
-#, c-format
-msgid "checksum mismatch for font file: `%s'"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:178 lily/all-font-metrics.cc:178
+#: all-font-metrics.cc:173
 #, c-format
-msgid "does not match: `%s'"
+msgid "cannot find font: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:184 lily/all-font-metrics.cc:184
-msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
-msgstr ""
-
-#: all-font-metrics.cc:186 lily/all-font-metrics.cc:186
-msgid "Rerun with -V to show font paths."
-msgstr ""
-
-#: all-font-metrics.cc:188 lily/all-font-metrics.cc:188
-msgid "A script for removing font-files is delivered with the source-code:"
+#: apply-context-iterator.cc:31
+msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: all-font-metrics.cc:297 lily/all-font-metrics.cc:297
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot change, already in translator: %s"
 msgstr ""
 
-#: all-font-metrics.cc:298 lily/all-font-metrics.cc:298
-msgid "loading default font"
+#: axis-group-engraver.cc:78
+msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: all-font-metrics.cc:313 lily/all-font-metrics.cc:313
-#, c-format
-msgid "can't find default font: `%s'"
+#: axis-group-engraver.cc:79
+msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: all-font-metrics.cc:314 includable-lexer.cc:59 lily-parser-scheme.cc:70
-#: lily/all-font-metrics.cc:314 lily/includable-lexer.cc:59
-#: lily/lily-parser-scheme.cc:70
-#, c-format
-msgid "(search path: `%s')"
+#: axis-group-engraver.cc:80
+msgid "removing this vertical group"
 msgstr ""
 
-#: all-font-metrics.cc:315 volta-engraver.cc:142 lily/all-font-metrics.cc:315
-#: lily/volta-engraver.cc:142
-msgid "giving up"
+#: axis-group-interface.cc:96
+msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
-#: apply-context-iterator.cc:33 lily/apply-context-iterator.cc:33
-msgid "\\applycontext argument is not a procedure"
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:60
-#: lily/auto-change-iterator.cc:62 lily/change-iterator.cc:60
+#: axis-group-interface.cc:383
 #, c-format
-msgid "can't change, already in translator: %s"
+msgid "outside-staff object %s has an empty extent"
 msgstr ""
 
-#: axis-group-engraver.cc:112 lily/axis-group-engraver.cc:112
-msgid "Axis_group_engraver: vertical group already has a parent"
-msgstr ""
-
-#: axis-group-engraver.cc:113 lily/axis-group-engraver.cc:113
-msgid "are there two Axis_group_engravers?"
-msgstr ""
-
-#: axis-group-engraver.cc:114 lily/axis-group-engraver.cc:114
-msgid "removing this vertical group"
-msgstr ""
-
-#: bar-check-iterator.cc:70 lily/bar-check-iterator.cc:70
+#: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr ""
 
-#: beam-engraver.cc:136 lily/beam-engraver.cc:136
+#: beam-engraver.cc:128
 msgid "already have a beam"
 msgstr ""
 
-#: beam-engraver.cc:205 lily/beam-engraver.cc:205
+#: beam-engraver.cc:196
 msgid "unterminated beam"
 msgstr ""
 
-#: beam-engraver.cc:238 chord-tremolo-engraver.cc:165
-#: lily/beam-engraver.cc:238 lily/chord-tremolo-engraver.cc:165
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr ""
 
-#: beam-engraver.cc:251 lily/beam-engraver.cc:251
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+msgid "stem does not fit in beam"
 msgstr ""
 
-#: beam-engraver.cc:252 lily/beam-engraver.cc:252
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr ""
 
-#: beam.cc:142 lily/beam.cc:142
-msgid "beam has less than two visible stems"
+#: beam-quanting.cc:307
+msgid "no feasible beam position"
 msgstr ""
 
-#: beam.cc:147 lily/beam.cc:147
-msgid "removing beam with less than two stems"
+#: beam.cc:144
+msgid "removing beam with no stems"
 msgstr ""
 
-#: beam.cc:988 lily/beam.cc:988
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:205 lily/break-align-interface.cc:205
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr ""
 
-#: change-iterator.cc:22 lily/change-iterator.cc:22
+#: change-iterator.cc:23
 #, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr ""
 
 #. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#: change-iterator.cc:81 lily/change-iterator.cc:81
-msgid "can't find context to switch to"
+#: change-iterator.cc:82
+msgid "cannot find context to switch to"
 msgstr ""
 
 #. We could change the current translator's id, but that would make
@@ -763,377 +637,345 @@ msgstr ""
 #.
 #. 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 ();
-#: change-iterator.cc:90 lily/change-iterator.cc:90
+#: change-iterator.cc:91
 #, c-format
 msgid "not changing to same context type: %s"
 msgstr ""
 
 #. FIXME: uncomprehensable message
-#. FIXME: uncomprehensable message
-#. FIXME: uncomprehensable message
-#. FIXME: uncomprehensable message
-#. FIXME: uncomprehensable message
-#. FIXME: uncomprehensable message
-#: change-iterator.cc:94 lily/change-iterator.cc:94
+#: change-iterator.cc:95
 msgid "none of these in my family"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:94 lily/chord-tremolo-engraver.cc:94
-#, c-format
-msgid "expect 2 elements for chord tremolo, found %d"
+#: chord-tremolo-engraver.cc:88
+msgid "No tremolo to end"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:131 lily/chord-tremolo-engraver.cc:131
+#: chord-tremolo-engraver.cc:110
 msgid "unterminated chord tremolo"
 msgstr ""
 
-#: chord-tremolo-iterator.cc:64 lily/chord-tremolo-iterator.cc:64
-msgid "no one to print a tremolos"
+#: chord-tremolo-iterator.cc:33
+#, c-format
+msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:57 lily/clef.cc:57
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
 
-#: cluster.cc:118 lily/cluster.cc:118
+#: cluster.cc:110
 #, c-format
 msgid "unknown cluster style `%s'"
 msgstr ""
 
-#: cluster.cc:144 lily/cluster.cc:144
+#: cluster.cc:135
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:84 lily/coherent-ligature-engraver.cc:84
+#: coherent-ligature-engraver.cc:100
 #, c-format
-msgid "gotcha: ptr=%ul"
+msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:93 lily/coherent-ligature-engraver.cc:93
-msgid "distance undefined, assuming 0.1"
+#. if we get to here, just put everything on one line
+#: constrained-breaking.cc:176 constrained-breaking.cc:193
+msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:96 lily/coherent-ligature-engraver.cc:96
+#: context-def.cc:130
 #, c-format
-msgid "distance=%f"
+msgid "program has no such type: `%s'"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:139 lily/coherent-ligature-engraver.cc:139
-#, c-format
-msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
+#: context-property.cc:76
+msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
-#: context-def.cc:111 lily/context-def.cc:111
+#: context.cc:151
 #, c-format
-msgid "program has no such type: `%s'"
+msgid "cannot find or create new `%s'"
 msgstr ""
 
-#: context-def.cc:285 lily/context-def.cc:285
+#: context.cc:213
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr ""
 
-#: context-property.cc:111 lily/context-property.cc:111
-msgid "need symbol arguments for \\override and \\revert"
+#: context.cc:276
+#, c-format
+msgid "Invalid CreateContext event: Cannot create %s context"
 msgstr ""
 
-#: context.cc:146 lily/context.cc:146
+#: context.cc:388
 #, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create: `%s'"
 msgstr ""
 
-#: context.cc:210 lily/context.cc:210
+#: custos.cc:77
 #, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "custos `%s' not found"
+msgstr ""
+
+#: dispatcher.cc:71
+msgid "Event class should be a symbol"
 msgstr ""
 
-#: context.cc:301 lily/context.cc:301
+#: dispatcher.cc:78
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "Unknown event class %s"
 msgstr ""
 
-#: custos.cc:83 lily/custos.cc:83
+#: dots.cc:38
 #, c-format
-msgid "custos `%s' not found"
+msgid "dot `%s' not found"
 msgstr ""
 
-#: dynamic-engraver.cc:171 span-dynamic-performer.cc:83
-#: lily/dynamic-engraver.cc:171 lily/span-dynamic-performer.cc:83
-msgid "can't find start of (de)crescendo"
+#: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
+msgid "cannot find start of (de)crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:180 lily/dynamic-engraver.cc:180
+#: dynamic-engraver.cc:195
 msgid "already have a decrescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:182 lily/dynamic-engraver.cc:182
+#: dynamic-engraver.cc:197
 msgid "already have a crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:185 lily/dynamic-engraver.cc:185
+#: dynamic-engraver.cc:200
 msgid "cresc starts here"
 msgstr ""
 
-#: dynamic-engraver.cc:304 lily/dynamic-engraver.cc:304
+#: dynamic-engraver.cc:323
 msgid "unterminated (de)crescendo"
 msgstr ""
 
-#: event-chord-iterator.cc:55 output-property-music-iterator.cc:29
-#: lily/event-chord-iterator.cc:55 lily/output-property-music-iterator.cc:29
-#, c-format
-msgid "junking event: `%s'"
-msgstr ""
-
-#: extender-engraver.cc:139 extender-engraver.cc:148
-#: lily/extender-engraver.cc:139 lily/extender-engraver.cc:148
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr ""
 
-#: folded-repeat-iterator.cc:64 lily/folded-repeat-iterator.cc:64
-msgid "no one to print a repeat brace"
-msgstr ""
-
-#: font-config.cc:23 lily/font-config.cc:23
+#: font-config.cc:28
 msgid "Initializing FontConfig..."
 msgstr ""
 
-#: font-config.cc:26 lily/font-config.cc:26
-msgid "initializing FontConfig"
+#: font-config.cc:44
+#, c-format
+msgid "Rebuilding FontConfig cache %s, this may take a while..."
 msgstr ""
 
-#: font-config.cc:47 lily/font-config.cc:47
+#: font-config.cc:55
 #, c-format
-msgid "adding lilypond directory: %s"
+msgid "failed adding font directory: %s"
 msgstr ""
 
-#: font-config.cc:49 lily/font-config.cc:49
+#: font-config.cc:57
 #, c-format
 msgid "adding font directory: %s"
 msgstr ""
 
-#: general-scheme.cc:172 lily/general-scheme.cc:172
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:173 lily/general-scheme.cc:173
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:97 lily/glissando-engraver.cc:97
+#: glissando-engraver.cc:92
 msgid "unterminated glissando"
 msgstr ""
 
-#: global-context-scheme.cc:50 global-context-scheme.cc:77
-#: lily/global-context-scheme.cc:50 lily/global-context-scheme.cc:77
+#: global-context-scheme.cc:91 global-context-scheme.cc:107
 msgid "no music found in score"
 msgstr ""
 
-#: global-context-scheme.cc:67 lily/global-context-scheme.cc:67
+#: global-context-scheme.cc:97
 msgid "Interpreting music... "
 msgstr ""
 
-#: global-context-scheme.cc:88 lily/global-context-scheme.cc:88
+#: global-context-scheme.cc:120
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr ""
 
-#: global-context.cc:160 lily/global-context.cc:160
-#, c-format
-msgid "can't find `%s' context"
-msgstr ""
-
-#: gourlay-breaking.cc:199 lily/gourlay-breaking.cc:199
-#, c-format
-msgid "Optimal demerits: %f"
-msgstr ""
-
-#: gourlay-breaking.cc:204 lily/gourlay-breaking.cc:204
-msgid "no feasible line breaking found"
-msgstr ""
-
-#: gourlay-breaking.cc:212 lily/gourlay-breaking.cc:212
-msgid "can't find line breaking that satisfies constraints"
-msgstr ""
-
-#: gregorian-ligature-engraver.cc:59 lily/gregorian-ligature-engraver.cc:59
+#: gregorian-ligature-engraver.cc:59
 #, c-format
 msgid "\\%s ignored"
 msgstr ""
 
-#: gregorian-ligature-engraver.cc:64 lily/gregorian-ligature-engraver.cc:64
+#: gregorian-ligature-engraver.cc:64
 #, c-format
 msgid "implied \\%s added"
 msgstr ""
 
-#: gregorian-ligature-engraver.cc:213 lily/gregorian-ligature-engraver.cc:213
-msgid "Cannot apply `\\~' on first head of ligature; ignoring `\\~'"
+#. ligature may not start with 2nd head of pes or flexa
+#: gregorian-ligature-engraver.cc:212
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr ""
 
-#: gregorian-ligature-engraver.cc:227 lily/gregorian-ligature-engraver.cc:227
-msgid "can't apply `\\~' on heads with identical pitch; ignoring `\\~'"
+#. (pitch == prev_pitch)
+#: gregorian-ligature-engraver.cc:224
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:45 lily/grob-interface.cc:45
+#: grob-interface.cc:57
 #, c-format
 msgid "Unknown interface `%s'"
 msgstr ""
 
-#: grob-interface.cc:56 lily/grob-interface.cc:56
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: hairpin.cc:131 lily/hairpin.cc:131
-msgid "decrescendo too small"
+#: grob.cc:253
+msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:132 lily/hairpin.cc:132
-msgid "crescendo too small"
+#: hairpin.cc:183
+msgid "decrescendo too small"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:55 lily/horizontal-bracket-engraver.cc:55
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:59
+msgid "do not have that many brackets"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:64 lily/horizontal-bracket-engraver.cc:64
+#: horizontal-bracket-engraver.cc:68
 msgid "conflicting note group events"
 msgstr ""
 
-#: hyphen-engraver.cc:89 lily/hyphen-engraver.cc:89
+#: hyphen-engraver.cc:93
 msgid "removing unterminated hyphen"
 msgstr ""
 
-#: hyphen-engraver.cc:102 lily/hyphen-engraver.cc:102
+#: hyphen-engraver.cc:107
 msgid "unterminated hyphen; removing"
 msgstr ""
 
-#: includable-lexer.cc:50 lily/includable-lexer.cc:50
+#: includable-lexer.cc:53
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:57 lily-guile.cc:90 lily-parser-scheme.cc:77
-#: lily/includable-lexer.cc:57 lily/lily-guile.cc:90
-#: lily/lily-parser-scheme.cc:77
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr ""
 
-#: input.cc:101 source-file.cc:144 source-file.cc:266 lily/input.cc:101
-#: lily/source-file.cc:144 lily/source-file.cc:266
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr ""
+
+#: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr ""
 
-#: ligature-engraver.cc:152 lily/ligature-engraver.cc:152
-msgid "can't find start of ligature"
+#: ligature-engraver.cc:93
+msgid "cannot find start of ligature"
 msgstr ""
 
-#: ligature-engraver.cc:158 lily/ligature-engraver.cc:158
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr ""
 
-#: ligature-engraver.cc:184 lily/ligature-engraver.cc:184
+#: ligature-engraver.cc:120
 msgid "already have a ligature"
 msgstr ""
 
-#: ligature-engraver.cc:200 lily/ligature-engraver.cc:200
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr ""
 
-#: ligature-engraver.cc:256 lily/ligature-engraver.cc:256
+#: ligature-engraver.cc:173
 msgid "unterminated ligature"
 msgstr ""
 
-#: ligature-engraver.cc:280 lily/ligature-engraver.cc:280
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:281 lily/ligature-engraver.cc:281
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr ""
 
-#: lily-guile.cc:92 lily/lily-guile.cc:92
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr ""
 
-#: lily-guile.cc:484 lily/lily-guile.cc:484
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:487 lily/lily-guile.cc:487
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:493 lily/lily-guile.cc:493
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:505 lily/lily-guile.cc:505
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:210 lily/lily-lexer.cc:210
+#: lily-lexer.cc:254
 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr ""
 
-#: lily-lexer.cc:225 lily/lily-lexer.cc:225
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
 
-#: lily-parser-scheme.cc:30 lily/lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, c-format
 msgid "deprecated function called: %s"
 msgstr ""
 
-#: lily-parser-scheme.cc:69 lily/lily-parser-scheme.cc:69
+#: lily-parser-scheme.cc:88
+#, c-format
+msgid "Changing working directory to: `%s'"
+msgstr ""
+
+#: lily-parser-scheme.cc:106
 #, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr ""
 
-#: lily-parser-scheme.cc:87 lily/lily-parser-scheme.cc:87
+#: lily-parser-scheme.cc:125
 #, c-format
 msgid "Processing `%s'"
 msgstr ""
 
-#: lily-parser.cc:101 lily/lily-parser.cc:101
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr ""
 
-#: lily-parser.cc:119 lily/lily-parser.cc:119
-msgid "braces don't match"
+#: lily-parser.cc:127
+msgid "braces do not match"
 msgstr ""
 
-#: main.cc:104 lily/main.cc:104
+#: lyric-combine-music-iterator.cc:291
+#, c-format
+msgid "cannot find Voice `%s'"
+msgstr ""
+
+#: main.cc:116
+#, c-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.\n"
+msgstr ""
+
+#: main.cc:122
 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"
@@ -1144,115 +986,129 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: main.cc:135 lily/main.cc:135
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:135 lily/main.cc:135
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps [default],\n"
-"                                       scm, svg, tex, texstr)"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:136 lily/main.cc:136
-msgid "EXPR"
+#: main.cc:155
+msgid "SYM[=VAL]"
 msgstr ""
 
-#: main.cc:136 lily/main.cc:136
+#: main.cc:156
 msgid ""
-"set scheme option, for help use\n"
-"                                       -e '(ly:option-usage)'"
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
+msgstr ""
+
+#: main.cc:159
+msgid "EXPR"
+msgstr ""
+
+#: main.cc:159
+msgid "evaluate scheme code"
 msgstr ""
 
 #. 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.
-#: main.cc:139 lily/main.cc:139
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:139 lily/main.cc:139
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:140 lily/main.cc:140
+#: main.cc:163
 msgid "generate DVI (tex backend only)"
 msgstr ""
 
-#: main.cc:141 lily/main.cc:141
+#: main.cc:164
 msgid "generate PDF (default)"
 msgstr ""
 
-#: main.cc:142 lily/main.cc:142
+#: main.cc:165
 msgid "generate PNG"
 msgstr ""
 
-#: main.cc:143 lily/main.cc:143
+#: main.cc:166
 msgid "generate PostScript"
 msgstr ""
 
-#: main.cc:144 lily/main.cc:144
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:146 lily/main.cc:146
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
+
+#: main.cc:169
 msgid "FIELD"
 msgstr ""
 
-#: main.cc:146 lily/main.cc:146
-msgid "write header field to BASENAME.FIELD"
+#: main.cc:169
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:147 lily/main.cc:147
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr ""
 
-#: main.cc:148 lily/main.cc:148
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr ""
 
-#: main.cc:149 lily/main.cc:149
-msgid "write output to FILE (suffix will be added)"
-msgstr ""
-
-#: main.cc:150 lily/main.cc:150
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:150 lily/main.cc:150
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
-"                                       and cd into DIR"
+"and cd into DIR"
 msgstr ""
 
-#: main.cc:151 lily/main.cc:151
+#: main.cc:177
 msgid "do not generate printed output"
 msgstr ""
 
-#: main.cc:152 lily/main.cc:152
+#: main.cc:178
+msgid "write output to FILE (suffix will be added)"
+msgstr ""
+
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr ""
 
-#: main.cc:153 lily/main.cc:153
-msgid "run in safe mode"
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
 msgstr ""
 
-#: main.cc:177 lily/main.cc:177
+#: main.cc:181
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
+msgstr ""
+
+#: main.cc:183
+msgid "show version number and exit"
+msgstr ""
+
+#: main.cc:224
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1260,121 +1116,131 @@ msgid ""
 msgstr ""
 
 #. 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:203 lily/main.cc:203
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
-#: main.cc:205 lily/main.cc:205
+#: main.cc:253
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
-#: main.cc:207 lily/main.cc:207
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:209 lily/main.cc:209
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:299 lily/main.cc:299
+#: main.cc:259
+#, c-format
+msgid "Options:"
+msgstr ""
+
+#: main.cc:263
+#, c-format
+msgid "Report bugs via %s"
+msgstr ""
+
+#: main.cc:309
 #, c-format
-msgid "expected %d arguments with jail, found: %d"
+msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:313 lily/main.cc:313
+#: main.cc:323
 #, c-format
 msgid "no such user: %s"
 msgstr ""
 
-#: main.cc:315 lily/main.cc:315
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:330 lily/main.cc:330
+#: main.cc:340
 #, c-format
 msgid "no such group: %s"
 msgstr ""
 
-#: main.cc:332 lily/main.cc:332
+#: main.cc:342
 #, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr ""
 
-#: main.cc:340 lily/main.cc:340
+#: main.cc:350
 #, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr ""
 
-#: main.cc:347 lily/main.cc:347
+#: main.cc:357
 #, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr ""
 
-#: main.cc:353 lily/main.cc:353
+#: main.cc:363
 #, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr ""
 
-#: main.cc:359 lily/main.cc:359
+#: main.cc:369
 #, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
+msgstr ""
+
+#: main.cc:415
+#, c-format
+msgid "Evaluating %s"
+msgstr ""
+
+#: main.cc:645
+#, c-format
+msgid "exception caught: %s"
 msgstr ""
 
 #. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#: mark-engraver.cc:123 lily/mark-engraver.cc:123
+#: mark-engraver.cc:154
 msgid "rehearsalMark must have integer value"
 msgstr ""
 
-#: mark-engraver.cc:129 lily/mark-engraver.cc:129
+#: mark-engraver.cc:160
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:74 lily/mensural-ligature-engraver.cc:74
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:101 lily/mensural-ligature-engraver.cc:101
+#: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:115 lily/mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:127 lily/mensural-ligature-engraver.cc:127
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:139 lily/mensural-ligature-engraver.cc:139
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:187 lily/mensural-ligature-engraver.cc:187
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:198 lily/mensural-ligature-engraver.cc:198
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:225 lily/mensural-ligature-engraver.cc:225
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1382,1036 +1248,904 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:345 lily/mensural-ligature-engraver.cc:345
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature.cc:131 lily/mensural-ligature.cc:131
+#: mensural-ligature.cc:141
 msgid "Mensural_ligature: unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature.cc:183 lily/mensural-ligature.cc:183
+#: mensural-ligature.cc:192
 msgid "Mensural_ligature: (join_right == 0)"
 msgstr ""
 
-#: midi-item.cc:150 lily/midi-item.cc:150
+#: midi-item.cc:152
 #, c-format
 msgid "no such MIDI instrument: `%s'"
 msgstr ""
 
-#: midi-item.cc:254 lily/midi-item.cc:254
-msgid "silly pitch"
-msgstr ""
-
-#: midi-item.cc:270 lily/midi-item.cc:270
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
-#: midi-stream.cc:27 lily/midi-stream.cc:27
+#: midi-stream.cc:28
 #, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr ""
 
-#: midi-stream.cc:44 lily/midi-stream.cc:44
+#: midi-stream.cc:44
 #, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr ""
 
-#: music.cc:176 lily/music.cc:176
-#, c-format
-msgid "octave check failed; expected %s, found: %s"
+#: music-iterator.cc:171
+msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:239 lily/music.cc:239
+#: music.cc:141
 #, c-format
-msgid "transposition by %s makes alteration larger than double"
-msgstr ""
-
-#: new-fingering-engraver.cc:84 lily/new-fingering-engraver.cc:84
-msgid "can't add text scripts to individual note heads"
-msgstr ""
-
-#.
-#. 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:158 lily/new-fingering-engraver.cc:158
-msgid "music for the martians."
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: new-fingering-engraver.cc:266 lily/new-fingering-engraver.cc:266
-msgid "no placement found for fingerings"
+#: music.cc:207
+#, c-format
+msgid "transposition by %s makes alteration larger than double"
 msgstr ""
 
-#: new-fingering-engraver.cc:267 lily/new-fingering-engraver.cc:267
-msgid "placing below"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-lyric-combine-music-iterator.cc:240
-#: lily/new-lyric-combine-music-iterator.cc:240
-#, c-format
-msgid "cannot find Voice `%s'"
+#: new-fingering-engraver.cc:239
+msgid "no placement found for fingerings"
+msgstr ""
+
+#: new-fingering-engraver.cc:240
+msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:404 lily/note-collision.cc:404
+#: note-collision.cc:457
 msgid "ignoring too many clashing note columns"
 msgstr ""
 
-#: note-column.cc:115 lily/note-column.cc:115
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:66 lily/note-head.cc:66
+#: note-head.cc:63
 #, c-format
-msgid "note head `%s' not found"
+msgid "none of note heads `%s' or `%s' found"
+msgstr ""
+
+#: note-heads-engraver.cc:61
+msgid "NoteEvent without pitch"
 msgstr ""
 
-#: open-type-font.cc:29 lily/open-type-font.cc:29
+#: open-type-font.cc:33
 #, c-format
-msgid "can't allocate %d bytes"
+msgid "cannot allocate %lu bytes"
 msgstr ""
 
-#: open-type-font.cc:33 lily/open-type-font.cc:33
+#: open-type-font.cc:37
 #, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr ""
 
-#: open-type-font.cc:84 lily/open-type-font.cc:84
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:86 lily/open-type-font.cc:86
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:140 lily/open-type-font.cc:140
+#: open-type-font.cc:173 open-type-font.cc:297
+#, c-format
+msgid "FT_Get_Glyph_Name() returned error: %u"
+msgstr ""
+
+#: page-turn-page-breaking.cc:205
+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:218
+#, c-format
+msgid "Calculating page and line breaks (%d possible page breaks)..."
+msgstr ""
+
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
+msgid "Drawing systems..."
+msgstr ""
+
+#: pango-font.cc:181
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
 msgstr ""
 
-#: pango-font.cc:130 lily/pango-font.cc:130
+#: pango-font.cc:224
 #, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr ""
 
-#: pango-font.cc:177 lily/pango-font.cc:177
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
-#: paper-outputter-scheme.cc:26 lily/paper-outputter-scheme.cc:26
+#: paper-outputter-scheme.cc:33
 #, c-format
 msgid "Layout output to `%s'..."
 msgstr ""
 
-#: paper-score.cc:66 lily/paper-score.cc:66
+#: paper-score.cc:105
+msgid "Calculating line breaks..."
+msgstr ""
+
+#: paper-score.cc:118
 #, c-format
 msgid "Element count %d (spanners %d) "
 msgstr ""
 
-#: paper-score.cc:70 lily/paper-score.cc:70
+#: paper-score.cc:122
 msgid "Preprocessing graphical objects..."
 msgstr ""
 
-#: parse-scm.cc:81 lily/parse-scm.cc:81
+#: parse-scm.cc:83
 msgid "GUILE signaled an error for the expression beginning here"
 msgstr ""
 
-#: percent-repeat-engraver.cc:100 lily/percent-repeat-engraver.cc:100
-#, c-format
-msgid "can't handle a percent repeat of length: %s"
-msgstr ""
-
-#: percent-repeat-engraver.cc:158 lily/percent-repeat-engraver.cc:158
+#: percent-repeat-engraver.cc:200
 msgid "unterminated percent repeat"
 msgstr ""
 
-#: percent-repeat-iterator.cc:51 lily/percent-repeat-iterator.cc:51
-msgid "no one to print a percent"
-msgstr ""
-
-#: performance.cc:47 lily/performance.cc:47
+#: performance.cc:45
 msgid "Track..."
 msgstr ""
 
-#: performance.cc:71 lily/performance.cc:71
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:72 lily/performance.cc:72
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:91 lily/performance.cc:91
-msgid "Creator: "
-msgstr ""
-
-#: performance.cc:111 lily/performance.cc:111
-msgid "at "
-msgstr ""
-
-#: performance.cc:164 lily/performance.cc:164
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr ""
 
-#: phrasing-slur-engraver.cc:115 lily/phrasing-slur-engraver.cc:115
+#: phrasing-slur-engraver.cc:146
 msgid "unterminated phrasing slur"
 msgstr ""
 
-#: piano-pedal-engraver.cc:224 lily/piano-pedal-engraver.cc:224
+#: piano-pedal-engraver.cc:286
 #, c-format
-msgid "expect 3 strings for piano pedals, found: %d"
+msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:240 piano-pedal-engraver.cc:255
-#: piano-pedal-performer.cc:80 lily/piano-pedal-engraver.cc:240
-#: lily/piano-pedal-engraver.cc:255 lily/piano-pedal-performer.cc:80
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
+#: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr ""
 
-#: piano-pedal-engraver.cc:305 lily/piano-pedal-engraver.cc:305
+#: piano-pedal-engraver.cc:347
 #, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr ""
 
-#: property-iterator.cc:90 lily/property-iterator.cc:90
+#: program-option.cc:205
 #, c-format
-msgid "not a grob name, `%s'"
+msgid "no such internal option: %s"
 msgstr ""
 
-#: quote-iterator.cc:254 lily/quote-iterator.cc:254
+#: property-iterator.cc:74
 #, c-format
-msgid "in quotation: junking event %s"
+msgid "not a grob name, `%s'"
 msgstr ""
 
-#: relative-octave-check.cc:38 lily/relative-octave-check.cc:38
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
-#: rest-collision.cc:147 lily/rest-collision.cc:147
-msgid "rest direction not set.  Cannot resolve collision."
+#: relocate.cc:44
+#, c-format
+msgid "Setting %s to %s"
+msgstr ""
+
+#: relocate.cc:59
+#, c-format
+msgid "no such file: %s for %s"
 msgstr ""
 
-#: rest-collision.cc:162 rest-collision.cc:208 lily/rest-collision.cc:162
-#: lily/rest-collision.cc:208
-msgid "too many colliding rests"
+#: relocate.cc:69 relocate.cc:87
+#, c-format
+msgid "no such directory: %s for %s"
 msgstr ""
 
-#: rest.cc:140 lily/rest.cc:140
+#: relocate.cc:79
 #, c-format
-msgid "rest `%s' not found"
+msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: scm-option.cc:54 lily/scm-option.cc:54
+#: relocate.cc:99
 #, c-format
-msgid "lilypond -e EXPR means:"
+msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: scm-option.cc:56 lily/scm-option.cc:56
+#: relocate.cc:129
 #, c-format
-msgid "  Evalute the Scheme EXPR before parsing any .ly files."
+msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: scm-option.cc:58 lily/scm-option.cc:58
+#: relocate.cc:169
 #, c-format
-msgid ""
-"  Multiple -e options may be given, they will be evaluated sequentially."
+msgid "Relocation: is absolute: argv0=%s"
+msgstr ""
+
+#: relocate.cc:176
+#, c-format
+msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: scm-option.cc:60 lily/scm-option.cc:60
+#: relocate.cc:185
 #, c-format
 msgid ""
-"  The function ly:set-option allows for access to some internal variables."
+"Relocation: from PATH=%s\n"
+"argv0=%s"
 msgstr ""
 
-#: scm-option.cc:62 lily/scm-option.cc:62
+#: relocate.cc:354
 #, c-format
-msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
+msgid "Relocation file: %s"
 msgstr ""
 
-#: scm-option.cc:64 lily/scm-option.cc:64
+#: relocate.cc:390
 #, c-format
-msgid "Use help as SYMBOL to get online help."
+msgid "Unknown relocation command %s"
+msgstr ""
+
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: scm-option.cc:135 scm-option.cc:175 lily/scm-option.cc:135
-#: lily/scm-option.cc:175
+#: rest-collision.cc:165 rest-collision.cc:210
+msgid "too many colliding rests"
+msgstr ""
+
+#: rest.cc:144
 #, c-format
-msgid "no such internal option: %s"
+msgid "rest `%s' not found"
 msgstr ""
 
-#: score-engraver.cc:105 lily/score-engraver.cc:105
+#: score-engraver.cc:67
 #, c-format
 msgid "cannot find `%s'"
 msgstr ""
 
-#: score-engraver.cc:107 lily/score-engraver.cc:107
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr ""
 
-#: score-engraver.cc:109 lily/score-engraver.cc:109
+#: score-engraver.cc:71
 #, c-format
 msgid "Search path `%s'"
 msgstr ""
 
-#: score.cc:213 lily/score.cc:213
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:225
 msgid "already have music in score"
 msgstr ""
 
-#: score.cc:214 lily/score.cc:214
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:219 lily/score.cc:219
+#: score.cc:231
 msgid "errors found, ignoring music expression"
 msgstr ""
 
 #. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
-#: script-engraver.cc:100 lily/script-engraver.cc:100
-msgid "don't know how to interpret articulation: "
+#: script-engraver.cc:102
+msgid "do not know how to interpret articulation: "
 msgstr ""
 
-#: script-engraver.cc:101 lily/script-engraver.cc:101
+#: script-engraver.cc:103
 msgid "scheme encoding: "
 msgstr ""
 
-#. 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:52 separation-item.cc:96 lily/separation-item.cc:52
-#: lily/separation-item.cc:96
-msgid "Separation_item:  I've been drinking too much"
-msgstr ""
-
-#: simple-spacer.cc:410 lily/simple-spacer.cc:410
+#: simple-spacer.cc:375
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:113 lily/slur-engraver.cc:113
-msgid "unterminated slur"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:122 lily/slur-engraver.cc:122
-msgid "can't end slur"
+#: slur-engraver.cc:157
+msgid "unterminated slur"
 msgstr ""
 
-#: source-file.cc:55 lily/source-file.cc:55
-#, c-format
-msgid "can't open file: `%s'"
+#: slur-engraver.cc:166
+msgid "cannot end slur"
 msgstr ""
 
-#: source-file.cc:68 lily/source-file.cc:68
+#: source-file.cc:74
 #, c-format
 msgid "expected to read %d characters, got %d"
 msgstr ""
 
-#: spacing-spanner.cc:377 lily/spacing-spanner.cc:377
-#, c-format
-msgid "Global shortest duration is %s"
+#: staff-symbol-engraver.cc:62
+msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:88 lily/stem-engraver.cc:88
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
-#: stem-engraver.cc:125 lily/stem-engraver.cc:125
+#: stem-engraver.cc:129
 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr ""
 
-#: stem-engraver.cc:126 lily/stem-engraver.cc:126
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:124 lily/stem.cc:124
+#: stem.cc:105
 msgid "weird stem size, check for narrow beams"
 msgstr ""
 
-#: stem.cc:577 lily/stem.cc:577
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:588 lily/stem.cc:588
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:145 lily/system.cc:145
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:224 lily/system.cc:224
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: system.cc:240 lily/system.cc:240
-msgid "Calculating line breaks..."
-msgstr ""
-
-#: text-spanner-engraver.cc:61 lily/text-spanner-engraver.cc:61
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:75 lily/text-spanner-engraver.cc:75
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:136 lily/text-spanner-engraver.cc:136
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr ""
 
-#. 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:106 lily/tfm-reader.cc:106
-#, c-format
-msgid "TFM header of `%s' has only %u word (s)"
-msgstr ""
-
-#: tfm-reader.cc:139 lily/tfm-reader.cc:139
-#, c-format
-msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
-msgstr ""
-
-#: tfm.cc:70 lily/tfm.cc:70
-#, c-format
-msgid "can't find ascii character: %d"
-msgstr ""
-
-#: tie-engraver.cc:194 lily/tie-engraver.cc:194
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr ""
 
-#: time-scaled-music-iterator.cc:22 lily/time-scaled-music-iterator.cc:22
-msgid "no one to print a tuplet start bracket"
-msgstr ""
-
-#.
-#. 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:54 lily/time-signature-engraver.cc:54
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. 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:83 lily/time-signature.cc:83
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
 
-#: translator-ctors.cc:52 lily/translator-ctors.cc:52
+#: translator-ctors.cc:52
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr ""
 
-#: trill-spanner-engraver.cc:68 lily/trill-spanner-engraver.cc:68
-msgid "can't find start of trill spanner"
+#: translator-group.cc:151
+#, c-format
+msgid "cannot find: `%s'"
 msgstr ""
 
-#: trill-spanner-engraver.cc:82 lily/trill-spanner-engraver.cc:82
-msgid "already have a trill spanner"
+#: translator.cc:332
+#, c-format
+msgid "Two simultaneous %s events, junking this one"
+msgstr ""
+
+#: translator.cc:333
+#, c-format
+msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:142 lily/trill-spanner-engraver.cc:142
-msgid "unterminated trill spanner"
+#: trill-spanner-engraver.cc:68
+msgid "cannot find start of trill spanner"
 msgstr ""
 
-#: tuplet-bracket.cc:438 lily/tuplet-bracket.cc:438
-msgid "removing tuplet bracket across linebreak"
+#: trill-spanner-engraver.cc:80
+msgid "already have a trill spanner"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:341 lily/vaticana-ligature-engraver.cc:341
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:568 lily/vaticana-ligature-engraver.cc:568
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
 
-#: vaticana-ligature.cc:87 lily/vaticana-ligature.cc:87
+#: vaticana-ligature.cc:84
 msgid "flexa-height undefined; assuming 0"
 msgstr ""
 
-#: vaticana-ligature.cc:93 lily/vaticana-ligature.cc:93
+#: vaticana-ligature.cc:89
 msgid "ascending vaticana style flexa"
 msgstr ""
 
-#: vaticana-ligature.cc:182 lily/vaticana-ligature.cc:182
+#: vaticana-ligature.cc:177
 msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
-#. fixme: be more verbose.
-#. fixme: be more verbose.
-#. fixme: be more verbose.
-#. fixme: be more verbose.
-#. fixme: be more verbose.
-#: volta-engraver.cc:127 lily/volta-engraver.cc:127
-msgid "can't end volta spanner"
+#: volta-engraver.cc:144
+msgid "cannot end volta spanner"
 msgstr ""
 
-#: volta-engraver.cc:137 lily/volta-engraver.cc:137
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: volta-engraver.cc:141 lily/volta-engraver.cc:141
+#: volta-engraver.cc:158
 msgid "also already have an ended spanner"
 msgstr ""
 
-#: parser.yy:90
-msgid "tag must be symbol or list of symbols"
-msgstr ""
-
-#: parser.yy:656
-msgid "identifier should have alphabetic characters only"
+#: volta-engraver.cc:159
+msgid "giving up"
 msgstr ""
 
-#: parser.yy:814
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:838
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:983
-msgid "more alternatives than repeats"
-msgstr ""
-
-#: parser.yy:1020
-#, c-format
-msgid "expect 2 elements for Chord tremolo, found %d"
-msgstr ""
-
-#: parser.yy:1175
-msgid "music head function must return Music object"
-msgstr ""
-
-#: parser.yy:1447
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1807
+#: parser.yy:1475
 msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1846 parser.yy:1851 parser.yy:2332
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1944
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:2107 parser.yy:2157
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:2251
+#: parser.yy:1926
 msgid "have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:2345
+#: parser.yy:1987
 msgid "have to be in Chord mode for chords"
 msgstr ""
 
-#: parser.yy:2496
-msgid "need integer number arg"
+#: lexer.ll:176
+msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: parser.yy:2694
-#, c-format
-msgid "suspect duration in beam: %s"
+#: lexer.ll:180
+msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:193
+#: lexer.ll:235
 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr ""
 
-#: lexer.ll:201
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:205
-msgid "quoted string expected after \\renameinput"
+#: lexer.ll:256
+msgid "quoted string expected after \\sourcefilename"
+msgstr ""
+
+#: lexer.ll:260
+msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:218
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:233
+#: lexer.ll:288
 msgid "\\maininput not allowed outside init files"
 msgstr ""
 
-#: lexer.ll:257
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:266
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:428
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:527
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:616
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 
-#: lexer.ll:703 lexer.ll:704
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:801 lexer.ll:802
-#, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr ""
-
-#: lexer.ll:802 lexer.ll:803
-msgid "Consider updating the input with the convert-ly script"
-msgstr ""
-
-#. TODO: print location
-#: lexer.ll:939 lexer.ll:940
-msgid "can't find signature for music function"
-msgstr ""
-
-#: out/parser.cc:1893
-msgid "syntax error: cannot back up"
-msgstr ""
-
-#: out/parser.cc:1993
-msgid "Stack now"
-msgstr ""
-
-#: out/parser.cc:2021
+#: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Reducing stack by rule %d (line %u), "
-msgstr ""
-
-#. Each stack pointer address is followed by the size of the
-#. data in use in that stack, in bytes.  This used to be a
-#. conditional around just the two extra args, but that might
-#. be undefined if yyoverflow is a macro.
-#: out/parser.cc:2351 out/parser.cc:5824
-msgid "parser stack overflow"
+msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
-#: out/parser.cc:2391
-#, c-format
-msgid "Stack size increased to %lu\n"
+#: lexer.ll:881 lexer.ll:882
+msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: out/parser.cc:2398
+#: lexer.ll:887 lexer.ll:888
 #, c-format
-msgid "Entering state %d\n"
-msgstr ""
-
-#: out/parser.cc:2422
-msgid "Reading a token: "
-msgstr ""
-
-#: out/parser.cc:2429
-msgid "Now at end of input.\n"
-msgstr ""
-
-#: out/parser.cc:2434
-msgid "Next token is"
-msgstr ""
-
-#. Shift the look-ahead token.
-#. Shift the error token.
-#: out/parser.cc:2455 out/parser.cc:5796
-msgid "Shifting"
+msgid "program too old: %s (file requires: %s)"
 msgstr ""
 
-#. This is so xgettext sees the translatable formats that are
-#. constructed on the fly.
-#: out/parser.cc:5615
-#, c-format
-msgid "syntax error, unexpected %s"
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, scheme-format
+msgid "Invoking `~a'..."
 msgstr ""
 
-#: out/parser.cc:5616
-#, c-format
-msgid "syntax error, unexpected %s, expecting %s"
+#: backend-library.scm:24
+#, scheme-format
+msgid "`~a' failed (~a)"
 msgstr ""
 
-#: out/parser.cc:5617
-#, c-format
-msgid "syntax error, unexpected %s, expecting %s or %s"
+#: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
+#, scheme-format
+msgid "Converting to `~a'..."
 msgstr ""
 
-#: out/parser.cc:5618
-#, c-format
-msgid "syntax error, unexpected %s, expecting %s or %s or %s"
+#: backend-library.scm:108
+#, scheme-format
+msgid "Converting to ~a..."
 msgstr ""
 
-#: out/parser.cc:5619
-#, c-format
-msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s"
+#: backend-library.scm:145
+#, scheme-format
+msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
-#: out/parser.cc:5693
-msgid "syntax error; also memory exhausted"
+#: define-context-properties.scm:20 define-grob-properties.scm:10
+#: define-music-properties.scm:10
+#, scheme-format
+msgid "symbol ~S redefined"
 msgstr ""
 
-#: out/parser.cc:5697
-msgid "syntax error"
+#: define-event-classes.scm:119
+#, scheme-format
+msgid "event class ~A seems to be unused"
 msgstr ""
 
-#: out/parser.cc:5718 out/parser.cc:5778
-msgid "Error: popping"
+#. should be programming-error
+#: define-event-classes.scm:125
+#, scheme-format
+msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: out/parser.cc:5724
-msgid "Error: discarding"
+#: define-markup-commands.scm:255
+msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: out/parser.cc:5813
-msgid "Error: discarding lookahead"
+#: define-markup-commands.scm:1297
+#, scheme-format
+msgid "not a valid duration string: ~a"
 msgstr ""
 
-#: backend-library.scm:18
-#, lisp-format
-msgid "Invoking `~a'..."
+#: define-music-types.scm:751
+#, scheme-format
+msgid "symbol expected: ~S"
 msgstr ""
 
-#: backend-library.scm:23
-#, lisp-format
-msgid "`~a' failed (~a)"
+#: define-music-types.scm:754
+#, scheme-format
+msgid "cannot find music object: ~S"
 msgstr ""
 
-#: backend-library.scm:42 framework-tex.scm:332 framework-tex.scm:357
-#, lisp-format
-msgid "Converting to `~a'..."
+#: define-music-types.scm:774
+#, scheme-format
+msgid "unknown repeat type `~S'"
 msgstr ""
 
-#. Do not try to guess the name of the png file,
-#. GS produces PNG files like BASE-page%d.png.
-#. (ly:message (_ "Converting to `~a'...")
-#. (string-append (basename name ".ps") "-page1.png" )))
-#: backend-library.scm:65
-#, lisp-format
-msgid "Converting to ~a..."
+#: define-music-types.scm:775
+msgid "See music-types.scm for supported repeats"
 msgstr ""
 
-#: backend-library.scm:95
-#, lisp-format
-msgid "Writing header field `~a' to `~a'..."
+#: document-backend.scm:91
+#, scheme-format
+msgid "pair expected in doc ~s"
 msgstr ""
 
-#: beam.scm:79
-#, lisp-format
-msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
+#: document-backend.scm:135
+#, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr ""
 
-#: beam.scm:93
-#, lisp-format
-msgid "Error in beam quanting.  Expected ~S 0, found ~S."
+#: document-backend.scm:145
+#, scheme-format
+msgid "unknown Grob interface: ~S"
 msgstr ""
 
-#: clef.scm:124
-#, lisp-format
-msgid "unknown clef type `~a'"
+#: documentation-lib.scm:45
+#, scheme-format
+msgid "Processing ~S..."
 msgstr ""
 
-#: clef.scm:125
-msgid "see scm/clef.scm for supported clefs"
+#: documentation-lib.scm:150
+#, scheme-format
+msgid "Writing ~S..."
 msgstr ""
 
-#: define-context-properties.scm:13 define-grob-properties.scm:10
-#: define-music-properties.scm:10
-#, lisp-format
-msgid "symbol ~S redefined"
+#: documentation-lib.scm:172
+#, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr ""
 
-#: define-markup-commands.scm:79
-#, lisp-format
-msgid "Could not find bounding box of `~a'"
+#: framework-eps.scm:91 framework-eps.scm:92
+#, scheme-format
+msgid "Writing ~a..."
 msgstr ""
 
-#: define-markup-commands.scm:110
-msgid "no systems found in \\score markup, does it have a \\layout block?"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: define-markup-commands.scm:651
-#, lisp-format
-msgid "not a valid duration string: ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: define-music-types.scm:802
-#, lisp-format
-msgid "symbol expected: ~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: define-music-types.scm:805
-#, lisp-format
-msgid "can't find music object: ~S"
+#: framework-ps.scm:380
+#, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: define-music-types.scm:825
-#, lisp-format
-msgid "unknown repeat type `~S'"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: define-music-types.scm:826
-msgid "See music-types.scm for supported repeats"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: document-backend.scm:91
-#, lisp-format
-msgid "pair expected in doc ~s"
+#: framework-ps.scm:758
+msgid ""
+"\n"
+"The PostScript backend does not support the 'classic'\n"
+"framework. Use the EPS backend instead,\n"
+"\n"
+"  lilypond -b eps <file>\n"
+"\n"
+"or remove the lilypond-book specific settings from the input.\n"
 msgstr ""
 
-#: document-backend.scm:135
-#, lisp-format
-msgid "can't find interface for property: ~S"
+#: framework-tex.scm:360
+#, scheme-format
+msgid "TeX file name must not contain whitespace: `~a'"
 msgstr ""
 
-#: document-backend.scm:144
-#, lisp-format
-msgid "unknown interface: ~S"
+#: layout-beam.scm:29
+#, scheme-format
+msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
-#: documentation-lib.scm:45
-#, lisp-format
-msgid "Processing ~S..."
+#: layout-beam.scm:46
+#, scheme-format
+msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: documentation-lib.scm:160
-#, lisp-format
-msgid "Writing ~S..."
+#: layout-page-layout.scm:357
+msgid "Calculating page breaks..."
 msgstr ""
 
-#: documentation-lib.scm:182
-#, lisp-format
-msgid "can't find description for property ~S"
+#: lily-library.scm:593
+#, scheme-format
+msgid "unknown unit: ~S"
 msgstr ""
 
-#: framework-eps.scm:45 framework-eps.scm:46
-#, lisp-format
-msgid "Writing ~a..."
+#: lily-library.scm:626
+#, scheme-format
+msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: framework-ps.scm:236
-#, lisp-format
-msgid "can't find CFF/PFA/PFB font ~S=~S"
+#: lily-library.scm:633
+msgid "old relative compatibility not used"
 msgstr ""
 
-#: framework-ps.scm:368
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: lily.scm:144
+#, scheme-format
+msgid "cannot find: ~A"
 msgstr ""
 
-#: framework-ps.scm:383 framework-ps.scm:386
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: lily.scm:209
+#, scheme-format
+msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: framework-tex.scm:349
-#, lisp-format
-msgid "TeX file name must not contain whitespace: `~a'"
+#: lily.scm:525 lily.scm:589
+#, scheme-format
+msgid "failed files: ~S"
 msgstr ""
 
-#: lily-library.scm:314
-#, lisp-format
-msgid "unknown unit: ~S"
+#: lily.scm:579
+#, scheme-format
+msgid "Redirecting output to ~a..."
 msgstr ""
 
-#: lily-library.scm:347
-#, lisp-format
-msgid "no \\version statement found,  add~afor future compatibility"
+#: ly-syntax-constructors.scm:40
+msgid "Music head function must return Music object"
 msgstr ""
 
-#: lily-library.scm:354
-msgid "old relative compatibility not used"
+#: ly-syntax-constructors.scm:136
+#, scheme-format
+msgid "Invalid property operation ~a"
 msgstr ""
 
-#: lily.scm:97
-#, lisp-format
-msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
+#: markup.scm:123
+#, scheme-format
+msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: lily.scm:319
-#, lisp-format
-msgid "failed files: ~S"
+#: markup.scm:129
+#, scheme-format
+msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
-msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
+#: music-functions.scm:213
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
-msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
+#: music-functions.scm:232
+#, scheme-format
+msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:507
-#, lisp-format
+#: music-functions.scm:538
+#, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:558
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:702
-#, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr ""
 
-#: music-functions.scm:875
-#, lisp-format
+#: music-functions.scm:942
+#, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 
-#: output-lib.scm:246
-#, lisp-format
-msgid "unknown bar glyph: `~S'"
-msgstr ""
-
-#: output-ps.scm:311
-msgid "utf8-string encountered in PS backend"
+#: output-ps.scm:315
+msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
-#: output-svg.scm:41
-#, lisp-format
+#: output-svg.scm:42
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
-#: output-svg.scm:119
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
-msgstr ""
-
-#: output-tex.scm:114
-#, lisp-format
-msgid "can't find ~a in ~a"
+#: output-svg.scm:132
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
-#: page-layout.scm:425
-msgid "Calculating page breaks..."
+#: output-tex.scm:98
+#, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr ""
 
-#: paper.scm:68
+#: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr ""
 
-#: paper.scm:113
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
+#: paper.scm:129
+#, scheme-format
+msgid "Unknown papersize: ~a"
+msgstr ""
+
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
+#: parser-clef.scm:126
+#, scheme-format
+msgid "unknown clef type `~a'"
+msgstr ""
+
+#: parser-clef.scm:127
+msgid "see scm/clef.scm for supported clefs"
+msgstr ""
+
+#: ps-to-png.scm:88
+#, scheme-format
+msgid "~a exited with status: ~S"
+msgstr ""
+
 #: to-xml.scm:190
-msgid "assertion failed"
+#, scheme-format
+msgid "assertion failed: ~S"
 msgstr ""