Merge branch 'master' into nested-bookparts

[lilypond.git] / po / lilypond.pot

diff --git a/po/lilypond.pot b/po/lilypond.pot
index eeb52ca22524664e2ba74cfa84620ea615e2aed5..5df28854d1e512146f672af3febc6bf50402e451 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -1,14 +1,12 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of LilyPond.
+# Copyright (C) 2008 Han-Wen Nienhuys, Jan Nieuwenhuizen
+# This file is distributed under the same license as lilypond package.

 #
 #

-#, fuzzy

 msgid ""
 msgstr ""
 msgid ""
 msgstr ""

-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-18 14:27+0200\n"
+"Project-Id-Version: lilypond 2.11.57\n"
+"Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs\n"
+"POT-Creation-Date: 2008-08-23 18:49+0200\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "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,736 +14,1158 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: fontextract.py:25
+#: convertrules.py:12

 #, python-format
 #, python-format

-msgid "Scanning %s"
+msgid "Not smart enough to convert %s"

 msgstr ""
 
 msgstr ""
 

-#: fontextract.py:70
+#: convertrules.py:13
+msgid "Please refer to the manual for details, and update manually."
+msgstr ""
+
+#: convertrules.py:14

 #, python-format
 #, python-format

-msgid "Extracted %s"
+msgid "%s has been replaced by %s"
+msgstr ""
+
+#: convertrules.py:24 musicexp.py:16 convert-ly.py:48 lilypond-book.py:82
+#: warn.cc:48 input.cc:90
+#, c-format, python-format
+msgid "warning: %s"
+msgstr ""
+
+#: convertrules.py:49 convertrules.py:99
+msgid "\\header { key = concat + with + operator }"

 msgstr ""
 
 msgstr ""
 

-#: fontextract.py:86
+#: convertrules.py:58

 #, python-format
 #, python-format

-msgid "Writing fonts to %s"
+msgid "deprecated %s"
+msgstr ""
+
+#: convertrules.py:70
+msgid "deprecated \\textstyle, new \\key syntax"
+msgstr ""
+
+#: convertrules.py:86 convertrules.py:1906 convertrules.py:2085
+#: convertrules.py:2237 convertrules.py:2567
+msgid "bump version for release"
+msgstr ""
+
+#: convertrules.py:103
+msgid "new \\header format"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:62
-msgid "lilylib module"
+#: convertrules.py:132
+msgid "\\translator syntax"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:65 lilypond-book.py:89 midi2ly.py:100 mup2ly.py:75 ps2png.py:41
-#: main.cc:145 lily/main.cc:145
-msgid "print this help"
+#: convertrules.py:184
+msgid "\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:112 midi2ly.py:136 mup2ly.py:130
+#: convertrules.py:216 convertrules.py:699 convertrules.py:1383
+#: convertrules.py:2379

 #, python-format
 #, python-format

-msgid "Copyright (c) %s by"
+msgid "deprecate %s"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:116 midi2ly.py:141 mup2ly.py:135
-msgid "Distributed under terms of the GNU General Public License."
+#: convertrules.py:290
+#, python-format
+msgid "deprecate %s "

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:118 midi2ly.py:142 mup2ly.py:136
-msgid "It comes with NO WARRANTY."
+#: convertrules.py:319
+msgid "new \\notenames format"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:125 warn.cc:44 input.cc:79 lily/input.cc:79
-#, c-format, python-format
-msgid "warning: %s"
+#: convertrules.py:337
+msgid "new tremolo format"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:128 warn.cc:50 input.cc:85 input.cc:93 lily/input.cc:85
-#: lily/input.cc:93
-#, c-format, python-format
-msgid "error: %s"
+#: convertrules.py:342
+msgid "Staff_margin_engraver deprecated, use Instrument_name_engraver"
+msgstr ""
+
+#: convertrules.py:395
+msgid "change property definiton case (eg. onevoice -> oneVoice)"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:132
+#: convertrules.py:457
+msgid "new \\textscript markup text"
+msgstr ""
+
+#: convertrules.py:530

 #, python-format
 #, python-format

-msgid "Exiting (%d)..."
+msgid "identifier names: %s"
+msgstr ""
+
+#: convertrules.py:569
+msgid "point-and-click argument changed to procedure."
+msgstr ""
+
+#: convertrules.py:611
+msgid "semicolons removed"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:200 midi2ly.py:223 mup2ly.py:219
+#. 40 ?
+#: convertrules.py:654

 #, python-format
 #, python-format

-msgid "Usage: %s [OPTIONS]... FILE"
+msgid "%s property names"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:204 convert-ly.py:57 midi2ly.py:227 mup2ly.py:223 main.cc:211
-#: lily/main.cc:211
-#, c-format
-msgid "Options:"
+#: convertrules.py:724
+msgid "automaticMelismata turned on by default"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:208 convert-ly.py:68 lilypond-pdfpc-helper.py:28 midi2ly.py:231
-#: mup2ly.py:227 main.cc:215 lily/main.cc:215
-#, c-format, python-format
-msgid "Report bugs to %s."
+#: convertrules.py:963 convertrules.py:1682 convertrules.py:1943
+#: convertrules.py:2190
+#, python-format
+msgid "remove %s"
+msgstr ""
+
+#: convertrules.py:1001 convertrules.py:1005
+msgid "cluster syntax"
+msgstr ""
+
+#: convertrules.py:1014
+msgid "new Pedal style syntax"
+msgstr ""
+
+#: convertrules.py:1273
+msgid ""
+"New relative mode,\n"
+"Postfix articulations, new text markup syntax, new chord syntax."
+msgstr ""
+
+#: convertrules.py:1286
+msgid "Remove - before articulation"
+msgstr ""
+
+#: convertrules.py:1324
+#, python-format
+msgid "%s misspelling"
+msgstr ""
+
+#: convertrules.py:1346
+msgid "Swap < > and << >>"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:228
+#: convertrules.py:1349
+msgid "attempting automatic \\figures conversion.  Check results!"
+msgstr ""
+
+#: convertrules.py:1400
+msgid "Use Scheme code to construct arbitrary note events."
+msgstr ""
+
+#: convertrules.py:1407
+msgid ""
+"use symbolic constants for alterations,\n"
+"remove \\outputproperty, move ly:verbose into ly:get-option"
+msgstr ""
+
+#: convertrules.py:1432

 #, python-format
 #, python-format

-msgid "Binary %s has version %s, looking for version %s"
+msgid ""
+"\\outputproperty found,\n"
+"Please hand-edit, using\n"
+"\n"
+"  \\applyoutput #(outputproperty-compatibility %s '%s <GROB PROPERTY "
+"VALUE>)\n"
+"\n"
+"as a substitution text."

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:262
+#: convertrules.py:1446
+msgid ""
+"The alteration field of Scheme pitches was multiplied by 2\n"
+"to support quarter tone accidentals.  You must update the following "
+"constructs manually:\n"
+"\n"
+"* calls of ly:make-pitch and ly:pitch-alteration\n"
+"* keySignature settings made with \\property\n"
+msgstr ""
+
+#: convertrules.py:1493
+msgid "removal of automaticMelismata; use melismaBusyProperties instead."
+msgstr ""
+
+#: convertrules.py:1600
+msgid "\\partcombine syntax change to \\newpartcombine"
+msgstr ""
+
+#: convertrules.py:1628
+msgid ""
+"Drum notation changes, Removing \\chordmodifiers, \\notenames.\n"
+"Harmonic notes. Thread context removed. Lyrics context removed."
+msgstr ""
+
+#: convertrules.py:1632
+msgid "Drums found. Enclose drum notes in \\drummode"
+msgstr ""
+
+#: convertrules.py:1643 convertrules.py:1650 convertrules.py:1661

 #, python-format
 #, python-format

-msgid "Opening pipe `%s'"
+msgid ""
+"\n"
+"%s found. Check file manually!\n"
+msgstr ""
+
+#: convertrules.py:1643
+msgid "Drum notation"
+msgstr ""
+
+#: convertrules.py:1702
+msgid "new syntax for property settings:"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:277 lilypond-book.py:1162
+#: convertrules.py:1728
+msgid "Property setting syntax in \\translator{ }"
+msgstr ""
+
+#: convertrules.py:1767
+msgid "Scheme grob function renaming"
+msgstr ""
+
+#: convertrules.py:1780

 #, python-format
 #, python-format

-msgid "`%s' failed (%d)"
+msgid "use %s"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:282 lilylib.py:341 lilypond-book.py:1163
-msgid "The error log is as follows:"
+#: convertrules.py:1797
+msgid "More Scheme function renaming"
+msgstr ""
+
+#: convertrules.py:1925
+msgid ""
+"Page layout has been changed, using paper size and margins.\n"
+"textheight is no longer used.\n"
+msgstr ""
+
+#: convertrules.py:2011
+msgid ""
+"\\foo -> \\foomode (for chords, notes, etc.)\n"
+"fold \\new FooContext \\foomode into \\foo."
+msgstr ""
+
+#: convertrules.py:2049
+msgid ""
+"staff size should be changed at top-level\n"
+"with\n"
+"\n"
+"  #(set-global-staff-size <STAFF-HEIGHT-IN-POINT>)\n"
+"\n"
+msgstr ""
+
+#: convertrules.py:2069
+msgid "regularize other identifiers"
+msgstr ""
+
+#: convertrules.py:2137
+msgid "\\encoding: smart recode latin1..utf-8. Remove ly:point-and-click"
+msgstr ""
+
+#: convertrules.py:2150
+msgid "LilyPond source must be UTF-8"
+msgstr ""
+
+#: convertrules.py:2153
+msgid "Try the texstrings backend"
+msgstr ""
+
+#: convertrules.py:2156
+#, python-format
+msgid "Do something like: %s"
+msgstr ""
+
+#: convertrules.py:2159
+msgid "Or save as UTF-8 in your editor"
+msgstr ""
+
+#: convertrules.py:2213
+msgid "warn about auto beam settings"
+msgstr ""
+
+#: convertrules.py:2218
+msgid "auto beam settings"
+msgstr ""
+
+#: convertrules.py:2220
+msgid ""
+"\n"
+"Auto beam settings must now specify each interesting moment in a measure\n"
+"explicitely; 1/4 is no longer multiplied to cover moments 1/2 and 3/4 too.\n"
+msgstr ""
+
+#: convertrules.py:2334
+msgid "verticalAlignmentChildCallback has been deprecated"
+msgstr ""
+
+#: convertrules.py:2338
+msgid "Remove callbacks property, deprecate XY-extent-callback."
+msgstr ""
+
+#: convertrules.py:2359
+msgid "Use grob closures iso. XY-offset-callbacks."
+msgstr ""
+
+#: convertrules.py:2421
+msgid "foobar -> foo-bar for \\paper, \\layout"
+msgstr ""
+
+#: convertrules.py:2531
+msgid "deprecate \\tempo in \\midi"
+msgstr ""
+
+#: convertrules.py:2578
+msgid "deprecate cautionary-style. Use AccidentalCautionary properties"
+msgstr ""
+
+#: convertrules.py:2591
+msgid "Rename accidental glyphs, use glyph-name-alist."
+msgstr ""
+
+#: convertrules.py:2646
+msgid "edge-text settings for TextSpanner."
+msgstr ""
+
+#: convertrules.py:2647
+#, python-format
+msgid ""
+"Use\n"
+"\n"
+"%s"
+msgstr ""
+
+#: convertrules.py:2686
+msgid "Use #'style not #'dash-fraction to select solid/dashed lines."
+msgstr ""
+
+#: convertrules.py:2692
+msgid "all settings related to dashed lines.\n"
+msgstr ""
+
+#: convertrules.py:2693
+msgid "Use \\override ... #'style = #'line for solid lines and\n"
+msgstr ""
+
+#: convertrules.py:2694
+msgid "\t\\override ... #'style = #'dashed-line for dashed lines."
+msgstr ""
+
+#: convertrules.py:2730
+msgid ""
+"metronomeMarkFormatter uses text markup as second argument,\n"
+"fret diagram properties moved to fret-diagram-details."
+msgstr ""
+
+#: convertrules.py:2735
+msgid "metronomeMarkFormatter got an additional text argument.\n"
+msgstr ""
+
+#: convertrules.py:2736
+#, python-format
+msgid ""
+"The function assigned to Score.metronomeMarkFunction now uses the signature\n"
+"%s"
+msgstr ""
+
+#: convertrules.py:2799
+msgid "\\put-adjacent argument order.\n"
+msgstr ""
+
+#: convertrules.py:2800
+msgid "Axis and direction now come before markups:\n"
+msgstr ""
+
+#: convertrules.py:2801
+msgid "\\put-adjacent axis dir markup markup."
+msgstr ""
+
+#: fontextract.py:25
+#, python-format
+msgid "Scanning %s"
+msgstr ""
+
+#: fontextract.py:70
+#, python-format
+msgid "Extracted %s"
+msgstr ""
+
+#: fontextract.py:85
+#, python-format
+msgid "Writing fonts to %s"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:313 midi2ly.py:259 mup2ly.py:255
+#: lilylib.py:101 lilylib.py:152

 #, python-format
 msgid "Invoking `%s'"
 msgstr ""
 
 #, python-format
 msgid "Invoking `%s'"
 msgstr ""
 

-#: lilylib.py:315
+#: lilylib.py:103 lilylib.py:154

 #, python-format
 msgid "Running %s..."
 msgstr ""
 
 #, python-format
 msgid "Running %s..."
 msgstr ""
 

-#: lilylib.py:334
+#: lilylib.py:219

 #, python-format
 #, python-format

-msgid "`%s' failed (%s)"
+msgid "Usage: %s"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:337 midi2ly.py:265 mup2ly.py:263
-msgid "(ignored)"
+#: musicexp.py:585
+#, python-format
+msgid "unable to set the music %(music)s for the repeat %(repeat)s"
+msgstr ""
+
+#: musicexp.py:594
+msgid "encountered repeat without body"
+msgstr ""
+
+#: musicxml.py:13 convert-ly.py:51 lilypond-book.py:85 warn.cc:54 input.cc:96
+#: input.cc:104
+#, c-format, python-format
+msgid "error: %s"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:355 midi2ly.py:275 mup2ly.py:273
+#: musicxml.py:298
+msgid "requested time signature, but time sig is unknown"
+msgstr ""
+
+#: musicxml.py:354

 #, python-format
 #, python-format

-msgid "Cleaning %s..."
+msgid "Encountered note at %s with %s duration (no <type> element):"

 msgstr ""
 
 msgstr ""
 

-#: lilylib.py:518
+#: musicxml.py:388

 #, python-format
 #, python-format

-msgid "%s exited with status: %d"
+msgid "Unable to find instrument for ID=%s\n"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:32
+#: abc2ly.py:1342 convert-ly.py:72 lilypond-book.py:109 midi2ly.py:846

 #, python-format
 #, python-format

-msgid "%s has been replaced by %s"
+msgid "%s [OPTION]... FILE"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:33
+#: abc2ly.py:1343

 #, python-format
 #, python-format

-msgid "Not smart enough to convert %s"
+msgid ""
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input.\n"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:34
-msgid "Please refer to the manual for details, and update manually."
+#: abc2ly.py:1351 convert-ly.py:79 etf2ly.py:1190 lilypond-book.py:195
+#: midi2ly.py:882 musicxml2ly.py:2185 main.cc:161
+msgid "show version number and exit"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:50
-#, python-format
-msgid "Usage: %s [OPTION]... [FILE]..."
+#: abc2ly.py:1355 convert-ly.py:83 etf2ly.py:1186 lilypond-book.py:126
+#: midi2ly.py:861 musicxml2ly.py:2167 main.cc:150
+msgid "show this help and exit"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:53
+#: abc2ly.py:1357 etf2ly.py:1191 midi2ly.py:865
+msgid "write output to FILE"
+msgstr ""
+
+#: abc2ly.py:1359
+msgid "be strict about success"
+msgstr ""
+
+#: abc2ly.py:1361
+msgid "preserve ABC's notion of beams"
+msgstr ""
+
+#: abc2ly.py:1363 convert-ly.py:120 etf2ly.py:1199 lilypond-book.py:202
+#: midi2ly.py:894 musicxml2ly.py:2240
+msgid "Report bugs via"
+msgstr ""
+
+#: convert-ly.py:31

 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
 "version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
 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 lilypond-pdfpc-helper.py:34 main.cc:98 lily/main.cc:98
-#, c-format, python-format
-msgid ""
-"This program is free software.  It is covered by the GNU General Public\n"
-"License and you are welcome to change it and/or distribute copies of it\n"
-"under certain conditions.  Invoke as `%s --warranty' for more\n"
-"information.\n"
+#: convert-ly.py:33 lilypond-book.py:59
+msgid "Examples:"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:2407
-msgid "LilyPond source must be UTF-8"
+#: convert-ly.py:67 etf2ly.py:1173 lilypond-book.py:105 midi2ly.py:77
+msgid "Distributed under terms of the GNU General Public License."

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:2410
-msgid "Try the texstrings backend"
+#: convert-ly.py:68 etf2ly.py:1174 lilypond-book.py:106 midi2ly.py:78
+msgid "It comes with NO WARRANTY."
+msgstr ""
+
+#: convert-ly.py:87 convert-ly.py:114
+msgid "VERSION"
+msgstr ""
+
+#: convert-ly.py:89
+msgid "start from VERSION [default: \\version found in file]"
+msgstr ""
+
+#: convert-ly.py:92
+msgid "edit in place"
+msgstr ""
+
+#: convert-ly.py:96
+msgid "do not add \\version command if missing"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:2413
+#: convert-ly.py:102

 #, python-format
 #, python-format

-msgid "Do something like: %s"
+msgid "force updating \\version number to %s"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:2416
-msgid "Or save as UTF-8 in your editor"
+#: convert-ly.py:108
+#, python-format
+msgid "show rules [default: -f 0, -t %s]"
+msgstr ""
+
+#: convert-ly.py:113
+#, python-format
+msgid "convert to VERSION [default: %s]"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:2494
+#: convert-ly.py:160

 msgid "Applying conversion: "
 msgstr ""
 
 msgid "Applying conversion: "
 msgstr ""
 

-#: convert-ly.py:2506
-#, python-format
-msgid "%s: error while converting"
+#: convert-ly.py:173
+msgid "Error while converting"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:2509 score-engraver.cc:111 lily/score-engraver.cc:111
-msgid "Aborting"
+#: convert-ly.py:175
+msgid "Stopping at last succesful rule"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:2530
+#: convert-ly.py:196

 #, python-format
 msgid "Processing `%s'... "
 msgstr ""
 
 #, python-format
 msgid "Processing `%s'... "
 msgstr ""
 

-#: convert-ly.py:2632
+#: convert-ly.py:286 relocate.cc:362 source-file.cc:59
+#, c-format, python-format
+msgid "cannot open file: `%s'"
+msgstr ""
+
+#: convert-ly.py:293

 #, python-format
 #, python-format

-msgid "%s: can't determine version for `%s'"
+msgid "cannot determine version for `%s'.  Skipping"

 msgstr ""
 
 msgstr ""
 

-#: convert-ly.py:2641
+#: etf2ly.py:1179

 #, python-format
 #, python-format

-msgid "%s: skipping: `%s'"
+msgid "%s [OPTION]... ETF-FILE"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:71
+#: etf2ly.py:1180

 msgid ""
 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.\n"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:83
-msgid "FMT"
+#: etf2ly.py:1192 midi2ly.py:866 musicxml2ly.py:2233 main.cc:154 main.cc:159
+msgid "FILE"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:84
+#: etf2ly.py:1194 lilypond-book.py:198 midi2ly.py:883 main.cc:163
+msgid "show warranty and copyright"
+msgstr ""
+
+#: lilypond-book.py:57

 msgid ""
 msgid ""

-"use output format FMT (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 ""
 
 msgstr ""
 

-#: lilypond-book.py:86
+#: lilypond-book.py:103
+#, python-format
+msgid "Copyright (c) %s by"
+msgstr ""
+
+#: lilypond-book.py:113

 msgid "FILTER"
 msgstr ""
 
 msgid "FILTER"
 msgstr ""
 

-#: lilypond-book.py:87
-msgid "pipe snippets through FILTER [convert-ly -n -]"
+#: lilypond-book.py:116
+msgid "pipe snippets through FILTER [default: `convert-ly -n -']"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:90 lilypond-book.py:92 main.cc:147 lily/main.cc:147
-msgid "DIR"
+#: lilypond-book.py:120
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:91
+#: lilypond-book.py:121
+msgid "FORMAT"
+msgstr ""
+
+#: lilypond-book.py:128

 msgid "add DIR to include path"
 msgstr ""
 
 msgid "add DIR to include path"
 msgstr ""
 

-#: lilypond-book.py:93
+#: lilypond-book.py:129 lilypond-book.py:136 lilypond-book.py:154
+#: lilypond-book.py:160 lilypond-book.py:166 lilypond-book.py:172 main.cc:153
+msgid "DIR"
+msgstr ""
+
+#: lilypond-book.py:134
+msgid "format Texinfo output so that Info will look for images of music in DIR"
+msgstr ""
+
+#: lilypond-book.py:141
+msgid "run executable PROG instead of latex"
+msgstr ""
+
+#: lilypond-book.py:142
+msgid "PROG"
+msgstr ""
+
+#: lilypond-book.py:147
+msgid "PAD"
+msgstr ""
+
+#: lilypond-book.py:149
+msgid ""
+"pad left side of music to align music inspite of uneven bar numbers (in mm)"
+msgstr ""
+
+#: lilypond-book.py:153

 msgid "write output to DIR"
 msgstr ""
 
 msgid "write output to DIR"
 msgstr ""
 

-#: lilypond-book.py:94
-msgid "COMMAND"
+#: lilypond-book.py:159
+msgid "do not fail if no lilypond output is found"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:95
-msgid "process ly_files using COMMAND FILE..."
+#: lilypond-book.py:165
+msgid "do not fail if no PNG images are found for EPS files"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:96 midi2ly.py:102 main.cc:148 main.cc:149 lily/main.cc:148
-#: lily/main.cc:149
-msgid "FILE"
+#: lilypond-book.py:171
+msgid "write lily-XXX files to DIR, link into --output dir"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:97
-msgid "extract all PS snippet fonts into FILE"
+#: lilypond-book.py:176
+msgid "COMMAND"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:99 midi2ly.py:105 mup2ly.py:78 ps2png.py:42 main.cc:155
-#: lily/main.cc:155
-msgid "be verbose"
+#: lilypond-book.py:177
+msgid "process ly_files using COMMAND FILE..."

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:101
-msgid "print version information"
+#: lilypond-book.py:184
+msgid "create PDF files for use with PDFTeX"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:103 midi2ly.py:107 mup2ly.py:80 main.cc:156
-#: lily/main.cc:156
-msgid "show warranty and copyright"
+#: lilypond-book.py:187 midi2ly.py:876 musicxml2ly.py:2190 main.cc:162
+msgid "be verbose"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:609
+#: lilypond-book.py:825

 #, python-format
 msgid "file not found: %s"
 msgstr ""
 
 #, python-format
 msgid "file not found: %s"
 msgstr ""
 

-#: lilypond-book.py:807
+#: lilypond-book.py:1087

 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 

-#: lilypond-book.py:810
+#: lilypond-book.py:1089

 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 

-#: lilypond-book.py:814
+#: lilypond-book.py:1092

 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 

-#: lilypond-book.py:817
+#: lilypond-book.py:1094

 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 

-#: lilypond-book.py:836
+#: lilypond-book.py:1112

 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 

-#: lilypond-book.py:1145
+#: lilypond-book.py:1538

 #, python-format
 msgid "Opening filter `%s'"
 msgstr ""
 
 #, python-format
 msgid "Opening filter `%s'"
 msgstr ""
 

-#: lilypond-book.py:1308
+#: lilypond-book.py:1555
+#, python-format
+msgid "`%s' failed (%d)"
+msgstr ""
+
+#: lilypond-book.py:1556
+msgid "The error log is as follows:"
+msgstr ""
+
+#: lilypond-book.py:1618
+msgid "cannot find \\begin{document} in LaTeX document"
+msgstr ""
+
+#: lilypond-book.py:1718

 msgid "Writing snippets..."
 msgstr ""
 
 msgid "Writing snippets..."
 msgstr ""
 

-#: lilypond-book.py:1313
+#: lilypond-book.py:1724

 msgid "Processing..."
 msgstr ""
 
 msgid "Processing..."
 msgstr ""
 

-#: lilypond-book.py:1317
+#: lilypond-book.py:1730

 msgid "All snippets are up to date..."
 msgstr ""
 
 msgid "All snippets are up to date..."
 msgstr ""
 

-#: lilypond-book.py:1327
+#: lilypond-book.py:1764

 #, python-format
 #, python-format

-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:1338
-msgid "Output file is up to date."
+#: lilypond-book.py:1775
+#, python-format
+msgid "%s is up to date."

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:1343
-msgid "Writing output file."
+#: lilypond-book.py:1789
+#, python-format
+msgid "Writing `%s'..."

 msgstr ""
 
 msgstr ""
 

-#: lilypond-book.py:1383
+#: lilypond-book.py:1847

 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 

-#: lilypond-book.py:1387
+#: lilypond-book.py:1851

 #, python-format
 msgid "Reading %s..."
 msgstr ""
 
 #, python-format
 msgid "Reading %s..."
 msgstr ""
 

-#: lilypond-book.py:1403
+#: lilypond-book.py:1870

 msgid "Dissecting..."
 msgstr ""
 
 msgid "Dissecting..."
 msgstr ""
 

-#: lilypond-book.py:1433
+#: lilypond-book.py:1886

 #, python-format
 msgid "Compiling %s..."
 msgstr ""
 
 #, python-format
 msgid "Compiling %s..."
 msgstr ""
 

-#: lilypond-book.py:1444
+#: lilypond-book.py:1895

 #, python-format
 msgid "Processing include: %s"
 msgstr ""
 
 #, python-format
 msgid "Processing include: %s"
 msgstr ""
 

-#: lilypond-book.py:1458
+#: lilypond-book.py:1907

 #, python-format
 msgid "Removing `%s'"
 msgstr ""
 
 #, python-format
 msgid "Removing `%s'"
 msgstr ""
 

-#: lilypond-book.py:1471 midi2ly.py:1016 ps2png.py:52
-#, python-format
-msgid "getopt says: `%s'"
+#: midi2ly.py:85 lily-library.scm:620 lily-library.scm:629
+msgid "warning: "
+msgstr ""
+
+#: midi2ly.py:88 midi2ly.py:907
+msgid "error: "

 msgstr ""
 
 msgstr ""
 

-#: lilypond-pdfpc-helper.py:72
-msgid "Not in FILE:LINE:COL format: "
+#: midi2ly.py:89
+msgid "Exiting... "

 msgstr ""
 
 msgstr ""
 

-#: lilypond-pdfpc-helper.py:100
+#: midi2ly.py:834

 #, python-format
 #, python-format

-msgid "Command failed: `%s' (status %d)"
+msgid "%s output to `%s'..."

 msgstr ""
 
 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."
+#: midi2ly.py:847
+#, python-format
+msgid "Convert %s to LilyPond input.\n"

 msgstr ""
 
 msgstr ""
 

-#: midi2ly.py:97
+#: midi2ly.py:852

 msgid "print absolute pitches"
 msgstr ""
 
 msgid "print absolute pitches"
 msgstr ""
 

-#: midi2ly.py:98 midi2ly.py:103
+#: midi2ly.py:854 midi2ly.py:869

 msgid "DUR"
 msgstr ""
 
 msgid "DUR"
 msgstr ""
 

-#: midi2ly.py:98
+#: midi2ly.py:855

 msgid "quantise note durations on DUR"
 msgstr ""
 
 msgid "quantise note durations on DUR"
 msgstr ""
 

-#: midi2ly.py:99
+#: midi2ly.py:858

 msgid "print explicit durations"
 msgstr ""
 
 msgid "print explicit durations"
 msgstr ""
 

-#: midi2ly.py:101
-msgid "ALT[:MINOR]"
-msgstr ""
-
-#: midi2ly.py:101
+#: midi2ly.py:862

 msgid "set key: ALT=+sharps|-flats; MINOR=1"
 msgstr ""
 
 msgid "set key: ALT=+sharps|-flats; MINOR=1"
 msgstr ""
 

-#: midi2ly.py:102 mup2ly.py:76
-msgid "write output to FILE"
+#: midi2ly.py:863
+msgid "ALT[:MINOR]"

 msgstr ""
 
 msgstr ""
 

-#: midi2ly.py:103
+#: midi2ly.py:868

 msgid "quantise note starts on DUR"
 msgstr ""
 
 msgid "quantise note starts on DUR"
 msgstr ""
 

-#: midi2ly.py:104
+#: midi2ly.py:871

 msgid "DUR*NUM/DEN"
 msgstr ""
 
 msgid "DUR*NUM/DEN"
 msgstr ""
 

-#: midi2ly.py:104
+#: midi2ly.py:874

 msgid "allow tuplet durations DUR*NUM/DEN"
 msgstr ""
 
 msgid "allow tuplet durations DUR*NUM/DEN"
 msgstr ""
 

-#: midi2ly.py:106 mup2ly.py:79 main.cc:154 lily/main.cc:154
-msgid "print version number"
+#: midi2ly.py:886
+msgid "treat every text as a lyric"

 msgstr ""
 
 msgstr ""
 

-#: midi2ly.py:108
-msgid "treat every text as a lyric"
+#: midi2ly.py:889
+msgid "Examples"

 msgstr ""
 
 msgstr ""
 

-#: midi2ly.py:149 mup2ly.py:143 lily-library.scm:345 lily-library.scm:353
-msgid "warning: "
+#: midi2ly.py:908
+msgid "no files specified on command line."

 msgstr ""
 
 msgstr ""
 

-#: midi2ly.py:164 midi2ly.py:1016 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160
-msgid "error: "
+#: musicxml2ly.py:213
+msgid ""
+"Encountered file created by Dolet 3.4 for Sibelius, containing wrong beaming "
+"information. All beaming information in the MusicXML file will be ignored"

 msgstr ""
 
 msgstr ""
 

-#: midi2ly.py:165 mup2ly.py:161
-msgid "Exiting ... "
+#: musicxml2ly.py:229 musicxml2ly.py:231
+#, python-format
+msgid "Unprocessed PartGroupInfo %s encountered"

 msgstr ""
 
 msgstr ""
 

-#: midi2ly.py:263 mup2ly.py:260
+#: musicxml2ly.py:471

 #, python-format
 #, python-format

-msgid "command exited with value %d"
+msgid ""
+"Encountered rational duration with denominator %s, unable to convert to "
+"lilypond duration"

 msgstr ""
 
 msgstr ""
 

-#: midi2ly.py:1000
+#: musicxml2ly.py:654

 #, python-format
 #, python-format

-msgid "%s output to `%s'..."
+msgid "unknown mode %s, expecting 'major' or 'minor'"

 msgstr ""
 
 msgstr ""
 

-#: midi2ly.py:1031
-msgid "Example:"
+#: musicxml2ly.py:692
+#, python-format
+msgid "Encountered unprocessed marker %s\n"

 msgstr ""
 
 msgstr ""
 

-#: midi2ly.py:1081
-msgid "no files specified on command line."
+#: musicxml2ly.py:786
+#, python-format
+msgid "unknown span event %s"

 msgstr ""
 
 msgstr ""
 

-#: mup2ly.py:70
-msgid "Convert mup to LilyPond source."
+#: musicxml2ly.py:796
+#, python-format
+msgid "unknown span type %s for %s"

 msgstr ""
 
 msgstr ""
 

-#: mup2ly.py:73
-msgid "debug"
+#: musicxml2ly.py:1222
+msgid "Unknown metronome mark, ignoring"

 msgstr ""
 
 msgstr ""
 

-#: mup2ly.py:74
-msgid "define macro NAME [optional expansion EXP]"
+#. TODO: Implement the other (more complex) way for tempo marks!
+#: musicxml2ly.py:1227
+msgid ""
+"Metronome marks with complex relations (<metronome-note> in MusicXML) are "
+"not yet implemented."

 msgstr ""
 
 msgstr ""
 

-#: mup2ly.py:77
-msgid "only pre-process"
+#: musicxml2ly.py:1383
+#, python-format
+msgid "Unable to convert chord type %s to lilypond."

 msgstr ""
 
 msgstr ""
 

-#: mup2ly.py:1075
+#: musicxml2ly.py:1529

 #, python-format
 #, python-format

-msgid "no such context: %s"
+msgid "drum %s type unknown, please add to instrument_drumtype_dict"
+msgstr ""
+
+#: musicxml2ly.py:1533
+msgid "cannot find suitable event"

 msgstr ""
 
 msgstr ""
 

-#: mup2ly.py:1300
+#: musicxml2ly.py:1623

 #, python-format
 #, python-format

-msgid "Processing `%s'..."
+msgid "Negative skip %s"

 msgstr ""
 
 msgstr ""
 

-#: mup2ly.py:1319
+#: musicxml2ly.py:1775

 #, python-format
 #, python-format

-msgid "Writing `%s'..."
+msgid "Negative skip found: from %s to %s, difference is %s"

 msgstr ""
 
 msgstr ""
 

-#. ugr.
-#: ps2png.py:36
-msgid "Convert PostScript to PNG image."
+#: musicxml2ly.py:1802
+#, python-format
+msgid "unexpected %s; expected %s or %s or %s"

 msgstr ""
 
 msgstr ""
 

-#: ps2png.py:43
-msgid "PAPER"
+#: musicxml2ly.py:1912
+msgid "cannot have two simultaneous slurs"

 msgstr ""
 
 msgstr ""
 

-#: ps2png.py:43
-msgid "use papersize PAPER"
+#: musicxml2ly.py:2050
+#, python-format
+msgid "cannot simultaneously have more than one mode: %s"

 msgstr ""
 
 msgstr ""
 

-#: ps2png.py:44
-msgid "RES"
+#: musicxml2ly.py:2148
+msgid "Converting to LilyPond expressions..."

 msgstr ""
 
 msgstr ""
 

-#: ps2png.py:44
-msgid "set the resolution of the preview to RES"
+#: musicxml2ly.py:2159
+msgid "musicxml2ly [OPTION]... FILE.xml"

 msgstr ""
 
 msgstr ""
 

-#: ps2png.py:76
-#, python-format
-msgid "Wrote `%s'"
+#: musicxml2ly.py:2161
+msgid ""
+"Convert MusicXML from FILE.xml to LilyPond input.\n"
+"If the given filename is -, musicxml2ly reads from the command line.\n"

 msgstr ""
 
 msgstr ""
 

-#: getopt-long.cc:143
-#, c-format
-msgid "option `%s' requires an argument"
+#: musicxml2ly.py:2171
+msgid ""
+"Copyright (c) 2005--2008 by\n"
+"    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
+"    Jan Nieuwenhuizen <janneke@gnu.org> and\n"
+"    Reinhold Kainhofer <reinhold@kainhofer.com>\n"

 msgstr ""
 
 msgstr ""
 

-#: getopt-long.cc:147
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: musicxml2ly.py:2196
+msgid "use lxml.etree; uses less memory and cpu time"

 msgstr ""
 
 msgstr ""
 

-#: getopt-long.cc:151
-#, c-format
-msgid "unrecognized option: `%s'"
+#: musicxml2ly.py:2202
+msgid "input file is a zip-compressed MusicXML file"

 msgstr ""
 
 msgstr ""
 

-#: getopt-long.cc:158
-#, c-format
-msgid "invalid argument `%s' to option `%s'"
+#: musicxml2ly.py:2208
+msgid "convert pitches in relative mode (default)"

 msgstr ""
 
 msgstr ""
 

-#: warn.cc:64 grob.cc:632 lily/grob.cc:632
-#, c-format
-msgid "programming error: %s"
+#: musicxml2ly.py:2213
+msgid "convert pitches in absolute mode"

 msgstr ""
 
 msgstr ""
 

-#: warn.cc:65
-msgid "continuing, cross fingers"
+#: musicxml2ly.py:2216
+msgid "LANG"

 msgstr ""
 
 msgstr ""
 

-#.
-#. todo i18n.
-#.
-#: kpath.c:142
-#, c-format
-msgid "can't dlopen: %s: %s"
+#: musicxml2ly.py:2218
+msgid ""
+"use a different language file 'LANG.ly' and corresponding pitch names, e.g. "
+"'deutsch' for deutsch.ly"

 msgstr ""
 
 msgstr ""
 

-#: kpath.c:143
-#, c-format
-msgid "install package: %s or %s"
+#: musicxml2ly.py:2224
+msgid "do not convert directions (^, _ or -) for articulations, dynamics, etc."

 msgstr ""
 
 msgstr ""
 

-#: kpath.c:156
-#, c-format
-msgid "no such symbol: %s: %s"
+#: musicxml2ly.py:2230
+msgid ""
+"do not convert beaming information, use lilypond's automatic beaming instead"

 msgstr ""
 
 msgstr ""
 

-#: kpath.c:179
-#, c-format
-msgid "error opening kpathsea library"
+#: musicxml2ly.py:2238
+msgid "set output filename to FILE, stdout if -"

 msgstr ""
 
 msgstr ""
 

-#: kpath.c:180
-#, c-format
-msgid "aborting"
+#: musicxml2ly.py:2320
+#, python-format
+msgid "unknown part in part-list: %s"

 msgstr ""
 
 msgstr ""
 

-#: accidental-engraver.cc:235 lily/accidental-engraver.cc:235
-#, c-format
-msgid "accidental typesetting list must begin with context-name: %s"
+#: musicxml2ly.py:2382
+msgid "Input is compressed, extracting raw MusicXML data from stdin"

 msgstr ""
 
 msgstr ""
 

-#: accidental-engraver.cc:263 lily/accidental-engraver.cc:263
-#, c-format
-msgid "ignoring unknown accidental: %s"
+#: musicxml2ly.py:2385
+#, python-format
+msgid "Input file %s is compressed, extracting raw MusicXML data"

 msgstr ""
 
 msgstr ""
 

-#: accidental-engraver.cc:279 lily/accidental-engraver.cc:279
-#, c-format
-msgid "pair or context-name expected for accidental rule, found %s"
+#: musicxml2ly.py:2415
+msgid "Reading MusicXML from Standard input ..."

 msgstr ""
 
 msgstr ""
 

-#: accidental.cc:233 key-signature-interface.cc:127 lily/accidental.cc:233
-#: lily/key-signature-interface.cc:127
-#, c-format
-msgid "accidental `%s' not found"
+#: musicxml2ly.py:2417
+#, python-format
+msgid "Reading MusicXML from %s ..."

 msgstr ""
 
 msgstr ""
 

-#: afm.cc:142 lily/afm.cc:142
+#: musicxml2ly.py:2450
+#, python-format
+msgid "Output to `%s'"
+msgstr ""
+
+#: musicxml2ly.py:2512
+#, python-format
+msgid "Unable to find input file %s"
+msgstr ""
+
+#: getopt-long.cc:140

 #, c-format
 #, c-format

-msgid "parsing AFM file: `%s'"
+msgid "option `%s' requires an argument"

 msgstr ""
 
 msgstr ""
 

-#. FIXME: broken sentence
-#: all-font-metrics.cc:176 lily/all-font-metrics.cc:176
+#: getopt-long.cc:144

 #, c-format
 #, c-format

-msgid "checksum mismatch for font file: `%s'"
+msgid "option `%s' does not allow an argument"

 msgstr ""
 
 msgstr ""
 

-#: all-font-metrics.cc:178 lily/all-font-metrics.cc:178
+#: getopt-long.cc:148

 #, c-format
 #, c-format

-msgid "does not match: `%s'"
+msgid "unrecognized option: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: all-font-metrics.cc:184 lily/all-font-metrics.cc:184
-msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
+#: getopt-long.cc:154
+#, c-format
+msgid "invalid argument `%s' to option `%s'"

 msgstr ""
 
 msgstr ""
 

-#: all-font-metrics.cc:186 lily/all-font-metrics.cc:186
-msgid "Rerun with -V to show font paths."
+#: warn.cc:68 grob.cc:566 input.cc:82
+#, c-format
+msgid "programming error: %s"

 msgstr ""
 
 msgstr ""
 

-#: all-font-metrics.cc:188 lily/all-font-metrics.cc:188
-msgid "A script for removing font-files is delivered with the source-code:"
+#: warn.cc:69 input.cc:83
+msgid "continuing, cross fingers"

 msgstr ""
 
 msgstr ""
 

-#: all-font-metrics.cc:297 lily/all-font-metrics.cc:297
+#: accidental-engraver.cc:249

 #, c-format
 #, c-format

-msgid "can't find font: `%s'"
+msgid "accidental typesetting list must begin with context-name: %s"

 msgstr ""
 
 msgstr ""
 

-#: all-font-metrics.cc:298 lily/all-font-metrics.cc:298
-msgid "loading default font"
+#: accidental-engraver.cc:276
+#, c-format
+msgid "ignoring unknown accidental rule: %s"

 msgstr ""
 
 msgstr ""
 

-#: all-font-metrics.cc:313 lily/all-font-metrics.cc:313
+#: accidental-engraver.cc:292

 #, c-format
 #, c-format

-msgid "can't find default font: `%s'"
+msgid "pair or context-name expected for accidental rule, found %s"

 msgstr ""
 
 msgstr ""
 

-#: all-font-metrics.cc:314 includable-lexer.cc:59 lily-parser-scheme.cc:70
-#: lily/all-font-metrics.cc:314 lily/includable-lexer.cc:59
-#: lily/lily-parser-scheme.cc:70
+#: accidental.cc:187

 #, c-format
 #, c-format

-msgid "(search path: `%s')"
+msgid "Could not find glyph-name for alteration %s"

 msgstr ""
 
 msgstr ""
 

-#: all-font-metrics.cc:315 volta-engraver.cc:142 lily/all-font-metrics.cc:315
-#: lily/volta-engraver.cc:142
-msgid "giving up"
+#: accidental.cc:202
+msgid "natural alteration glyph not found"
+msgstr ""
+
+#: align-interface.cc:305
+msgid "tried to get a translation for something that is no child of mine"
+msgstr ""
+
+#: all-font-metrics.cc:143
+#, c-format
+msgid "cannot find font: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: apply-context-iterator.cc:33 lily/apply-context-iterator.cc:33
+#: apply-context-iterator.cc:31

 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 

-#: auto-change-iterator.cc:62 change-iterator.cc:60
-#: lily/auto-change-iterator.cc:62 lily/change-iterator.cc:60
+#: auto-change-iterator.cc:63 change-iterator.cc:61

 #, c-format
 #, c-format

-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"

 msgstr ""
 
 msgstr ""
 

-#: axis-group-engraver.cc:112 lily/axis-group-engraver.cc:112
+#: axis-group-engraver.cc:78

 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 

-#: axis-group-engraver.cc:113 lily/axis-group-engraver.cc:113
+#: axis-group-engraver.cc:79

 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 

-#: axis-group-engraver.cc:114 lily/axis-group-engraver.cc:114
+#: axis-group-engraver.cc:80

 msgid "removing this vertical group"
 msgstr ""
 
 msgid "removing this vertical group"
 msgstr ""
 

-#: bar-check-iterator.cc:70 lily/bar-check-iterator.cc:70
+#: axis-group-interface.cc:532
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: bar-check-iterator.cc:73

 #, c-format
 msgid "barcheck failed at: %s"
 msgstr ""
 
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr ""
 

-#: beam-engraver.cc:136 lily/beam-engraver.cc:136
+#: beam-engraver.cc:126

 msgid "already have a beam"
 msgstr ""
 
 msgid "already have a beam"
 msgstr ""
 

-#: beam-engraver.cc:205 lily/beam-engraver.cc:205
+#: beam-engraver.cc:202

 msgid "unterminated beam"
 msgstr ""
 
 msgid "unterminated beam"
 msgstr ""
 

-#: beam-engraver.cc:238 chord-tremolo-engraver.cc:165
-#: lily/beam-engraver.cc:238 lily/chord-tremolo-engraver.cc:165
+#: beam-engraver.cc:244 chord-tremolo-engraver.cc:138

 msgid "stem must have Rhythmic structure"
 msgstr ""
 
 msgid "stem must have Rhythmic structure"
 msgstr ""
 

-#: beam-engraver.cc:251 lily/beam-engraver.cc:251
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:252
+msgid "stem does not fit in beam"

 msgstr ""
 
 msgstr ""
 

-#: beam-engraver.cc:252 lily/beam-engraver.cc:252
+#: beam-engraver.cc:253

 msgid "beam was started here"
 msgstr ""
 
 msgid "beam was started here"
 msgstr ""
 

-#: beam.cc:142 lily/beam.cc:142
-msgid "beam has less than two visible stems"
+#: beam-quanting.cc:307
+msgid "no feasible beam position"

 msgstr ""
 
 msgstr ""
 

-#: beam.cc:147 lily/beam.cc:147
-msgid "removing beam with less than two stems"
+#: beam.cc:160
+msgid "removing beam with no stems"

 msgstr ""
 
 msgstr ""
 

-#: beam.cc:988 lily/beam.cc:988
+#: beam.cc:1078

 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 

-#: break-align-interface.cc:205 lily/break-align-interface.cc:205
+#: break-alignment-interface.cc:195

 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr ""
 
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr ""
 

-#: change-iterator.cc:22 lily/change-iterator.cc:22
+#: change-iterator.cc:23

 #, c-format
 #, c-format

-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"

 msgstr ""
 
 #. FIXME: constant error message.
 msgstr ""
 
 #. FIXME: constant error message.

-#: change-iterator.cc:81 lily/change-iterator.cc:81
-msgid "can't find context to switch to"
+#: change-iterator.cc:82
+msgid "cannot find context to switch to"

 msgstr ""
 
 #. We could change the current translator's id, but that would make
 msgstr ""
 
 #. We could change the current translator's id, but that would make


@@ -753,350 +1173,372 @@ msgstr ""
 #.
 #. last->translator_id_string () = get_change
 #. ()->change_to_id_string ();
 #.
 #. last->translator_id_string () = get_change
 #. ()->change_to_id_string ();

-#: change-iterator.cc:90 lily/change-iterator.cc:90
+#: change-iterator.cc:91

 #, c-format
 msgid "not changing to same context type: %s"
 msgstr ""
 
 #. FIXME: uncomprehensable message
 #, c-format
 msgid "not changing to same context type: %s"
 msgstr ""
 
 #. FIXME: uncomprehensable message

-#: change-iterator.cc:94 lily/change-iterator.cc:94
+#: change-iterator.cc:95

 msgid "none of these in my family"
 msgstr ""
 
 msgid "none of these in my family"
 msgstr ""
 

-#: chord-tremolo-engraver.cc:94 lily/chord-tremolo-engraver.cc:94
-#, c-format
-msgid "expect 2 elements for chord tremolo, found %d"
+#: chord-tremolo-engraver.cc:88
+msgid "No tremolo to end"

 msgstr ""
 
 msgstr ""
 

-#: chord-tremolo-engraver.cc:131 lily/chord-tremolo-engraver.cc:131
+#: chord-tremolo-engraver.cc:110

 msgid "unterminated chord tremolo"
 msgstr ""
 
 msgid "unterminated chord tremolo"
 msgstr ""
 

-#: chord-tremolo-iterator.cc:64 lily/chord-tremolo-iterator.cc:64
-msgid "no one to print a tremolos"
+#: chord-tremolo-iterator.cc:35
+#, c-format
+msgid "expect 2 elements for chord tremolo, found %d"

 msgstr ""
 
 msgstr ""
 

-#: clef.cc:57 lily/clef.cc:57
+#: clef.cc:54

 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
 
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
 

-#: cluster.cc:118 lily/cluster.cc:118
+#: cluster.cc:110

 #, c-format
 msgid "unknown cluster style `%s'"
 msgstr ""
 
 #, c-format
 msgid "unknown cluster style `%s'"
 msgstr ""
 

-#: cluster.cc:144 lily/cluster.cc:144
+#: cluster.cc:147

 msgid "junking empty cluster"
 msgstr ""
 
 msgid "junking empty cluster"
 msgstr ""
 

-#: coherent-ligature-engraver.cc:84 lily/coherent-ligature-engraver.cc:84
+#: coherent-ligature-engraver.cc:100

 #, c-format
 #, c-format

-msgid "gotcha: ptr=%ul"
+msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"

 msgstr ""
 
 msgstr ""
 

-#: coherent-ligature-engraver.cc:93 lily/coherent-ligature-engraver.cc:93
-msgid "distance undefined, assuming 0.1"
+#. if we get to here, just put everything on one line
+#: constrained-breaking.cc:176 constrained-breaking.cc:193
+msgid "cannot find line breaking that satisfies constraints"

 msgstr ""
 
 msgstr ""
 

-#: coherent-ligature-engraver.cc:96 lily/coherent-ligature-engraver.cc:96
+#: context-def.cc:130

 #, c-format
 #, c-format

-msgid "distance=%f"
+msgid "program has no such type: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: coherent-ligature-engraver.cc:139 lily/coherent-ligature-engraver.cc:139
-#, c-format
-msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
+#: context-property.cc:32
+msgid "need symbol arguments for \\override and \\revert"

 msgstr ""
 
 msgstr ""
 

-#: context-def.cc:111 lily/context-def.cc:111
+#: context.cc:139

 #, c-format
 #, c-format

-msgid "program has no such type: `%s'"
+msgid "cannot find or create new `%s'"

 msgstr ""
 
 msgstr ""
 

-#: context-def.cc:285 lily/context-def.cc:285
+#: context.cc:197

 #, c-format
 #, c-format

-msgid "can't find: `%s'"
+msgid "cannot find or create `%s' called `%s'"

 msgstr ""
 
 msgstr ""
 

-#: context-property.cc:111 lily/context-property.cc:111
-msgid "need symbol arguments for \\override and \\revert"
+#: context.cc:259
+#, c-format
+msgid "Invalid CreateContext event: Cannot create %s context"

 msgstr ""
 
 msgstr ""
 

-#: context.cc:146 lily/context.cc:146
+#: context.cc:390

 #, c-format
 #, c-format

-msgid "can't find or create new `%s'"
+msgid "cannot find or create: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: context.cc:210 lily/context.cc:210
+#: custos.cc:77

 #, c-format
 #, c-format

-msgid "can't find or create `%s' called `%s'"
+msgid "custos `%s' not found"
+msgstr ""
+
+#: dispatcher.cc:71
+msgid "Event class should be a symbol"

 msgstr ""
 
 msgstr ""
 

-#: context.cc:301 lily/context.cc:301
+#: dispatcher.cc:78

 #, c-format
 #, c-format

-msgid "can't find or create: `%s'"
+msgid "Unknown event class %s"

 msgstr ""
 
 msgstr ""
 

-#: custos.cc:83 lily/custos.cc:83
+#: dots.cc:37

 #, c-format
 #, c-format

-msgid "custos `%s' not found"
+msgid "dot `%s' not found"

 msgstr ""
 
 msgstr ""
 

-#: dynamic-engraver.cc:171 span-dynamic-performer.cc:83
-#: lily/dynamic-engraver.cc:171 lily/span-dynamic-performer.cc:83
-msgid "can't find start of (de)crescendo"
+#: dynamic-engraver.cc:186
+msgid "cannot find start of (de)crescendo"

 msgstr ""
 
 msgstr ""
 

-#: dynamic-engraver.cc:180 lily/dynamic-engraver.cc:180
+#: dynamic-engraver.cc:195

 msgid "already have a decrescendo"
 msgstr ""
 
 msgid "already have a decrescendo"
 msgstr ""
 

-#: dynamic-engraver.cc:182 lily/dynamic-engraver.cc:182
+#: dynamic-engraver.cc:197

 msgid "already have a crescendo"
 msgstr ""
 
 msgid "already have a crescendo"
 msgstr ""
 

-#: dynamic-engraver.cc:185 lily/dynamic-engraver.cc:185
+#: dynamic-engraver.cc:200

 msgid "cresc starts here"
 msgstr ""
 
 msgid "cresc starts here"
 msgstr ""
 

-#: dynamic-engraver.cc:304 lily/dynamic-engraver.cc:304
+#: dynamic-engraver.cc:328

 msgid "unterminated (de)crescendo"
 msgstr ""
 
 msgid "unterminated (de)crescendo"
 msgstr ""
 

-#: event-chord-iterator.cc:55 output-property-music-iterator.cc:29
-#: lily/event-chord-iterator.cc:55 lily/output-property-music-iterator.cc:29
-#, c-format
-msgid "junking event: `%s'"
-msgstr ""
-
-#: extender-engraver.cc:139 extender-engraver.cc:148
-#: lily/extender-engraver.cc:139 lily/extender-engraver.cc:148
+#: extender-engraver.cc:142 extender-engraver.cc:151

 msgid "unterminated extender"
 msgstr ""
 
 msgid "unterminated extender"
 msgstr ""
 

-#: folded-repeat-iterator.cc:64 lily/folded-repeat-iterator.cc:64
-msgid "no one to print a repeat brace"
-msgstr ""
-
-#: font-config.cc:23 lily/font-config.cc:23
+#: font-config.cc:28

 msgid "Initializing FontConfig..."
 msgstr ""
 
 msgid "Initializing FontConfig..."
 msgstr ""
 

-#: font-config.cc:26 lily/font-config.cc:26
-msgid "initializing FontConfig"
+#: font-config.cc:44
+#, c-format
+msgid "Rebuilding FontConfig cache %s, this may take a while..."

 msgstr ""
 
 msgstr ""
 

-#: font-config.cc:47 lily/font-config.cc:47
+#: font-config.cc:57

 #, c-format
 #, c-format

-msgid "adding lilypond directory: %s"
+msgid "failed adding font directory: %s"

 msgstr ""
 
 msgstr ""
 

-#: font-config.cc:49 lily/font-config.cc:49
+#: font-config.cc:59

 #, c-format
 msgid "adding font directory: %s"
 msgstr ""
 
 #, c-format
 msgid "adding font directory: %s"
 msgstr ""
 

-#: general-scheme.cc:172 lily/general-scheme.cc:172
+#: general-scheme.cc:202

 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 

-#: general-scheme.cc:173 lily/general-scheme.cc:173
+#: general-scheme.cc:203

 msgid "setting to zero"
 msgstr ""
 
 msgid "setting to zero"
 msgstr ""
 

-#: glissando-engraver.cc:97 lily/glissando-engraver.cc:97
+#: general-scheme.cc:422 output-ps.scm:62
+msgid "Found infinity or nan in output. Substituting 0.0"
+msgstr ""
+
+#: glissando-engraver.cc:94

 msgid "unterminated glissando"
 msgstr ""
 
 msgid "unterminated glissando"
 msgstr ""
 

-#: global-context-scheme.cc:50 global-context-scheme.cc:77
-#: lily/global-context-scheme.cc:50 lily/global-context-scheme.cc:77
-#: lily/global-context-scheme.cc:49 lily/global-context-scheme.cc:76
+#: global-context-scheme.cc:85 global-context-scheme.cc:103

 msgid "no music found in score"
 msgstr ""
 
 msgid "no music found in score"
 msgstr ""
 

-#: global-context-scheme.cc:67 lily/global-context-scheme.cc:67
-#: lily/global-context-scheme.cc:66
+#: global-context-scheme.cc:93

 msgid "Interpreting music... "
 msgstr ""
 
 msgid "Interpreting music... "
 msgstr ""
 

-#: global-context-scheme.cc:88 lily/global-context-scheme.cc:88
-#: lily/global-context-scheme.cc:87
+#: global-context-scheme.cc:116

 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr ""
 
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr ""
 

-#: global-context.cc:160 lily/global-context.cc:160
+#: gregorian-ligature-engraver.cc:59

 #, c-format
 #, c-format

-msgid "can't find `%s' context"
+msgid "\\%s ignored"

 msgstr ""
 
 msgstr ""
 

-#: gourlay-breaking.cc:199 lily/gourlay-breaking.cc:199
+#: gregorian-ligature-engraver.cc:64

 #, c-format
 #, c-format

-msgid "Optimal demerits: %f"
+msgid "implied \\%s added"

 msgstr ""
 
 msgstr ""
 

-#: gourlay-breaking.cc:204 lily/gourlay-breaking.cc:204
-msgid "no feasible line breaking found"
+#. ligature may not start with 2nd head of pes or flexa
+#: gregorian-ligature-engraver.cc:213
+msgid "cannot apply `\\~' on first head of ligature"

 msgstr ""
 
 msgstr ""
 

-#: gourlay-breaking.cc:212 lily/gourlay-breaking.cc:212
-msgid "can't find line breaking that satisfies constraints"
+#. (pitch == prev_pitch)
+#: gregorian-ligature-engraver.cc:225
+msgid "cannot apply `\\~' on heads with identical pitch"

 msgstr ""
 
 msgstr ""
 

-#: gregorian-ligature-engraver.cc:59 lily/gregorian-ligature-engraver.cc:59
+#: grob-interface.cc:57

 #, c-format
 #, c-format

-msgid "\\%s ignored"
+msgid "Unknown interface `%s'"

 msgstr ""
 
 msgstr ""
 

-#: gregorian-ligature-engraver.cc:64 lily/gregorian-ligature-engraver.cc:64
+#: grob-interface.cc:68

 #, c-format
 #, c-format

-msgid "implied \\%s added"
-msgstr ""
-
-#: gregorian-ligature-engraver.cc:213 lily/gregorian-ligature-engraver.cc:213
-msgid "Cannot apply `\\~' on first head of ligature; ignoring `\\~'"
-msgstr ""
-
-#: gregorian-ligature-engraver.cc:227 lily/gregorian-ligature-engraver.cc:227
-msgid "can't apply `\\~' on heads with identical pitch; ignoring `\\~'"
+msgid "Grob `%s' has no interface for property `%s'"

 msgstr ""
 
 msgstr ""
 

-#: grob-interface.cc:45 lily/grob-interface.cc:45
+#: grob-property.cc:34

 #, c-format
 #, c-format

-msgid "Unknown interface `%s'"
+msgid "%d: %s"

 msgstr ""
 
 msgstr ""
 

-#: grob-interface.cc:56 lily/grob-interface.cc:56
+#: grob-property.cc:173

 #, c-format
 #, c-format

-msgid "Grob `%s' has no interface for property `%s'"
+msgid "cyclic dependency: calculation-in-progress encountered for #'%s (%s)"

 msgstr ""
 
 msgstr ""
 

-#: hairpin.cc:131 lily/hairpin.cc:131
-msgid "decrescendo too small"
+#: grob.cc:251
+msgid "Infinity or NaN encountered"

 msgstr ""
 
 msgstr ""
 

-#: hairpin.cc:132 lily/hairpin.cc:132
-msgid "crescendo too small"
+#: hairpin.cc:186
+msgid "decrescendo too small"

 msgstr ""
 
 msgstr ""
 

-#: horizontal-bracket-engraver.cc:55 lily/horizontal-bracket-engraver.cc:55
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:68
+msgid "do not have that many brackets"

 msgstr ""
 
 msgstr ""
 

-#: horizontal-bracket-engraver.cc:64 lily/horizontal-bracket-engraver.cc:64
+#: horizontal-bracket-engraver.cc:77

 msgid "conflicting note group events"
 msgstr ""
 
 msgid "conflicting note group events"
 msgstr ""
 

-#: hyphen-engraver.cc:89 lily/hyphen-engraver.cc:89
+#: hyphen-engraver.cc:93

 msgid "removing unterminated hyphen"
 msgstr ""
 
 msgid "removing unterminated hyphen"
 msgstr ""
 

-#: hyphen-engraver.cc:102 lily/hyphen-engraver.cc:102
+#: hyphen-engraver.cc:107

 msgid "unterminated hyphen; removing"
 msgstr ""
 
 msgid "unterminated hyphen; removing"
 msgstr ""
 

-#: includable-lexer.cc:50 lily/includable-lexer.cc:50
-msgid "include files are not allowed in safe mode"
+#: includable-lexer.cc:53 lily-guile.cc:76 lily-parser-scheme.cc:110
+#, c-format
+msgid "cannot find file: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: includable-lexer.cc:57 lily-guile.cc:90 lily-parser-scheme.cc:77
-#: lily/includable-lexer.cc:57 lily/lily-guile.cc:90
-#: lily/lily-parser-scheme.cc:77
+#: includable-lexer.cc:55 lily-parser-scheme.cc:101

 #, c-format
 #, c-format

-msgid "can't find file: `%s'"
+msgid "(search path: `%s')"

 msgstr ""
 
 msgstr ""
 

-#: input.cc:101 source-file.cc:144 source-file.cc:266 lily/input.cc:101
-#: lily/source-file.cc:144 lily/source-file.cc:266
+#: input.cc:112 source-file.cc:173 source-file.cc:188

 msgid "position unknown"
 msgstr ""
 
 msgid "position unknown"
 msgstr ""
 

-#: ligature-engraver.cc:152 lily/ligature-engraver.cc:152
-msgid "can't find start of ligature"
+#: key-signature-interface.cc:74
+#, c-format
+msgid "No glyph found for alteration: %s"

 msgstr ""
 
 msgstr ""
 

-#: ligature-engraver.cc:158 lily/ligature-engraver.cc:158
-msgid "no right bound"
+#: key-signature-interface.cc:84
+msgid "alteration not found"

 msgstr ""
 
 msgstr ""
 

-#: ligature-engraver.cc:184 lily/ligature-engraver.cc:184
+#: ligature-bracket-engraver.cc:62 ligature-engraver.cc:93
+msgid "cannot find start of ligature"
+msgstr ""
+
+#: ligature-bracket-engraver.cc:75 ligature-engraver.cc:120

 msgid "already have a ligature"
 msgstr ""
 
 msgid "already have a ligature"
 msgstr ""
 

-#: ligature-engraver.cc:200 lily/ligature-engraver.cc:200
+#: ligature-engraver.cc:98
+msgid "no right bound"
+msgstr ""
+
+#: ligature-engraver.cc:129

 msgid "no left bound"
 msgstr ""
 
 msgid "no left bound"
 msgstr ""
 

-#: ligature-engraver.cc:256 lily/ligature-engraver.cc:256
+#: ligature-engraver.cc:173

 msgid "unterminated ligature"
 msgstr ""
 
 msgid "unterminated ligature"
 msgstr ""
 

-#: ligature-engraver.cc:280 lily/ligature-engraver.cc:280
+#: ligature-engraver.cc:202

 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 

-#: ligature-engraver.cc:281 lily/ligature-engraver.cc:281
+#: ligature-engraver.cc:203

 msgid "ligature was started here"
 msgstr ""
 
 msgid "ligature was started here"
 msgstr ""
 

-#: lily-guile.cc:92 lily/lily-guile.cc:92
+#: lily-guile.cc:78

 #, c-format
 msgid "(load path: `%s')"
 msgstr ""
 
 #, c-format
 msgid "(load path: `%s')"
 msgstr ""
 

-#: lily-guile.cc:484 lily/lily-guile.cc:484
+#: lily-guile.cc:428

 #, c-format
 #, c-format

-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."

 msgstr ""
 
 msgstr ""
 

-#: lily-guile.cc:487 lily/lily-guile.cc:487
+#: lily-guile.cc:431

 msgid "perhaps a typing error?"
 msgstr ""
 
 msgid "perhaps a typing error?"
 msgstr ""
 

-#: lily-guile.cc:493 lily/lily-guile.cc:493
+#: lily-guile.cc:438

 msgid "doing assignment anyway"
 msgstr ""
 
 msgid "doing assignment anyway"
 msgstr ""
 

-#: lily-guile.cc:505 lily/lily-guile.cc:505
+#: lily-guile.cc:450

 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 

-#: lily-lexer.cc:210 lily/lily-lexer.cc:210
+#: lily-lexer.cc:251
+msgid "include files are not allowed in safe mode"
+msgstr ""
+
+#: lily-lexer.cc:270

 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr ""
 
 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr ""
 

-#: lily-lexer.cc:225 lily/lily-lexer.cc:225
+#: lily-lexer.cc:285

 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
 
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
 

-#: lily-parser-scheme.cc:30 lily/lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:30

 #, c-format
 msgid "deprecated function called: %s"
 msgstr ""
 
 #, c-format
 msgid "deprecated function called: %s"
 msgstr ""
 

-#: lily-parser-scheme.cc:69 lily/lily-parser-scheme.cc:69
+#: lily-parser-scheme.cc:83
+#, c-format
+msgid "Changing working directory to: `%s'"
+msgstr ""
+
+#: lily-parser-scheme.cc:100

 #, c-format
 #, c-format

-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: lily-parser-scheme.cc:87 lily/lily-parser-scheme.cc:87
+#: lily-parser-scheme.cc:119

 #, c-format
 msgid "Processing `%s'"
 msgstr ""
 
 #, c-format
 msgid "Processing `%s'"
 msgstr ""
 

-#: lily-parser.cc:101 lily/lily-parser.cc:101
+#: lily-parser.cc:99

 msgid "Parsing..."
 msgstr ""
 
 msgid "Parsing..."
 msgstr ""
 

-#: lily-parser.cc:119 lily/lily-parser.cc:119
-msgid "braces don't match"
+#: lily-parser.cc:127
+msgid "braces do not match"
+msgstr ""
+
+#: lyric-combine-music-iterator.cc:329
+#, c-format
+msgid "cannot find Voice `%s'"
+msgstr ""
+
+#: lyric-engraver.cc:162
+msgid "Lyric syllable does not have note. Use \\lyricsto or associatedVoice."
+msgstr ""
+
+#: 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 ""
 
 msgstr ""
 

-#: main.cc:104 lily/main.cc:104
+#: 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"
 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"


@@ -1107,105 +1549,97 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
 "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 ""
 
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
 msgstr ""
 

-#: main.cc:135 lily/main.cc:135
-msgid "BACK"
+#: main.cc:137
+msgid "SYM[=VAL]"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:135 lily/main.cc:135
+#: main.cc:138

 msgid ""
 msgid ""

-"use backend BACK (gnome, ps [default],\n"
-"                                       scm, svg, tex, texstr)"
+"set Scheme option SYM to VAL (default: #t).\n"
+"Use -dhelp for help."

 msgstr ""
 
 msgstr ""
 

-#: main.cc:136 lily/main.cc:136
+#: main.cc:141

 msgid "EXPR"
 msgstr ""
 
 msgid "EXPR"
 msgstr ""
 

-#: main.cc:136 lily/main.cc:136
-msgid ""
-"set scheme option, for help use\n"
-"                                       -e '(ly:option-usage)'"
+#: main.cc:141
+msgid "evaluate scheme code"

 msgstr ""
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
 msgstr ""
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.

-#: main.cc:139 lily/main.cc:139
+#: main.cc:144

 msgid "FORMATs"
 msgstr ""
 
 msgid "FORMATs"
 msgstr ""
 

-#: main.cc:139 lily/main.cc:139
+#: main.cc:144

 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 

-#: main.cc:140 lily/main.cc:140
+#: main.cc:145

 msgid "generate DVI (tex backend only)"
 msgstr ""
 
 msgid "generate DVI (tex backend only)"
 msgstr ""
 

-#: main.cc:141 lily/main.cc:141
+#: main.cc:146

 msgid "generate PDF (default)"
 msgstr ""
 
 msgid "generate PDF (default)"
 msgstr ""
 

-#: main.cc:142 lily/main.cc:142
+#: main.cc:147

 msgid "generate PNG"
 msgstr ""
 
 msgid "generate PNG"
 msgstr ""
 

-#: main.cc:143 lily/main.cc:143
+#: main.cc:148

 msgid "generate PostScript"
 msgstr ""
 
 msgid "generate PostScript"
 msgstr ""
 

-#: main.cc:144 lily/main.cc:144
+#: main.cc:149

 msgid "generate TeX (tex backend only)"
 msgstr ""
 
 msgid "generate TeX (tex backend only)"
 msgstr ""
 

-#: main.cc:146 lily/main.cc:146
+#: main.cc:151

 msgid "FIELD"
 msgstr ""
 
 msgid "FIELD"
 msgstr ""
 

-#: main.cc:146 lily/main.cc:146
-msgid "write header field to BASENAME.FIELD"
+#: main.cc:151
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:147 lily/main.cc:147
+#: main.cc:153

 msgid "add DIR to search path"
 msgstr ""
 
 msgid "add DIR to search path"
 msgstr ""
 

-#: main.cc:148 lily/main.cc:148
+#: main.cc:154

 msgid "use FILE as init file"
 msgstr ""
 
 msgid "use FILE as init file"
 msgstr ""
 

-#: main.cc:149 lily/main.cc:149
-msgid "write output to FILE (suffix will be added)"
+#: main.cc:156
+msgid "USER, GROUP, JAIL, DIR"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:150 lily/main.cc:150
-msgid "USER,GROUP,JAIL,DIR"
-msgstr ""
-
-#: main.cc:150 lily/main.cc:150
+#: main.cc:156

 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"

-"                                       and cd into DIR"
-msgstr ""
-
-#: main.cc:151 lily/main.cc:151
-msgid "do not generate printed output"
+"and cd into DIR"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:152 lily/main.cc:152
-msgid "generate a preview of the first system"
+#: main.cc:159
+msgid "write output to FILE (suffix will be added)"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:153 lily/main.cc:153
-msgid "run in safe mode"
+#: main.cc:160
+msgid "relocate using directory of lilypond program"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:177 lily/main.cc:177
+#: main.cc:226

 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"


@@ -1213,111 +1647,126 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.

-#: main.cc:203 lily/main.cc:203
+#: main.cc:254

 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 

-#: main.cc:205 lily/main.cc:205
+#: main.cc:256

 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 

-#: main.cc:207 lily/main.cc:207
+#: main.cc:258

 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 

-#: main.cc:209 lily/main.cc:209
+#: main.cc:260

 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 

-#: main.cc:299 lily/main.cc:299
+#: main.cc:262
+#, c-format
+msgid "Options:"
+msgstr ""
+
+#: main.cc:266
+#, c-format
+msgid "Report bugs via %s"
+msgstr ""
+
+#: main.cc:312

 #, c-format
 #, c-format

-msgid "expected %d arguments with jail, found: %d"
+msgid "expected %d arguments with jail, found: %u"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:313 lily/main.cc:313
+#: main.cc:326

 #, c-format
 msgid "no such user: %s"
 msgstr ""
 
 #, c-format
 msgid "no such user: %s"
 msgstr ""
 

-#: main.cc:315 lily/main.cc:315
+#: main.cc:328

 #, c-format
 #, c-format

-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:330 lily/main.cc:330
+#: main.cc:343

 #, c-format
 msgid "no such group: %s"
 msgstr ""
 
 #, c-format
 msgid "no such group: %s"
 msgstr ""
 

-#: main.cc:332 lily/main.cc:332
+#: main.cc:345

 #, c-format
 #, c-format

-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:340 lily/main.cc:340
+#: main.cc:353

 #, c-format
 #, c-format

-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:347 lily/main.cc:347
+#: main.cc:360

 #, c-format
 #, c-format

-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:353 lily/main.cc:353
+#: main.cc:366

 #, c-format
 #, c-format

-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"

 msgstr ""
 
 msgstr ""
 

-#: main.cc:359 lily/main.cc:359
+#: main.cc:372

 #, c-format
 #, c-format

-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
+msgstr ""
+
+#: main.cc:619
+#, c-format
+msgid "exception caught: %s"

 msgstr ""
 
 #. FIXME: constant error message.
 msgstr ""
 
 #. FIXME: constant error message.

-#: mark-engraver.cc:123 lily/mark-engraver.cc:123
+#: mark-engraver.cc:129

 msgid "rehearsalMark must have integer value"
 msgstr ""
 
 msgid "rehearsalMark must have integer value"
 msgstr ""
 

-#: mark-engraver.cc:129 lily/mark-engraver.cc:129
+#: mark-engraver.cc:135

 msgid "mark label must be a markup object"
 msgstr ""
 
 msgid "mark label must be a markup object"
 msgstr ""
 

-#: mensural-ligature-engraver.cc:74 lily/mensural-ligature-engraver.cc:74
+#: mensural-ligature-engraver.cc:85

 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 

-#: mensural-ligature-engraver.cc:101 lily/mensural-ligature-engraver.cc:101
+#: mensural-ligature-engraver.cc:112

 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 

-#: mensural-ligature-engraver.cc:115 lily/mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:126

 msgid "single note ligature - skipping"
 msgstr ""
 
 msgid "single note ligature - skipping"
 msgstr ""
 

-#: mensural-ligature-engraver.cc:127 lily/mensural-ligature-engraver.cc:127
+#: mensural-ligature-engraver.cc:138

 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 

-#: mensural-ligature-engraver.cc:139 lily/mensural-ligature-engraver.cc:139
+#: mensural-ligature-engraver.cc:150

 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 

-#: mensural-ligature-engraver.cc:187 lily/mensural-ligature-engraver.cc:187
+#: mensural-ligature-engraver.cc:198

 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 

-#: mensural-ligature-engraver.cc:198 lily/mensural-ligature-engraver.cc:198
+#: mensural-ligature-engraver.cc:209

 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 

-#: mensural-ligature-engraver.cc:225 lily/mensural-ligature-engraver.cc:225
+#: mensural-ligature-engraver.cc:236

 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"


@@ -1325,968 +1774,1043 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
 "or the ligatura must be LB or SSB"
 msgstr ""
 

-#: mensural-ligature-engraver.cc:345 lily/mensural-ligature-engraver.cc:345
+#: mensural-ligature-engraver.cc:356

 msgid "unexpected case fall-through"
 msgstr ""
 
 msgid "unexpected case fall-through"
 msgstr ""
 

-#: mensural-ligature.cc:131 lily/mensural-ligature.cc:131
+#: mensural-ligature.cc:141

 msgid "Mensural_ligature: unexpected case fall-through"
 msgstr ""
 
 msgid "Mensural_ligature: unexpected case fall-through"
 msgstr ""
 

-#: mensural-ligature.cc:183 lily/mensural-ligature.cc:183
+#: mensural-ligature.cc:192

 msgid "Mensural_ligature: (join_right == 0)"
 msgstr ""
 
 msgid "Mensural_ligature: (join_right == 0)"
 msgstr ""
 

-#: midi-item.cc:150 lily/midi-item.cc:150
+#: midi-item.cc:81

 #, c-format
 msgid "no such MIDI instrument: `%s'"
 msgstr ""
 
 #, c-format
 msgid "no such MIDI instrument: `%s'"
 msgstr ""
 

-#: midi-item.cc:254 lily/midi-item.cc:254
-msgid "silly pitch"
+#: midi-stream.cc:28
+#, c-format
+msgid "cannot open for write: %s: %s"

 msgstr ""
 
 msgstr ""
 

-#: midi-item.cc:270 lily/midi-item.cc:270
+#: midi-stream.cc:44

 #, c-format
 #, c-format

-msgid "experimental: temporarily fine tuning (of %d cents) a channel."
+msgid "cannot write to file: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: midi-stream.cc:27 lily/midi-stream.cc:27
-#, c-format
-msgid "can't open for write: %s: %s"
+#: minimal-page-breaking.cc:42
+msgid "Computing page breaks..."

 msgstr ""
 
 msgstr ""
 

-#: midi-stream.cc:44 lily/midi-stream.cc:44
-#, c-format
-msgid "can't write to file: `%s'"
+#: music-iterator.cc:171
+msgid "Sending non-event to context"

 msgstr ""
 
 msgstr ""
 

-#: music.cc:176 lily/music.cc:176
+#: music.cc:140

 #, c-format
 #, c-format

-msgid "octave check failed; expected %s, found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""

 msgstr ""
 
 msgstr ""
 

-#: music.cc:239 lily/music.cc:239
+#: music.cc:203

 #, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr ""
 
 #, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr ""
 

-#: new-fingering-engraver.cc:84 lily/new-fingering-engraver.cc:84
-msgid "can't add text scripts to individual note heads"
+#: new-dynamic-engraver.cc:128
+#, c-format
+msgid ""
+"unknown crescendo style: %s\n"
+"defaulting to hairpin."

 msgstr ""
 
 msgstr ""
 

-#. music for the softenon children?
-#.
-#: new-fingering-engraver.cc:158 lily/new-fingering-engraver.cc:158
-msgid "music for the martians."
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"

 msgstr ""
 
 msgstr ""
 

-#: new-fingering-engraver.cc:266 lily/new-fingering-engraver.cc:266
+#: new-fingering-engraver.cc:239

 msgid "no placement found for fingerings"
 msgstr ""
 
 msgid "no placement found for fingerings"
 msgstr ""
 

-#: new-fingering-engraver.cc:267 lily/new-fingering-engraver.cc:267
+#: new-fingering-engraver.cc:240

 msgid "placing below"
 msgstr ""
 
 msgid "placing below"
 msgstr ""
 

-#: new-lyric-combine-music-iterator.cc:240
-#: lily/new-lyric-combine-music-iterator.cc:240
-#, c-format
-msgid "cannot find Voice `%s'"
+#: note-collision.cc:484
+msgid "ignoring too many clashing note columns"

 msgstr ""
 
 msgstr ""
 

-#: note-collision.cc:404 lily/note-collision.cc:404
-msgid "ignoring too many clashing note columns"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
+msgstr ""
+
+#: note-head.cc:63
+#, c-format
+msgid "none of note heads `%s' or `%s' found"

 msgstr ""
 
 msgstr ""
 

-#: note-column.cc:115 lily/note-column.cc:115
-msgid "can't have note heads and rests together on a stem"
+#: note-heads-engraver.cc:64
+msgid "NoteEvent without pitch"

 msgstr ""
 
 msgstr ""
 

-#: note-head.cc:66 lily/note-head.cc:66
+#: open-type-font.cc:33

 #, c-format
 #, c-format

-msgid "note head `%s' not found"
+msgid "cannot allocate %lu bytes"

 msgstr ""
 
 msgstr ""
 

-#: open-type-font.cc:29 lily/open-type-font.cc:29
+#: open-type-font.cc:37

 #, c-format
 #, c-format

-msgid "can't allocate %d bytes"
+msgid "cannot load font table: %s"

 msgstr ""
 
 msgstr ""
 

-#: open-type-font.cc:33 lily/open-type-font.cc:33
+#: open-type-font.cc:42

 #, c-format
 #, c-format

-msgid "can't load font table: %s"
+msgid "Free type error: %s"

 msgstr ""
 
 msgstr ""
 

-#: open-type-font.cc:84 lily/open-type-font.cc:84
+#: open-type-font.cc:100

 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 

-#: open-type-font.cc:86 lily/open-type-font.cc:86
+#: open-type-font.cc:102
+#, c-format
+msgid "error reading font file %s: %s"
+msgstr ""
+
+#: open-type-font.cc:177
+#, c-format
+msgid "FT_Get_Glyph_Name () Freetype error: %s"
+msgstr ""
+
+#: open-type-font.cc:302 pango-font.cc:167
+#, c-format
+msgid "FT_Get_Glyph_Name () error: %s"
+msgstr ""
+
+#. find out the ideal number of pages
+#: optimal-page-breaking.cc:56
+msgid "Finding the ideal number of pages..."
+msgstr ""
+
+#: optimal-page-breaking.cc:76
+msgid "Fitting music on 1 page..."
+msgstr ""
+
+#: optimal-page-breaking.cc:78
+#, c-format
+msgid "Fitting music on %d pages..."
+msgstr ""
+
+#: optimal-page-breaking.cc:80
+#, c-format
+msgid "Fitting music on %d or %d pages..."
+msgstr ""
+
+#: optimal-page-breaking.cc:157 page-turn-page-breaking.cc:226
+#: paper-score.cc:146
+msgid "Drawing systems..."
+msgstr ""
+
+#: page-turn-page-breaking.cc:146
+#, c-format
+msgid "page-turn-page-breaking: breaking from %d to %d"
+msgstr ""
+
+#: page-turn-page-breaking.cc: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:275
+#, c-format
+msgid "break starting at page %d"
+msgstr ""
+
+#: page-turn-page-breaking.cc:276
+#, c-format
+msgid "\tdemerits: %f"
+msgstr ""
+
+#: page-turn-page-breaking.cc:277
+#, c-format
+msgid "\tsystem count: %d"
+msgstr ""
+
+#: page-turn-page-breaking.cc:278
+#, c-format
+msgid "\tpage count: %d"
+msgstr ""
+
+#: page-turn-page-breaking.cc:279

 #, c-format
 #, c-format

-msgid "unknown error: %d reading font file: %s"
+msgid "\tprevious break: %d"

 msgstr ""
 
 msgstr ""
 

-#: open-type-font.cc:140 lily/open-type-font.cc:140
+#: pango-font.cc:184

 #, c-format
 #, c-format

-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"

 msgstr ""
 
 msgstr ""
 

-#: pango-font.cc:130 lily/pango-font.cc:130
+#: pango-font.cc:229

 #, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr ""
 
 #, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr ""
 

-#: pango-font.cc:177 lily/pango-font.cc:177
+#: pango-font.cc:277

 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 

-#: paper-outputter-scheme.cc:26 lily/paper-outputter-scheme.cc:26
+#: paper-column-engraver.cc:221
+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 ""
 
 #, c-format
 msgid "Layout output to `%s'..."
 msgstr ""
 

-#: paper-score.cc:66 lily/paper-score.cc:66 lily/paper-score.cc:76
+#: paper-score.cc:105
+msgid "Calculating line breaks..."
+msgstr ""
+
+#: paper-score.cc:118

 #, c-format
 msgid "Element count %d (spanners %d) "
 msgstr ""
 
 #, c-format
 msgid "Element count %d (spanners %d) "
 msgstr ""
 

-#: paper-score.cc:70 lily/paper-score.cc:70 lily/paper-score.cc:80
+#: paper-score.cc:122

 msgid "Preprocessing graphical objects..."
 msgstr ""
 
 msgid "Preprocessing graphical objects..."
 msgstr ""
 

-#: parse-scm.cc:81 lily/parse-scm.cc:81
+#: parse-scm.cc:93

 msgid "GUILE signaled an error for the expression beginning here"
 msgstr ""
 
 msgid "GUILE signaled an error for the expression beginning here"
 msgstr ""
 

-#: percent-repeat-engraver.cc:100 lily/percent-repeat-engraver.cc:100
-#, c-format
-msgid "can't handle a percent repeat of length: %s"
-msgstr ""
-
-#: percent-repeat-engraver.cc:158 lily/percent-repeat-engraver.cc:158
+#: percent-repeat-engraver.cc:200

 msgid "unterminated percent repeat"
 msgstr ""
 
 msgid "unterminated percent repeat"
 msgstr ""
 

-#: percent-repeat-iterator.cc:51 lily/percent-repeat-iterator.cc:51
-msgid "no one to print a percent"
-msgstr ""
-
-#: performance.cc:47 lily/performance.cc:47
+#: performance.cc:43

 msgid "Track..."
 msgstr ""
 
 msgid "Track..."
 msgstr ""
 

-#: performance.cc:71 lily/performance.cc:71
+#: performance.cc:72

 msgid "MIDI channel wrapped around"
 msgstr ""
 
 msgid "MIDI channel wrapped around"
 msgstr ""
 

-#: performance.cc:72 lily/performance.cc:72
+#: performance.cc:73

 msgid "remapping modulo 16"
 msgstr ""
 
 msgid "remapping modulo 16"
 msgstr ""
 

-#: performance.cc:91 lily/performance.cc:91
-msgid "Creator: "
+#: performance.cc:101
+#, c-format
+msgid "MIDI output to `%s'..."

 msgstr ""
 
 msgstr ""
 

-#: performance.cc:111 lily/performance.cc:111
-msgid "at "
+#: phrasing-slur-engraver.cc:139
+msgid "unterminated phrasing slur"

 msgstr ""
 
 msgstr ""
 

-#: performance.cc:164 lily/performance.cc:164 lily/performance.cc:165
+#: piano-pedal-engraver.cc:287

 #, c-format
 #, c-format

-msgid "MIDI output to `%s'..."
+msgid "expect 3 strings for piano pedals, found: %ld"

 msgstr ""
 
 msgstr ""
 

-#: phrasing-slur-engraver.cc:115 lily/phrasing-slur-engraver.cc:115
-msgid "unterminated phrasing slur"
+#: piano-pedal-engraver.cc:302 piano-pedal-engraver.cc:313
+#: piano-pedal-performer.cc:93
+#, c-format
+msgid "cannot find start of piano pedal: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: piano-pedal-engraver.cc:224 lily/piano-pedal-engraver.cc:224
+#: piano-pedal-engraver.cc:348

 #, c-format
 #, c-format

-msgid "expect 3 strings for piano pedals, found: %d"
+msgid "cannot find start of piano pedal bracket: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: piano-pedal-engraver.cc:240 piano-pedal-engraver.cc:255
-#: piano-pedal-performer.cc:80 lily/piano-pedal-engraver.cc:240
-#: lily/piano-pedal-engraver.cc:255 lily/piano-pedal-performer.cc:80
+#: program-option-scheme.cc:215

 #, c-format
 #, c-format

-msgid "can't find start of piano pedal: `%s'"
+msgid "no such internal option: %s"

 msgstr ""
 
 msgstr ""
 

-#: piano-pedal-engraver.cc:305 lily/piano-pedal-engraver.cc:305
+#: property-iterator.cc:74

 #, c-format
 #, c-format

-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "not a grob name, `%s'"
+msgstr ""
+
+#: relative-octave-check.cc:38
+msgid "Failed octave check, got: "

 msgstr ""
 
 msgstr ""
 

-#: property-iterator.cc:90 lily/property-iterator.cc:90
+#: relocate.cc:44

 #, c-format
 #, c-format

-msgid "not a grob name, `%s'"
+msgid "Setting %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: quote-iterator.cc:254 lily/quote-iterator.cc:254
+#: relocate.cc:64

 #, c-format
 #, c-format

-msgid "in quotation: junking event %s"
+msgid "no such file: %s for %s"

 msgstr ""
 
 msgstr ""
 

-#: relative-octave-check.cc:38 lily/relative-octave-check.cc:38
-msgid "Failed octave check, got: "
+#: relocate.cc:74 relocate.cc:92
+#, c-format
+msgid "no such directory: %s for %s"

 msgstr ""
 
 msgstr ""
 

-#: rest-collision.cc:147 lily/rest-collision.cc:147
-msgid "rest direction not set.  Cannot resolve collision."
+#: relocate.cc:84
+#, c-format
+msgid "%s=%s (prepend)\n"

 msgstr ""
 
 msgstr ""
 

-#: rest-collision.cc:162 rest-collision.cc:208 lily/rest-collision.cc:162
-#: lily/rest-collision.cc:208
-msgid "too many colliding rests"
+#: relocate.cc:114
+#, c-format
+msgid "not relocating, no %s/ or current/ found under %s"

 msgstr ""
 
 msgstr ""
 

-#: rest.cc:140 lily/rest.cc:140
+#: relocate.cc:125

 #, c-format
 #, c-format

-msgid "rest `%s' not found"
+msgid "Relocation: compile datadir=%s, new datadir=%s"

 msgstr ""
 
 msgstr ""
 

-#: scm-option.cc:54 lily/scm-option.cc:54
+#: relocate.cc:138

 #, c-format
 #, c-format

-msgid "lilypond -e EXPR means:"
+msgid "Relocation: framework_prefix=%s"

 msgstr ""
 
 msgstr ""
 

-#: scm-option.cc:56 lily/scm-option.cc:56
+#: relocate.cc:179

 #, c-format
 #, c-format

-msgid "  Evalute the Scheme EXPR before parsing any .ly files."
+msgid "Relocation: is absolute: argv0=%s"

 msgstr ""
 
 msgstr ""
 

-#: scm-option.cc:58 lily/scm-option.cc:58
+#: relocate.cc:186

 #, c-format
 #, c-format

-msgid ""
-"  Multiple -e options may be given, they will be evaluated sequentially."
+msgid "Relocation: from cwd: argv0=%s"

 msgstr ""
 
 msgstr ""
 

-#: scm-option.cc:60 lily/scm-option.cc:60
+#: relocate.cc:195

 #, c-format
 msgid ""
 #, 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 ""
 
 msgstr ""
 

-#: scm-option.cc:62 lily/scm-option.cc:62
+#: relocate.cc:356

 #, c-format
 #, c-format

-msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
+msgid "Relocation file: %s"

 msgstr ""
 
 msgstr ""
 

-#: scm-option.cc:64 lily/scm-option.cc:64
+#: relocate.cc:392

 #, c-format
 #, 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 ""
+
+#: rest-collision.cc:159 rest-collision.cc:204
+msgid "too many colliding rests"

 msgstr ""
 
 msgstr ""
 

-#: scm-option.cc:135 scm-option.cc:175 lily/scm-option.cc:135
-#: lily/scm-option.cc:175
+#: rest.cc:148

 #, c-format
 #, c-format

-msgid "no such internal option: %s"
+msgid "rest `%s' not found"

 msgstr ""
 
 msgstr ""
 

-#: score-engraver.cc:105 lily/score-engraver.cc:105
+#: score-engraver.cc:67

 #, c-format
 msgid "cannot find `%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot find `%s'"
 msgstr ""
 

-#: score-engraver.cc:107 lily/score-engraver.cc:107
+#: score-engraver.cc:69

 msgid "Music font has not been installed properly."
 msgstr ""
 
 msgid "Music font has not been installed properly."
 msgstr ""
 

-#: score-engraver.cc:109 lily/score-engraver.cc:109
+#: score-engraver.cc:71

 #, c-format
 msgid "Search path `%s'"
 msgstr ""
 
 #, c-format
 msgid "Search path `%s'"
 msgstr ""
 

-#: score.cc:213 lily/score.cc:213 lily/score.cc:214
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:167

 msgid "already have music in score"
 msgstr ""
 
 msgid "already have music in score"
 msgstr ""
 

-#: score.cc:214 lily/score.cc:214 lily/score.cc:215
+#: score.cc:168

 msgid "this is the previous music"
 msgstr ""
 
 msgid "this is the previous music"
 msgstr ""
 

-#: score.cc:219 lily/score.cc:219 lily/score.cc:220
+#: score.cc:173

 msgid "errors found, ignoring music expression"
 msgstr ""
 
 #. FIXME:
 msgid "errors found, ignoring music expression"
 msgstr ""
 
 #. FIXME:

-#: script-engraver.cc:100 lily/script-engraver.cc:100
-msgid "don't know how to interpret articulation: "
+#: script-engraver.cc:102
+msgid "do not know how to interpret articulation: "

 msgstr ""
 
 msgstr ""
 

-#: script-engraver.cc:101 lily/script-engraver.cc:101
+#: script-engraver.cc:103

 msgid "scheme encoding: "
 msgstr ""
 
 msgid "scheme encoding: "
 msgstr ""
 

-#. this shouldn't happen, but let's continue anyway.
-#: separation-item.cc:52 separation-item.cc:96 lily/separation-item.cc:52
-#: lily/separation-item.cc:96
-msgid "Separation_item:  I've been drinking too much"
-msgstr ""
-
-#: simple-spacer.cc:410 lily/simple-spacer.cc:410
+#: slur-engraver.cc:82

 #, c-format
 #, c-format

-msgid "No spring between column %d and next one"
+msgid "direction of %s invalid: %d"

 msgstr ""
 
 msgstr ""
 

-#: slur-engraver.cc:113 lily/slur-engraver.cc:113
+#: slur-engraver.cc:151

 msgid "unterminated slur"
 msgstr ""
 
 msgid "unterminated slur"
 msgstr ""
 

-#: slur-engraver.cc:122 lily/slur-engraver.cc:122
-msgid "can't end slur"
+#: slur-engraver.cc:163
+msgid "cannot end slur"

 msgstr ""
 
 msgstr ""
 

-#: source-file.cc:55 lily/source-file.cc:55
+#: slur.cc:357

 #, c-format
 #, c-format

-msgid "can't open file: `%s'"
+msgid "Ignoring grob for slur: %s. avoid-slur not set?"

 msgstr ""
 
 msgstr ""
 

-#: source-file.cc:68 lily/source-file.cc:68
+#: source-file.cc:79

 #, c-format
 msgid "expected to read %d characters, got %d"
 msgstr ""
 
 #, c-format
 msgid "expected to read %d characters, got %d"
 msgstr ""
 

-#: spacing-spanner.cc:377 lily/spacing-spanner.cc:377
+#: spaceable-grob.cc:83

 #, c-format
 #, 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 ""
 
 msgstr ""
 

-#: stem-engraver.cc:88 lily/stem-engraver.cc:88
+#: stem-engraver.cc:92

 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:

-#: stem-engraver.cc:125 lily/stem-engraver.cc:125
+#: stem-engraver.cc:129

 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr ""
 
 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr ""
 

-#: stem-engraver.cc:126 lily/stem-engraver.cc:126
+#: stem-engraver.cc:131

 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 

-#: stem.cc:124 lily/stem.cc:124
+#: stem.cc:105

 msgid "weird stem size, check for narrow beams"
 msgstr ""
 
 msgid "weird stem size, check for narrow beams"
 msgstr ""
 

-#: stem.cc:577 lily/stem.cc:577
+#: stem.cc:627

 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 

-#: stem.cc:588 lily/stem.cc:588
+#: stem.cc:638

 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 

-#: system.cc:145 lily/system.cc:145
+#: system.cc:178

 #, c-format
 msgid "Element count %d."
 msgstr ""
 
 #, c-format
 msgid "Element count %d."
 msgstr ""
 

-#: system.cc:224 lily/system.cc:224
+#: system.cc:270

 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 

-#: system.cc:240 lily/system.cc:240
-msgid "Calculating line breaks..."
-msgstr ""
-
-#: text-spanner-engraver.cc:61 lily/text-spanner-engraver.cc:61
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:62
+msgid "cannot find start of text spanner"

 msgstr ""
 
 msgstr ""
 

-#: text-spanner-engraver.cc:75 lily/text-spanner-engraver.cc:75
+#: text-spanner-engraver.cc:75

 msgid "already have a text spanner"
 msgstr ""
 
 msgid "already have a text spanner"
 msgstr ""
 

-#: text-spanner-engraver.cc:136 lily/text-spanner-engraver.cc:136
+#: text-spanner-engraver.cc:121

 msgid "unterminated text spanner"
 msgstr ""
 
 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 lily/tfm-reader.cc:106
-#, c-format
-msgid "TFM header of `%s' has only %u word (s)"
-msgstr ""
-
-#: tfm-reader.cc:139 lily/tfm-reader.cc:139
-#, c-format
-msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
-msgstr ""
-
-#: tfm.cc:70 lily/tfm.cc:70
-#, c-format
-msgid "can't find ascii character: %d"
-msgstr ""
-
-#: tie-engraver.cc:194 lily/tie-engraver.cc:194
+#: tie-engraver.cc:262

 msgid "lonely tie"
 msgstr ""
 
 msgid "lonely tie"
 msgstr ""
 

-#: time-scaled-music-iterator.cc:22 lily/time-scaled-music-iterator.cc:22
-msgid "no one to print a tuplet start bracket"
-msgstr ""
-
+#.

 #. Todo: should make typecheck?
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
 #. Todo: should make typecheck?
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.

-#: time-signature-engraver.cc:54 lily/time-signature-engraver.cc:54
+#: time-signature-engraver.cc:64

 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)

-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#: time-signature.cc:83 lily/time-signature.cc:83
+#: time-signature.cc:83

 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
 
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
 

-#: translator-ctors.cc:52 lily/translator-ctors.cc:52
+#: translator-ctors.cc:53

 #, c-format
 msgid "unknown translator: `%s'"
 msgstr ""
 
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr ""
 

-#: trill-spanner-engraver.cc:68 lily/trill-spanner-engraver.cc:68
-msgid "can't find start of trill spanner"
+#: translator-group-ctors.cc:29
+#, c-format
+msgid "fatal error. Couldn't find type: %s"

 msgstr ""
 
 msgstr ""
 

-#: trill-spanner-engraver.cc:82 lily/trill-spanner-engraver.cc:82
-msgid "already have a trill spanner"
+#: translator-group.cc:146
+#, c-format
+msgid "cannot find: `%s'"
+msgstr ""
+
+#: translator.cc:347
+#, c-format
+msgid "Two simultaneous %s events, junking this one"
+msgstr ""
+
+#: translator.cc:348
+#, c-format
+msgid "Previous %s event here"
+msgstr ""
+
+#: trill-spanner-engraver.cc:85
+msgid "cannot find start of trill spanner"

 msgstr ""
 
 msgstr ""
 

-#: trill-spanner-engraver.cc:142 lily/trill-spanner-engraver.cc:142
-msgid "unterminated trill spanner"
+#: trill-spanner-engraver.cc:98
+msgid "already have a trill spanner"

 msgstr ""
 
 msgstr ""
 

-#: tuplet-bracket.cc:438 lily/tuplet-bracket.cc:438
-msgid "removing tuplet bracket across linebreak"
+#: tuplet-engraver.cc:96
+msgid "No tuplet to end"

 msgstr ""
 
 msgstr ""
 

-#: vaticana-ligature-engraver.cc:341 lily/vaticana-ligature-engraver.cc:341
+#: vaticana-ligature-engraver.cc:389

 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 

-#: vaticana-ligature-engraver.cc:568 lily/vaticana-ligature-engraver.cc:568
+#: vaticana-ligature-engraver.cc:718

 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
 
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
 

-#: vaticana-ligature.cc:87 lily/vaticana-ligature.cc:87
+#: vaticana-ligature.cc:84

 msgid "flexa-height undefined; assuming 0"
 msgstr ""
 
 msgid "flexa-height undefined; assuming 0"
 msgstr ""
 

-#: vaticana-ligature.cc:93 lily/vaticana-ligature.cc:93
+#: vaticana-ligature.cc:89

 msgid "ascending vaticana style flexa"
 msgstr ""
 
 msgid "ascending vaticana style flexa"
 msgstr ""
 

-#: vaticana-ligature.cc:182 lily/vaticana-ligature.cc:182
+#: vaticana-ligature.cc:177

 msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
 msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.

-#: volta-engraver.cc:127 lily/volta-engraver.cc:127
-msgid "can't end volta spanner"
+#: volta-engraver.cc:100
+msgid "cannot end volta spanner"

 msgstr ""
 
 msgstr ""
 

-#: volta-engraver.cc:137 lily/volta-engraver.cc:137
+#: volta-engraver.cc:110

 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 

-#: volta-engraver.cc:141 lily/volta-engraver.cc:141
+#: volta-engraver.cc:114

 msgid "also already have an ended spanner"
 msgstr ""
 
 msgid "also already have an ended spanner"
 msgstr ""
 

-#: parser.yy:90
-msgid "tag must be symbol or list of symbols"
-msgstr ""
-
-#: parser.yy:656
-msgid "identifier should have alphabetic characters only"
+#: volta-engraver.cc:115
+msgid "giving up"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:814
+#: parser.yy:729

 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 

-#: parser.yy:838
+#: parser.yy:753

 msgid "need \\paper for paper block"
 msgstr ""
 
 msgid "need \\paper for paper block"
 msgstr ""
 

-#: parser.yy:983
-msgid "more alternatives than repeats"
-msgstr ""
-
-#: parser.yy:1020
-#, c-format
-msgid "expect 2 elements for Chord tremolo, found %d"
-msgstr ""
-
-#: parser.yy:1175
-msgid "music head function must return Music object"
-msgstr ""
-
-#: parser.yy:1447
+#: parser.yy:1224

 msgid "Grob name should be alphanumeric"
 msgstr ""
 
 msgid "Grob name should be alphanumeric"
 msgstr ""
 

-#: parser.yy:1807
+#: parser.yy:1522

 msgid "second argument must be pitch list"
 msgstr ""
 
 msgid "second argument must be pitch list"
 msgstr ""
 

-#: parser.yy:1846 parser.yy:1851 parser.yy:2332
+#: parser.yy:1549 parser.yy:1554 parser.yy:2026

 msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
 msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 

-#: parser.yy:1944
+#: parser.yy:1651

 msgid "expecting string as script definition"
 msgstr ""
 
 msgid "expecting string as script definition"
 msgstr ""
 

-#: parser.yy:2107 parser.yy:2157
+#: parser.yy:1806 parser.yy:1856

 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 

-#: parser.yy:2251
+#: parser.yy:1980

 msgid "have to be in Note mode for notes"
 msgstr ""
 
 msgid "have to be in Note mode for notes"
 msgstr ""
 

-#: parser.yy:2345
+#: parser.yy:2041

 msgid "have to be in Chord mode for chords"
 msgstr ""
 
 msgid "have to be in Chord mode for chords"
 msgstr ""
 

-#: parser.yy:2496
-msgid "need integer number arg"
+#: lexer.ll:179
+msgid "stray UTF-8 BOM encountered"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:2694
-#, c-format
-msgid "suspect duration in beam: %s"
+#: lexer.ll:183
+msgid "Skipping UTF-8 BOM"

 msgstr ""
 
 msgstr ""
 

-#: lexer.ll:193
+#: lexer.ll:238

 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr ""
 
 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr ""
 

-#: lexer.ll:201
+#: lexer.ll:255

 msgid "quoted string expected after \\version"
 msgstr ""
 
 msgid "quoted string expected after \\version"
 msgstr ""
 

-#: lexer.ll:205
-msgid "quoted string expected after \\renameinput"
+#: lexer.ll:259
+msgid "quoted string expected after \\sourcefilename"
+msgstr ""
+
+#: lexer.ll:263
+msgid "integer expected after \\sourcefileline"

 msgstr ""
 
 msgstr ""
 

-#: lexer.ll:218
+#: lexer.ll:276

 msgid "EOF found inside a comment"
 msgstr ""
 
 msgid "EOF found inside a comment"
 msgstr ""
 

-#: lexer.ll:233
+#: lexer.ll:291

 msgid "\\maininput not allowed outside init files"
 msgstr ""
 
 msgid "\\maininput not allowed outside init files"
 msgstr ""
 

-#: lexer.ll:257
+#: lexer.ll:315

 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr ""
 
 #. backup rule
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr ""
 
 #. backup rule

-#: lexer.ll:266
+#: lexer.ll:324

 msgid "end quote missing"
 msgstr ""
 
 msgid "end quote missing"
 msgstr ""
 

-#: lexer.ll:428
+#: lexer.ll:469

 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 

-#: lexer.ll:527
+#: lexer.ll:584

 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 

-#: lexer.ll:616
+#: lexer.ll:688

 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 
 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 

-#: lexer.ll:703 lexer.ll:704
+#: lexer.ll:803 lexer.ll:804

 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 

-#: lexer.ll:801 lexer.ll:802
+#: lexer.ll:910 lexer.ll:911

 #, c-format
 #, c-format

-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr ""
-
-#: lexer.ll:802 lexer.ll:803
-msgid "Consider updating the input with the convert-ly script"
-msgstr ""
-
-#. TODO: print location
-#: lexer.ll:939 lexer.ll:940
-msgid "can't find signature for music function"
-msgstr ""
-
-#: out/parser.cc:1893
-msgid "syntax error: cannot back up"
+msgid "file too old: %s (oldest supported: %s)"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:1993
-msgid "Stack now"
+#: lexer.ll:911 lexer.ll:912
+msgid "consider updating the input with the convert-ly script"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:2021
+#: lexer.ll:917 lexer.ll:918

 #, c-format
 #, c-format

-msgid "Reducing stack by rule %d (line %u), "
+msgid "program too old: %s (file requires: %s)"

 msgstr ""
 
 msgstr ""
 

-#. Each stack pointer address is followed by the size of the
-#. data in use in that stack, in bytes.  This used to be a
-#. conditional around just the two extra args, but that might
-#. be undefined if yyoverflow is a macro.
-#: out/parser.cc:2351 out/parser.cc:5824
-msgid "parser stack overflow"
+#: backend-library.scm:19 lily.scm:777 ps-to-png.scm:58
+#, scheme-format
+msgid "Invoking `~a'..."

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:2391
-#, c-format
-msgid "Stack size increased to %lu\n"
+#: backend-library.scm:28
+#, scheme-format
+msgid "`~a' failed (~a)"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:2398
-#, c-format
-msgid "Entering state %d\n"
+#: backend-library.scm:116 framework-tex.scm:344 framework-tex.scm:369
+#, scheme-format
+msgid "Converting to `~a'..."

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:2422
-msgid "Reading a token: "
+#. Do not try to guess the name of the png file,
+#. GS produces PNG files like BASE-page%d.png.
+#: backend-library.scm:128
+#, scheme-format
+msgid "Converting to ~a..."

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:2429
-msgid "Now at end of input.\n"
+#: backend-library.scm:166
+#, scheme-format
+msgid "Writing header field `~a' to `~a'..."

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:2434
-msgid "Next token is"
+#: define-context-properties.scm:20 define-grob-properties.scm:10
+#: define-music-properties.scm:10
+#, scheme-format
+msgid "symbol ~S redefined"

 msgstr ""
 
 msgstr ""
 

-#. Shift the look-ahead token.
-#. Shift the error token.
-#: out/parser.cc:2455 out/parser.cc:5796
-msgid "Shifting"
+#: define-event-classes.scm:119
+#, scheme-format
+msgid "event class ~A seems to be unused"

 msgstr ""
 
 msgstr ""
 

-#. This is so xgettext sees the translatable formats that are
-#. constructed on the fly.
-#: out/parser.cc:5615
-#, c-format
-msgid "syntax error, unexpected %s"
+#. should be programming-error
+#: define-event-classes.scm:125
+#, scheme-format
+msgid "translator listens to nonexisting event class ~A"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:5616
-#, c-format
-msgid "syntax error, unexpected %s, expecting %s"
+#: define-markup-commands.scm:599
+msgid "no systems found in \\score markup, does it have a \\layout block?"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:5617
-#, c-format
-msgid "syntax error, unexpected %s, expecting %s or %s"
+#: define-markup-commands.scm:2428
+#, scheme-format
+msgid "Cannot find glyph ~a"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:5618
-#, c-format
-msgid "syntax error, unexpected %s, expecting %s or %s or %s"
+#: define-markup-commands.scm:2737
+#, scheme-format
+msgid "not a valid duration string: ~a"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:5619
-#, c-format
-msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s"
+#: define-music-types.scm:670
+#, scheme-format
+msgid "symbol expected: ~S"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:5693
-msgid "syntax error; also memory exhausted"
+#: define-music-types.scm:673
+#, scheme-format
+msgid "cannot find music object: ~S"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:5697
-msgid "syntax error"
+#: define-music-types.scm:692
+#, scheme-format
+msgid "unknown repeat type `~S'"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:5718 out/parser.cc:5778
-msgid "Error: popping"
+#: define-music-types.scm:693
+msgid "See music-types.scm for supported repeats"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:5724
-msgid "Error: discarding"
+#: document-backend.scm:99
+#, scheme-format
+msgid "pair expected in doc ~s"

 msgstr ""
 
 msgstr ""
 

-#: out/parser.cc:5813
-msgid "Error: discarding lookahead"
+#: document-backend.scm:154
+#, scheme-format
+msgid "cannot find interface for property: ~S"

 msgstr ""
 
 msgstr ""
 

-#: backend-library.scm:18
-#, lisp-format
-msgid "Invoking `~a'..."
+#: document-backend.scm:164
+#, scheme-format
+msgid "unknown Grob interface: ~S"

 msgstr ""
 
 msgstr ""
 

-#: backend-library.scm:23
-#, lisp-format
-msgid "`~a' failed (~a)"
+#: documentation-lib.scm:48
+#, scheme-format
+msgid "Processing ~S..."

 msgstr ""
 
 msgstr ""
 

-#: backend-library.scm:42 framework-tex.scm:332 framework-tex.scm:357
-#, lisp-format
-msgid "Converting to `~a'..."
+#: documentation-lib.scm:164
+#, scheme-format
+msgid "Writing ~S..."

 msgstr ""
 
 msgstr ""
 

-#. Do not try to guess the name of the png file,
-#. GS produces PNG files like BASE-page%d.png.
-#. (ly:message (_ "Converting to `~a'...")
-#. (string-append (basename name ".ps") "-page1.png" )))
-#: backend-library.scm:65
-#, lisp-format
-msgid "Converting to ~a..."
+#: documentation-lib.scm:186
+#, scheme-format
+msgid "cannot find description for property ~S (~S)"

 msgstr ""
 
 msgstr ""
 

-#: backend-library.scm:95
-#, lisp-format
-msgid "Writing header field `~a' to `~a'..."
+#: framework-eps.scm:90
+#, scheme-format
+msgid "Writing ~a..."

 msgstr ""
 
 msgstr ""
 

-#: beam.scm:79
-#, lisp-format
-msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
+#: framework-ps.scm:282
+#, scheme-format
+msgid "cannot embed ~S=~S"

 msgstr ""
 
 msgstr ""
 

-#: beam.scm:93
-#, lisp-format
-msgid "Error in beam quanting.  Expected ~S 0, found ~S."
+#: framework-ps.scm:335
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"

 msgstr ""
 
 msgstr ""
 

-#: clef.scm:124
-#, lisp-format
-msgid "unknown clef type `~a'"
+#: framework-ps.scm:352
+#, scheme-format
+msgid "do not know how to embed ~S=~S"

 msgstr ""
 
 msgstr ""
 

-#: clef.scm:125
-msgid "see scm/clef.scm for supported clefs"
+#: framework-ps.scm:383
+#, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"

 msgstr ""
 
 msgstr ""
 

-#: define-context-properties.scm:13 define-grob-properties.scm:10
-#: define-music-properties.scm:10
-#, lisp-format
-msgid "symbol ~S redefined"
+#: framework-ps.scm:753
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"

 msgstr ""
 
 msgstr ""
 

-#: define-markup-commands.scm:79
-#, lisp-format
-msgid "Could not find bounding box of `~a'"
+#: framework-ps.scm:772 framework-ps.scm:775
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"

 msgstr ""
 
 msgstr ""
 

-#: define-markup-commands.scm:110
-msgid "no systems found in \\score markup, does it have a \\layout block?"
+#: framework-ps.scm:782
+msgid ""
+"\n"
+"The PostScript backend does not support the system-by-system \n"
+"output. For that, use the EPS backend instead,\n"
+"\n"
+"  lilypond -dbackend=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 ""
 
 msgstr ""
 

-#: define-markup-commands.scm:651
-#, lisp-format
-msgid "not a valid duration string: ~a"
+#: framework-tex.scm:361
+#, scheme-format
+msgid "TeX file name must not contain whitespace: `~a'"

 msgstr ""
 
 msgstr ""
 

-#: define-music-types.scm:802
-#, lisp-format
-msgid "symbol expected: ~S"
+#: graphviz.scm:53
+#, scheme-format
+msgid "Writing graph `~a'..."

 msgstr ""
 
 msgstr ""
 

-#: define-music-types.scm:805
-#, lisp-format
-msgid "can't find music object: ~S"
+#: layout-beam.scm:29
+#, scheme-format
+msgid "Error in beam quanting.  Expected (~S,~S) found ~S."

 msgstr ""
 
 msgstr ""
 

-#: define-music-types.scm:825
-#, lisp-format
-msgid "unknown repeat type `~S'"
+#: layout-beam.scm:43
+#, scheme-format
+msgid "Error in beam quanting.  Expected ~S 0, found ~S."

 msgstr ""
 
 msgstr ""
 

-#: define-music-types.scm:826
-msgid "See music-types.scm for supported repeats"
+#: layout-page-layout.scm:124
+msgid "Can't fit systems on page -- ignoring between-system-padding"

 msgstr ""
 
 msgstr ""
 

-#: document-backend.scm:91
-#, lisp-format
-msgid "pair expected in doc ~s"
+#: layout-page-layout.scm:458
+msgid "Calculating page breaks..."

 msgstr ""
 
 msgstr ""
 

-#: document-backend.scm:135
-#, lisp-format
-msgid "can't find interface for property: ~S"
+#: lily-library.scm:588
+#, scheme-format
+msgid "unknown unit: ~S"

 msgstr ""
 
 msgstr ""
 

-#: document-backend.scm:144
-#, lisp-format
-msgid "unknown interface: ~S"
+#: lily-library.scm:622
+#, scheme-format
+msgid "no \\version statement found, please add~afor future compatibility"

 msgstr ""
 
 msgstr ""
 

-#: documentation-lib.scm:45
-#, lisp-format
-msgid "Processing ~S..."
+#: lily-library.scm:630
+msgid "old relative compatibility not used"

 msgstr ""
 
 msgstr ""
 

-#: documentation-lib.scm:160
-#, lisp-format
-msgid "Writing ~S..."
+#: lily.scm:178
+#, scheme-format
+msgid "cannot find: ~A"

 msgstr ""
 
 msgstr ""
 

-#: documentation-lib.scm:182
-#, lisp-format
-msgid "can't find description for property ~S"
+#: lily.scm:243
+#, scheme-format
+msgid "wrong type for argument ~a.  Expecting ~a, found ~s"

 msgstr ""
 
 msgstr ""
 

-#: framework-eps.scm:45 framework-eps.scm:46
-#, lisp-format
-msgid "Writing ~a..."
+#: lily.scm:641
+#, scheme-format
+msgid "job ~a terminated with signal: ~a"

 msgstr ""
 
 msgstr ""
 

-#: framework-ps.scm:236
-#, lisp-format
-msgid "can't find CFF/PFA/PFB font ~S=~S"
+#: lily.scm:644
+#, scheme-format
+msgid ""
+"logfile ~a (exit ~a):\n"
+"~a"

 msgstr ""
 
 msgstr ""
 

-#: framework-ps.scm:368
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: lily.scm:669 lily.scm:767
+#, scheme-format
+msgid "failed files: ~S"

 msgstr ""
 
 msgstr ""
 

-#: framework-ps.scm:383 framework-ps.scm:386
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: lily.scm:757
+#, scheme-format
+msgid "Redirecting output to ~a..."

 msgstr ""
 
 msgstr ""
 

-#: framework-tex.scm:349
-#, lisp-format
-msgid "TeX file name must not contain whitespace: `~a'"
+#: ly-syntax-constructors.scm:40
+msgid "Music head function must return Music object"

 msgstr ""
 
 msgstr ""
 

-#: lily-library.scm:314
-#, lisp-format
-msgid "unknown unit: ~S"
+#: ly-syntax-constructors.scm:150
+#, scheme-format
+msgid "Invalid property operation ~a"

 msgstr ""
 
 msgstr ""
 

-#: lily-library.scm:347
-#, lisp-format
-msgid "no \\version statement found,  add~afor future compatibility"
+#: markup.scm:204
+#, scheme-format
+msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"

 msgstr ""
 
 msgstr ""
 

-#: lily-library.scm:354
-msgid "old relative compatibility not used"
+#: markup.scm:210
+#, scheme-format
+msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."

 msgstr ""
 
 msgstr ""
 

-#: lily.scm:97
-#, lisp-format
-msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
+#: markup.scm:274
+#, scheme-format
+msgid "Not a markup command: ~A"

 msgstr ""
 
 msgstr ""
 

-#: lily.scm:319
-#, lisp-format
-msgid "failed files: ~S"
+#: music-functions.scm:228
+msgid "More alternatives than repeats.  Junking excess alternatives"

 msgstr ""
 
 msgstr ""
 

-#: markup.scm:88
-#, lisp-format
-msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
+#: music-functions.scm:240
+#, scheme-format
+msgid "invalid tremolo repeat count: ~a"

 msgstr ""
 
 msgstr ""
 

-#: markup.scm:94
-#, lisp-format
-msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
+#: music-functions.scm:248
+#, scheme-format
+msgid "expecting 2 elements for chord tremolo, found ~a"

 msgstr ""
 
 msgstr ""
 

-#: music-functions.scm:507
-#, lisp-format
+#: music-functions.scm:575
+#, scheme-format

 msgid "music expected: ~S"
 msgstr ""
 
 #. FIXME: uncomprehensable message
 msgid "music expected: ~S"
 msgstr ""
 
 #. FIXME: uncomprehensable message

-#: music-functions.scm:558
-#, lisp-format
+#: music-functions.scm:625
+#, scheme-format

 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 

-#: music-functions.scm:702
-#, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:793
+#, scheme-format
+msgid "cannot find quoted music: `~S'"

 msgstr ""
 
 msgstr ""
 

-#: music-functions.scm:875
-#, lisp-format
+#: music-functions.scm:990
+#, scheme-format

 msgid "unknown accidental style: ~S"
 msgstr ""
 
 msgid "unknown accidental style: ~S"
 msgstr ""
 

-#: output-lib.scm:246
-#, lisp-format
-msgid "unknown bar glyph: `~S'"
+#: output-ps.scm:285
+msgid "utf-8-string encountered in PS backend"

 msgstr ""
 
 msgstr ""
 

-#: output-ps.scm:311
-msgid "utf8-string encountered in PS backend"
-msgstr ""
-
-#: output-svg.scm:41
-#, lisp-format
+#: output-svg.scm:45
+#, scheme-format

 msgid "undefined: ~S"
 msgstr ""
 
 msgid "undefined: ~S"
 msgstr ""
 

-#: output-svg.scm:119
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#: output-svg.scm:135
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"

 msgstr ""
 
 msgstr ""
 

-#: output-tex.scm:114
-#, lisp-format
-msgid "can't find ~a in ~a"
+#: output-tex.scm:96
+#, scheme-format
+msgid "cannot find ~a in ~a"

 msgstr ""
 
 msgstr ""
 

-#: page-layout.scm:425
-msgid "Calculating page breaks..."
+#: paper.scm:86
+msgid "set-global-staff-size: not in toplevel scope"

 msgstr ""
 
 msgstr ""
 

-#: paper.scm:68
-msgid "Not in toplevel scope"
+#: paper.scm:226
+#, scheme-format
+msgid "This is not a \\layout {} object, ~S"

 msgstr ""
 
 msgstr ""
 

-#: paper.scm:113
-#, lisp-format
-msgid "This is not a \\layout {} object, ~S"
+#: paper.scm:238
+#, scheme-format
+msgid "Unknown papersize: ~a"

 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc

-#: paper.scm:141
+#: paper.scm:253

 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 

-#: to-xml.scm:190
-msgid "assertion failed"
+#: parser-clef.scm:129
+#, scheme-format
+msgid "unknown clef type `~a'"
+msgstr ""
+
+#: parser-clef.scm:130
+#, 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 ""
 msgstr ""