Merge branch 'master' into translation

13 files changed, 20 insertions, 18 deletions

diff --git a/scripts/auxiliar/fixcc.py b/scripts/auxiliar/fixcc.py
index bc7c7e3f0c..0ecbf8cd6a 100755
--- a/scripts/auxiliar/fixcc.py
+++ b/scripts/auxiliar/fixcc.py
@@ -450,7 +450,7 @@ typedef struct _t_ligature
 typedef std::map < AFM_Ligature const *, int > Bar;
 
  /**
- Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
  
 /*      ||
diff --git a/scripts/auxiliar/lily-git.tcl b/scripts/auxiliar/lily-git.tcl
index 5e8dc3a0c9..8a90c48ba6 100755
--- a/scripts/auxiliar/lily-git.tcl
+++ b/scripts/auxiliar/lily-git.tcl
@@ -1,7 +1,7 @@
 #!/usr/bin/wish
 
 # GUI interface for common LilyPond git repository commands
-# Copyright 2009--2014 by Johannes Schindelin and Carl Sorensen
+# Copyright 2009--2015 by Johannes Schindelin and Carl Sorensen
 #
 package require Tk
 
diff --git a/scripts/build/grand-replace.py b/scripts/build/grand-replace.py
index 222551f06f..f709be1760 100644
--- a/scripts/build/grand-replace.py
+++ b/scripts/build/grand-replace.py
@@ -2,7 +2,7 @@
 
 # This file is part of LilyPond, the GNU music typesetter.
 #
-# Copyright (C) 2009--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+# Copyright (C) 2009--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # LilyPond is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,9 +44,11 @@ copied_files = [
     'texinfo.tex',
     'txi-de.tex',
     'txi-en.tex',
-    'txi-fr.tex',
     'txi-es.tex',
+    'txi-fr.tex',
+    'txi-hu.tex',
     'txi-it.tex',
+    'txi-nl.tex',
     ]
 
 def main ():
diff --git a/scripts/build/mf-to-table.py b/scripts/build/mf-to-table.py
index 6d86b6be7e..03284dc8b1 100644
--- a/scripts/build/mf-to-table.py
+++ b/scripts/build/mf-to-table.py
@@ -4,7 +4,7 @@
 
 # This file is part of LilyPond, the GNU music typesetter.
 #
-# Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 #
 # LilyPond is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/scripts/build/pytt.py b/scripts/build/pytt.py
index 11d5163583..cabccf0aa2 100755
--- a/scripts/build/pytt.py
+++ b/scripts/build/pytt.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python
 
 '''
-    Copyright (C) 2008--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+    Copyright (C) 2008--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 21c0b1bcaf..08a2a1032c 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -5,7 +5,7 @@
 
 # This file is part of LilyPond, the GNU music typesetter.
 #
-# Copyright (C) 1998--2014  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2015  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # LilyPond is free software: you can redistribute it and/or modify
@@ -76,7 +76,7 @@ def warranty ():
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '2001--2014',
+''' % ( _ ('Copyright (c) %s by') % '2001--2015',
         ' '.join (authors),
         _ ('Distributed under terms of the GNU General Public License.'),
         _ ('It comes with NO WARRANTY.')))
diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py
index 171f5b226c..24dc562871 100644
--- a/scripts/etf2ly.py
+++ b/scripts/etf2ly.py
@@ -1131,12 +1131,12 @@ class Etf_file:
 
         
         while c and c.number <> endno:
-            d = c # hack to avoid problem with build/scripts/grand-replace.py
+            d = c # hack to avoid problem with scripts/build/grand-replace.py
             thread.append (d)
             c = c.next
 
         if c: 
-            d = c # hack to avoid problem with build/scripts/grand-replace.py
+            d = c # hack to avoid problem with scripts/build/grand-replace.py
             thread.append (d)
         
         return thread
@@ -1188,7 +1188,7 @@ def warranty ():
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '2001--2014',
+''' % ( _ ('Copyright (c) %s by') % '2001--2015',
         '\n  '.join (authors),
         _ ('Distributed under terms of the GNU General Public License.'),
         _ ('It comes with NO WARRANTY.')))
diff --git a/scripts/lilymidi.py b/scripts/lilymidi.py
index 7198b48753..34308f0702 100644
--- a/scripts/lilymidi.py
+++ b/scripts/lilymidi.py
@@ -1,6 +1,6 @@
 #!@TARGET_PYTHON@
 
-# Copyright (C) 2006--2014 Brailcom, o.p.s.
+# Copyright (C) 2006--2015 Brailcom, o.p.s.
 #
 # Author: Milan Zamazal <pdm@brailcom.org>
 #
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index f38fb4f7e3..73b1cd9464 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -112,7 +112,7 @@ def warranty ():
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '2001--2014',
+''' % ( _ ('Copyright (c) %s by') % '2001--2015',
         '\n  '.join (authors),
         _ ("Distributed under terms of the GNU General Public License."),
         _ ("It comes with NO WARRANTY.")))
diff --git a/scripts/lilypond-invoke-editor.scm b/scripts/lilypond-invoke-editor.scm
index ff3efbdf26..313d6cc8dc 100644
--- a/scripts/lilypond-invoke-editor.scm
+++ b/scripts/lilypond-invoke-editor.scm
@@ -2,7 +2,7 @@
 !#
 ;;;; lilypond-invoke-editor.scm -- Invoke an editor in file:line:column mode
 
-;;;; Copyright (C) 2005--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2005--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
diff --git a/scripts/lilysong.py b/scripts/lilysong.py
index 047937b9c5..f31fbbae25 100644
--- a/scripts/lilysong.py
+++ b/scripts/lilysong.py
@@ -1,6 +1,6 @@
 #!@TARGET_PYTHON@
 
-# Copyright (c) 2006--2014 Brailcom, o.p.s.
+# Copyright (c) 2006--2015 Brailcom, o.p.s.
 #
 # Author: Milan Zamazal <pdm@brailcom.org>
 #
diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 79351bbfa2..f4a47fb79a 100644
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -4,7 +4,7 @@
 
 # This file is part of LilyPond, the GNU music typesetter.
 #
-# Copyright (C) 1998--2014  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2015  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                           Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # LilyPond is free software: you can redistribute it and/or modify
@@ -78,7 +78,7 @@ def warranty ():
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '1998--2014',
+''' % ( _ ('Copyright (c) %s by') % '1998--2015',
         '\n  '.join (authors),
         _ ('Distributed under terms of the GNU General Public License.'),
         _ ('It comes with NO WARRANTY.')))
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index e270aed95e..dda374d84e 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -2573,7 +2573,7 @@ If the given filename is -, musicxml2ly reads from the command line.
 
     p.version = ('''%prog (LilyPond) @TOPLEVEL_VERSION@\n\n'''
 +
-_ ("""Copyright (c) 2005--2014 by
+_ ("""Copyright (c) 2005--2015 by
     Han-Wen Nienhuys <hanwen@xs4all.nl>,
     Jan Nieuwenhuizen <janneke@gnu.org> and
     Reinhold Kainhofer <reinhold@kainhofer.com>