Merge branch 'lilypond/translation' of /home/lilycvs/git/lily/ into lilypond/translation

[lilypond.git] / lily / gregorian-ligature-engraver.cc

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 9a7efcb4a5a328e622c2e7fea26bc0d6ae0cc44e..91232d5b31c8e02b6f90c73bffff5039806f303b 100644 (file)
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2006 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2007 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "gregorian-ligature-engraver.hh"
@@ -84,7 +84,7 @@ void fix_prefix_set (int *current_set, int min_set, int max_set, Grob *primitive
 
 void check_and_fix_all_prefixes (vector<Grob_info> primitives)
 {
-  /* Check for illegal head modifier combinations */
+  /* Check for invalid head modifier combinations */
   for (vsize i = 0; i < primitives.size (); i++)
     {
       Grob *primitive = primitives[i].grob ();
@@ -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 (_ ("can't 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 (_ ("can't apply `\\~' on heads with identical pitch"));
+         primitive->warning (_ ("cannot apply `\\~' on heads with identical pitch"));
       if (prev_prefix_set & DEMINUTUM)
        context_info |= AFTER_DEMINUTUM;