Merge remote branch 'origin/master' into release/unstable

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index f96dab2e0a028e66da39655e4eb5cb3c6ec427bc..18049ffba283fc7364f607470394cc04f6134fb9 100644 (file)
--- 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.17 released  @emph{March 15, 2015}
+@subheading LilyPond 2.19.18 released  @emph{March 29, 2015}
 
 We are happy to announce the release of LilyPond
-2.19.17.  This release includes a number of enhancements, and contains some
+2.19.18.  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 e7112a1656159847cdbed09be25a70c6a9469d4d..0f34eb6e0181afbfacea1d49663f2c850f50a924 100644 (file)
--- 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.17 released  @emph{March 15, 2015}
+
+We are happy to announce the release of LilyPond
+2.19.17.  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.16 released  @emph{February 28, 2015}
 

diff --git a/VERSION b/VERSION
index 2a4331999121179c55d1d214f658541fcc7e757a..df8c021d90f438b249d1cf4f98bc233322caf944 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@ MINOR_VERSION=19
 PATCH_LEVEL=18
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.18.2
-VERSION_DEVEL=2.19.17
+VERSION_DEVEL=2.19.18

diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
index 10bd9371aee8a141b07f9c54004c45c5efb92acf..23251c31a3036d87cc83865807b67fd4e8175234 100644 (file)
--- 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.17"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.18"  % 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 6afad0027c26c1b19da913e13017fb8ad6447d2f..c1faabb9afaa6982028b40609877d160bf098467 100644 (file)
--- 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.17"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.18"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"

diff --git a/po/lilypond.pot b/po/lilypond.pot
index fd3b4e072b52ea829abf9b95ae13652834be173d..04484a0d444caa6bcad473484509f27d1d60127b 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.19.17\n"
+"Project-Id-Version: lilypond 2.19.18\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
-"POT-Creation-Date: 2015-03-15 11:17+0000\n"
+"POT-Creation-Date: 2015-03-29 12:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2039,7 +2039,7 @@ msgstr ""
 msgid "(search path: `%s')"
 msgstr ""
 
-#: input.cc:138 source-file.cc:177 source-file.cc:192
+#: input.cc:138 source-file.cc:180 source-file.cc:195
 msgid "position unknown"
 msgstr ""
 
@@ -2510,22 +2510,22 @@ msgstr ""
 msgid "FreeType error: %s"
 msgstr ""
 
-#: open-type-font.cc:112
+#: open-type-font.cc:116
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:114
+#: open-type-font.cc:118
 #, c-format
 msgid "error reading font file %s: %s"
 msgstr ""
 
-#: open-type-font.cc:189
+#: open-type-font.cc:193
 #, c-format
 msgid "FT_Get_Glyph_Name () Freetype error: %s"
 msgstr ""
 
-#: open-type-font.cc:337 pango-font.cc:257
+#: open-type-font.cc:341 pango-font.cc:257
 #, c-format
 msgid "FT_Get_Glyph_Name () error: %s"
 msgstr ""