Fix a bug that produced incorrect syntax for the staccatissimo articulation.

[lilypond.git] / po / lilypond.pot

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 2c15f609bdaf87b6d1baa82e4493ea75ce5ec326..91af9420db648b99cca1a9741fd9fe7c588da2bf 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -1,15 +1,15 @@
 # Translation of LilyPond
 # Translation of LilyPond

-# Copyright (C) 1998--2012 Han-Wen Nienhuys, Jan Nieuwenhuizen.
+# Copyright (C) 1998--2015 Han-Wen Nienhuys, Jan Nieuwenhuizen.

 # This file is distributed under the same license as the LilyPond package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 # This file is distributed under the same license as the LilyPond package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: lilypond 2.17.9\n"
+"Project-Id-Version: lilypond 2.19.36\n"

 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"

-"POT-Creation-Date: 2012-12-15 16:18+0000\n"
+"POT-Creation-Date: 2016-01-31 16:19+0000\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"


@@ -27,26 +27,30 @@ msgstr ""
 msgid "Output function not implemented"
 msgstr ""
 
 msgid "Output function not implemented"
 msgstr ""
 

-#: book_latex.py:170
+#: book_latex.py:174

 msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
 msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 

-#: book_latex.py:188
+#: book_latex.py:190

 #, python-format
 msgid "Running `%s' on file `%s' to detect default page settings.\n"
 msgstr ""
 
 #, python-format
 msgid "Running `%s' on file `%s' to detect default page settings.\n"
 msgstr ""
 

-#: book_latex.py:209 book_texinfo.py:228
+#: book_latex.py:219 book_texinfo.py:230

 msgid "Unable to auto-detect default settings:\n"
 msgstr ""
 
 msgid "Unable to auto-detect default settings:\n"
 msgstr ""
 

-#: book_latex.py:221 book_texinfo.py:240
+#: book_latex.py:231 book_texinfo.py:242

 #, python-format
 msgid ""
 "Unable to auto-detect default settings:\n"
 "%s"
 msgstr ""
 
 #, python-format
 msgid ""
 "Unable to auto-detect default settings:\n"
 "%s"
 msgstr ""
 

+#: book_latex.py:254
+msgid "cannot detect textwidth from LaTeX"
+msgstr ""
+

 #: book_snippets.py:406
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 #: book_snippets.py:406
 #, python-format
 msgid "deprecated ly-option used: %s=%s"


@@ -77,38 +81,38 @@ msgstr ""
 msgid "Missing files: %s"
 msgstr ""
 
 msgid "Missing files: %s"
 msgstr ""
 

-#: book_snippets.py:651
+#: book_snippets.py:661

 #, python-format
 msgid "Could not overwrite file %s"
 msgstr ""
 
 #, python-format
 msgid "Could not overwrite file %s"
 msgstr ""
 

-#: book_snippets.py:738
+#: book_snippets.py:748

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

-#: book_snippets.py:759
+#: book_snippets.py:769

 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 

-#: book_snippets.py:760
+#: book_snippets.py:770

 msgid "The error log is as follows:"
 msgstr ""
 
 msgid "The error log is as follows:"
 msgstr ""
 

-#: book_snippets.py:880
+#: book_snippets.py:890

 #, python-format
 msgid "Converting MusicXML file `%s'...\n"
 msgstr ""
 
 #, python-format
 msgid "Converting MusicXML file `%s'...\n"
 msgstr ""
 

-#: book_snippets.py:907
+#: book_snippets.py:917

 #, python-format
 msgid ""
 "%s: duplicate filename but different contents of original file,\n"
 "printing diff against existing file."
 msgstr ""
 
 #, python-format
 msgid ""
 "%s: duplicate filename but different contents of original file,\n"
 "printing diff against existing file."
 msgstr ""
 

-#: book_snippets.py:920
+#: book_snippets.py:930

 #, python-format
 msgid ""
 "%s: duplicate filename but different contents of converted lilypond file,\n"
 #, python-format
 msgid ""
 "%s: duplicate filename but different contents of converted lilypond file,\n"


@@ -118,167 +122,167 @@ msgstr ""
 #. Work around a texi2pdf bug: if LANG=C is not given, a broken regexp is
 #. used to detect relative/absolute paths, so the absolute path is not
 #. detected as such and this command fails:
 #. Work around a texi2pdf bug: if LANG=C is not given, a broken regexp is
 #. used to detect relative/absolute paths, so the absolute path is not
 #. detected as such and this command fails:

-#: book_texinfo.py:206
+#: book_texinfo.py:208

 #, python-format
 msgid "Running texi2pdf on file %s to detect default page settings.\n"
 msgstr ""
 
 #, python-format
 msgid "Running texi2pdf on file %s to detect default page settings.\n"
 msgstr ""
 

-#: convertrules.py:12
+#: convertrules.py:13

 #, python-format
 msgid "Not smart enough to convert %s."
 msgstr ""
 
 #, python-format
 msgid "Not smart enough to convert %s."
 msgstr ""
 

-#: convertrules.py:13
+#: convertrules.py:14

 msgid "Please refer to the manual for details, and update manually."
 msgstr ""
 
 msgid "Please refer to the manual for details, and update manually."
 msgstr ""
 

-#: convertrules.py:14
+#: convertrules.py:15

 #, python-format
 msgid "%s has been replaced by %s"
 msgstr ""
 
 #, python-format
 msgid "%s has been replaced by %s"
 msgstr ""
 

-#: convertrules.py:24 lilylib.py:136 warn.cc:223
+#: convertrules.py:25 lilylib.py:136 warn.cc:223

 #, c-format, python-format
 msgid "warning: %s"
 msgstr ""
 
 #, c-format, python-format
 msgid "warning: %s"
 msgstr ""
 

-#: convertrules.py:49 convertrules.py:94
+#: convertrules.py:50 convertrules.py:95

 msgid "\\header { key = concat + with + operator }"
 msgstr ""
 
 msgid "\\header { key = concat + with + operator }"
 msgstr ""
 

-#: convertrules.py:56
+#: convertrules.py:57

 #, python-format
 msgid "deprecated %s"
 msgstr ""
 
 #, python-format
 msgid "deprecated %s"
 msgstr ""
 

-#: convertrules.py:65
+#: convertrules.py:66

 msgid "deprecated \\textstyle, new \\key syntax"
 msgstr ""
 
 msgid "deprecated \\textstyle, new \\key syntax"
 msgstr ""
 

-#: convertrules.py:81 convertrules.py:1855 convertrules.py:2031
-#: convertrules.py:2174 convertrules.py:2505 convertrules.py:2800
-#: convertrules.py:3150 convertrules.py:3384
+#: convertrules.py:82 convertrules.py:1856 convertrules.py:2032
+#: convertrules.py:2175 convertrules.py:2506 convertrules.py:2801
+#: convertrules.py:3151 convertrules.py:3388 convertrules.py:3700

 msgid "bump version for release"
 msgstr ""
 
 msgid "bump version for release"
 msgstr ""
 

-#: convertrules.py:97
+#: convertrules.py:98

 msgid "new \\header format"
 msgstr ""
 
 msgid "new \\header format"
 msgstr ""
 

-#: convertrules.py:124
+#: convertrules.py:125

 msgid "\\translator syntax"
 msgstr ""
 
 msgid "\\translator syntax"
 msgstr ""
 

-#: convertrules.py:175
+#: convertrules.py:176

 msgid "\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative"
 msgstr ""
 
 msgid "\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative"
 msgstr ""
 

-#: convertrules.py:205 convertrules.py:678 convertrules.py:1350
-#: convertrules.py:2317
+#: convertrules.py:206 convertrules.py:679 convertrules.py:1351
+#: convertrules.py:2318

 #, python-format
 msgid "deprecate %s"
 msgstr ""
 
 #, python-format
 msgid "deprecate %s"
 msgstr ""
 

-#: convertrules.py:279
+#: convertrules.py:280

 #, python-format
 msgid "deprecate %s "
 msgstr ""
 
 #, python-format
 msgid "deprecate %s "
 msgstr ""
 

-#: convertrules.py:305
+#: convertrules.py:306

 msgid "new \\notenames format"
 msgstr ""
 
 msgid "new \\notenames format"
 msgstr ""
 

-#: convertrules.py:321
+#: convertrules.py:322

 msgid "new tremolo format"
 msgstr ""
 
 msgid "new tremolo format"
 msgstr ""
 

-#: convertrules.py:325
+#: convertrules.py:326

 msgid "Staff_margin_engraver deprecated, use Instrument_name_engraver"
 msgstr ""
 
 msgid "Staff_margin_engraver deprecated, use Instrument_name_engraver"
 msgstr ""
 

-#: convertrules.py:376
+#: convertrules.py:377

 msgid "change property definition case (eg. onevoice -> oneVoice)"
 msgstr ""
 
 msgid "change property definition case (eg. onevoice -> oneVoice)"
 msgstr ""
 

-#: convertrules.py:437
+#: convertrules.py:438

 msgid "new \\textscript markup text"
 msgstr ""
 
 msgid "new \\textscript markup text"
 msgstr ""
 

-#: convertrules.py:509
+#: convertrules.py:510

 #, python-format
 msgid "identifier names: %s"
 msgstr ""
 
 #, python-format
 msgid "identifier names: %s"
 msgstr ""
 

-#: convertrules.py:548
+#: convertrules.py:549

 msgid "point-and-click argument changed to procedure."
 msgstr ""
 
 msgid "point-and-click argument changed to procedure."
 msgstr ""
 

-#: convertrules.py:590
+#: convertrules.py:591

 msgid "semicolons removed"
 msgstr ""
 
 #. 40 ?
 msgid "semicolons removed"
 msgstr ""
 
 #. 40 ?

-#: convertrules.py:633
+#: convertrules.py:634

 #, python-format
 msgid "%s property names"
 msgstr ""
 
 #, python-format
 msgid "%s property names"
 msgstr ""
 

-#: convertrules.py:703
+#: convertrules.py:704

 msgid "automaticMelismata turned on by default"
 msgstr ""
 
 msgid "automaticMelismata turned on by default"
 msgstr ""
 

-#: convertrules.py:708
+#: convertrules.py:709

 msgid "automaticMelismata is turned on by default since 1.5.67."
 msgstr ""
 
 msgid "automaticMelismata is turned on by default since 1.5.67."
 msgstr ""
 

-#: convertrules.py:942 convertrules.py:1635 convertrules.py:1889
-#: convertrules.py:2134
+#: convertrules.py:943 convertrules.py:1636 convertrules.py:1890
+#: convertrules.py:2135

 #, python-format
 msgid "remove %s"
 msgstr ""
 
 #, python-format
 msgid "remove %s"
 msgstr ""
 

-#: convertrules.py:977 convertrules.py:980
+#: convertrules.py:978 convertrules.py:981

 msgid "cluster syntax"
 msgstr ""
 
 msgid "cluster syntax"
 msgstr ""
 

-#: convertrules.py:987
+#: convertrules.py:988

 msgid "new Pedal style syntax"
 msgstr ""
 
 msgid "new Pedal style syntax"
 msgstr ""
 

-#: convertrules.py:1246
+#: convertrules.py:1247

 msgid ""
 "New relative mode,\n"
 "Postfix articulations, new text markup syntax, new chord syntax."
 msgstr ""
 
 msgid ""
 "New relative mode,\n"
 "Postfix articulations, new text markup syntax, new chord syntax."
 msgstr ""
 

-#: convertrules.py:1259
+#: convertrules.py:1260

 msgid "Remove - before articulation"
 msgstr ""
 
 msgid "Remove - before articulation"
 msgstr ""
 

-#: convertrules.py:1294
+#: convertrules.py:1295

 #, python-format
 msgid "%s misspelling"
 msgstr ""
 
 #, python-format
 msgid "%s misspelling"
 msgstr ""
 

-#: convertrules.py:1313
+#: convertrules.py:1314

 msgid "Swap < > and << >>"
 msgstr ""
 
 msgid "Swap < > and << >>"
 msgstr ""
 

-#: convertrules.py:1316
+#: convertrules.py:1317

 msgid "attempting automatic \\figures conversion.  Check results!"
 msgstr ""
 
 msgid "attempting automatic \\figures conversion.  Check results!"
 msgstr ""
 

-#: convertrules.py:1362
+#: convertrules.py:1363

 msgid "Use Scheme code to construct arbitrary note events."
 msgstr ""
 
 msgid "Use Scheme code to construct arbitrary note events."
 msgstr ""
 

-#: convertrules.py:1369
+#: convertrules.py:1370

 msgid ""
 "use symbolic constants for alterations,\n"
 "remove \\outputproperty, move ly:verbose into ly:get-option"
 msgstr ""
 
 msgid ""
 "use symbolic constants for alterations,\n"
 "remove \\outputproperty, move ly:verbose into ly:get-option"
 msgstr ""
 

-#: convertrules.py:1394
+#: convertrules.py:1395

 #, python-format
 msgid ""
 "\\outputproperty found,\n"
 #, python-format
 msgid ""
 "\\outputproperty found,\n"


@@ -290,7 +294,7 @@ msgid ""
 "as a substitution text."
 msgstr ""
 
 "as a substitution text."
 msgstr ""
 

-#: convertrules.py:1406
+#: convertrules.py:1407

 msgid ""
 "The alteration field of Scheme pitches was multiplied by 2\n"
 "to support quarter tone accidentals.  You must update the following "
 msgid ""
 "The alteration field of Scheme pitches was multiplied by 2\n"
 "to support quarter tone accidentals.  You must update the following "


@@ -300,70 +304,70 @@ msgid ""
 "* keySignature settings made with \\property\n"
 msgstr ""
 
 "* keySignature settings made with \\property\n"
 msgstr ""
 

-#: convertrules.py:1449
+#: convertrules.py:1450

 msgid "removal of automaticMelismata; use melismaBusyProperties instead."
 msgstr ""
 
 msgid "removal of automaticMelismata; use melismaBusyProperties instead."
 msgstr ""
 

-#: convertrules.py:1556
+#: convertrules.py:1557

 msgid "\\partcombine syntax change to \\newpartcombine"
 msgstr ""
 
 msgid "\\partcombine syntax change to \\newpartcombine"
 msgstr ""
 

-#: convertrules.py:1581
+#: convertrules.py:1582

 msgid ""
 "Drum notation changes, Removing \\chordmodifiers, \\notenames.\n"
 "Harmonic notes. Thread context removed. Lyrics context removed."
 msgstr ""
 
 msgid ""
 "Drum notation changes, Removing \\chordmodifiers, \\notenames.\n"
 "Harmonic notes. Thread context removed. Lyrics context removed."
 msgstr ""
 

-#: convertrules.py:1585
+#: convertrules.py:1586

 msgid "Drums found. Enclose drum notes in \\drummode"
 msgstr ""
 
 msgid "Drums found. Enclose drum notes in \\drummode"
 msgstr ""
 

-#: convertrules.py:1596 convertrules.py:1603 convertrules.py:1614
+#: convertrules.py:1597 convertrules.py:1604 convertrules.py:1615

 #, python-format
 msgid ""
 "\n"
 "%s found. Check file manually!\n"
 msgstr ""
 
 #, python-format
 msgid ""
 "\n"
 "%s found. Check file manually!\n"
 msgstr ""
 

-#: convertrules.py:1596
+#: convertrules.py:1597

 msgid "Drum notation"
 msgstr ""
 
 msgid "Drum notation"
 msgstr ""
 

-#: convertrules.py:1655
+#: convertrules.py:1656

 msgid "new syntax for property settings:"
 msgstr ""
 
 msgid "new syntax for property settings:"
 msgstr ""
 

-#: convertrules.py:1681
+#: convertrules.py:1682

 msgid "Property setting syntax in \\translator{ }"
 msgstr ""
 
 msgid "Property setting syntax in \\translator{ }"
 msgstr ""
 

-#: convertrules.py:1720
+#: convertrules.py:1721

 msgid "Scheme grob function renaming"
 msgstr ""
 
 msgid "Scheme grob function renaming"
 msgstr ""
 

-#: convertrules.py:1731 convertrules.py:2138 convertrules.py:2142
-#: convertrules.py:2708
+#: convertrules.py:1732 convertrules.py:2139 convertrules.py:2143
+#: convertrules.py:2709

 #, python-format
 msgid "Use %s\n"
 msgstr ""
 
 #, python-format
 msgid "Use %s\n"
 msgstr ""
 

-#: convertrules.py:1747
+#: convertrules.py:1748

 msgid "More Scheme function renaming"
 msgstr ""
 
 msgid "More Scheme function renaming"
 msgstr ""
 

-#: convertrules.py:1871
+#: convertrules.py:1872

 msgid ""
 "Page layout has been changed, using paper size and margins.\n"
 "textheight is no longer used.\n"
 msgstr ""
 
 msgid ""
 "Page layout has been changed, using paper size and margins.\n"
 "textheight is no longer used.\n"
 msgstr ""
 

-#: convertrules.py:1957
+#: convertrules.py:1958

 msgid ""
 "\\foo -> \\foomode (for chords, notes, etc.)\n"
 "fold \\new FooContext \\foomode into \\foo."
 msgstr ""
 
 msgid ""
 "\\foo -> \\foomode (for chords, notes, etc.)\n"
 "fold \\new FooContext \\foomode into \\foo."
 msgstr ""
 

-#: convertrules.py:1995
+#: convertrules.py:1996

 msgid ""
 "staff size should be changed at top-level\n"
 "with\n"
 msgid ""
 "staff size should be changed at top-level\n"
 "with\n"


@@ -372,79 +376,79 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: convertrules.py:2015
+#: convertrules.py:2016

 msgid "regularize other identifiers"
 msgstr ""
 
 msgid "regularize other identifiers"
 msgstr ""
 

-#: convertrules.py:2083
+#: convertrules.py:2084

 msgid "\\encoding: smart recode latin1..utf-8. Remove ly:point-and-click"
 msgstr ""
 
 msgid "\\encoding: smart recode latin1..utf-8. Remove ly:point-and-click"
 msgstr ""
 

-#: convertrules.py:2094
+#: convertrules.py:2095

 msgid "LilyPond source must be UTF-8"
 msgstr ""
 
 msgid "LilyPond source must be UTF-8"
 msgstr ""
 

-#: convertrules.py:2097
+#: convertrules.py:2098

 msgid "Try the texstrings backend"
 msgstr ""
 
 msgid "Try the texstrings backend"
 msgstr ""
 

-#: convertrules.py:2100
+#: convertrules.py:2101

 #, python-format
 msgid "Do something like: %s"
 msgstr ""
 
 #, python-format
 msgid "Do something like: %s"
 msgstr ""
 

-#: convertrules.py:2103
+#: convertrules.py:2104

 msgid "Or save as UTF-8 in your editor"
 msgstr ""
 
 msgid "Or save as UTF-8 in your editor"
 msgstr ""
 

-#: convertrules.py:2153
+#: convertrules.py:2154

 msgid "warn about auto beam settings"
 msgstr ""
 
 msgid "warn about auto beam settings"
 msgstr ""
 

-#: convertrules.py:2157
+#: convertrules.py:2158

 msgid "auto beam settings"
 msgstr ""
 
 msgid "auto beam settings"
 msgstr ""
 

-#: convertrules.py:2158
+#: convertrules.py:2159

 msgid ""
 "\n"
 "Auto beam settings must now specify each interesting moment in a measure\n"
 "explicitly; 1/4 is no longer multiplied to cover moments 1/2 and 3/4 too.\n"
 msgstr ""
 
 msgid ""
 "\n"
 "Auto beam settings must now specify each interesting moment in a measure\n"
 "explicitly; 1/4 is no longer multiplied to cover moments 1/2 and 3/4 too.\n"
 msgstr ""
 

-#: convertrules.py:2271
+#: convertrules.py:2272

 msgid "verticalAlignmentChildCallback has been deprecated"
 msgstr ""
 
 msgid "verticalAlignmentChildCallback has been deprecated"
 msgstr ""
 

-#: convertrules.py:2276
+#: convertrules.py:2277

 msgid "Remove callbacks property, deprecate XY-extent-callback."
 msgstr ""
 
 msgid "Remove callbacks property, deprecate XY-extent-callback."
 msgstr ""
 

-#: convertrules.py:2297
+#: convertrules.py:2298

 msgid "Use grob closures iso. XY-offset-callbacks."
 msgstr ""
 
 msgid "Use grob closures iso. XY-offset-callbacks."
 msgstr ""
 

-#: convertrules.py:2359
+#: convertrules.py:2360

 msgid "foobar -> foo-bar for \\paper, \\layout"
 msgstr ""
 
 msgid "foobar -> foo-bar for \\paper, \\layout"
 msgstr ""
 

-#: convertrules.py:2469
+#: convertrules.py:2470

 msgid "deprecate \\tempo in \\midi"
 msgstr ""
 
 msgid "deprecate \\tempo in \\midi"
 msgstr ""
 

-#: convertrules.py:2522
+#: convertrules.py:2523

 msgid "deprecate cautionary-style. Use AccidentalCautionary properties"
 msgstr ""
 
 msgid "deprecate cautionary-style. Use AccidentalCautionary properties"
 msgstr ""
 

-#: convertrules.py:2535
+#: convertrules.py:2536

 msgid "Rename accidental glyphs, use glyph-name-alist."
 msgstr ""
 
 msgid "Rename accidental glyphs, use glyph-name-alist."
 msgstr ""
 

-#: convertrules.py:2590
+#: convertrules.py:2591

 msgid "edge-text settings for TextSpanner"
 msgstr ""
 
 msgid "edge-text settings for TextSpanner"
 msgstr ""
 

-#: convertrules.py:2591
+#: convertrules.py:2592

 #, python-format
 msgid ""
 "Use\n"
 #, python-format
 msgid ""
 "Use\n"


@@ -452,124 +456,124 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: convertrules.py:2624
+#: convertrules.py:2625

 msgid "Use the `alignment-offsets' sub-property of\n"
 msgstr ""
 
 msgid "Use the `alignment-offsets' sub-property of\n"
 msgstr ""
 

-#: convertrules.py:2625
+#: convertrules.py:2626

 msgid "NonMusicalPaperColumn #'line-break-system-details\n"
 msgstr ""
 
 msgid "NonMusicalPaperColumn #'line-break-system-details\n"
 msgstr ""
 

-#: convertrules.py:2626
+#: convertrules.py:2627

 msgid "to set fixed distances between staves.\n"
 msgstr ""
 
 msgid "to set fixed distances between staves.\n"
 msgstr ""
 

-#: convertrules.py:2638
+#: convertrules.py:2639

 msgid "Use #'style not #'dash-fraction to select solid/dashed lines."
 msgstr ""
 
 msgid "Use #'style not #'dash-fraction to select solid/dashed lines."
 msgstr ""
 

-#: convertrules.py:2644
+#: convertrules.py:2645

 msgid "all settings related to dashed lines"
 msgstr ""
 
 msgid "all settings related to dashed lines"
 msgstr ""
 

-#: convertrules.py:2645
+#: convertrules.py:2646

 msgid "Use \\override ... #'style = #'line for solid lines and\n"
 msgstr ""
 
 msgid "Use \\override ... #'style = #'line for solid lines and\n"
 msgstr ""
 

-#: convertrules.py:2646
+#: convertrules.py:2647

 msgid "\t\\override ... #'style = #'dashed-line for dashed lines."
 msgstr ""
 
 msgid "\t\\override ... #'style = #'dashed-line for dashed lines."
 msgstr ""
 

-#: convertrules.py:2682
+#: convertrules.py:2683

 msgid ""
 "metronomeMarkFormatter uses text markup as second argument,\n"
 "fret diagram properties moved to fret-diagram-details."
 msgstr ""
 
 msgid ""
 "metronomeMarkFormatter uses text markup as second argument,\n"
 "fret diagram properties moved to fret-diagram-details."
 msgstr ""
 

-#: convertrules.py:2688
+#: convertrules.py:2689

 msgid "metronomeMarkFormatter got an additional text argument.\n"
 msgstr ""
 
 msgid "metronomeMarkFormatter got an additional text argument.\n"
 msgstr ""
 

-#: convertrules.py:2689
+#: convertrules.py:2690

 #, python-format
 msgid ""
 "The function assigned to Score.metronomeMarkFunction now uses the signature\n"
 "%s"
 msgstr ""
 
 #, python-format
 msgid ""
 "The function assigned to Score.metronomeMarkFunction now uses the signature\n"
 "%s"
 msgstr ""
 

-#: convertrules.py:2707
+#: convertrules.py:2708

 #, python-format
 msgid "%s in fret-diagram properties"
 msgstr ""
 
 #, python-format
 msgid "%s in fret-diagram properties"
 msgstr ""
 

-#: convertrules.py:2751
+#: convertrules.py:2752

 msgid "\\put-adjacent argument order"
 msgstr ""
 
 msgid "\\put-adjacent argument order"
 msgstr ""
 

-#: convertrules.py:2752
+#: convertrules.py:2753

 msgid "Axis and direction now come before markups:\n"
 msgstr ""
 
 msgid "Axis and direction now come before markups:\n"
 msgstr ""
 

-#: convertrules.py:2753
+#: convertrules.py:2754

 msgid "\\put-adjacent axis dir markup markup."
 msgstr ""
 
 msgid "\\put-adjacent axis dir markup markup."
 msgstr ""
 

-#: convertrules.py:2784
+#: convertrules.py:2785

 msgid "re-definition of InnerStaffGroup"
 msgstr ""
 
 msgid "re-definition of InnerStaffGroup"
 msgstr ""
 

-#: convertrules.py:2789
+#: convertrules.py:2790

 msgid "re-definition of InnerChoirStaff"
 msgstr ""
 
 msgid "re-definition of InnerChoirStaff"
 msgstr ""
 

-#: convertrules.py:2799
+#: convertrules.py:2800

 msgid "Syntax changes for \\addChordShape and \\chord-shape"
 msgstr ""
 
 msgid "Syntax changes for \\addChordShape and \\chord-shape"
 msgstr ""
 

-#: convertrules.py:2804
+#: convertrules.py:2805

 msgid "stringTuning must be added to addChordShape call.\n"
 msgstr ""
 
 msgid "stringTuning must be added to addChordShape call.\n"
 msgstr ""
 

-#: convertrules.py:2809
+#: convertrules.py:2810

 msgid "stringTuning must be added to chord-shape call.\n"
 msgstr ""
 
 msgid "stringTuning must be added to chord-shape call.\n"
 msgstr ""
 

-#: convertrules.py:2815
+#: convertrules.py:2816

 msgid "Remove oldaddlyrics"
 msgstr ""
 
 msgid "Remove oldaddlyrics"
 msgstr ""
 

-#: convertrules.py:2819
+#: convertrules.py:2820

 msgid ""
 "oldaddlyrics is no longer supported. \n"
 msgid ""
 "oldaddlyrics is no longer supported. \n"

-"         Use addlyrics or lyrsicsto instead.\n"
+"         Use addlyrics or lyricsto instead.\n"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:2825
+#: convertrules.py:2826

 msgid ""
 "keySignature property not reversed any more\n"
 "MIDI 47: orchestral strings -> orchestral harp"
 msgstr ""
 
 msgid ""
 "keySignature property not reversed any more\n"
 "MIDI 47: orchestral strings -> orchestral harp"
 msgstr ""
 

-#: convertrules.py:2830
+#: convertrules.py:2831

 msgid "The alist for Staff.keySignature is no longer in reversed order.\n"
 msgstr ""
 
 msgid "The alist for Staff.keySignature is no longer in reversed order.\n"
 msgstr ""
 

-#: convertrules.py:2836
+#: convertrules.py:2837

 msgid ""
 "\\bar \".\" now produces a thick barline\n"
 "ly:hairpin::after-line-breaking -> ly:spanner::kill-zero-spanned-time\n"
 "Dash parameters for slurs and ties are now in dash-definition"
 msgstr ""
 
 msgid ""
 "\\bar \".\" now produces a thick barline\n"
 "ly:hairpin::after-line-breaking -> ly:spanner::kill-zero-spanned-time\n"
 "Dash parameters for slurs and ties are now in dash-definition"
 msgstr ""
 

-#: convertrules.py:2842
+#: convertrules.py:2843

 msgid "\\bar \".\" now produces a thick barline.\n"
 msgstr ""
 
 msgid "\\bar \".\" now produces a thick barline.\n"
 msgstr ""
 

-#: convertrules.py:2848
-msgid "Dash parameters for slurs and ties are now in 'dash-details.\n"
+#: convertrules.py:2849
+msgid "Dash parameters for slurs and ties are now in 'dash-definition.\n"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:2853
+#: convertrules.py:2854

 msgid ""
 "Autobeaming rules have changed.  override-auto-beam-setting and\n"
 "revert-auto-beam-setting have been eliminated.\n"
 msgid ""
 "Autobeaming rules have changed.  override-auto-beam-setting and\n"
 "revert-auto-beam-setting have been eliminated.\n"


@@ -584,27 +588,27 @@ msgid ""
 "template replaced by new `Dynamics' context."
 msgstr ""
 
 "template replaced by new `Dynamics' context."
 msgstr ""
 

-#: convertrules.py:2867
+#: convertrules.py:2868

 msgid "    Autobeam settings are now overriden with \\overrideBeamSettings.\n"
 msgstr ""
 
 msgid "    Autobeam settings are now overriden with \\overrideBeamSettings.\n"
 msgstr ""
 

-#: convertrules.py:2872
+#: convertrules.py:2873

 msgid "    Autobeam settings are now reverted with \\revertBeamSettings.\n"
 msgstr ""
 
 msgid "    Autobeam settings are now reverted with \\revertBeamSettings.\n"
 msgstr ""
 

-#: convertrules.py:2878
+#: convertrules.py:2879

 msgid ""
 "    beatGrouping with a specified context must now be accomplished with\n"
 "   \\overrideBeamSettings.\n"
 msgstr ""
 
 msgid ""
 "    beatGrouping with a specified context must now be accomplished with\n"
 "   \\overrideBeamSettings.\n"
 msgstr ""
 

-#: convertrules.py:2884
+#: convertrules.py:2885

 msgid ""
 "alignment-offsets has been changed to alignment-distances: you must now "
 "specify the distances between staves rather than the offset of staves.\n"
 msgstr ""
 
 msgid ""
 "alignment-offsets has been changed to alignment-distances: you must now "
 "specify the distances between staves rather than the offset of staves.\n"
 msgstr ""
 

-#: convertrules.py:2895
+#: convertrules.py:2896

 msgid ""
 "Remove obsolete engravers/translators: Note_swallow_translator,\n"
 "Rest_swallow_translator, Skip_event_swallow_translator, Swallow_engraver,\n"
 msgid ""
 "Remove obsolete engravers/translators: Note_swallow_translator,\n"
 "Rest_swallow_translator, Skip_event_swallow_translator, Swallow_engraver,\n"


@@ -612,47 +616,47 @@ msgid ""
 "New vertical spacing variables."
 msgstr ""
 
 "New vertical spacing variables."
 msgstr ""
 

-#: convertrules.py:2926
+#: convertrules.py:2927

 msgid ""
 "Vertical spacing no longer depends on the Y-extent of a VerticalAxisGroup.\n"
 msgstr ""
 
 msgid ""
 "Vertical spacing no longer depends on the Y-extent of a VerticalAxisGroup.\n"
 msgstr ""
 

-#: convertrules.py:2932
+#: convertrules.py:2933

 msgid "Unify fetaNumber and fetaDynamic encodings"
 msgstr ""
 
 msgid "Unify fetaNumber and fetaDynamic encodings"
 msgstr ""
 

-#: convertrules.py:2937
+#: convertrules.py:2938

 msgid "\\RemoveEmpty*StaffContext -> \\*Staff \\RemoveEmptyStaves"
 msgstr ""
 
 msgid "\\RemoveEmpty*StaffContext -> \\*Staff \\RemoveEmptyStaves"
 msgstr ""
 

-#: convertrules.py:2948
+#: convertrules.py:2949

 msgid "\\cresc etc. are now postfix operators"
 msgstr ""
 
 msgid "\\cresc etc. are now postfix operators"
 msgstr ""
 

-#: convertrules.py:2960
+#: convertrules.py:2961

 msgid ""
 "Eliminate beamSettings, beatLength, \\setBeatGrouping, "
 "\\overrideBeamSettings and \\revertBeamSettings.\n"
 "\"accordion.accEtcbase\" -> \"accordion.etcbass\""
 msgstr ""
 
 msgid ""
 "Eliminate beamSettings, beatLength, \\setBeatGrouping, "
 "\\overrideBeamSettings and \\revertBeamSettings.\n"
 "\"accordion.accEtcbase\" -> \"accordion.etcbass\""
 msgstr ""
 

-#: convertrules.py:2978
+#: convertrules.py:2979

 msgid "Use \\set beamExceptions or \\overrideTimeSignatureSettings.\n"
 msgstr ""
 
 msgid "Use \\set beamExceptions or \\overrideTimeSignatureSettings.\n"
 msgstr ""
 

-#: convertrules.py:2982
+#: convertrules.py:2983

 msgid "Use \\set beamExceptions or \\revertTimeSignatureSettings.\n"
 msgstr ""
 
 msgid "Use \\set beamExceptions or \\revertTimeSignatureSettings.\n"
 msgstr ""
 

-#: convertrules.py:2986
+#: convertrules.py:2987

 msgid "Use baseMoment, beatStructure, and beamExceptions.\n"
 msgstr ""
 
 msgid "Use baseMoment, beatStructure, and beamExceptions.\n"
 msgstr ""
 

-#: convertrules.py:2990 convertrules.py:2994
+#: convertrules.py:2991 convertrules.py:2995

 msgid "Use baseMoment and beatStructure.\n"
 msgstr ""
 
 msgid "Use baseMoment and beatStructure.\n"
 msgstr ""
 

-#: convertrules.py:2999
+#: convertrules.py:3000

 msgid ""
 "Woodwind diagrams: Move size, thickness, and graphic from argument list to "
 "properties.\n"
 msgid ""
 "Woodwind diagrams: Move size, thickness, and graphic from argument list to "
 "properties.\n"


@@ -660,117 +664,127 @@ msgid ""
 "instead."
 msgstr ""
 
 "instead."
 msgstr ""
 

-#: convertrules.py:3004
+#: convertrules.py:3005

 msgid ""
 "Move size, thickness, and graphic to properties.  Argument should be just "
 "the key list.\n"
 msgstr ""
 
 msgid ""
 "Move size, thickness, and graphic to properties.  Argument should be just "
 "the key list.\n"
 msgstr ""
 

-#: convertrules.py:3012
+#: convertrules.py:3013

 msgid ""
 "Rename vertical spacing variables.\n"
 "Add fretboard-table argument to savePredefinedFretboard."
 msgstr ""
 
 msgid ""
 "Rename vertical spacing variables.\n"
 "Add fretboard-table argument to savePredefinedFretboard."
 msgstr ""
 

-#: convertrules.py:3030
+#: convertrules.py:3031

 msgid "Rename vertical spacing grob properties."
 msgstr ""
 
 msgid "Rename vertical spacing grob properties."
 msgstr ""
 

-#: convertrules.py:3046
+#: convertrules.py:3047

 msgid "Remove \\paper variables head-separation and foot-separation."
 msgstr ""
 
 msgid "Remove \\paper variables head-separation and foot-separation."
 msgstr ""
 

-#: convertrules.py:3050
+#: convertrules.py:3051

 msgid "Adjust settings for top-system-spacing instead.\n"
 msgstr ""
 
 msgid "Adjust settings for top-system-spacing instead.\n"
 msgstr ""
 

-#: convertrules.py:3054
+#: convertrules.py:3055

 msgid "Adjust settings for last-bottom-spacing instead.\n"
 msgstr ""
 
 msgid "Adjust settings for last-bottom-spacing instead.\n"
 msgstr ""
 

-#: convertrules.py:3060
+#: convertrules.py:3061

 msgid ""
 "Rename space to basic-distance in various spacing alists.\n"
 "Remove HarmonicParenthesesItem grob."
 msgstr ""
 
 msgid ""
 "Rename space to basic-distance in various spacing alists.\n"
 "Remove HarmonicParenthesesItem grob."
 msgstr ""
 

-#: convertrules.py:3067
+#: convertrules.py:3068

 msgid "HarmonicParenthesesItem has been eliminated.\n"
 msgstr ""
 
 msgid "HarmonicParenthesesItem has been eliminated.\n"
 msgstr ""
 

-#: convertrules.py:3068
+#: convertrules.py:3069

 msgid "Harmonic parentheses are part of the TabNoteHead grob.\n"
 msgstr ""
 
 msgid "Harmonic parentheses are part of the TabNoteHead grob.\n"
 msgstr ""
 

-#: convertrules.py:3073
+#: convertrules.py:3074

 msgid ""
 "Remove context from overrideTimeSignatureSettings and "
 "revertTimeSignatureSettings.\n"
 msgstr ""
 
 msgid ""
 "Remove context from overrideTimeSignatureSettings and "
 "revertTimeSignatureSettings.\n"
 msgstr ""
 

-#: convertrules.py:3080
+#: convertrules.py:3081

 msgid ""
 "Change stringTunings from a list of semitones to a list of pitches.\n"
 "Change tenor and baritone ukulele names in string tunings.\n"
 "Generate messages for manual conversion of vertical spacing if required."
 msgstr ""
 
 msgid ""
 "Change stringTunings from a list of semitones to a list of pitches.\n"
 "Change tenor and baritone ukulele names in string tunings.\n"
 "Generate messages for manual conversion of vertical spacing if required."
 msgstr ""
 

-#: convertrules.py:3123
+#: convertrules.py:3124

 msgid "Vertical spacing changes might affect user-defined contexts."
 msgstr ""
 
 msgid "Vertical spacing changes might affect user-defined contexts."
 msgstr ""
 

-#: convertrules.py:3129
+#: convertrules.py:3130

 msgid "Replace bar-size with bar-extent."
 msgstr ""
 
 msgid "Replace bar-size with bar-extent."
 msgstr ""
 

-#: convertrules.py:3141
+#: convertrules.py:3142

 msgid "Woodwind diagrams: Changes to the clarinet diagram."
 msgstr ""
 
 msgid "Woodwind diagrams: Changes to the clarinet diagram."
 msgstr ""
 

-#: convertrules.py:3145
+#: convertrules.py:3146

 msgid "Clarinet fingering changed to reflect actual anatomy of instrument.\n"
 msgstr ""
 
 msgid "Clarinet fingering changed to reflect actual anatomy of instrument.\n"
 msgstr ""
 

-#: convertrules.py:3155
+#: convertrules.py:3156

 msgid "Handling of non-automatic footnotes."
 msgstr ""
 
 msgid "Handling of non-automatic footnotes."
 msgstr ""
 

-#: convertrules.py:3159
+#: convertrules.py:3160

 msgid ""
 "If you are using non-automatic footnotes, make sure to set footnote-auto-"
 "numbering = ##f in the paper block.\n"
 msgstr ""
 
 msgid ""
 "If you are using non-automatic footnotes, make sure to set footnote-auto-"
 "numbering = ##f in the paper block.\n"
 msgstr ""
 

-#: convertrules.py:3164
+#: convertrules.py:3165

 msgid "Change in internal property for MultiMeasureRest"
 msgstr ""
 
 msgid "Change in internal property for MultiMeasureRest"
 msgstr ""
 

-#: convertrules.py:3168
+#: convertrules.py:3169

 msgid ""
 "This internal property has been replaced by round-up-to-longer-rest, round-"
 "up-exceptions and usable-duration-logs.\n"
 msgstr ""
 
 msgid ""
 "This internal property has been replaced by round-up-to-longer-rest, round-"
 "up-exceptions and usable-duration-logs.\n"
 msgstr ""
 

-#: convertrules.py:3173
+#: convertrules.py:3174

 msgid ""
 "Creation of a Flag grob and moving of certain Stem properties to this grob"
 msgstr ""
 
 msgid ""
 "Creation of a Flag grob and moving of certain Stem properties to this grob"
 msgstr ""
 

-#: convertrules.py:3209
+#: convertrules.py:3210

 msgid ""
 "consistent-broken-slope is now handled through the positions callback.\n"
 msgstr ""
 
 msgid ""
 "consistent-broken-slope is now handled through the positions callback.\n"
 msgstr ""
 

-#: convertrules.py:3210
+#: convertrules.py:3211

 msgid ""
 "input/regression/beam-broken-classic.ly shows how broken beams are now "
 "handled.\n"
 msgstr ""
 
 msgid ""
 "input/regression/beam-broken-classic.ly shows how broken beams are now "
 "handled.\n"
 msgstr ""
 

-#: convertrules.py:3368
+#: convertrules.py:3372

 msgid "beamExceptions controls whole-measure beaming."
 msgstr ""
 
 msgid "beamExceptions controls whole-measure beaming."
 msgstr ""
 

+#: convertrules.py:3609
+msgid "Flag.transparent and Flag.color inherit from Stem"
+msgstr ""
+
+#: convertrules.py:3675
+msgid ""
+"Staff-padding now controls the distance to the baseline, not the nearest "
+"point."
+msgstr ""
+

 #: fontextract.py:25
 #, python-format
 msgid "Scanning %s"
 #: fontextract.py:25
 #, python-format
 msgid "Scanning %s"


@@ -875,41 +889,41 @@ msgstr ""
 msgid "Unable to find instrument for ID=%s\n"
 msgstr ""
 
 msgid "Unable to find instrument for ID=%s\n"
 msgstr ""
 

-#: abc2ly.py:1386 convert-ly.py:84 lilypond-book.py:122 midi2ly.py:1044
+#: abc2ly.py:1389 convert-ly.py:85 lilypond-book.py:122 midi2ly.py:1044

 #, python-format
 msgid "%s [OPTION]... FILE"
 msgstr ""
 
 #, python-format
 msgid "%s [OPTION]... FILE"
 msgstr ""
 

-#: abc2ly.py:1387
+#: abc2ly.py:1390

 #, python-format
 msgid ""
 "abc2ly converts ABC music files (see\n"
 "%s) to LilyPond input.\n"
 msgstr ""
 
 #, python-format
 msgid ""
 "abc2ly converts ABC music files (see\n"
 "%s) to LilyPond input.\n"
 msgstr ""
 

-#: abc2ly.py:1395 convert-ly.py:91 etf2ly.py:1208 lilypond-book.py:231
-#: midi2ly.py:1095 musicxml2ly.py:2590 main.cc:138
+#: abc2ly.py:1398 convert-ly.py:92 etf2ly.py:1208 lilypond-book.py:231
+#: midi2ly.py:1095 musicxml2ly.py:2590 main.cc:184

 msgid "show version number and exit"
 msgstr ""
 
 msgid "show version number and exit"
 msgstr ""
 

-#: abc2ly.py:1398 convert-ly.py:95 etf2ly.py:1204 lilypond-book.py:140
-#: midi2ly.py:1062 musicxml2ly.py:2572 main.cc:117
+#: abc2ly.py:1401 convert-ly.py:96 etf2ly.py:1204 lilypond-book.py:140
+#: midi2ly.py:1062 musicxml2ly.py:2572 main.cc:163

 msgid "show this help and exit"
 msgstr ""
 
 msgid "show this help and exit"
 msgstr ""
 

-#: abc2ly.py:1401 etf2ly.py:1209 midi2ly.py:1071
+#: abc2ly.py:1404 etf2ly.py:1209 midi2ly.py:1071

 msgid "write output to FILE"
 msgstr ""
 
 msgid "write output to FILE"
 msgstr ""
 

-#: abc2ly.py:1404
+#: abc2ly.py:1407

 msgid "be strict about success"
 msgstr ""
 
 msgid "be strict about success"
 msgstr ""
 

-#: abc2ly.py:1407
+#: abc2ly.py:1410

 msgid "preserve ABC's notion of beams"
 msgstr ""
 
 msgid "preserve ABC's notion of beams"
 msgstr ""
 

-#: abc2ly.py:1410
+#: abc2ly.py:1413

 msgid "suppress progress messages"
 msgstr ""
 
 msgid "suppress progress messages"
 msgstr ""
 


@@ -917,118 +931,122 @@ msgstr ""
 #. "Report bugs in English via %s",
 #. or if there is a LilyPond users list or forum in your language
 #. "Report bugs in English via %s or in YOUR_LANG via URI"
 #. "Report bugs in English via %s",
 #. or if there is a LilyPond users list or forum in your language
 #. "Report bugs in English via %s or in YOUR_LANG via URI"

-#: abc2ly.py:1413 convert-ly.py:149 etf2ly.py:1218 lilypond-book.py:258
-#: midi2ly.py:1107 musicxml2ly.py:2674 main.cc:249
+#: abc2ly.py:1416 convert-ly.py:157 etf2ly.py:1218 lilypond-book.py:258
+#: midi2ly.py:1107 musicxml2ly.py:2674 main.cc:318

 #, c-format, python-format
 msgid "Report bugs via %s"
 msgstr ""
 
 #, c-format, python-format
 msgid "Report bugs via %s"
 msgstr ""
 

-#: convert-ly.py:46
+#: convert-ly.py:47

 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:49
+#: convert-ly.py:50

 msgid "If FILE is `-', read from standard input."
 msgstr ""
 
 msgid "If FILE is `-', read from standard input."
 msgstr ""
 

-#: convert-ly.py:51 lilypond-book.py:82
+#: convert-ly.py:52 lilypond-book.py:82

 msgid "Examples:"
 msgstr ""
 
 msgid "Examples:"
 msgstr ""
 

-#: convert-ly.py:78 etf2ly.py:1191 lilypond-book.py:115 midi2ly.py:81
+#: convert-ly.py:79 etf2ly.py:1191 lilypond-book.py:115 midi2ly.py:81

 #, python-format
 msgid "Copyright (c) %s by"
 msgstr ""
 
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr ""
 

-#: convert-ly.py:80 etf2ly.py:1193 lilypond-book.py:117 midi2ly.py:83
+#: convert-ly.py:81 etf2ly.py:1193 lilypond-book.py:117 midi2ly.py:83

 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 

-#: convert-ly.py:81 etf2ly.py:1194 lilypond-book.py:118 midi2ly.py:84
+#: convert-ly.py:82 etf2ly.py:1194 lilypond-book.py:118 midi2ly.py:84

 msgid "It comes with NO WARRANTY."
 msgstr ""
 
 msgid "It comes with NO WARRANTY."
 msgstr ""
 

-#: convert-ly.py:99 convert-ly.py:140
+#: convert-ly.py:100 convert-ly.py:141

 msgid "VERSION"
 msgstr ""
 
 msgid "VERSION"
 msgstr ""
 

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

 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 

-#: convert-ly.py:104
+#: convert-ly.py:105

 msgid "edit in place"
 msgstr ""
 
 msgid "edit in place"
 msgstr ""
 

-#: convert-ly.py:108 lilypond-book.py:179 musicxml2ly.py:2627
+#: convert-ly.py:109 lilypond-book.py:179 musicxml2ly.py:2627

 msgid ""
 "Print log messages according to LOGLEVEL (NONE, ERROR, WARNING, PROGRESS "
 "(default), DEBUG)"
 msgstr ""
 
 msgid ""
 "Print log messages according to LOGLEVEL (NONE, ERROR, WARNING, PROGRESS "
 "(default), DEBUG)"
 msgstr ""
 

-#: convert-ly.py:110 lilypond-book.py:163 lilypond-book.py:181
-#: musicxml2ly.py:2629 main.cc:131
+#: convert-ly.py:111 lilypond-book.py:163 lilypond-book.py:181
+#: musicxml2ly.py:2629 main.cc:177

 msgid "LOGLEVEL"
 msgstr ""
 
 msgid "LOGLEVEL"
 msgstr ""
 

-#: convert-ly.py:116
+#: convert-ly.py:117

 msgid "do not add \\version command if missing"
 msgstr ""
 
 msgid "do not add \\version command if missing"
 msgstr ""
 

-#: convert-ly.py:122
+#: convert-ly.py:123

 #, python-format
 msgid "force updating \\version number to %s"
 msgstr ""
 
 #, python-format
 msgid "force updating \\version number to %s"
 msgstr ""
 

-#: convert-ly.py:128
+#: convert-ly.py:129

 msgid "only update \\version number if file is modified"
 msgstr ""
 
 msgid "only update \\version number if file is modified"
 msgstr ""
 

-#: convert-ly.py:134
+#: convert-ly.py:135

 #, python-format
 msgid "show rules [default: -f 0, -t %s]"
 msgstr ""
 
 #, python-format
 msgid "show rules [default: -f 0, -t %s]"
 msgstr ""
 

-#: convert-ly.py:139
+#: convert-ly.py:140

 #, python-format
 msgid "convert to VERSION [default: %s]"
 msgstr ""
 
 #, python-format
 msgid "convert to VERSION [default: %s]"
 msgstr ""
 

-#: convert-ly.py:144 etf2ly.py:1212 lilypond-book.py:234 midi2ly.py:1096
-#: main.cc:140
+#: convert-ly.py:147
+msgid "make a numbered backup [default: filename.ext~]"
+msgstr ""
+
+#: convert-ly.py:152 etf2ly.py:1212 lilypond-book.py:234 midi2ly.py:1096
+#: main.cc:186

 msgid "show warranty and copyright"
 msgstr ""
 
 msgid "show warranty and copyright"
 msgstr ""
 

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

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

-#: convert-ly.py:204
+#: convert-ly.py:215

 msgid "Error while converting"
 msgstr ""
 
 msgid "Error while converting"
 msgstr ""
 

-#: convert-ly.py:206
+#: convert-ly.py:217

 msgid "Stopping at last successful rule"
 msgstr ""
 
 msgid "Stopping at last successful rule"
 msgstr ""
 

-#: convert-ly.py:234
+#: convert-ly.py:256

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

-#: convert-ly.py:344
+#: convert-ly.py:366

 #, python-format
 msgid "%s: Unable to open file"
 msgstr ""
 
 #, python-format
 msgid "%s: Unable to open file"
 msgstr ""
 

-#: convert-ly.py:350
+#: convert-ly.py:372

 #, python-format
 msgid "%s: Unable to determine version.  Skipping"
 msgstr ""
 
 #, python-format
 msgid "%s: Unable to determine version.  Skipping"
 msgstr ""
 

-#: convert-ly.py:356
+#: convert-ly.py:378

 #, python-format
 msgid ""
 "%s: Invalid version string `%s' \n"
 #, python-format
 msgid ""
 "%s: Invalid version string `%s' \n"


@@ -1036,7 +1054,7 @@ msgid ""
 "`2.8.12'"
 msgstr ""
 
 "`2.8.12'"
 msgstr ""
 

-#: convert-ly.py:362
+#: convert-ly.py:384

 #, python-format
 msgid "There was %d error."
 msgid_plural "There were %d errors."
 #, python-format
 msgid "There was %d error."
 msgid_plural "There were %d errors."


@@ -1056,7 +1074,7 @@ msgid ""
 msgstr ""
 
 #: etf2ly.py:1210 midi2ly.py:1067 midi2ly.py:1072 musicxml2ly.py:2659
 msgstr ""
 
 #: etf2ly.py:1210 midi2ly.py:1067 midi2ly.py:1072 musicxml2ly.py:2659

-#: main.cc:123 main.cc:135
+#: main.cc:169 main.cc:181

 msgid "FILE"
 msgstr ""
 
 msgid "FILE"
 msgstr ""
 


@@ -1096,7 +1114,7 @@ msgid "add DIR to include path"
 msgstr ""
 
 #: lilypond-book.py:143 lilypond-book.py:150 lilypond-book.py:169
 msgstr ""
 
 #: lilypond-book.py:143 lilypond-book.py:150 lilypond-book.py:169

-#: lilypond-book.py:187 lilypond-book.py:208 lilypond-book.py:214 main.cc:122
+#: lilypond-book.py:187 lilypond-book.py:208 lilypond-book.py:214 main.cc:168

 msgid "DIR"
 msgstr ""
 
 msgid "DIR"
 msgstr ""
 


@@ -1110,7 +1128,7 @@ msgstr ""
 
 #: lilypond-book.py:157
 msgid ""
 
 #: lilypond-book.py:157
 msgid ""

-"pad left side of music to align music inspite of uneven bar numbers (in mm)"
+"pad left side of music to align music in spite of uneven bar numbers (in mm)"

 msgstr ""
 
 #: lilypond-book.py:162
 msgstr ""
 
 #: lilypond-book.py:162


@@ -1184,78 +1202,78 @@ msgstr ""
 msgid "create PDF files for use with PDFTeX"
 msgstr ""
 
 msgid "create PDF files for use with PDFTeX"
 msgstr ""
 

-#: lilypond-book.py:455
+#: lilypond-book.py:463

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

-#: lilypond-book.py:460
+#: lilypond-book.py:468

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

-#: lilypond-book.py:465
+#: lilypond-book.py:473

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

-#: lilypond-book.py:467
+#: lilypond-book.py:475

 msgid "Linking files..."
 msgstr ""
 
 msgid "Linking files..."
 msgstr ""
 

-#: lilypond-book.py:487
+#: lilypond-book.py:495

 #, python-format
 msgid "cannot determine format for: %s"
 msgstr ""
 
 #, python-format
 msgid "cannot determine format for: %s"
 msgstr ""
 

-#: lilypond-book.py:496
+#: lilypond-book.py:504

 #, python-format
 msgid "%s is up to date."
 msgstr ""
 
 #, python-format
 msgid "%s is up to date."
 msgstr ""
 

-#: lilypond-book.py:509
+#: lilypond-book.py:517

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

-#: lilypond-book.py:570
+#: lilypond-book.py:580

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

-#: lilypond-book.py:574
+#: lilypond-book.py:584

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

-#: lilypond-book.py:581
+#: lilypond-book.py:591

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

-#: lilypond-book.py:592
+#: lilypond-book.py:602

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

-#: lilypond-book.py:600
+#: lilypond-book.py:610

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

-#: lilypond-book.py:611
+#: lilypond-book.py:621

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

-#: lilypond-book.py:704
+#: lilypond-book.py:727

 #, python-format
 msgid "Setting LilyPond's loglevel to %s"
 msgstr ""
 
 #, python-format
 msgid "Setting LilyPond's loglevel to %s"
 msgstr ""
 

-#: lilypond-book.py:708
+#: lilypond-book.py:731

 #, python-format
 msgid ""
 "Setting LilyPond's loglevel to %s (from environment variable "
 "LILYPOND_LOGLEVEL)"
 msgstr ""
 
 #, python-format
 msgid ""
 "Setting LilyPond's loglevel to %s (from environment variable "
 "LILYPOND_LOGLEVEL)"
 msgstr ""
 

-#: lilypond-book.py:711
+#: lilypond-book.py:734

 msgid ""
 "Setting LilyPond's output to --verbose, implied by lilypond-book's setting"
 msgstr ""
 msgid ""
 "Setting LilyPond's output to --verbose, implied by lilypond-book's setting"
 msgstr ""


@@ -1479,7 +1497,7 @@ msgstr ""
 
 #: musicxml2ly.py:2576
 msgid ""
 
 #: musicxml2ly.py:2576
 msgid ""

-"Copyright (c) 2005--2012 by\n"
+"Copyright (c) 2005--2015 by\n"

 "    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
 "    Jan Nieuwenhuizen <janneke@gnu.org> and\n"
 "    Reinhold Kainhofer <reinhold@kainhofer.com>\n"
 "    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
 "    Jan Nieuwenhuizen <janneke@gnu.org> and\n"
 "    Reinhold Kainhofer <reinhold@kainhofer.com>\n"


@@ -1567,15 +1585,15 @@ msgstr ""
 msgid "Unable to find input file %s"
 msgstr ""
 
 msgid "Unable to find input file %s"
 msgstr ""
 

-#: website_post.py:125
+#: website_post.py:129

 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 

-#: website_post.py:128
+#: website_post.py:132

 msgid "Other languages"
 msgstr ""
 
 msgid "Other languages"
 msgstr ""
 

-#: website_post.py:129
+#: website_post.py:133

 #, python-format
 msgid "About <a href=\"%s\">automatic language selection</a>."
 msgstr ""
 #, python-format
 msgid "About <a href=\"%s\">automatic language selection</a>."
 msgstr ""


@@ -1650,21 +1668,21 @@ msgstr ""
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 

-#: accidental-engraver.cc:210
+#: accidental-engraver.cc:207

 #, c-format
 msgid "procedure or context-name expected for accidental rule, found %s"
 msgstr ""
 
 #, c-format
 msgid "procedure or context-name expected for accidental rule, found %s"
 msgstr ""
 

-#: accidental.cc:169
+#: accidental.cc:141

 #, c-format
 msgid "Could not find glyph-name for alteration %s"
 msgstr ""
 
 #, c-format
 msgid "Could not find glyph-name for alteration %s"
 msgstr ""
 

-#: accidental.cc:184
+#: accidental.cc:157

 msgid "natural alteration glyph not found"
 msgstr ""
 
 msgid "natural alteration glyph not found"
 msgstr ""
 

-#: all-font-metrics.cc:149
+#: all-font-metrics.cc:159

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


@@ -1673,33 +1691,28 @@ msgstr ""
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 

-#: arpeggio.cc:115
+#: arpeggio.cc:138

 msgid "no heads for arpeggio found?"
 msgstr ""
 
 msgid "no heads for arpeggio found?"
 msgstr ""
 

-#: auto-change-iterator.cc:74 change-iterator.cc:72
-#, c-format
-msgid "cannot change, already in translator: %s"
-msgstr ""
-
-#: axis-group-engraver.cc:94
+#: axis-group-engraver.cc:149

 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:95
+#: axis-group-engraver.cc:150

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

-#: axis-group-engraver.cc:96
+#: axis-group-engraver.cc:151

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

-#: axis-group-interface.cc:686
+#: axis-group-interface.cc:716

 #, c-format
 msgid "\"%s\" is not a valid outside-staff-placement-directive"
 msgstr ""
 
 #, c-format
 msgid "\"%s\" is not a valid outside-staff-placement-directive"
 msgstr ""
 

-#: axis-group-interface.cc:756
+#: axis-group-interface.cc:788

 msgid "an outside-staff object should have a direction, defaulting to up"
 msgstr ""
 
 msgid "an outside-staff object should have a direction, defaulting to up"
 msgstr ""
 


@@ -1708,32 +1721,32 @@ msgstr ""
 msgid "barcheck failed at: %s"
 msgstr ""
 
 msgid "barcheck failed at: %s"
 msgstr ""
 

-#: beam-engraver.cc:147
+#: beam-engraver.cc:148

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

-#: beam-engraver.cc:230
+#: beam-engraver.cc:235

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

-#: beam-engraver.cc:266 chord-tremolo-engraver.cc:149
+#: beam-engraver.cc:282 chord-tremolo-engraver.cc:149

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

-#: beam-engraver.cc:277
+#: beam-engraver.cc:293

 msgid "stem does not fit in beam"
 msgstr ""
 
 msgid "stem does not fit in beam"
 msgstr ""
 

-#: beam-engraver.cc:278
+#: beam-engraver.cc:294

 msgid "beam was started here"
 msgstr ""
 
 #. We are completely screwed.
 msgid "beam was started here"
 msgstr ""
 
 #. We are completely screwed.

-#: beam-quanting.cc:839
+#: beam-quanting.cc:850

 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 ""
 

-#: beam.cc:268
+#: beam.cc:183

 msgid "removing beam with no stems"
 msgstr ""
 
 msgid "removing beam with no stems"
 msgstr ""
 


@@ -1743,22 +1756,24 @@ msgid "cannot change `%s' to `%s'"
 msgstr ""
 
 #. FIXME: constant error message.
 msgstr ""
 
 #. FIXME: constant error message.

-#: change-iterator.cc:93
+#: change-iterator.cc:67

 msgid "cannot find context to switch to"
 msgstr ""
 
 msgid "cannot find context to switch to"
 msgstr ""
 

+#. No enclosing context was found because the iterator's immediate
+#. context is the kind that was sought.

 #. We could change the current translator's id, but that would make
 #. errors hard to catch.
 #.
 #. last->translator_id_string () = get_change
 #. ()->change_to_id_string ();
 #. We could change the current translator's id, but that would make
 #. errors hard to catch.
 #.
 #. last->translator_id_string () = get_change
 #. ()->change_to_id_string ();

-#: change-iterator.cc:102
+#: change-iterator.cc:78

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

-#. FIXME: uncomprehensable message
-#: change-iterator.cc:106
+#. FIXME: incomprehensible message
+#: change-iterator.cc:82

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


@@ -1793,44 +1808,49 @@ msgstr ""
 msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 
 msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 

-#: context-property.cc:43
+#: context-property.cc:45

 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 

-#: context.cc:149
+#: context.cc:143

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

-#: context.cc:207
+#: context.cc:222

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

-#: context.cc:406
+#: context.cc:453

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

+#: context.cc:467
+#, c-format
+msgid "cannot find or create new Bottom = \"%s\""
+msgstr ""
+

 #: custos.cc:87
 #, c-format
 msgid "custos `%s' not found"
 msgstr ""
 
 #: custos.cc:87
 #, c-format
 msgid "custos `%s' not found"
 msgstr ""
 

-#: dispatcher.cc:83
+#: dispatcher.cc:82

 msgid "Event class should be a list"
 msgstr ""
 
 msgid "Event class should be a list"
 msgstr ""
 

-#: dispatcher.cc:166
+#: dispatcher.cc:165

 #, c-format
 msgid "Junking event: %s"
 msgstr ""
 
 #, c-format
 msgid "Junking event: %s"
 msgstr ""
 

-#: dispatcher.cc:262
+#: dispatcher.cc:279

 msgid "Attempting to remove nonexisting listener."
 msgstr ""
 
 msgid "Attempting to remove nonexisting listener."
 msgstr ""
 

-#: dispatcher.cc:284
+#: dispatcher.cc:305

 msgid "Already listening to dispatcher, ignoring request"
 msgstr ""
 
 msgid "Already listening to dispatcher, ignoring request"
 msgstr ""
 


@@ -1839,24 +1859,16 @@ msgstr ""
 msgid "dot `%s' not found"
 msgstr ""
 
 msgid "dot `%s' not found"
 msgstr ""
 

-#: dynamic-engraver.cc:193
-msgid "cannot find start of (de)crescendo"
-msgstr ""
-
-#: dynamic-engraver.cc:200
-msgid "already have a decrescendo"
-msgstr ""
-
-#: dynamic-engraver.cc:202
-msgid "already have a crescendo"
-msgstr ""
-
-#: dynamic-engraver.cc:205
-msgid "cresc starts here"
+#: dynamic-engraver.cc:169
+#, c-format
+msgid ""
+"unknown crescendo style: %s\n"
+"defaulting to hairpin."

 msgstr ""
 
 msgstr ""
 

-#: dynamic-engraver.cc:333
-msgid "unterminated (de)crescendo"
+#: dynamic-engraver.cc:234 slur-proto-engraver.cc:159
+#, c-format
+msgid "unterminated %s"

 msgstr ""
 
 #. No explicit dynamic script events have occurred yet, but there is
 msgstr ""
 
 #. No explicit dynamic script events have occurred yet, but there is


@@ -1882,22 +1894,22 @@ msgstr ""
 msgid "unterminated extender"
 msgstr ""
 
 msgid "unterminated extender"
 msgstr ""
 

-#: flag.cc:134
+#: flag.cc:133

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

-#: flag.cc:154
+#: flag.cc:153

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

-#: font-config-scheme.cc:151 font-config.cc:53
+#: font-config-scheme.cc:151 font-config.cc:82

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

-#: font-config-scheme.cc:153 font-config.cc:55
+#: font-config-scheme.cc:153 font-config.cc:84

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


@@ -1916,7 +1928,17 @@ msgstr ""
 msgid "Initializing FontConfig..."
 msgstr ""
 
 msgid "Initializing FontConfig..."
 msgstr ""
 

-#: font-config.cc:58
+#: font-config.cc:70
+#, c-format
+msgid "failed to add fontconfig configuration file `%s'"
+msgstr ""
+
+#: font-config.cc:73
+#, c-format
+msgid "Adding fontconfig configuration file: %s"
+msgstr ""
+
+#: font-config.cc:86

 msgid "Building font database..."
 msgstr ""
 
 msgid "Building font database..."
 msgstr ""
 


@@ -1924,12 +1946,12 @@ msgstr ""
 msgid "Must be footnote-event."
 msgstr ""
 
 msgid "Must be footnote-event."
 msgstr ""
 

-#: general-scheme.cc:390
+#: general-scheme.cc:403

 #, c-format
 msgid "failed redirecting stderr to `%s'"
 msgstr ""
 
 #, c-format
 msgid "failed redirecting stderr to `%s'"
 msgstr ""
 

-#: general-scheme.cc:469 output-ps.scm:48
+#: general-scheme.cc:482 output-ps.scm:48

 msgid "Found infinity or nan in output.  Substituting 0.0"
 msgstr ""
 
 msgid "Found infinity or nan in output.  Substituting 0.0"
 msgstr ""
 


@@ -1980,12 +2002,12 @@ msgstr ""
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 

-#: grob-property.cc:35
+#: grob-property.cc:32

 #, c-format
 msgid "%d: %s"
 msgstr ""
 
 #, c-format
 msgid "%d: %s"
 msgstr ""
 

-#: grob.cc:478
+#: grob.cc:486

 #, c-format
 msgid "ignored infinite %s-offset"
 msgstr ""
 #, c-format
 msgid "ignored infinite %s-offset"
 msgstr ""


@@ -1994,7 +2016,7 @@ msgstr ""
 msgid "Asking for broken bound padding at a non-broken bound."
 msgstr ""
 
 msgid "Asking for broken bound padding at a non-broken bound."
 msgstr ""
 

-#: hairpin.cc:256
+#: hairpin.cc:257

 msgid "decrescendo too small"
 msgstr ""
 
 msgid "decrescendo too small"
 msgstr ""
 


@@ -2014,7 +2036,7 @@ msgstr ""
 msgid "unterminated hyphen; removing"
 msgstr ""
 
 msgid "unterminated hyphen; removing"
 msgstr ""
 

-#: includable-lexer.cc:71 lily-guile.cc:91 lily-parser-scheme.cc:108
+#: includable-lexer.cc:71 lily-guile.cc:92 lily-parser-scheme.cc:108

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


@@ -2024,11 +2046,11 @@ msgstr ""
 msgid "(search path: `%s')"
 msgstr ""
 
 msgid "(search path: `%s')"
 msgstr ""
 

-#: input.cc:138 source-file.cc:178 source-file.cc:193
+#: input.cc:138 source-file.cc:180 source-file.cc:195

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

-#: key-engraver.cc:198
+#: key-engraver.cc:197

 msgid "Incomplete keyAlterationOrder for key signature"
 msgstr ""
 
 msgid "Incomplete keyAlterationOrder for key signature"
 msgstr ""
 


@@ -2041,71 +2063,84 @@ msgstr ""
 msgid "alteration not found"
 msgstr ""
 
 msgid "alteration not found"
 msgstr ""
 

-#: ligature-bracket-engraver.cc:72 ligature-engraver.cc:104
+#: ligature-bracket-engraver.cc:72 ligature-engraver.cc:109

 msgid "cannot find start of ligature"
 msgstr ""
 
 msgid "cannot find start of ligature"
 msgstr ""
 

-#: ligature-bracket-engraver.cc:85 ligature-engraver.cc:131
+#: ligature-bracket-engraver.cc:85 ligature-engraver.cc:136

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

-#: ligature-engraver.cc:109
+#: ligature-engraver.cc:114

 msgid "no right bound"
 msgstr ""
 
 msgid "no right bound"
 msgstr ""
 

-#: ligature-engraver.cc:140
+#: ligature-engraver.cc:145

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

-#: ligature-engraver.cc:184
+#: ligature-engraver.cc:189

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

-#: ligature-engraver.cc:211
+#: ligature-engraver.cc:216

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

-#: ligature-engraver.cc:212
+#: ligature-engraver.cc:217

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

-#: lily-guile.cc:93
+#: lily-guile.cc:94

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

-#: lily-guile.cc:416
+#: lily-guile.cc:413

 #, c-format
 msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
 #, c-format
 msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 

-#: lily-guile.cc:419
+#: lily-guile.cc:416

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

-#: lily-guile.cc:426
-msgid "doing assignment anyway"
+#: lily-guile.cc:423
+msgid "skipping assignment"

 msgstr ""
 
 msgstr ""
 

-#: lily-guile.cc:438
+#: lily-guile.cc:442

 #, 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:246
+#. Uh oh.  unsmob<T> delivered 0, yet
+#. unsmob<T> delivers true.  This means that unsmob<T> is a
+#. matching check from a base class of T, but var is of an
+#. incompatible derived type.
+#: lily-guile.cc:462
+msgid "Wrong kind of "
+msgstr ""
+
+#: lily-lexer.cc:251

 msgid "include files are not allowed in safe mode"
 msgstr ""
 
 msgid "include files are not allowed in safe mode"
 msgstr ""
 

-#: lily-lexer.cc:273
+#: lily-lexer.cc:278

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

-#: lily-lexer.cc:294 lily-lexer.cc:307
+#: lily-lexer.cc:299 lily-lexer.cc:312

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

+#: lily-modules.cc:81
+#, c-format
+msgid "Uninitialized variable `%s' in module (%s)"
+msgstr ""
+

 #: lily-parser-scheme.cc:80
 #, c-format
 msgid "Changing working directory to: `%s'"
 #: lily-parser-scheme.cc:80
 #, c-format
 msgid "Changing working directory to: `%s'"


@@ -2126,41 +2161,37 @@ msgstr ""
 msgid "Processing `%s'"
 msgstr ""
 
 msgid "Processing `%s'"
 msgstr ""
 

-#: lily-parser-scheme.cc:208
+#: lily-parser-scheme.cc:210

 msgid ""
 "ly:parser-parse-string is only valid with a new parser.  Use ly:parser-"
 "include-string instead."
 msgstr ""
 
 msgid ""
 "ly:parser-parse-string is only valid with a new parser.  Use ly:parser-"
 "include-string instead."
 msgstr ""
 

-#: lily-parser-scheme.cc:239
+#: lily-parser-scheme.cc:241

 msgid ""
 "ly:parse-string-expression is only valid with a new parser.  Use ly:parser-"
 "include-string instead."
 msgstr ""
 
 msgid ""
 "ly:parse-string-expression is only valid with a new parser.  Use ly:parser-"
 "include-string instead."
 msgstr ""
 

-#: lily-parser.cc:108
+#: lily-parser.cc:106

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

-#: lookup.cc:181
+#: lookup.cc:178

 #, c-format
 msgid "Not drawing a box with negative dimension, %.2f by %.2f."
 msgstr ""
 
 #, c-format
 msgid "Not drawing a box with negative dimension, %.2f by %.2f."
 msgstr ""
 

-#: lyric-combine-music-iterator.cc:199
+#: lyric-combine-music-iterator.cc:204

 msgid "argument of \\lyricsto should contain Lyrics context"
 msgstr ""
 
 msgid "argument of \\lyricsto should contain Lyrics context"
 msgstr ""
 

-#: lyric-combine-music-iterator.cc:337
+#: lyric-combine-music-iterator.cc:344

 #, c-format
 #, c-format

-msgid "cannot find Voice `%s'"
+msgid "cannot find %s `%s'"

 msgstr ""
 
 msgstr ""
 

-#: lyric-engraver.cc:186
-msgid "Lyric syllable does not have note.  Use \\lyricsto or associatedVoice."
-msgstr ""
-
-#: main.cc:70
+#: main.cc:106

 #, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
 #, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"


@@ -2169,7 +2200,7 @@ msgid ""
 "information.\n"
 msgstr ""
 
 "information.\n"
 msgstr ""
 

-#: main.cc:76
+#: main.cc:112

 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License as \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 as \n"


@@ -2187,98 +2218,102 @@ msgid ""
 "Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
 "Boston, MA 02111-1307, USA.\n"
 msgstr ""
 

-#: main.cc:105
+#: main.cc:150

 msgid "SYM[=VAL]"
 msgstr ""
 
 msgid "SYM[=VAL]"
 msgstr ""
 

-#: main.cc:106
+#: main.cc:151

 msgid ""
 "set Scheme option SYM to VAL (default: #t).\n"
 "Use -dhelp for help."
 msgstr ""
 
 msgid ""
 "set Scheme option SYM to VAL (default: #t).\n"
 "Use -dhelp for help."
 msgstr ""
 

-#: main.cc:110
+#: main.cc:155

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

-#: main.cc:110
+#: main.cc:155

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

-#: main.cc:113
+#: main.cc:158

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

-#: main.cc:113
+#: main.cc:158

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

-#: main.cc:114
+#: main.cc:159

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

-#: main.cc:115
+#: main.cc:160

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

-#: main.cc:116
+#: main.cc:161

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

-#: main.cc:119
+#: main.cc:162
+msgid "generate big PDF files"
+msgstr ""
+
+#: main.cc:165

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

-#: main.cc:119
+#: main.cc:165

 msgid ""
 "dump header field FIELD to file\n"
 "named BASENAME.FIELD"
 msgstr ""
 
 msgid ""
 "dump header field FIELD to file\n"
 "named BASENAME.FIELD"
 msgstr ""
 

-#: main.cc:122
+#: main.cc:168

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

-#: main.cc:123
+#: main.cc:169

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

-#: main.cc:126
+#: main.cc:172

 msgid "USER, GROUP, JAIL, DIR"
 msgstr ""
 
 msgid "USER, GROUP, JAIL, DIR"
 msgstr ""
 

-#: main.cc:126
+#: main.cc:172

 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 

-#: main.cc:131
+#: main.cc:177

 msgid ""
 "print log messages according to LOGLEVEL.  Possible values are:\n"
 "NONE, ERROR, WARNING, BASIC, PROGRESS, INFO (default) and DEBUG."
 msgstr ""
 
 msgid ""
 "print log messages according to LOGLEVEL.  Possible values are:\n"
 "NONE, ERROR, WARNING, BASIC, PROGRESS, INFO (default) and DEBUG."
 msgstr ""
 

-#: main.cc:135
+#: main.cc:181

 msgid "write output to FILE (suffix will be added)"
 msgstr ""
 
 msgid "write output to FILE (suffix will be added)"
 msgstr ""
 

-#: main.cc:136
+#: main.cc:182

 msgid "relocate using directory of lilypond program"
 msgstr ""
 
 msgid "relocate using directory of lilypond program"
 msgstr ""
 

-#: main.cc:137
+#: main.cc:183

 msgid "no progress, only error messages (equivalent to loglevel=ERROR)"
 msgstr ""
 
 msgid "no progress, only error messages (equivalent to loglevel=ERROR)"
 msgstr ""
 

-#: main.cc:139
+#: main.cc:185

 msgid "be verbose (equivalent to loglevel=DEBUG)"
 msgstr ""
 
 #. Do not update the copyright years here, run `make grand-replace'
 msgid "be verbose (equivalent to loglevel=DEBUG)"
 msgstr ""
 
 #. Do not update the copyright years here, run `make grand-replace'

-#: main.cc:206
+#: main.cc:264

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


@@ -2286,84 +2321,84 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.

-#: main.cc:233
+#: main.cc:302

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

-#: main.cc:235
+#: main.cc:304

 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 

-#: main.cc:237
+#: main.cc:306

 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 

-#: main.cc:239
+#: main.cc:308

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

-#: main.cc:241
+#: main.cc:310

 msgid "Options:"
 msgstr ""
 
 msgid "Options:"
 msgstr ""
 

-#: main.cc:295
+#: main.cc:377

 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 

-#: main.cc:309
+#: main.cc:391

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

-#: main.cc:311
+#: main.cc:393

 #, c-format
 msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 

-#: main.cc:326
+#: main.cc:408

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

-#: main.cc:328
+#: main.cc:410

 #, c-format
 msgid "cannot get group id from group name: %s: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot get group id from group name: %s: %s"
 msgstr ""
 

-#: main.cc:336
+#: main.cc:418

 #, c-format
 msgid "cannot chroot to: %s: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot chroot to: %s: %s"
 msgstr ""
 

-#: main.cc:343
+#: main.cc:425

 #, c-format
 msgid "cannot change group id to: %d: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot change group id to: %d: %s"
 msgstr ""
 

-#: main.cc:349
+#: main.cc:431

 #, c-format
 msgid "cannot change user id to: %d: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot change user id to: %d: %s"
 msgstr ""
 

-#: main.cc:355
+#: main.cc:437

 #, c-format
 msgid "cannot change working directory to: %s: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot change working directory to: %s: %s"
 msgstr ""
 

-#: main.cc:601
+#: main.cc:826

 #, c-format
 msgid "exception caught: %s"
 msgstr ""
 
 #. FIXME: constant error message.
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
 
 #. FIXME: constant error message.

-#: mark-engraver.cc:156
+#: mark-engraver.cc:150

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

-#: mark-engraver.cc:162
+#: mark-engraver.cc:156

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


@@ -2409,26 +2444,31 @@ msgstr ""
 msgid "unexpected case fall-through"
 msgstr ""
 
 msgid "unexpected case fall-through"
 msgstr ""
 

-#: midi-item.cc:89
+#: midi-control-function-performer.cc:107 staff-performer.cc:153
+#, c-format
+msgid "ignoring out-of-range value change for MIDI property `%s'"
+msgstr ""
+
+#: midi-item.cc:93

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

-#: midi-item.cc:161
+#: midi-item.cc:179

 msgid "Time signature with more than 255 beats.  Truncating"
 msgstr ""
 
 msgid "Time signature with more than 255 beats.  Truncating"
 msgstr ""
 

-#: midi-stream.cc:39
+#: midi-stream.cc:38

 #, c-format
 msgid "cannot open for write: %s: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot open for write: %s: %s"
 msgstr ""
 

-#: midi-stream.cc:55
+#: midi-stream.cc:54

 #, c-format
 msgid "cannot write to file: `%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot write to file: `%s'"
 msgstr ""
 

-#: minimal-page-breaking.cc:40 paper-score.cc:122
+#: minimal-page-breaking.cc:40 paper-score.cc:116

 msgid "Calculating line breaks..."
 msgstr ""
 
 msgid "Calculating line breaks..."
 msgstr ""
 


@@ -2436,41 +2476,16 @@ msgstr ""
 msgid "Calculating page breaks..."
 msgstr ""
 
 msgid "Calculating page breaks..."
 msgstr ""
 

-#: multi-measure-rest.cc:138
+#: multi-measure-rest.cc:152

 msgid ""
 "usable-duration-logs must be a non-empty list.  Falling back to whole rests."
 msgstr ""
 
 msgid ""
 "usable-duration-logs must be a non-empty list.  Falling back to whole rests."
 msgstr ""
 

-#: multi-measure-rest.cc:328
-msgid "Using naive multi measure rest spacing."
-msgstr ""
-

 #: music.cc:150
 #, c-format
 msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
 #: music.cc:150
 #, c-format
 msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 

-#: music.cc:219
-msgid "(normalized pitch)"
-msgstr ""
-
-#: music.cc:223
-#, c-format
-msgid "Transposing %s by %s makes alteration larger than double"
-msgstr ""
-
-#: new-dynamic-engraver.cc:168
-#, c-format
-msgid ""
-"unknown crescendo style: %s\n"
-"defaulting to hairpin."
-msgstr ""
-
-#: new-dynamic-engraver.cc:233
-#, c-format
-msgid "unterminated %s"
-msgstr ""
-

 #: new-fingering-engraver.cc:113
 msgid "cannot add text scripts to individual note heads"
 msgstr ""
 #: new-fingering-engraver.cc:113
 msgid "cannot add text scripts to individual note heads"
 msgstr ""


@@ -2483,11 +2498,11 @@ msgstr ""
 msgid "placing below"
 msgstr ""
 
 msgid "placing below"
 msgstr ""
 

-#: note-collision.cc:497
-msgid "ignoring too many clashing note columns"
+#: note-collision.cc:512
+msgid "this Voice needs a \\voiceXx or \\shiftXx setting"

 msgstr ""
 
 msgstr ""
 

-#: note-column.cc:172
+#: note-column.cc:150

 msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
 msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 


@@ -2515,22 +2530,22 @@ msgstr ""
 msgid "FreeType error: %s"
 msgstr ""
 
 msgid "FreeType error: %s"
 msgstr ""
 

-#: open-type-font.cc:111
+#: open-type-font.cc:115

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

-#: open-type-font.cc:113
+#: open-type-font.cc:117

 #, c-format
 msgid "error reading font file %s: %s"
 msgstr ""
 
 #, c-format
 msgid "error reading font file %s: %s"
 msgstr ""
 

-#: open-type-font.cc:188
+#: open-type-font.cc:192

 #, c-format
 msgid "FT_Get_Glyph_Name () Freetype error: %s"
 msgstr ""
 
 #, c-format
 msgid "FT_Get_Glyph_Name () Freetype error: %s"
 msgstr ""
 

-#: open-type-font.cc:336 pango-font.cc:256
+#: open-type-font.cc:340 pango-font.cc:258

 #, c-format
 msgid "FT_Get_Glyph_Name () error: %s"
 msgstr ""
 #, c-format
 msgid "FT_Get_Glyph_Name () error: %s"
 msgstr ""


@@ -2540,160 +2555,159 @@ msgstr ""
 msgid "Finding the ideal number of pages..."
 msgstr ""
 
 msgid "Finding the ideal number of pages..."
 msgstr ""
 

-#: optimal-page-breaking.cc:92
+#: optimal-page-breaking.cc:94

 msgid ""
 "could not satisfy systems-per-page and page-count at the same time, ignoring "
 "systems-per-page"
 msgstr ""
 
 msgid ""
 "could not satisfy systems-per-page and page-count at the same time, ignoring "
 "systems-per-page"
 msgstr ""
 

-#: optimal-page-breaking.cc:112
+#: optimal-page-breaking.cc:114

 msgid "Fitting music on 1 page..."
 msgstr ""
 
 msgid "Fitting music on 1 page..."
 msgstr ""
 

-#: optimal-page-breaking.cc:114
+#: optimal-page-breaking.cc:116

 #, c-format
 msgid "Fitting music on %d pages..."
 msgstr ""
 
 #, c-format
 msgid "Fitting music on %d pages..."
 msgstr ""
 

-#: optimal-page-breaking.cc:116
+#: optimal-page-breaking.cc:118

 #, c-format
 msgid "Fitting music on %d or %d pages..."
 msgstr ""
 
 #, c-format
 msgid "Fitting music on %d or %d pages..."
 msgstr ""
 

-#: optimal-page-breaking.cc:126 optimal-page-breaking.cc:179
+#: optimal-page-breaking.cc:128 optimal-page-breaking.cc:181

 #, c-format
 msgid "trying %d systems"
 msgstr ""
 
 #, c-format
 msgid "trying %d systems"
 msgstr ""
 

-#: optimal-page-breaking.cc:145 optimal-page-breaking.cc:207
+#: optimal-page-breaking.cc:147 optimal-page-breaking.cc:209

 #, c-format
 msgid "best score for this sys-count: %f"
 msgstr ""
 
 #, c-format
 msgid "best score for this sys-count: %f"
 msgstr ""
 

-#: optimal-page-breaking.cc:214 page-turn-page-breaking.cc:248
-#: paper-score.cc:162
+#: optimal-page-breaking.cc:216 page-turn-page-breaking.cc:249
+#: paper-score.cc:156

 msgid "Drawing systems..."
 msgstr ""
 
 msgid "Drawing systems..."
 msgstr ""
 

-#: output-def.cc:235
+#: output-def.cc:229

 msgid "margins do not fit with line-width, setting default values"
 msgstr ""
 
 msgid "margins do not fit with line-width, setting default values"
 msgstr ""
 

-#: output-def.cc:242
+#: output-def.cc:236

 msgid ""
 "systems run off the page due to improper paper settings, setting default "
 "values"
 msgstr ""
 
 msgid ""
 "systems run off the page due to improper paper settings, setting default "
 "values"
 msgstr ""
 

-#: page-breaking.cc:277
+#: page-breaking.cc:276

 msgid ""
 "ignoring min-systems-per-page and max-systems-per-page because systems-per-"
 "page was set"
 msgstr ""
 
 msgid ""
 "ignoring min-systems-per-page and max-systems-per-page because systems-per-"
 "page was set"
 msgstr ""
 

-#: page-breaking.cc:282
+#: page-breaking.cc:281

 msgid ""
 "min-systems-per-page is larger than max-systems-per-page, ignoring both "
 "values"
 msgstr ""
 
 msgid ""
 "min-systems-per-page is larger than max-systems-per-page, ignoring both "
 "values"
 msgstr ""
 

-#: page-layout-problem.cc:403
-msgid ""
-"A page layout problem has been initiated that cannot accommodate footnotes."
+#: page-breaking.cc:636
+#, c-format
+msgid "page %d has been compressed"

 msgstr ""
 
 msgstr ""
 

-#: page-layout-problem.cc:732
+#: page-layout-problem.cc:400

 msgid ""
 msgid ""

-"cannot fit music on page: ragged-spacing was requested, but page was "
-"compressed"
+"A page layout problem has been initiated that cannot accommodate footnotes."

 msgstr ""
 
 msgstr ""
 

-#: page-layout-problem.cc:735
-#, c-format
-msgid "cannot fit music on page: overflow is %f"
+#: page-layout-problem.cc:729
+msgid "ragged-bottom was specified, but page must be compressed"

 msgstr ""
 
 msgstr ""
 

-#: page-layout-problem.cc:737
-msgid "compressing music to fit"
+#: page-layout-problem.cc:732
+#, c-format
+msgid "compressing over-full page by %.1f staff-spaces"

 msgstr ""
 
 #: page-layout-problem.cc:1197
 msgid "staff-affinities should only decrease"
 msgstr ""
 
 msgstr ""
 
 #: page-layout-problem.cc:1197
 msgid "staff-affinities should only decrease"
 msgstr ""
 

-#: page-turn-page-breaking.cc:168
+#: page-turn-page-breaking.cc:169

 #, c-format
 msgid "page-turn-page-breaking: breaking from %d to %d"
 msgstr ""
 
 #, c-format
 msgid "page-turn-page-breaking: breaking from %d to %d"
 msgstr ""
 

-#: page-turn-page-breaking.cc:217
+#: page-turn-page-breaking.cc:218

 msgid ""
 "cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
 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:230
+#: page-turn-page-breaking.cc:231

 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 

-#: page-turn-page-breaking.cc:300
+#: page-turn-page-breaking.cc:301

 #, c-format
 msgid "break starting at page %d"
 msgstr ""
 
 #, c-format
 msgid "break starting at page %d"
 msgstr ""
 

-#: page-turn-page-breaking.cc:301
+#: page-turn-page-breaking.cc:302

 #, c-format
 msgid "\tdemerits: %f"
 msgstr ""
 
 #, c-format
 msgid "\tdemerits: %f"
 msgstr ""
 

-#: page-turn-page-breaking.cc:302
+#: page-turn-page-breaking.cc:303

 #, c-format
 msgid "\tsystem count: %d"
 msgstr ""
 
 #, c-format
 msgid "\tsystem count: %d"
 msgstr ""
 

-#: page-turn-page-breaking.cc:303
+#: page-turn-page-breaking.cc:304

 #, c-format
 msgid "\tpage count: %d"
 msgstr ""
 
 #, c-format
 msgid "\tpage count: %d"
 msgstr ""
 

-#: page-turn-page-breaking.cc:304
+#: page-turn-page-breaking.cc:305

 #, c-format
 msgid "\tprevious break: %d"
 msgstr ""
 
 #, c-format
 msgid "\tprevious break: %d"
 msgstr ""
 

-#: pango-font.cc:245
+#: pango-font.cc:247

 #, c-format
 msgid "no glyph for character U+%0X in font `%s'"
 msgstr ""
 
 #, c-format
 msgid "no glyph for character U+%0X in font `%s'"
 msgstr ""
 

-#: pango-font.cc:272
+#: pango-font.cc:274

 #, c-format
 msgid ""
 "Glyph has no name, but font supports glyph naming.\n"
 "Skipping glyph U+%0X, file %s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Glyph has no name, but font supports glyph naming.\n"
 "Skipping glyph U+%0X, file %s"
 msgstr ""
 

-#: pango-font.cc:322
+#: pango-font.cc:324

 #, 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:372
+#: pango-font.cc:374

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

-#: paper-book.cc:214
+#: paper-book.cc:200

 #, c-format
 msgid "program option -dprint-pages not supported by backend `%s'"
 msgstr ""
 
 #, c-format
 msgid "program option -dprint-pages not supported by backend `%s'"
 msgstr ""
 

-#: paper-book.cc:233
+#: paper-book.cc:219

 #, c-format
 msgid "program option -dpreview not supported by backend `%s'"
 msgstr ""
 
 #, c-format
 msgid "program option -dpreview not supported by backend `%s'"
 msgstr ""
 

-#: paper-column-engraver.cc:261
+#: paper-column-engraver.cc:263

 msgid ""
 "forced break was overridden by some other event, should you be using bar "
 "checks?"
 msgid ""
 "forced break was overridden by some other event, should you be using bar "
 "checks?"


@@ -2704,60 +2718,37 @@ msgstr ""
 msgid "Layout output to `%s'..."
 msgstr ""
 
 msgid "Layout output to `%s'..."
 msgstr ""
 

-#: paper-score.cc:134
+#: paper-score.cc:128

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

-#: paper-score.cc:138
+#: paper-score.cc:132

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

-#: parse-scm.cc:121
+#: parse-scm.cc:124

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

-#: partial-iterator.cc:45
-msgid "trying to use \\partial after the start of a piece"
-msgstr ""
-
-#: pdf-scheme.cc:50
+#: pdf-scheme.cc:65

 #, c-format
 msgid "Conversion of string `%s' to UTF-16be failed: %s"
 msgstr ""
 
 #, c-format
 msgid "Conversion of string `%s' to UTF-16be failed: %s"
 msgstr ""
 

-#: percent-repeat-engraver.cc:147
+#: percent-repeat-engraver.cc:148

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

-#: performance.cc:54
+#: performance.cc:76

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

-#: performance.cc:82
+#: performance.cc:126

 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr ""
 
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr ""
 

-#: phrasing-slur-engraver.cc:101 slur-engraver.cc:102
-#, c-format
-msgid "direction of %s invalid: %d"
-msgstr ""
-
-#: phrasing-slur-engraver.cc:175
-msgid "unterminated phrasing slur"
-msgstr ""
-
-#: phrasing-slur-engraver.cc:210
-msgid "cannot end phrasing slur"
-msgstr ""
-
-#. We already have an old slur, so give a warning
-#. and completely ignore the new slur.
-#: phrasing-slur-engraver.cc:230
-msgid "already have phrasing slur"
-msgstr ""
-

 #: piano-pedal-engraver.cc:279
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 #: piano-pedal-engraver.cc:279
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"


@@ -2774,12 +2765,12 @@ msgstr ""
 msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr ""
 
 msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr ""
 

-#: program-option-scheme.cc:235
+#: program-option-scheme.cc:223

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

-#: property-iterator.cc:100
+#: property-iterator.cc:66

 #, c-format
 msgid "not a grob name, `%s'"
 msgstr ""
 #, c-format
 msgid "not a grob name, `%s'"
 msgstr ""


@@ -2788,25 +2779,25 @@ msgstr ""
 msgid "Failed octave check, got: "
 msgstr ""
 
 msgid "Failed octave check, got: "
 msgstr ""
 

-#: relocate.cc:52
+#: relocate.cc:56

 #, c-format
 msgid "Setting %s to %s"
 msgstr ""
 
 #. this warning should only be printed in debug mode!
 #, c-format
 msgid "Setting %s to %s"
 msgstr ""
 
 #. this warning should only be printed in debug mode!

-#: relocate.cc:73
+#: relocate.cc:77

 #, c-format
 msgid "no such file: %s for %s"
 msgstr ""
 
 #. this warning should only be printed in debug mode!
 #. this warning should only be printed in debug mode
 #, c-format
 msgid "no such file: %s for %s"
 msgstr ""
 
 #. this warning should only be printed in debug mode!
 #. this warning should only be printed in debug mode

-#: relocate.cc:84 relocate.cc:102
+#: relocate.cc:88 relocate.cc:106

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

-#: relocate.cc:93
+#: relocate.cc:97

 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""


@@ -2836,76 +2827,72 @@ msgstr ""
 msgid "Relocation : from cwd: argv0=%s\n"
 msgstr ""
 
 msgid "Relocation : from cwd: argv0=%s\n"
 msgstr ""
 

-#: relocate.cc:194
+#: relocate.cc:196

 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s\n"
 msgstr ""
 

-#: relocate.cc:220
+#: relocate.cc:222

 msgid "LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR"
 msgstr ""
 
 msgid "LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR"
 msgstr ""
 

-#: relocate.cc:345
+#: relocate.cc:347

 #, c-format
 msgid "Relocation file: %s"
 msgstr ""
 
 #, c-format
 msgid "Relocation file: %s"
 msgstr ""
 

-#: relocate.cc:349 source-file.cc:65
+#: relocate.cc:351 source-file.cc:65

 #, c-format
 msgid "cannot open file: `%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot open file: `%s'"
 msgstr ""
 

-#: relocate.cc:379
+#: relocate.cc:381

 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 

-#: rest-collision-engraver.cc:70
-msgid "rhythmic head is not part of a rhythmic column"
-msgstr ""
-
-#: rest-collision.cc:146
+#: rest-collision.cc:154

 msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
 msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 

-#: rest-collision.cc:157 rest-collision.cc:266
+#: rest-collision.cc:165 rest-collision.cc:274

 msgid "too many colliding rests"
 msgstr ""
 
 msgid "too many colliding rests"
 msgstr ""
 

-#: rest.cc:192
+#: rest.cc:239

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

-#: score-engraver.cc:78
+#: score-engraver.cc:77

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

-#: score-engraver.cc:80
+#: score-engraver.cc:79

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

-#: score-engraver.cc:82
+#: score-engraver.cc:81

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

-#: score-engraver.cc:84
+#: score-engraver.cc:83

 msgid "Aborting"
 msgstr ""
 
 msgid "Aborting"
 msgstr ""
 

-#: score.cc:172
+#: score.cc:161

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

-#: score.cc:173
+#: score.cc:163

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

-#: score.cc:178
+#: score.cc:169

 msgid "errors found, ignoring music expression"
 msgstr ""
 
 msgid "errors found, ignoring music expression"
 msgstr ""
 


@@ -2918,25 +2905,33 @@ msgstr ""
 msgid " scheme encoding: "
 msgstr ""
 
 msgid " scheme encoding: "
 msgstr ""
 

-#: skyline-pair.cc:160
+#: skyline-pair.cc:135

 msgid "direction must not be CENTER in ly:skyline-pair::skyline"
 msgstr ""
 
 msgid "direction must not be CENTER in ly:skyline-pair::skyline"
 msgstr ""
 

-#: slur-engraver.cc:176
-msgid "unterminated slur"
-msgstr ""
-
-#: slur-engraver.cc:211
-msgid "cannot end slur"
+#: slur-proto-engraver.cc:60
+#, c-format
+msgid "direction of %s invalid: %d"

 msgstr ""
 
 #. We already have an old slur, so give a warning
 #. and completely ignore the new slur.
 msgstr ""
 
 #. We already have an old slur, so give a warning
 #. and completely ignore the new slur.

-#: slur-engraver.cc:231
-msgid "already have slur"
+#: slur-proto-engraver.cc:213
+#, c-format
+msgid "already have %s"

 msgstr ""
 
 msgstr ""
 

-#: slur.cc:430
+#: slur-proto-engraver.cc:230
+#, c-format
+msgid "%s without a cause"
+msgstr ""
+
+#: slur-proto-engraver.cc:297
+#, c-format
+msgid "cannot end %s"
+msgstr ""
+
+#: slur.cc:431

 #, c-format
 msgid "Ignoring grob for slur: %s.  avoid-slur not set?"
 msgstr ""
 #, c-format
 msgid "Ignoring grob for slur: %s.  avoid-slur not set?"
 msgstr ""


@@ -2946,24 +2941,24 @@ msgstr ""
 msgid "expected to read %d characters, got %d"
 msgstr ""
 
 msgid "expected to read %d characters, got %d"
 msgstr ""
 

-#: staff-performer.cc:275
+#: staff-performer.cc:301

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

-#: staff-performer.cc:276
+#: staff-performer.cc:302

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

-#: stem-engraver.cc:110
+#: stem-engraver.cc:100

 msgid "tremolo duration is too long"
 msgstr ""
 
 msgid "tremolo duration is too long"
 msgstr ""
 

-#: stem-engraver.cc:162
+#: stem-engraver.cc:152

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

-#: stem-engraver.cc:165
+#: stem-engraver.cc:155

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


@@ -2971,24 +2966,18 @@ msgstr ""
 msgid "weird stem size, check for narrow beams"
 msgstr ""
 
 msgid "weird stem size, check for narrow beams"
 msgstr ""
 

-#: system.cc:201
+#: system.cc:195

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

-#: system.cc:512
+#: system.cc:506

 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
 #. TODO: Also print the arguments of the markup!
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
 #. TODO: Also print the arguments of the markup!

-#: text-interface.cc:131
-#, c-format
-msgid "Cyclic markup detected: %s"
-msgstr ""
-
-#. TODO: Also print the arguments of the markup!
-#: text-interface.cc:144
+#: text-interface.cc:139

 #, c-format
 msgid "Markup depth exceeds maximal value of %d; Markup: %s"
 msgstr ""
 #, c-format
 msgid "Markup depth exceeds maximal value of %d; Markup: %s"
 msgstr ""


@@ -3005,11 +2994,11 @@ msgstr ""
 msgid "unterminated text spanner"
 msgstr ""
 
 msgid "unterminated text spanner"
 msgstr ""
 

-#: tie-engraver.cc:116
+#: tie-engraver.cc:121

 msgid "unterminated tie"
 msgstr ""
 
 msgid "unterminated tie"
 msgstr ""
 

-#: tie-engraver.cc:350
+#: tie-engraver.cc:377

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


@@ -3018,19 +3007,12 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.

-#: time-signature-engraver.cc:75
+#: time-signature-engraver.cc:95

 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #, 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!)
-#: time-signature.cc:89
-#, c-format
-msgid "time signature symbol `%s' not found; reverting to numbered style"
-msgstr ""
-
-#: translator-ctors.cc:65
+#: translator-ctors.cc:70

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


@@ -3040,17 +3022,17 @@ msgstr ""
 msgid "fatal error.  Couldn't find type: %s"
 msgstr ""
 
 msgid "fatal error.  Couldn't find type: %s"
 msgstr ""
 

-#: translator-group.cc:188
+#: translator-group.cc:185

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

-#: translator.cc:326
+#: translator.cc:310

 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 

-#: translator.cc:327
+#: translator.cc:311

 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 #, c-format
 msgid "Previous %s event here"
 msgstr ""


@@ -3100,6 +3082,10 @@ msgstr ""
 msgid "ascending vaticana style flexa"
 msgstr ""
 
 msgid "ascending vaticana style flexa"
 msgstr ""
 

+#: vertical-align-engraver.cc:95
+msgid "Ignoring Vertical_align_engraver in VerticalAxisGroup"
+msgstr ""
+

 #. fixme: be more verbose.
 #: volta-engraver.cc:110
 msgid "cannot end volta spanner"
 #. fixme: be more verbose.
 #: volta-engraver.cc:110
 msgid "cannot end volta spanner"


@@ -3117,185 +3103,218 @@ msgstr ""
 msgid "giving up"
 msgstr ""
 
 msgid "giving up"
 msgstr ""
 

-#: parser.yy:174 parser.yy:188 /home/phil/lilypond-git/lily/parser.yy:174
-#: /home/phil/lilypond-git/lily/parser.yy:188
-msgid "Too much lookahead"
-msgstr ""
-
-#: parser.yy:464 parser.yy:732 parser.yy:799
-#: /home/phil/lilypond-git/lily/parser.yy:464
-#: /home/phil/lilypond-git/lily/parser.yy:732
-#: /home/phil/lilypond-git/lily/parser.yy:799
+#: parser.yy:476 parser.yy:947 parser.yy:1028 parser.yy:1248

 msgid "bad expression type"
 msgstr ""
 
 msgid "bad expression type"
 msgstr ""
 

-#: parser.yy:628 parser.yy:1102 /home/phil/lilypond-git/lily/parser.yy:628
-#: /home/phil/lilypond-git/lily/parser.yy:1102
+#: parser.yy:859 parser.yy:1458 parser.yy:1503

 msgid "not a context mod"
 msgstr ""
 
 msgid "not a context mod"
 msgstr ""
 

-#: parser.yy:834 /home/phil/lilypond-git/lily/parser.yy:834
-msgid "score expected"
+#: parser.yy:1054
+msgid "Missing music in \\score"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:850 /home/phil/lilypond-git/lily/parser.yy:850
+#: parser.yy:1091

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

-#: parser.yy:874 /home/phil/lilypond-git/lily/parser.yy:874
-msgid "need \\paper for paper block"
+#: parser.yy:1126
+msgid "Spurious expression in \\score"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:1027 /home/phil/lilypond-git/lily/parser.yy:1027
-msgid "Ignoring non-music expression"
+#: parser.yy:1156
+msgid "need \\paper for paper block"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:1038 parser.yy:2293 /home/phil/lilypond-git/lily/parser.yy:1038
-#: /home/phil/lilypond-git/lily/parser.yy:2293
+#: parser.yy:1331

 msgid "music expected"
 msgstr ""
 
 msgid "music expected"
 msgstr ""
 

-#: parser.yy:1306 /home/phil/lilypond-git/lily/parser.yy:1306
+#: parser.yy:1341 parser.yy:1375
+msgid "unexpected post-event"
+msgstr ""
+
+#: parser.yy:1383
+msgid "Ignoring non-music expression"
+msgstr ""
+
+#: parser.yy:1691

 msgid "not a symbol"
 msgstr ""
 
 msgid "not a symbol"
 msgstr ""
 

-#: parser.yy:1997 parser.yy:2108 parser.yy:2121 parser.yy:2130
-#: /home/phil/lilypond-git/lily/parser.yy:1997
-#: /home/phil/lilypond-git/lily/parser.yy:2108
-#: /home/phil/lilypond-git/lily/parser.yy:2121
-#: /home/phil/lilypond-git/lily/parser.yy:2130
+#: parser.yy:2491 parser.yy:2605 parser.yy:2618 parser.yy:2627

 msgid "bad grob property path"
 msgstr ""
 
 msgid "bad grob property path"
 msgstr ""
 

-#: parser.yy:2088 /home/phil/lilypond-git/lily/parser.yy:2088
+#: parser.yy:2585

 msgid "only \\consists and \\remove take non-string argument."
 msgstr ""
 
 msgid "only \\consists and \\remove take non-string argument."
 msgstr ""
 

-#: parser.yy:2149 /home/phil/lilypond-git/lily/parser.yy:2149
+#: parser.yy:2646

 msgid "bad context property path"
 msgstr ""
 
 msgid "bad context property path"
 msgstr ""
 

-#: parser.yy:2242 parser.yy:2246 parser.yy:2261
-#: /home/phil/lilypond-git/lily/parser.yy:2242
-#: /home/phil/lilypond-git/lily/parser.yy:2246
-#: /home/phil/lilypond-git/lily/parser.yy:2261
+#: parser.yy:2731
+msgid "markup expected"
+msgstr ""
+
+#: parser.yy:2743

 msgid "simple string expected"
 msgstr ""
 
 msgid "simple string expected"
 msgstr ""
 

-#: parser.yy:2402 /home/phil/lilypond-git/lily/parser.yy:2402
+#: parser.yy:2760
+msgid "symbol expected"
+msgstr ""
+
+#: parser.yy:2896

 msgid "not a rhythmic event"
 msgstr ""
 
 msgid "not a rhythmic event"
 msgstr ""
 

-#: parser.yy:2498 parser.yy:2503 /home/phil/lilypond-git/lily/parser.yy:2498
-#: /home/phil/lilypond-git/lily/parser.yy:2503
+#: parser.yy:2946
+msgid "post-event expected"
+msgstr ""
+
+#: parser.yy:2955 parser.yy:2960

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

-#: parser.yy:2618 /home/phil/lilypond-git/lily/parser.yy:2618
-msgid "expecting string as script definition"
+#: parser.yy:3036
+msgid "expecting string or post-event as script definition"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:2713 /home/phil/lilypond-git/lily/parser.yy:2713
+#: parser.yy:3140

 msgid "not an articulation"
 msgstr ""
 
 msgid "not an articulation"
 msgstr ""
 

-#: parser.yy:2785 parser.yy:2831 /home/phil/lilypond-git/lily/parser.yy:2785
-#: /home/phil/lilypond-git/lily/parser.yy:2831
-#, c-format
-msgid "not a duration: %d"
+#: parser.yy:3212 parser.yy:3255
+msgid "not a duration"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:2848 /home/phil/lilypond-git/lily/parser.yy:2848
+#: parser.yy:3276

 msgid "bass number expected"
 msgstr ""
 
 msgid "bass number expected"
 msgstr ""
 

-#: parser.yy:2962 /home/phil/lilypond-git/lily/parser.yy:2962
+#: parser.yy:3368

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

-#: parser.yy:3021 /home/phil/lilypond-git/lily/parser.yy:3021
+#: parser.yy:3407

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

-#: parser.yy:3243 /home/phil/lilypond-git/lily/parser.yy:3243
+#: parser.yy:3450
+msgid "markup outside of text script or \\lyricmode"
+msgstr ""
+
+#: parser.yy:3455
+msgid "unrecognized string, not in text script or \\lyricmode"
+msgstr ""
+
+#: parser.yy:3607 parser.yy:3616
+msgid "not an unsigned integer"
+msgstr ""
+
+#: parser.yy:3703

 msgid "not a markup"
 msgstr ""
 
 msgid "not a markup"
 msgstr ""
 

-#: lexer.ll:209 /home/phil/lilypond-git/lily/lexer.ll:209
+#: lexer.ll:193

 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 

-#: lexer.ll:212 /home/phil/lilypond-git/lily/lexer.ll:212
+#: lexer.ll:196

 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 

-#: lexer.ll:270 /home/phil/lilypond-git/lily/lexer.ll:270
+#: lexer.ll:248

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

-#: lexer.ll:287 /home/phil/lilypond-git/lily/lexer.ll:287
+#: lexer.ll:265

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

-#: lexer.ll:291 /home/phil/lilypond-git/lily/lexer.ll:291
+#: lexer.ll:269

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

-#: lexer.ll:295 /home/phil/lilypond-git/lily/lexer.ll:295
+#: lexer.ll:273

 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 

-#: lexer.ll:319 /home/phil/lilypond-git/lily/lexer.ll:319
+#: lexer.ll:300

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

-#: lexer.ll:343 /home/phil/lilypond-git/lily/lexer.ll:343
+#: lexer.ll:324

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

-#: lexer.ll:369 /home/phil/lilypond-git/lily/lexer.ll:369
+#: lexer.ll:349

 msgid "string expected after \\include"
 msgstr ""
 
 msgid "string expected after \\include"
 msgstr ""
 

-#. backup rule
-#: lexer.ll:379 /home/phil/lilypond-git/lily/lexer.ll:379
+#: lexer.ll:359

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

-#: lexer.ll:691 /home/phil/lilypond-git/lily/lexer.ll:691
+#: lexer.ll:714

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

-#: lexer.ll:791 /home/phil/lilypond-git/lily/lexer.ll:791
+#: lexer.ll:719
+msgid "EOF found inside string"
+msgstr ""
+
+#: lexer.ll:734
+msgid "Unfinished main input"
+msgstr ""
+
+#: lexer.ll:805

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

-#: lexer.ll:913 /home/phil/lilypond-git/lily/lexer.ll:915
+#: lexer.ll:925

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

-#: lexer.ll:1196 /home/phil/lilypond-git/lily/lexer.ll:1198
+#: lexer.ll:945
+#, c-format
+msgid "undefined character or shorthand: %s"
+msgstr ""
+
+#: lexer.ll:1236

 msgid "non-UTF-8 input"
 msgstr ""
 
 msgid "non-UTF-8 input"
 msgstr ""
 

-#: lexer.ll:1240 /home/phil/lilypond-git/lily/lexer.ll:1242
+#: lexer.ll:1280
+#, c-format
+msgid "Invalid version string \"%s\""
+msgstr ""
+
+#: lexer.ll:1285

 #, c-format
 msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
 #, c-format
 msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 

-#: lexer.ll:1241 /home/phil/lilypond-git/lily/lexer.ll:1243
+#: lexer.ll:1286

 msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
 msgid "consider updating the input with the convert-ly script"
 msgstr ""
 

-#: lexer.ll:1247 /home/phil/lilypond-git/lily/lexer.ll:1249
+#: lexer.ll:1292

 #, c-format
 msgid "program too old: %s (file requires: %s)"
 msgstr ""
 
 #, c-format
 msgid "program too old: %s (file requires: %s)"
 msgstr ""
 

+#: auto-beam.scm:147
+msgid "Beam end fits no pattern"
+msgstr ""
+

 #: backend-library.scm:27
 #, scheme-format
 msgid "Invoking `~a'..."
 #: backend-library.scm:27
 #, scheme-format
 msgid "Invoking `~a'..."


@@ -3306,59 +3325,69 @@ msgstr ""
 msgid "`~a' failed (~a)\n"
 msgstr ""
 
 msgid "`~a' failed (~a)\n"
 msgstr ""
 

-#: backend-library.scm:90
+#: backend-library.scm:108

 #, scheme-format
 msgid "Converting to `~a'...\n"
 msgstr ""
 
 #. Do not try to guess the name of the png file,
 #. GS produces PNG files like BASE-page%d.png.
 #, scheme-format
 msgid "Converting to `~a'...\n"
 msgstr ""
 
 #. Do not try to guess the name of the png file,
 #. GS produces PNG files like BASE-page%d.png.

-#: backend-library.scm:99
+#: backend-library.scm:118

 #, scheme-format
 msgid "Converting to ~a..."
 msgstr ""
 
 #, scheme-format
 msgid "Converting to ~a..."
 msgstr ""
 

-#: backend-library.scm:137
+#: backend-library.scm:134
+#, scheme-format
+msgid "Copying to `~a'...\n"
+msgstr ""
+
+#: backend-library.scm:200
+#, scheme-format
+msgid "Deleting `~a'...\n"
+msgstr ""
+
+#: backend-library.scm:219

 #, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
 #, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 

-#: backend-library.scm:187
+#: backend-library.scm:268

 #, scheme-format
 msgid "missing stencil expression `~S'"
 msgstr ""
 
 #, scheme-format
 msgid "missing stencil expression `~S'"
 msgstr ""
 

-#: bar-line.scm:140
+#: bar-line.scm:133

 #, scheme-format
 msgid "Bar glyph ~a not known. Ignoring."
 msgstr ""
 
 #, scheme-format
 msgid "Bar glyph ~a not known. Ignoring."
 msgstr ""
 

-#: bar-line.scm:168
+#: bar-line.scm:161

 #, scheme-format
 msgid ""
 "Annotation '~a' is allowed in the first argument of a bar line definition "
 "only."
 msgstr ""
 
 #, scheme-format
 msgid ""
 "Annotation '~a' is allowed in the first argument of a bar line definition "
 "only."
 msgstr ""
 

-#: bar-line.scm:176
+#: bar-line.scm:169

 #, scheme-format
 msgid ""
 "Replacement '~a' is allowed in the last argument of a bar line definition "
 "only."
 msgstr ""
 
 #, scheme-format
 msgid ""
 "Replacement '~a' is allowed in the last argument of a bar line definition "
 "only."
 msgstr ""
 

-#: bar-line.scm:237
+#: bar-line.scm:230

 #, scheme-format
 msgid ""
 "add-bar-glyph-print-procedure: glyph '~a' has to be a single ASCII character."
 msgstr ""
 
 #, scheme-format
 msgid ""
 "add-bar-glyph-print-procedure: glyph '~a' has to be a single ASCII character."
 msgstr ""
 

-#: bar-line.scm:808
+#: bar-line.scm:795

 #, scheme-format
 msgid "No span bar glyph defined for bar glyph '~a'; ignoring."
 msgstr ""
 
 #, scheme-format
 msgid "No span bar glyph defined for bar glyph '~a'; ignoring."
 msgstr ""
 

-#: chord-entry.scm:52
+#: chord-entry.scm:55

 #, scheme-format
 msgid "Spurious garbage following chord: ~A"
 msgstr ""
 #, scheme-format
 msgid "Spurious garbage following chord: ~A"
 msgstr ""


@@ -3369,139 +3398,145 @@ msgstr ""
 msgid "symbol ~S redefined"
 msgstr ""
 
 msgid "symbol ~S redefined"
 msgstr ""
 

-#: define-event-classes.scm:69
+#: define-event-classes.scm:74

 #, scheme-format
 msgid "unknown parent class `~a'"
 msgstr ""
 
 #, scheme-format
 msgid "unknown parent class `~a'"
 msgstr ""
 

-#: define-markup-commands.scm:881
+#: define-event-classes.scm:108
+#, scheme-format
+msgid "Cannot redefine event class `~S'"
+msgstr ""
+
+#: define-event-classes.scm:110
+#, scheme-format
+msgid "Undefined parent event class `~S'"
+msgstr ""
+
+#: define-markup-commands.scm:1272

 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 

-#: define-markup-commands.scm:2608
+#: define-markup-commands.scm:3112

 #, scheme-format
 msgid "Cannot find glyph ~a"
 msgstr ""
 
 #, scheme-format
 msgid "Cannot find glyph ~a"
 msgstr ""
 

-#: define-markup-commands.scm:3034
+#: define-markup-commands.scm:3588

 #, scheme-format
 msgid "no brace found for point size ~S "
 msgstr ""
 
 #, scheme-format
 msgid "no brace found for point size ~S "
 msgstr ""
 

-#: define-markup-commands.scm:3035
+#: define-markup-commands.scm:3589

 #, scheme-format
 msgid "defaulting to ~S pt"
 msgstr ""
 
 #, scheme-format
 msgid "defaulting to ~S pt"
 msgstr ""
 

-#: define-markup-commands.scm:3188
+#: define-markup-commands.scm:3847

 #, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
 
 #, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
 

-#: define-markup-commands.scm:3397
+#: define-markup-commands.scm:4060

 #, scheme-format
 msgid "not a valid duration string: ~a - ignoring"
 msgstr ""
 
 #, scheme-format
 msgid "not a valid duration string: ~a - ignoring"
 msgstr ""
 

-#: define-music-types.scm:770
+#: define-music-types.scm:798

 #, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 

-#: define-music-types.scm:773
+#: define-music-types.scm:801

 #, scheme-format
 msgid "cannot find music object: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "cannot find music object: ~S"
 msgstr ""
 

-#: define-music-types.scm:792
+#: define-music-types.scm:821

 #, scheme-format
 #, scheme-format

-msgid "unknown repeat type `~S'"
-msgstr ""
-
-#: define-music-types.scm:793
-msgid "See define-music-types.scm for supported repeats"
+msgid "bad make-music argument: ~S"

 msgstr ""
 
 msgstr ""
 

-#: define-note-names.scm:971
+#: define-note-names.scm:1000

 msgid "Select note names language."
 msgstr ""
 
 msgid "Select note names language."
 msgstr ""
 

-#: define-note-names.scm:977
+#: define-note-names.scm:1006

 #, scheme-format
 msgid "Using `~a' note names..."
 msgstr ""
 
 #, scheme-format
 msgid "Using `~a' note names..."
 msgstr ""
 

-#: define-note-names.scm:980
+#: define-note-names.scm:1009

 #, scheme-format
 msgid "Could not find language `~a'.  Ignoring."
 msgstr ""
 
 #, scheme-format
 msgid "Could not find language `~a'.  Ignoring."
 msgstr ""
 

-#: document-backend.scm:132
+#: document-backend.scm:135

 #, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 

-#: document-backend.scm:189
+#: document-backend.scm:202

 #, scheme-format
 msgid "cannot find interface for property: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "cannot find interface for property: ~S"
 msgstr ""
 

-#: document-backend.scm:199
+#: document-backend.scm:212

 #, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr ""
 

-#: documentation-lib.scm:59
+#: documentation-lib.scm:62

 #, scheme-format
 msgid "Processing ~S..."
 msgstr ""
 
 #, scheme-format
 msgid "Processing ~S..."
 msgstr ""
 

-#: documentation-lib.scm:176
+#: documentation-lib.scm:178

 #, scheme-format
 msgid "Writing ~S..."
 msgstr ""
 
 #, scheme-format
 msgid "Writing ~S..."
 msgstr ""
 

-#: documentation-lib.scm:188
+#: documentation-lib.scm:190

 #, scheme-format
 msgid "cannot find description for property `~S' (~S)"
 msgstr ""
 
 #, scheme-format
 msgid "cannot find description for property `~S' (~S)"
 msgstr ""
 

-#: documentation-lib.scm:209
+#: documentation-lib.scm:211

 #, scheme-format
 msgid "cannot find description for property ~S (~S)"
 msgstr ""
 
 #, scheme-format
 msgid "cannot find description for property ~S (~S)"
 msgstr ""
 

-#: flag-styles.scm:151
+#: flag-styles.scm:155

 #, scheme-format
 msgid "flag stroke `~a' or `~a' not found"
 msgstr ""
 
 #, scheme-format
 msgid "flag stroke `~a' or `~a' not found"
 msgstr ""
 

-#: framework-eps.scm:108
+#: framework-eps.scm:112

 #, scheme-format
 msgid "Writing ~a..."
 msgstr ""
 
 #, scheme-format
 msgid "Writing ~a..."
 msgstr ""
 

-#: framework-ps.scm:250
+#: framework-ps.scm:286

 #, scheme-format
 msgid "cannot embed ~S=~S"
 msgstr ""
 
 #, scheme-format
 msgid "cannot embed ~S=~S"
 msgstr ""
 

-#: framework-ps.scm:293
+#: framework-ps.scm:329

 #, scheme-format
 msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
 #, scheme-format
 msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 

-#: framework-ps.scm:311
+#: framework-ps.scm:347

 #, scheme-format
 msgid "do not know how to embed ~S=~S"
 msgstr ""
 
 #, scheme-format
 msgid "do not know how to embed ~S=~S"
 msgstr ""
 

-#: framework-ps.scm:336
+#: framework-ps.scm:372

 #, scheme-format
 msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
 #, scheme-format
 msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 

-#: framework-ps.scm:686
+#: framework-ps.scm:728

 msgid ""
 "\n"
 "The PostScript backend does not support the\n"
 msgid ""
 "\n"
 "The PostScript backend does not support the\n"


@@ -3537,107 +3572,102 @@ msgstr ""
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 

-#: lily-library.scm:304
+#: lily-library.scm:333

 msgid "Music unsuitable for context-mod"
 msgstr ""
 
 msgid "Music unsuitable for context-mod"
 msgstr ""
 

-#: lily-library.scm:359
+#: lily-library.scm:388

 #, scheme-format
 msgid "Cannot find context-def \\~a"
 msgstr ""
 
 #, scheme-format
 msgid "Cannot find context-def \\~a"
 msgstr ""
 

-#: lily-library.scm:375
+#: lily-library.scm:404

 msgid "Music unsuitable for output-def"
 msgstr ""
 
 msgid "Music unsuitable for output-def"
 msgstr ""
 

-#: lily-library.scm:902
+#: lily-library.scm:920

 msgid ""
 "Find the index between @var{start} and @var{end} (an integer)\n"
 "which produces the closest match to @var{target-val} if\n"
 "applied to function @var{getter}."
 msgstr ""
 
 msgid ""
 "Find the index between @var{start} and @var{end} (an integer)\n"
 "which produces the closest match to @var{target-val} if\n"
 "applied to function @var{getter}."
 msgstr ""
 

-#: lily-library.scm:976
+#: lily-library.scm:1014

 #, scheme-format
 msgid "unknown unit: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "unknown unit: ~S"
 msgstr ""
 

-#: lily-library.scm:1001
+#: lily-library.scm:1039

 #, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
 #, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 

-#: lily-library.scm:1007
-msgid "old relative compatibility not used"
+#: lily.scm:93
+msgid "call-after-session used after session start"

 msgstr ""
 
 msgstr ""
 

-#: lily.scm:63
+#: lily.scm:111

 msgid "define-session used after session start"
 msgstr ""
 
 msgid "define-session used after session start"
 msgstr ""
 

-#: lily.scm:311
+#: lily.scm:417

 msgid "Using (ice-9 curried-definitions) module\n"
 msgstr ""
 
 msgid "Using (ice-9 curried-definitions) module\n"
 msgstr ""
 

-#: lily.scm:314
+#: lily.scm:420

 msgid "Guile 1.8\n"
 msgstr ""
 
 msgid "Guile 1.8\n"
 msgstr ""
 

-#: lily.scm:373
+#: lily.scm:477

 #, scheme-format
 msgid "cannot find: ~A"
 msgstr ""
 
 #, scheme-format
 msgid "cannot find: ~A"
 msgstr ""
 

-#: lily.scm:794
+#: lily.scm:903

 msgid "Success: compilation successfully completed"
 msgstr ""
 
 msgid "Success: compilation successfully completed"
 msgstr ""
 

-#: lily.scm:795
+#: lily.scm:904

 msgid "Compilation completed with warnings or errors"
 msgstr ""
 
 msgid "Compilation completed with warnings or errors"
 msgstr ""
 

-#: lily.scm:857
+#: lily.scm:965

 #, scheme-format
 msgid "job ~a terminated with signal: ~a"
 msgstr ""
 
 #, scheme-format
 msgid "job ~a terminated with signal: ~a"
 msgstr ""
 

-#: lily.scm:860
+#: lily.scm:968

 #, scheme-format
 msgid ""
 "logfile ~a (exit ~a):\n"
 "~a"
 msgstr ""
 
 #, scheme-format
 msgid ""
 "logfile ~a (exit ~a):\n"
 "~a"
 msgstr ""
 

-#: lily.scm:882 lily.scm:971
+#: lily.scm:990 lily.scm:1079

 #, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 

-#: lily.scm:962
+#: lily.scm:1070

 #, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
 
 #, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
 

-#: lily.scm:981 ps-to-png.scm:66
+#: lily.scm:1089

 #, scheme-format
 msgid "Invoking `~a'...\n"
 msgstr ""
 
 #, scheme-format
 msgid "Invoking `~a'...\n"
 msgstr ""
 

-#: ly-syntax-constructors.scm:66
+#: ly-syntax-constructors.scm:27

 #, scheme-format
 msgid "~a function cannot return ~a"
 msgstr ""
 
 #, scheme-format
 msgid "~a function cannot return ~a"
 msgstr ""
 

-#: ly-syntax-constructors.scm:75
+#: ly-syntax-constructors.scm:60

 #, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
 #, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 

-#: ly-syntax-constructors.scm:188
-#, scheme-format
-msgid "Invalid property operation ~a"
-msgstr ""
-

 #: markup-macros.scm:331
 #, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 #: markup-macros.scm:331
 #, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"


@@ -3677,82 +3707,106 @@ msgstr ""
 msgid "negative replication count; ignoring"
 msgstr ""
 
 msgid "negative replication count; ignoring"
 msgstr ""
 

-#: music-functions.scm:272
-msgid "More alternatives than repeats.  Junking excess alternatives"
+#: music-functions.scm:319
+#, scheme-format
+msgid "invalid tremolo repeat count: ~a"

 msgstr ""
 
 msgstr ""
 

-#: music-functions.scm:303
+#: music-functions.scm:348

 #, scheme-format
 #, scheme-format

-msgid "invalid tremolo repeat count: ~a"
+msgid "unknown repeat type `~S': must be volta, unfold, percent, or tremolo"

 msgstr ""
 
 msgstr ""
 

-#: music-functions.scm:459
+#: music-functions.scm:352
+msgid "More alternatives than repeats.  Junking excess alternatives"
+msgstr ""
+
+#: music-functions.scm:487

 #, scheme-format
 msgid "bad grob property path ~a"
 msgstr ""
 
 #, scheme-format
 msgid "bad grob property path ~a"
 msgstr ""
 

-#: music-functions.scm:765
+#: music-functions.scm:511
+#, scheme-format
+msgid "bad context property ~a"
+msgstr ""
+
+#: music-functions.scm:534
+#, scheme-format
+msgid "bad music property ~a"
+msgstr ""
+
+#: music-functions.scm:842

 msgid "Bad chord repetition"
 msgstr ""
 
 msgid "Bad chord repetition"
 msgstr ""
 

-#: music-functions.scm:800
+#: music-functions.scm:947

 #, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 

-#: music-functions.scm:1118
+#: music-functions.scm:1297

 #, scheme-format
 msgid "cannot find quoted music: `~S'"
 msgstr ""
 
 #, scheme-format
 msgid "cannot find quoted music: `~S'"
 msgstr ""
 

-#: music-functions.scm:1256
+#: music-functions.scm:1434

 msgid "Add @var{octave-shift} to the octave of @var{pitch}."
 msgstr ""
 
 msgid "Add @var{octave-shift} to the octave of @var{pitch}."
 msgstr ""
 

-#: music-functions.scm:1316
+#: music-functions.scm:1497

 #, scheme-format
 msgid "Unknown octaveness type: ~S "
 msgstr ""
 
 #, scheme-format
 msgid "Unknown octaveness type: ~S "
 msgstr ""
 

-#: music-functions.scm:1317
+#: music-functions.scm:1498

 msgid "Defaulting to 'any-octave."
 msgstr ""
 
 msgid "Defaulting to 'any-octave."
 msgstr ""
 

-#: music-functions.scm:1662
+#: music-functions.scm:1872

 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 

-#: output-ps.scm:278 output-svg.scm:524
+#: music-functions.scm:2097
+msgid "Missing duration"
+msgstr ""
+
+#: music-functions.scm:2633

 #, scheme-format
 #, scheme-format

-msgid "unknown line-cap-style: ~S"
+msgid "not a symbol list: ~a"

 msgstr ""
 
 msgstr ""
 

-#: output-ps.scm:283 output-svg.scm:530
+#: music-functions.scm:2636

 #, scheme-format
 #, scheme-format

-msgid "unknown line-join-style: ~S"
+msgid "conflicting tag group ~a"
+msgstr ""
+
+#: output-ps.scm:286 output-svg.scm:535
+#, scheme-format
+msgid "unknown line-cap-style: ~S"

 msgstr ""
 
 msgstr ""
 

-#: output-svg.scm:47
+#: output-ps.scm:291 output-svg.scm:541

 #, scheme-format
 #, scheme-format

-msgid "undefined: ~S"
+msgid "unknown line-join-style: ~S"

 msgstr ""
 
 msgstr ""
 

-#: output-svg.scm:157
+#: output-svg.scm:148

 #, scheme-format
 msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #, scheme-format
 msgid "cannot decypher Pango description: ~a"
 msgstr ""
 

-#: output-svg.scm:237
+#: output-svg.scm:228

 msgid "Glyph must have a unicode value"
 msgstr ""
 
 msgid "Glyph must have a unicode value"
 msgstr ""
 

-#: output-svg.scm:289 output-svg.scm:299
+#: output-svg.scm:280 output-svg.scm:290

 #, scheme-format
 msgid "cannot find SVG font ~S"
 msgstr ""
 
 #, scheme-format
 msgid "cannot find SVG font ~S"
 msgstr ""
 

-#: paper.scm:120
+#: paper.scm:121

 msgid "set-global-staff-size: not in toplevel scope"
 msgstr ""
 
 msgid "set-global-staff-size: not in toplevel scope"
 msgstr ""
 


@@ -3761,23 +3815,23 @@ msgstr ""
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 

-#: paper.scm:332
+#: paper.scm:329

 #, scheme-format
 msgid "Unknown paper size: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
 #, scheme-format
 msgid "Unknown paper size: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc

-#: paper.scm:347
+#: paper.scm:348

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

-#: parser-clef.scm:164 parser-clef.scm:215
+#: parser-clef.scm:154

 #, scheme-format
 msgid "unknown clef type `~a'"
 msgstr ""
 
 #, scheme-format
 msgid "unknown clef type `~a'"
 msgstr ""
 

-#: parser-clef.scm:165 parser-clef.scm:216
+#: parser-clef.scm:155

 #, scheme-format
 msgid "supported clefs: ~a"
 msgstr ""
 #, scheme-format
 msgid "supported clefs: ~a"
 msgstr ""


@@ -3786,55 +3840,60 @@ msgstr ""
 msgid "error in #{ ... #}"
 msgstr ""
 
 msgid "error in #{ ... #}"
 msgstr ""
 

-#: part-combiner.scm:598
+#: part-combiner.scm:931

 #, scheme-format
 msgid "quoted music `~a' is empty"
 msgstr ""
 
 #, scheme-format
 msgid "quoted music `~a' is empty"
 msgstr ""
 

-#: ps-to-png.scm:70
+#: ps-to-png.scm:72 ps-to-png.scm:75
+#, scheme-format
+msgid "Copying `~a' to `~a'..."
+msgstr ""
+
+#: ps-to-png.scm:77 ps-to-png.scm:79

 #, scheme-format
 #, scheme-format

-msgid "~a exited with status: ~S"
+msgid "Deleting `~a'..."

 msgstr ""
 
 msgstr ""
 

-#: to-xml.scm:191
+#: to-xml.scm:190

 #, scheme-format
 msgid "assertion failed: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "assertion failed: ~S"
 msgstr ""
 

-#: translation-functions.scm:375
+#: translation-functions.scm:379

 #, scheme-format
 msgid "Negative fret for pitch ~a on string ~a"
 msgstr ""
 
 #, scheme-format
 msgid "Negative fret for pitch ~a on string ~a"
 msgstr ""
 

-#: translation-functions.scm:378
+#: translation-functions.scm:384

 #, scheme-format
 msgid "Missing fret for pitch ~a on string ~a"
 msgstr ""
 
 #, scheme-format
 msgid "Missing fret for pitch ~a on string ~a"
 msgstr ""
 

-#: translation-functions.scm:421
+#: translation-functions.scm:427

 #, scheme-format
 msgid "No open string for pitch ~a"
 msgstr ""
 
 #, scheme-format
 msgid "No open string for pitch ~a"
 msgstr ""
 

-#: translation-functions.scm:436 translation-functions.scm:448
+#: translation-functions.scm:442 translation-functions.scm:454

 #, scheme-format
 msgid "Requested string for pitch requires negative fret: string ~a pitch ~a"
 msgstr ""
 
 #, scheme-format
 msgid "Requested string for pitch requires negative fret: string ~a pitch ~a"
 msgstr ""
 

-#: translation-functions.scm:439
+#: translation-functions.scm:445

 msgid "Ignoring string request and recalculating."
 msgstr ""
 
 msgid "Ignoring string request and recalculating."
 msgstr ""
 

-#: translation-functions.scm:451
+#: translation-functions.scm:457

 msgid "Ignoring note in tablature."
 msgstr ""
 
 msgid "Ignoring note in tablature."
 msgstr ""
 

-#: translation-functions.scm:474
+#: translation-functions.scm:482

 #, scheme-format
 msgid "No string for pitch ~a (given frets ~a)"
 msgstr ""
 
 #, scheme-format
 msgid "No string for pitch ~a (given frets ~a)"
 msgstr ""
 

-#: translation-functions.scm:579
+#: translation-functions.scm:587

 #, scheme-format
 msgid ""
 "No label for fret ~a (on string ~a);\n"
 #, scheme-format
 msgid ""
 "No label for fret ~a (on string ~a);\n"