summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Nieuwenhuizen <janneke@gnu.org>2006-12-22 20:04:07 +0100
committerJan Nieuwenhuizen <janneke@gnu.org>2006-12-22 20:04:07 +0100
commit6c1d83456de48485e27ab062297ef04f9720fc3c (patch)
tree73e188802c92cb0f527c20bc9e86022181f3eabe
parent744614ec4497e540fbaa6ad9bf6e842f4b99442a (diff)
Oops "cannot.
-rw-r--r--lily/change-iterator.cc2
-rw-r--r--lily/dynamic-engraver.cc2
-rw-r--r--lily/gregorian-ligature-engraver.cc4
-rw-r--r--lily/ligature-engraver.cc2
-rw-r--r--lily/midi-stream.cc2
-rw-r--r--lily/new-fingering-engraver.cc2
-rw-r--r--lily/note-column.cc2
-rw-r--r--lily/rest-collision.cc2
-rw-r--r--lily/slur-engraver.cc2
-rw-r--r--lily/span-dynamic-performer.cc2
-rw-r--r--lily/text-spanner-engraver.cc2
-rw-r--r--lily/trill-spanner-engraver.cc2
-rw-r--r--lily/volta-engraver.cc2
-rw-r--r--scripts/convert-ly.py4
-rw-r--r--scripts/lilypond-book.py2
15 files changed, 17 insertions, 17 deletions
diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index c4eaf62dc9..6ff0cd6482 100644
--- 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 81742dcb90..6882939d88 100644
--- 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 0dfdbc0850..73ba7e1fed 100644
--- 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 41cb3b8139..c4565f8e53 100644
--- 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 e6835f42fd..f90688c2ab 100644
--- 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 0474bc88f8..1ae7794393 100644
--- 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 6a7b0f8ee3..ca85f08e12 100644
--- 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 040874c6c6..f748b56a82 100644
--- 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 c3f84e8ff6..db363f5773 100644
--- 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 d6ad6d7c5c..e5938f0852 100644
--- 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 89cc76d179..2994956a50 100644
--- 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 38103cef35..844af53736 100644
--- 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 0587a011b7..532ac965e6 100644
--- 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 f3c2819cbe..4a4fee8895 100644
--- 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 66f15f5925..b921d8dde4 100644
--- 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