From: Phil Holmes <mail@philholmes.net>
Date: Mon, 6 Jan 2014 13:36:08 +0000 (+0000)
Subject: Merge remote branch 'origin/release/unstable' into HEAD
X-Git-Tag: release/2.19.1-1~20^2~20
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;hp=-c;p=lilypond.git

Merge remote branch 'origin/release/unstable' into HEAD
---

e24fb7cc5671aea95211d4a0c56f28fb6fe8720e
diff --combined VERSION
index 5bff3796c5,0c08f632be..b00c8a267d
--- a/VERSION
+++ b/VERSION
@@@ -1,7 -1,7 +1,7 @@@
  PACKAGE_NAME=LilyPond
  MAJOR_VERSION=2
  MINOR_VERSION=19
 -PATCH_LEVEL=0
 +PATCH_LEVEL=1
  MY_PATCH_LEVEL=
  VERSION_STABLE=2.18.0
- VERSION_DEVEL=2.17.97
+ VERSION_DEVEL=2.19.0
diff --combined po/lilypond.pot
index 3635d6c210,b6bbcd7273..fa26c4b455
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@@ -1,5 -1,5 +1,5 @@@
  # Translation of LilyPond
 -# Copyright (C) 1998--2012 Han-Wen Nienhuys, Jan Nieuwenhuizen.
 +# 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.
  #
@@@ -9,7 -9,7 +9,7 @@@ msgstr "
  "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"
+ "POT-Creation-Date: 2014-01-05 15:09+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"
@@@ -161,7 -161,7 +161,7 @@@ msgstr "
  
  #: convertrules.py:82 convertrules.py:1856 convertrules.py:2032
  #: convertrules.py:2175 convertrules.py:2506 convertrules.py:2801
- #: convertrules.py:3151 convertrules.py:3385
+ #: convertrules.py:3151 convertrules.py:3385 convertrules.py:3697
  msgid "bump version for release"
  msgstr ""
  
@@@ -1497,7 -1497,7 +1497,7 @@@ msgstr "
  
  #: musicxml2ly.py:2576
  msgid ""
 -"Copyright (c) 2005--2012 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"
@@@ -3391,31 -3391,31 +3391,31 @@@ msgstr "
  msgid "Undefined parent event class `~S'"
  msgstr ""
  
- #: define-markup-commands.scm:1033
+ #: define-markup-commands.scm:1037
  msgid "no systems found in \\score markup, does it have a \\layout block?"
  msgstr ""
  
- #: define-markup-commands.scm:2852
+ #: define-markup-commands.scm:2856
  #, scheme-format
  msgid "Cannot find glyph ~a"
  msgstr ""
  
- #: define-markup-commands.scm:3278
+ #: define-markup-commands.scm:3282
  #, scheme-format
  msgid "no brace found for point size ~S "
  msgstr ""
  
- #: define-markup-commands.scm:3279
+ #: define-markup-commands.scm:3283
  #, scheme-format
  msgid "defaulting to ~S pt"
  msgstr ""
  
- #: define-markup-commands.scm:3531
+ #: define-markup-commands.scm:3535
  #, scheme-format
  msgid "not a valid duration string: ~a"
  msgstr ""
  
- #: define-markup-commands.scm:3742
+ #: define-markup-commands.scm:3746
  #, scheme-format
  msgid "not a valid duration string: ~a - ignoring"
  msgstr ""