CG: update makelsr.py documentation

[lilypond.git] / lily / lyric-combine-music-iterator.cc

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index a6de96f5d3b8020981bf869962d6a6414e2865ea..48c8af205e1a16741b44405850279773869fd07e 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -196,7 +196,7 @@ Lyric_combine_music_iterator::construct_children ()
 
   if (!lyrics_context_)
     {
-      m->origin ()->warning ("argument of \\lyricsto should contain Lyrics context");
+      m->origin ()->warning (_ ("argument of \\lyricsto should contain Lyrics context"));
     }
 
   lyricsto_voice_name_ = get_music ()->get_property ("associated-context");
@@ -221,7 +221,7 @@ Lyric_combine_music_iterator::construct_children ()
 
 IMPLEMENT_LISTENER (Lyric_combine_music_iterator, check_new_context)
 void
-Lyric_combine_music_iterator::check_new_context (SCM sev)
+Lyric_combine_music_iterator::check_new_context (SCM /*sev*/)
 {
   if (!ok ())
     return;