From: Phil Holmes Date: Sun, 30 Aug 2015 13:11:45 +0000 (+0100) Subject: Merge remote branch 'origin/release/unstable' into HEAD X-Git-Tag: release/2.19.27-1~21 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=34cc8063c5cb355e975ba7a54b89ef04f6250f2e;hp=a3fc862086a720201e4a4764c7beb952fab5f106;p=lilypond.git Merge remote branch 'origin/release/unstable' into HEAD --- diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi index e210d80181..42893bedd6 100644 --- a/Documentation/web/news-front.itexi +++ b/Documentation/web/news-front.itexi @@ -9,10 +9,10 @@ @c used for news about the upcoming release; see CG 10.2 @newsItem -@subheading LilyPond 2.19.25 released @emph{August 9, 2015} +@subheading LilyPond 2.19.26 released @emph{August 27, 2015} We are happy to announce the release of LilyPond -2.19.25. This release includes a number of enhancements, and contains some +2.19.26. This release includes a number of enhancements, and contains some work in progress. You will have access to the very latest features, but some may be incomplete, and you may encounter bugs and crashes. If you require a stable version of Lilypond, we recommend using the 2.18 diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi index 2480cc0e0a..300b4c076a 100644 --- a/Documentation/web/news.itexi +++ b/Documentation/web/news.itexi @@ -26,6 +26,18 @@ NOTE: * don't duplicate entries from news-front.itexi @end ignore +@newsItem +@subheading LilyPond 2.19.25 released @emph{August 9, 2015} + +We are happy to announce the release of LilyPond +2.19.25. This release includes a number of enhancements, and contains some +work in progress. You will have access to the very latest features, but +some may be incomplete, and you may encounter bugs and crashes. If you +require a stable version of Lilypond, we recommend using the 2.18 +version. + +@newsEnd + @newsItem @subheading LilyPond 2.19.24 released @emph{July 26, 2015} diff --git a/VERSION b/VERSION index ff8c10be4c..2987a53f7f 100644 --- a/VERSION +++ b/VERSION @@ -4,4 +4,4 @@ MINOR_VERSION=19 PATCH_LEVEL=26 MY_PATCH_LEVEL= VERSION_STABLE=2.18.2 -VERSION_DEVEL=2.19.25 +VERSION_DEVEL=2.19.26 diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly index 953a561abe..b58a5d6935 100644 --- a/ly/Welcome-to-LilyPond-MacOS.ly +++ b/ly/Welcome-to-LilyPond-MacOS.ly @@ -23,7 +23,7 @@ That's it. For more information, visit http://lilypond.org . %} -\version "2.19.25" % necessary for upgrading to future LilyPond versions. +\version "2.19.26" % necessary for upgrading to future LilyPond versions. \header{ title = "A scale in LilyPond" diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly index eb0b6b1ccb..4bd39226b5 100644 --- a/ly/Welcome_to_LilyPond.ly +++ b/ly/Welcome_to_LilyPond.ly @@ -32,7 +32,7 @@ Good luck with LilyPond! Happy engraving. %} -\version "2.19.25" % necessary for upgrading to future LilyPond versions. +\version "2.19.26" % necessary for upgrading to future LilyPond versions. \header{ title = "A scale in LilyPond" diff --git a/po/lilypond.pot b/po/lilypond.pot index 3a2224e0b0..b616c043bc 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lilypond 2.19.25\n" +"Project-Id-Version: lilypond 2.19.26\n" "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu." "lilypond.bugs\n" -"POT-Creation-Date: 2015-08-09 12:34+0100\n" +"POT-Creation-Date: 2015-08-27 10:48+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -545,7 +545,7 @@ msgstr "" #: convertrules.py:2820 msgid "" "oldaddlyrics is no longer supported. \n" -" Use addlyrics or lyrsicsto instead.\n" +" Use addlyrics or lyricsto instead.\n" msgstr "" #: convertrules.py:2826 @@ -1128,7 +1128,7 @@ msgstr "" #: lilypond-book.py:157 msgid "" -"pad left side of music to align music inspite of uneven bar numbers (in mm)" +"pad left side of music to align music in spite of uneven bar numbers (in mm)" msgstr "" #: lilypond-book.py:162 @@ -1772,7 +1772,7 @@ msgstr "" msgid "not changing to same context type: %s" msgstr "" -#. FIXME: uncomprehensable message +#. FIXME: incomprehensible message #: change-iterator.cc:82 msgid "none of these in my family" msgstr "" @@ -1894,22 +1894,22 @@ msgstr "" msgid "unterminated extender" msgstr "" -#: flag.cc:134 +#: flag.cc:133 #, c-format msgid "flag `%s' not found" msgstr "" -#: flag.cc:154 +#: flag.cc:153 #, c-format msgid "flag stroke `%s' not found" msgstr "" -#: font-config-scheme.cc:151 font-config.cc:48 +#: font-config-scheme.cc:151 font-config.cc:82 #, c-format msgid "failed adding font directory: %s" msgstr "" -#: font-config-scheme.cc:153 font-config.cc:50 +#: font-config-scheme.cc:153 font-config.cc:84 #, c-format msgid "Adding font directory: %s" msgstr "" @@ -1928,17 +1928,17 @@ msgstr "" msgid "Initializing FontConfig..." msgstr "" -#: font-config.cc:57 +#: font-config.cc:70 #, c-format -msgid "failed adding fontconfig configuration file: %s" +msgid "failed to add fontconfig configuration file `%s'" msgstr "" -#: font-config.cc:60 +#: font-config.cc:73 #, c-format msgid "Adding fontconfig configuration file: %s" msgstr "" -#: font-config.cc:63 +#: font-config.cc:86 msgid "Building font database..." msgstr "" @@ -2054,12 +2054,12 @@ msgstr "" msgid "Incomplete keyAlterationOrder for key signature" msgstr "" -#: key-signature-interface.cc:78 +#: key-signature-interface.cc:77 #, 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 "" @@ -2177,7 +2177,7 @@ msgstr "" msgid "Parsing..." msgstr "" -#: lookup.cc:181 +#: lookup.cc:178 #, c-format msgid "Not drawing a box with negative dimension, %.2f by %.2f." msgstr "" @@ -2740,11 +2740,11 @@ msgstr "" msgid "unterminated percent repeat" msgstr "" -#: performance.cc:55 +#: performance.cc:76 msgid "Track..." msgstr "" -#: performance.cc:90 +#: performance.cc:126 #, c-format msgid "MIDI output to `%s'..." msgstr "" @@ -2779,25 +2779,25 @@ msgstr "" msgid "Failed octave check, got: " msgstr "" -#: relocate.cc:52 +#: relocate.cc:56 #, c-format msgid "Setting %s to %s" msgstr "" #. this warning should only be printed in debug mode! -#: relocate.cc:73 +#: relocate.cc:77 #, c-format msgid "no such file: %s for %s" msgstr "" #. this warning should only be printed in debug mode! #. this warning should only be printed in debug mode -#: relocate.cc:84 relocate.cc:102 +#: relocate.cc:88 relocate.cc:106 #, c-format msgid "no such directory: %s for %s" msgstr "" -#: relocate.cc:93 +#: relocate.cc:97 #, c-format msgid "%s=%s (prepend)\n" msgstr "" @@ -3409,31 +3409,31 @@ msgstr "" msgid "Undefined parent event class `~S'" msgstr "" -#: define-markup-commands.scm:1089 +#: define-markup-commands.scm:1098 msgid "no systems found in \\score markup, does it have a \\layout block?" msgstr "" -#: define-markup-commands.scm:2913 +#: define-markup-commands.scm:2922 #, scheme-format msgid "Cannot find glyph ~a" msgstr "" -#: define-markup-commands.scm:3389 +#: define-markup-commands.scm:3398 #, scheme-format msgid "no brace found for point size ~S " msgstr "" -#: define-markup-commands.scm:3390 +#: define-markup-commands.scm:3399 #, scheme-format msgid "defaulting to ~S pt" msgstr "" -#: define-markup-commands.scm:3642 +#: define-markup-commands.scm:3643 #, scheme-format msgid "not a valid duration string: ~a" msgstr "" -#: define-markup-commands.scm:3853 +#: define-markup-commands.scm:3854 #, scheme-format msgid "not a valid duration string: ~a - ignoring" msgstr "" @@ -3502,7 +3502,7 @@ msgstr "" msgid "cannot find description for property ~S (~S)" msgstr "" -#: flag-styles.scm:162 +#: flag-styles.scm:155 #, scheme-format msgid "flag stroke `~a' or `~a' not found" msgstr "" @@ -3727,48 +3727,53 @@ msgstr "" msgid "bad context property ~a" msgstr "" -#: music-functions.scm:812 +#: music-functions.scm:534 +#, scheme-format +msgid "bad music property ~a" +msgstr "" + +#: music-functions.scm:840 msgid "Bad chord repetition" msgstr "" -#: music-functions.scm:917 +#: music-functions.scm:945 #, scheme-format msgid "music expected: ~S" msgstr "" -#: music-functions.scm:1267 +#: music-functions.scm:1295 #, scheme-format msgid "cannot find quoted music: `~S'" msgstr "" -#: music-functions.scm:1404 +#: music-functions.scm:1432 msgid "Add @var{octave-shift} to the octave of @var{pitch}." msgstr "" -#: music-functions.scm:1467 +#: music-functions.scm:1495 #, scheme-format msgid "Unknown octaveness type: ~S " msgstr "" -#: music-functions.scm:1468 +#: music-functions.scm:1496 msgid "Defaulting to 'any-octave." msgstr "" -#: music-functions.scm:1860 +#: music-functions.scm:1888 #, scheme-format msgid "unknown accidental style: ~S" msgstr "" -#: music-functions.scm:2070 +#: music-functions.scm:2098 msgid "Missing duration" msgstr "" -#: music-functions.scm:2598 +#: music-functions.scm:2626 #, scheme-format msgid "not a symbol list: ~a" msgstr "" -#: music-functions.scm:2601 +#: music-functions.scm:2629 #, scheme-format msgid "conflicting tag group ~a" msgstr ""