Oops "cannot.

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index c4eaf62dc958a5b5b5e09d22e461e01594c1b61d..6ff0cd648231c0941b9d519525ed289316fa51fb 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -79,7 +79,7 @@ Change_iterator::process (Moment m)
          }
        else
          /* FIXME: constant error message.  */
-         get_music ()->origin ()->warning (_ (cannot find context to switch to"));
+         get_music ()->origin ()->warning (_ ("cannot find context to switch to"));
       }
     else
       {

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 81742dcb90a5e4710efa1c655c5a7e5459eb4a95..6882939d883904a7744d81809df69adfef1c9b1a 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -183,7 +183,7 @@ Dynamic_engraver::process_music ()
        }
       else if (accepted_spanevents_drul_[STOP])
        {
-         accepted_spanevents_drul_[STOP]->origin ()->warning (_ (cannot find start of (de)crescendo"));
+         accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
          stop_ev = 0;
        }
     }

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 0dfdbc08500dc89d143a9602730d8d594f87a5c4..73ba7e1fed4db859a88c8f2da4a2ebe2ec4c34e6 100644 (file)
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -209,7 +209,7 @@ provide_context_info (vector<Grob_info> primitives)
 
       if (prefix_set & PES_OR_FLEXA)
        if (!i) // ligature may not start with 2nd head of pes or flexa
-         primitive->warning (_ (cannot apply `\\~' on first head of ligature"));
+         primitive->warning (_ ("cannot apply `\\~' on first head of ligature"));
        else if (pitch > prev_pitch) // pes
          {
            prev_context_info |= PES_LOWER;
@@ -221,7 +221,7 @@ provide_context_info (vector<Grob_info> primitives)
            context_info |= FLEXA_RIGHT;
          }
        else // (pitch == prev_pitch)
-         primitive->warning (_ (cannot apply `\\~' on heads with identical pitch"));
+         primitive->warning (_ ("cannot apply `\\~' on heads with identical pitch"));
       if (prev_prefix_set & DEMINUTUM)
        context_info |= AFTER_DEMINUTUM;
 

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 41cb3b81390b34499f37210e809124c0f13dec24..c4565f8e53e23fcd7d0c45cefcff73a8f5f02f6a 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -90,7 +90,7 @@ Ligature_engraver::process_music ()
     {
       if (!ligature_)
        {
-         events_drul_[STOP]->origin ()->warning (_ (cannot find start of ligature"));
+         events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature"));
          return;
        }
 

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index e6835f42fd89bd6e092666ea427d62084e68f2a0..f90688c2ab5ebe4f8b94eecb789a46282b893b7d 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -41,7 +41,7 @@ Midi_stream::operator << (string str)
   size_t written = fwrite (str.data (), sz, n, out_file_);
 
   if (written != sz * n)
-    warning (_ (cannot write to file: `%s'"));
+    warning (_ ("cannot write to file: `%s'"));
 
   return *this;
 }

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 0474bc88f8f3d2d03d9e7fc5fdcc509769781c93..1ae7794393cffa9dd7be84a82bad09b4f0d5c4c7 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -93,7 +93,7 @@ New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
                       &fingerings_,
                       ev, note_ev);
       else if (ev->in_event_class ("text-script-event"))
-       ev->origin ()->warning (_ (cannot add text scripts to individual note heads"));
+       ev->origin ()->warning (_ ("cannot add text scripts to individual note heads"));
       else if (ev->in_event_class ("script-event"))
        add_script (inf.grob (), ev, note_ev);
       else if (ev->in_event_class ("string-number-event"))

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 6a7b0f8ee38ea26077585d9f2809348fb59dedd9..ca85f08e123f47d180da89f445441c4c0ad86d26 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -121,7 +121,7 @@ Note_column::add_head (Grob *me, Grob *h)
     }
 
   if (both)
-    me->warning (_ (cannot have note heads and rests together on a stem"));
+    me->warning (_ ("cannot have note heads and rests together on a stem"));
   else
     Axis_group_interface::add_element (me, h);
 }

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 040874c6c604faa2c41e4bd9f8be1344a5fe14a1..f748b56a829641e5ecdece06bd80288648640868 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -148,7 +148,7 @@ Rest_collision::calc_positioning_done (SCM smob)
          if (d)
            ordered_rests[d].push_back (rests[i]);
          else
-           rests[d]->warning (_ (cannot resolve rest collision: rest direction not set"));
+           rests[d]->warning (_ ("cannot resolve rest collision: rest direction not set"));
        }
 
       Direction d = LEFT;

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index c3f84e8ff6968ce298338df61314fd9daf0d2f22..db363f5773c4511b204e4e7da8e6d26cffd64a02 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -162,7 +162,7 @@ Slur_engraver::process_music ()
   if (events_[STOP])
     {
       if (slurs_.size () == 0)
-       events_[STOP]->origin ()->warning (_ (cannot end slur"));
+       events_[STOP]->origin ()->warning (_ ("cannot end slur"));
 
       
       end_slurs_ = slurs_;

diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index d6ad6d7c5c03e1e8665a4e33f8339dfa04218516..e5938f0852e7ae3a48e9d14f4ba6f40b211cdb59 100644 (file)
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -84,7 +84,7 @@ Span_dynamic_performer::process_music ()
     {
       if (!span_start_event_)
        {
-         span_events_[STOP]->origin ()->warning (_ (cannot find start of (de)crescendo"));
+         span_events_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
          span_events_[STOP] = 0;
        }
       else

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 89cc76d179a472680b6d331f209288dc46bc3f0f..2994956a50c01d665a717b92a3c36df6d1837024 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -58,7 +58,7 @@ Text_spanner_engraver::process_music ()
   if (event_drul_[STOP])
     {
       if (!span_)
-       event_drul_[STOP]->origin ()->warning (_ (cannot find start of text spanner"));
+       event_drul_[STOP]->origin ()->warning (_ ("cannot find start of text spanner"));
       else
        {
          finished_ = span_;

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 38103cef3519b49d0991474036fdcfc6444962a5..844af53736d41ee467acc036e79b47d938c85412 100644 (file)
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -65,7 +65,7 @@ Trill_spanner_engraver::process_music ()
   if (event_drul_[STOP])
     {
       if (!span_)
-       event_drul_[STOP]->origin ()->warning (_ (cannot find start of trill spanner"));
+       event_drul_[STOP]->origin ()->warning (_ ("cannot find start of trill spanner"));
       else
        {
          finished_ = span_;

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 0587a011b7e86e520e50c32cf2fa012a9f0c65e6..532ac965e6cf0f285941862bc8bf4f2b8894c150 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -141,7 +141,7 @@ Volta_engraver::process_music ()
 
   if (end && !volta_span_)
     /* fixme: be more verbose.  */
-    warning (_ (cannot end volta spanner"));
+    warning (_ ("cannot end volta spanner"));
   else if (end)
     {
       end_volta_span_ = volta_span_;

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index f3c2819cbe0d0fb4f8e32d7c3731ca53f7c18c04..4a4fee88959f3ad9ad06b3cc61ee03b373b2ad1e 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -275,14 +275,14 @@ def main ():
         if f == '-':
             f = ''
         elif not os.path.isfile (f):
-            error (_ (cannot open file: `%s'") % f)
+            error (_ ("cannot open file: `%s'") % f)
             if len (files) == 1:
                 sys.exit (1)
             continue
         try:
             do_one_file (f)
         except UnknownVersion:
-            error (_ (cannot determine version for `%s'. Skipping") % f)
+            error (_ ("cannot determine version for `%s'. Skipping") % f)
 
     sys.stderr.write ('\n')
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 66f15f59259cd74fc2d74ada9f10b1a2a1ad3ba5..b921d8dde429478c8b835eb9080a78625111f5c7 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1608,7 +1608,7 @@ def guess_format (input_filename):
         # FIXME
         format = ext2format[e]
     else:
-        error (_ (cannot determine format for: %s" \
+        error (_ ("cannot determine format for: %s" \
               % input_filename))
         exit (1)
     return format