Run grand-replace (issue 3765)

[lilypond.git] / po / lilypond.pot

diff --git a/po/lilypond.pot b/po/lilypond.pot
index adfe4a88c3f54516ad960b769fcbe2bf78c8a889..3635d6c210f9dcb9539f3d2dd46f79fa5027bb4d 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -1,226 +1,288 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Translation of LilyPond
+# Copyright (C) 1998--2014 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 ""
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 14:40+0100\n"
+"Project-Id-Version: lilypond 2.19.0\n"
+"Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
+"lilypond.bugs\n"
+"POT-Creation-Date: 2013-12-30 09:31+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"

-"Language: \n"

 "MIME-Version: 1.0\n"
 "MIME-Version: 1.0\n"

-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"

 "Content-Transfer-Encoding: 8bit\n"
 "Content-Transfer-Encoding: 8bit\n"

+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

 
 

-#: book_base.py:24
+#: book_base.py:26

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

-#: book_base.py:161
+#: book_base.py:164

 msgid "Output function not implemented"
 msgstr ""
 
 msgid "Output function not implemented"
 msgstr ""
 

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

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

-#: book_snippets.py:519
+#: book_latex.py:190
+#, python-format
+msgid "Running `%s' on file `%s' to detect default page settings.\n"
+msgstr ""
+
+#: book_latex.py:212 book_texinfo.py:228
+msgid "Unable to auto-detect default settings:\n"
+msgstr ""
+
+#: book_latex.py:224 book_texinfo.py:240
+#, python-format
+msgid ""
+"Unable to auto-detect default settings:\n"
+"%s"
+msgstr ""
+
+#: book_latex.py:247
+msgid "cannot detect textwidth from LaTeX"
+msgstr ""
+
+#: book_snippets.py:406

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

-#: book_snippets.py:521
+#: book_snippets.py:408

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

-#: book_snippets.py:524
+#: book_snippets.py:411

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

-#: book_snippets.py:526
+#: book_snippets.py:413

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

-#: book_snippets.py:544
+#: book_snippets.py:530

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

-#: book_snippets.py:736
+#: book_snippets.py:621

 #, python-format
 #, python-format

-msgid "Opening filter `%s'\n"
+msgid "Missing files: %s"

 msgstr ""
 
 msgstr ""
 

-#: book_snippets.py:756
+#: book_snippets.py:651
+#, python-format
+msgid "Could not overwrite file %s"
+msgstr ""
+
+#: book_snippets.py:738
+#, python-format
+msgid "Running through filter `%s'"
+msgstr ""
+
+#: book_snippets.py:759

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

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

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

-#: convertrules.py:12
+#: book_snippets.py:880
+#, python-format
+msgid "Converting MusicXML file `%s'...\n"
+msgstr ""
+
+#: book_snippets.py:907
+#, python-format
+msgid ""
+"%s: duplicate filename but different contents of original file,\n"
+"printing diff against existing file."
+msgstr ""
+
+#: book_snippets.py:920
+#, python-format
+msgid ""
+"%s: duplicate filename but different contents of converted lilypond file,\n"
+"printing diff against existing file."
+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:
+#: book_texinfo.py:206

 #, python-format
 #, python-format

-msgid "Not smart enough to convert %s"
+msgid "Running texi2pdf on file %s to detect default page settings.\n"

 msgstr ""
 
 #: convertrules.py:13
 msgstr ""
 
 #: convertrules.py:13

-msgid "Please refer to the manual for details, and update manually."
+#, python-format
+msgid "Not smart enough to convert %s."

 msgstr ""
 
 #: convertrules.py:14
 msgstr ""
 
 #: convertrules.py:14

+msgid "Please refer to the manual for details, and update manually."
+msgstr ""
+
+#: 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:78 musicexp.py:17 convert-ly.py:64 warn.cc:66
-#: input.cc:109
+#: 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:99
+#: convertrules.py:50 convertrules.py:95

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

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

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

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

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

-#: convertrules.py:86 convertrules.py:1905 convertrules.py:2084
-#: convertrules.py:2236 convertrules.py:2566 convertrules.py:2862
+#: convertrules.py:82 convertrules.py:1856 convertrules.py:2032
+#: convertrules.py:2175 convertrules.py:2506 convertrules.py:2801
+#: convertrules.py:3151 convertrules.py:3385

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

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

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

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

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

-#: convertrules.py:184
+#: 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:216 convertrules.py:699 convertrules.py:1383
-#: convertrules.py:2378
+#: 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:290
+#: convertrules.py:280

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

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

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

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

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

-#: convertrules.py:342
+#: 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:395
-msgid "change property definiton case (eg. onevoice -> oneVoice)"
+#: convertrules.py:377
+msgid "change property definition case (eg. onevoice -> oneVoice)"

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

-#: convertrules.py:963 convertrules.py:1682 convertrules.py:1942
-#: convertrules.py:2189
+#: convertrules.py:709
+msgid "automaticMelismata is turned on by default since 1.5.67."
+msgstr ""
+
+#: 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:1001 convertrules.py:1005
+#: convertrules.py:978 convertrules.py:981

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

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

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

-#: convertrules.py:1273
+#: 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:1286
+#: convertrules.py:1260

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

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

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

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

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

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

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

-#: convertrules.py:1400
+#: 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:1407
+#: 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:1432
+#: convertrules.py:1395

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


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

-#: convertrules.py:1446
+#: 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 "


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

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

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

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

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

-#: convertrules.py:1628
+#: 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:1632
+#: convertrules.py:1586

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

-#: convertrules.py:1643 convertrules.py:1650 convertrules.py:1661
+#: 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:1643
+#: convertrules.py:1597

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

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

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

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

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

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

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

-#: convertrules.py:1780
+#: convertrules.py:1732 convertrules.py:2139 convertrules.py:2143
+#: convertrules.py:2709

 #, python-format
 #, python-format

-msgid "use %s"
+msgid "Use %s\n"

 msgstr ""
 
 msgstr ""
 

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

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

-#: convertrules.py:1924
+#: 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:2010
+#: 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:2048
+#: 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"


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

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

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

-#: convertrules.py:2136
+#: 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:2149
+#: convertrules.py:2095

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

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

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

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

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

-#: convertrules.py:2158
+#: 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:2212
+#: convertrules.py:2154

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

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

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

-#: convertrules.py:2219
+#: 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:2333
+#: convertrules.py:2272

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: convertrules.py:2651
-msgid "edge-text settings for TextSpanner."
+#: convertrules.py:2591
+msgid "edge-text settings for TextSpanner"

 msgstr ""
 
 msgstr ""
 

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

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


@@ -393,119 +456,124 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: convertrules.py:2685
+#: 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:2686
+#: convertrules.py:2626

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

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

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

-#: convertrules.py:2699
+#: 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:2705
-msgid "all settings related to dashed lines.\n"
+#: convertrules.py:2645
+msgid "all settings related to dashed lines"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:2706
+#: 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:2707
+#: 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:2743
+#: 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:2748
+#: convertrules.py:2689

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

-#: convertrules.py:2749
+#: 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:2812
-msgid "\\put-adjacent argument order.\n"
+#: convertrules.py:2708
+#, python-format
+msgid "%s in fret-diagram properties"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:2813
+#: convertrules.py:2752
+msgid "\\put-adjacent argument order"
+msgstr ""
+
+#: 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:2814
+#: convertrules.py:2754

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

-#: convertrules.py:2845
-msgid "re-definition of InnerStaffGroup.\n"
+#: convertrules.py:2785
+msgid "re-definition of InnerStaffGroup"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:2851
-msgid "re-definition of InnerChoirStaff.\n"
+#: convertrules.py:2790
+msgid "re-definition of InnerChoirStaff"

 msgstr ""
 
 msgstr ""
 

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

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

-#: convertrules.py:2866
+#: 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:2872
+#: 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:2879
+#: convertrules.py:2816

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

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

 msgid ""
 "oldaddlyrics is no longer supported. \n"
 "         Use addlyrics or lyrsicsto instead.\n"
 msgstr ""
 
 msgid ""
 "oldaddlyrics is no longer supported. \n"
 "         Use addlyrics or lyrsicsto instead.\n"
 msgstr ""
 

-#: convertrules.py:2889
+#: 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:2894
+#: 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:2900
+#: 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:2906
+#: convertrules.py:2843

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

-#: convertrules.py:2912
+#: convertrules.py:2849

 msgid "Dash parameters for slurs and ties are now in 'dash-details.\n"
 msgstr ""
 
 msgid "Dash parameters for slurs and ties are now in 'dash-details.\n"
 msgstr ""
 

-#: convertrules.py:2917
+#: 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"


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

-#: convertrules.py:2931
-msgid ""
-"override-auto-beam-setting.\n"
-"   Autobeam settings are now overriden with \\overrideBeamSettings.\n"
+#: convertrules.py:2868
+msgid "    Autobeam settings are now overriden with \\overrideBeamSettings.\n"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:2936
-msgid ""
-"override-auto-beam-setting.\n"
-"   Autobeam settings are now reverted with \\revertBeamSettings.\n"
+#: convertrules.py:2873
+msgid "    Autobeam settings are now reverted with \\revertBeamSettings.\n"

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 msgid ""

-"beatGrouping. \n"
-"   beatGrouping with a specified context must now be accomplished with\n"
+"    beatGrouping with a specified context must now be accomplished with\n"

 "   \\overrideBeamSettings.\n"
 msgstr ""
 
 "   \\overrideBeamSettings.\n"
 msgstr ""
 

-#: convertrules.py:2947
+#: 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:2958
+#: 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"


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

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

 msgid ""
 msgid ""

-"minimum-Y-extent; vertical spacing no longer depends on the Y-extent of a "
-"VerticalAxisGroup.\n"
+"Vertical spacing no longer depends on the Y-extent of a VerticalAxisGroup.\n"

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

-#: convertrules.py:3017
+#: 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:3035
-msgid ""
-"\\overrideBeamSettings.  Use \\set beamExceptions or "
-"\\overrideTimeSignatureSettings.\n"
-msgstr ""
-
-#: convertrules.py:3039
-msgid ""
-"\\revertBeamSettings. Use \\set beamExceptions or "
-"\\revertTimeSignatureSettings.\n"
+#: convertrules.py:2979
+msgid "Use \\set beamExceptions or \\overrideTimeSignatureSettings.\n"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:3043
-msgid "beamSettings. Use baseMoment, beatStructure, and beamExceptions.\n"
+#: convertrules.py:2983
+msgid "Use \\set beamExceptions or \\revertTimeSignatureSettings.\n"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:3047
-msgid "beatLength. Use baseMoment and beatStructure.\n"
+#: convertrules.py:2987
+msgid "Use baseMoment, beatStructure, and beamExceptions.\n"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:3051
-msgid "setbeatGrouping. Use baseMoment and beatStructure.\n"
+#: convertrules.py:2991 convertrules.py:2995
+msgid "Use baseMoment and beatStructure.\n"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:3056
+#: 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"


@@ -610,77 +664,125 @@ msgid ""
 "instead."
 msgstr ""
 
 "instead."
 msgstr ""
 

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

 msgid ""
 msgid ""

-"woodwind-diagrams.  Move size, thickness, and graphic to properties.  "
-"Argument should be just the key list.\n"
+"Move size, thickness, and graphic to properties.  Argument should be just "
+"the key list.\n"

 msgstr ""
 
 msgstr ""
 

-#: convertrules.py:3069
+#: 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:3087
+#: convertrules.py:3031

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

-#: convertrules.py:3103
+#: 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:3108
+#: 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:3113
+#: 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:3119
+#: 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:3127
+#: convertrules.py:3068

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

-#: convertrules.py:3128
+#: 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:3133
+#: convertrules.py:3074

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

-#: convertrules.py:3140
+#: 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:3180
-msgid "Vertical spacing changes might affect user-defined contexts.  "
+#: convertrules.py:3124
+msgid "Vertical spacing changes might affect user-defined contexts."

 msgstr ""
 
 msgstr ""
 

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

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

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

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

-#: convertrules.py:3201
+#: convertrules.py:3146
+msgid "Clarinet fingering changed to reflect actual anatomy of instrument.\n"
+msgstr ""
+
+#: convertrules.py:3156
+msgid "Handling of non-automatic footnotes."
+msgstr ""
+
+#: 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 ""
+
+#: convertrules.py:3165
+msgid "Change in internal property for MultiMeasureRest"
+msgstr ""
+
+#: 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 ""
+
+#: convertrules.py:3174
+msgid ""
+"Creation of a Flag grob and moving of certain Stem properties to this grob"
+msgstr ""
+
+#: convertrules.py:3210
+msgid ""
+"consistent-broken-slope is now handled through the positions callback.\n"
+msgstr ""
+
+#: convertrules.py:3211
+msgid ""
+"input/regression/beam-broken-classic.ly shows how broken beams are now "
+"handled.\n"
+msgstr ""
+
+#: convertrules.py:3369
+msgid "beamExceptions controls whole-measure beaming."
+msgstr ""
+
+#: convertrules.py:3606
+msgid "Flag.transparent and Flag.color inherit from Stem"
+msgstr ""
+
+#: convertrules.py:3672

 msgid ""
 msgid ""

-"woodwind-diagrams.  Clarinet fingering changed to reflect actual anatomy of "
-"instrument.\n"
+"Staff-padding now controls the distance to the baseline, not the nearest "
+"point."

 msgstr ""
 
 #: fontextract.py:25
 msgstr ""
 
 #: fontextract.py:25


@@ -698,216 +800,253 @@ msgstr ""
 msgid "Writing fonts to %s"
 msgstr ""
 
 msgid "Writing fonts to %s"
 msgstr ""
 

-#: lilylib.py:81 musicxml.py:13 convert-ly.py:67 warn.cc:72 input.cc:115
-#: input.cc:123
+#: lilylib.py:101
+#, python-format
+msgid "Setting loglevel to %s"
+msgstr ""
+
+#: lilylib.py:104
+#, python-format
+msgid "Unknown or invalid loglevel '%s'"
+msgstr ""
+
+#: lilylib.py:133 warn.cc:211

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

-#: lilylib.py:124 lilylib.py:175
+#: lilylib.py:190
+#, python-format
+msgid "Processing %s.ly"
+msgstr ""
+
+#: lilylib.py:194 lilylib.py:255

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

-#: lilylib.py:126 lilylib.py:177
+#: lilylib.py:196 lilylib.py:257

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

-#: lilylib.py:253
+#: lilylib.py:333

 #, python-format
 msgid "Usage: %s"
 msgstr ""
 
 #, python-format
 msgid "Usage: %s"
 msgstr ""
 

-#: musicexp.py:216 musicexp.py:221
+#: musicexp.py:224 musicexp.py:229

 msgid "Language does not support microtones contained in the piece"
 msgstr ""
 
 msgid "Language does not support microtones contained in the piece"
 msgstr ""
 

-#: musicexp.py:483
+#: musicexp.py:491

 msgid "Tuplet brackets of curved shape are not correctly implemented"
 msgstr ""
 
 msgid "Tuplet brackets of curved shape are not correctly implemented"
 msgstr ""
 

-#: musicexp.py:669
+#: musicexp.py:677

 #, python-format
 msgid "unable to set the music %(music)s for the repeat %(repeat)s"
 msgstr ""
 
 #, python-format
 msgid "unable to set the music %(music)s for the repeat %(repeat)s"
 msgstr ""
 

-#: musicexp.py:678
+#: musicexp.py:686

 msgid "encountered repeat without body"
 msgstr ""
 
 #. no self.elements!
 msgid "encountered repeat without body"
 msgstr ""
 
 #. no self.elements!

-#: musicexp.py:848
+#: musicexp.py:856

 #, python-format
 msgid "Grace note with no following music: %s"
 msgstr ""
 
 #, python-format
 msgid "Grace note with no following music: %s"
 msgstr ""
 

-#: musicexp.py:1010
+#: musicexp.py:1018

 #, python-format
 msgid "Invalid octave shift size found: %s. Using no shift."
 msgstr ""
 
 #, python-format
 msgid "Invalid octave shift size found: %s. Using no shift."
 msgstr ""
 

-#: musicexp.py:1468
+#: musicexp.py:1476

 #, python-format
 msgid "Unable to convert alteration %s to a lilypond expression"
 msgstr ""
 
 #. TODO: Handle pieces without a time signature!
 #, python-format
 msgid "Unable to convert alteration %s to a lilypond expression"
 msgstr ""
 
 #. TODO: Handle pieces without a time signature!

-#: musicxml.py:358
+#: musicxml.py:361

 msgid "Senza-misura time signatures are not yet supported!"
 msgstr ""
 
 msgid "Senza-misura time signatures are not yet supported!"
 msgstr ""
 

-#: musicxml.py:376
+#: musicxml.py:379

 msgid "Unable to interpret time signature! Falling back to 4/4."
 msgstr ""
 
 msgid "Unable to interpret time signature! Falling back to 4/4."
 msgstr ""
 

-#: musicxml.py:432
+#: musicxml.py:435

 #, python-format
 msgid ""
 "Key alteration octave given for a non-existing alteration nr. %s, available "
 "numbers: %s!"
 msgstr ""
 
 #, python-format
 msgid ""
 "Key alteration octave given for a non-existing alteration nr. %s, available "
 "numbers: %s!"
 msgstr ""
 

-#: musicxml.py:520
+#: musicxml.py:523

 #, python-format
 msgid "Unable to find instrument for ID=%s\n"
 msgstr ""
 
 #, python-format
 msgid "Unable to find instrument for ID=%s\n"
 msgstr ""
 

-#: abc2ly.py:1373 convert-ly.py:87 lilypond-book.py:122 midi2ly.py:969
+#: abc2ly.py:1386 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:1374
+#: abc2ly.py:1387

 #, 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:1382 convert-ly.py:94 etf2ly.py:1206 lilypond-book.py:212
-#: midi2ly.py:1011 musicxml2ly.py:2580 main.cc:168
+#: abc2ly.py:1395 convert-ly.py:92 etf2ly.py:1208 lilypond-book.py:231
+#: midi2ly.py:1095 musicxml2ly.py:2590 main.cc:181

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

-#: abc2ly.py:1386 convert-ly.py:98 etf2ly.py:1202 lilypond-book.py:140
-#: midi2ly.py:984 musicxml2ly.py:2562 main.cc:157
+#: abc2ly.py:1398 convert-ly.py:96 etf2ly.py:1204 lilypond-book.py:140
+#: midi2ly.py:1062 musicxml2ly.py:2572 main.cc:160

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

-#: abc2ly.py:1388 etf2ly.py:1207 midi2ly.py:992
+#: abc2ly.py:1401 etf2ly.py:1209 midi2ly.py:1071

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

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

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

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

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

+#: abc2ly.py:1410
+msgid "suppress progress messages"
+msgstr ""
+

 #. Translators, please translate this string as
 #. "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"
 #. Translators, please translate this string as
 #. "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:1395 convert-ly.py:144 etf2ly.py:1216 lilypond-book.py:234
-#: midi2ly.py:1024 musicxml2ly.py:2648 main.cc:281
+#: abc2ly.py:1413 convert-ly.py:157 etf2ly.py:1218 lilypond-book.py:258
+#: midi2ly.py:1107 musicxml2ly.py:2674 main.cc:315

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

-#: convert-ly.py:44
+#: 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:46 lilypond-book.py:82
+#: convert-ly.py:50
+msgid "If FILE is `-', read from standard input."
+msgstr ""
+
+#: convert-ly.py:52 lilypond-book.py:82

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

-#: convert-ly.py:81 etf2ly.py:1189 lilypond-book.py:116 midi2ly.py:90
+#: 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:83 etf2ly.py:1191 lilypond-book.py:118 midi2ly.py:92
+#: 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:84 etf2ly.py:1192 lilypond-book.py:119 midi2ly.py:93
+#: 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:102 convert-ly.py:135
+#: convert-ly.py:100 convert-ly.py:141

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

-#: convert-ly.py:104
+#: 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:107
+#: convert-ly.py:105

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

-#: convert-ly.py:111
-msgid "do not add \\version command if missing"
+#: 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 ""
+
+#: convert-ly.py:111 lilypond-book.py:163 lilypond-book.py:181
+#: musicxml2ly.py:2629 main.cc:174
+msgid "LOGLEVEL"

 msgstr ""
 
 #: convert-ly.py:117
 msgstr ""
 
 #: convert-ly.py:117

+msgid "do not add \\version command if missing"
+msgstr ""
+
+#: 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:123
+#: 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:129
+#: 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:134
+#: 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:139 etf2ly.py:1210 lilypond-book.py:215 midi2ly.py:1012
-#: main.cc:170
+#: 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:183

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

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

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

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

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

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

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

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

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

-#: convert-ly.py:332
+#: convert-ly.py:368

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

-#: convert-ly.py:339
+#: convert-ly.py:374

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

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

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


@@ -915,20 +1054,27 @@ msgid ""
 "`2.8.12'"
 msgstr ""
 
 "`2.8.12'"
 msgstr ""
 

-#: etf2ly.py:1195
+#: convert-ly.py:386
+#, python-format
+msgid "There was %d error."
+msgid_plural "There were %d errors."
+msgstr[0] ""
+msgstr[1] ""
+
+#: etf2ly.py:1197

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

-#: etf2ly.py:1196
+#: etf2ly.py:1198

 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
 "Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
 "file.\n"
 msgstr ""
 
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
 "Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
 "file.\n"
 msgstr ""
 

-#: etf2ly.py:1208 midi2ly.py:988 midi2ly.py:993 musicxml2ly.py:2640
-#: main.cc:161 main.cc:166
+#: etf2ly.py:1210 midi2ly.py:1067 midi2ly.py:1072 musicxml2ly.py:2659
+#: main.cc:166 main.cc:178

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


@@ -967,8 +1113,8 @@ msgstr ""
 msgid "add DIR to include path"
 msgstr ""
 
 msgid "add DIR to include path"
 msgstr ""
 

-#: lilypond-book.py:143 lilypond-book.py:150 lilypond-book.py:163
-#: lilypond-book.py:173 lilypond-book.py:189 lilypond-book.py:195 main.cc:160
+#: 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:165

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


@@ -986,414 +1132,472 @@ msgid ""
 msgstr ""
 
 #: lilypond-book.py:162
 msgstr ""
 
 #: lilypond-book.py:162

+msgid "Print lilypond log messages according to LOGLEVEL"
+msgstr ""
+
+#: lilypond-book.py:168

 msgid "write lily-XXX files to DIR, link into --output dir"
 msgstr ""
 
 msgid "write lily-XXX files to DIR, link into --output dir"
 msgstr ""
 

-#: lilypond-book.py:167
+#: lilypond-book.py:173

 msgid ""
 "Load the additional python PACKAGE (containing e.g. a custom output format)"
 msgstr ""
 
 msgid ""
 "Load the additional python PACKAGE (containing e.g. a custom output format)"
 msgstr ""
 

-#: lilypond-book.py:168
+#: lilypond-book.py:174

 msgid "PACKAGE"
 msgstr ""
 
 msgid "PACKAGE"
 msgstr ""
 

-#: lilypond-book.py:172
+#: lilypond-book.py:186

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

-#: lilypond-book.py:177
+#: lilypond-book.py:191

 msgid "COMMAND"
 msgstr ""
 
 msgid "COMMAND"
 msgstr ""
 

-#: lilypond-book.py:178
+#: lilypond-book.py:192

 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 

-#: lilypond-book.py:182
+#: lilypond-book.py:197
+msgid "Redirect the lilypond output"
+msgstr ""
+
+#: lilypond-book.py:201

 msgid "Compile snippets in safe mode"
 msgstr ""
 
 msgid "Compile snippets in safe mode"
 msgstr ""
 

-#: lilypond-book.py:188
+#: lilypond-book.py:207

 msgid "do not fail if no lilypond output is found"
 msgstr ""
 
 msgid "do not fail if no lilypond output is found"
 msgstr ""
 

-#: lilypond-book.py:194
+#: lilypond-book.py:213

 msgid "do not fail if no PNG images are found for EPS files"
 msgstr ""
 
 msgid "do not fail if no PNG images are found for EPS files"
 msgstr ""
 

-#: lilypond-book.py:200
+#: lilypond-book.py:219

 msgid "write snippet output files with the same base name as their source file"
 msgstr ""
 
 msgid "write snippet output files with the same base name as their source file"
 msgstr ""
 

-#: lilypond-book.py:204 midi2ly.py:1005 musicxml2ly.py:2585 main.cc:169
+#: lilypond-book.py:223 midi2ly.py:1090 musicxml2ly.py:2596

 msgid "be verbose"
 msgstr ""
 
 msgid "be verbose"
 msgstr ""
 

-#: lilypond-book.py:220
+#: lilypond-book.py:239

 msgid ""
 "run executable PROG instead of latex, or in\n"
 "case --pdf option is set instead of pdflatex"
 msgstr ""
 
 msgid ""
 "run executable PROG instead of latex, or in\n"
 "case --pdf option is set instead of pdflatex"
 msgstr ""
 

-#: lilypond-book.py:222
+#: lilypond-book.py:241 lilypond-book.py:246

 msgid "PROG"
 msgstr ""
 
 msgid "PROG"
 msgstr ""
 

-#: lilypond-book.py:228
+#: lilypond-book.py:245
+msgid "run executable PROG instead of texi2pdf"
+msgstr ""
+
+#: lilypond-book.py:252

 msgid "create PDF files for use with PDFTeX"
 msgstr ""
 
 msgid "create PDF files for use with PDFTeX"
 msgstr ""
 

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

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

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

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

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

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

-#: lilypond-book.py:452
+#: lilypond-book.py:475
+msgid "Linking files..."
+msgstr ""
+
+#: 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:461
+#: 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:475
+#: lilypond-book.py:517

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

-#: lilypond-book.py:537
+#: 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:541
+#: lilypond-book.py:584

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

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

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

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

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

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

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

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

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

-#: midi2ly.py:99
+#: lilypond-book.py:714
+#, python-format
+msgid "Setting LilyPond's loglevel to %s"
+msgstr ""
+
+#: lilypond-book.py:718
+#, python-format
+msgid ""
+"Setting LilyPond's loglevel to %s (from environment variable "
+"LILYPOND_LOGLEVEL)"
+msgstr ""
+
+#: lilypond-book.py:721
+msgid ""
+"Setting LilyPond's output to --verbose, implied by lilypond-book's setting"
+msgstr ""
+
+#: midi2ly.py:90

 msgid "warning: "
 msgstr ""
 
 msgid "warning: "
 msgstr ""
 

-#: midi2ly.py:102 midi2ly.py:1037
+#: midi2ly.py:93 midi2ly.py:1124

 msgid "error: "
 msgstr ""
 
 msgid "error: "
 msgstr ""
 

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

 msgid "Exiting... "
 msgstr ""
 
 msgid "Exiting... "
 msgstr ""
 

-#: midi2ly.py:957
+#: midi2ly.py:835
+msgid "found more than 5 voices on a staff, expect bad output"
+msgstr ""
+
+#: midi2ly.py:1032

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

-#: midi2ly.py:970
+#: midi2ly.py:1045

 #, python-format
 msgid "Convert %s to LilyPond input.\n"
 msgstr ""
 
 #, python-format
 msgid "Convert %s to LilyPond input.\n"
 msgstr ""
 

-#: midi2ly.py:975
+#: midi2ly.py:1050

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

-#: midi2ly.py:977 midi2ly.py:998
+#: midi2ly.py:1052 midi2ly.py:1080

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

-#: midi2ly.py:978
+#: midi2ly.py:1053

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

-#: midi2ly.py:981
+#: midi2ly.py:1056
+msgid "debug printing"
+msgstr ""
+
+#: midi2ly.py:1059

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

-#: midi2ly.py:986
+#: midi2ly.py:1064

 msgid "prepend FILE to output"
 msgstr ""
 
 msgid "prepend FILE to output"
 msgstr ""
 

-#: midi2ly.py:989
+#: midi2ly.py:1068

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

-#: midi2ly.py:990
+#: midi2ly.py:1069

 msgid "ALT[:MINOR]"
 msgstr ""
 
 msgid "ALT[:MINOR]"
 msgstr ""
 

-#: midi2ly.py:995
+#: midi2ly.py:1074

 msgid "preview of first 4 bars"
 msgstr ""
 
 msgid "preview of first 4 bars"
 msgstr ""
 

-#: midi2ly.py:997
+#: midi2ly.py:1078
+msgid "suppress progress messages and warnings about excess voices"
+msgstr ""
+
+#: midi2ly.py:1079

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

-#: midi2ly.py:1000
+#: midi2ly.py:1083
+msgid "use s instead of r for rests"
+msgstr ""
+
+#: midi2ly.py:1085

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

-#: midi2ly.py:1003
+#: midi2ly.py:1088

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

-#: midi2ly.py:1015
+#: midi2ly.py:1098

 msgid "treat every text as a lyric"
 msgstr ""
 
 msgid "treat every text as a lyric"
 msgstr ""
 

-#: midi2ly.py:1018
+#: midi2ly.py:1101

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

-#: midi2ly.py:1038
+#: midi2ly.py:1125

 msgid "no files specified on command line."
 msgstr ""
 
 msgid "no files specified on command line."
 msgstr ""
 

-#: musicxml2ly.py:223
+#: musicxml2ly.py:228

 #, python-format
 msgid ""
 "Encountered file created by %s, containing wrong beaming information. All "
 "beaming information in the MusicXML file will be ignored"
 msgstr ""
 
 #, python-format
 msgid ""
 "Encountered file created by %s, containing wrong beaming information. All "
 "beaming information in the MusicXML file will be ignored"
 msgstr ""
 

-#: musicxml2ly.py:239 musicxml2ly.py:241
+#: musicxml2ly.py:247 musicxml2ly.py:249

 #, python-format
 msgid "Unprocessed PartGroupInfo %s encountered"
 msgstr ""
 
 #, python-format
 msgid "Unprocessed PartGroupInfo %s encountered"
 msgstr ""
 

-#: musicxml2ly.py:494
+#: musicxml2ly.py:500

 #, python-format
 msgid "Encountered note at %s without type and duration (=%s)"
 msgstr ""
 
 #, python-format
 msgid "Encountered note at %s without type and duration (=%s)"
 msgstr ""
 

-#: musicxml2ly.py:514
+#: musicxml2ly.py:520

 #, python-format
 msgid ""
 "Encountered rational duration with denominator %s, unable to convert to "
 "lilypond duration"
 msgstr ""
 
 #, python-format
 msgid ""
 "Encountered rational duration with denominator %s, unable to convert to "
 "lilypond duration"
 msgstr ""
 

-#: musicxml2ly.py:761
+#: musicxml2ly.py:767

 msgid "Unable to extract key signature!"
 msgstr ""
 
 msgid "Unable to extract key signature!"
 msgstr ""
 

-#: musicxml2ly.py:788
+#: musicxml2ly.py:794

 #, python-format
 msgid "unknown mode %s, expecting 'major' or 'minor' or a church mode!"
 msgstr ""
 
 #, python-format
 msgid "unknown mode %s, expecting 'major' or 'minor' or a church mode!"
 msgstr ""
 

-#: musicxml2ly.py:926
+#: musicxml2ly.py:932

 #, python-format
 msgid "Encountered unprocessed marker %s\n"
 msgstr ""
 
 #, python-format
 msgid "Encountered unprocessed marker %s\n"
 msgstr ""
 

-#: musicxml2ly.py:1020
+#: musicxml2ly.py:1026

 #, python-format
 msgid "unknown span event %s"
 msgstr ""
 
 #, python-format
 msgid "unknown span event %s"
 msgstr ""
 

-#: musicxml2ly.py:1030
+#: musicxml2ly.py:1036

 #, python-format
 msgid "unknown span type %s for %s"
 msgstr ""
 
 #, python-format
 msgid "unknown span type %s for %s"
 msgstr ""
 

-#: musicxml2ly.py:1450
+#: musicxml2ly.py:1456

 msgid "Unknown metronome mark, ignoring"
 msgstr ""
 
 #. TODO: Implement the other (more complex) way for tempo marks!
 msgid "Unknown metronome mark, ignoring"
 msgstr ""
 
 #. TODO: Implement the other (more complex) way for tempo marks!

-#: musicxml2ly.py:1455
+#: musicxml2ly.py:1461

 msgid ""
 "Metronome marks with complex relations (<metronome-note> in MusicXML) are "
 "not yet implemented."
 msgstr ""
 
 msgid ""
 "Metronome marks with complex relations (<metronome-note> in MusicXML) are "
 "not yet implemented."
 msgstr ""
 

-#: musicxml2ly.py:1657
+#: musicxml2ly.py:1663

 #, python-format
 msgid "Unable to convert chord type %s to lilypond."
 msgstr ""
 
 #, python-format
 msgid "Unable to convert chord type %s to lilypond."
 msgstr ""
 

-#: musicxml2ly.py:1806
+#: musicxml2ly.py:1816

 #, python-format
 msgid "drum %s type unknown, please add to instrument_drumtype_dict"
 msgstr ""
 
 #, python-format
 msgid "drum %s type unknown, please add to instrument_drumtype_dict"
 msgstr ""
 

-#: musicxml2ly.py:1810
+#: musicxml2ly.py:1820

 msgid "cannot find suitable event"
 msgstr ""
 
 msgid "cannot find suitable event"
 msgstr ""
 

-#: musicxml2ly.py:1958
+#: musicxml2ly.py:1968

 #, python-format
 msgid "Negative skip %s (from position %s to %s)"
 msgstr ""
 
 #, python-format
 msgid "Negative skip %s (from position %s to %s)"
 msgstr ""
 

-#: musicxml2ly.py:2099
+#: musicxml2ly.py:2109

 #, python-format
 msgid "Negative skip found: from %s to %s, difference is %s"
 msgstr ""
 
 #, python-format
 msgid "Negative skip found: from %s to %s, difference is %s"
 msgstr ""
 

-#: musicxml2ly.py:2180
+#: musicxml2ly.py:2190

 #, python-format
 msgid "unexpected %s; expected %s or %s or %s"
 msgstr ""
 
 #, python-format
 msgid "unexpected %s; expected %s or %s or %s"
 msgstr ""
 

-#: musicxml2ly.py:2286
+#: musicxml2ly.py:2296

 msgid "Encountered closing slur, but no slur is open"
 msgstr ""
 
 msgid "Encountered closing slur, but no slur is open"
 msgstr ""
 

-#: musicxml2ly.py:2289
+#: musicxml2ly.py:2299

 msgid "Cannot have two simultaneous (closing) slurs"
 msgstr ""
 
 msgid "Cannot have two simultaneous (closing) slurs"
 msgstr ""
 

-#: musicxml2ly.py:2298
+#: musicxml2ly.py:2308

 msgid "Cannot have a slur inside another slur"
 msgstr ""
 
 msgid "Cannot have a slur inside another slur"
 msgstr ""
 

-#: musicxml2ly.py:2301
+#: musicxml2ly.py:2311

 msgid "Cannot have two simultaneous slurs"
 msgstr ""
 
 msgid "Cannot have two simultaneous slurs"
 msgstr ""
 

-#: musicxml2ly.py:2435
+#: musicxml2ly.py:2445

 #, python-format
 msgid "cannot simultaneously have more than one mode: %s"
 msgstr ""
 
 #, python-format
 msgid "cannot simultaneously have more than one mode: %s"
 msgstr ""
 

-#: musicxml2ly.py:2543
+#: musicxml2ly.py:2553

 msgid "Converting to LilyPond expressions..."
 msgstr ""
 
 msgid "Converting to LilyPond expressions..."
 msgstr ""
 

-#: musicxml2ly.py:2554
+#: musicxml2ly.py:2564

 msgid "musicxml2ly [OPTION]... FILE.xml"
 msgstr ""
 
 msgid "musicxml2ly [OPTION]... FILE.xml"
 msgstr ""
 

-#: musicxml2ly.py:2556
+#: musicxml2ly.py:2566

 msgid ""
 "Convert MusicXML from FILE.xml to LilyPond input.\n"
 "If the given filename is -, musicxml2ly reads from the command line.\n"
 msgstr ""
 
 msgid ""
 "Convert MusicXML from FILE.xml to LilyPond input.\n"
 "If the given filename is -, musicxml2ly reads from the command line.\n"
 msgstr ""
 

-#: musicxml2ly.py:2566
+#: musicxml2ly.py:2576

 msgid ""
 msgid ""

-"Copyright (c) 2005--2011 by\n"
+"Copyright (c) 2005--2014 by\n"

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

-#: musicxml2ly.py:2591
+#: musicxml2ly.py:2602

 msgid "use lxml.etree; uses less memory and cpu time"
 msgstr ""
 
 msgid "use lxml.etree; uses less memory and cpu time"
 msgstr ""
 

-#: musicxml2ly.py:2597
+#: musicxml2ly.py:2608

 msgid "input file is a zip-compressed MusicXML file"
 msgstr ""
 
 msgid "input file is a zip-compressed MusicXML file"
 msgstr ""
 

-#: musicxml2ly.py:2603
+#: musicxml2ly.py:2614

 msgid "convert pitches in relative mode (default)"
 msgstr ""
 
 msgid "convert pitches in relative mode (default)"
 msgstr ""
 

-#: musicxml2ly.py:2608
+#: musicxml2ly.py:2619

 msgid "convert pitches in absolute mode"
 msgstr ""
 
 msgid "convert pitches in absolute mode"
 msgstr ""
 

-#: musicxml2ly.py:2611
+#: musicxml2ly.py:2622

 msgid "LANG"
 msgstr ""
 
 msgid "LANG"
 msgstr ""
 

-#: musicxml2ly.py:2613
+#: musicxml2ly.py:2624

 msgid "use LANG for pitch names, e.g. 'deutsch' for note names in German"
 msgstr ""
 
 msgid "use LANG for pitch names, e.g. 'deutsch' for note names in German"
 msgstr ""
 

-#: musicxml2ly.py:2619
+#: musicxml2ly.py:2638

 msgid "do not convert directions (^, _ or -) for articulations, dynamics, etc."
 msgstr ""
 
 msgid "do not convert directions (^, _ or -) for articulations, dynamics, etc."
 msgstr ""
 

-#: musicxml2ly.py:2625
+#: musicxml2ly.py:2644

 msgid "do not convert exact vertical positions of rests"
 msgstr ""
 
 msgid "do not convert exact vertical positions of rests"
 msgstr ""
 

-#: musicxml2ly.py:2631
+#: musicxml2ly.py:2650

 msgid "do not convert the exact page layout and breaks"
 msgstr ""
 
 msgid "do not convert the exact page layout and breaks"
 msgstr ""
 

-#: musicxml2ly.py:2637
+#: musicxml2ly.py:2656

 msgid ""
 "do not convert beaming information, use lilypond's automatic beaming instead"
 msgstr ""
 
 msgid ""
 "do not convert beaming information, use lilypond's automatic beaming instead"
 msgstr ""
 

-#: musicxml2ly.py:2645
+#: musicxml2ly.py:2664

 msgid "set output filename to FILE, stdout if -"
 msgstr ""
 
 msgid "set output filename to FILE, stdout if -"
 msgstr ""
 

-#: musicxml2ly.py:2728
+#: musicxml2ly.py:2670
+msgid "activate midi-block"
+msgstr ""
+
+#: musicxml2ly.py:2754

 #, python-format
 msgid "unknown part in part-list: %s"
 msgstr ""
 
 #, python-format
 msgid "unknown part in part-list: %s"
 msgstr ""
 

-#: musicxml2ly.py:2790
+#: musicxml2ly.py:2816

 msgid "Input is compressed, extracting raw MusicXML data from stdin"
 msgstr ""
 
 msgid "Input is compressed, extracting raw MusicXML data from stdin"
 msgstr ""
 

-#: musicxml2ly.py:2793
+#: musicxml2ly.py:2829

 #, python-format
 msgid "Input file %s is compressed, extracting raw MusicXML data"
 msgstr ""
 
 #, python-format
 msgid "Input file %s is compressed, extracting raw MusicXML data"
 msgstr ""
 

-#: musicxml2ly.py:2823
+#: musicxml2ly.py:2859

 msgid "Reading MusicXML from Standard input ..."
 msgstr ""
 
 msgid "Reading MusicXML from Standard input ..."
 msgstr ""
 

-#: musicxml2ly.py:2825
+#: musicxml2ly.py:2861

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

-#: musicxml2ly.py:2858
+#: musicxml2ly.py:2894

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

-#: musicxml2ly.py:2925
+#: musicxml2ly.py:2964

 #, python-format
 msgid "Unable to find input file %s"
 msgstr ""
 
 #, python-format
 msgid "Unable to find input file %s"
 msgstr ""
 

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

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

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

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

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

 #: getopt-long.cc:153
 #, c-format
 msgid "option `%s' requires an argument"
 #: getopt-long.cc:153
 #, c-format
 msgid "option `%s' requires an argument"


@@ -1414,20 +1618,51 @@ msgstr ""
 msgid "invalid argument `%s' to option `%s'"
 msgstr ""
 
 msgid "invalid argument `%s' to option `%s'"
 msgstr ""
 

-#: warn.cc:59
+#: warn.cc:56
+#, c-format
+msgid "Log level set to %d\n"
+msgstr ""
+
+#: warn.cc:89
+#, c-format
+msgid "unknown log level `%s', using default (INFO)"
+msgstr ""
+
+#. Some expected warning was not triggered, so print out a warning.
+#: warn.cc:112
+#, c-format
+msgid "%d expected warning(s) not encountered: "
+msgstr ""
+
+#: warn.cc:183

 #, c-format
 #, c-format

-msgid "success: %s"
+msgid "fatal error: %s"

 msgstr ""
 
 msgstr ""
 

-#: warn.cc:86 grob.cc:617 input.cc:97
+#: warn.cc:192
+#, c-format
+msgid "suppressed programming error: %s"
+msgstr ""
+
+#: warn.cc:197

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

-#: warn.cc:87 input.cc:98
+#: warn.cc:198

 msgid "continuing, cross fingers"
 msgstr ""
 
 msgid "continuing, cross fingers"
 msgstr ""
 

+#: warn.cc:207
+#, c-format
+msgid "suppressed error: %s"
+msgstr ""
+
+#: warn.cc:219
+#, c-format
+msgid "suppressed warning: %s"
+msgstr ""
+

 #: accidental-engraver.cc:180
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 #: accidental-engraver.cc:180
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"


@@ -1438,16 +1673,16 @@ msgstr ""
 msgid "procedure or context-name expected for accidental rule, found %s"
 msgstr ""
 
 msgid "procedure or context-name expected for accidental rule, found %s"
 msgstr ""
 

-#: accidental.cc:200
+#: accidental.cc:170

 #, 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:215
+#: accidental.cc:186

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

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

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


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

+#: arpeggio.cc:138
+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 ""
 
 #: 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:631
+#: axis-group-interface.cc:714
+#, c-format
+msgid "\"%s\" is not a valid outside-staff-placement-directive"
+msgstr ""
+
+#: axis-group-interface.cc:786

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


@@ -1482,38 +1726,33 @@ 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:150
+#: 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:274
+#: beam-engraver.cc:293

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

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

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

-#: beam.cc:180
-msgid "removing beam with no stems"
-msgstr ""
-

 #. We are completely screwed.
 #. We are completely screwed.

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

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

-#: break-alignment-interface.cc:206
-#, c-format
-msgid "No spacing entry from %s to `%s'"
+#: beam.cc:181
+msgid "removing beam with no stems"

 msgstr ""
 
 #: change-iterator.cc:34
 msgstr ""
 
 #: change-iterator.cc:34


@@ -1563,17 +1802,16 @@ msgstr ""
 msgid "junking empty cluster"
 msgstr ""
 
 msgid "junking empty cluster"
 msgstr ""
 

-#: coherent-ligature-engraver.cc:111
+#: coherent-ligature-engraver.cc:110

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

-#. if we get to here, just put everything on one line
-#: constrained-breaking.cc:189 constrained-breaking.cc:207
+#: constrained-breaking.cc:187 constrained-breaking.cc:206

 msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 
 msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 

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

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


@@ -1582,58 +1820,65 @@ msgstr ""
 msgid "cannot find or create new `%s'"
 msgstr ""
 
 msgid "cannot find or create new `%s'"
 msgstr ""
 

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

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

-#: context.cc:269
+#: context.cc:425

 #, c-format
 #, c-format

-msgid "Invalid CreateContext event: Cannot create %s context"
+msgid "cannot find or create: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: context.cc:400
+#: context.cc:439

 #, c-format
 #, c-format

-msgid "cannot find or create: `%s'"
+msgid "cannot find or create new Bottom = \"%s\""

 msgstr ""
 
 msgstr ""
 

-#: custos.cc:88
+#: custos.cc:87

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

-#: dispatcher.cc:82
-msgid "Event class should be a symbol"
+#: dispatcher.cc:89
+msgid "Event class should be a list"

 msgstr ""
 
 msgstr ""
 

-#: dispatcher.cc:89
+#: dispatcher.cc:172

 #, c-format
 #, c-format

-msgid "Unknown event class %s"
+msgid "Junking event: %s"

 msgstr ""
 
 msgstr ""
 

-#: dots.cc:48
-#, c-format
-msgid "dot `%s' not found"
+#: dispatcher.cc:277
+msgid "Attempting to remove nonexisting listener."

 msgstr ""
 
 msgstr ""
 

-#: dynamic-engraver.cc:197
-msgid "cannot find start of (de)crescendo"
+#: dispatcher.cc:303
+msgid "Already listening to dispatcher, ignoring request"

 msgstr ""
 
 msgstr ""
 

-#: dynamic-engraver.cc:206
-msgid "already have a decrescendo"
+#: dots.cc:48
+#, c-format
+msgid "dot `%s' not found"

 msgstr ""
 
 msgstr ""
 

-#: dynamic-engraver.cc:208
-msgid "already have a crescendo"
+#: dynamic-engraver.cc:168
+#, c-format
+msgid ""
+"unknown crescendo style: %s\n"
+"defaulting to hairpin."

 msgstr ""
 
 msgstr ""
 

-#: dynamic-engraver.cc:211
-msgid "cresc starts here"
+#: dynamic-engraver.cc:233 slur-proto-engraver.cc:119
+#, c-format
+msgid "unterminated %s"

 msgstr ""
 
 msgstr ""
 

-#: dynamic-engraver.cc:339
-msgid "unterminated (de)crescendo"
+#. No explicit dynamic script events have occurred yet, but there is
+#. nevertheless a dynamic spanner.  Initialize last_volume_ to a
+#. value within the available range.
+#: dynamic-performer.cc:129
+msgid "(De)crescendo with unspecified starting volume in MIDI."

 msgstr ""
 
 #: episema-engraver.cc:75
 msgstr ""
 
 #: episema-engraver.cc:75


@@ -1648,63 +1893,74 @@ msgstr ""
 msgid "unterminated episema"
 msgstr ""
 
 msgid "unterminated episema"
 msgstr ""
 

-#: extender-engraver.cc:170 extender-engraver.cc:179
+#: extender-engraver.cc:169 extender-engraver.cc:178

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

-#: font-config-scheme.cc:152 font-config.cc:55
+#: flag.cc:134
+#, c-format
+msgid "flag `%s' not found"
+msgstr ""
+
+#: flag.cc:154
+#, c-format
+msgid "flag stroke `%s' not found"
+msgstr ""
+
+#: font-config-scheme.cc:151 font-config.cc:53

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

-#: font-config-scheme.cc:154 font-config.cc:57
+#: font-config-scheme.cc:153 font-config.cc:55

 #, c-format
 #, c-format

-msgid "adding font directory: %s"
+msgid "Adding font directory: %s"

 msgstr ""
 
 msgstr ""
 

-#: font-config-scheme.cc:168
+#: font-config-scheme.cc:167

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

-#: font-config-scheme.cc:170
+#: font-config-scheme.cc:169

 #, c-format
 #, c-format

-msgid "adding font file: %s"
+msgid "Adding font file: %s"

 msgstr ""
 
 msgstr ""
 

-#: font-config.cc:40
+#: font-config.cc:38

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

-#: font-config.cc:61
+#: font-config.cc:58

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

-#: general-scheme.cc:306
-msgid "infinity or NaN encountered while converting Real number"
+#: footnote-engraver.cc:87
+msgid "Must be footnote-event."

 msgstr ""
 
 msgstr ""
 

-#: general-scheme.cc:307
-msgid "setting to zero"
+#: general-scheme.cc:390
+#, c-format
+msgid "failed redirecting stderr to `%s'"

 msgstr ""
 
 msgstr ""
 

-#: general-scheme.cc:543
-msgid "Found infinity or nan in output. Substituting 0.0"
+#: general-scheme.cc:469 output-ps.scm:48
+msgid "Found infinity or nan in output.  Substituting 0.0"

 msgstr ""
 
 msgstr ""
 

-#: glissando-engraver.cc:105
+#: glissando-engraver.cc:158

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

-#: global-context-scheme.cc:96 global-context-scheme.cc:114
+#: global-context-scheme.cc:95 global-context-scheme.cc:113

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

-#: global-context-scheme.cc:104
-msgid "Interpreting music... "
+#: global-context-scheme.cc:103
+msgid "Interpreting music..."

 msgstr ""
 
 msgstr ""
 

-#: global-context-scheme.cc:127
+#: global-context-scheme.cc:125

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


@@ -1739,29 +1995,29 @@ msgstr ""
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 

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

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

-#: grob-property.cc:173
+#: grob.cc:488

 #, c-format
 #, c-format

-msgid "cyclic dependency: calculation-in-progress encountered for #'%s (%s)"
+msgid "ignored infinite %s-offset"

 msgstr ""
 
 msgstr ""
 

-#: grob.cc:286
-msgid "Infinity or NaN encountered"
+#: hairpin.cc:60
+msgid "Asking for broken bound padding at a non-broken bound."

 msgstr ""
 
 msgstr ""
 

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

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

-#: horizontal-bracket-engraver.cc:78
+#: horizontal-bracket-engraver.cc:62

 msgid "do not have that many brackets"
 msgstr ""
 
 msgid "do not have that many brackets"
 msgstr ""
 

-#: horizontal-bracket-engraver.cc:87
+#: horizontal-bracket-engraver.cc:71

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


@@ -1773,7 +2029,7 @@ msgstr ""
 msgid "unterminated hyphen; removing"
 msgstr ""
 
 msgid "unterminated hyphen; removing"
 msgstr ""
 

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

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


@@ -1783,111 +2039,131 @@ msgstr ""
 msgid "(search path: `%s')"
 msgstr ""
 
 msgid "(search path: `%s')"
 msgstr ""
 

-#: input.cc:131 source-file.cc:179 source-file.cc:194
+#: input.cc:138 source-file.cc:178 source-file.cc:193

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

-#: key-signature-interface.cc:78
+#: key-engraver.cc:198
+msgid "Incomplete keyAlterationOrder for key signature"
+msgstr ""
+
+#: key-signature-interface.cc:77

 #, c-format
 msgid "No glyph found for alteration: %s"
 msgstr ""
 
 #, c-format
 msgid "No glyph found for alteration: %s"
 msgstr ""
 

-#: key-signature-interface.cc:88
+#: key-signature-interface.cc:87

 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:185
+#: ligature-engraver.cc:189

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

-#: ligature-engraver.cc:214
+#: 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:215
+#: ligature-engraver.cc:217

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

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

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

-#: lily-guile.cc:437
+#: lily-guile.cc:412

 #, 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:440
+#: lily-guile.cc:415

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

-#: lily-guile.cc:447
-msgid "doing assignment anyway"
+#: lily-guile.cc:422
+msgid "skipping assignment"

 msgstr ""
 
 msgstr ""
 

-#: lily-guile.cc:459
+#: 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:264
+#: lily-lexer.cc:249

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

-#: lily-lexer.cc:291
+#: lily-lexer.cc:276

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

-#: lily-lexer.cc:312
+#: lily-lexer.cc:297 lily-lexer.cc:310

 #, c-format
 #, c-format

-msgid "error at EOF: %s"
+msgid "%s:EOF"

 msgstr ""
 
 msgstr ""
 

-#: lily-parser-scheme.cc:82
+#: lily-parser-scheme.cc:80

 #, c-format
 msgid "Changing working directory to: `%s'"
 msgstr ""
 
 #, c-format
 msgid "Changing working directory to: `%s'"
 msgstr ""
 

+#: lily-parser-scheme.cc:84
+#, c-format
+msgid "unable to change directory to: `%s'"
+msgstr ""
+

 #: lily-parser-scheme.cc:99
 #, c-format
 msgid "cannot find init file: `%s'"
 msgstr ""
 
 #: lily-parser-scheme.cc:99
 #, c-format
 msgid "cannot find init file: `%s'"
 msgstr ""
 

-#: lily-parser-scheme.cc:118
+#: lily-parser-scheme.cc:117

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

-#: lily-parser-scheme.cc:204
+#: lily-parser-scheme.cc:209

 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.cc:106
+#: lily-parser-scheme.cc:240
+msgid ""
+"ly:parse-string-expression is only valid with a new parser.  Use ly:parser-"
+"include-string instead."
+msgstr ""
+
+#: lily-parser.cc:107

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

-#: lily-parser.cc:134
-msgid "braces do not match"
+#: lookup.cc:181
+#, c-format
+msgid "Not drawing a box with negative dimension, %.2f by %.2f."
+msgstr ""
+
+#: lyric-combine-music-iterator.cc:199
+msgid "argument of \\lyricsto should contain Lyrics context"

 msgstr ""
 
 #: lyric-combine-music-iterator.cc:337
 msgstr ""
 
 #: lyric-combine-music-iterator.cc:337


@@ -1895,11 +2171,11 @@ msgstr ""
 msgid "cannot find Voice `%s'"
 msgstr ""
 
 msgid "cannot find Voice `%s'"
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: main.cc:109
+#: main.cc:104

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


@@ -1908,11 +2184,12 @@ msgid ""
 "information.\n"
 msgstr ""
 
 "information.\n"
 msgstr ""
 

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

 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"

-"modify it under the terms of the GNU General Public License version 2\n"
-"as published by the Free Software Foundation.\n"
+"modify it under the terms of the GNU General Public License as \n"
+"published by the Free Software Foundation, either version 3 of\n"
+"the License, or (at your option) any later version.\n"

 "\n"
 "    This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "\n"
 "    This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"


@@ -1925,84 +2202,98 @@ msgid ""
 "Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
 "Boston, MA 02111-1307, USA.\n"
 msgstr ""
 

-#: main.cc:146
+#: main.cc:148

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

-#: main.cc:147
+#: main.cc:149

 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:150
+#: main.cc:153

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

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

 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:153
+#: main.cc:156

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

-#: main.cc:153
+#: main.cc:156

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

-#: main.cc:154
+#: main.cc:157

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

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

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

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

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

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

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

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

 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:160
+#: main.cc:165

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

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

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

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

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

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

 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:166
+#: main.cc:174
+msgid ""
+"print log messages according to LOGLEVEL.  Possible values are:\n"
+"NONE, ERROR, WARNING, BASIC, PROGRESS, INFO (default) and DEBUG."
+msgstr ""
+
+#: main.cc:178

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

-#: main.cc:167
+#: main.cc:179

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

+#: main.cc:180
+msgid "no progress, only error messages (equivalent to loglevel=ERROR)"
+msgstr ""
+
+#: main.cc:182
+msgid "be verbose (equivalent to loglevel=DEBUG)"
+msgstr ""
+

 #. Do not update the copyright years here, run `make grand-replace'
 #. Do not update the copyright years here, run `make grand-replace'

-#: main.cc:238
+#: main.cc:261

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


@@ -2010,118 +2301,118 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.

-#: main.cc:265
+#: main.cc:299

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

-#: main.cc:267
+#: main.cc:301

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

-#: main.cc:269
+#: main.cc:303

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

-#: main.cc:271
+#: main.cc:305

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

-#: main.cc:273
+#: main.cc:307

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

-#: main.cc:327
+#: main.cc:374

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

-#: main.cc:341
+#: main.cc:388

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

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

 #, 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:358
+#: main.cc:405

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

-#: main.cc:360
+#: main.cc:407

 #, 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:368
+#: main.cc:415

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

-#: main.cc:375
+#: main.cc:422

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

-#: main.cc:381
+#: main.cc:428

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

-#: main.cc:387
+#: main.cc:434

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

-#: main.cc:628
+#: main.cc:805

 #, 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:157
+#: mark-engraver.cc:156

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

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

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

-#: mensural-ligature-engraver.cc:96
+#: mensural-ligature-engraver.cc:100

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

-#: mensural-ligature-engraver.cc:123
+#: mensural-ligature-engraver.cc:127

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

-#: mensural-ligature-engraver.cc:137
+#: mensural-ligature-engraver.cc:141

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

-#: mensural-ligature-engraver.cc:148
+#: mensural-ligature-engraver.cc:152

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

-#: mensural-ligature-engraver.cc:159
+#: mensural-ligature-engraver.cc:163

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

-#: mensural-ligature-engraver.cc:202
+#: mensural-ligature-engraver.cc:206

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

-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:216

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

-#: mensural-ligature-engraver.cc:232
+#: mensural-ligature-engraver.cc:236

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


@@ -2129,29 +2420,30 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
 "or the ligatura must be LB or SSB"
 msgstr ""
 

-#: mensural-ligature-engraver.cc:386
+#: mensural-ligature-engraver.cc:396

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

-#: mensural-ligature.cc:171
-msgid "Mensural_ligature: unexpected case fall-through"
-msgstr ""
-
-#: mensural-ligature.cc:233
-msgid "Mensural_ligature: (join_right == 0)"
+#: midi-control-function-performer.cc:109 staff-performer.cc:152
+#, c-format
+msgid "ignoring out-of-range value change for MIDI property `%s'"

 msgstr ""
 
 msgstr ""
 

-#: midi-item.cc:92
+#: midi-item.cc:93

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

-#: midi-stream.cc:39
+#: midi-item.cc:179
+msgid "Time signature with more than 255 beats.  Truncating"
+msgstr ""
+
+#: 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 ""


@@ -2164,45 +2456,29 @@ msgstr ""
 msgid "Calculating page breaks..."
 msgstr ""
 
 msgid "Calculating page breaks..."
 msgstr ""
 

-#: music-iterator.cc:182
-msgid "Sending non-event to context"
-msgstr ""
-
-#: music.cc:151
-#, c-format
-msgid "octave check failed; expected \"%s\", found: \"%s\""
-msgstr ""
-
-#: music.cc:219
-msgid "(normalized pitch)"
+#: multi-measure-rest.cc:154
+msgid ""
+"usable-duration-logs must be a non-empty list.  Falling back to whole rests."

 msgstr ""
 
 msgstr ""
 

-#: music.cc:223
-#, c-format
-msgid "Transposing %s by %s makes alteration larger than double"
+#: multi-measure-rest.cc:364
+msgid "Using naive multi measure rest spacing."

 msgstr ""
 
 msgstr ""
 

-#: new-dynamic-engraver.cc:142
+#: music.cc:150

 #, c-format
 #, c-format

-msgid ""
-"unknown crescendo style: %s\n"
-"defaulting to hairpin."
-msgstr ""
-
-#: new-dynamic-engraver.cc:200
-#, c-format
-msgid "unterminated %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""

 msgstr ""
 
 msgstr ""
 

-#: new-fingering-engraver.cc:106
+#: new-fingering-engraver.cc:113

 msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
 msgid "cannot add text scripts to individual note heads"
 msgstr ""
 

-#: new-fingering-engraver.cc:250
+#: new-fingering-engraver.cc:269

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

-#: new-fingering-engraver.cc:251
+#: new-fingering-engraver.cc:270

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


@@ -2210,11 +2486,11 @@ msgstr ""
 msgid "ignoring too many clashing note columns"
 msgstr ""
 
 msgid "ignoring too many clashing note columns"
 msgstr ""
 

-#: note-column.cc:135
+#: note-column.cc:147

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

-#: note-head.cc:76
+#: note-head.cc:95

 #, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr ""
 #, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr ""


@@ -2223,41 +2499,37 @@ msgstr ""
 msgid "NoteEvent without pitch"
 msgstr ""
 
 msgid "NoteEvent without pitch"
 msgstr ""
 

-#: open-type-font.cc:44
+#: open-type-font.cc:46

 #, c-format
 msgid "cannot allocate %lu bytes"
 msgstr ""
 
 #, c-format
 msgid "cannot allocate %lu bytes"
 msgstr ""
 

-#: open-type-font.cc:48
+#: open-type-font.cc:50

 #, c-format
 msgid "cannot load font table: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot load font table: %s"
 msgstr ""
 

-#: open-type-font.cc:53
+#: open-type-font.cc:55

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

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

 #, 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:114

 #, 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:189

 #, 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:250
-msgid "Invalid index for character"
-msgstr ""
-
-#: open-type-font.cc:319 pango-font.cc:187
+#: open-type-font.cc:337 pango-font.cc:257

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


@@ -2267,38 +2539,38 @@ msgstr ""
 msgid "Finding the ideal number of pages..."
 msgstr ""
 
 msgid "Finding the ideal number of pages..."
 msgstr ""
 

-#: optimal-page-breaking.cc:85
+#: 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:105
+#: optimal-page-breaking.cc:114

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

-#: optimal-page-breaking.cc:107
+#: 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:109
+#: 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:119 optimal-page-breaking.cc:173
+#: 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:138 optimal-page-breaking.cc:201
+#: 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:208 page-turn-page-breaking.cc:248
-#: paper-score.cc:163
+#: optimal-page-breaking.cc:216 page-turn-page-breaking.cc:248
+#: paper-score.cc:162

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


@@ -2312,34 +2584,38 @@ msgid ""
 "values"
 msgstr ""
 
 "values"
 msgstr ""
 

-#: page-breaking.cc:248
+#: 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:253
+#: 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:322
+#: page-breaking.cc:636
+#, c-format
+msgid "page %d has been compressed"
+msgstr ""
+
+#: page-layout-problem.cc:402

 msgid ""
 msgid ""

-"couldn't 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:325
-#, c-format
-msgid "couldn't fit music on page: overflow is %f"
+#: page-layout-problem.cc:731
+msgid "ragged-bottom was specified, but page must be compressed"

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: page-layout-problem.cc:765
+#: page-layout-problem.cc:1199

 msgid "staff-affinities should only decrease"
 msgstr ""
 
 msgid "staff-affinities should only decrease"
 msgstr ""
 


@@ -2384,19 +2660,24 @@ msgstr ""
 msgid "\tprevious break: %d"
 msgstr ""
 
 msgid "\tprevious break: %d"
 msgstr ""
 

-#: pango-font.cc:204
+#: pango-font.cc:246
+#, c-format
+msgid "no glyph for character U+%0X in font `%s'"
+msgstr ""
+
+#: pango-font.cc:273

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

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

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


@@ -2410,7 +2691,7 @@ msgstr ""
 msgid "program option -dpreview not supported by backend `%s'"
 msgstr ""
 
 msgid "program option -dpreview not supported by backend `%s'"
 msgstr ""
 

-#: paper-column-engraver.cc:245
+#: 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?"


@@ -2421,24 +2702,25 @@ msgstr ""
 msgid "Layout output to `%s'..."
 msgstr ""
 
 msgid "Layout output to `%s'..."
 msgstr ""
 

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

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

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

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

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

 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"
+#: pdf-scheme.cc:65
+#, c-format
+msgid "Conversion of string `%s' to UTF-16be failed: %s"

 msgstr ""
 
 msgstr ""
 

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

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


@@ -2446,45 +2728,33 @@ msgstr ""
 msgid "Track..."
 msgstr ""
 
 msgid "Track..."
 msgstr ""
 

-#: performance.cc:83
-msgid "MIDI channel wrapped around"
-msgstr ""
-
-#: performance.cc:84
-msgid "remapping modulo 16"
-msgstr ""
-
-#: performance.cc:111
+#: performance.cc:82

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

-#: phrasing-slur-engraver.cc:157
-msgid "unterminated phrasing slur"
-msgstr ""
-
-#: piano-pedal-engraver.cc:298
+#: piano-pedal-engraver.cc:279

 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 

-#: piano-pedal-engraver.cc:313 piano-pedal-engraver.cc:324
+#: piano-pedal-engraver.cc:294 piano-pedal-engraver.cc:305

 #: piano-pedal-performer.cc:104
 #, c-format
 msgid "cannot find start of piano pedal: `%s'"
 msgstr ""
 
 #: piano-pedal-performer.cc:104
 #, c-format
 msgid "cannot find start of piano pedal: `%s'"
 msgstr ""
 

-#: piano-pedal-engraver.cc:359
+#: piano-pedal-engraver.cc:340

 #, c-format
 msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr ""
 

-#: program-option-scheme.cc:237
+#: 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:85
+#: property-iterator.cc:100

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


@@ -2493,22 +2763,25 @@ msgstr ""
 msgid "Failed octave check, got: "
 msgstr ""
 
 msgid "Failed octave check, got: "
 msgstr ""
 

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

 #, c-format
 msgid "Setting %s to %s"
 msgstr ""
 
 #, c-format
 msgid "Setting %s to %s"
 msgstr ""
 

-#: relocate.cc:74
+#. this warning should only be printed in debug mode!
+#: relocate.cc:73

 #, c-format
 msgid "no such file: %s for %s"
 msgstr ""
 
 #, 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
 #, c-format
 msgid "no such directory: %s for %s"
 msgstr ""
 
 #: relocate.cc:84 relocate.cc:102
 #, c-format
 msgid "no such directory: %s for %s"
 msgstr ""
 

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

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


@@ -2518,48 +2791,48 @@ msgstr ""
 msgid "not relocating, no %s/ or current/ found under %s"
 msgstr ""
 
 msgid "not relocating, no %s/ or current/ found under %s"
 msgstr ""
 

-#: relocate.cc:135
+#: relocate.cc:134

 #, c-format
 msgid "Relocation: compile datadir=%s, new datadir=%s"
 msgstr ""
 
 #, c-format
 msgid "Relocation: compile datadir=%s, new datadir=%s"
 msgstr ""
 

-#: relocate.cc:148
+#: relocate.cc:146

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

-#: relocate.cc:189
+#: relocate.cc:172

 #, c-format
 #, c-format

-msgid "Relocation: is absolute: argv0=%s"
+msgid "Relocation: is absolute: argv0=%s\n"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Relocation: from cwd: argv0=%s"
+msgid "Relocation : from cwd: argv0=%s\n"

 msgstr ""
 
 msgstr ""
 

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

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

-"argv0=%s"
+"argv0=%s\n"

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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


@@ -2568,15 +2841,15 @@ msgstr ""
 msgid "rhythmic head is not part of a rhythmic column"
 msgstr ""
 
 msgid "rhythmic head is not part of a rhythmic column"
 msgstr ""
 

-#: rest-collision.cc:146
+#: rest-collision.cc:150

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

-#: rest-collision.cc:160 rest-collision.cc:205
+#: rest-collision.cc:161 rest-collision.cc:270

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

-#: rest.cc:159
+#: rest.cc:240

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


@@ -2599,43 +2872,56 @@ msgstr ""
 msgid "Aborting"
 msgstr ""
 
 msgid "Aborting"
 msgstr ""
 

-#: score.cc:178
+#: score.cc:172

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

-#: score.cc:179
+#: score.cc:173

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

-#: score.cc:184
+#: score.cc:178

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

-#: script-engraver.cc:113
+#: script-engraver.cc:115

 msgid "do not know how to interpret articulation:"
 msgstr ""
 
 msgid "do not know how to interpret articulation:"
 msgstr ""
 

-#: script-engraver.cc:114
+#: script-engraver.cc:116

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

-#: slur-engraver.cc:93
+#: skyline-pair.cc:160
+msgid "direction must not be CENTER in ly:skyline-pair::skyline"
+msgstr ""
+
+#: slur-proto-engraver.cc:51

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

-#: slur-engraver.cc:162
-msgid "unterminated slur"
+#. We already have an old slur, so give a warning
+#. and completely ignore the new slur.
+#: slur-proto-engraver.cc:166
+#, c-format
+msgid "already have %s"

 msgstr ""
 
 msgstr ""
 

-#: slur-engraver.cc:174
-msgid "cannot end slur"
+#: slur-proto-engraver.cc:183
+#, c-format
+msgid "%s without a cause"

 msgstr ""
 
 msgstr ""
 

-#: slur.cc:362
+#: slur-proto-engraver.cc:244

 #, c-format
 #, c-format

-msgid "Ignoring grob for slur: %s. avoid-slur not set?"
+msgid "cannot end %s"
+msgstr ""
+
+#: slur.cc:434
+#, c-format
+msgid "Ignoring grob for slur: %s.  avoid-slur not set?"

 msgstr ""
 
 #: source-file.cc:85
 msgstr ""
 
 #: source-file.cc:85


@@ -2643,66 +2929,70 @@ msgstr ""
 msgid "expected to read %d characters, got %d"
 msgstr ""
 
 msgid "expected to read %d characters, got %d"
 msgstr ""
 

-#: spaceable-grob.cc:94
-#, c-format
-msgid "No spring between column %d and next one"
+#: staff-performer.cc:301
+msgid "MIDI channel wrapped around"

 msgstr ""
 
 msgstr ""
 

-#: stem-engraver.cc:103
+#: staff-performer.cc:302
+msgid "remapping modulo 16"
+msgstr ""
+
+#: stem-engraver.cc:110

 msgid "tremolo duration is too long"
 msgstr ""
 
 msgid "tremolo duration is too long"
 msgstr ""
 

-#. FIXME:
-#: stem-engraver.cc:140
+#: stem-engraver.cc:162

 #, c-format
 #, c-format

-msgid "adding note head to incompatible stem (type = %d)"
+msgid "adding note head to incompatible stem (type = %d/%d)"

 msgstr ""
 
 msgstr ""
 

-#: stem-engraver.cc:142
+#: stem-engraver.cc:165

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

-#: stem.cc:116
+#: stem.cc:128

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

-#: stem.cc:657
+#: system.cc:201

 #, c-format
 #, c-format

-msgid "flag `%s' not found"
+msgid "Element count %d"

 msgstr ""
 
 msgstr ""
 

-#: stem.cc:673
+#: system.cc:512

 #, c-format
 #, c-format

-msgid "flag stroke `%s' not found"
+msgid "Grob count %d"

 msgstr ""
 
 msgstr ""
 

-#: system.cc:197
+#. TODO: Also print the arguments of the markup!
+#: text-interface.cc:129

 #, c-format
 #, c-format

-msgid "Element count %d"
+msgid "Cyclic markup detected: %s"

 msgstr ""
 
 msgstr ""
 

-#: system.cc:303
+#. TODO: Also print the arguments of the markup!
+#: text-interface.cc:142

 #, c-format
 #, c-format

-msgid "Grob count %d"
+msgid "Markup depth exceeds maximal value of %d; Markup: %s"

 msgstr ""
 
 msgstr ""
 

-#: text-spanner-engraver.cc:73
+#: text-spanner-engraver.cc:72

 msgid "cannot find start of text spanner"
 msgstr ""
 
 msgid "cannot find start of text spanner"
 msgstr ""
 

-#: text-spanner-engraver.cc:86
+#: text-spanner-engraver.cc:85

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

-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:130

 msgid "unterminated text spanner"
 msgstr ""
 
 msgid "unterminated text spanner"
 msgstr ""
 

-#: tie-engraver.cc:116
+#: tie-engraver.cc:119

 msgid "unterminated tie"
 msgstr ""
 
 msgid "unterminated tie"
 msgstr ""
 

-#: tie-engraver.cc:312
+#: tie-engraver.cc:353

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


@@ -2718,7 +3008,7 @@ msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)

-#: time-signature.cc:94
+#: time-signature.cc:89

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


@@ -2730,7 +3020,7 @@ msgstr ""
 
 #: translator-group-ctors.cc:40
 #, c-format
 
 #: translator-group-ctors.cc:40
 #, c-format

-msgid "fatal error. Couldn't find type: %s"
+msgid "fatal error.  Couldn't find type: %s"

 msgstr ""
 
 #: translator-group.cc:188
 msgstr ""
 
 #: translator-group.cc:188


@@ -2738,26 +3028,26 @@ msgstr ""
 msgid "cannot find: `%s'"
 msgstr ""
 
 msgid "cannot find: `%s'"
 msgstr ""
 

-#: translator.cc:359
+#: translator.cc:326

 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 

-#: translator.cc:360
+#: translator.cc:327

 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 

-#: ttf.cc:481 ttf.cc:530
+#: ttf.cc:480 ttf.cc:528

 #, c-format
 msgid "font index %d too large for font `%s', using index 0"
 msgstr ""
 
 #, c-format
 msgid "font index %d too large for font `%s', using index 0"
 msgstr ""
 

-#: ttf.cc:513 ttf.cc:565
+#: ttf.cc:512 ttf.cc:562

 msgid "font index must be non-negative, using index 0"
 msgstr ""
 
 msgid "font index must be non-negative, using index 0"
 msgstr ""
 

-#: tuplet-engraver.cc:107
+#: tuplet-engraver.cc:110

 msgid "No tuplet to end"
 msgstr ""
 
 msgid "No tuplet to end"
 msgstr ""
 


@@ -2768,189 +3058,314 @@ msgid ""
 "selected ligature style"
 msgstr ""
 
 "selected ligature style"
 msgstr ""
 

+#: vaticana-ligature-engraver.cc:466
+msgid ""
+"Ambiguous use of dots in ligature: there are multiple dotted notes with the "
+"same pitch.  The ligature should be split."
+msgstr ""
+
+#: vaticana-ligature-engraver.cc:524
+msgid ""
+"This ligature has a dotted head followed by a non-dotted head.  The ligature "
+"should be split after the last dotted head before this head."
+msgstr ""
+

 #: vaticana-ligature-engraver.cc:736
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
 
 #: vaticana-ligature-engraver.cc:736
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
 

-#: vaticana-ligature.cc:95
+#: vaticana-ligature.cc:94

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

-#: vaticana-ligature.cc:100
+#: vaticana-ligature.cc:99

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

-#: vaticana-ligature.cc:188
-msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
+#: vertical-align-engraver.cc:95
+msgid "Ignoring Vertical_align_engraver in VerticalAxisGroup"

 msgstr ""
 
 #. fixme: be more verbose.
 msgstr ""
 
 #. fixme: be more verbose.

-#: volta-engraver.cc:111
+#: volta-engraver.cc:110

 msgid "cannot end volta spanner"
 msgstr ""
 
 msgid "cannot end volta spanner"
 msgstr ""
 

-#: volta-engraver.cc:121
+#: volta-engraver.cc:120

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

-#: volta-engraver.cc:125
+#: volta-engraver.cc:124

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

-#: volta-engraver.cc:126
+#: volta-engraver.cc:125

 msgid "giving up"
 msgstr ""
 
 msgid "giving up"
 msgstr ""
 

-#: parser.yy:820
+#: parser.yy:454 parser.yy:815 parser.yy:885
+msgid "bad expression type"
+msgstr ""
+
+#: parser.yy:709 parser.yy:1268
+msgid "not a context mod"
+msgstr ""
+
+#: parser.yy:928 parser.yy:978

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

-#: parser.yy:844
+#: parser.yy:964
+msgid "score expected"
+msgstr ""
+
+#: parser.yy:1002

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

-#: parser.yy:1363
-msgid "only \\consists takes non-string argument."
+#: parser.yy:1141
+msgid "music expected"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:1376
-msgid "Grob name should be alphanumeric"
+#: parser.yy:1151 parser.yy:1185
+msgid "unexpected post-event"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:1685
-msgid "second argument must be pitch list"
+#: parser.yy:1193
+msgid "Ignoring non-music expression"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:1716 parser.yy:1721 parser.yy:2194
+#: parser.yy:1401
+msgid "not a symbol"
+msgstr ""
+
+#: parser.yy:2194 parser.yy:2308 parser.yy:2321 parser.yy:2330
+msgid "bad grob property path"
+msgstr ""
+
+#: parser.yy:2288
+msgid "only \\consists and \\remove take non-string argument."
+msgstr ""
+
+#: parser.yy:2349
+msgid "bad context property path"
+msgstr ""
+
+#: parser.yy:2450
+msgid "simple string expected"
+msgstr ""
+
+#: parser.yy:2468
+msgid "symbol expected"
+msgstr ""
+
+#: parser.yy:2600
+msgid "not a rhythmic event"
+msgstr ""
+
+#: parser.yy:2649
+msgid "post-event expected"
+msgstr ""
+
+#: parser.yy:2658 parser.yy:2663

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

-#: parser.yy:1818
-msgid "expecting string as script definition"
+#: parser.yy:2739
+msgid "expecting string or post-event as script definition"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:1973 parser.yy:2024
-#, c-format
-msgid "not a duration: %d"
+#: parser.yy:2838
+msgid "not an articulation"
+msgstr ""
+
+#: parser.yy:2910 parser.yy:2953
+msgid "not a duration"

 msgstr ""
 
 msgstr ""
 

-#: parser.yy:2148
+#: parser.yy:2970
+msgid "bass number expected"
+msgstr ""
+
+#: parser.yy:3069

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

-#: parser.yy:2209
+#: parser.yy:3150

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

-#: lexer.ll:190
+#: parser.yy:3165
+msgid "markup outside of text script or \\lyricmode"
+msgstr ""
+
+#: parser.yy:3170
+msgid "unrecognized string, not in text script or \\lyricmode"
+msgstr ""
+
+#: parser.yy:3322 parser.yy:3331
+msgid "not an unsigned integer"
+msgstr ""
+
+#: parser.yy:3405
+msgid "not a markup"
+msgstr ""
+
+#: lexer.ll:193

 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 

-#: lexer.ll:194
+#: lexer.ll:196

 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 

-#: lexer.ll:249
+#: lexer.ll:248

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

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

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

-#: lexer.ll:270
+#: lexer.ll:269

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

-#: lexer.ll:274
+#: lexer.ll:273

 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 

-#: lexer.ll:287
-msgid "EOF found inside a comment"
-msgstr ""
-
-#: lexer.ll:302
+#: lexer.ll:300

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

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

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

-#. backup rule
-#: lexer.ll:335
+#: lexer.ll:350
+msgid "string expected after \\include"
+msgstr ""
+
+#: lexer.ll:360

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

-#: lexer.ll:485
-msgid "Brace found at end of lyric.  Did you forget a space?"
+#: lexer.ll:716
+msgid "EOF found inside a comment"
+msgstr ""
+
+#: lexer.ll:721
+msgid "EOF found inside string"

 msgstr ""
 
 msgstr ""
 

-#: lexer.ll:595
-msgid "Brace found at end of markup.  Did you forget a space?"
+#: lexer.ll:736
+msgid "Unfinished main input"

 msgstr ""
 
 msgstr ""
 

-#: lexer.ll:699
+#: lexer.ll:807

 #, c-format
 #, c-format

-msgid "invalid character: `%c'"
+msgid "invalid character: `%s'"

 msgstr ""
 
 msgstr ""
 

-#: lexer.ll:814 lexer.ll:815
+#: lexer.ll:927

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

-#: lexer.ll:924 lexer.ll:925
+#: lexer.ll:947
+#, c-format
+msgid "undefined character or shorthand: %s"
+msgstr ""
+
+#: lexer.ll:1238
+msgid "non-UTF-8 input"
+msgstr ""
+
+#: lexer.ll:1282

 #, c-format
 msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
 #, c-format
 msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 

-#: lexer.ll:925 lexer.ll:926
+#: lexer.ll:1283

 msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
 msgid "consider updating the input with the convert-ly script"
 msgstr ""
 

-#: lexer.ll:931 lexer.ll:932
+#: lexer.ll:1289

 #, c-format
 msgid "program too old: %s (file requires: %s)"
 msgstr ""
 
 #, c-format
 msgid "program too old: %s (file requires: %s)"
 msgstr ""
 

-#: backend-library.scm:29 ps-to-png.scm:68
+#: auto-beam.scm:147
+msgid "Beam end fits no pattern"
+msgstr ""
+
+#: backend-library.scm:27

 #, scheme-format
 msgid "Invoking `~a'..."
 msgstr ""
 
 #, scheme-format
 msgid "Invoking `~a'..."
 msgstr ""
 

-#: backend-library.scm:34
+#: backend-library.scm:31

 #, scheme-format
 #, scheme-format

-msgid "`~a' failed (~a)"
+msgid "`~a' failed (~a)\n"

 msgstr ""
 
 msgstr ""
 

-#: backend-library.scm:94
+#: backend-library.scm:93

 #, scheme-format
 #, scheme-format

-msgid "Converting to `~a'..."
+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.
 msgstr ""
 
 #. Do not try to guess the name of the png file,
 #. GS produces PNG files like BASE-page%d.png.

-#: backend-library.scm:104
+#: backend-library.scm:102

 #, scheme-format
 msgid "Converting to ~a..."
 msgstr ""
 
 #, scheme-format
 msgid "Converting to ~a..."
 msgstr ""
 

-#: backend-library.scm:142
+#: backend-library.scm:140

 #, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
 #, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 

-#: backend-library.scm:192
+#: backend-library.scm:189

 #, scheme-format
 msgid "missing stencil expression `~S'"
 msgstr ""
 
 #, scheme-format
 msgid "missing stencil expression `~S'"
 msgstr ""
 

-#: chord-entry.scm:49
+#: bar-line.scm:133
+#, scheme-format
+msgid "Bar glyph ~a not known. Ignoring."
+msgstr ""
+
+#: bar-line.scm:161
+#, scheme-format
+msgid ""
+"Annotation '~a' is allowed in the first argument of a bar line definition "
+"only."
+msgstr ""
+
+#: bar-line.scm:169
+#, scheme-format
+msgid ""
+"Replacement '~a' is allowed in the last argument of a bar line definition "
+"only."
+msgstr ""
+
+#: bar-line.scm:230
+#, scheme-format
+msgid ""
+"add-bar-glyph-print-procedure: glyph '~a' has to be a single ASCII character."
+msgstr ""
+
+#: bar-line.scm:795
+#, scheme-format
+msgid "No span bar glyph defined for bar glyph '~a'; ignoring."
+msgstr ""
+
+#: chord-entry.scm:52

 #, scheme-format
 msgid "Spurious garbage following chord: ~A"
 msgstr ""
 #, scheme-format
 msgid "Spurious garbage following chord: ~A"
 msgstr ""


@@ -2961,80 +3376,84 @@ msgstr ""
 msgid "symbol ~S redefined"
 msgstr ""
 
 msgid "symbol ~S redefined"
 msgstr ""
 

-#: define-event-classes.scm:79
-msgid "All classes must be the last in their matrilineal line."
-msgstr ""
-
-#: define-event-classes.scm:83
-msgid ""
-"All classes must have a well-defined pedigree in the existing class "
-"hierarchy."
+#: define-event-classes.scm:73
+#, scheme-format
+msgid "unknown parent class `~a'"

 msgstr ""
 
 msgstr ""
 

-#: define-event-classes.scm:149
+#: define-event-classes.scm:107

 #, scheme-format
 #, scheme-format

-msgid "event class ~A seems to be unused"
+msgid "Cannot redefine event class `~S'"

 msgstr ""
 
 msgstr ""
 

-#. should be programming-error
-#: define-event-classes.scm:155
+#: define-event-classes.scm:109

 #, scheme-format
 #, scheme-format

-msgid "translator listens to nonexisting event class ~A"
+msgid "Undefined parent event class `~S'"

 msgstr ""
 
 msgstr ""
 

-#: define-markup-commands.scm:803
+#: define-markup-commands.scm:1033

 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:2404
+#: define-markup-commands.scm:2852

 #, scheme-format
 msgid "Cannot find glyph ~a"
 msgstr ""
 
 #, scheme-format
 msgid "Cannot find glyph ~a"
 msgstr ""
 

-#: define-markup-commands.scm:2830
+#: define-markup-commands.scm:3278

 #, 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:2831
+#: define-markup-commands.scm:3279

 #, scheme-format
 msgid "defaulting to ~S pt"
 msgstr ""
 
 #, scheme-format
 msgid "defaulting to ~S pt"
 msgstr ""
 

-#: define-markup-commands.scm:2984
+#: define-markup-commands.scm:3531

 #, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
 
 #, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
 

-#: define-music-types.scm:740
+#: define-markup-commands.scm:3742
+#, scheme-format
+msgid "not a valid duration string: ~a - ignoring"
+msgstr ""
+
+#: define-music-types.scm:792

 #, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 

-#: define-music-types.scm:743
+#: define-music-types.scm:795

 #, scheme-format
 msgid "cannot find music object: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "cannot find music object: ~S"
 msgstr ""
 

-#: define-music-types.scm:762
+#: define-music-types.scm:815
+#, scheme-format
+msgid "bad make-music argument: ~S"
+msgstr ""
+
+#: define-music-types.scm:827

 #, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr ""
 
 #, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr ""
 

-#: define-music-types.scm:763
+#: define-music-types.scm:828

 msgid "See define-music-types.scm for supported repeats"
 msgstr ""
 
 msgid "See define-music-types.scm for supported repeats"
 msgstr ""
 

-#: define-note-names.scm:962
+#: define-note-names.scm:972

 msgid "Select note names language."
 msgstr ""
 
 msgid "Select note names language."
 msgstr ""
 

-#: define-note-names.scm:969
+#: define-note-names.scm:978

 #, scheme-format
 msgid "Using `~a' note names..."
 msgstr ""
 
 #, scheme-format
 msgid "Using `~a' note names..."
 msgstr ""
 

-#: define-note-names.scm:972
+#: define-note-names.scm:981

 #, scheme-format
 msgid "Could not find language `~a'.  Ignoring."
 msgstr ""
 #, scheme-format
 msgid "Could not find language `~a'.  Ignoring."
 msgstr ""


@@ -3064,12 +3483,17 @@ msgstr ""
 msgid "Writing ~S..."
 msgstr ""
 
 msgid "Writing ~S..."
 msgstr ""
 

-#: documentation-lib.scm:198
+#: documentation-lib.scm:188
+#, scheme-format
+msgid "cannot find description for property `~S' (~S)"
+msgstr ""
+
+#: documentation-lib.scm:209

 #, 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:148
+#: flag-styles.scm:162

 #, scheme-format
 msgid "flag stroke `~a' or `~a' not found"
 msgstr ""
 #, scheme-format
 msgid "flag stroke `~a' or `~a' not found"
 msgstr ""


@@ -3079,27 +3503,27 @@ msgstr ""
 msgid "Writing ~a..."
 msgstr ""
 
 msgid "Writing ~a..."
 msgstr ""
 

-#: framework-ps.scm:250
+#: framework-ps.scm:251

 #, scheme-format
 msgid "cannot embed ~S=~S"
 msgstr ""
 
 #, scheme-format
 msgid "cannot embed ~S=~S"
 msgstr ""
 

-#: framework-ps.scm:293
+#: framework-ps.scm:294

 #, 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:312

 #, 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:337

 #, 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:669
+#: framework-ps.scm:688

 msgid ""
 "\n"
 "The PostScript backend does not support the\n"
 msgid ""
 "\n"
 "The PostScript backend does not support the\n"


@@ -3135,104 +3559,118 @@ 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:758
+#: lily-library.scm:348
+msgid "Music unsuitable for context-mod"
+msgstr ""
+
+#: lily-library.scm:403
+#, scheme-format
+msgid "Cannot find context-def \\~a"
+msgstr ""
+
+#: lily-library.scm:419
+msgid "Music unsuitable for output-def"
+msgstr ""
+
+#: lily-library.scm:899

 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:832
+#: lily-library.scm:970

 #, scheme-format
 msgid "unknown unit: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "unknown unit: ~S"
 msgstr ""
 

-#: lily-library.scm:858 lily-library.scm:867
-msgid "warning:"
-msgstr ""
-
-#: lily-library.scm:860
+#: lily-library.scm:995

 #, 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:868
-msgid "old relative compatibility not used"
+#: lily.scm:75
+msgid "call-after-session used after session start"
+msgstr ""
+
+#: lily.scm:93
+msgid "define-session used after session start"

 msgstr ""
 
 msgstr ""
 

-#: lily.scm:225
+#: lily.scm:399

 msgid "Using (ice-9 curried-definitions) module\n"
 msgstr ""
 
 msgid "Using (ice-9 curried-definitions) module\n"
 msgstr ""
 

-#: lily.scm:230
+#: lily.scm:402

 msgid "Guile 1.8\n"
 msgstr ""
 
 msgid "Guile 1.8\n"
 msgstr ""
 

-#: lily.scm:290
+#: lily.scm:461

 #, scheme-format
 msgid "cannot find: ~A"
 msgstr ""
 
 #, scheme-format
 msgid "cannot find: ~A"
 msgstr ""
 

-#: lily.scm:350
-#, scheme-format
-msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
+#: lily.scm:885
+msgid "Success: compilation successfully completed"

 msgstr ""
 
 msgstr ""
 

-#: lily.scm:716
-msgid "Compilation successfully completed"
-msgstr ""
-
-#: lily.scm:717
+#: lily.scm:886

 msgid "Compilation completed with warnings or errors"
 msgstr ""
 
 msgid "Compilation completed with warnings or errors"
 msgstr ""
 

-#: lily.scm:779
+#: lily.scm:947

 #, scheme-format
 msgid "job ~a terminated with signal: ~a"
 msgstr ""
 
 #, scheme-format
 msgid "job ~a terminated with signal: ~a"
 msgstr ""
 

-#: lily.scm:782
+#: lily.scm:950

 #, scheme-format
 msgid ""
 "logfile ~a (exit ~a):\n"
 "~a"
 msgstr ""
 
 #, scheme-format
 msgid ""
 "logfile ~a (exit ~a):\n"
 "~a"
 msgstr ""
 

-#: lily.scm:804 lily.scm:882
+#: lily.scm:972 lily.scm:1061

 #, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 

-#: lily.scm:873
+#: lily.scm:1052

 #, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
 
 #, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
 

-#: lily.scm:892
+#: lily.scm:1071 ps-to-png.scm:66

 #, scheme-format
 msgid "Invoking `~a'...\n"
 msgstr ""
 
 #, scheme-format
 msgid "Invoking `~a'...\n"
 msgstr ""
 

-#: ly-syntax-constructors.scm:51
-msgid "Music head function must return Music object"
+#: ly-syntax-constructors.scm:66
+#, scheme-format
+msgid "~a function cannot return ~a"
+msgstr ""
+
+#: ly-syntax-constructors.scm:75
+#, scheme-format
+msgid "wrong type for argument ~a.  Expecting ~a, found ~s"

 msgstr ""
 
 msgstr ""
 

-#: ly-syntax-constructors.scm:177
+#: ly-syntax-constructors.scm:199

 #, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
 #, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 

-#: markup.scm:223
+#: markup-macros.scm:331

 #, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 

-#: markup.scm:229
+#: markup-macros.scm:337

 #, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
 #, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 

-#: markup.scm:292
+#: markup-macros.scm:373

 #, scheme-format
 msgid "Not a markup command: ~A"
 msgstr ""
 #, scheme-format
 msgid "Not a markup command: ~A"
 msgstr ""


@@ -3261,147 +3699,163 @@ msgstr ""
 msgid "negative replication count; ignoring"
 msgstr ""
 
 msgid "negative replication count; ignoring"
 msgstr ""
 

-#: music-functions.scm:268
+#: music-functions.scm:273

 msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
 msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 

-#: music-functions.scm:297
+#: music-functions.scm:304

 #, scheme-format
 msgid "invalid tremolo repeat count: ~a"
 msgstr ""
 
 #, scheme-format
 msgid "invalid tremolo repeat count: ~a"
 msgstr ""
 

-#: music-functions.scm:618
+#: music-functions.scm:480

 #, scheme-format
 #, scheme-format

-msgid "music expected: ~S"
+msgid "bad grob property path ~a"

 msgstr ""
 
 msgstr ""
 

-#. FIXME: uncomprehensable message
-#: music-functions.scm:662
+#: music-functions.scm:775
+msgid "Bad chord repetition"
+msgstr ""
+
+#: music-functions.scm:877

 #, scheme-format
 #, scheme-format

-msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
+msgid "music expected: ~S"

 msgstr ""
 
 msgstr ""
 

-#: music-functions.scm:846
+#: music-functions.scm:1233

 #, scheme-format
 msgid "cannot find quoted music: `~S'"
 msgstr ""
 
 #, scheme-format
 msgid "cannot find quoted music: `~S'"
 msgstr ""
 

-#: music-functions.scm:982
+#: music-functions.scm:1372

 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:1037
+#: music-functions.scm:1432

 #, scheme-format
 msgid "Unknown octaveness type: ~S "
 msgstr ""
 
 #, scheme-format
 msgid "Unknown octaveness type: ~S "
 msgstr ""
 

-#: music-functions.scm:1038
+#: music-functions.scm:1433

 msgid "Defaulting to 'any-octave."
 msgstr ""
 
 msgid "Defaulting to 'any-octave."
 msgstr ""
 

-#: music-functions.scm:1378
+#: music-functions.scm:1778

 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 

-#: output-ps.scm:48
-msgid "Found infinity or nan in output.  Substituting 0.0"
+#: music-functions.scm:1996
+msgid "Missing duration"

 msgstr ""
 
 msgstr ""
 

-#: output-ps.scm:289 output-svg.scm:550
+#: output-ps.scm:278 output-svg.scm:539

 #, scheme-format
 msgid "unknown line-cap-style: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "unknown line-cap-style: ~S"
 msgstr ""
 

-#: output-ps.scm:294 output-svg.scm:556
+#: output-ps.scm:283 output-svg.scm:545

 #, scheme-format
 msgid "unknown line-join-style: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "unknown line-join-style: ~S"
 msgstr ""
 

-#: output-svg.scm:47
-#, scheme-format
-msgid "undefined: ~S"
-msgstr ""
-
-#: output-svg.scm:151
+#: 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:231
+#: output-svg.scm:228

 msgid "Glyph must have a unicode value"
 msgstr ""
 
 msgid "Glyph must have a unicode value"
 msgstr ""
 

-#: output-svg.scm:283 output-svg.scm:293
+#: 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:115
+#: paper.scm:120

 msgid "set-global-staff-size: not in toplevel scope"
 msgstr ""
 
 msgid "set-global-staff-size: not in toplevel scope"
 msgstr ""
 

-#: paper.scm:296
+#: paper.scm:320

 #, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
 #, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 

-#: paper.scm:308
+#: paper.scm:328

 #, 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:323
+#: paper.scm:347

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

-#: parser-clef.scm:141 parser-clef.scm:181
+#: parser-clef.scm:164

 #, scheme-format
 msgid "unknown clef type `~a'"
 msgstr ""
 
 #, scheme-format
 msgid "unknown clef type `~a'"
 msgstr ""
 

-#: parser-clef.scm:142 parser-clef.scm:182
+#: parser-clef.scm:165

 #, scheme-format
 msgid "supported clefs: ~a"
 msgstr ""
 
 #, scheme-format
 msgid "supported clefs: ~a"
 msgstr ""
 

-#: ps-to-png.scm:74
+#: parser-ly-from-scheme.scm:74
+msgid "error in #{ ... #}"
+msgstr ""
+
+#: part-combiner.scm:598
+#, scheme-format
+msgid "quoted music `~a' is empty"
+msgstr ""
+
+#: ps-to-png.scm:70

 #, scheme-format
 msgid "~a exited with status: ~S"
 msgstr ""
 
 #, scheme-format
 msgid "~a exited with status: ~S"
 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:341
+#: translation-functions.scm:388

 #, 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:385
+#: translation-functions.scm:391
+#, scheme-format
+msgid "Missing fret for pitch ~a on string ~a"
+msgstr ""
+
+#: translation-functions.scm:434

 #, scheme-format
 msgid "No open string for pitch ~a"
 msgstr ""
 
 #, scheme-format
 msgid "No open string for pitch ~a"
 msgstr ""
 

-#: translation-functions.scm:400
+#: translation-functions.scm:449 translation-functions.scm:461

 #, 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:401
-msgid "Ignoring string request."
+#: translation-functions.scm:452
+msgid "Ignoring string request and recalculating."
+msgstr ""
+
+#: translation-functions.scm:464
+msgid "Ignoring note in tablature."

 msgstr ""
 
 msgstr ""
 

-#: translation-functions.scm:414
+#: translation-functions.scm:489

 #, 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:515
+#: translation-functions.scm:594

 #, scheme-format
 msgid ""
 "No label for fret ~a (on string ~a);\n"
 #, scheme-format
 msgid ""
 "No label for fret ~a (on string ~a);\n"