X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=po%2Flilypond.pot;h=8caa983b729bfb5b5b25bcfc52643b1940b41840;hb=49e4c7ee898f09c6fd6ffd73d49f091344d0c7d7;hp=6a1ef7528c9f2336fc7697f5d87d8d9e2793abbc;hpb=26253bd2625f96bdaed6689668d7c5ff1a98f132;p=lilypond.git

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 6a1ef7528c..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-02-25 13:09+0100\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,971 +16,788 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lilylib.py:62
-msgid "lilylib module"
-msgstr ""
-
-#: lilylib.py:65 lilypond-book.py:88 lilypond-latex.py:109 midi2ly.py:100
-#: mup2ly.py:75 ps2png.py:40 main.cc:130
-msgid "print this help"
-msgstr ""
-
-#: lilylib.py:112 midi2ly.py:136 mup2ly.py:130
+#: convertrules.py:12
 #, 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 "Not smart enough to convert %s"
 msgstr ""
 
-#: lilylib.py:118 midi2ly.py:142 mup2ly.py:136
-msgid "It comes with NO WARRANTY."
+#: convertrules.py:13
+msgid "Please refer to the manual for details, and update manually."
 msgstr ""
 
-#: lilylib.py:125 warn.cc:24
-#, c-format, python-format
-msgid "warning: %s"
+#: convertrules.py:14
+#, python-format
+msgid "%s has been replaced by %s"
 msgstr ""
 
-#: lilylib.py:128 warn.cc:30
-#, c-format, python-format
-msgid "error: %s"
+#: convertrules.py:2398
+msgid "LilyPond source must be UTF-8"
 msgstr ""
 
-#: lilylib.py:132
-#, python-format
-msgid "Exiting (%d)..."
+#: convertrules.py:2401
+msgid "Try the texstrings backend"
 msgstr ""
 
-#: lilylib.py:200 midi2ly.py:223 mup2ly.py:219
+#: convertrules.py:2404
 #, python-format
-msgid "Usage: %s [OPTIONS]... FILE"
-msgstr ""
-
-#: lilylib.py:204 convert-ly.py:57 midi2ly.py:227 mup2ly.py:223 main.cc:200
-#, c-format
-msgid "Options:"
+msgid "Do something like: %s"
 msgstr ""
 
-#: lilylib.py:208 convert-ly.py:68 midi2ly.py:231 mup2ly.py:227 main.cc:204
-#, c-format, python-format
-msgid "Report bugs to %s."
+#: convertrules.py:2407
+msgid "Or save as UTF-8 in your editor"
 msgstr ""
 
-#: lilylib.py:228
+#: fontextract.py:26
 #, python-format
-msgid "Binary %s has version %s, looking for version %s"
+msgid "Scanning %s"
 msgstr ""
 
-#: lilylib.py:262
+#: fontextract.py:71
 #, python-format
-msgid "Opening pipe `%s'"
+msgid "Extracted %s"
 msgstr ""
 
-#: lilylib.py:277 lilypond-book.py:1111
+#: fontextract.py:86
 #, python-format
-msgid "`%s' failed (%d)"
+msgid "Writing fonts to %s"
 msgstr ""
 
-#: lilylib.py:282 lilylib.py:341 lilypond-book.py:1112 lilypond-latex.py:466
-msgid "The error log is as follows:"
-msgstr ""
-
-#: lilylib.py:313 midi2ly.py:259 mup2ly.py:255
+#: lilylib.py:85 lilylib.py:136
 #, python-format
 msgid "Invoking `%s'"
 msgstr ""
 
-#: lilylib.py:315
+#: lilylib.py:87 lilylib.py:138
 #, python-format
 msgid "Running %s..."
 msgstr ""
 
-#: lilylib.py:334
+#: lilylib.py:203
 #, python-format
-msgid "`%s' failed (%s)"
-msgstr ""
-
-#: lilylib.py:337 midi2ly.py:265 mup2ly.py:263
-msgid "(ignored)"
+msgid "Usage: %s"
 msgstr ""
 
-#: lilylib.py:355 midi2ly.py:275 mup2ly.py:273
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
 #, python-format
-msgid "Cleaning %s..."
+msgid "%s [OPTION]... FILE"
 msgstr ""
 
-#: lilylib.py:529
-msgid "Removing output file"
+#: abc2ly.py:1351
+#, python-format
+msgid ""
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: convert-ly.py:32
-#, python-format
-msgid "%s has been replaced by %s"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr ""
 
-#: convert-ly.py:33
-#, python-format
-msgid "Not smart enough to convert %s"
+#: abc2ly.py:1357
+msgid "be strict about succes"
 msgstr ""
 
-#: convert-ly.py:34
-msgid "Please refer to the manual for details, and update manually."
+#: abc2ly.py:1359
+msgid "preserve ABC's notion of beams"
 msgstr ""
 
-#: convert-ly.py:50
-#, python-format
-msgid "Usage: %s [OPTION]... [FILE]..."
+#: 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 ""
 
-#: convert-ly.py:53
+#: 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 ""
 
-#: 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 main.cc:89
-#, 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"
-msgstr ""
-
-#: convert-ly.py:2402
-msgid "LilyPond source must be UTF-8"
-msgstr ""
-
-#: convert-ly.py:2405
-msgid "Try the texstrings backend"
-msgstr ""
-
-#: convert-ly.py:2408
-#, python-format
-msgid "Do something like: %s"
+#: convert-ly.py:43 lilypond-book.py:73
+msgid "Examples:"
 msgstr ""
 
-#: convert-ly.py:2411
-msgid "Or save as UTF-8 in your editor"
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
+#, c-format, python-format
+msgid "warning: %s"
 msgstr ""
 
-#: convert-ly.py:2455
-msgid "Applying conversion: "
+#: 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:2467
-#, python-format
-msgid "%s: error while converting"
+#: 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:2470 score-engraver.cc:110
-msgid "Aborting"
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
+msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:2491
-#, python-format
-msgid "Processing `%s'... "
+#: convert-ly.py:86 convert-ly.py:106
+msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:2593
-#, python-format
-msgid "%s: cannot determine version for `%s'"
+#: convert-ly.py:88
+msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:2602
-#, python-format
-msgid "%s: skipping: `%s' "
+#: convert-ly.py:91
+msgid "edit in place"
 msgstr ""
 
-#: lilypond-book.py:70
-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"
+#: convert-ly.py:94
+msgid "do not add \\version command if missing"
 msgstr ""
 
-#: lilypond-book.py:82 main.cc:124
-msgid "EXT"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: lilypond-book.py:83
-msgid ""
-"use output format EXT (texi [default], texi-html,\n"
-"\t\tlatex, html)"
+#: convert-ly.py:105
+msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: lilypond-book.py:85
-msgid "FILTER"
+#: convert-ly.py:153
+msgid "Applying conversion: "
 msgstr ""
 
-#: lilypond-book.py:86
-msgid "pipe snippets through FILTER [convert-ly -n -]"
+#: convert-ly.py:166
+msgid "Error while converting"
 msgstr ""
 
-#: lilypond-book.py:89 lilypond-book.py:91 lilypond-latex.py:114 main.cc:132
-msgid "DIR"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: lilypond-book.py:90
-msgid "add DIR to include path"
+#: convert-ly.py:190
+#, python-format
+msgid "Processing `%s'... "
 msgstr ""
 
-#: lilypond-book.py:92
-msgid "write output to DIR"
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
+#, c-format, python-format
+msgid "cannot open file: `%s'"
 msgstr ""
 
-#: lilypond-book.py:93
-msgid "COMMAND"
+#: convert-ly.py:284
+#, python-format
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr ""
 
-#: lilypond-book.py:94
-msgid "process ly_files using COMMAND FILE..."
+#: etf2ly.py:1196
+#, python-format
+msgid "%s [OPTION]... ETF-FILE"
 msgstr ""
 
-#: lilypond-book.py:96 lilypond-latex.py:133 midi2ly.py:105 mup2ly.py:78
-#: ps2png.py:41 main.cc:145
-msgid "be verbose"
+#: 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 ""
 
-#: lilypond-book.py:98
-msgid "print version information"
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
+msgid "FILE"
 msgstr ""
 
-#: lilypond-book.py:100 lilypond-latex.py:135 midi2ly.py:107 mup2ly.py:80
-#: main.cc:146
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
 msgid "show warranty and copyright"
 msgstr ""
 
-#: lilypond-book.py:699
-#, python-format
-msgid "deprecated ly-option used: %s=%s"
+#: lilypond-book.py:71
+msgid ""
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
 msgstr ""
 
-#: lilypond-book.py:702
-#, python-format
-msgid "compatibility mode translation: %s=%s"
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
 
-#: lilypond-book.py:706
+#: lilypond-book.py:87
 #, python-format
-msgid "deprecated ly-option used: %s"
+msgid "Exiting (%d)..."
 msgstr ""
 
-#: lilypond-book.py:709
+#: lilypond-book.py:119
 #, python-format
-msgid "compatibility mode translation: %s"
+msgid "Copyright (c) %s by"
 msgstr ""
 
-#: lilypond-book.py:728
-#, python-format
-msgid "ignoring unknown ly option: %s"
+#: lilypond-book.py:129
+msgid "FILTER"
 msgstr ""
 
-#: lilypond-book.py:761
-#, python-format
-msgid "file not found: %s"
+#: lilypond-book.py:132
+msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr ""
 
-#: lilypond-book.py:1094
-#, python-format
-msgid "Opening filter `%s'"
+#: lilypond-book.py:135
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr ""
 
-#: lilypond-book.py:1236
-msgid "Writing snippets..."
+#: lilypond-book.py:138
+msgid "add DIR to include path"
 msgstr ""
 
-#: lilypond-book.py:1241
-msgid "Processing...\n"
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
 msgstr ""
 
-#: lilypond-book.py:1244
-msgid "All snippets are up to date..."
+#: lilypond-book.py:143
+msgid "write output to DIR"
 msgstr ""
 
-#: lilypond-book.py:1254
-#, python-format
-msgid "cannot determine format for: %s"
+#: lilypond-book.py:147
+msgid "COMMAND"
 msgstr ""
 
-#: lilypond-book.py:1299
-msgid "Output would overwrite input file; use --output."
+#: lilypond-book.py:148
+msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:1306
-#, python-format
-msgid "Reading %s..."
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
 msgstr ""
 
-#: lilypond-book.py:1322
-msgid "Dissecting..."
+#: 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:1353
-#, python-format
-msgid "Compiling %s..."
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
+msgid "be verbose"
 msgstr ""
 
-#: lilypond-book.py:1361
+#: lilypond-book.py:773
 #, python-format
-msgid "Processing include: %s"
+msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:1371
+#: lilypond-book.py:1004
 #, python-format
-msgid "Removing `%s'"
+msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:1386 lilypond-latex.py:576 midi2ly.py:1017 ps2png.py:51
+#: lilypond-book.py:1007
 #, python-format
-msgid "getopt says: `%s'"
-msgstr ""
-
-#. # FIXME
-#. # do -P or -p by default?
-#. #help_summary = _ ("Run LilyPond using LaTeX for titling")
-#: lilypond-latex.py:104
-msgid "Run LilyPond, generate printable document."
-msgstr ""
-
-#: lilypond-latex.py:110
-msgid "use LaTeX for formatting"
-msgstr ""
-
-#: lilypond-latex.py:111
-msgid "print even more output"
-msgstr ""
-
-#: lilypond-latex.py:112 lilypond-latex.py:123 midi2ly.py:102 main.cc:133
-#: main.cc:135
-msgid "FILE"
-msgstr ""
-
-#: lilypond-latex.py:112
-msgid "find pfa fonts used in FILE"
-msgstr ""
-
-#: lilypond-latex.py:114
-msgid "add DIR to LilyPond's search path"
+msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-latex.py:116
+#: lilypond-book.py:1011
 #, python-format
-msgid "keep all output, output to directory %s.dir"
-msgstr ""
-
-#. junkme?
-#: lilypond-latex.py:119
-msgid "don't run LilyPond"
-msgstr ""
-
-#. junkme?
-#: lilypond-latex.py:121 main.cc:134
-msgid "produce MIDI output only"
-msgstr ""
-
-#: lilypond-latex.py:123 main.cc:135
-msgid "write output to FILE (suffix will be added)"
-msgstr ""
-
-#: lilypond-latex.py:124 ps2png.py:42
-msgid "RES"
-msgstr ""
-
-#: lilypond-latex.py:125 ps2png.py:43
-msgid "set the resolution of the preview to RES"
+msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-latex.py:126
-msgid "generate PDF output"
+#: lilypond-book.py:1014
+#, python-format
+msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-latex.py:127
-msgid "generate PostScript output"
+#: lilypond-book.py:1033
+#, python-format
+msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-latex.py:128
-msgid "generate PNG page images"
+#: lilypond-book.py:1388
+#, python-format
+msgid "Opening filter `%s'"
 msgstr ""
 
-#: lilypond-latex.py:129
-msgid "make a picture of the first system"
+#: lilypond-book.py:1405
+#, python-format
+msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilypond-latex.py:130
-msgid "generate PS.GZ"
+#: lilypond-book.py:1406
+msgid "The error log is as follows:"
 msgstr ""
 
-#: lilypond-latex.py:131
-msgid "run in safe-mode"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-latex.py:132
-msgid "KEY=VAL"
+#: lilypond-book.py:1586
+msgid "Writing snippets..."
 msgstr ""
 
-#: lilypond-latex.py:132
-msgid "change global setting KEY to VAL"
+#: lilypond-book.py:1591
+msgid "Processing..."
 msgstr ""
 
-#: lilypond-latex.py:134 midi2ly.py:106 mup2ly.py:79 main.cc:144
-msgid "print version number"
+#: lilypond-book.py:1595
+msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-latex.py:203
+#: lilypond-book.py:1605
 #, python-format
-msgid "no such setting: `%s'"
+msgid "cannot determine format for: %s"
 msgstr ""
 
-#: lilypond-latex.py:247
+#: lilypond-book.py:1616
 #, python-format
-msgid "LilyPond crashed (signal %d)."
+msgid "%s is up to date."
 msgstr ""
 
-#: lilypond-latex.py:248
-msgid "Please submit a bug report to bug-lilypond@gnu.org"
+#: lilypond-book.py:1622
+#, python-format
+msgid "Writing `%s'..."
 msgstr ""
 
-#: lilypond-latex.py:255
-#, python-format
-msgid "LilyPond failed on input file %s (exit status %d)"
+#: lilypond-book.py:1677
+msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-latex.py:259
+#: lilypond-book.py:1681
 #, python-format
-msgid "LilyPond failed on an input file (exit status %d)"
+msgid "Reading %s..."
 msgstr ""
 
-#: lilypond-latex.py:260
-msgid "Continuing..."
+#: lilypond-book.py:1700
+msgid "Dissecting..."
 msgstr ""
 
-#: lilypond-latex.py:270
+#: lilypond-book.py:1716
 #, python-format
-msgid "Analyzing %s..."
+msgid "Compiling %s..."
 msgstr ""
 
-#: lilypond-latex.py:324
+#: lilypond-book.py:1725
 #, python-format
-msgid "no LilyPond output found for `%s'"
-msgstr ""
-
-#: lilypond-latex.py:465
-msgid "LaTeX failed on the output file."
-msgstr ""
-
-#: lilypond-latex.py:513
-msgid ""
-"Trying create PDF, but no PFA fonts found.\n"
-"Using bitmap fonts instead. This will look bad."
+msgid "Processing include: %s"
 msgstr ""
 
-#. no ps header?
-#: lilypond-latex.py:556
+#: lilypond-book.py:1739
 #, python-format
-msgid "not a PostScript file: `%s'"
-msgstr ""
-
-#: lilypond-latex.py:666
-msgid "pseudo filter"
+msgid "Removing `%s'"
 msgstr ""
 
-#: lilypond-latex.py:669
-msgid "pseudo filter only for single input file"
+#: lilypond-book.py:1815
+#, python-format
+msgid "Writing fonts to %s..."
 msgstr ""
 
-#: lilypond-latex.py:674
-msgid "no files specified on command line"
+#: lilypond-book.py:1830
+msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-latex.py:706
-#, python-format
-msgid "filename should not contain spaces: `%s'"
+#: lilypond-book.py:1831
+msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-latex.py:744
-msgid "Running LilyPond failed. Rerun with --verbose for a trace."
+#: lilypond-book.py:1834
+msgid "DVIPS usage:"
 msgstr ""
 
-#: lilypond-latex.py:786
-msgid "Failed to make PS file. Rerun with --verbose for a trace."
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
+msgid "warning: "
 msgstr ""
 
-#: lilypond-latex.py:815
-#, python-format
-msgid "%s output to <stdout>..."
+#: midi2ly.py:109 midi2ly.py:924
+msgid "error: "
 msgstr ""
 
-#: lilypond-latex.py:820 includable-lexer.cc:57 kpath.cc:129 lily-guile.cc:90
-#: lily-parser-scheme.cc:92
-#, c-format, python-format
-msgid "can't find file: `%s'"
+#: midi2ly.py:110
+msgid "Exiting ... "
 msgstr ""
 
-#: lilypond-latex.py:843
+#: midi2ly.py:857
 #, python-format
-msgid "%s output to %s..."
+msgid "%s output to `%s'..."
 msgstr ""
 
-#: lilypond-latex.py:846
+#: midi2ly.py:871 musicxml2ly.py:485
 #, python-format
-msgid "can't find file: `%s.%s'"
+msgid "Convert %s to LilyPond input."
 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
+#: midi2ly.py:875
 msgid "print absolute pitches"
 msgstr ""
 
-#: midi2ly.py:98 midi2ly.py:103
+#: midi2ly.py:877 midi2ly.py:889
 msgid "DUR"
 msgstr ""
 
-#: midi2ly.py:98
+#: midi2ly.py:878
 msgid "quantise note durations on DUR"
 msgstr ""
 
-#: midi2ly.py:99
+#: midi2ly.py:881
 msgid "print explicit durations"
 msgstr ""
 
-#: midi2ly.py:101
-msgid "ALT[:MINOR]"
-msgstr ""
-
-#: midi2ly.py:101
+#: midi2ly.py:882
 msgid "set key: ALT=+sharps|-flats; MINOR=1"
 msgstr ""
 
-#: midi2ly.py:102 mup2ly.py:76
-msgid "write output to FILE"
+#: midi2ly.py:883
+msgid "ALT[:MINOR]"
 msgstr ""
 
-#: midi2ly.py:103
+#: midi2ly.py:888
 msgid "quantise note starts on DUR"
 msgstr ""
 
-#: midi2ly.py:104
+#: midi2ly.py:891
 msgid "DUR*NUM/DEN"
 msgstr ""
 
-#: midi2ly.py:104
+#: midi2ly.py:894
 msgid "allow tuplet durations DUR*NUM/DEN"
 msgstr ""
 
-#: midi2ly.py:108
+#: midi2ly.py:902
 msgid "treat every text as a lyric"
 msgstr ""
 
-#: midi2ly.py:149 mup2ly.py:143 input.cc:105
-msgid "warning: "
-msgstr ""
-
-#: midi2ly.py:164 midi2ly.py:1017 midi2ly.py:1082 mup2ly.py:146 mup2ly.py:160
-#: input.cc:110
-msgid "error: "
-msgstr ""
-
-#: midi2ly.py:165 mup2ly.py:161
-msgid "Exiting ... "
-msgstr ""
-
-#: midi2ly.py:263 mup2ly.py:260
-#, python-format
-msgid "command exited with value %d"
-msgstr ""
-
-#: midi2ly.py:1001
-#, python-format
-msgid "%s output to `%s'..."
-msgstr ""
-
-#: midi2ly.py:1032
-msgid "Example:"
+#: midi2ly.py:905
+msgid "Examples"
 msgstr ""
 
-#: midi2ly.py:1082
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr ""
 
-#: mup2ly.py:70
-msgid "Convert mup to LilyPond source."
-msgstr ""
-
-#: mup2ly.py:73
-msgid "debug"
-msgstr ""
-
-#: mup2ly.py:74
-msgid "define macro NAME [optional expansion EXP]"
-msgstr ""
-
-#: mup2ly.py:77
-msgid "only pre-process"
-msgstr ""
-
-#: mup2ly.py:1075
-#, python-format
-msgid "no such context: %s"
-msgstr ""
-
-#: mup2ly.py:1300
-#, python-format
-msgid "Processing `%s'..."
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
 msgstr ""
 
-#: mup2ly.py:1319
+#: musicxml2ly.py:476
 #, python-format
-msgid "Writing `%s'..."
+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 ""
 
-#. ugr.
-#: ps2png.py:35
-msgid "Convert PostScript to PNG image."
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
 msgstr ""
 
-#. # FIXME: silly message containing %d
-#: ps2png.py:72
-#, python-format
-msgid "Wrote `%s'"
+#: musicxml2ly.py:503
+msgid "set output filename to FILE"
 msgstr ""
 
-#: getopt-long.cc:144
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr ""
 
-#: getopt-long.cc:148
+#: 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:152
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr ""
 
-#: getopt-long.cc:159
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr ""
 
-#: warn.cc:43
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr ""
 
-#: warn.cc:44
-msgid "Continuing; crossing fingers"
+#: warn.cc:69 input.cc:83
+msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:239
+#: accidental-engraver.cc:240
 #, c-format
-msgid "Accidental typesetting list must begin with context-name: %s"
+msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:267
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
 #: accidental-engraver.cc:284
 #, c-format
-msgid "Accidental rule must be pair or context-name; Found %s"
+msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:223 key-signature-interface.cc:133
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
 
-#: afm.cc:144
-#, c-format
-msgid "Error 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
-#: all-font-metrics.cc:158
-#, 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:160
+#: all-font-metrics.cc:173
 #, c-format
-msgid "does not match: `%s'"
-msgstr ""
-
-#: all-font-metrics.cc:166
-msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
+msgid "cannot find font: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:168
-msgid "Rerun with -V to show font paths."
-msgstr ""
-
-#: all-font-metrics.cc:170
-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:279
+#: 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:280
-msgid "Loading default font"
+#: axis-group-engraver.cc:78
+msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: all-font-metrics.cc:295
-#, 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:296 includable-lexer.cc:59 lily-parser-scheme.cc:85
-#, c-format
-msgid "(search path: `%s')"
+#: axis-group-engraver.cc:80
+msgid "removing this vertical group"
 msgstr ""
 
-#: all-font-metrics.cc:297
-msgid "Giving up"
+#: axis-group-interface.cc:96
+msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
-#: apply-context-iterator.cc:35
-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:66 change-iterator.cc:61
-msgid "Can't switch translators, I'm there already"
-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:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
 msgstr ""
 
-#: bar-check-iterator.cc:68
+#: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr ""
 
-#: beam-engraver.cc:138
+#: beam-engraver.cc:128
 msgid "already have a beam"
 msgstr ""
 
-#: beam-engraver.cc:209
+#: beam-engraver.cc:196
 msgid "unterminated beam"
 msgstr ""
 
-#: beam-engraver.cc:242 chord-tremolo-engraver.cc:168
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr ""
 
-#: beam-engraver.cc:256
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+msgid "stem does not fit in beam"
 msgstr ""
 
-#: beam-engraver.cc:257
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr ""
 
-#: beam.cc:150
-msgid "beam has less than two visible stems"
+#: beam-quanting.cc:307
+msgid "no feasible beam position"
 msgstr ""
 
-#: beam.cc:155
-msgid "removing beam with less than two stems"
+#: beam.cc:144
+msgid "removing beam with no stems"
 msgstr ""
 
-#: beam.cc:1011
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:212
+#: break-alignment-interface.cc:208
 #, 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
-#.
-#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#. errors hard to catch.
 #.
-#: change-iterator.cc:93
-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 ""
 
-#: change-iterator.cc:96
+#. FIXME: uncomprehensable message
+#: change-iterator.cc:95
 msgid "none of these in my family"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:97
-#, 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:134
+#: chord-tremolo-engraver.cc:110
 msgid "unterminated chord tremolo"
 msgstr ""
 
-#: chord-tremolo-iterator.cc:66
-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
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
 
-#: cluster.cc:122
+#: 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 ""
 
-#: coherent-ligature-engraver.cc:96
+#. 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 ""
+
+#: context-def.cc:130
 #, c-format
-msgid "distance =%f"
+msgid "program has no such type: `%s'"
+msgstr ""
+
+#: context-property.cc:76
+msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:139
+#: context.cc:151
 #, 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:213
 #, c-format
-msgid "Program has no such type: `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr ""
 
-#: context-def.cc:286
+#: context.cc:276
 #, c-format
-msgid "can't find: `%s'"
+msgid "Invalid CreateContext event: Cannot create %s context"
 msgstr ""
 
-#: context.cc:151
+#: context.cc:388
 #, c-format
-msgid "Cannot find or create new `%s'"
+msgid "cannot find or create: `%s'"
 msgstr ""
 
-#: context.cc:217
+#: 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:315
+#: dispatcher.cc:78
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "Unknown event class %s"
 msgstr ""
 
-#: custos.cc:84
+#: dots.cc:38
 #, c-format
-msgid "custos `%s' not found"
+msgid "dot `%s' not found"
 msgstr ""
 
-#: dynamic-engraver.cc:179 span-dynamic-performer.cc:84
-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:189
+#: dynamic-engraver.cc:195
 msgid "already have a decrescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:191
+#: dynamic-engraver.cc:197
 msgid "already have a crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:194
-msgid "Cresc started here"
+#: dynamic-engraver.cc:200
+msgid "cresc starts here"
 msgstr ""
 
-#: dynamic-engraver.cc:315
+#: dynamic-engraver.cc:323
 msgid "unterminated (de)crescendo"
 msgstr ""
 
-#: event-chord-iterator.cc:56 output-property-music-iterator.cc:29
-#, c-format
-msgid "Junking event: `%s'"
+#: extender-engraver.cc:131 extender-engraver.cc:140
+msgid "unterminated extender"
 msgstr ""
 
-#: extender-engraver.cc:140 extender-engraver.cc:149
-msgid "unterminated extender"
+#: font-config.cc:28
+msgid "Initializing FontConfig..."
 msgstr ""
 
-#: folded-repeat-iterator.cc:65
-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:34
+#: font-config.cc:55
 #, c-format
-msgid "Failed to add lilypond directory %s"
+msgid "failed adding font directory: %s"
 msgstr ""
 
-#: glissando-engraver.cc:99
-msgid "Unterminated glissando."
+#: font-config.cc:57
+#, c-format
+msgid "adding font directory: %s"
 msgstr ""
 
-#: global-context-scheme.cc:52 global-context-scheme.cc:80
-msgid "Need music in a score"
+#: general-scheme.cc:160
+msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: global-context-scheme.cc:70
-msgid "Interpreting music... "
+#: general-scheme.cc:161
+msgid "setting to zero"
 msgstr ""
 
-#: global-context-scheme.cc:91
-#, c-format
-msgid "elapsed time: %.2f seconds"
+#: glissando-engraver.cc:92
+msgid "unterminated glissando"
 msgstr ""
 
-#: global-context.cc:162
-#, c-format
-msgid "can't find `%s' context"
+#: global-context-scheme.cc:91 global-context-scheme.cc:107
+msgid "no music found in score"
 msgstr ""
 
-#: gourlay-breaking.cc:200
-#, c-format
-msgid "Optimal demerits: %f"
+#: global-context-scheme.cc:97
+msgid "Interpreting music... "
 msgstr ""
 
-#: gourlay-breaking.cc:205
-msgid "No feasible line breaking found"
+#: global-context-scheme.cc:120
+#, c-format
+msgid "elapsed time: %.2f seconds"
 msgstr ""
 
 #: gregorian-ligature-engraver.cc:59
@@ -993,96 +810,93 @@ msgstr ""
 msgid "implied \\%s added"
 msgstr ""
 
-#: grob-interface.cc:48
+#. 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:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: hairpin.cc:106
-msgid "decrescendo too small"
+#: grob.cc:253
+msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:107
-msgid "crescendo too small"
+#: hairpin.cc:183
+msgid "decrescendo too small"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:57
-msgid "Don't have that many brackets."
+#: horizontal-bracket-engraver.cc:59
+msgid "do not have that many brackets"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:66
-msgid "Conflicting note group events."
+#: horizontal-bracket-engraver.cc:68
+msgid "conflicting note group events"
 msgstr ""
 
-#: hyphen-engraver.cc:96
+#: hyphen-engraver.cc:93
 msgid "removing unterminated hyphen"
 msgstr ""
 
-#: hyphen-engraver.cc:109
+#: hyphen-engraver.cc:107
 msgid "unterminated hyphen; removing"
 msgstr ""
 
-#: includable-lexer.cc:50
+#: includable-lexer.cc:53
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: input.cc:116
-msgid "non fatal error: "
-msgstr ""
-
-#: input.cc:124 source-file.cc:136 source-file.cc:229
-msgid "position unknown"
-msgstr ""
-
-#: key-performer.cc:88
-msgid "FIXME: key change merge"
-msgstr ""
-
-#: kpath.cc:56
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "kpathsea can not find AFM file `%s'"
+msgid "cannot find file: `%s'"
 msgstr ""
 
-#: kpath.cc:80
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
 #, c-format
-msgid "kpathsea can not find TFM file: `%s'"
+msgid "(search path: `%s')"
 msgstr ""
 
-#: kpath.cc:124
-#, c-format
-msgid "kpathsea can not find file: `%s'"
+#: input.cc:112 source-file.cc:168 source-file.cc:183
+msgid "position unknown"
 msgstr ""
 
-#: ligature-engraver.cc:153
-msgid "can't find start of ligature"
+#: ligature-engraver.cc:93
+msgid "cannot find start of ligature"
 msgstr ""
 
-#: ligature-engraver.cc:159
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr ""
 
-#: ligature-engraver.cc:185
+#: ligature-engraver.cc:120
 msgid "already have a ligature"
 msgstr ""
 
-#: ligature-engraver.cc:201
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr ""
 
-#: ligature-engraver.cc:257
+#: ligature-engraver.cc:173
 msgid "unterminated ligature"
 msgstr ""
 
-#: ligature-engraver.cc:281
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:282
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr ""
 
@@ -1091,53 +905,77 @@ msgstr ""
 msgid "(load path: `%s')"
 msgstr ""
 
-#: lily-guile.cc:478
+#: 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:481
-msgid "Perhaps you made a typing error?"
+#: lily-guile.cc:521
+msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:487
-msgid "Doing assignment anyway."
+#: lily-guile.cc:527
+msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:501
+#: lily-guile.cc:539
 #, 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:211
+#: lily-lexer.cc:254
 #, c-format
-msgid "Identifier name is a keyword: `%s'"
+msgid "identifier name is a keyword: `%s'"
 msgstr ""
 
-#: lily-lexer.cc:228
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
 
-#: lily-parser-scheme.cc:84
+#: lily-parser-scheme.cc:29
+#, c-format
+msgid "deprecated function called: %s"
+msgstr ""
+
+#: lily-parser-scheme.cc:88
 #, c-format
-msgid "can't find init file: `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr ""
 
-#: lily-parser-scheme.cc:101
+#: lily-parser-scheme.cc:106
+#, c-format
+msgid "cannot find init file: `%s'"
+msgstr ""
+
+#: lily-parser-scheme.cc:125
 #, c-format
 msgid "Processing `%s'"
 msgstr ""
 
-#: lily-parser.cc:102
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr ""
 
-#: lily-parser.cc:120
-msgid "Braces don't match"
+#: lily-parser.cc:127
+msgid "braces do not match"
+msgstr ""
+
+#: 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:95
+#: 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"
@@ -1148,83 +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:124
-msgid "select backend to use"
+#: main.cc:153
+msgid "BACK"
 msgstr ""
 
-#: main.cc:125
+#: main.cc:153
+msgid ""
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
+msgstr ""
+
+#: main.cc:155
+msgid "SYM[=VAL]"
+msgstr ""
+
+#: main.cc:156
+msgid ""
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
+msgstr ""
+
+#: main.cc:159
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:126
-msgid "set option, use -e '(ly:option-usage)' for help"
+#: main.cc:159
+msgid "evaluate scheme code"
+msgstr ""
+
+#. Bug in option parser: --output =foe is taken as an abbreviation
+#. for --output-format.
+#: main.cc:162
+msgid "FORMATs"
+msgstr ""
+
+#: main.cc:162
+msgid "dump FORMAT,...  Also as separate options:"
+msgstr ""
+
+#: main.cc:163
+msgid "generate DVI (tex backend only)"
+msgstr ""
+
+#: main.cc:164
+msgid "generate PDF (default)"
+msgstr ""
+
+#: main.cc:165
+msgid "generate PNG"
+msgstr ""
+
+#: main.cc:166
+msgid "generate PostScript"
 msgstr ""
 
-#. Bug in option parser: --output =foe is taken as an abbreviation
-#. for --output-format.
-#: main.cc:129
-msgid "EXTs"
+#: main.cc:167
+msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:129
-msgid "list of formats to dump"
+#: main.cc:168
+msgid "show this help and exit"
 msgstr ""
 
-#: main.cc:131
+#: main.cc:169
 msgid "FIELD"
 msgstr ""
 
-#: main.cc:131
-msgid "write header field to BASENAME.FIELD"
+#: main.cc:169
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:132
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr ""
 
-#: main.cc:133
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr ""
 
-#: main.cc:136
-msgid "generate a preview"
+#: main.cc:174
+msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:137
-msgid "don't generate full pages"
+#: main.cc:174
+msgid ""
+"chroot to JAIL, become USER:GROUP\n"
+"and cd into DIR"
 msgstr ""
 
-#: main.cc:138
-msgid "generate PNG"
+#: main.cc:177
+msgid "do not generate printed output"
 msgstr ""
 
-#: main.cc:139
-msgid "generate PostScript"
+#: main.cc:178
+msgid "write output to FILE (suffix will be added)"
 msgstr ""
 
-#: main.cc:140
-msgid "generate DVI"
+#: main.cc:179
+msgid "generate a preview of the first system"
 msgstr ""
 
-#: main.cc:141
-msgid "generate PDF (default)"
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
 msgstr ""
 
-#: main.cc:142
-msgid "generate TeX"
+#: main.cc:181
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:143
-msgid "run in safe mode"
+#: main.cc:183
+msgid "show version number and exit"
 msgstr ""
 
-#: main.cc:166
+#: main.cc:224
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1232,57 +1116,131 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:192
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
-#: main.cc:194
+#: main.cc:253
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
-#: main.cc:196
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:198
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:76
+#: 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: %u"
+msgstr ""
+
+#: main.cc:323
+#, c-format
+msgid "no such user: %s"
+msgstr ""
+
+#: main.cc:325
+#, c-format
+msgid "cannot get user id from user name: %s: %s"
+msgstr ""
+
+#: main.cc:340
+#, c-format
+msgid "no such group: %s"
+msgstr ""
+
+#: main.cc:342
+#, c-format
+msgid "cannot get group id from group name: %s: %s"
+msgstr ""
+
+#: main.cc:350
+#, c-format
+msgid "cannot chroot to: %s: %s"
+msgstr ""
+
+#: main.cc:357
+#, c-format
+msgid "cannot change group id to: %d: %s"
+msgstr ""
+
+#: main.cc:363
+#, c-format
+msgid "cannot change user id to: %d: %s"
+msgstr ""
+
+#: main.cc:369
+#, c-format
+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.
+#: 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:102
-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:116
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:128
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:140
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:188
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:199
+#: 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:226
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1290,625 +1248,904 @@ 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:132
+#: mensural-ligature.cc:141
 msgid "Mensural_ligature: unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature.cc:184
+#: mensural-ligature.cc:192
 msgid "Mensural_ligature: (join_right == 0)"
 msgstr ""
 
-#: midi-item.cc:151
+#: midi-item.cc:152
 #, c-format
 msgid "no such MIDI instrument: `%s'"
 msgstr ""
 
-#: midi-item.cc:255
-msgid "silly pitch"
+#: midi-item.cc:285
+#, c-format
+msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
-#: midi-item.cc:271
+#: midi-stream.cc:28
 #, c-format
-msgid "Experimental: temporarily fine tuning (of %d cents) a channel."
+msgid "cannot open for write: %s: %s"
 msgstr ""
 
-#: midi-stream.cc:39
+#: midi-stream.cc:44
 #, c-format
-msgid "could not write file: `%s'"
+msgid "cannot write to file: `%s'"
+msgstr ""
+
+#: music-iterator.cc:171
+msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:176
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected %s, found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:239
+#: music.cc:207
 #, c-format
-msgid "Transposition by %s makes alteration larger than double"
+msgid "transposition by %s makes alteration larger than double"
 msgstr ""
 
-#.
-#. music for the softenon children?
-#.
-#: new-fingering-engraver.cc:153
-msgid "music for the martians."
+#: 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 ""
 
-#: new-fingering-engraver.cc:233
-msgid "Fingerings are also not down?! Putting them down anyway."
+#: new-fingering-engraver.cc:240
+msgid "placing below"
 msgstr ""
 
-#: new-lyric-combine-music-iterator.cc:243
+#: note-collision.cc:457
+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 "cannot find Voice `%s'"
+msgid "none of note heads `%s' or `%s' found"
 msgstr ""
 
-#: note-collision.cc:413
-msgid "Too many clashing notecolumns.  Ignoring them."
+#: note-heads-engraver.cc:61
+msgid "NoteEvent without pitch"
 msgstr ""
 
-#: note-head.cc:68
+#: open-type-font.cc:33
 #, c-format
-msgid "note head `%s' not found"
+msgid "cannot allocate %lu bytes"
 msgstr ""
 
-#: open-type-font.cc:29
+#: open-type-font.cc:37
 #, c-format
-msgid "Cannot allocate %d bytes"
+msgid "cannot load font table: %s"
 msgstr ""
 
-#: open-type-font.cc:33
+#: open-type-font.cc:98
 #, c-format
-msgid "Could not load %s font table"
+msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:85
+#: open-type-font.cc:100
 #, c-format
-msgid "Unsupported font format: %s"
+msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:89
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "Unknown error: %d reading font file: %s"
+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 ""
 
-#: open-type-font.cc:144
+#: page-turn-page-breaking.cc:218
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: pango-font.cc:147
-msgid "FreeType face has no PostScript font name."
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
+msgid "Drawing systems..."
 msgstr ""
 
-#: paper-outputter-scheme.cc:27
+#: pango-font.cc:181
 #, c-format
-msgid "Layout output to `%s'..."
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
 msgstr ""
 
-#: paper-score.cc:66
+#: pango-font.cc:224
 #, c-format
-msgid "Element count %d (spanners %d) "
+msgid "no PostScript font name for font `%s'"
 msgstr ""
 
-#: paper-score.cc:70
-msgid "Preprocessing graphical objects..."
+#: pango-font.cc:272
+msgid "FreeType face has no PostScript font name"
 msgstr ""
 
-#: parse-scm.cc:81
-msgid "GUILE signaled an error for the expression beginning here"
+#: paper-outputter-scheme.cc:33
+#, c-format
+msgid "Layout output to `%s'..."
+msgstr ""
+
+#: paper-score.cc:105
+msgid "Calculating line breaks..."
 msgstr ""
 
-#: pdf.cc:259
+#: paper-score.cc:118
 #, c-format
-msgid "Can't open file %s"
+msgid "Element count %d (spanners %d) "
 msgstr ""
 
-#: percent-repeat-engraver.cc:100
-msgid "Don't know how to handle a percent repeat of this length."
+#: paper-score.cc:122
+msgid "Preprocessing graphical objects..."
 msgstr ""
 
-#: percent-repeat-engraver.cc:160
-msgid "unterminated percent repeat"
+#: parse-scm.cc:83
+msgid "GUILE signaled an error for the expression beginning here"
 msgstr ""
 
-#: percent-repeat-iterator.cc:54
-msgid "no one to print a percent"
+#: percent-repeat-engraver.cc:200
+msgid "unterminated percent repeat"
 msgstr ""
 
-#: performance.cc:49
+#: performance.cc:45
 msgid "Track..."
 msgstr ""
 
-#: performance.cc:92
-msgid "Creator: "
+#: performance.cc:74
+msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:112
-msgid "at "
+#: performance.cc:75
+msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:166
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr ""
 
-#: phrasing-slur-engraver.cc:116
+#: phrasing-slur-engraver.cc:146
 msgid "unterminated phrasing slur"
 msgstr ""
 
-#: piano-pedal-engraver.cc:232
-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:247 piano-pedal-engraver.cc:262
-#: 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:313
+#: 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:95
+#: program-option.cc:205
 #, c-format
-msgid "Not a grob name, `%s'."
+msgid "no such internal option: %s"
 msgstr ""
 
-#: quote-iterator.cc:251
+#: property-iterator.cc:74
 #, c-format
-msgid "In quotation: junking event %s"
+msgid "not a grob name, `%s'"
 msgstr ""
 
-#: relative-octave-check.cc:40
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
-#: rest-collision.cc:152
-msgid "rest direction not set.  Cannot resolve collision."
+#: relocate.cc:44
+#, c-format
+msgid "Setting %s to %s"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:207
-msgid "too many colliding rests"
+#: relocate.cc:59
+#, c-format
+msgid "no such file: %s for %s"
 msgstr ""
 
-#: rest.cc:141
+#: relocate.cc:69 relocate.cc:87
 #, c-format
-msgid "rest `%s' not found"
+msgid "no such directory: %s for %s"
 msgstr ""
 
-#: scm-option.cc:59
+#: relocate.cc:79
 #, c-format
-msgid "lilypond -e EXPR means:"
+msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: scm-option.cc:61
+#: relocate.cc:99
 #, c-format
-msgid "  Evalute the Scheme EXPR before parsing any .ly files."
+msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: scm-option.cc:63
+#: relocate.cc:129
 #, c-format
-msgid ""
-"  Multiple -e options may be given, they will be evaluated sequentially."
+msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: scm-option.cc:65
+#: relocate.cc:169
 #, c-format
-msgid ""
-"  The function ly:set-option allows for access to some internal variables."
+msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: scm-option.cc:67
+#: relocate.cc:176
 #, c-format
-msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
+msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: scm-option.cc:69
+#: relocate.cc:185
 #, c-format
-msgid "Use help as  SYMBOL to get online help."
+msgid ""
+"Relocation: from PATH=%s\n"
+"argv0=%s"
 msgstr ""
 
-#: scm-option.cc:137 scm-option.cc:175
+#: relocate.cc:354
 #, c-format
-msgid "No such internal option: %s"
+msgid "Relocation file: %s"
 msgstr ""
 
-#: score-engraver.cc:106 score-engraver.cc:115 score-engraver.cc:117
+#: relocate.cc:390
 #, c-format
-msgid "cannot find `%s'"
+msgid "Unknown relocation command %s"
+msgstr ""
+
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: score-engraver.cc:108
-msgid "Music font has not been installed properly.\n"
+#: rest-collision.cc:165 rest-collision.cc:210
+msgid "too many colliding rests"
 msgstr ""
 
-#: score-engraver.cc:109
+#: rest.cc:144
 #, c-format
-msgid "Search path `%s'\n"
+msgid "rest `%s' not found"
 msgstr ""
 
-#: score-engraver.cc:119
+#: score-engraver.cc:67
 #, c-format
-msgid "Install the ec-fonts-mftraced package from: %s."
+msgid "cannot find `%s'"
+msgstr ""
+
+#: score-engraver.cc:69
+msgid "Music font has not been installed properly."
 msgstr ""
 
-#: score-engraver.cc:122
-msgid "Aborting."
+#: score-engraver.cc:71
+#, c-format
+msgid "Search path `%s'"
 msgstr ""
 
-#: score.cc:224
-msgid "Already have music in score"
+#: score-engraver.cc:73
+msgid "Aborting"
 msgstr ""
 
 #: score.cc:225
-msgid "This is the previous music"
+msgid "already have music in score"
 msgstr ""
 
-#: score.cc:230
-msgid "Error found in this music expression. Ignoring it"
+#: score.cc:226
+msgid "this is the previous music"
 msgstr ""
 
-#. FIXME:
-#: script-engraver.cc:101
-msgid "Do not know how to interpret articulation: "
+#: score.cc:231
+msgid "errors found, ignoring music expression"
 msgstr ""
 
+#. FIXME:
 #: script-engraver.cc:102
-msgid "Scheme encoding: "
+msgid "do not know how to interpret articulation: "
 msgstr ""
 
-#. this shouldn't happen, but let's continue anyway.
-#: separation-item.cc:54 separation-item.cc:98
-msgid "Separation_item:  I've been drinking too much"
+#: script-engraver.cc:103
+msgid "scheme encoding: "
 msgstr ""
 
-#: simple-spacer.cc:506
+#: simple-spacer.cc:375
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: 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:123
-msgid "No slur to end"
+#: slur-engraver.cc:157
+msgid "unterminated slur"
 msgstr ""
 
-#: source-file.cc:47
-#, c-format
-msgid "can't open file: `%s'"
+#: slur-engraver.cc:166
+msgid "cannot end slur"
 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:386
-#, 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
+#: 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:125
-msgid "Weird stem size; check for narrow beams"
+#: stem.cc:105
+msgid "weird stem size, check for narrow beams"
 msgstr ""
 
-#: stem.cc:579
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:590
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:148
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:301
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: system.cc:319
-msgid "Calculating line breaks..."
-msgstr ""
-
-#: text-spanner-engraver.cc:62
-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:76
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:138
+#: 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.
-#: tfm-reader.cc:108
-#, c-format
-msgid "TFM header of `%s' has only %u word (s)"
-msgstr ""
-
-#: tfm-reader.cc:142
-#, 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:199
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr ""
 
-#: time-scaled-music-iterator.cc:23
-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:55
+#: 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.
 #. (Here really with a warning!)
-#: time-signature.cc:85
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
 
-#: translator-ctors.cc:53
+#: translator-ctors.cc:52
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr ""
 
-#: trill-spanner-engraver.cc:70
-msgid "can't find start of trill spanner"
+#: translator-group.cc:151
+#, c-format
+msgid "cannot find: `%s'"
 msgstr ""
 
-#: trill-spanner-engraver.cc:84
-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:144
-msgid "unterminated trill spanner"
+#: trill-spanner-engraver.cc:68
+msgid "cannot find start of trill spanner"
 msgstr ""
 
-#: tuplet-bracket.cc:451
-msgid "Killing tuplet bracket across linebreak."
+#: trill-spanner-engraver.cc:80
+msgid "already have a trill spanner"
 msgstr ""
 
-#: 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:571
+#: 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:140
-msgid "No volta spanner to end"
+#: vaticana-ligature.cc:84
+msgid "flexa-height undefined; assuming 0"
 msgstr ""
 
-#: volta-engraver.cc:151
-msgid "Already have a volta spanner.  Stopping that one prematurely."
+#: vaticana-ligature.cc:89
+msgid "ascending vaticana style flexa"
 msgstr ""
 
-#: volta-engraver.cc:155
-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:144
+msgid "cannot end volta spanner"
 msgstr ""
 
-#: parser.yy:567
-msgid "Identifier should have alphabetic characters only"
+#: volta-engraver.cc:154
+msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: parser.yy:721
-msgid "\\paper cannot be in \\score. Use \\layout instead"
+#: volta-engraver.cc:158
+msgid "also already have an ended spanner"
 msgstr ""
 
-#: parser.yy:745
-msgid "Need \\paper for paper block."
+#: volta-engraver.cc:159
+msgid "giving up"
 msgstr ""
 
-#: parser.yy:890
-msgid "More alternatives than repeats.  Junking excess alternatives."
+#: parser.yy:702
+msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:1082
-msgid "Music head function should return Music object."
+#: parser.yy:726
+msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1354
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1714
-msgid "Second argument must be pitch list."
+#: parser.yy:1475
+msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1753 parser.yy:1758 parser.yy:2238
-msgid "Have to be in Lyric mode for lyrics"
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
+msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1851
-msgid "Expecting string as script definition"
+#: parser.yy:1604
+msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:2014 parser.yy:2064
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:2157
-msgid "Have to be in Note mode for notes"
+#: parser.yy:1926
+msgid "have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:2251
-msgid "Have to be in Chord mode for chords"
+#: parser.yy:1987
+msgid "have to be in Chord mode for chords"
 msgstr ""
 
-#: parser.yy:2403
-msgid "need integer number arg"
+#: lexer.ll:176
+msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: parser.yy:2586
-msgid "Suspect duration found following this beam"
+#: 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
-msgid "No quoted string found after \\version"
+#: lexer.ll:252
+msgid "quoted string expected after \\version"
+msgstr ""
+
+#: lexer.ll:256
+msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:205
-msgid "No quoted string found after \\renameinput"
+#: 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
-msgid "Missing end quote"
+#: 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:702 lexer.ll:703
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:800 lexer.ll:801
+#: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
-#: lexer.ll:801 lexer.ll:802
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:881 lexer.ll:882
+msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: backend-library.scm:20
-#, lisp-format
-msgid "Invoking `~a'...n"
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
 msgstr ""
 
-#: backend-library.scm:26
-#, lisp-format
-msgid "Error invoking `~a'. Return value ~a"
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, scheme-format
+msgid "Invoking `~a'..."
 msgstr ""
 
-#: backend-library.scm:47
-#, lisp-format
-msgid "Converting to `~a'..."
+#: backend-library.scm:24
+#, scheme-format
+msgid "`~a' failed (~a)"
 msgstr ""
 
-#: clef.scm:124
-#, lisp-format
-msgid "Unknown clef type `~a'"
+#: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
+#, scheme-format
+msgid "Converting to `~a'..."
 msgstr ""
 
-#: clef.scm:125
-msgid "See scm/lily.scm for supported clefs"
+#: backend-library.scm:108
+#, scheme-format
+msgid "Converting to ~a..."
 msgstr ""
 
-#: framework-tex.scm:130
-#, lisp-format
+#: backend-library.scm:145
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
-#: framework-tex.scm:366
-#, lisp-format
-msgid "Converting to `~a.ps'..."
+#: 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:255
+msgid "no systems found in \\score markup, does it have a \\layout block?"
+msgstr ""
+
+#: define-markup-commands.scm:1297
+#, scheme-format
+msgid "not a valid duration string: ~a"
+msgstr ""
+
+#: define-music-types.scm:751
+#, scheme-format
+msgid "symbol expected: ~S"
+msgstr ""
+
+#: define-music-types.scm:754
+#, scheme-format
+msgid "cannot find music object: ~S"
+msgstr ""
+
+#: define-music-types.scm:774
+#, scheme-format
+msgid "unknown repeat type `~S'"
+msgstr ""
+
+#: define-music-types.scm:775
+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:91 framework-eps.scm:92
+#, scheme-format
+msgid "Writing ~a..."
+msgstr ""
+
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
+msgstr ""
+
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
+msgstr ""
+
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
+msgstr ""
+
+#: framework-ps.scm:380
+#, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
+msgstr ""
+
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
+msgstr ""
+
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
+msgstr ""
+
+#: 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 ""
+
+#: framework-tex.scm:360
+#, scheme-format
+msgid "TeX file name must not contain whitespace: `~a'"
+msgstr ""
+
+#: 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 ""
+
+#: layout-page-layout.scm:357
+msgid "Calculating page breaks..."
+msgstr ""
+
+#: lily-library.scm:593
+#, scheme-format
+msgid "unknown unit: ~S"
+msgstr ""
+
+#: lily-library.scm:626
+#, scheme-format
+msgid "no \\version statement found, please add~afor future compatibility"
+msgstr ""
+
+#: lily-library.scm:633
+msgid "old relative compatibility not used"
+msgstr ""
+
+#: lily.scm:144
+#, scheme-format
+msgid "cannot find: ~A"
+msgstr ""
+
+#: lily.scm:209
+#, scheme-format
+msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
+msgstr ""
+
+#: lily.scm:525 lily.scm:589
+#, scheme-format
+msgid "failed files: ~S"
+msgstr ""
+
+#: lily.scm:579
+#, 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:136
+#, scheme-format
+msgid "Invalid property operation ~a"
+msgstr ""
+
+#: markup.scm:123
+#, scheme-format
+msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
+msgstr ""
+
+#: markup.scm:129
+#, scheme-format
+msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
+msgstr ""
+
+#: music-functions.scm:213
+msgid "More alternatives than repeats.  Junking excess alternatives"
+msgstr ""
+
+#: music-functions.scm:232
+#, scheme-format
+msgid "expecting 2 elements for chord tremolo, found ~a"
+msgstr ""
+
+#: music-functions.scm:538
+#, scheme-format
+msgid "music expected: ~S"
+msgstr ""
+
+#. FIXME: uncomprehensable message
+#: music-functions.scm:589
+#, scheme-format
+msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
+msgstr ""
+
+#: music-functions.scm:748
+#, scheme-format
+msgid "cannot find quoted music: `~S'"
+msgstr ""
+
+#: music-functions.scm:942
+#, scheme-format
+msgid "unknown accidental style: ~S"
+msgstr ""
+
+#: output-ps.scm:315
+msgid "utf-8-string encountered in PS backend"
+msgstr ""
+
+#: output-svg.scm:42
+#, scheme-format
+msgid "undefined: ~S"
+msgstr ""
+
+#: output-svg.scm:132
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
+msgstr ""
+
+#: output-tex.scm:98
+#, scheme-format
+msgid "cannot find ~a in ~a"
+msgstr ""
+
+#: paper.scm:69
+msgid "Not in toplevel scope"
+msgstr ""
+
+#: 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:144
+msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
+msgstr ""
+
+#: parser-clef.scm:126
+#, scheme-format
+msgid "unknown clef type `~a'"
 msgstr ""
 
-#: framework-tex.scm:386
-#, lisp-format
-msgid "Converting to `~a.dvi'..."
+#: parser-clef.scm:127
+msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: lily.scm:94
-#, lisp-format
-msgid "wrong type for argument ~a. Expecting ~a, found ~s"
+#: ps-to-png.scm:88
+#, scheme-format
+msgid "~a exited with status: ~S"
 msgstr ""
 
-#: lily.scm:312
-msgid "error: failed files: "
+#: to-xml.scm:190
+#, scheme-format
+msgid "assertion failed: ~S"
 msgstr ""