Merge with master

[lilypond.git] / lily / auto-change-iterator.cc

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index ade8303e0d75a5cdc639799fa58bcee6d617b541..04ed126556cc7b53d8620a13e47da5bbeeccd6db 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -9,6 +9,7 @@
 #include "context.hh"
 #include "direction.hh"
 #include "international.hh"
+#include "music.hh"
 #include "music-wrapper-iterator.hh"
 
 class Auto_change_iterator : public Music_wrapper_iterator
@@ -59,7 +60,7 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
   if (current && current->id_string () == to_id)
     {
       string msg;
-      msg += _f ("can't change, already in translator: %s", to_id);
+      msg += _f ("cannot change, already in translator: %s", to_id);
     }
 
   if (current)