From 8032af1c6c8a170df3bbd9aaa418b3e7a652c3dd Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 9 Jun 2000 02:23:59 +0200
Subject: [PATCH] patch::: 1.3.58.jcn1

1.3.58.jcn1
===========

* Added `Ped' as a compound symbol font and removed silly scheme kerning.

* Replaced some scheme assoc u-turns with scm_assoc ()

* Ran po-update (mostly because of new ja contribution).
---
 CHANGES                  |   9 +
 VERSION                  |   2 +-
 lily/all-font-metrics.cc |   5 +-
 lily/break-align-item.cc |  23 +-
 lily/chord-name.cc       |  14 +-
 lily/lookup.cc           |  12 +-
 lily/script-engraver.cc  |   5 +-
 lily/sustain-pedal.cc    |  31 +-
 mf/feta-pendaal.mf       | 116 +++--
 po/de.po                 |  44 +-
 po/fr.po                 |  44 +-
 po/it.po                 |  44 +-
 po/ja.po                 | 949 ++++++++++++++++++++-------------------
 po/lilypond.pot          |  44 +-
 po/nl.po                 |  53 ++-
 po/ru.po                 |  47 +-
 scm/lily.scm             |  20 -
 scm/paper.scm            |  16 -
 18 files changed, 735 insertions(+), 743 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6b5b31db01..642f5a6711 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+1.3.58.jcn1
+===========
+
+* Added `Ped' as a compound symbol font and removed silly scheme kerning.
+
+* Replaced some scheme assoc u-turns with scm_assoc ()
+
+* Ran po-update (mostly because of new ja contribution).
+
 1.3.57.jcn2
 ===========
 
diff --git a/VERSION b/VERSION
index 1aae31d4c3..14173e93e6 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=58
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 20b5483348..966546c2d9 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -105,9 +105,8 @@ All_font_metrics::find_font (String name)
   warning (_ ("Loading default font"));
   
   String def_name = default_font_sz_;
-  SCM l = scm_eval (gh_list (ly_symbol2scm ("style-to-cmr"),
-			    ly_str02scm ("default"),
-			    SCM_UNDEFINED));
+  SCM l = scm_assoc (ly_str02scm ("default"),
+		     scm_eval (ly_symbol2scm ("cmr-alist")));
   
   if (l != SCM_BOOL_F)
     def_name = ly_scm2string (gh_cdr (l));
diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc
index 7705d94e26..58b04d19a7 100644
--- a/lily/break-align-item.cc
+++ b/lily/break-align-item.cc
@@ -72,11 +72,24 @@ Break_align_item::before_line_breaking ()
       else
 	next_origin = ly_symbol2scm ("begin-of-note");
       
-      SCM extra_space
-	= scm_eval (scm_listify (ly_symbol2scm ("break-align-spacer"),
-				 ly_quote_scm (current_origin),
-				 ly_quote_scm (next_origin),
-				 SCM_UNDEFINED));
+      SCM e = scm_assoc (scm_listify (current_origin,
+				      next_origin,
+				      SCM_UNDEFINED),
+			 scm_eval (ly_symbol2scm ("space-alist")));
+      
+      SCM extra_space;
+      if (e != SCM_BOOL_F)
+	{
+	  extra_space = gh_cdr (e);
+	}
+      else
+	{
+	  warning (_f ("unknown spacing pair `%s', `%s'",
+		       ly_symbol2string (current_origin),
+		       ly_symbol2string (next_origin)));
+	  extra_space = scm_listify (ly_symbol2scm ("minimum-space"), gh_double2scm (0.0), SCM_UNDEFINED);
+	}
+
       SCM symbol = gh_car  (extra_space);
       Real spc = gh_scm2double (SCM_CADR(extra_space));
       spc *= interline;
diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 052a5b99dd..7e784aaa07 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -31,10 +31,10 @@ Chord_name::ly_word2molecule (SCM word, Real* x) const
 {
   *x = 0;
 
-  SCM options = SCM_EOL;
+  SCM options_alist = SCM_EOL;
   if (gh_pair_p (word))
     {
-      options = gh_cdr (word);
+      options_alist = gh_cdr (word);
       word = gh_car (word);
     }
 
@@ -51,7 +51,7 @@ Chord_name::ly_word2molecule (SCM word, Real* x) const
       String w = ly_scm2string (word);
 
       String style;
-      SCM s = scm_assoc (ly_symbol2scm ("style"), options);
+      SCM s = scm_assoc (ly_symbol2scm ("style"), options_alist);
       if (s != SCM_BOOL_F)
 	{
 	  style = ly_scm2string (gh_cdr (s));
@@ -62,7 +62,7 @@ Chord_name::ly_word2molecule (SCM word, Real* x) const
       /*
 	urg, `type'
       */
-      s = scm_assoc (ly_symbol2scm ("type"), options);
+      s = scm_assoc (ly_symbol2scm ("type"), options_alist);
       if (s != SCM_BOOL_F && ly_scm2string (gh_cdr (s)) == "super")
 	{
 	  Real super_y = ex / 2;
@@ -71,13 +71,13 @@ Chord_name::ly_word2molecule (SCM word, Real* x) const
 	    size = -2;
 	}
 
-      s = scm_assoc (ly_symbol2scm ("size"), options);
+      s = scm_assoc (ly_symbol2scm ("size"), options_alist);
       if (s != SCM_BOOL_F)
 	{
 	  size = gh_scm2int (gh_cdr (s));
 	}
 
-      s = scm_assoc (ly_symbol2scm ("offset"), options);
+      s = scm_assoc (ly_symbol2scm ("offset"), options_alist);
       if (s != SCM_BOOL_F)
 	{
 	  // hmm
@@ -88,7 +88,7 @@ Chord_name::ly_word2molecule (SCM word, Real* x) const
 	}
 
       Molecule mol;
-      s = scm_assoc (ly_symbol2scm ("font"), options);
+      s = scm_assoc (ly_symbol2scm ("font"), options_alist);
       if (s != SCM_BOOL_F && ly_scm2string (gh_cdr (s)) == "feta")
         mol = paper_l ()->lookup_l (size)->afm_find (w);
       else
diff --git a/lily/lookup.cc b/lily/lookup.cc
index 85b9a02bd6..56d0637936 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -241,20 +241,14 @@ Lookup::text (String style, String text, Paper_def *paper_l)
       font_mag = (int)paper_l->get_var ("magnification_" + style);
     }
 
-  /*
-    UGH.
-  */
-  SCM l = scm_eval (gh_list (ly_symbol2scm ("style-to-cmr"),
-			     ly_str02scm (style.ch_C()),
-			     SCM_UNDEFINED));
-  
+  SCM l = scm_assoc (ly_str02scm (style.ch_C()),
+		     scm_eval (ly_symbol2scm ("cmr-alist")));
+
   if (l != SCM_BOOL_F)
     {
       style = ly_scm2string (gh_cdr(l)) +to_str  ((int)font_h);
     }
 
-  
-
   Font_metric* metric_l = 0;
 
   if (font_mag)
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index d53c47648f..04f8bf4f8d 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -60,9 +60,8 @@ Script_engraver::do_process_music()
     {
       Articulation_req* l=script_req_l_arr_[i];
 
-      SCM list = scm_eval (gh_list (ly_symbol2scm ("articulation-to-scriptdef"),
-				    ly_str02scm (l->articulation_str_.ch_C()),
-				    SCM_UNDEFINED));
+      SCM list = scm_assoc (ly_str02scm (l->articulation_str_.ch_C ()),
+			    scm_eval (ly_symbol2scm ("script-alist")));
       
       if (list == SCM_BOOL_F)
 	{
diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index f94867bbf4..9ee9a2905b 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -35,32 +35,23 @@ Sustain_pedal::do_brew_molecule () const
 
   for (int i = 0; i < text.length_i (); i++)
     {
-      String idx = String ("pedal-") + String (&text.byte_C ()[i], 1);
-      Molecule m = lookup_l ()->afm_find (idx);
-      if (m.empty_b ())
-	continue;
-      Real kern = 0;
-      if (i)
+      String idx ("pedal-");
+      if (text.cut_str (i, i + 2) == "Ped")
 	{
-	  SCM s = scm_eval (gh_list (ly_symbol2scm ("pedal-kerning"),
-				     ly_str02scm (String (&text.byte_C ()[i - 1], 1).ch_C ()),
-				     ly_str02scm (String (&text.byte_C ()[i], 1).ch_C ()),
-				     SCM_UNDEFINED));
-	  if (gh_number_p (s))
-	    {
-	      Staff_symbol_referencer_interface st (this);
-	      Real staff_space = st.staff_space ();
-	      kern = gh_scm2double (s) * staff_space;
-	    }
+	  idx += "Ped";
+	  i += 2;
 	}
-      mol.add_at_edge (X_AXIS, RIGHT, m, kern);
+      else
+	idx += String (&text.byte_C ()[i], 1);
+      Molecule m = lookup_l ()->afm_find (idx);
+      if (!m.empty_b ())
+	mol.add_at_edge (X_AXIS, RIGHT, m, 0);
     }
     
   return mol;
 }
 
-
-
 Sustain_pedal ::Sustain_pedal(SCM s )
   : Item (s)
-{}
+{
+}
diff --git a/mf/feta-pendaal.mf b/mf/feta-pendaal.mf
index 2cdbddc0a0..2fa526a135 100644
--- a/mf/feta-pendaal.mf
+++ b/mf/feta-pendaal.mf
@@ -1,3 +1,4 @@
+% -*- Fundamental -*-  (emacs-20 mf mode mucks
 % feta-pendaal.mf -- piano pedal markings
 %
 % part of LilyPond's pretty-but-neat music font
@@ -90,10 +91,9 @@ fet_beginchar("Pedal dot", ".", "pedal-dot")
 	draw (1/2penw,1/2penw);
 fet_endchar;
 
-% code := 79;  % P = 80
-
-fet_beginchar("Pedal P", "P", "pedal-P")
-	set_char_box(0, 5/6pedalh#, 0, pedalh#);
+def draw_pedal_P =
+	begingroup;
+	clearxy;
 	pickup pencircle scaled penh;
 
 	penpos 1 (penh, 0);
@@ -153,43 +153,13 @@ fet_beginchar("Pedal P", "P", "pedal-P")
 		..z14e{right}..tension 1.1
 		..z15e{dir (180+pedbeta)}..tension 1.1
 		..z16e{dir (90+pedbeta)};
-fet_endchar;
-
-
-% code := 99;  % d = 100
-
-if 0 = 1:
-
-fet_beginchar("Pedal d", "d", "pedal-d")
-	set_char_box(2/9pedalh#, 4/9pedalh#, 0, 7/8pedalh#);
-	pickup pencircle scaled penh;
-
-	penpos 1 (penh, -70);
-	penpos 2 (3/4penw, 0);
-	penpos 3 (2penh, 90);
-	penpos 4 (penw, 190);
-	penpos 5 (penh, -10-90);
-
-	z1l = (1/2w, pedalbh);
-	z2l = (0, 1/2pedalbh);
-	z3l = (1/2w, 0);
-	z4 = (w - 1/2penw, 1/2pedalbh + penh);
-	x5r = -b;
-	y5l = h;
-
-	penlabels (1,2,3,4,5);
-
-	penstroke z1e{dir (-70-90)}..tension 1.1
-		..z2e{down}..tension 1.1
-		..z3e{right}..tension 1.1
-		..z4e{dir (90+10)}..tension 1.1
-		..z5e{dir (180-10)};
-fet_endchar;
+	endgroup;
+	enddef;
 
-else:
 
-fet_beginchar("Pedal d", "d", "pedal-d")
-	set_char_box(0, 2/3pedalh#, 0, 7/8pedalh#);
+def draw_pedal_d =
+	begingroup;
+	clearxy;
 	pickup pencircle scaled penh;
 
 	penpos 1 (penh, -70);
@@ -212,12 +182,12 @@ fet_beginchar("Pedal d", "d", "pedal-d")
 		..z3e{right}..tension 1.1
 		..z4e{dir (90+10)}..tension 1.1
 		..z5e{dir (180-10)};
-fet_endchar;
-
-fi
+	endgroup;
+	enddef;
 
-fet_beginchar("Pedal e", "e", "pedal-e")
-	set_char_box(0, 2/5pedalh#, 0, pedalbh#);
+def draw_pedal_e =
+	begingroup;
+	clearxy;
 	pickup pencircle scaled penh;
 
 	penpos 1 (penh, pedalpha-90);
@@ -256,7 +226,65 @@ fet_beginchar("Pedal e", "e", "pedal-e")
 		..z6e{dir -pedalpha}..tension 1.1
 		..z7e.. tension 2.5
 		..z8e;
+	endgroup;
+	enddef;
+
+
+% code := 79;  % P = 80
+
+fet_beginchar("Pedal P", "P", "pedal-P")
+	set_char_box(0, 5/6pedalh#, 0, pedalh#);
+	draw_pedal_P;
 fet_endchar;
 
+% code := 99;  % d = 100
+
+fet_beginchar("Pedal d", "d", "pedal-d")
+	set_char_box(0, 2/3pedalh#, 0, 7/8pedalh#);
+	draw_pedal_d;
+fet_endchar;
+
+fet_beginchar("Pedal e", "e", "pedal-e")
+	set_char_box(0, 2/5pedalh#, 0, pedalbh#);
+	draw_pedal_e;
+fet_endchar;
+
+%
+% Han-Wen insists on having a `Ped' symbol, ready-kerned in mf.
+% The pre 1.3.59 user-scm kerning sucks, but I'm not struck by
+% the looks of this either.
+%
+fet_beginchar("Pedal Ped", "Ped", "pedal-Ped")
+	P_width# = 5/6pedalh#;
+	e_width# = 2/5pedalh#;
+	d_width# = 2/3pedalh#;
+	define_pixels (P_width, e_width, d_width);
+
+	e_height# = pedalbh#;
+	d_height# = 7/8pedalh#;
+	define_pixels (e_height, d_height);
+
+	% Pe = -0.034 pedalh == -0.07 staff-space
+	% ed = -0.27 pedalh == -0.53 staff-space
+	Pe_kern# = -0.034 pedalh#;
+	ed_kern# = -0.27 pedalh#;
+	define_pixels (Pe_kern, ed_kern);
+
+	w := d_width;
+	h := d_height;
+	draw_pedal_d;
+	currentpicture := currentpicture shifted (e_width + ed_kern, 0);
+	w := e_width;
+	h := e_height;
+	draw_pedal_e;
+	currentpicture := currentpicture shifted (P_width + Pe_kern, 0);
+	w := P_width;
+	h := pedalh;
+	draw_pedal_P;
+	set_char_box(0, P_width# + Pe_kern# + e_width# + ed_kern# + d_width#,
+		0, pedalh#);
+fet_endchar;
+
+
 fet_endgroup("pedal")
 
diff --git a/po/de.po b/po/de.po
index 063d9a4b38..ff9f1cee4a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Lilypond 1.2.8\n"
-"POT-Creation-Date: 2000-05-30 21:06+0200\n"
+"POT-Creation-Date: 2000-06-09 02:01+0200\n"
 "PO-Revision-Date: 1999-09-18 01:30+0200\n"
 "Last-Translator: Erwin Dieterich <bamse@gmx.de>\n"
 "Language-Team: LANGUAGE <de@li.org>\n"
@@ -112,17 +112,17 @@ msgstr "Kann Schrift `%s' nicht finden"
 msgid "Loading default font"
 msgstr "Kann die Schrift %s nicht finden, lade die Standardschrift."
 
-#: all-font-metrics.cc:123
+#: all-font-metrics.cc:122
 #, fuzzy, c-format
 msgid "can't find default font: `%s'"
 msgstr "Kann Schrift `%s' nicht finden"
 
-#: all-font-metrics.cc:124 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
+#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
 #, c-format
 msgid "(search path: `%s')"
 msgstr "(Suchpfad: `%s')"
 
-#: all-font-metrics.cc:125
+#: all-font-metrics.cc:124
 msgid "Giving up"
 msgstr ""
 
@@ -167,6 +167,11 @@ msgstr "Balken mit weniger als zwei H
 msgid "weird beam vertical offset"
 msgstr ""
 
+#: break-align-item.cc:87
+#, fuzzy, c-format
+msgid "unknown spacing pair `%s', `%s'"
+msgstr "unbekannter Übersetzer `%s'"
+
 #: change-iterator.cc:22
 #, c-format
 msgid "can't change `%s' to `%s'"
@@ -196,17 +201,17 @@ msgstr "Unbeendeter Bindestrich"
 msgid "no one to print a tremolos"
 msgstr "Keiner darf eine Wiederholungsklammer drucken"
 
-#: chord.cc:146
+#: chord.cc:151
 #, c-format
 msgid "invalid subtraction: not part of chord: %s"
 msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s"
 
-#: chord.cc:372
+#: chord.cc:375
 #, c-format
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s"
 
-#: clef-engraver.cc:172
+#: clef-engraver.cc:166
 #, fuzzy
 msgid "unknown clef type"
 msgstr "Unbekannter Notenschlüssel"
@@ -322,25 +327,10 @@ msgstr "Keine Tonart: ich nehme `C' an"
 msgid "Don't know how handle empty keys"
 msgstr "Weiß nicht, wie ich eine fehlende Tonart behandeln soll"
 
-#: key-engraver.cc:93 key-performer.cc:65
+#: key-engraver.cc:74 key-performer.cc:65
 msgid "FIXME: key change merge"
 msgstr ""
 
-#: key.cc:56 key.cc:61
-#, c-format
-msgid "Don't have that many octaves (%s)"
-msgstr ""
-
-#: key.cc:79
-#, c-format
-msgid "underdone accidentals (%s)"
-msgstr ""
-
-#: key.cc:84
-#, c-format
-msgid "overdone accidentals (%s)"
-msgstr ""
-
 #: lily-guile.cc:123 lily-guile.cc:146
 #, c-format
 msgid "(load path: `%s')"
@@ -351,12 +341,12 @@ msgstr "(Ladepfad ist `%s')"
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:228 paper-score.cc:70
+#: line-of-score.cc:207 paper-score.cc:70
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:242
+#: line-of-score.cc:221
 msgid "Calculating column positions..."
 msgstr "Berechne Position der Spalten..."
 
@@ -729,7 +719,7 @@ msgstr "Schreibe Datei mit Abh
 msgid "Score contains errors; will not process it"
 msgstr "Partitur enthält Fehler; ich werde sie nicht weiterverarbeiten"
 
-#: script-engraver.cc:69
+#: script-engraver.cc:68
 #, fuzzy, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "Ich weiß nicht, wie ich die Artikulation `%s' interpretieren soll\n"
@@ -766,7 +756,7 @@ msgstr "Setze Bindebogen 
 msgid "Slur over rest?"
 msgstr "Bindebogen übe den Rest?"
 
-#: spanner.cc:34 spanner.cc:173
+#: spanner.cc:35 spanner.cc:174
 #, fuzzy, c-format
 msgid "Spanner `%s' has equal left and right spanpoints"
 msgstr "Bogen `%s' mit gleichen linken und rechten Bogenpunkten"
diff --git a/po/fr.po b/po/fr.po
index 36b7344678..23107fbf69 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.3.18\n"
-"POT-Creation-Date: 2000-05-30 21:06+0200\n"
+"POT-Creation-Date: 2000-06-09 02:01+0200\n"
 "PO-Revision-Date: 1999-12-28 00:32 +1\n"
 "Last-Translator: Laurent Martelli <laurent@linuxfan.com>\n"
 "Language-Team: \n"
@@ -112,17 +112,17 @@ msgstr "ne peut pas trouver le fichier: `%s'"
 msgid "Loading default font"
 msgstr "Impossible de trouver la police `%s', chargement la police par défaut"
 
-#: all-font-metrics.cc:123
+#: all-font-metrics.cc:122
 #, fuzzy, c-format
 msgid "can't find default font: `%s'"
 msgstr "Impossible de trouver la fonte par défaut `%s', abandon."
 
-#: all-font-metrics.cc:124 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
+#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
 #, fuzzy, c-format
 msgid "(search path: `%s')"
 msgstr "chemin de recherche= %s"
 
-#: all-font-metrics.cc:125
+#: all-font-metrics.cc:124
 msgid "Giving up"
 msgstr ""
 
@@ -167,6 +167,11 @@ msgstr "barre avec moins de deux tiges"
 msgid "weird beam vertical offset"
 msgstr ""
 
+#: break-align-item.cc:87
+#, fuzzy, c-format
+msgid "unknown spacing pair `%s', `%s'"
+msgstr "traducteur inconnu `%s'"
+
 #: change-iterator.cc:22
 #, c-format
 msgid "can't change `%s' to `%s'"
@@ -194,17 +199,17 @@ msgstr ""
 msgid "no one to print a tremolos"
 msgstr ""
 
-#: chord.cc:146
+#: chord.cc:151
 #, c-format
 msgid "invalid subtraction: not part of chord: %s"
 msgstr "soustraction invalide: ne fait pas partie de l'accord: %s"
 
-#: chord.cc:372
+#: chord.cc:375
 #, c-format
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "renversement invalide: ne fait pas partie de l'accord: %s"
 
-#: clef-engraver.cc:172
+#: clef-engraver.cc:166
 #, fuzzy
 msgid "unknown clef type"
 msgstr "type de clé inconnu"
@@ -315,25 +320,10 @@ msgstr "Pas de nom de cl
 msgid "Don't know how handle empty keys"
 msgstr "ne sait pas traiter les clés vides"
 
-#: key-engraver.cc:93 key-performer.cc:65
+#: key-engraver.cc:74 key-performer.cc:65
 msgid "FIXME: key change merge"
 msgstr ""
 
-#: key.cc:56 key.cc:61
-#, c-format
-msgid "Don't have that many octaves (%s)"
-msgstr ""
-
-#: key.cc:79
-#, c-format
-msgid "underdone accidentals (%s)"
-msgstr ""
-
-#: key.cc:84
-#, c-format
-msgid "overdone accidentals (%s)"
-msgstr ""
-
 #: lily-guile.cc:123 lily-guile.cc:146
 #, c-format
 msgid "(load path: `%s')"
@@ -344,12 +334,12 @@ msgstr ""
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:228 paper-score.cc:70
+#: line-of-score.cc:207 paper-score.cc:70
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:242
+#: line-of-score.cc:221
 msgid "Calculating column positions..."
 msgstr "Calcul de la position des colonnes..."
 
@@ -700,7 +690,7 @@ msgstr "impossible d'ouvrir le fichier: `%s'"
 msgid "Score contains errors; will not process it"
 msgstr ""
 
-#: script-engraver.cc:69
+#: script-engraver.cc:68
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -735,7 +725,7 @@ msgstr ""
 msgid "Slur over rest?"
 msgstr ""
 
-#: spanner.cc:34 spanner.cc:173
+#: spanner.cc:35 spanner.cc:174
 #, c-format
 msgid "Spanner `%s' has equal left and right spanpoints"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index c446c87d00..d07f63010f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-30 21:06+0200\n"
+"POT-Creation-Date: 2000-06-09 02:01+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-30 00:17:12+0200\n"
 "From:  <jantien@xs4all.nl>\n"
@@ -109,17 +109,17 @@ msgstr "non trovo il file: `%s'"
 msgid "Loading default font"
 msgstr ""
 
-#: all-font-metrics.cc:123
+#: all-font-metrics.cc:122
 #, fuzzy, c-format
 msgid "can't find default font: `%s'"
 msgstr "non trovo il file: `%s'"
 
-#: all-font-metrics.cc:124 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
+#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
 #, fuzzy, c-format
 msgid "(search path: `%s')"
 msgstr "(Il path di caricamento è `%s'"
 
-#: all-font-metrics.cc:125
+#: all-font-metrics.cc:124
 msgid "Giving up"
 msgstr ""
 
@@ -163,6 +163,11 @@ msgstr "beam con meno di due gambi"
 msgid "weird beam vertical offset"
 msgstr ""
 
+#: break-align-item.cc:87
+#, fuzzy, c-format
+msgid "unknown spacing pair `%s', `%s'"
+msgstr "traduttore sconosciuto `%s'"
+
 #: change-iterator.cc:22
 #, c-format
 msgid "can't change `%s' to `%s'"
@@ -191,17 +196,17 @@ msgstr "beam non terminato"
 msgid "no one to print a tremolos"
 msgstr ""
 
-#: chord.cc:146
+#: chord.cc:151
 #, c-format
 msgid "invalid subtraction: not part of chord: %s"
 msgstr ""
 
-#: chord.cc:372
+#: chord.cc:375
 #, c-format
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr ""
 
-#: clef-engraver.cc:172
+#: clef-engraver.cc:166
 #, fuzzy
 msgid "unknown clef type"
 msgstr "tipo di chiave sconosciuto"
@@ -313,25 +318,10 @@ msgstr "Nessuna armatura di chiave: assumo Do'"
 msgid "Don't know how handle empty keys"
 msgstr "non so manipolare tasti vuoti"
 
-#: key-engraver.cc:93 key-performer.cc:65
+#: key-engraver.cc:74 key-performer.cc:65
 msgid "FIXME: key change merge"
 msgstr ""
 
-#: key.cc:56 key.cc:61
-#, c-format
-msgid "Don't have that many octaves (%s)"
-msgstr ""
-
-#: key.cc:79
-#, c-format
-msgid "underdone accidentals (%s)"
-msgstr ""
-
-#: key.cc:84
-#, c-format
-msgid "overdone accidentals (%s)"
-msgstr ""
-
 #: lily-guile.cc:123 lily-guile.cc:146
 #, fuzzy, c-format
 msgid "(load path: `%s')"
@@ -342,12 +332,12 @@ msgstr "(Il path di caricamento 
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:228 paper-score.cc:70
+#: line-of-score.cc:207 paper-score.cc:70
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:242
+#: line-of-score.cc:221
 msgid "Calculating column positions..."
 msgstr "Calcolo delle posizioni della colonne..."
 
@@ -731,7 +721,7 @@ msgstr "scrivo il file delle dipendenze: `%s'..."
 msgid "Score contains errors; will not process it"
 msgstr "lo spartito contiene errori; non lo elaborerò"
 
-#: script-engraver.cc:69
+#: script-engraver.cc:68
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -768,7 +758,7 @@ msgstr "Metto uno slur sulla pausa."
 msgid "Slur over rest?"
 msgstr "Metto uno slur sulla pausa."
 
-#: spanner.cc:34 spanner.cc:173
+#: spanner.cc:35 spanner.cc:174
 #, fuzzy, c-format
 msgid "Spanner `%s' has equal left and right spanpoints"
 msgstr "I punti di span sinistro e destro dello spanner `%s' coincidono"
diff --git a/po/ja.po b/po/ja.po
index 5384961816..c5319994f9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.2.17\n"
-"POT-Creation-Date: 1999-09-16 20:29+0200\n"
+"POT-Creation-Date: 2000-06-09 02:01+0200\n"
 "PO-Revision-Date: 2000-03-29 20:50+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,281 +17,259 @@ msgstr ""
 msgid "EOF in a string"
 msgstr "ʸ»úÎóÃæ¤Ë EOF ¤¬¤¢¤ê¤Þ¤¹"
 
-#: data-file.cc:116 input.cc:86 midi-parser.cc:100 warn.cc:21
+#: data-file.cc:116 input.cc:87 midi-parser.cc:100 warn.cc:22
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: dstream.cc:158
+#: dstream.cc:184
 msgid "not enough fields in Dstream init"
 msgstr "Dstream ½é´ü²½»þ¤Î¥Õ¥£¡¼¥ë¥É¤¬ÉÔ½½Ê¬"
 
-#: flower-debug.cc:17
-msgid "Debug output disabled.  Compiled with NPRINT."
-msgstr "¥Ç¥Ð¥Ã¥°½ÐÎϤ¬Ìµ¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£NPRINT ¤Ä¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿¡£"
-
-#: getopt-long.cc:141
-#, c-format
-msgid "Option `%s' requires an argument"
+#: getopt-long.cc:143
+#, fuzzy, c-format
+msgid "option `%s' requires an argument"
 msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "Option `%s' doesn't allow an argument"
+#: getopt-long.cc:147
+#, fuzzy, c-format
+msgid "option `%s' doesn't allow an argument"
 msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òµö²Ä¤·¤Þ¤»¤ó"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:151
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó: `%s'"
 
-#: getopt-long.cc:156
+#: getopt-long.cc:158
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "¥ª¥×¥·¥ç¥ó `%2$s' ¤ËÂФ¹¤ë̵¸ú¤Ê°ú¿ô `%1$s'"
 
-#: text-stream.cc:8
-msgid "<stdin>"
-msgstr "<stdin>"
-
-#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:104
-#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:21
-#, c-format
-msgid "Can't open file: `%s'"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
-
-#: input.cc:91 warn.cc:7 warn.cc:15
+#: input.cc:92 warn.cc:8 warn.cc:16
 msgid "error: "
 msgstr "¥¨¥é¡¼: "
 
-#: input.cc:97
-msgid "Non fatal error: "
+#: input.cc:98
+#, fuzzy
+msgid "non fatal error: "
 msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
 
-#: input.cc:105 source-file.cc:63 source-file.cc:156
+#: input.cc:106 source-file.cc:62 source-file.cc:155
 msgid "position unknown"
 msgstr "°ÌÃÖ¤¬È½¤ê¤Þ¤»¤ó"
 
 #: mapped-file-storage.cc:74
-msgid "Can't map file"
+#, fuzzy
+msgid "can't map file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó"
 
+#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
+#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22
+#, fuzzy, c-format
+msgid "can't open file: `%s'"
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
+
 #: simple-file-storage.cc:56
 #, c-format
 msgid "Huh?  Got %d, expected %d characters"
 msgstr "¤Ï¡© %2$d ʸ»ú¤¢¤ë¤Ï¤º¤Ê¤Î¤Ë %1$d ʸ»ú¤·¤«¤Ê¤¤"
 
-#: warn.cc:34
+#: text-stream.cc:9
+msgid "<stdin>"
+msgstr "<stdin>"
+
+#: warn.cc:35
 msgid "programming error: "
 msgstr "¥×¥í¥°¥é¥à¾å¤Î¥¨¥é¡¼: "
 
-#: warn.cc:34
+#: warn.cc:35
 msgid " (Continuing; cross thumbs)"
 msgstr " (³¤±¤Þ¤¹ -- cross thumbs)"
 
-#: warn.cc:40
-msgid "programming warning: "
-msgstr "¥×¥í¥°¥é¥à¾å¤Î·Ù¹ð: "
+#: afm.cc:42
+#, fuzzy, c-format
+msgid "can't find character number: %d"
+msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d"
 
-#: afm.cc:129
-#, c-format
-msgid "Can't find character called: `%s'"
+#: afm.cc:57
+#, fuzzy, c-format
+msgid "can't find character called: `%s'"
 msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: afm.cc:154
-#, c-format
-msgid "Can't find character number: %d"
-msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d"
+#: afm.cc:87
+msgid "Error parsing AFM file"
+msgstr ""
 
-#: all-font-metrics.cc:69 lookup.cc:103
-#, c-format
-msgid "Can't find font: `%s'"
+#: all-font-metrics.cc:104 lookup.cc:56
+#, fuzzy, c-format
+msgid "can't find font: `%s'"
 msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: all-font-metrics.cc:70
+#: all-font-metrics.cc:105
 msgid "Loading default font"
 msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹"
 
-#: all-font-metrics.cc:75
-#, c-format
-msgid "Can't find default font: `%s'"
+#: all-font-metrics.cc:122
+#, fuzzy, c-format
+msgid "can't find default font: `%s'"
 msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: all-font-metrics.cc:76
+#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
 #, c-format
-msgid "(search path: `%s)'"
+msgid "(search path: `%s')"
 msgstr "(¸¡º÷¥Ñ¥¹: `%s')"
 
-#: all-font-metrics.cc:77
+#: all-font-metrics.cc:124
 msgid "Giving up"
 msgstr "Äü¤á¤Þ¤·¤¿"
 
-#: beam-engraver.cc:42 beam-engraver.cc:58
-msgid "no beam to end"
-msgstr "ËöÈø¤Ø¤Î³Ã¤¬¤¢¤ê¤Þ¤»¤ó"
+#: auto-change-iterator.cc:43 change-iterator.cc:60
+msgid "Can't switch translators, I'm there already"
+msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
+
+#: beam-engraver.cc:40 beam-engraver.cc:56
+msgid "can't find start of beam"
+msgstr ""
 
-#: beam-engraver.cc:87
-msgid "Already have a Beam"
+#: beam-engraver.cc:85
+#, fuzzy
+msgid "already have a beam"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: beam-engraver.cc:149
-msgid "unfinished beam"
-msgstr "½ªÎ»¤µ¤ì¤Æ¤¤¤Ê¤¤³Ã"
+#: beam-engraver.cc:141
+#, fuzzy
+msgid "unterminated beam"
+msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: beam-engraver.cc:174
-msgid "Stem must have Rhythmic structure"
+#: beam-engraver.cc:169 chord-tremolo-engraver.cc:167
+#, fuzzy
+msgid "stem must have Rhythmic structure"
 msgstr "ÉäÈø¤Ï¥ê¥º¥à¹½Â¤¤ò»ý¤¿¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: beam-engraver.cc:185
-msgid "Stem doesn't fit in beam"
+#: beam-engraver.cc:180
+#, fuzzy
+msgid "stem doesn't fit in beam"
 msgstr "ÉäÈø¤¬³Ã¤ÎÃæ¤Ë¤ª¤µ¤Þ¤ê¤Þ¤»¤ó"
 
-#: beam-engraver.cc:186
-msgid "Beam was started here"
+#: beam-engraver.cc:181
+#, fuzzy
+msgid "beam was started here"
 msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿"
 
-#: beam.cc:147
-msgid "beam with less than two stems"
+#: beam.cc:90
+#, fuzzy
+msgid "beam has less than two stems"
 msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿"
 
-#: beam.cc:312
+#: beam.cc:483
 msgid "weird beam vertical offset"
 msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã"
 
-#: break-algorithm.cc:28
-msgid "0 lines"
-msgstr "0 ¹Ô"
-
-#: break-algorithm.cc:30
-#, c-format
-msgid "1 line (of %.0f columns)"
-msgstr "1 ¹Ô (%.0f ¥«¥é¥à)"
-
-#: break-algorithm.cc:32
-#, c-format
-msgid "%d lines (with an average of %.1f columns)"
-msgstr "%d ¹Ô (Ê¿¶Ñ %.1f ¥«¥é¥à)"
-
-#: break-algorithm.cc:155
-msgid "Score does not have any columns"
-msgstr "ÉèÌ̤˥«¥é¥à¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#: break-algorithm.cc:172
-#, c-format
-msgid "approximated %s"
-msgstr "¤ª¤ª¤è¤½ %s"
-
-#: break-algorithm.cc:174
-#, c-format
-msgid "calculated %s exactly"
-msgstr "Àµ³Î¤Ë·×»»¤µ¤ì¤¿ %s"
-
-#: break-algorithm.cc:175
-#, c-format
-msgid "elapsed time %.2f seconds"
-msgstr "%.2f É÷вá"
+#: break-align-item.cc:87
+#, fuzzy, c-format
+msgid "unknown spacing pair `%s', `%s'"
+msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'"
 
 #: change-iterator.cc:22
-#, c-format
-msgid "Can't change `%s' to `%s'"
+#, fuzzy, c-format
+msgid "can't change `%s' to `%s'"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: change-iterator.cc:57
-msgid "Can't switch translators, I'm there already"
-msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
-
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
 #.
 #. last->translator_id_str_  = change_l ()->change_to_id_str_;
 #.
-#: change-iterator.cc:76
+#: change-iterator.cc:79
 msgid "I'm one myself"
 msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤½¤Î¤â¤Î¤Ç¤¹"
 
-#: change-iterator.cc:79
+#: change-iterator.cc:82
 msgid "none of these in my family"
 msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó"
 
-#: chord-tremolo-engraver.cc:41 chord-tremolo-engraver.cc:58
-msgid "no tremolo beam to end"
-msgstr "ËöÈø¤Ø¤Î¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#: chord-tremolo-engraver.cc:83
-msgid "Already have a tremolo beam"
-msgstr "¤¹¤Ç¤Ë¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤¹"
+#: chord-tremolo-engraver.cc:111
+#, fuzzy
+msgid "unterminated chord tremolo"
+msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: chord-tremolo-engraver.cc:124
-msgid "unfinished tremolo beam"
-msgstr "½ª¤ï¤Ã¤Æ¤¤¤Ê¤¤¥È¥ì¥â¥íµ­¹æ"
+#: chord-tremolo-iterator.cc:41
+#, fuzzy
+msgid "no one to print a tremolos"
+msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: chord.cc:231
+#: chord.cc:151
 #, c-format
 msgid "invalid subtraction: not part of chord: %s"
 msgstr "̵¸ú¤Ê°ú¤­»»: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
-#: chord.cc:245
+#: chord.cc:375
 #, c-format
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
-#: clef-engraver.cc:178
+#: clef-engraver.cc:166
 msgid "unknown clef type"
 msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
 
-#: collision.cc:95
+#: collision.cc:111
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£"
 
-#: crescendo.cc:42
+#: crescendo.cc:69
 msgid "crescendo"
 msgstr "¥¯¥ì¥Ã¥·¥§¥ó¥É"
 
-#: crescendo.cc:42
+#: crescendo.cc:69
 msgid "too small"
 msgstr "¾®¤µ¤¹¤®¤Þ¤¹"
 
-#: debug.cc:56
+#: cross-staff.cc:19
+#, fuzzy
+msgid ""
+"minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken"
+msgstr ""
+"minVerticalAlign != maxVerticalAlign: ÆâÉôŪ¤Ê beams/slurs ¤¬²õ¤ì¤Þ¤·¤¿"
+
+#: debug.cc:26
 msgid "floating point exception"
 msgstr "ÉâÆ°¾®¿ôÅÀÎã³°"
 
-#: debug.cc:139
-msgid "Can't set mem-checking!"
+#: debug.cc:50
+#, fuzzy
+msgid "can't set mem-checking!"
 msgstr "¥á¥â¥ê¥Á¥§¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
 
 #: dimensions.cc:13
 msgid "NaN"
 msgstr "NaN"
 
-#: dynamic-engraver.cc:109
-msgid "Got a dynamic already.  Continuing dazed and confused."
-msgstr "´û¤ËưŪ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£º®Í𤷤¿¤Þ¤Þ³¤±¤Þ¤¹¡£"
-
-#: dynamic-engraver.cc:162
-msgid "Can't find (de)crescendo to end"
+#: dynamic-engraver.cc:281 span-dynamic-performer.cc:87
+#, fuzzy
+msgid "can't find start of (de)crescendo"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: dynamic-engraver.cc:216
-msgid "Too many crescendi here"
-msgstr "¤³¤³¤Î¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬Â¿¤¹¤®¤Þ¤¹"
-
-#: dynamic-engraver.cc:254
-msgid "unended crescendo"
-msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É"
+#: dynamic-engraver.cc:300
+#, fuzzy
+msgid "already have a crescendo"
+msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: encompass-info.cc:32
-msgid "Slur over rest?"
-msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?"
+#: dynamic-engraver.cc:301
+#, fuzzy
+msgid "already have a decrescendo"
+msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: encompass-info.cc:67 stem-info.cc:140
-msgid "minVerticalAlign != maxVerticalAlign: interstaff beams/slurs may be broken"
-msgstr "minVerticalAlign != maxVerticalAlign: ÆâÉôŪ¤Ê beams/slurs ¤¬²õ¤ì¤Þ¤·¤¿"
+#: dynamic-engraver.cc:381
+#, fuzzy
+msgid "unterminated (de)crescendo"
+msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É"
 
-#: extender-engraver.cc:62
+#: extender-engraver.cc:96
 msgid "unterminated extender"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À"
 
-#: extender-engraver.cc:74
+#: extender-engraver.cc:108
 msgid "Nothing to connect extender to on the left.  Ignoring extender request."
 msgstr "¥¨¥¯¥¹¥Æ¥ó¥À¤¬º¸Â¦¤Ë¤Ä¤Ê¤¬¤ê¤Þ¤»¤ó¡£¥¨¥¯¥¹¥Æ¥ó¥ÀÍ×µá¤ò̵»ë¤·¤Þ¤¹¡£"
 
@@ -299,51 +277,37 @@ msgstr "
 msgid "no one to print a repeat brace"
 msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
 
+#: gourlay-breaking.cc:157
+msgid "No feasible line breaking found"
+msgstr ""
+
 #: grace-iterator.cc:43
 msgid "no Grace context available"
 msgstr "Áõ¾þ¥³¥ó¥Æ¥­¥¹¥È¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: grace-position-engraver.cc:89
+#: grace-position-engraver.cc:93
 msgid "Unattached grace notes.  Attaching to last musical column."
 msgstr "Áõ¾þ²»É䤬¤Ä¤±¤é¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£Ä¾Á°¤Î¥«¥é¥à¤Ë¤Ä¤±¤Þ¤¹"
 
-#: hyphen-engraver.cc:60
+#: hyphen-engraver.cc:59
 msgid "unterminated hyphen"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: hyphen-engraver.cc:72
+#: hyphen-engraver.cc:71
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr "º¸Â¦¤Ë·Ò¤²¤ë¥Ï¥¤¥Õ¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ï¥¤¥Õ¥ó¤ÎÍ×µá¤ò̵»ë¤·¤Þ¤¹"
 
-#: identifier.cc:46
+#: identifier.cc:44
 #, c-format
 msgid "wrong identifier type, expected: `%s'"
 msgstr "´Ö°ã¤Ã¤¿¼±Ê̻ҷ¿¡¢¤³¤³¤ËÍè¤ë¤Ù¤­¤â¤Î¤Ï: `%s'"
 
-#: includable-lexer.cc:47 lily-guile.cc:82 lily-guile.cc:105
+#: includable-lexer.cc:47 lily-guile.cc:121 lily-guile.cc:144
 #: midi-score-parser.cc:24 scores.cc:108 scores.cc:114
-#, c-format
-msgid "Can't find file: `%s'"
+#, fuzzy, c-format
+msgid "can't find file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: includable-lexer.cc:49 lookup.cc:104 scores.cc:109
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(¸¡º÷¥Ñ¥¹: `%s')"
-
-#: ineq-constrained-qp.cc:169
-#, c-format
-msgid "Ineq_constrained_qp::solve (): Constraint off by %f"
-msgstr "Ineq_constrained_qp::solve (): À©¸Â¤ò %f ¤Ç²ò½ü"
-
-#: ineq-constrained-qp.cc:233
-msgid "Didn't converge!"
-msgstr "¼ý«¤·¤Þ¤»¤ó¤Ç¤·¤¿!"
-
-#: ineq-constrained-qp.cc:235
-msgid "too much degeneracy"
-msgstr "¾®¤µ¤¹¤®¤Þ¤¹"
-
 #: key-def.cc:31
 msgid "No key name, assuming `C'"
 msgstr "¥­¡¼Ì¾¤¬¤¢¤ê¤Þ¤»¤ó¡¢`C' ¤ò»î¤ß¤Þ¤¹"
@@ -352,54 +316,49 @@ msgstr "
 msgid "Don't know how handle empty keys"
 msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó"
 
-#: key-engraver.cc:70 key-performer.cc:65
+#: key-engraver.cc:74 key-performer.cc:65
 msgid "FIXME: key change merge"
 msgstr "FIXME: ¥­¡¼Êѹ¹¤Î¥Þ¡¼¥¸"
 
-#: key.cc:54 key.cc:59
+#: lily-guile.cc:123 lily-guile.cc:146
 #, c-format
-msgid "Don't have that many octaves (%s)"
-msgstr "¤½¤ó¤Ê¤ËÂô»³¤Î¥ª¥¯¥¿¡¼¥Ö (%s) ¤ò»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤"
-
-#: key.cc:77
-#, c-format
-msgid "underdone accidentals (%s)"
-msgstr "¥Õ¥é¥Ã¥È¤¬Â¿¤¹¤®¤Þ¤¹ (%s)"
+msgid "(load path: `%s')"
+msgstr "(Æɹþ¥Ñ¥¹: `%s')"
 
-#: key.cc:82
+#: line-of-score.cc:90
 #, c-format
-msgid "overdone accidentals (%s)"
-msgstr "¥·¥ã¡¼¥×¤¬Â¿¤¹¤®¤Þ¤¹ (%s)"
+msgid "Element count %d."
+msgstr ""
 
-#: lily-guile.cc:84 lily-guile.cc:107
+#: line-of-score.cc:207 paper-score.cc:70
 #, c-format
-msgid "(load path: `%s')"
-msgstr "(Æɹþ¥Ñ¥¹: `%s')"
+msgid "Element count %d "
+msgstr ""
 
-#: line-of-score.cc:91
-msgid "Huh?  Empty Line_of_score?"
-msgstr "¤Ï? ÉèÌ̤ιԤ¬¶õ?"
+#: line-of-score.cc:221
+msgid "Calculating column positions..."
+msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..."
 
-#: local-key-engraver.cc:42
+#: local-key-engraver.cc:82
 msgid "out of tune:"
 msgstr "Èϰϳ°¤ÎÄ´:"
 
-#: local-key-engraver.cc:43 time-signature-engraver.cc:29
-#: translator-group.cc:437 translator-group.cc:446
-#, c-format
-msgid "Can't find: `%s'"
+#: local-key-engraver.cc:83 time-signature-engraver.cc:29
+#: translator-group.cc:416 translator-group.cc:425
+#, fuzzy, c-format
+msgid "can't find: `%s'"
 msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: lookup.cc:105
+#: lookup.cc:58
 msgid "Aborting"
 msgstr "½ªÎ»¤·¤Þ¤¹"
 
-#: lookup.cc:436
+#: lookup.cc:198
 #, c-format
 msgid "Non-matching braces in text `%s', adding braces"
 msgstr "¥Æ¥­¥¹¥È `%s' Ãæ¤Ë°ìÃפ¹¤ë¥Ö¥ì¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ö¥ì¡¼¥¹¤òÄɲä·¤Þ¤¹"
 
-#: main.cc:71 main.cc:91
+#: main.cc:71 main.cc:92
 msgid "enable debugging output"
 msgstr "¥Ç¥Ð¥Ã¥°½ÐÎϤòÍ­¸ú"
 
@@ -408,10 +367,11 @@ msgid "EXT"
 msgstr "EXT"
 
 #: main.cc:72
-msgid "use output format EXT"
+#, fuzzy
+msgid "use output format EXT (scm, ps, tex or as)"
 msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦"
 
-#: main.cc:73 main.cc:92
+#: main.cc:73 main.cc:93
 msgid "this help"
 msgstr "¤³¤Î¥Ø¥ë¥×"
 
@@ -423,7 +383,7 @@ msgstr "DIR"
 msgid "add DIR to search path"
 msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ"
 
-#: main.cc:75 main.cc:95
+#: main.cc:75 main.cc:96
 msgid "FILE"
 msgstr "FILE"
 
@@ -455,7 +415,7 @@ msgstr "
 msgid "inhibit file output naming and exporting"
 msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë"
 
-#: main.cc:81 main.cc:99
+#: main.cc:81 main.cc:100
 msgid "don't timestamp the output"
 msgstr "½ÐÎϤ˥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤"
 
@@ -467,37 +427,47 @@ msgstr "
 msgid "ignore mudela version"
 msgstr "mudela ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò̵»ë¤¹¤ë"
 
-#: main.cc:84 main.cc:100
+#: main.cc:84 main.cc:101
 msgid "print version number"
 msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨"
 
-#: main.cc:85 main.cc:102
+#: main.cc:85 main.cc:103
 msgid "show warranty and copyright"
 msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë"
 
-#: main.cc:92
+#: main.cc:100
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..."
 
-#: main.cc:94
+#: main.cc:102
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë"
 
-#: main.cc:100 main.cc:115
+#: main.cc:106
+msgid ""
+"LilyPond is a music typesetter.  It produces beautiful sheet music\n"
+"using a high level description file as input.  LilyPond is part of \n"
+"the GNU Project.\n"
+msgstr ""
+"LilyPond ¤Ï³Ú¶ÊÁÈÈÇ¥½¥Õ¥È¤Ç¤¹¡£ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤Ï¥Ï¥¤¥ì¥Ù¥ë¤Êµ­½Ò¤ò»ÈÍѤǤ­¡¢\n"
+"Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU "
+"¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤¹¡£\n"
+
+#: main.cc:112 main.cc:116
 msgid "Options:"
 msgstr "¥ª¥×¥·¥ç¥ó:"
 
-#: main.cc:104
+#: main.cc:116
 msgid "This binary was compiled with the following options:"
 msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿"
 
-#: main.cc:119 main.cc:123
+#: main.cc:120 main.cc:135
 #, c-format
 msgid "Report bugs to %s"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø"
 
-#: main.cc:52 main.cc:137
+#: main.cc:53 main.cc:143
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -513,17 +483,17 @@ msgstr ""
 "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n"
 "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n"
 
-#: main.cc:59 main.cc:144 main.cc:156
+#: main.cc:60 main.cc:150 main.cc:162
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s by"
 
 #. GNU GNU?
-#: main.cc:154
+#: main.cc:160
 msgid "GNU LilyPond -- The GNU Project music typesetter"
 msgstr "GNU LilyPond -- The GNU Project music typesetter"
 
-#: main.cc:68 main.cc:162
+#: main.cc:69 main.cc:168
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -554,33 +524,37 @@ msgstr ""
 "USA.\n"
 "\n"
 "-- »²¹ÍÌõ\n"
-" ¤³¤Î¥×¥í¥°¥é¥à¤Ï¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï Free Software Foundation\n"
-"¤¬¸øɽ¤·¤¿ GNU °ìÈ̸øÍ­»ÈÍѵöÂú¤Î¥Ð¡¼¥¸¥ç¥ó 2 ¤Î¾ò¹à¤Ë´ð¤Å¤¤¤Æ¡¢¤³¤Î¥×¥í¥°¥é\n"
+" ¤³¤Î¥×¥í¥°¥é¥à¤Ï¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï Free Software "
+"Foundation\n"
+"¤¬¸øɽ¤·¤¿ GNU °ìÈ̸øÍ­»ÈÍѵöÂú¤Î¥Ð¡¼¥¸¥ç¥ó 2 "
+"¤Î¾ò¹à¤Ë´ð¤Å¤¤¤Æ¡¢¤³¤Î¥×¥í¥°¥é\n"
 "¥à¤òºÆÈÒÉÛ¤Þ¤¿¤ÏÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
 "\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤ÏÍ­ÍѤȤϻפ¤¤Þ¤¹¤¬¡¢ÈÒÉÛ¤ËÅö¤¿¤Ã¤Æ¤Ï¡¢»Ô¾ìÀ­µÚ¤ÓÆÃÄêÌÜŪŬ¹ç\n"
-"À­¤Ë¤Ä¤¤¤Æ¤Î°ÅÌÛ¤ÎÊݾڤâ´Þ¤á¤Æ¡¢¤¤¤«¤Ê¤ëÊݾڤâ¹Ô¤Ê¤¤¤Þ¤»¤ó¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢\n"
+"¤³¤Î¥×¥í¥°¥é¥à¤ÏÍ­ÍѤȤϻפ¤¤Þ¤¹¤¬¡¢ÈÒÉÛ¤ËÅö¤¿¤Ã¤Æ¤Ï¡¢»Ô¾ìÀ­µÚ¤ÓÆÃÄêÌÜŪŬ¹ç"
+"\n"
+"À­¤Ë¤Ä¤¤¤Æ¤Î°ÅÌÛ¤ÎÊݾڤâ´Þ¤á¤Æ¡¢¤¤¤«¤Ê¤ëÊݾڤâ¹Ô¤Ê¤¤¤Þ¤»¤ó¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢"
+"\n"
 "GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤ò¤ªÆɤ߲¼¤µ¤¤¡£\n"
 "\n"
 "¤¢¤Ê¤¿¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤È°ì½ï¤Ë GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤ò¼õ¤±¼è¤Ã¤Æ¤¤¤ë¤Ï¤º\n"
 "¤Ç¤¹(COPYING ¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢Free Software Foundation,\n"
 "Inc., 675 Mass Ave, Cambridge, MA 02139, USA ¤Ë¼ê»æ¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: midi-item.cc:303
+#: midi-item.cc:311
 #, c-format
 msgid "no such instrument: `%s'"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: midi-item.cc:357
+#: midi-item.cc:365
 #, c-format
 msgid "unconventional key: flats: %d, sharps: %d"
 msgstr "´·½¬¤Ë¹ç¤ï¤Ê¤¤¥­¡¼¤Ç¤¹: ¥Õ¥é¥Ã¥È: %d ¸Ä, ¥·¥ã¡¼¥× %d ¸Ä"
 
-#: midi-item.cc:402
+#: midi-item.cc:410
 msgid "silly duration"
 msgstr "Çϼ¯¤²¤¿²»Ä¹"
 
-#: midi-item.cc:415
+#: midi-item.cc:423
 msgid "silly pitch"
 msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á"
 
@@ -588,13 +562,13 @@ msgstr "
 msgid "Error syncing file (disk full?)"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎƱĴ¥¨¥é¡¼ (¥Ç¥£¥¹¥¯¤¬°ìÇÕ?)"
 
-#: music-output-def.cc:56
+#: music-output-def.cc:57
 msgid "Interpretation context with empty type"
 msgstr "¶õ¥¿¥¤¥×¤Î²ò¼á¥³¥ó¥Æ¥­¥¹¥È"
 
-#: music-output-def.cc:83
-#, c-format
-msgid "Can't find `%s' context"
+#: music-output-def.cc:87
+#, fuzzy, c-format
+msgid "can't find `%s' context"
 msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #: musical-request.cc:42
@@ -602,154 +576,134 @@ msgstr "`%s' 
 msgid "Transposition by %s makes accidental larger than two"
 msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿"
 
-#: my-lily-lexer.cc:137
-#, c-format
-msgid "redeclaration of `\\%s'"
-msgstr "`\\%s' ¤ÎºÆÀë¸À"
-
-#: my-lily-lexer.cc:143
+#: my-lily-lexer.cc:129
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr "¼±ÊÌ»Ò̾¤Ï¥­¡¼¥ï¡¼¥É¤Ç¤¹: `%s'"
 
-#: my-lily-lexer.cc:172
+#: my-lily-lexer.cc:148
 #, c-format
 msgid "error at EOF: %s"
 msgstr "EOF ¤Î¤È¤³¤í¤Ç¥¨¥é¡¼: %s"
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:60
+#: midi-score-parser.cc:94 my-lily-parser.cc:56
 msgid "Parsing..."
 msgstr "¹½Ê¸²òÀÏÃæ..."
 
-#: my-lily-parser.cc:69
+#: my-lily-parser.cc:64
 msgid "Braces don't match"
 msgstr "¥Ö¥ì¡¼¥¹¤¬°ìÃפ·¤Þ¤»¤ó"
 
-#: p-col.cc:48
-msgid "Must set spring between differing columns"
-msgstr "°Û¤Ê¤ë¥«¥é¥à¤Î´Ö¤Ë spring ¤ò¥»¥Ã¥È¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-#: paper-def.cc:95
+#: paper-def.cc:70
 #, c-format
 msgid "unknown paper variable: `%s'"
 msgstr "paper ÊÑ¿ô¤ÎÃͤ¬È½¤ê¤Þ¤»¤ó: `%s'"
 
-#: paper-def.cc:99
+#: paper-def.cc:74
 msgid "not a real variable"
 msgstr "Ãͤ¬¼Â¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#. for now; breaks -fscm output
-#: paper-def.cc:251
-msgid "Outputting Score, defined at: "
-msgstr "ÉèÌ̤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤³¤ÇÄêµÁ: "
-
-#: paper-def.cc:280
+#: paper-def.cc:165
 #, c-format
 msgid "paper output to %s..."
 msgstr "%s ¤Ø paper ½ÐÎÏ..."
 
-#: mudela-stream.cc:86 paper-outputter.cc:76 performance.cc:97
+#: mudela-stream.cc:93 paper-outputter.cc:92 performance.cc:95
 msgid ", at "
 msgstr ", at "
 
-#: paper-outputter.cc:130
-#, c-format
-msgid "improbable offset for object type: `%s'"
-msgstr "¥ª¥Ö¥¸¥§¥¯¥È·¿¤Ë¤È¤Ã¤Æ¤¢¤ê¤½¤¦¤Ë¤Ê¤¤¥ª¥Õ¥»¥Ã¥È: `%s'"
-
-#: paper-score.cc:131
-msgid "Can't solve this casting problem exactly; reverting to Word_wrap"
-msgstr "Àµ³Î¤Ë¥­¥ã¥¹¥È¤ò²ò·è¤Ç¤­¤Þ¤»¤ó -- Word_wrap ¤ËÉüµ¢¤·¤Þ¤¹"
-
-#: paper-score.cc:156
+#: paper-score.cc:72
 msgid "Preprocessing elements..."
 msgstr "Í×ÁǤòÁ°½èÍýÃæ..."
 
-#: paper-score.cc:160
-msgid "Calculating column positions..."
-msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..."
-
-#: paper-score.cc:179
-#, c-format
-msgid "%s elements"
-msgstr "%s ¸Ä¤ÎÍ×ÁÇ"
-
-#: paper-score.cc:182
-msgid "Line ... "
-msgstr "¹Ô ..."
+#: paper-score.cc:97
+msgid "Outputting Score, defined at: "
+msgstr "ÉèÌ̤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤³¤ÇÄêµÁ: "
 
 #: performance.cc:50
 msgid "Track ... "
 msgstr "¥È¥é¥Ã¥¯ ..."
 
 #. perhaps multiple text events?
-#: performance.cc:77
+#: performance.cc:75
 msgid "Creator: "
 msgstr "ºî¶Ê¼Ô: "
 
-#: performance.cc:92
+#: performance.cc:90
 msgid "Automatically generated"
 msgstr "¼«Æ°À¸À®¤µ¤ì¤¿"
 
-#: performance.cc:106
+#: performance.cc:104
 #, c-format
 msgid "from musical definition: %s"
 msgstr "²»³ÚŪÄêµÁ¤è¤ê: %s"
 
-#: performance.cc:174
+#: performance.cc:172
 #, c-format
 msgid "MIDI output to %s..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
-#: qlpsolve.cc:88 qlpsolve.cc:139
-msgid "degenerate constraints"
-msgstr "À©¸Â¤ò´ËÏÂ"
+#: piano-pedal-engraver.cc:158 piano-pedal-engraver.cc:170
+#: piano-pedal-performer.cc:87
+#, fuzzy, c-format
+msgid "can't find start of piano pedal: %s"
+msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
+
+#: property-engraver.cc:106
+#, fuzzy
+msgid "Wrong type for property"
+msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: repeat-engraver.cc:177
+#: repeat-engraver.cc:196
 msgid "No bar engraver found.  Ignoring repeats."
 msgstr "¾®À᤬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£È¿Éü¤ò̵»ë¤·¤Þ¤¹¡£"
 
-#: request-chord-iterator.cc:73
+#: request-chord-iterator.cc:72
 #, c-format
 msgid "Junking request: `%s'"
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: request-chord-iterator.cc:76
+#: request-chord-iterator.cc:75
 #, c-format
 msgid "Huh?  Not a Request: `%s'"
 msgstr "¤Ï? Í×µá¤Ç¤Ï¤Ê¤¤: `%s'"
 
-#: rest-collision.cc:64
+#: request-iterator.cc:20
+#, fuzzy, c-format
+msgid "Junking music: `%s'"
+msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
+
+#: rest-collision.cc:135
 msgid "too many colliding rests"
 msgstr "µÙÉä¤Î¾×Æͤ¬Â¿¤¹¤®¤Þ¤¹"
 
-#: rest-collision.cc:68
+#: rest-collision.cc:139
 msgid "too many notes for rest collision"
 msgstr "µÙÉä¤Î¾×ÆͤËÂФ·¤Æ²»É䤬¿¤¹¤®¤Þ¤¹"
 
-#: score-engraver.cc:149
+#: score-engraver.cc:139
 #, c-format
 msgid "unbound spanner `%s'"
 msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'"
 
-#: score.cc:56
+#: score.cc:64
 msgid "no toplevel translator"
 msgstr "ºÇ¾å°Ì¤Î¥È¥é¥ó¥¹¥ì¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: score.cc:59
+#: score.cc:67
 msgid "Interpreting music..."
 msgstr "³Ú¶Ê¤Î²ò¼áÃæ..."
 
-#: score.cc:70
+#: score.cc:79
 msgid "Need music in a score"
 msgstr "³ÚÉè¤Ë¤Ï³Ú¶Ê¤¬É¬ÍפǤ¹"
 
 #. should we? hampers debugging.
-#: score.cc:83
+#: score.cc:92
 msgid "Errors found/*, not processing score*/"
 msgstr "¥¨¥é¡¼¤òȯ¸«/*, ³ÚÉè¤ò½èÍý¤·¤Þ¤»¤ó*/"
 
-#: score.cc:88
+#: score.cc:97
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "·Ð²á»þ´Ö: %.2f ÉÃ"
@@ -763,119 +717,78 @@ msgstr "
 msgid "Score contains errors; will not process it"
 msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- ½èÍý¤·¤Þ¤»¤ó"
 
-#: script-engraver.cc:49
+#: script-engraver.cc:68
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "²»Àá `%s' ¤Î²ò¼áÊýË¡¤¬È½¤ê¤Þ¤»¤ó"
 
-#: sequential-music-iterator.cc:82
+#: sequential-music-iterator.cc:83
 msgid "Must stop before this music ends"
 msgstr "¤³¤Î³Ú¶Ê¤Î½ª¤ï¤ê¤Þ¤Ç¤Ë»ß¤á¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
 #. this shouldn't happen, but let's continue anyway.
-#: single-malt-grouping-item.cc:43
+#: single-malt-grouping-item.cc:51
 msgid "Single_malt_grouping_item:  I've been drinking too much"
 msgstr "Single_malt_grouping_item:  °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿"
 
-#: slur-engraver.cc:64
+#: slur-engraver.cc:82
 msgid "unterminated slur"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
 
-#: slur-engraver.cc:80
-#, c-format
-msgid "Can't find both ends of %s"
+#: slur-engraver.cc:98
+#, fuzzy, c-format
+msgid "can't find both ends of %s"
 msgstr "%s ¤Îξü¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: slur-engraver.cc:80
+#: slur-engraver.cc:98
 msgid "slur"
 msgstr "¥¹¥é¡¼"
 
-#: slur.cc:38
+#: slur.cc:231
 msgid "Putting slur over rest.  Ignoring."
 msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£"
 
-#: spanner.cc:41
-msgid "Left spanpoint is right spanpoint"
-msgstr "ÈϰϤκ¸Â¦¤¬¡¢±¦Â¦¤Ë¤¢¤ê¤Þ¤¹"
+#: slur.cc:312
+msgid "Slur over rest?"
+msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?"
 
-#: spanner.cc:111
+#: spanner.cc:35 spanner.cc:174
 #, c-format
 msgid "Spanner `%s' has equal left and right spanpoints"
 msgstr "ÈÏ°Ï»ØÄê»Ò `%s' ¤Îº¸±¦¤ÎÅÀ¤¬Æ±¤¸¤Ç¤¹"
 
-#: spanner.cc:143
-msgid "spanner with negative length"
-msgstr "ÈÏ°Ï»ØÄê»Ò¤¬Éé¤ÎŤµ¤Ç¤¹"
-
-#: spring-spacer.cc:134
-msgid "I'm too fat; call Oprah"
-msgstr "ÂÀ¤¹¤®¤Þ¤¹ -- Oprah ¤ò¸Æ¤ó¤Ç"
-
-#: spring-spacer.cc:299
-msgid "Solution doesn't satisfy constraints"
-msgstr "¤½¤Î²ò·è¤ÏÀ©¸Â¤òËþ¤¿¤·¤Þ¤»¤ó"
-
-#: spring-spacer.cc:400
-#, c-format
-msgid "Improbable distance: %f point, setting to 10 mm"
-msgstr "¤¢¤ê¤½¤¦¤Ë¤Ê¤¤µ÷Î¥: %f ¥Ý¥¤¥ó¥È, 10 mm ¤ËÀßÄꤷ¤Þ¤¹"
-
-#: spring-spacer.cc:405
-msgid "Negative distance, setting to 10 mm"
-msgstr "Éé¤ÎÃͤȤʤëµ÷Î¥, 10 mm ¤ËÀßÄꤷ¤Þ¤¹"
-
-#: stem-engraver.cc:80
+#: stem-engraver.cc:124
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)"
 
-#: stem.cc:26
-msgid "stem direction set already!"
-msgstr "ÉäÈø¤ÎÊý¸þ¤Ï´û¤Ë¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤¹!"
-
-#: stem.cc:106
+#: stem.cc:118
 msgid "Weird stem size; check for narrow beams"
 msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤"
 
-#: tfm-reader.cc:108
+#: tfm-reader.cc:115
 #, c-format
 msgid "TFM header of `%s' has only %u word(s)"
 msgstr "`%s' ¤Î TFM ¥Ø¥Ã¥À¤Ë %u ¸ì¤·¤«¤¢¤ê¤Þ¤»¤ó"
 
-#: tfm-reader.cc:146
+#: tfm-reader.cc:153
 #, c-format
 msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
 msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó"
 
-#: tfm.cc:64
-#, c-format
-msgid "Can't find ascii character: `%d'"
+#: tfm.cc:70
+#, fuzzy, c-format
+msgid "can't find ascii character: `%d'"
 msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'"
 
-#: tie-engraver.cc:91
-msgid "unequal number of note heads for tie"
-msgstr "¥¿¥¤¤ËÂбþ¤¹¤ëÉäƬ¤Î¿ô¤¬¶ÑÅù¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: tie-engraver.cc:155 tie-performer.cc:106
+#: tie-engraver.cc:195 tie-performer.cc:109
 msgid "No ties were created!"
 msgstr "ºî¤é¤ì¤¿¥¿¥¤¤¬¤¢¤ê¤Þ¤»¤ó!"
 
-#: tie.cc:55
+#: tie.cc:80
 msgid "lonely tie"
 msgstr "°ì¤Ä¤À¤±¤Î¥¿¥¤"
 
-#: time-description.cc:17
-msgid "cadenza"
-msgstr "cadenza"
-
-#: time-description.cc:106
-msgid "Partial measure must be non-negative"
-msgstr "¾®ÀáÉô¤ÏÈóÉé¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
-
-#: time-description.cc:108
-msgid "partial measure too large"
-msgstr "¾®ÀáÉô¤¬Â礭¤¹¤®¤Þ¤¹"
-
 #: time-scaled-music-iterator.cc:25
 msgid "no one to print a tuplet start bracket"
 msgstr "¥¿¥×¥ì¥Ã¥È³«»Ï¥Ö¥é¥±¥Ã¥È¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -884,219 +797,191 @@ msgstr "
 msgid "lost in time:"
 msgstr "Çï»Ò¤Ë̤¤¤Þ¤·¤¿:"
 
-#: timing-translator.cc:26
+#: timing-translator.cc:36
 msgid "conflicting timing request"
 msgstr "Çï»Ò¤ÎÍ׵᤬¶¥¹ç¤·¤Þ¤¹"
 
-#: timing-translator.cc:62
-msgid "time signature change not allowed here"
-msgstr "¤³¤³¤Ç¤ÏÇï»Òµ­¹æ¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó"
+#: timing-translator.cc:37
+msgid "This is the other timing request"
+msgstr ""
 
-#: timing-translator.cc:83
+#: timing-translator.cc:78
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr "¾®Àá¥Á¥§¥Ã¥¯¤¬¼ºÇÔ: %s"
 
-#: translator-ctors.cc:39
+#: translator-ctors.cc:42
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'"
 
-#: translator-group.cc:78 translator-group.cc:91
+#: translator-group.cc:81 translator-group.cc:94
 msgid "Program has no such type"
 msgstr "¥×¥í¥°¥é¥à¤Ë¤Ï¤½¤ÎÍͤʥ¿¥¤¥×¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: translator-group.cc:82 translator-group.cc:97
+#: translator-group.cc:85 translator-group.cc:100
 #, c-format
 msgid "Already contains: `%s'"
 msgstr "´û¤Ë´Þ¤ó¤Ç¤¤¤Þ¤¹: `%s'"
 
-#: translator-group.cc:207
-#, c-format
-msgid "Can't find or create `%s' called `%s'"
+#: translator-group.cc:210
+#, fuzzy, c-format
+msgid "can't find or create `%s' called `%s'"
 msgstr "`%2$s' ¤Ë¸Æ¤Ð¤ì¤¿ `%1$s' ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó"
 
-#: translator-group.cc:341
-#, c-format
-msgid "Can't find or create: `%s'"
+#: translator-group.cc:322
+#, fuzzy, c-format
+msgid "can't find or create: `%s'"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: transposed-music.cc:31
-msgid "Will ignore \\relative for transposed music"
-msgstr "žĴ¤µ¤ì¤¿³Ú¶Ê¤Ï \\relative ¤ò̵»ë¤·¤Þ¤¹"
-
 #: unfolded-repeat-iterator.cc:145
 msgid "no one to print a volta bracket"
 msgstr "volta ¥Ö¥é¥±¥Ã¥È¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: word-wrap.cc:75
-#, c-format
-msgid "Ugh, this measure is too long, breakpoint: %d"
-msgstr "¤¦¤°¤Ã¡¢¤³¤Î¾®Àá¤ÏŤ¹¤®¤Þ¤¹¡£¤­¤ë¾ì½ê: %d"
-
-#: word-wrap.cc:77
-msgid "Generating stupido solution"
-msgstr "Çϼ¯¤²¤¿²ò·è¤òÀ¸À®Ãæ"
-
-#: word-wrap.cc:95
-msgid "I don't fit; put me on Montignac"
-msgstr "¾å¼ê¤¯¤Ï¤Þ¤ê¤Þ¤»¤ó -- Montignac ¤Î¤È¤³¤í¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤"
-
-#: parser.yy:55
+#: parser.yy:58
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "°ìÈָŤ¤ÆþÎϲÄǽ¥Ð¡¼¥¸¥ç¥ó: %s"
 
-#: parser.yy:313
-msgid "Can't evaluate Scheme in safe mode"
-msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó"
-
-#: parser.yy:433 parser.yy:441 parser.yy:465
+#: parser.yy:427
 msgid "Need a translator group for a context"
 msgstr "¥³¥ó¥Æ¥­¥¹¥È¤Ë¤Ï¥È¥é¥ó¥¹¥ì¡¼¥¿¥°¥ë¡¼¥×¤¬É¬ÍפǤ¹"
 
-#: parser.yy:459
+#: parser.yy:448
 msgid "Wrong type for property value"
 msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: parser.yy:515
-msgid "More than one music block"
-msgstr "Ê£¿ô¤Î³Ú¶Ê¥Ö¥í¥Ã¥¯"
-
-#: parser.yy:575
-msgid "Need even number of args for shape array"
-msgstr "shape ÇÛÎó¤Ø¤Î°ú¿ô¤Ï¶ö¿ô¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-#: parser.yy:723
+#: parser.yy:694
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£"
 
-#: parser.yy:946 parser.yy:1360 parser.yy:1380
-#, c-format
-msgid "not a duration: %d"
-msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d"
+#: parser.yy:739
+msgid "Second argument must be a symbol"
+msgstr ""
 
-#: parser.yy:948 parser.yy:1382
-msgid "Can't abbreviate"
-msgstr "¾Êά¤Ç¤­¤Þ¤»¤ó"
+#: parser.yy:744
+msgid "First argument must be a procedure taking 1 argument"
+msgstr ""
 
-#: parser.yy:1076
+#: parser.yy:1069
 msgid "Can't specify direction for this request"
 msgstr "¤³¤ÎÍ×µá¤ËÂФ¹¤ëÊý¸þ¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: parser.yy:1211 parser.yy:1219 parser.yy:1444
+#: parser.yy:1170
+#, c-format
+msgid "Expecting %d arguments"
+msgstr ""
+
+#: parser.yy:1193 parser.yy:1201 parser.yy:1443
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: parser.yy:1391
+#: parser.yy:1342 parser.yy:1362
+#, c-format
+msgid "not a duration: %d"
+msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d"
+
+#: parser.yy:1371
 msgid "Have to be in Note mode for notes"
 msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: parser.yy:1403
-msgid "Can't abbreviate tuplet"
-msgstr "¥¿¥×¥ì¥Ã¥È¤ò¾Êά¤Ç¤­¤Þ¤»¤ó"
-
-#: parser.yy:1450
+#: parser.yy:1459
 msgid "Have to be in Chord mode for chords"
 msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: lexer.ll:155
+#: lexer.ll:158
 msgid "EOF found inside a comment"
 msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: lexer.ll:169
+#: lexer.ll:172
 msgid "\\maininput disallowed outside init files"
 msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó"
 
-#: lexer.ll:199
+#: lexer.ll:202
 #, c-format
 msgid "undefined identifier: `%s'"
 msgstr "̤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'"
 
 #. backup rule
-#: lexer.ll:204
+#: lexer.ll:207
 msgid "Missing end quote"
 msgstr "½ªÎ»¥¯¥ª¡¼¥È¤¬¤¢¤ê¤Þ¤»¤ó"
 
 #. backup rule
-#: lexer.ll:227 lexer.ll:231
+#: lexer.ll:229 lexer.ll:233
 msgid "white expected"
 msgstr "¶õÇò¤¬É¬ÍפǤ¹"
 
-#: lexer.ll:401
+#: lexer.ll:241
+msgid "Can't evaluate Scheme in safe mode"
+msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó"
+
+#: lexer.ll:436
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "̵¸ú¤Êʸ»ú: `%c'"
 
-#: lexer.ll:457
+#: lexer.ll:494
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'"
 
-#: lexer.ll:543
+#: lexer.ll:580
 #, c-format
 msgid "incorrect mudela version: %s (%s, %s)"
 msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)"
 
-#: out/BLURB.hh:2
-msgid ""
-"LilyPond is a music typesetter.  It produces beautiful sheet music\n"
-"using a high level description file as input.  LilyPond is part of \n"
-"the GNU Project.\n"
-msgstr ""
-"LilyPond ¤Ï³Ú¶ÊÁÈÈÇ¥½¥Õ¥È¤Ç¤¹¡£ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤Ï¥Ï¥¤¥ì¥Ù¥ë¤Êµ­½Ò¤ò»ÈÍѤǤ­¡¢\n"
-"Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU ¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤¹¡£\n"
-
-#: main.cc:90
+#: main.cc:91
 msgid "write exact durations, e.g.: a4*385/384"
 msgstr "Àµ³Î¤Ê²»Ä¹¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£Îã: a4*385/384"
 
-#: main.cc:93
+#: main.cc:94
 msgid "ACC[:MINOR]"
 msgstr "ACC[:MINOR]"
 
-#: main.cc:93
+#: main.cc:94
 msgid "set key: ACC +sharps/-flats; :1 minor"
 msgstr "Ä´¤òÀßÄê: ACC +¥·¥ã¡¼¥×/-¥Õ¥é¥Ã¥È :1 ûĴ"
 
-#: main.cc:94
-msgid "assume no tuplets or double dots, smallest is 32"
+#: main.cc:95
+#, fuzzy
+msgid "don't output tuplets or double dots, smallest is 32"
 msgstr "ÉäÅÀ¤äÊ£ÉäÅÀ¤ò¤Ê¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹¡¢ºÇ¾®¤Ï 32"
 
-#: main.cc:95
+#: main.cc:96
 msgid "set FILE as default output"
 msgstr "¥Ç¥Õ¥©¥ë¥È½ÐÎϤȤ·¤Æ FILE ¤òÀßÄꤹ¤ë"
 
-#: main.cc:96
-msgid "assume no tuplets"
-msgstr "ÉäÅÀ¤ò̵¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹"
-
 #: main.cc:97
+msgid "don't output tuplets"
+msgstr ""
+
+#: main.cc:98
 msgid "be quiet"
 msgstr "ÀŤ«¤Ë¤·¤Þ¤¹"
 
-#: main.cc:98
+#: main.cc:99
 msgid "DUR"
 msgstr "DUR"
 
-#: main.cc:98
+#: main.cc:99
 msgid "set smallest duration"
 msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹"
 
-#: main.cc:101
+#: main.cc:102
 msgid "be verbose"
 msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: main.cc:103
+#: main.cc:104
 msgid "assume no double dotted notes"
 msgstr "Ê£ÉäÅÀ²»Éä¤ò̵¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹"
 
-#: main.cc:110
+#: main.cc:111
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
 
-#: main.cc:112
+#: main.cc:113
 msgid "Translate MIDI-file to mudela"
 msgstr "MIDI ¥Õ¥¡¥¤¥ë¤ò mudela ¤ËÊÑ´¹¤·¤Þ¤¹"
 
@@ -1121,7 +1006,8 @@ msgid "invalid number of tracks"
 msgstr "̵¸ú¤Ê¥È¥é¥Ã¥¯¿ô"
 
 #: midi-score-parser.cc:58
-msgid "Can't handle non-metrical time"
+#, fuzzy
+msgid "can't handle non-metrical time"
 msgstr "±¤Î§¤Ë¤Ê¤é¤Ê¤¤Çï»Ò¤Ï°·¤¨¤Þ¤»¤ó"
 
 #: midi-track-parser.cc:68
@@ -1192,11 +1078,11 @@ msgstr "
 msgid "Settling columns..."
 msgstr "¥«¥é¥à¤ò·èÄꤷ¤Þ¤¹..."
 
-#: mudela-staff.cc:177
+#: mudela-staff.cc:178
 msgid "% MIDI copyright:"
 msgstr "% MIDI copyright:"
 
-#: mudela-staff.cc:178
+#: mudela-staff.cc:179
 msgid "% MIDI instrument:"
 msgstr "% MIDI instrument:"
 
@@ -1206,15 +1092,172 @@ msgid "lily indent level: %d"
 msgstr "lily indent level: %d"
 
 #. Maybe better not to translate these?
-#: mudela-stream.cc:76
+#: mudela-stream.cc:83
 msgid "% Creator: "
 msgstr "%s Creator: "
 
-#: mudela-stream.cc:81
+#: mudela-stream.cc:88
 msgid "% Automatically generated"
 msgstr "% Automatically generated"
 
-#: mudela-stream.cc:90
+#: mudela-stream.cc:97
 #, c-format
 msgid "% from input file: "
 msgstr "% from input file: "
+
+#~ msgid "Debug output disabled.  Compiled with NPRINT."
+#~ msgstr ""
+#~ "¥Ç¥Ð¥Ã¥°½ÐÎϤ¬Ìµ¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£NPRINT ¤Ä¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿¡£"
+
+#~ msgid "programming warning: "
+#~ msgstr "¥×¥í¥°¥é¥à¾å¤Î·Ù¹ð: "
+
+#~ msgid "(search path: `%s)'"
+#~ msgstr "(¸¡º÷¥Ñ¥¹: `%s')"
+
+#~ msgid "no beam to end"
+#~ msgstr "ËöÈø¤Ø¤Î³Ã¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#~ msgid "unfinished beam"
+#~ msgstr "½ªÎ»¤µ¤ì¤Æ¤¤¤Ê¤¤³Ã"
+
+#~ msgid "0 lines"
+#~ msgstr "0 ¹Ô"
+
+#~ msgid "1 line (of %.0f columns)"
+#~ msgstr "1 ¹Ô (%.0f ¥«¥é¥à)"
+
+#~ msgid "%d lines (with an average of %.1f columns)"
+#~ msgstr "%d ¹Ô (Ê¿¶Ñ %.1f ¥«¥é¥à)"
+
+#~ msgid "Score does not have any columns"
+#~ msgstr "ÉèÌ̤˥«¥é¥à¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#~ msgid "approximated %s"
+#~ msgstr "¤ª¤ª¤è¤½ %s"
+
+#~ msgid "calculated %s exactly"
+#~ msgstr "Àµ³Î¤Ë·×»»¤µ¤ì¤¿ %s"
+
+#~ msgid "elapsed time %.2f seconds"
+#~ msgstr "%.2f É÷вá"
+
+#~ msgid "no tremolo beam to end"
+#~ msgstr "ËöÈø¤Ø¤Î¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#~ msgid "Already have a tremolo beam"
+#~ msgstr "¤¹¤Ç¤Ë¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤¹"
+
+#~ msgid "unfinished tremolo beam"
+#~ msgstr "½ª¤ï¤Ã¤Æ¤¤¤Ê¤¤¥È¥ì¥â¥íµ­¹æ"
+
+#~ msgid "Got a dynamic already.  Continuing dazed and confused."
+#~ msgstr "´û¤ËưŪ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£º®Í𤷤¿¤Þ¤Þ³¤±¤Þ¤¹¡£"
+
+#~ msgid "Too many crescendi here"
+#~ msgstr "¤³¤³¤Î¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬Â¿¤¹¤®¤Þ¤¹"
+
+#~ msgid "Ineq_constrained_qp::solve (): Constraint off by %f"
+#~ msgstr "Ineq_constrained_qp::solve (): À©¸Â¤ò %f ¤Ç²ò½ü"
+
+#~ msgid "Didn't converge!"
+#~ msgstr "¼ý«¤·¤Þ¤»¤ó¤Ç¤·¤¿!"
+
+#~ msgid "too much degeneracy"
+#~ msgstr "¾®¤µ¤¹¤®¤Þ¤¹"
+
+#~ msgid "Don't have that many octaves (%s)"
+#~ msgstr "¤½¤ó¤Ê¤ËÂô»³¤Î¥ª¥¯¥¿¡¼¥Ö (%s) ¤ò»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤"
+
+#~ msgid "underdone accidentals (%s)"
+#~ msgstr "¥Õ¥é¥Ã¥È¤¬Â¿¤¹¤®¤Þ¤¹ (%s)"
+
+#~ msgid "overdone accidentals (%s)"
+#~ msgstr "¥·¥ã¡¼¥×¤¬Â¿¤¹¤®¤Þ¤¹ (%s)"
+
+#~ msgid "Huh?  Empty Line_of_score?"
+#~ msgstr "¤Ï? ÉèÌ̤ιԤ¬¶õ?"
+
+#~ msgid "redeclaration of `\\%s'"
+#~ msgstr "`\\%s' ¤ÎºÆÀë¸À"
+
+#~ msgid "Must set spring between differing columns"
+#~ msgstr "°Û¤Ê¤ë¥«¥é¥à¤Î´Ö¤Ë spring ¤ò¥»¥Ã¥È¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+#~ msgid "improbable offset for object type: `%s'"
+#~ msgstr "¥ª¥Ö¥¸¥§¥¯¥È·¿¤Ë¤È¤Ã¤Æ¤¢¤ê¤½¤¦¤Ë¤Ê¤¤¥ª¥Õ¥»¥Ã¥È: `%s'"
+
+#~ msgid "Can't solve this casting problem exactly; reverting to Word_wrap"
+#~ msgstr "Àµ³Î¤Ë¥­¥ã¥¹¥È¤ò²ò·è¤Ç¤­¤Þ¤»¤ó -- Word_wrap ¤ËÉüµ¢¤·¤Þ¤¹"
+
+#~ msgid "%s elements"
+#~ msgstr "%s ¸Ä¤ÎÍ×ÁÇ"
+
+#~ msgid "Line ... "
+#~ msgstr "¹Ô ..."
+
+#~ msgid "degenerate constraints"
+#~ msgstr "À©¸Â¤ò´ËÏÂ"
+
+#~ msgid "Left spanpoint is right spanpoint"
+#~ msgstr "ÈϰϤκ¸Â¦¤¬¡¢±¦Â¦¤Ë¤¢¤ê¤Þ¤¹"
+
+#~ msgid "spanner with negative length"
+#~ msgstr "ÈÏ°Ï»ØÄê»Ò¤¬Éé¤ÎŤµ¤Ç¤¹"
+
+#~ msgid "I'm too fat; call Oprah"
+#~ msgstr "ÂÀ¤¹¤®¤Þ¤¹ -- Oprah ¤ò¸Æ¤ó¤Ç"
+
+#~ msgid "Solution doesn't satisfy constraints"
+#~ msgstr "¤½¤Î²ò·è¤ÏÀ©¸Â¤òËþ¤¿¤·¤Þ¤»¤ó"
+
+#~ msgid "Improbable distance: %f point, setting to 10 mm"
+#~ msgstr "¤¢¤ê¤½¤¦¤Ë¤Ê¤¤µ÷Î¥: %f ¥Ý¥¤¥ó¥È, 10 mm ¤ËÀßÄꤷ¤Þ¤¹"
+
+#~ msgid "Negative distance, setting to 10 mm"
+#~ msgstr "Éé¤ÎÃͤȤʤëµ÷Î¥, 10 mm ¤ËÀßÄꤷ¤Þ¤¹"
+
+#~ msgid "stem direction set already!"
+#~ msgstr "ÉäÈø¤ÎÊý¸þ¤Ï´û¤Ë¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤¹!"
+
+#~ msgid "unequal number of note heads for tie"
+#~ msgstr "¥¿¥¤¤ËÂбþ¤¹¤ëÉäƬ¤Î¿ô¤¬¶ÑÅù¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+#~ msgid "cadenza"
+#~ msgstr "cadenza"
+
+#~ msgid "Partial measure must be non-negative"
+#~ msgstr "¾®ÀáÉô¤ÏÈóÉé¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
+
+#~ msgid "partial measure too large"
+#~ msgstr "¾®ÀáÉô¤¬Â礭¤¹¤®¤Þ¤¹"
+
+#~ msgid "time signature change not allowed here"
+#~ msgstr "¤³¤³¤Ç¤ÏÇï»Òµ­¹æ¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó"
+
+#~ msgid "Will ignore \\relative for transposed music"
+#~ msgstr "žĴ¤µ¤ì¤¿³Ú¶Ê¤Ï \\relative ¤ò̵»ë¤·¤Þ¤¹"
+
+#~ msgid "Ugh, this measure is too long, breakpoint: %d"
+#~ msgstr "¤¦¤°¤Ã¡¢¤³¤Î¾®Àá¤ÏŤ¹¤®¤Þ¤¹¡£¤­¤ë¾ì½ê: %d"
+
+#~ msgid "Generating stupido solution"
+#~ msgstr "Çϼ¯¤²¤¿²ò·è¤òÀ¸À®Ãæ"
+
+#~ msgid "I don't fit; put me on Montignac"
+#~ msgstr "¾å¼ê¤¯¤Ï¤Þ¤ê¤Þ¤»¤ó -- Montignac ¤Î¤È¤³¤í¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤"
+
+#~ msgid "More than one music block"
+#~ msgstr "Ê£¿ô¤Î³Ú¶Ê¥Ö¥í¥Ã¥¯"
+
+#~ msgid "Need even number of args for shape array"
+#~ msgstr "shape ÇÛÎó¤Ø¤Î°ú¿ô¤Ï¶ö¿ô¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+#~ msgid "Can't abbreviate"
+#~ msgstr "¾Êά¤Ç¤­¤Þ¤»¤ó"
+
+#~ msgid "Can't abbreviate tuplet"
+#~ msgstr "¥¿¥×¥ì¥Ã¥È¤ò¾Êά¤Ç¤­¤Þ¤»¤ó"
+
+#~ msgid "assume no tuplets"
+#~ msgstr "ÉäÅÀ¤ò̵¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹"
diff --git a/po/lilypond.pot b/po/lilypond.pot
index b0ef079af6..30fd6bfd6b 100644
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-30 21:06+0200\n"
+"POT-Creation-Date: 2000-06-09 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,17 +108,17 @@ msgstr ""
 msgid "Loading default font"
 msgstr ""
 
-#: all-font-metrics.cc:123
+#: all-font-metrics.cc:122
 #, c-format
 msgid "can't find default font: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:124 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
+#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
 #, c-format
 msgid "(search path: `%s')"
 msgstr ""
 
-#: all-font-metrics.cc:125
+#: all-font-metrics.cc:124
 msgid "Giving up"
 msgstr ""
 
@@ -158,6 +158,11 @@ msgstr ""
 msgid "weird beam vertical offset"
 msgstr ""
 
+#: break-align-item.cc:87
+#, c-format
+msgid "unknown spacing pair `%s', `%s'"
+msgstr ""
+
 #: change-iterator.cc:22
 #, c-format
 msgid "can't change `%s' to `%s'"
@@ -185,17 +190,17 @@ msgstr ""
 msgid "no one to print a tremolos"
 msgstr ""
 
-#: chord.cc:146
+#: chord.cc:151
 #, c-format
 msgid "invalid subtraction: not part of chord: %s"
 msgstr ""
 
-#: chord.cc:372
+#: chord.cc:375
 #, c-format
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr ""
 
-#: clef-engraver.cc:172
+#: clef-engraver.cc:166
 msgid "unknown clef type"
 msgstr ""
 
@@ -295,25 +300,10 @@ msgstr ""
 msgid "Don't know how handle empty keys"
 msgstr ""
 
-#: key-engraver.cc:93 key-performer.cc:65
+#: key-engraver.cc:74 key-performer.cc:65
 msgid "FIXME: key change merge"
 msgstr ""
 
-#: key.cc:56 key.cc:61
-#, c-format
-msgid "Don't have that many octaves (%s)"
-msgstr ""
-
-#: key.cc:79
-#, c-format
-msgid "underdone accidentals (%s)"
-msgstr ""
-
-#: key.cc:84
-#, c-format
-msgid "overdone accidentals (%s)"
-msgstr ""
-
 #: lily-guile.cc:123 lily-guile.cc:146
 #, c-format
 msgid "(load path: `%s')"
@@ -324,12 +314,12 @@ msgstr ""
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:228 paper-score.cc:70
+#: line-of-score.cc:207 paper-score.cc:70
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:242
+#: line-of-score.cc:221
 msgid "Calculating column positions..."
 msgstr ""
 
@@ -668,7 +658,7 @@ msgstr ""
 msgid "Score contains errors; will not process it"
 msgstr ""
 
-#: script-engraver.cc:69
+#: script-engraver.cc:68
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -703,7 +693,7 @@ msgstr ""
 msgid "Slur over rest?"
 msgstr ""
 
-#: spanner.cc:34 spanner.cc:173
+#: spanner.cc:35 spanner.cc:174
 #, c-format
 msgid "Spanner `%s' has equal left and right spanpoints"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index e41162d913..ed02b27e72 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-30 21:06+0200\n"
+"POT-Creation-Date: 2000-06-09 02:01+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-26 11:26:28+0200\n"
 "From:  <janneke@gnu.org>\n"
@@ -106,17 +106,17 @@ msgstr "kan font niet vinden: `%s'"
 msgid "Loading default font"
 msgstr "Laad verstek font"
 
-#: all-font-metrics.cc:123
+#: all-font-metrics.cc:122
 #, c-format
 msgid "can't find default font: `%s'"
 msgstr "kan verstekfont niet vinden: `%s'"
 
-#: all-font-metrics.cc:124 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
+#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
 #, c-format
 msgid "(search path: `%s')"
 msgstr "(zoekpad: `%s')"
 
-#: all-font-metrics.cc:125
+#: all-font-metrics.cc:124
 msgid "Giving up"
 msgstr "Geef op"
 
@@ -156,6 +156,10 @@ msgstr "waardestreep heeft minder dan twee stokken"
 msgid "weird beam vertical offset"
 msgstr "rare verticale waardestreep verplaatsing"
 
+#: break-align-item.cc:87
+msgid "unknown spacing pair `%s', `%s'"
+msgstr "onbekend ruimte paar `%s', `%s'"
+
 #: change-iterator.cc:22
 #, c-format
 msgid "can't change `%s' to `%s'"
@@ -183,17 +187,17 @@ msgstr "onbe
 msgid "no one to print a tremolos"
 msgstr "niemand om tremolos af te drukken"
 
-#: chord.cc:146
+#: chord.cc:151
 #, c-format
 msgid "invalid subtraction: not part of chord: %s"
 msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s"
 
-#: chord.cc:372
+#: chord.cc:375
 #, c-format
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s"
 
-#: clef-engraver.cc:172
+#: clef-engraver.cc:166
 msgid "unknown clef type"
 msgstr "onbekend type sleutel"
 
@@ -297,25 +301,10 @@ msgstr "Geen toonsoort, ga uit van `C'"
 msgid "Don't know how handle empty keys"
 msgstr "Weet niet hoe lege toonsoorten te behandelen"
 
-#: key-engraver.cc:93 key-performer.cc:65
+#: key-engraver.cc:74 key-performer.cc:65
 msgid "FIXME: key change merge"
 msgstr "MAAKME: toonsoort sleutel samenvoeging"
 
-#: key.cc:56 key.cc:61
-#, c-format
-msgid "Don't have that many octaves (%s)"
-msgstr "Zoveel oktaven heb ik niet (%s)"
-
-#: key.cc:79
-#, c-format
-msgid "underdone accidentals (%s)"
-msgstr "onderdreven aantal kruizen/mollen (%s)"
-
-#: key.cc:84
-#, c-format
-msgid "overdone accidentals (%s)"
-msgstr "overdreven aantal kruizen/mollen (%s)"
-
 #: lily-guile.cc:123 lily-guile.cc:146
 #, c-format
 msgid "(load path: `%s')"
@@ -326,12 +315,12 @@ msgstr "(zoekpad: `%s')"
 msgid "Element count %d."
 msgstr "Aantal elementen: %d."
 
-#: line-of-score.cc:228 paper-score.cc:70
+#: line-of-score.cc:207 paper-score.cc:70
 #, c-format
 msgid "Element count %d "
 msgstr "Aantal elementen: %d."
 
-#: line-of-score.cc:242
+#: line-of-score.cc:221
 msgid "Calculating column positions..."
 msgstr "Berekenen van kolomposities..."
 
@@ -621,6 +610,7 @@ msgstr "MIDI uitvoer naar %s..."
 
 #: piano-pedal-engraver.cc:158 piano-pedal-engraver.cc:170
 #: piano-pedal-performer.cc:87
+#, c-format
 msgid "can't find start of piano pedal: %s"
 msgstr "kan start van piano pedaal niet vinden: %s"
 
@@ -691,7 +681,7 @@ msgstr "Schijven van afhankelijkheden bestand: `%s'..."
 msgid "Score contains errors; will not process it"
 msgstr "Partituur bevat fouten; zal hem niet verwerken"
 
-#: script-engraver.cc:69
+#: script-engraver.cc:68
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "Weet niet hoe articulatie te vertolken `%s'"
@@ -726,7 +716,7 @@ msgstr "Zet bindingsboog over rust.  Negeer."
 msgid "Slur over rest?"
 msgstr "Boogje over rust?"
 
-#: spanner.cc:34 spanner.cc:173
+#: spanner.cc:35 spanner.cc:174
 #, c-format
 msgid "Spanner `%s' has equal left and right spanpoints"
 msgstr "Spanner `%s' heeft gelijke linker en rechter spanpunten"
@@ -1079,6 +1069,15 @@ msgstr "% Automatisch gegenereerd"
 msgid "% from input file: "
 msgstr "% van invoerbestand: "
 
+#~ msgid "Don't have that many octaves (%s)"
+#~ msgstr "Zoveel oktaven heb ik niet (%s)"
+
+#~ msgid "underdone accidentals (%s)"
+#~ msgstr "onderdreven aantal kruizen/mollen (%s)"
+
+#~ msgid "overdone accidentals (%s)"
+#~ msgstr "overdreven aantal kruizen/mollen (%s)"
+
 #~ msgid "score does not have any columns"
 #~ msgstr "partituur heeft geen enkele kolom"
 
diff --git a/po/ru.po b/po/ru.po
index 4a7af6606c..e114030df0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-30 21:06+0200\n"
+"POT-Creation-Date: 2000-06-09 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: August S.Sigov <august@infran.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -108,17 +108,17 @@ msgstr "
 msgid "Loading default font"
 msgstr "úÁÇÒÕÖÁÀ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: all-font-metrics.cc:123
+#: all-font-metrics.cc:122
 #, c-format
 msgid "can't find default font: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'"
 
-#: all-font-metrics.cc:124 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
+#: all-font-metrics.cc:123 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
 #, c-format
 msgid "(search path: `%s')"
 msgstr "(ÐÕÔØ ÐÏÉÓËÁ: `%s')"
 
-#: all-font-metrics.cc:125
+#: all-font-metrics.cc:124
 msgid "Giving up"
 msgstr "óÄÁÀÓØ"
 
@@ -158,6 +158,11 @@ msgstr "
 msgid "weird beam vertical offset"
 msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
+#: break-align-item.cc:87
+#, fuzzy, c-format
+msgid "unknown spacing pair `%s', `%s'"
+msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ ÂÕÍÁÇÉ: `%s'"
+
 #: change-iterator.cc:22
 #, c-format
 msgid "can't change `%s' to `%s'"
@@ -186,17 +191,17 @@ msgstr "
 msgid "no one to print a tremolos"
 msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ"
 
-#: chord.cc:146
+#: chord.cc:151
 #, c-format
 msgid "invalid subtraction: not part of chord: %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÞÉÔÁÎÉÅ: ÎÅ ÞÁÓÔØ ÁËËÏÒÄÁ: %s"
 
-#: chord.cc:372
+#: chord.cc:375
 #, c-format
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr ""
 
-#: clef-engraver.cc:172
+#: clef-engraver.cc:166
 msgid "unknown clef type"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ËÌÀÞÁ"
 
@@ -297,25 +302,10 @@ msgstr "
 msgid "Don't know how handle empty keys"
 msgstr "îÅ ÚÎÁÀ, ÞÔÏ ÄÅÌÁÔØ Ó ÐÕÓÔÙÍÉ ËÌÀÞÁÍÉ"
 
-#: key-engraver.cc:93 key-performer.cc:65
+#: key-engraver.cc:74 key-performer.cc:65
 msgid "FIXME: key change merge"
 msgstr "éóðòá÷øíåîñ: ÓÌÉÑÎÉÅ ÓÍÅÎÙ ËÌÀÞÁ"
 
-#: key.cc:56 key.cc:61
-#, c-format
-msgid "Don't have that many octaves (%s)"
-msgstr "îÅÔ ÔÁËÏÇÏ ËÏÌÉÞÅÓÔ×Á ÏËÔÁ× (%s)"
-
-#: key.cc:79
-#, c-format
-msgid "underdone accidentals (%s)"
-msgstr ""
-
-#: key.cc:84
-#, c-format
-msgid "overdone accidentals (%s)"
-msgstr ""
-
 #: lily-guile.cc:123 lily-guile.cc:146
 #, c-format
 msgid "(load path: `%s')"
@@ -326,12 +316,12 @@ msgstr "(
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:228 paper-score.cc:70
+#: line-of-score.cc:207 paper-score.cc:70
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:242
+#: line-of-score.cc:221
 msgid "Calculating column positions..."
 msgstr "÷ÙÞÉÓÌÑÀ ÐÏÚÉÃÉÉ ÓÔÏÌÂÃÏ×"
 
@@ -678,7 +668,7 @@ msgstr "
 msgid "Score contains errors; will not process it"
 msgstr ""
 
-#: script-engraver.cc:69
+#: script-engraver.cc:68
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -713,7 +703,7 @@ msgstr "
 msgid "Slur over rest?"
 msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?"
 
-#: spanner.cc:34 spanner.cc:173
+#: spanner.cc:35 spanner.cc:174
 #, c-format
 msgid "Spanner `%s' has equal left and right spanpoints"
 msgstr ""
@@ -1064,6 +1054,9 @@ msgstr "% 
 msgid "% from input file: "
 msgstr "% ÉÚ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ: "
 
+#~ msgid "Don't have that many octaves (%s)"
+#~ msgstr "îÅÔ ÔÁËÏÇÏ ËÏÌÉÞÅÓÔ×Á ÏËÔÁ× (%s)"
+
 #~ msgid "score does not have any columns"
 #~ msgstr "ÆÒÁÇÍÅÎÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓÔÏÌÂÃÏ×"
 
diff --git a/scm/lily.scm b/scm/lily.scm
index d68cdd9384..b9d5c1020d 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -136,15 +136,6 @@
    )
 )
 
-;; (define (ly-warn s) (error s))
-(define (break-align-spacer this next)
-  (let ((entry (assoc (list this next) space-alist)))
-    (if entry
-	(cdr entry)
-	(begin (ly-warn (string-append "Unknown spacing pair `" this "', `" next "'"))
-	       '(minimum-space 0.0)))))
-  
-
 (define (find-notehead-symbol duration style)
   (case style
    ((cross) "2cross")
@@ -210,17 +201,6 @@
   )
 	     
 (define script-alist '())
-(define (articulation-to-scriptdef a)
-  (assoc a script-alist)
-  )
-
-;; Map style names to TeX font names.  Return false if 
-;; no font name found. 
-(define (style-to-cmr s)
-  (assoc s cmr-alist )
-  )
-	    
-
 
 (define font-name-alist  '())
 (define (font-command name-mag)
diff --git a/scm/paper.scm b/scm/paper.scm
index c5bdbbeba4..a615f9564f 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -137,19 +137,3 @@
 	(beta (/ (* pi r-0) (* 2.0 h-inf))))
     (* alpha (atan (* beta b)))))
  
-;; see mf/feta-pendaal.mf
-(define pedal-kerning-alist '())
-(set! pedal-kerning-alist
-      (append 
-      '(
-	(("P" . "e") . -0.07)
-	(("e" . "d") . -0.53)
-	(("*" . "P") . 0.2)
-	)
-      pedal-kerning-alist))
-
-(define (pedal-kerning l r)
-  (let ((entry (assoc (cons l r) pedal-kerning-alist)))
-    (if entry
-	(cdr entry))))
-
-- 
2.39.5