X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=po%2Flilypond.pot;h=7d30315618ee59c13a3b4fd4270e64ba0b91f5a9;hb=f14b93986622250d7cf47eb1ccd102988954b0f9;hp=267b14360712d911ddbb0ad0e8e10108f1174864;hpb=21aeaabcac6aaf49b36e92578e2add2dfe7bb089;p=lilypond.git

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 267b143607..7d30315618 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-03-29 14:04+0200\n"
+"POT-Creation-Date: 2007-06-17 22:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,815 +16,785 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lilylib.py:62
-msgid "lilylib module"
+#: convertrules.py:12
+#, python-format
+msgid "Not smart enough to convert %s"
 msgstr ""
 
-#: lilylib.py:65 lilypond-book.py:88 midi2ly.py:100 mup2ly.py:75 ps2png.py:42
-#: main.cc:135
-msgid "print this help"
+#: convertrules.py:13
+msgid "Please refer to the manual for details, and update manually."
 msgstr ""
 
-#: lilylib.py:112 midi2ly.py:136 mup2ly.py:130
+#: convertrules.py:14
 #, python-format
-msgid "Copyright (c) %s by"
+msgid "%s has been replaced by %s"
 msgstr ""
 
-#: lilylib.py:116 midi2ly.py:141 mup2ly.py:135
-msgid "Distributed under terms of the GNU General Public License."
+#: convertrules.py:2408
+msgid "LilyPond source must be UTF-8"
 msgstr ""
 
-#: lilylib.py:118 midi2ly.py:142 mup2ly.py:136
-msgid "It comes with NO WARRANTY."
+#: convertrules.py:2411
+msgid "Try the texstrings backend"
 msgstr ""
 
-#: lilylib.py:125 warn.cc:24
-#, c-format, python-format
-msgid "warning: %s"
+#: convertrules.py:2414
+#, python-format
+msgid "Do something like: %s"
 msgstr ""
 
-#: lilylib.py:128 warn.cc:30
-#, c-format, python-format
-msgid "error: %s"
+#: convertrules.py:2417
+msgid "Or save as UTF-8 in your editor"
 msgstr ""
 
-#: lilylib.py:132
+#: fontextract.py:26
 #, python-format
-msgid "Exiting (%d)..."
+msgid "Scanning %s"
 msgstr ""
 
-#: lilylib.py:200 midi2ly.py:223 mup2ly.py:219
+#: fontextract.py:71
 #, python-format
-msgid "Usage: %s [OPTIONS]... FILE"
+msgid "Extracted %s"
 msgstr ""
 
-#: lilylib.py:204 convert-ly.py:57 midi2ly.py:227 mup2ly.py:223 main.cc:204
-#, c-format
-msgid "Options:"
+#: fontextract.py:86
+#, python-format
+msgid "Writing fonts to %s"
 msgstr ""
 
-#: lilylib.py:208 convert-ly.py:68 lilypond-pdfpc-helper.py:28 midi2ly.py:231
-#: mup2ly.py:227 main.cc:208
-#, c-format, python-format
-msgid "Report bugs to %s."
+#: lilylib.py:85 lilylib.py:136
+#, python-format
+msgid "Invoking `%s'"
 msgstr ""
 
-#: lilylib.py:228
+#: lilylib.py:87 lilylib.py:138
 #, python-format
-msgid "Binary %s has version %s, looking for version %s"
+msgid "Running %s..."
 msgstr ""
 
-#: lilylib.py:262
+#: lilylib.py:203
 #, python-format
-msgid "Opening pipe `%s'"
+msgid "Usage: %s"
 msgstr ""
 
-#: lilylib.py:277 lilypond-book.py:1122
+#: abc2ly.py:1342 convert-ly.py:71 lilypond-book.py:110 midi2ly.py:858
 #, python-format
-msgid "`%s' failed (%d)"
+msgid "%s [OPTION]... FILE"
 msgstr ""
 
-#: lilylib.py:282 lilylib.py:341 lilypond-book.py:1123
-msgid "The error log is as follows:"
+#: abc2ly.py:1344
+#, python-format
+msgid ""
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: lilylib.py:313 midi2ly.py:259 mup2ly.py:255
-#, python-format
-msgid "Invoking `%s'"
+#: abc2ly.py:1348 etf2ly.py:1184 midi2ly.py:874
+msgid "write output to FILE"
 msgstr ""
 
-#: lilylib.py:315
-#, python-format
-msgid "Running %s..."
+#: abc2ly.py:1350
+msgid "be strict about succes"
 msgstr ""
 
-#: lilylib.py:334
-#, python-format
-msgid "`%s' failed (%s)"
+#: abc2ly.py:1352
+msgid "preserve ABC's notion of beams"
 msgstr ""
 
-#: lilylib.py:337 midi2ly.py:265 mup2ly.py:263
-msgid "(ignored)"
+#: abc2ly.py:1354 convert-ly.py:103 etf2ly.py:1192 lilypond-book.py:161
+#: midi2ly.py:900 musicxml2ly.py:506
+msgid "Report bugs via"
 msgstr ""
 
-#: lilylib.py:355 midi2ly.py:275 mup2ly.py:273
-#, python-format
-msgid "Cleaning %s..."
+#: convert-ly.py:32
+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:551
-msgid "Removing output file"
+#: convert-ly.py:34 lilypond-book.py:59
+msgid "Examples:"
 msgstr ""
 
-#: convert-ly.py:32
-#, python-format
-msgid "%s has been replaced by %s"
+#: 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:33
-#, python-format
-msgid "Not smart enough to convert %s"
+#: 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:34
-msgid "Please refer to the manual for details, and update manually."
+#: convert-ly.py:66 etf2ly.py:1174 lilypond-book.py:106 midi2ly.py:87
+msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:50
-#, python-format
-msgid "Usage: %s [OPTION]... [FILE]..."
+#: convert-ly.py:67 etf2ly.py:1175 lilypond-book.py:107 midi2ly.py:88
+msgid "It comes with NO WARRANTY."
 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:77 convert-ly.py:97
+msgid "VERSION"
 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:92
-#, 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:79
+msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:2402
-msgid "LilyPond source must be UTF-8"
+#: convert-ly.py:82
+msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:2405
-msgid "Try the texstrings backend"
+#: convert-ly.py:85
+msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:2408
-#, python-format
-msgid "Do something like: %s"
+#: convert-ly.py:91
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:2411
-msgid "Or save as UTF-8 in your editor"
+#: convert-ly.py:96
+msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:2462
+#: convert-ly.py:144
 msgid "Applying conversion: "
 msgstr ""
 
-#: convert-ly.py:2474
-#, python-format
-msgid "%s: error while converting"
+#: convert-ly.py:157
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:2477 score-engraver.cc:111
-msgid "Aborting"
+#: convert-ly.py:159
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:2498
+#: convert-ly.py:181
 #, python-format
 msgid "Processing `%s'... "
 msgstr ""
 
-#: convert-ly.py:2600
+#: convert-ly.py:268 relocate.cc:362 source-file.cc:54
+#, c-format, python-format
+msgid "cannot open file: `%s'"
+msgstr ""
+
+#: convert-ly.py:275
 #, python-format
-msgid "%s: cannot determine version for `%s'"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr ""
 
-#: convert-ly.py:2609
+#: etf2ly.py:1180
 #, python-format
-msgid "%s: skipping: `%s'"
+msgid "%s [OPTION]... ETF-FILE"
 msgstr ""
 
-#: lilypond-book.py:70
+#: etf2ly.py:1182
 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"
+"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:1185 midi2ly.py:875 musicxml2ly.py:499 main.cc:154 main.cc:159
+msgid "FILE"
 msgstr ""
 
-#: lilypond-book.py:82 main.cc:129
-msgid "EXT"
+#: etf2ly.py:1187 lilypond-book.py:158 midi2ly.py:888 main.cc:163
+msgid "show warranty and copyright"
 msgstr ""
 
-#: lilypond-book.py:83
+#: lilypond-book.py:57
 msgid ""
-"use output format EXT (texi [default], texi-html,\n"
-"\t\tlatex, html)"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr ""
+
+#: lilypond-book.py:64
+msgid "BOOK"
+msgstr ""
+
+#: lilypond-book.py:72
+#, python-format
+msgid "Exiting (%d)..."
+msgstr ""
+
+#: lilypond-book.py:104
+#, python-format
+msgid "Copyright (c) %s by"
 msgstr ""
 
-#: lilypond-book.py:85
+#: lilypond-book.py:114
 msgid "FILTER"
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:117
 msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr ""
 
-#: lilypond-book.py:89 lilypond-book.py:91 main.cc:137
-msgid "DIR"
+#: lilypond-book.py:120
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr ""
 
-#: lilypond-book.py:90
+#: lilypond-book.py:123
 msgid "add DIR to include path"
 msgstr ""
 
-#: lilypond-book.py:92
+#: lilypond-book.py:124 lilypond-book.py:136 main.cc:153
+msgid "DIR"
+msgstr ""
+
+#: lilypond-book.py:129
+msgid "PAD"
+msgstr ""
+
+#: lilypond-book.py:135
 msgid "write output to DIR"
 msgstr ""
 
-#: lilypond-book.py:93
+#: lilypond-book.py:140
 msgid "COMMAND"
 msgstr ""
 
-#: lilypond-book.py:94
+#: lilypond-book.py:141
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:96 midi2ly.py:105 mup2ly.py:78 ps2png.py:43 main.cc:150
-msgid "be verbose"
+#: lilypond-book.py:147
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:150
+msgid ""
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:98
-msgid "print version information"
+#: lilypond-book.py:153 midi2ly.py:885 musicxml2ly.py:490 main.cc:162
+msgid "be verbose"
 msgstr ""
 
-#: lilypond-book.py:100 midi2ly.py:107 mup2ly.py:80 main.cc:151
-msgid "show warranty and copyright"
+#: lilypond-book.py:768
+#, python-format
+msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:706
+#: lilypond-book.py:999
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:709
+#: lilypond-book.py:1002
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:713
+#: lilypond-book.py:1006
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:716
+#: lilypond-book.py:1009
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:735
+#: lilypond-book.py:1028
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:772
+#: lilypond-book.py:1382
 #, python-format
-msgid "file not found: %s"
+msgid "Opening filter `%s'"
 msgstr ""
 
-#: lilypond-book.py:1105
+#: lilypond-book.py:1399
 #, python-format
-msgid "Opening filter `%s'"
+msgid "`%s' failed (%d)"
+msgstr ""
+
+#: lilypond-book.py:1400
+msgid "The error log is as follows:"
+msgstr ""
+
+#: lilypond-book.py:1472
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1247
+#: lilypond-book.py:1583
 msgid "Writing snippets..."
 msgstr ""
 
-#: lilypond-book.py:1252
+#: lilypond-book.py:1588
 msgid "Processing..."
 msgstr ""
 
-#: lilypond-book.py:1256
+#: lilypond-book.py:1592
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1266
+#: lilypond-book.py:1602
 #, python-format
 msgid "cannot determine format for: %s"
 msgstr ""
 
-#: lilypond-book.py:1311
+#: lilypond-book.py:1613
+#, python-format
+msgid "%s is up to date."
+msgstr ""
+
+#: lilypond-book.py:1619
+#, python-format
+msgid "Writing `%s'..."
+msgstr ""
+
+#: lilypond-book.py:1674
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1678
 #, python-format
 msgid "Reading %s..."
 msgstr ""
 
-#: lilypond-book.py:1334
+#: lilypond-book.py:1697
 msgid "Dissecting..."
 msgstr ""
 
-#: lilypond-book.py:1365
+#: lilypond-book.py:1713
 #, python-format
 msgid "Compiling %s..."
 msgstr ""
 
-#: lilypond-book.py:1373
+#: lilypond-book.py:1722
 #, python-format
 msgid "Processing include: %s"
 msgstr ""
 
-#: lilypond-book.py:1383
+#: lilypond-book.py:1736
 #, python-format
 msgid "Removing `%s'"
 msgstr ""
 
-#: lilypond-book.py:1398 midi2ly.py:1016 ps2png.py:53
-#, 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
-#, 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"
-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]"
-msgstr ""
-
-#: midi2ly.py:101
-msgid "set key: ALT=+sharps|-flats; MINOR=1"
-msgstr ""
-
-#: midi2ly.py:102 main.cc:138 main.cc:139
-msgid "FILE"
-msgstr ""
-
-#: midi2ly.py:102 mup2ly.py:76
-msgid "write output to FILE"
-msgstr ""
-
-#: midi2ly.py:103
-msgid "quantise note starts on DUR"
-msgstr ""
-
-#: midi2ly.py:104
-msgid "DUR*NUM/DEN"
+#: lilypond-book.py:1769
+msgid "option --psfonts not used"
 msgstr ""
 
-#: midi2ly.py:104
-msgid "allow tuplet durations DUR*NUM/DEN"
+#: lilypond-book.py:1770
+msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: midi2ly.py:106 mup2ly.py:79 main.cc:149
-msgid "print version number"
+#: lilypond-book.py:1773
+msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:108
-msgid "treat every text as a lyric"
+#: lilypond-book.py:1829
+#, python-format
+msgid "Writing fonts to %s..."
 msgstr ""
 
-#: midi2ly.py:149 mup2ly.py:143 input.cc:104
+#: midi2ly.py:95 lily-library.scm:612 lily-library.scm:621
 msgid "warning: "
 msgstr ""
 
-#: midi2ly.py:164 midi2ly.py:1016 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160
-#: input.cc:110
+#: midi2ly.py:98 midi2ly.py:913
 msgid "error: "
 msgstr ""
 
-#: midi2ly.py:165 mup2ly.py:161
+#: midi2ly.py:99
 msgid "Exiting ... "
 msgstr ""
 
-#: midi2ly.py:263 mup2ly.py:260
+#: midi2ly.py:846
 #, python-format
-msgid "command exited with value %d"
+msgid "%s output to `%s'..."
 msgstr ""
 
-#: midi2ly.py:1000
+#: midi2ly.py:860 musicxml2ly.py:486
 #, python-format
-msgid "%s output to `%s'..."
+msgid "Convert %s to LilyPond input."
 msgstr ""
 
-#: midi2ly.py:1031
-msgid "Example:"
+#: midi2ly.py:864
+msgid "print absolute pitches"
 msgstr ""
 
-#: midi2ly.py:1081
-msgid "no files specified on command line."
+#: midi2ly.py:866 midi2ly.py:878
+msgid "DUR"
 msgstr ""
 
-#: mup2ly.py:70
-msgid "Convert mup to LilyPond source."
+#: midi2ly.py:867
+msgid "quantise note durations on DUR"
 msgstr ""
 
-#: mup2ly.py:73
-msgid "debug"
+#: midi2ly.py:870
+msgid "print explicit durations"
 msgstr ""
 
-#: mup2ly.py:74
-msgid "define macro NAME [optional expansion EXP]"
+#: midi2ly.py:871
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
 msgstr ""
 
-#: mup2ly.py:77
-msgid "only pre-process"
+#: midi2ly.py:872
+msgid "ALT[:MINOR]"
 msgstr ""
 
-#: mup2ly.py:1075
-#, python-format
-msgid "no such context: %s"
+#: midi2ly.py:877
+msgid "quantise note starts on DUR"
 msgstr ""
 
-#: mup2ly.py:1300
-#, python-format
-msgid "Processing `%s'..."
+#: midi2ly.py:880
+msgid "DUR*NUM/DEN"
 msgstr ""
 
-#: mup2ly.py:1319
-#, python-format
-msgid "Writing `%s'..."
+#: midi2ly.py:883
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:891
+msgid "treat every text as a lyric"
 msgstr ""
 
-#. ugr.
-#: ps2png.py:37
-msgid "Convert PostScript to PNG image."
+#: midi2ly.py:894
+msgid "Examples"
 msgstr ""
 
-#: ps2png.py:44
-msgid "PAPER"
+#: midi2ly.py:914
+msgid "no files specified on command line."
 msgstr ""
 
-#: ps2png.py:44
-msgid "use papersize PAPER"
+#: musicxml2ly.py:474
+msgid "musicxml2ly FILE.xml"
 msgstr ""
 
-#: ps2png.py:45
-msgid "RES"
+#: musicxml2ly.py:477
+#, 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:45
-msgid "set the resolution of the preview to RES"
+#: musicxml2ly.py:496
+msgid "Use lxml.etree; uses less memory and cpu time."
 msgstr ""
 
-#. # FIXME: silly message containing %d
-#: ps2png.py:77
-#, python-format
-msgid "Wrote `%s'"
+#: musicxml2ly.py:504
+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:43
+#: warn.cc:68 grob.cc:557 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr ""
 
-#: warn.cc:44
-msgid "Continuing; crossing fingers"
-msgstr ""
-
-#: accidental-engraver.cc:235
-#, c-format
-msgid "Accidental typesetting list must begin with context-name: %s"
-msgstr ""
-
-#: accidental-engraver.cc:263
-#, c-format
-msgid "ignoring unknown accidental: %s"
-msgstr ""
-
-#: accidental-engraver.cc:279
-#, c-format
-msgid "Accidental rule must be pair or context-name; Found %s"
+#: warn.cc:69 input.cc:83
+msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental.cc:233 key-signature-interface.cc:127
+#: accidental-engraver.cc:247
 #, c-format
-msgid "accidental `%s' not found"
+msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: afm.cc:143
+#: accidental-engraver.cc:274
 #, c-format
-msgid "Error parsing AFM file: `%s'"
+msgid "ignoring unknown accidental rule: %s"
 msgstr ""
 
-#. FIXME: broken sentence
-#: all-font-metrics.cc:176
+#: accidental-engraver.cc:290
 #, c-format
-msgid "checksum mismatch for font file: `%s'"
+msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: all-font-metrics.cc:178
+#: accidental.cc:160
 #, c-format
-msgid "does not match: `%s'"
+msgid "Could not find glyph-name for alteration %s"
 msgstr ""
 
-#: all-font-metrics.cc:184
-msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
+#: accidental.cc:175
+msgid "natural alteration glyph not found"
 msgstr ""
 
-#: all-font-metrics.cc:186
-msgid "Rerun with -V to show font paths."
+#: align-interface.cc:322
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:188
-msgid "A script for removing font-files is delivered with the source-code:"
-msgstr ""
-
-#: all-font-metrics.cc:297
+#: all-font-metrics.cc:143
 #, c-format
-msgid "can't find font: `%s'"
-msgstr ""
-
-#: all-font-metrics.cc:298
-msgid "Loading default font"
+msgid "cannot find font: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:313
-#, c-format
-msgid "can't find default font: `%s'"
+#: apply-context-iterator.cc:31
+msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: all-font-metrics.cc:314 includable-lexer.cc:59 lily-parser-scheme.cc:69
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, c-format
-msgid "(search path: `%s')"
+msgid "cannot change, already in translator: %s"
 msgstr ""
 
-#: all-font-metrics.cc:315
-msgid "Giving up"
+#: axis-group-engraver.cc:78
+msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: apply-context-iterator.cc:33
-msgid "\\applycontext argument is not a procedure"
+#: axis-group-engraver.cc:79
+msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:60
-msgid "Can't switch translators, I'm there already"
+#: axis-group-engraver.cc:80
+msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-engraver.cc:112
-msgid ""
-"Axis_group_engraver: vertical group already has a parent.\n"
-"Do you have two Axis_group_engravers?\n"
-"Killing this vertical group."
+#: axis-group-interface.cc:505
+msgid "an outside-staff object should have a direction, defaulting to up"
 msgstr ""
 
-#: bar-check-iterator.cc:66
+#: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr ""
 
-#: beam-engraver.cc:136
+#: beam-engraver.cc:126
 msgid "already have a beam"
 msgstr ""
 
-#: beam-engraver.cc:205
+#: beam-engraver.cc:202
 msgid "unterminated beam"
 msgstr ""
 
-#: beam-engraver.cc:238 chord-tremolo-engraver.cc:165
+#: beam-engraver.cc:244 chord-tremolo-engraver.cc:138
 msgid "stem must have Rhythmic structure"
 msgstr ""
 
-#: beam-engraver.cc:251
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:252
+msgid "stem does not fit in beam"
 msgstr ""
 
-#: beam-engraver.cc:252
+#: beam-engraver.cc:253
 msgid "beam was started here"
 msgstr ""
 
-#: beam.cc:142
-msgid "beam has less than two visible stems"
+#: beam-quanting.cc:309
+msgid "no feasible beam position"
 msgstr ""
 
-#: beam.cc:147
-msgid "removing beam with less than two stems"
+#: beam.cc:160
+msgid "removing beam with no stems"
 msgstr ""
 
-#: beam.cc:988
+#: beam.cc:1039
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:205
+#: break-alignment-interface.cc:195
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr ""
 
-#: 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.
+#: change-iterator.cc:82
+msgid "cannot find context to switch to"
 msgstr ""
 
-#.
 #. We could change the current translator's id, but that would make
-#. errors hard to catch
+#. errors hard to catch.
 #.
-#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
-#.
-#: change-iterator.cc:92
-msgid "I'm one myself"
+#. last->translator_id_string () = get_change
+#. ()->change_to_id_string ();
+#: change-iterator.cc:91
+#, c-format
+msgid "not changing to same context type: %s"
 msgstr ""
 
+#. FIXME: uncomprehensable message
 #: change-iterator.cc:95
 msgid "none of these in my family"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:94
-#, c-format
-msgid "Chord tremolo with %d elements. Must have two elements."
+#: chord-tremolo-engraver.cc:88
+msgid "No tremolo to end"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:131
+#: chord-tremolo-engraver.cc:110
 msgid "unterminated chord tremolo"
 msgstr ""
 
-#: chord-tremolo-iterator.cc:64
-msgid "no one to print a tremolos"
+#: chord-tremolo-iterator.cc:35
+#, c-format
+msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:57
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
 
-#: cluster.cc:118
+#: cluster.cc:110
 #, c-format
 msgid "unknown cluster style `%s'"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:84
+#: cluster.cc:135
+msgid "junking empty cluster"
+msgstr ""
+
+#: coherent-ligature-engraver.cc:100
 #, c-format
-msgid "gotcha: ptr=%ul"
+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
+msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:96
+#: context-def.cc:130
 #, c-format
-msgid "distance=%f"
+msgid "program has no such type: `%s'"
+msgstr ""
+
+#: context-property.cc:30
+msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:139
+#: context.cc:144
 #, c-format
-msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
+msgid "cannot find or create new `%s'"
 msgstr ""
 
-#: context-def.cc:111
+#: context.cc:206
 #, c-format
-msgid "Program has no such type: `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr ""
 
-#: context-def.cc:285
+#: context.cc:268
 #, c-format
-msgid "can't find: `%s'"
+msgid "Invalid CreateContext event: Cannot create %s context"
 msgstr ""
 
-#: context.cc:148
+#: context.cc:380
 #, c-format
-msgid "Cannot find or create new `%s'"
+msgid "cannot find or create: `%s'"
 msgstr ""
 
-#: context.cc:212
+#: custos.cc:77
 #, c-format
-msgid "Cannot 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:303
+#: dispatcher.cc:78
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "Unknown event class %s"
 msgstr ""
 
-#: custos.cc:83
+#: dots.cc:37
 #, c-format
-msgid "custos `%s' not found"
+msgid "dot `%s' not found"
 msgstr ""
 
-#: dynamic-engraver.cc:171 span-dynamic-performer.cc:84
-msgid "can't find start of (de)crescendo"
+#: dynamic-engraver.cc:184
+msgid "cannot find start of (de)crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:180
+#: dynamic-engraver.cc:193
 msgid "already have a decrescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:182
+#: dynamic-engraver.cc:195
 msgid "already have a crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:185
-msgid "Cresc started here"
+#: dynamic-engraver.cc:198
+msgid "cresc starts here"
 msgstr ""
 
-#: dynamic-engraver.cc:304
+#: dynamic-engraver.cc:327
 msgid "unterminated (de)crescendo"
 msgstr ""
 
-#: event-chord-iterator.cc:55 output-property-music-iterator.cc:29
-#, c-format
-msgid "Junking event: `%s'"
+#: extender-engraver.cc:142 extender-engraver.cc:151
+msgid "unterminated extender"
 msgstr ""
 
-#: extender-engraver.cc:139 extender-engraver.cc:148
-msgid "unterminated extender"
+#: font-config.cc:28
+msgid "Initializing FontConfig..."
 msgstr ""
 
-#: folded-repeat-iterator.cc:64
-msgid "no one to print a repeat brace"
+#: font-config.cc:44
+#, c-format
+msgid "Rebuilding FontConfig cache %s, this may take a while..."
 msgstr ""
 
-#: font-config.cc:23
-msgid "FontConfig failed to initialize"
+#: font-config.cc:55
+#, c-format
+msgid "failed adding font directory: %s"
 msgstr ""
 
-#: font-config.cc:37
+#: font-config.cc:57
 #, c-format
-msgid "Failed to add lilypond directory %s"
+msgid "adding font directory: %s"
 msgstr ""
 
-#: glissando-engraver.cc:97
-msgid "Unterminated glissando."
+#: general-scheme.cc:198
+msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: global-context-scheme.cc:50 global-context-scheme.cc:78
-msgid "Need music in a score"
+#: general-scheme.cc:199
+msgid "setting to zero"
 msgstr ""
 
-#: global-context-scheme.cc:68
-msgid "Interpreting music... "
+#: general-scheme.cc:417 output-ps.scm:61
+msgid "Found infinity or nan in output. Substituting 0.0"
 msgstr ""
 
-#: global-context-scheme.cc:89
-#, c-format
-msgid "elapsed time: %.2f seconds"
+#: glissando-engraver.cc:94
+msgid "unterminated glissando"
 msgstr ""
 
-#: global-context.cc:160
-#, c-format
-msgid "can't find `%s' context"
+#: global-context-scheme.cc:87 global-context-scheme.cc:105
+msgid "no music found in score"
 msgstr ""
 
-#: gourlay-breaking.cc:199
-#, c-format
-msgid "Optimal demerits: %f"
+#: global-context-scheme.cc:95
+msgid "Interpreting music... "
 msgstr ""
 
-#: gourlay-breaking.cc:204
-msgid "No feasible line breaking found"
+#: global-context-scheme.cc:118
+#, c-format
+msgid "elapsed time: %.2f seconds"
 msgstr ""
 
 #: gregorian-ligature-engraver.cc:59
@@ -837,141 +807,195 @@ msgstr ""
 msgid "implied \\%s added"
 msgstr ""
 
-#: grob-interface.cc:45
+#. 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 ""
+
+#. (pitch == prev_pitch)
+#: gregorian-ligature-engraver.cc:224
+msgid "cannot apply `\\~' on heads with identical pitch"
+msgstr ""
+
+#: grob-interface.cc:57
 #, c-format
 msgid "Unknown interface `%s'"
 msgstr ""
 
-#: grob-interface.cc:56
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: hairpin.cc:105
-msgid "decrescendo too small"
+#: grob-property.cc:34
+#, c-format
+msgid "%d: %s"
 msgstr ""
 
-#: hairpin.cc:106
-msgid "crescendo too small"
+#: grob-property.cc:174
+#, c-format
+msgid "cyclic dependency: calculation-in-progress encountered for #'%s (%s)"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:55
-msgid "Don't have that many brackets."
+#: grob.cc:251
+msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:64
-msgid "Conflicting note group events."
+#: hairpin.cc:187
+msgid "decrescendo too small"
 msgstr ""
 
-#: hyphen-engraver.cc:89
-msgid "removing unterminated hyphen"
+#: horizontal-bracket-engraver.cc:59
+msgid "do not have that many brackets"
 msgstr ""
 
-#: hyphen-engraver.cc:102
-msgid "unterminated hyphen; removing"
+#: horizontal-bracket-engraver.cc:68
+msgid "conflicting note group events"
 msgstr ""
 
-#: includable-lexer.cc:50
-msgid "include files are not allowed in safe mode"
+#: hyphen-engraver.cc:93
+msgid "removing unterminated hyphen"
+msgstr ""
+
+#: hyphen-engraver.cc:107
+msgid "unterminated hyphen; removing"
 msgstr ""
 
-#: includable-lexer.cc:57 lily-guile.cc:90 lily-parser-scheme.cc:76
+#: includable-lexer.cc:53 lily-guile.cc:76 lily-parser-scheme.cc:117
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr ""
 
-#: input.cc:116
-msgid "non fatal error: "
+#: includable-lexer.cc:55 lily-parser-scheme.cc:108
+#, c-format
+msgid "(search path: `%s')"
 msgstr ""
 
-#: input.cc:125 source-file.cc:136 source-file.cc:229
+#: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr ""
 
-#: key-performer.cc:94
-msgid "FIXME: key change merge"
+#: key-signature-interface.cc:71
+#, c-format
+msgid "No glyph found for alteration: %s"
+msgstr ""
+
+#: key-signature-interface.cc:81
+msgid "alteration not found"
 msgstr ""
 
-#: 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
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr ""
 
-#: ligature-engraver.cc:184
+#: ligature-engraver.cc:120
 msgid "already have a ligature"
 msgstr ""
 
-#: ligature-engraver.cc:200
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr ""
 
-#: ligature-engraver.cc:256
+#: ligature-engraver.cc:173
 msgid "unterminated ligature"
 msgstr ""
 
-#: ligature-engraver.cc:280
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:281
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr ""
 
-#: lily-guile.cc:92
+#: lily-guile.cc:78
 #, c-format
 msgid "(load path: `%s')"
 msgstr ""
 
-#: lily-guile.cc:486
+#: lily-guile.cc:438
 #, 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:489
-msgid "Perhaps you made a typing error?"
+#: lily-guile.cc:441
+msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:495
-msgid "Doing assignment anyway."
+#: lily-guile.cc:448
+msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:508
+#: lily-guile.cc:460
 #, c-format
-msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
+msgid "type check for `%s' failed; value `%s' must be of type `%s'"
+msgstr ""
+
+#: lily-lexer.cc:251
+msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: lily-lexer.cc:210
+#: lily-lexer.cc:270
 #, c-format
-msgid "Identifier name is a keyword: `%s'"
+msgid "identifier name is a keyword: `%s'"
 msgstr ""
 
-#: lily-lexer.cc:227
+#: lily-lexer.cc:285
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
 
-#: lily-parser-scheme.cc:68
+#: lily-parser-scheme.cc:30
 #, c-format
-msgid "can't find init file: `%s'"
+msgid "deprecated function called: %s"
 msgstr ""
 
-#: lily-parser-scheme.cc:85
+#: lily-parser-scheme.cc:89
+#, c-format
+msgid "Changing working directory to: `%s'"
+msgstr ""
+
+#: lily-parser-scheme.cc:107
+#, c-format
+msgid "cannot find init file: `%s'"
+msgstr ""
+
+#: lily-parser-scheme.cc:126
 #, c-format
 msgid "Processing `%s'"
 msgstr ""
 
-#: lily-parser.cc:101
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr ""
 
-#: lily-parser.cc:119
-msgid "Braces don't match"
+#: lily-parser.cc:127
+msgid "braces do not match"
+msgstr ""
+
+#: lyric-combine-music-iterator.cc:327
+#, c-format
+msgid "cannot find Voice `%s'"
+msgstr ""
+
+#: lyric-engraver.cc:158
+msgid "Lyric syllable does not have note. Use \\lyricsto or associatedVoice."
 msgstr ""
 
-#: main.cc:98
+#: main.cc:100
+#, 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:106
 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"
@@ -982,95 +1006,105 @@ 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:129
-msgid "select backend to use"
+#: main.cc:137
+msgid "SYM[=VAL]"
+msgstr ""
+
+#: main.cc:138
+msgid ""
+"set Scheme option SYM to VAL (default: #t).\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:130
+#: main.cc:141
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:131
-msgid "set option, use -e '(ly:option-usage)' for help"
+#: main.cc:141
+msgid "evaluate scheme code"
 msgstr ""
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:134
-msgid "EXTs"
+#: main.cc:144
+msgid "FORMATs"
 msgstr ""
 
-#: main.cc:134
-msgid "list of formats to dump"
+#: main.cc:144
+msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:136
-msgid "FIELD"
+#: main.cc:145
+msgid "generate DVI (tex backend only)"
 msgstr ""
 
-#: main.cc:136
-msgid "write header field to BASENAME.FIELD"
+#: main.cc:146
+msgid "generate PDF (default)"
 msgstr ""
 
-#: main.cc:137
-msgid "add DIR to search path"
+#: main.cc:147
+msgid "generate PNG"
 msgstr ""
 
-#: main.cc:138
-msgid "use FILE as init file"
+#: main.cc:148
+msgid "generate PostScript"
 msgstr ""
 
-#: main.cc:139
-msgid "write output to FILE (suffix will be added)"
+#: main.cc:149
+msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:140
-msgid "USER,GROUP,JAIL,DIR"
+#: main.cc:150
+msgid "show this help and exit"
 msgstr ""
 
-#: main.cc:140
-msgid "chroot to JAIL, become USER:GROUP and cd into DIR"
+#: main.cc:151
+msgid "FIELD"
 msgstr ""
 
-#: main.cc:141
-msgid "generate a preview"
+#: main.cc:151
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:142
-msgid "don't generate full pages"
+#: main.cc:153
+msgid "add DIR to search path"
 msgstr ""
 
-#: main.cc:143
-msgid "generate PNG"
+#: main.cc:154
+msgid "use FILE as init file"
 msgstr ""
 
-#: main.cc:144
-msgid "generate PostScript"
+#: main.cc:156
+msgid "USER, GROUP, JAIL, DIR"
 msgstr ""
 
-#: main.cc:145
-msgid "generate DVI"
+#: main.cc:156
+msgid ""
+"chroot to JAIL, become USER:GROUP\n"
+"and cd into DIR"
 msgstr ""
 
-#: main.cc:146
-msgid "generate PDF (default)"
+#: main.cc:159
+msgid "write output to FILE (suffix will be added)"
 msgstr ""
 
-#: main.cc:147
-msgid "generate TeX"
+#: main.cc:160
+msgid "relocate using directory of lilypond program"
 msgstr ""
 
-#: main.cc:148
-msgid "run in safe mode"
+#: main.cc:161
+msgid "show version number and exit"
 msgstr ""
 
-#: main.cc:170
+#: main.cc:203
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1078,102 +1112,126 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:196
+#: main.cc:230
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
-#: main.cc:198
+#: main.cc:232
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
-#: main.cc:200
+#: main.cc:234
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:202
+#: main.cc:236
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:272
+#: main.cc:238
 #, c-format
-msgid "expected %d arguments with jail, found: %d"
+msgid "Options:"
 msgstr ""
 
-#: main.cc:286
+#: main.cc:242
 #, c-format
-msgid "no such user: %s"
+msgid "Report bugs via %s"
 msgstr ""
 
 #: main.cc:288
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "expected %d arguments with jail, found: %u"
+msgstr ""
+
+#: main.cc:302
+#, c-format
+msgid "no such user: %s"
+msgstr ""
+
+#: main.cc:304
+#, c-format
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:303
+#: main.cc:319
 #, c-format
 msgid "no such group: %s"
 msgstr ""
 
-#: main.cc:305
+#: main.cc:321
 #, c-format
-msgid "can't get group id from group name: %s: "
+msgid "cannot get group id from group name: %s: %s"
 msgstr ""
 
-#: main.cc:313
+#: main.cc:329
 #, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr ""
 
-#: main.cc:320
+#: main.cc:336
 #, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr ""
 
-#: main.cc:326
+#: main.cc:342
 #, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr ""
 
-#: main.cc:332
+#: main.cc:348
 #, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:74
+#: main.cc:594
+#, c-format
+msgid "exception caught: %s"
+msgstr ""
+
+#. FIXME: constant error message.
+#: mark-engraver.cc:154
+msgid "rehearsalMark must have integer value"
+msgstr ""
+
+#: mark-engraver.cc:160
+msgid "mark label must be a markup object"
+msgstr ""
+
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:101
-msgid "can not determine pitch of ligature primitive -> skipping"
+#: mensural-ligature-engraver.cc:112
+msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:127
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: 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
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: 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
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1181,391 +1239,481 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:345
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature.cc:131
+#: mensural-ligature.cc:141
 msgid "Mensural_ligature: unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature.cc:183
+#: mensural-ligature.cc:192
 msgid "Mensural_ligature: (join_right == 0)"
 msgstr ""
 
-#: midi-item.cc:150
+#: midi-item.cc:81
 #, c-format
 msgid "no such MIDI instrument: `%s'"
 msgstr ""
 
-#: midi-item.cc:254
-msgid "silly pitch"
+#: midi-stream.cc:28
+#, c-format
+msgid "cannot open for write: %s: %s"
 msgstr ""
 
-#: midi-item.cc:270
+#: midi-stream.cc:44
 #, c-format
-msgid "Experimental: temporarily fine tuning (of %d cents) a channel."
+msgid "cannot write to file: `%s'"
 msgstr ""
 
-#: midi-stream.cc:39
+#: music-iterator.cc:171
+msgid "Sending non-event to context"
+msgstr ""
+
+#: music.cc:140
 #, c-format
-msgid "could not write file: `%s'"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:176
+#: music.cc:203
 #, c-format
-msgid "octave check failed; expected %s, found: %s"
+msgid "transposition by %s makes alteration larger than double"
+msgstr ""
+
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
+msgstr ""
+
+#: new-fingering-engraver.cc:239
+msgid "no placement found for fingerings"
 msgstr ""
 
-#: music.cc:239
+#: new-fingering-engraver.cc:240
+msgid "placing below"
+msgstr ""
+
+#: note-collision.cc:464
+msgid "ignoring too many clashing note columns"
+msgstr ""
+
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
+msgstr ""
+
+#: note-head.cc:63
 #, c-format
-msgid "Transposition by %s makes alteration larger than double"
+msgid "none of note heads `%s' or `%s' found"
 msgstr ""
 
-#.
-#. music for the softenon children?
-#.
-#: new-fingering-engraver.cc:158
-msgid "music for the martians."
+#: note-heads-engraver.cc:64
+msgid "NoteEvent without pitch"
 msgstr ""
 
-#: new-fingering-engraver.cc:265
-msgid "Fingerings are also not down?! Putting them down anyway."
+#: open-type-font.cc:33
+#, c-format
+msgid "cannot allocate %lu bytes"
 msgstr ""
 
-#: new-lyric-combine-music-iterator.cc:240
+#: open-type-font.cc:37
 #, c-format
-msgid "cannot find Voice `%s'"
+msgid "cannot load font table: %s"
 msgstr ""
 
-#: note-collision.cc:404
-msgid "Too many clashing notecolumns.  Ignoring them."
+#: open-type-font.cc:42
+#, c-format
+msgid "Free type error: %s"
 msgstr ""
 
-#: note-head.cc:68
+#: open-type-font.cc:100
 #, c-format
-msgid "note head `%s' not found"
+msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:29
+#: open-type-font.cc:102
 #, c-format
-msgid "Cannot allocate %d bytes"
+msgid "error reading font file %s: %s"
 msgstr ""
 
-#: open-type-font.cc:33
+#: open-type-font.cc:177
 #, c-format
-msgid "Could not load %s font table"
+msgid "FT_Get_Glyph_Name () Freetype error: %s"
 msgstr ""
 
-#: open-type-font.cc:85
+#: open-type-font.cc:302 pango-font.cc:167
 #, c-format
-msgid "Unsupported font format: %s"
+msgid "FT_Get_Glyph_Name () error: %s"
+msgstr ""
+
+#. find out the ideal number of pages
+#: optimal-page-breaking.cc:44
+msgid "Finding the ideal number of pages..."
 msgstr ""
 
-#: open-type-font.cc:89
+#: optimal-page-breaking.cc:59
+msgid "Fitting music on 1 page..."
+msgstr ""
+
+#: optimal-page-breaking.cc:61
+#, c-format
+msgid "Fitting music on %d or %d pages..."
+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: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:208
+#, c-format
+msgid "Calculating page and line breaks (%d possible page breaks)..."
+msgstr ""
+
+#: page-turn-page-breaking.cc:226 paper-score.cc:146
+msgid "Drawing systems..."
+msgstr ""
+
+#: page-turn-page-breaking.cc:275
 #, c-format
-msgid "Unknown error: %d reading font file: %s"
+msgid "break starting at page %d"
 msgstr ""
 
-#: open-type-font.cc:144
+#: page-turn-page-breaking.cc:276
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "\tdemerits: %f"
 msgstr ""
 
-#: pango-font.cc:130
+#: page-turn-page-breaking.cc:277
 #, c-format
-msgid "No PS font name for font `%s'"
+msgid "\tsystem count: %d"
 msgstr ""
 
-#: pango-font.cc:177
-msgid "FreeType face has no PostScript font name."
+#: page-turn-page-breaking.cc:278
+#, c-format
+msgid "\tpage count: %d"
+msgstr ""
+
+#: page-turn-page-breaking.cc:279
+#, c-format
+msgid "\tprevious break: %d"
 msgstr ""
 
-#: paper-outputter-scheme.cc:26
+#: pango-font.cc:184
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:229
+#, c-format
+msgid "no PostScript font name for font `%s'"
+msgstr ""
+
+#: pango-font.cc:277
+msgid "FreeType face has no PostScript font name"
+msgstr ""
+
+#: paper-column-engraver.cc:213
+msgid ""
+"forced break was overridden by some other event, should you be using bar "
+"checks?"
+msgstr ""
+
+#: paper-outputter-scheme.cc:30
 #, c-format
 msgid "Layout output to `%s'..."
 msgstr ""
 
-#: 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
+#: paper-score.cc:122
 msgid "Preprocessing graphical objects..."
 msgstr ""
 
-#: parse-scm.cc:81
+#: parse-scm.cc:87
 msgid "GUILE signaled an error for the expression beginning here"
 msgstr ""
 
-#: percent-repeat-engraver.cc:100
-msgid "Don't know how to handle a percent repeat of this length."
-msgstr ""
-
-#: percent-repeat-engraver.cc:158
+#: percent-repeat-engraver.cc:200
 msgid "unterminated percent repeat"
 msgstr ""
 
-#: percent-repeat-iterator.cc:51
-msgid "no one to print a percent"
-msgstr ""
-
-#: performance.cc:48
+#: performance.cc:43
 msgid "Track..."
 msgstr ""
 
-#: performance.cc:89
-msgid "Creator: "
+#: performance.cc:72
+msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:109
-msgid "at "
+#: performance.cc:73
+msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:162
+#: performance.cc:101
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr ""
 
-#: phrasing-slur-engraver.cc:115
+#: phrasing-slur-engraver.cc:131
 msgid "unterminated phrasing slur"
 msgstr ""
 
-#: piano-pedal-engraver.cc:224
-msgid "Need 3 strings for piano pedals. No pedal made. "
+#: piano-pedal-engraver.cc:286
+#, c-format
+msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:239 piano-pedal-engraver.cc:254
-#: 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:304
+#: 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:93
+#: program-option-scheme.cc:215
 #, c-format
-msgid "Not a grob name, `%s'."
+msgid "no such internal option: %s"
 msgstr ""
 
-#: quote-iterator.cc:245
+#: property-iterator.cc:74
 #, c-format
-msgid "In quotation: junking event %s"
+msgid "not a grob name, `%s'"
 msgstr ""
 
 #: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
-#: rest-collision.cc:147
-msgid "rest direction not set.  Cannot resolve collision."
+#: relocate.cc:44
+#, c-format
+msgid "Setting %s to %s"
 msgstr ""
 
-#: rest-collision.cc:162 rest-collision.cc:208
-msgid "too many colliding rests"
+#: relocate.cc:64
+#, c-format
+msgid "no such file: %s for %s"
 msgstr ""
 
-#: rest.cc:140
+#: relocate.cc:74 relocate.cc:92
 #, c-format
-msgid "rest `%s' not found"
+msgid "no such directory: %s for %s"
 msgstr ""
 
-#: scm-option.cc:54
+#: relocate.cc:84
 #, c-format
-msgid "lilypond -e EXPR means:"
+msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: scm-option.cc:56
+#: relocate.cc:114
 #, c-format
-msgid "  Evalute the Scheme EXPR before parsing any .ly files."
+msgid "not relocating, no %s/ or current/ found under %s"
 msgstr ""
 
-#: scm-option.cc:58
+#: relocate.cc:125
 #, c-format
-msgid ""
-"  Multiple -e options may be given, they will be evaluated sequentially."
+msgid "Relocation: compile datadir=%s, new datadir=%s"
+msgstr ""
+
+#: relocate.cc:138
+#, c-format
+msgid "Relocation: framework_prefix=%s"
+msgstr ""
+
+#: relocate.cc:179
+#, c-format
+msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: scm-option.cc:60
+#: relocate.cc:186
+#, c-format
+msgid "Relocation: from cwd: argv0=%s"
+msgstr ""
+
+#: relocate.cc:195
 #, c-format
 msgid ""
-"  The function ly:set-option allows for access to some internal variables."
+"Relocation: from PATH=%s\n"
+"argv0=%s"
+msgstr ""
+
+#: relocate.cc:229
+msgid "LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR"
 msgstr ""
 
-#: scm-option.cc:62
+#: relocate.cc:356
 #, c-format
-msgid "Usage: lilypond -e \"(ly : set - option SYMBOL VAL)\""
+msgid "Relocation file: %s"
 msgstr ""
 
-#: scm-option.cc:64
+#: relocate.cc:392
 #, c-format
-msgid "Use help as  SYMBOL to get online help."
+msgid "Unknown relocation command %s"
+msgstr ""
+
+#: rest-collision.cc:145
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: scm-option.cc:130 scm-option.cc:168
+#: rest-collision.cc:159 rest-collision.cc:204
+msgid "too many colliding rests"
+msgstr ""
+
+#: rest.cc:132
 #, c-format
-msgid "No such internal option: %s"
+msgid "rest `%s' not found"
 msgstr ""
 
-#: score-engraver.cc:105
+#: score-engraver.cc:67
 #, c-format
 msgid "cannot find `%s'"
 msgstr ""
 
-#: score-engraver.cc:107
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr ""
 
-#: score-engraver.cc:109
+#: score-engraver.cc:71
 #, c-format
 msgid "Search path `%s'"
 msgstr ""
 
-#: score.cc:213
-msgid "Already have music in score"
+#: score-engraver.cc:73
+msgid "Aborting"
 msgstr ""
 
-#: score.cc:214
-msgid "This is the previous music"
+#: score.cc:167
+msgid "already have music in score"
 msgstr ""
 
-#: score.cc:219
-msgid "Error found in this music expression. Ignoring it"
+#: score.cc:168
+msgid "this is the previous music"
 msgstr ""
 
-#. FIXME:
-#: script-engraver.cc:100
-msgid "Do not know how to interpret articulation: "
+#: score.cc:173
+msgid "errors found, ignoring music expression"
 msgstr ""
 
-#: script-engraver.cc:101
-msgid "Scheme encoding: "
+#. FIXME:
+#: script-engraver.cc:102
+msgid "do not know how to interpret articulation: "
 msgstr ""
 
-#. this shouldn't happen, but let's continue anyway.
-#: separation-item.cc:52 separation-item.cc:96
-msgid "Separation_item:  I've been drinking too much"
+#: script-engraver.cc:103
+msgid "scheme encoding: "
 msgstr ""
 
-#: simple-spacer.cc:410
+#: slur-engraver.cc:82
 #, c-format
-msgid "No spring between column %d and next one"
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:113
+#: slur-engraver.cc:151
 msgid "unterminated slur"
 msgstr ""
 
-#: slur-engraver.cc:123
-msgid "No slur to end"
+#: slur-engraver.cc:163
+msgid "cannot end slur"
 msgstr ""
 
-#: source-file.cc:47
+#: slur.cc:355
 #, c-format
-msgid "can't open file: `%s'"
+msgid "Ignoring grob for slur: %s. avoid-slur not set?"
 msgstr ""
 
-#: source-file.cc:60
+#: source-file.cc:74
 #, c-format
-msgid "Huh?  Got %d, expected %d characters"
+msgid "expected to read %d characters, got %d"
 msgstr ""
 
-#: spacing-spanner.cc:377
+#: spaceable-grob.cc:117
 #, c-format
-msgid "Global shortest duration is %s"
+msgid "No spring between column %d and next one"
+msgstr ""
+
+#: staff-symbol-engraver.cc:62
+msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:88
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:125
+#: stem-engraver.cc:129
 #, c-format
-msgid "Adding note head to incompatible stem (type = %d)"
+msgid "adding note head to incompatible stem (type = %d)"
 msgstr ""
 
-#: stem-engraver.cc:127
-msgid "Don't you want polyphonic voices instead?"
+#: stem-engraver.cc:131
+msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:124
-msgid "Weird stem size; check for narrow beams"
+#: stem.cc:105
+msgid "weird stem size, check for narrow beams"
 msgstr ""
 
-#: stem.cc:577
+#: stem.cc:618
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:588
+#: stem.cc:629
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:145
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:224
+#: system.cc:272
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: system.cc:241
-msgid "Calculating line breaks..."
+#: text-spanner-engraver.cc:60
+msgid "cannot find start of text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:61
-msgid "can't find start of text spanner"
-msgstr ""
-
-#: text-spanner-engraver.cc:75
+#: text-spanner-engraver.cc:72
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:136
+#: text-spanner-engraver.cc:118
 msgid "unterminated text spanner"
 msgstr ""
 
-#. Not using ngettext's plural feature here, as this message is
-#. more of a programming error.
-#: tfm-reader.cc:106
-#, c-format
-msgid "TFM header of `%s' has only %u word (s)"
-msgstr ""
-
-#: 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
-#, c-format
-msgid "can't find ascii character: %d"
-msgstr ""
-
-#: tie-engraver.cc:194
+#: tie-engraver.cc:267
 msgid "lonely tie"
 msgstr ""
 
-#: 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.
 #.
-#: time-signature-engraver.cc:54
+#: time-signature-engraver.cc:64
 #, c-format
-msgid "Found strange time signature %d/%d."
+msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
@@ -1580,235 +1728,520 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr ""
 
-#: trill-spanner-engraver.cc:68
-msgid "can't find start of trill spanner"
+#: translator-group-ctors.cc:29
+#, c-format
+msgid "fatal error. Couldn't find type: %s"
 msgstr ""
 
-#: trill-spanner-engraver.cc:82
-msgid "already have a trill spanner"
+#: translator-group.cc:146
+#, c-format
+msgid "cannot find: `%s'"
+msgstr ""
+
+#: translator.cc:346
+#, c-format
+msgid "Two simultaneous %s events, junking this one"
+msgstr ""
+
+#: translator.cc:347
+#, c-format
+msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:142
-msgid "unterminated trill spanner"
+#: trill-spanner-engraver.cc:67
+msgid "cannot find start of trill spanner"
 msgstr ""
 
-#: tuplet-bracket.cc:438
-msgid "Killing tuplet bracket across linebreak."
+#: trill-spanner-engraver.cc:79
+msgid "already have a trill spanner"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:341
+#: tuplet-engraver.cc:96
+msgid "No tuplet to end"
+msgstr ""
+
+#: 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
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
 
-#: vaticana-ligature.cc:93
-msgid "ascending vaticana style flexa"
-msgstr ""
-
-#: vaticana-ligature.cc:182
-msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
-msgstr ""
-
-#: volta-engraver.cc:133
-msgid "No volta spanner to end"
+#: vaticana-ligature.cc:84
+msgid "flexa-height undefined; assuming 0"
 msgstr ""
 
-#: volta-engraver.cc:144
-msgid "Already have a volta spanner.  Stopping that one prematurely."
+#: vaticana-ligature.cc:89
+msgid "ascending vaticana style flexa"
 msgstr ""
 
-#: volta-engraver.cc:148
-msgid "Also have a stopped spanner.  Giving up."
+#: vaticana-ligature.cc:177
+msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
-#: parser.yy:82
-msgid "Tag must be symbol or list of symbols."
+#. fixme: be more verbose.
+#: volta-engraver.cc:143
+msgid "cannot end volta spanner"
 msgstr ""
 
-#: parser.yy:559
-msgid "Identifier should have alphabetic characters only"
+#: volta-engraver.cc:153
+msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: parser.yy:717
-msgid "\\paper cannot be in \\score. Use \\layout instead"
+#: volta-engraver.cc:157
+msgid "also already have an ended spanner"
 msgstr ""
 
-#: parser.yy:741
-msgid "Need \\paper for paper block."
+#: volta-engraver.cc:158
+msgid "giving up"
 msgstr ""
 
-#: parser.yy:886
-msgid "More alternatives than repeats.  Junking excess alternatives."
+#: parser.yy:727
+msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:1078
-msgid "Music head function should return Music object."
+#: parser.yy:751
+msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1350
+#: parser.yy:1210
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1710
-msgid "Second argument must be pitch list."
+#: parser.yy:1508
+msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1749 parser.yy:1754 parser.yy:2235
-msgid "Have to be in Lyric mode for lyrics"
+#: parser.yy:1535 parser.yy:1540 parser.yy:2005
+msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1847
-msgid "Expecting string as script definition"
+#: parser.yy:1637
+msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:2010 parser.yy:2060
+#: parser.yy:1792 parser.yy:1842
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:2154
-msgid "Have to be in Note mode for notes"
+#: parser.yy:1959
+msgid "have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:2248
-msgid "Have to be in Chord mode for chords"
+#: parser.yy:2020
+msgid "have to be in Chord mode for chords"
 msgstr ""
 
-#: parser.yy:2399
-msgid "need integer number arg"
+#: lexer.ll:177
+msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: parser.yy:2597
-msgid "Suspect duration found following this beam"
+#: lexer.ll:181
+msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:193
+#: lexer.ll:236
 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr ""
 
-#: lexer.ll:201
-msgid "No quoted string found after \\version"
+#: lexer.ll:253
+msgid "quoted string expected after \\version"
+msgstr ""
+
+#: lexer.ll:257
+msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:205
-msgid "No quoted string found after \\renameinput"
+#: lexer.ll:261
+msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:218
+#: lexer.ll:274
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:233
+#: lexer.ll:289
 msgid "\\maininput not allowed outside init files"
 msgstr ""
 
-#: lexer.ll:257
+#: lexer.ll:313
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:266
-msgid "Missing end quote"
+#: lexer.ll:322
+msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:428
+#: lexer.ll:467
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:527
+#: lexer.ll:578
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:616
+#: lexer.ll:682
 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 
-#: lexer.ll:703 lexer.ll:704
+#: lexer.ll:797 lexer.ll:798
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:801 lexer.ll:802
+#: lexer.ll:903 lexer.ll:904
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
-#: lexer.ll:802 lexer.ll:803
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:904 lexer.ll:905
+msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: backend-library.scm:19
-#, lisp-format
+#: lexer.ll:910 lexer.ll:911
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:762 ps-to-png.scm:58
+#, scheme-format
 msgid "Invoking `~a'..."
 msgstr ""
 
-#: backend-library.scm:24
-#, lisp-format
+#: backend-library.scm:28
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr ""
 
-#: backend-library.scm:44 framework-tex.scm:366
-#, lisp-format
+#: backend-library.scm:115 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.
-#. (format (current-error-port) (_ "Converting to `~a'...")
-#. (string-append (basename name ".ps") "-page1.png" )))
-#: backend-library.scm:66
-#, lisp-format
+#: backend-library.scm:128
+#, scheme-format
 msgid "Converting to ~a..."
 msgstr ""
 
-#: backend-library.scm:99
-#, lisp-format
+#: backend-library.scm:166
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
-#: clef.scm:124
-#, lisp-format
-msgid "Unknown clef type `~a'"
+#: define-context-properties.scm:20 define-grob-properties.scm:10
+#: define-music-properties.scm:10
+#, scheme-format
+msgid "symbol ~S redefined"
+msgstr ""
+
+#: define-event-classes.scm:119
+#, scheme-format
+msgid "event class ~A seems to be unused"
+msgstr ""
+
+#. should be programming-error
+#: define-event-classes.scm:125
+#, scheme-format
+msgid "translator listens to nonexisting event class ~A"
+msgstr ""
+
+#: define-markup-commands.scm:274
+msgid "no systems found in \\score markup, does it have a \\layout block?"
+msgstr ""
+
+#: define-markup-commands.scm:1312
+#, scheme-format
+msgid "not a valid duration string: ~a"
+msgstr ""
+
+#: define-music-types.scm:746
+#, scheme-format
+msgid "symbol expected: ~S"
+msgstr ""
+
+#: define-music-types.scm:749
+#, scheme-format
+msgid "cannot find music object: ~S"
+msgstr ""
+
+#: define-music-types.scm:769
+#, scheme-format
+msgid "unknown repeat type `~S'"
+msgstr ""
+
+#: define-music-types.scm:770
+msgid "See music-types.scm for supported repeats"
+msgstr ""
+
+#: document-backend.scm:91
+#, scheme-format
+msgid "pair expected in doc ~s"
+msgstr ""
+
+#: document-backend.scm:135
+#, scheme-format
+msgid "cannot find interface for property: ~S"
+msgstr ""
+
+#: document-backend.scm:145
+#, scheme-format
+msgid "unknown Grob interface: ~S"
+msgstr ""
+
+#: documentation-lib.scm:45
+#, scheme-format
+msgid "Processing ~S..."
+msgstr ""
+
+#: documentation-lib.scm:150
+#, scheme-format
+msgid "Writing ~S..."
+msgstr ""
+
+#: documentation-lib.scm:172
+#, scheme-format
+msgid "cannot find description for property ~S (~S)"
+msgstr ""
+
+#: framework-eps.scm:90
+#, scheme-format
+msgid "Writing ~a..."
+msgstr ""
+
+#: framework-ps.scm:280
+#, scheme-format
+msgid "cannot embed ~S=~S"
+msgstr ""
+
+#: framework-ps.scm:333
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: clef.scm:125
-msgid "See scm/lily.scm for supported clefs"
+#: framework-ps.scm:350
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-tex.scm:339
-#, lisp-format
-msgid "Converting to `~a'...n"
+#: framework-ps.scm:381
+#, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: framework-tex.scm:358
-#, lisp-format
+#: framework-ps.scm:735
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
+msgstr ""
+
+#: framework-ps.scm:754 framework-ps.scm:757
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
+msgstr ""
+
+#: framework-ps.scm:764
+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"
+"\n"
+"If have cut & pasted a lilypond fragment from a webpage, be sure\n"
+"to only remove anything before\n"
+"\n"
+"  %% ****************************************************************\n"
+"  %% Start cut-&-pastable-section\n"
+"  %% ****************************************************************\n"
+msgstr ""
+
+#: framework-tex.scm:361
+#, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr ""
 
-#: lily-library.scm:346
-#, lisp-format
-msgid "No \\version statement found.  Add~afor future compatibility."
+#: graphviz.scm:53
+#, scheme-format
+msgid "Writing graph `~a'..."
 msgstr ""
 
-#: lily.scm:95
-#, lisp-format
-msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
+#: layout-beam.scm:29
+#, scheme-format
+msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
+msgstr ""
+
+#: layout-beam.scm:46
+#, scheme-format
+msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: lily.scm:316
-msgid "error: failed files: "
+#: layout-page-layout.scm:115
+msgid "Can't fit systems on page -- ignoring between-system-padding"
 msgstr ""
 
-#: page-layout.scm:416
+#: layout-page-layout.scm:447
 msgid "Calculating page breaks..."
 msgstr ""
+
+#: lily-library.scm:580
+#, scheme-format
+msgid "unknown unit: ~S"
+msgstr ""
+
+#: lily-library.scm:614
+#, scheme-format
+msgid "no \\version statement found, please add~afor future compatibility"
+msgstr ""
+
+#: lily-library.scm:622
+msgid "old relative compatibility not used"
+msgstr ""
+
+#: lily.scm:182
+#, scheme-format
+msgid "cannot find: ~A"
+msgstr ""
+
+#: lily.scm:247
+#, scheme-format
+msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
+msgstr ""
+
+#: lily.scm:629
+#, scheme-format
+msgid "job ~a terminated with signal: ~a"
+msgstr ""
+
+#: lily.scm:632
+#, scheme-format
+msgid ""
+"logfile ~a (exit ~a):\n"
+"~a"
+msgstr ""
+
+#: lily.scm:659 lily.scm:752
+#, scheme-format
+msgid "failed files: ~S"
+msgstr ""
+
+#: lily.scm:742
+#, scheme-format
+msgid "Redirecting output to ~a..."
+msgstr ""
+
+#: ly-syntax-constructors.scm:40
+msgid "Music head function must return Music object"
+msgstr ""
+
+#: ly-syntax-constructors.scm:139
+#, scheme-format
+msgid "Invalid property operation ~a"
+msgstr ""
+
+#: markup.scm:124
+#, scheme-format
+msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
+msgstr ""
+
+#: markup.scm:130
+#, scheme-format
+msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
+msgstr ""
+
+#: music-functions.scm:228
+msgid "More alternatives than repeats.  Junking excess alternatives"
+msgstr ""
+
+#: music-functions.scm:250
+#, scheme-format
+msgid "expecting 2 elements for chord tremolo, found ~a"
+msgstr ""
+
+#: music-functions.scm:573
+#, scheme-format
+msgid "music expected: ~S"
+msgstr ""
+
+#. FIXME: uncomprehensable message
+#: music-functions.scm:623
+#, scheme-format
+msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
+msgstr ""
+
+#: music-functions.scm:773
+#, scheme-format
+msgid "cannot find quoted music: `~S'"
+msgstr ""
+
+#: music-functions.scm:970
+#, scheme-format
+msgid "unknown accidental style: ~S"
+msgstr ""
+
+#: output-ps.scm:276
+msgid "utf-8-string encountered in PS backend"
+msgstr ""
+
+#: output-svg.scm:45
+#, scheme-format
+msgid "undefined: ~S"
+msgstr ""
+
+#: output-svg.scm:135
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
+msgstr ""
+
+#: output-tex.scm:96
+#, scheme-format
+msgid "cannot find ~a in ~a"
+msgstr ""
+
+#: paper.scm:84
+msgid "set-global-staff-size: not in toplevel scope"
+msgstr ""
+
+#: paper.scm:132
+#, scheme-format
+msgid "This is not a \\layout {} object, ~S"
+msgstr ""
+
+#: paper.scm:144
+#, scheme-format
+msgid "Unknown papersize: ~a"
+msgstr ""
+
+#. TODO: should raise (generic) exception with throw, and catch
+#. that in parse-scm.cc
+#: paper.scm:159
+msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
+msgstr ""
+
+#: parser-clef.scm:127
+#, scheme-format
+msgid "unknown clef type `~a'"
+msgstr ""
+
+#: parser-clef.scm:128
+#, scheme-format
+msgid "supported clefs: ~a"
+msgstr ""
+
+#: ps-to-png.scm:64
+#, scheme-format
+msgid "~a exited with status: ~S"
+msgstr ""
+
+#: to-xml.scm:180
+#, scheme-format
+msgid "assertion failed: ~S"
+msgstr ""