From 3abcf40ffcc86fa452df2d3e79cc2c27b60fc6bd Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 19 May 2001 12:08:21 +0200
Subject: [PATCH] patch::: 1.4.1.jcn2

1.4.1.jcn2
==========

* Added \newpage command.

* Doco fixes.

* Debian make fix.
---
 CHANGES                           |   9 +++
 Documentation/user/invoking.itexi |   2 +-
 Documentation/user/ly2dvi.itexi   |   3 +-
 Documentation/user/refman.itely   |  15 +++-
 VERSION                           |   2 +-
 ly/property.ly                    |   7 ++
 make/mutopia-rules.make           |   6 +-
 make/stepmake.make                |   3 +-
 po/de.po                          | 125 ++++++++++++++---------------
 po/fr.po                          | 125 ++++++++++++++---------------
 po/it.po                          | 125 ++++++++++++++---------------
 po/ja.po                          | 125 ++++++++++++++---------------
 po/lilypond.pot                   | 121 +++++++++++++---------------
 po/nl.po                          | 128 ++++++++++++++----------------
 po/ru.po                          | 125 ++++++++++++++---------------
 scripts/ly2dvi.py                 |   7 +-
 stepmake/make/stepmake.make       |   3 +-
 17 files changed, 457 insertions(+), 474 deletions(-)

diff --git a/CHANGES b/CHANGES
index 31d6873fbd..fb18257fbd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+1.4.1.jcn2
+==========
+
+* Added \newpage command.
+
+* Doco fixes.
+
+* Debian make fix.
+
 1.4.1.jcn1
 ==========
 
diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index d1779bdbbb..93649dc3e1 100644
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -9,7 +9,7 @@
 Usage:
 
 @example
-        lilypond @var{[OPTION]} ... @var{[file]}...
+        lilypond [@var{OPTION}@dots{} [@var{FILE}]@dots{}
 @end example
 
 @unnumberedsec Options
diff --git a/Documentation/user/ly2dvi.itexi b/Documentation/user/ly2dvi.itexi
index 653cf2a6ae..0ca57e8064 100644
--- a/Documentation/user/ly2dvi.itexi
+++ b/Documentation/user/ly2dvi.itexi
@@ -11,8 +11,9 @@ wrapper around the output, and running La@TeX{} (and optionally
 
 @unnumberedsubsec Invoking ly2dvi
 
+@c ly2dvi needs at least one FILE, can't act as filter yet
 @example
-ly2dvi @var{[OPTIONS]} ... @var{[FILE]}...
+        ly2dvi [@var{OPTION}]@dots{} @var{FILE}@dots{}
 @end example
 
 @unnumberedsec Options
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index b791f4e8fc..6bbaa27564 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -3418,12 +3418,21 @@ command is rather kludgey, and slated for rewriting.
 @cindex page breaks
 @cindex breaking pages
 
-
 Page breaks are normally computed by @TeX{}, so they are not under
 direct control of LilyPond.  However, you can insert a commands into the
-@file{.tex} output to instruct @TeX{} where to break pages. For more
-details, see the example file @file{input/test/between-systems.ly}
+@file{.tex} output to instruct @TeX{} where to break pages, by inserting
+the command @code{\newpage}
+@cindex @code{\newpage}
+
+@example
+  \newpage
+@end example
 
+@c why do so difficult?
+@c maybe should explain contents of between-system.ly,
+@c but not now, we're talking about page breaks here.
+@c For more
+@c details, see the example file @file{input/test/between-systems.ly}
 
 
 @c .  {Output scaling}
diff --git a/VERSION b/VERSION
index 0057b13635..b56ac51a2e 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=1
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/ly/property.ly b/ly/property.ly
index 058ffdd2c7..1ebe98c918 100644
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -65,6 +65,13 @@ cadenzaOff = {
   \property Score.measurePosition = #(make-moment 0 1)
 }
 
+newpage = {
+  \break
+  % urg, only works for TeX output
+  \context Score \outputproperty #(make-type-checker 'paper-column-interface)
+    #'between-system-string = #"\\newpage"
+}
+
 % dynamic dir?  text script, articulation script dir?	
 oneVoice = { 	
   \stemBoth
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index f2328cb16a..15226f7dad 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -3,14 +3,12 @@
 $(outdir)/%.gif: $(outdir)/%.ps
 	sh $(PS_TO_GIFS) $<
 	-mv $(name-stem)-page*.gif $(outdir)/
-#	touch $@
-	ln -s $(outdir)/$(name-stem)-page1.gif $@
+	ln -s $(name-stem)-page1.gif $@
 
 $(outdir)/%.png: $(outdir)/%.ps
 	sh $(PS_TO_PNGS) $<
 	-mv $(name-stem)-page*.png $(outdir)/
-#	touch $@
-	ln -s $(outdir)/$(name-stem)-page1.png $@
+	ln -s $(name-stem)-page1.png $@
 
 $(outdir)/%.ly.txt: %.ly
 	ln -f $< $@
diff --git a/make/stepmake.make b/make/stepmake.make
index 6d25f54696..d92fd1ff66 100644
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -65,7 +65,8 @@ LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
 # Don't try to outsmart us, you puny computer!
 # Well, UGH.  This only removes builtin rules from
 # subsequent $(MAKE)s, *not* from the current run!
-ifeq (0,${MAKELEVEL})
+ifeq ($(BUILTINS_REMOVED),)
+  export BUILTINS_REMOVED = yes
   MAKE:=$(MAKE) --no-builtin-rules
   include $(stepdir)/no-builtin-rules.make
 endif
diff --git a/po/de.po b/po/de.po
index 41f769ba08..175daf6528 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: 2001-05-09 16:11+0200\n"
+"POT-Creation-Date: 2001-05-18 15:48+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"
@@ -13,170 +13,166 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ly2dvi.py:96
+#: ly2dvi.py:105
 msgid "Generate .dvi with LaTeX for LilyPond"
 msgstr ""
 
-#: data-file.cc:118 input.cc:85 ly2dvi.py:177 midi-parser.cc:100 mup2ly.py:93
+#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93
 #: update-lily.py:118 warn.cc:23
 msgid "warning: "
 msgstr "Warnung: "
 
-#: ly2dvi.py:182
-msgid "Report the error S.  Exit by raising an exception. Please"
-msgstr ""
-
-#: input.cc:90 ly2dvi.py:192 ly2dvi.py:790 mup2ly.py:98 mup2ly.py:188
+#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "Fehler: "
 
-#: ly2dvi.py:193 mup2ly.py:100 update-lily.py:125
+#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125
 #, fuzzy
 msgid "Exiting ... "
 msgstr "Linie ... "
 
-#: ly2dvi.py:251 mup2ly.py:158 update-lily.py:183
+#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]"
 
-#: ly2dvi.py:255 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
+#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
 msgid "Options:"
 msgstr "Optionen:"
 
-#: ly2dvi.py:259 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
+#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
 #, fuzzy, c-format
 msgid "Report bugs to %s"
 msgstr "Melde Fehler an"
 
-#: ly2dvi.py:286 mup2ly.py:185 update-lily.py:208
+#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208
 #, fuzzy, c-format
 msgid "Invoking `%s'"
 msgstr "Uralt-Bitte: `%s'"
 
-#: ly2dvi.py:290 mup2ly.py:188 update-lily.py:211
+#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:292 mup2ly.py:190 update-lily.py:213
+#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:302
+#: ly2dvi.py:321
 #, fuzzy, c-format
 msgid "Cleaning %s..."
 msgstr "Uralt-Bitte: `%s'"
 
-#: ly2dvi.py:317 mup2ly.py:214 update-lily.py:237
+#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237
 #, fuzzy, c-format
 msgid "no such setting: %s"
 msgstr "Kein solches instrument: `%s'"
 
-#: ly2dvi.py:330 main.cc:112
+#: ly2dvi.py:349 main.cc:112
 msgid "write Makefile dependencies for every input file"
 msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei"
 
-#: ly2dvi.py:331 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
+#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
 msgid "this help"
 msgstr "Diese Hilfe"
 
-#: ly2dvi.py:332 main.cc:110 main.cc:115
+#: ly2dvi.py:351 main.cc:110 main.cc:115
 msgid "DIR"
 msgstr "DIR"
 
-#: ly2dvi.py:332
+#: ly2dvi.py:351
 #, fuzzy
 msgid "add DIR to LilyPond's search path"
 msgstr "Hänge DIR an den Suchpfad an"
 
-#: ly2dvi.py:333
+#: ly2dvi.py:352
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:334
+#: ly2dvi.py:353
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:335 main.cc:113
+#: ly2dvi.py:354 main.cc:113
 #, fuzzy
 msgid "produce MIDI output only"
 msgstr "Nur Midiausgabe"
 
-#: ly2dvi.py:336 main.cc:99 main.cc:111 main.cc:114
+#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114
 msgid "FILE"
 msgstr "DATEI"
 
-#: ly2dvi.py:336
+#: ly2dvi.py:355
 #, fuzzy
 msgid "write ouput to FILE"
 msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung"
 
-#: ly2dvi.py:338
+#: ly2dvi.py:357
 #, fuzzy
 msgid "generate PostScript output"
 msgstr "Degenerierte Zwangsbedingungen"
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:340 main.cc:118 mup2ly.py:1120 update-lily.py:255
+#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255
 #, fuzzy
 msgid "verbose"
 msgstr "Sei geschwätzig"
 
-#: ly2dvi.py:341 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
+#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
 msgid "print version number"
 msgstr "Zeige die Versionsnummer"
 
-#: ly2dvi.py:342 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
+#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
 msgid "show warranty and copyright"
 msgstr "Zeige Garantie und Urheberrechte"
 
-#: ly2dvi.py:364 ly2dvi.py:577 ly2dvi.py:602
+#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Uralt-Bitte: `%s'"
 
-#: ly2dvi.py:377
+#: ly2dvi.py:396
 #, fuzzy, c-format
 msgid "Analyzing %s..."
 msgstr "Uralt-Bitte: `%s'"
 
-#: ly2dvi.py:433
+#: ly2dvi.py:452
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:475
+#: ly2dvi.py:494
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "Ungültiger Buchstabe `%c'"
 
-#: ly2dvi.py:770 scores.cc:44
+#: ly2dvi.py:807 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "Ausgabe auf Papier auf %s..."
 
-#: ly2dvi.py:780
+#: ly2dvi.py:817
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "MIDI-Ausgabe nach %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:782
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "Kann Datei `%s' nicht finden"
 
-#: ly2dvi.py:790
+#: ly2dvi.py:830
 msgid "no files specified on command line."
 msgstr ""
 
@@ -294,12 +290,7 @@ msgstr ""
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:435
-#, fuzzy, c-format
-msgid "Fetching `%'s..."
-msgstr "Uralt-Bitte: `%s'"
-
-#: update-lily.py:448
+#: update-lily.py:435 update-lily.py:448
 #, fuzzy, c-format
 msgid "Fetching `%s'..."
 msgstr "Uralt-Bitte: `%s'"
@@ -371,17 +362,17 @@ msgstr "Programmierfehler: "
 msgid " (Continuing; cross thumbs)"
 msgstr " (Ich mache weiter: Drück´ mir die Daumen!)"
 
-#: afm.cc:53
+#: afm.cc:59
 #, fuzzy, c-format
 msgid "can't find character number: %d"
 msgstr "ich kann das Zeichen nummer %d nicht finden"
 
-#: afm.cc:68
+#: afm.cc:74
 #, fuzzy, c-format
 msgid "can't find character called: `%s'"
 msgstr "Ich kann das Zeichen `%s' nicht finden"
 
-#: afm.cc:118
+#: afm.cc:124
 #, c-format
 msgid "Error parsing AFM file: `%s'"
 msgstr ""
@@ -765,7 +756,7 @@ msgstr "Unsinnige Dauer"
 msgid "silly pitch"
 msgstr "unsinnige Tonhöhe"
 
-#: musical-request.cc:29
+#: musical-request.cc:28
 #, fuzzy, c-format
 msgid "Transposition by %s makes accidental larger than two"
 msgstr "Transponieren um %s macht Vorzecihen größer als zwei"
@@ -978,7 +969,7 @@ msgstr "Partitur enth
 msgid "Now processing: `%s'"
 msgstr "Unbekannte Sonder-Zeichenkette"
 
-#: script-engraver.cc:67
+#: script-engraver.cc:66
 #, fuzzy, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "Ich weiß nicht, wie ich die Artikulation `%s' interpretieren soll\n"
@@ -989,12 +980,12 @@ msgstr "Ich wei
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Single_malt_grouping_item: Ich saufe zu viel"
 
-#: slur.cc:49
+#: slur.cc:48
 #, fuzzy
 msgid "Putting slur over rest.  Ignoring."
 msgstr "Setze Bindebogen über Pause. Wird ignoriert"
 
-#: slur.cc:379
+#: slur.cc:383
 msgid "Slur over rest?"
 msgstr "Bindebogen übe den Rest?"
 
@@ -1199,60 +1190,60 @@ msgstr "F
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:172
+#: lexer.ll:174
 msgid "EOF found inside a comment"
 msgstr "Während eines Kommentar war die Datei zu Ende (EOF gefunden)"
 
-#: lexer.ll:186
+#: lexer.ll:188
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:210
+#: lexer.ll:212
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "Unbekannter Identifier: `%s'"
 
 #. backup rule
-#: lexer.ll:219
+#: lexer.ll:221
 #, fuzzy
 msgid "Missing end quote"
 msgstr "Endnote fehlt"
 
 #. backup rule
-#: lexer.ll:241 lexer.ll:245
+#: lexer.ll:243 lexer.ll:247
 msgid "white expected"
 msgstr "Erwarte Weiß"
 
-#: lexer.ll:254
+#: lexer.ll:256
 #, fuzzy
 msgid "Can't evaluate Scheme in safe mode"
 msgstr "Kann Scheme nicht interpretieren, wenn ich im sicheren Modus bin"
 
-#: lexer.ll:347
+#: lexer.ll:349
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:455
+#: lexer.ll:457
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "Ungültiger Buchstabe `%c'"
 
-#: lexer.ll:536
+#: lexer.ll:538
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "Unbekannte Sonder-Zeichenkette"
 
-#: lexer.ll:615
+#: lexer.ll:617
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "Älteste noch unterstütze Version der Eingabe: %s"
 
-#: lexer.ll:627
+#: lexer.ll:629
 #, fuzzy, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "Falsche Version von Lilypond: %s (%s, %s)"
 
-#: lexer.ll:628
+#: lexer.ll:630
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
@@ -1476,6 +1467,10 @@ msgstr "Erwarte MIDI-St
 msgid "invalid track length"
 msgstr "Unzulässige Länge für ein Stück"
 
+#, fuzzy
+#~ msgid "Fetching `%'s..."
+#~ msgstr "Uralt-Bitte: `%s'"
+
 #, fuzzy
 #~ msgid "Lily output to %s..."
 #~ msgstr "Lily-Ausgabe nach %s..."
diff --git a/po/fr.po b/po/fr.po
index a9b860dfcf..8c1599e052 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,173 +6,169 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.3.18\n"
-"POT-Creation-Date: 2001-05-09 16:11+0200\n"
+"POT-Creation-Date: 2001-05-18 15:48+0200\n"
 "PO-Revision-Date: 1999-12-28 00:32 +1\n"
 "Last-Translator: Laurent Martelli <laurent@linuxfan.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 
-#: ly2dvi.py:96
+#: ly2dvi.py:105
 msgid "Generate .dvi with LaTeX for LilyPond"
 msgstr ""
 
-#: data-file.cc:118 input.cc:85 ly2dvi.py:177 midi-parser.cc:100 mup2ly.py:93
+#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93
 #: update-lily.py:118 warn.cc:23
 msgid "warning: "
 msgstr "avertissement: "
 
-#: ly2dvi.py:182
-msgid "Report the error S.  Exit by raising an exception. Please"
-msgstr ""
-
-#: input.cc:90 ly2dvi.py:192 ly2dvi.py:790 mup2ly.py:98 mup2ly.py:188
+#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "erreur: "
 
-#: ly2dvi.py:193 mup2ly.py:100 update-lily.py:125
+#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125
 #, fuzzy
 msgid "Exiting ... "
 msgstr "Ligne ..."
 
-#: ly2dvi.py:251 mup2ly.py:158 update-lily.py:183
+#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "Usage: %s [OPTION... [FICHIER]"
 
-#: ly2dvi.py:255 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
+#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
 msgid "Options:"
 msgstr "Options: "
 
-#: ly2dvi.py:259 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
+#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
 #, fuzzy, c-format
 msgid "Report bugs to %s"
 msgstr "Rapporter les bugs "
 
-#: ly2dvi.py:286 mup2ly.py:185 update-lily.py:208
+#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208
 #, c-format
 msgid "Invoking `%s'"
 msgstr ""
 
-#: ly2dvi.py:290 mup2ly.py:188 update-lily.py:211
+#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:292 mup2ly.py:190 update-lily.py:213
+#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:302
+#: ly2dvi.py:321
 #, fuzzy, c-format
 msgid "Cleaning %s..."
 msgstr "Cration des voix..."
 
-#: ly2dvi.py:317 mup2ly.py:214 update-lily.py:237
+#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237
 #, fuzzy, c-format
 msgid "no such setting: %s"
 msgstr "Pas d'instrument tel: `%s'"
 
-#: ly2dvi.py:330 main.cc:112
+#: ly2dvi.py:349 main.cc:112
 msgid "write Makefile dependencies for every input file"
 msgstr ""
 
-#: ly2dvi.py:331 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
+#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
 msgid "this help"
 msgstr "cette aide"
 
-#: ly2dvi.py:332 main.cc:110 main.cc:115
+#: ly2dvi.py:351 main.cc:110 main.cc:115
 msgid "DIR"
 msgstr "REP"
 
-#: ly2dvi.py:332
+#: ly2dvi.py:351
 #, fuzzy
 msgid "add DIR to LilyPond's search path"
 msgstr "ajoute REP au chemin de recherche"
 
-#: ly2dvi.py:333
+#: ly2dvi.py:352
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:334
+#: ly2dvi.py:353
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:335 main.cc:113
+#: ly2dvi.py:354 main.cc:113
 #, fuzzy
 msgid "produce MIDI output only"
 msgstr "produit seulement la sortie MIDI"
 
-#: ly2dvi.py:336 main.cc:99 main.cc:111 main.cc:114
+#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114
 msgid "FILE"
 msgstr "FICHIER"
 
-#: ly2dvi.py:336
+#: ly2dvi.py:355
 msgid "write ouput to FILE"
 msgstr ""
 
-#: ly2dvi.py:338
+#: ly2dvi.py:357
 msgid "generate PostScript output"
 msgstr ""
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:340 main.cc:118 mup2ly.py:1120 update-lily.py:255
+#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255
 msgid "verbose"
 msgstr ""
 
-#: ly2dvi.py:341 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
+#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
 msgid "print version number"
 msgstr "afficher le numro de version"
 
-#: ly2dvi.py:342 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
+#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
 msgid "show warranty and copyright"
 msgstr ""
 
-#: ly2dvi.py:364 ly2dvi.py:577 ly2dvi.py:602
+#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Cration des voix..."
 
-#: ly2dvi.py:377
+#: ly2dvi.py:396
 #, fuzzy, c-format
 msgid "Analyzing %s..."
 msgstr "Cration des voix..."
 
-#: ly2dvi.py:433
+#: ly2dvi.py:452
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:475
+#: ly2dvi.py:494
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "caractres illgal: `%c'"
 
-#: ly2dvi.py:770 scores.cc:44
+#: ly2dvi.py:807 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "Sortie papier vers %s..."
 
-#: ly2dvi.py:780
+#: ly2dvi.py:817
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "Sortie de Lily vers %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:782
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "ne peut pas trouver le fichier: `%s'"
 
-#: ly2dvi.py:790
+#: ly2dvi.py:830
 msgid "no files specified on command line."
 msgstr ""
 
@@ -289,12 +285,7 @@ msgstr ""
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:435
-#, fuzzy, c-format
-msgid "Fetching `%'s..."
-msgstr "Cration des voix..."
-
-#: update-lily.py:448
+#: update-lily.py:435 update-lily.py:448
 #, fuzzy, c-format
 msgid "Fetching `%s'..."
 msgstr "Cration des voix..."
@@ -367,17 +358,17 @@ msgstr "Erreur de programmation: "
 msgid " (Continuing; cross thumbs)"
 msgstr " (je continure; croisez les doigts)"
 
-#: afm.cc:53
+#: afm.cc:59
 #, fuzzy, c-format
 msgid "can't find character number: %d"
 msgstr "impossible de trouver le caractres numro %d"
 
-#: afm.cc:68
+#: afm.cc:74
 #, fuzzy, c-format
 msgid "can't find character called: `%s'"
 msgstr "impossible de trouver le caractres appel `%s'"
 
-#: afm.cc:118
+#: afm.cc:124
 #, c-format
 msgid "Error parsing AFM file: `%s'"
 msgstr ""
@@ -741,7 +732,7 @@ msgstr ""
 msgid "silly pitch"
 msgstr ""
 
-#: musical-request.cc:29
+#: musical-request.cc:28
 #, c-format
 msgid "Transposition by %s makes accidental larger than two"
 msgstr ""
@@ -947,7 +938,7 @@ msgstr ""
 msgid "Now processing: `%s'"
 msgstr "chane d'chappement inconnue: `\\%s'"
 
-#: script-engraver.cc:67
+#: script-engraver.cc:66
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -957,11 +948,11 @@ msgstr ""
 msgid "Separation_item:  I've been drinking too much"
 msgstr ""
 
-#: slur.cc:49
+#: slur.cc:48
 msgid "Putting slur over rest.  Ignoring."
 msgstr ""
 
-#: slur.cc:379
+#: slur.cc:383
 msgid "Slur over rest?"
 msgstr ""
 
@@ -1164,58 +1155,58 @@ msgstr "il faut tre en mode Accord pour les accords"
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:172
+#: lexer.ll:174
 msgid "EOF found inside a comment"
 msgstr "EOF trouv dans un commentaire"
 
-#: lexer.ll:186
+#: lexer.ll:188
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:210
+#: lexer.ll:212
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "indentifiant non dfini: `%s'"
 
 #. backup rule
-#: lexer.ll:219
+#: lexer.ll:221
 msgid "Missing end quote"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:241 lexer.ll:245
+#: lexer.ll:243 lexer.ll:247
 msgid "white expected"
 msgstr "blanche attendue"
 
-#: lexer.ll:254
+#: lexer.ll:256
 msgid "Can't evaluate Scheme in safe mode"
 msgstr ""
 
-#: lexer.ll:347
+#: lexer.ll:349
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:455
+#: lexer.ll:457
 #, fuzzy, c-format
 msgid "invalid character: `%c'"
 msgstr "caractres illgal: `%c'"
 
-#: lexer.ll:536
+#: lexer.ll:538
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "chane d'chappement inconnue: `\\%s'"
 
-#: lexer.ll:615
+#: lexer.ll:617
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "Plus ancienne version supporte: %s"
 
-#: lexer.ll:627
+#: lexer.ll:629
 #, fuzzy, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "version de mudela incorrecte: %s (%s, %s)"
 
-#: lexer.ll:628
+#: lexer.ll:630
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
@@ -1436,6 +1427,10 @@ msgstr "piste MIDI attendue"
 msgid "invalid track length"
 msgstr "taille de piste invalide"
 
+#, fuzzy
+#~ msgid "Fetching `%'s..."
+#~ msgstr "Cration des voix..."
+
 #, fuzzy
 #~ msgid "Lily output to %s..."
 #~ msgstr "Sortie de Lily vers %s..."
diff --git a/po/it.po b/po/it.po
index 868a39e4a8..5129acac40 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-05-09 16:11+0200\n"
+"POT-Creation-Date: 2001-05-18 15:48+0200\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Date: 1998-05-30 00:17:12+0200\n"
 "From:  <jantien@xs4all.nl>\n"
@@ -13,171 +13,167 @@ msgstr ""
 "out --add-comments --keyword=_ --keyword=_f\n"
 "Files: bow.cc int.cc\n"
 
-#: ly2dvi.py:96
+#: ly2dvi.py:105
 msgid "Generate .dvi with LaTeX for LilyPond"
 msgstr ""
 
-#: data-file.cc:118 input.cc:85 ly2dvi.py:177 midi-parser.cc:100 mup2ly.py:93
+#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93
 #: update-lily.py:118 warn.cc:23
 msgid "warning: "
 msgstr "attenzione: "
 
-#: ly2dvi.py:182
-msgid "Report the error S.  Exit by raising an exception. Please"
-msgstr ""
-
-#: input.cc:90 ly2dvi.py:192 ly2dvi.py:790 mup2ly.py:98 mup2ly.py:188
+#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "errore: "
 
-#: ly2dvi.py:193 mup2ly.py:100 update-lily.py:125
+#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125
 msgid "Exiting ... "
 msgstr ""
 
-#: ly2dvi.py:251 mup2ly.py:158 update-lily.py:183
+#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "Uso: %s [OPZIONE... [FILE]"
 
-#: ly2dvi.py:255 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
+#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
 msgid "Options:"
 msgstr "Opzioni: "
 
-#: ly2dvi.py:259 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
+#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 
-#: ly2dvi.py:286 mup2ly.py:185 update-lily.py:208
+#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208
 #, c-format
 msgid "Invoking `%s'"
 msgstr ""
 
-#: ly2dvi.py:290 mup2ly.py:188 update-lily.py:211
+#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:292 mup2ly.py:190 update-lily.py:213
+#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:302
+#: ly2dvi.py:321
 #, fuzzy, c-format
 msgid "Cleaning %s..."
 msgstr "Genero le voci..."
 
-#: ly2dvi.py:317 mup2ly.py:214 update-lily.py:237
+#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237
 #, fuzzy, c-format
 msgid "no such setting: %s"
 msgstr "% strumento:"
 
-#: ly2dvi.py:330 main.cc:112
+#: ly2dvi.py:349 main.cc:112
 #, fuzzy
 msgid "write Makefile dependencies for every input file"
 msgstr ""
 "  -d, --dependencies     scrive le dependenze del Makefile per ogni file di "
 "input\n"
 
-#: ly2dvi.py:331 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
+#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
 msgid "this help"
 msgstr ""
 
-#: ly2dvi.py:332 main.cc:110 main.cc:115
+#: ly2dvi.py:351 main.cc:110 main.cc:115
 msgid "DIR"
 msgstr ""
 
-#: ly2dvi.py:332
+#: ly2dvi.py:351
 #, fuzzy
 msgid "add DIR to LilyPond's search path"
 msgstr "  -I, --include=DIR      aggiunge DIR ai path di ricerca\n"
 
-#: ly2dvi.py:333
+#: ly2dvi.py:352
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:334
+#: ly2dvi.py:353
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:335 main.cc:113
+#: ly2dvi.py:354 main.cc:113
 #, fuzzy
 msgid "produce MIDI output only"
 msgstr "  -M, --no-paper         produce solo output midi\n"
 
-#: ly2dvi.py:336 main.cc:99 main.cc:111 main.cc:114
+#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114
 msgid "FILE"
 msgstr ""
 
-#: ly2dvi.py:336
+#: ly2dvi.py:355
 msgid "write ouput to FILE"
 msgstr ""
 
-#: ly2dvi.py:338
+#: ly2dvi.py:357
 #, fuzzy
 msgid "generate PostScript output"
 msgstr "vincoli degenerati"
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:340 main.cc:118 mup2ly.py:1120 update-lily.py:255
+#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255
 msgid "verbose"
 msgstr ""
 
-#: ly2dvi.py:341 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
+#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
 msgid "print version number"
 msgstr ""
 
-#: ly2dvi.py:342 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
+#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
 #, fuzzy
 msgid "show warranty and copyright"
 msgstr "  -w, --warranty         mostra la garanzia e il copyright\n"
 
-#: ly2dvi.py:364 ly2dvi.py:577 ly2dvi.py:602
+#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Genero le voci..."
 
-#: ly2dvi.py:377
+#: ly2dvi.py:396
 #, fuzzy, c-format
 msgid "Analyzing %s..."
 msgstr "Genero le voci..."
 
-#: ly2dvi.py:433
+#: ly2dvi.py:452
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:475
+#: ly2dvi.py:494
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "carattere illegale: `%c'"
 
-#: ly2dvi.py:770 scores.cc:44
+#: ly2dvi.py:807 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "L'output stampato è inviato a %s..."
 
-#: ly2dvi.py:780
+#: ly2dvi.py:817
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "L'output MIDI è inviato a %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:782
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "non trovo il file: `%s'"
 
-#: ly2dvi.py:790
+#: ly2dvi.py:830
 msgid "no files specified on command line."
 msgstr ""
 
@@ -294,12 +290,7 @@ msgstr ""
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:435
-#, fuzzy, c-format
-msgid "Fetching `%'s..."
-msgstr "Genero le voci..."
-
-#: update-lily.py:448
+#: update-lily.py:435 update-lily.py:448
 #, fuzzy, c-format
 msgid "Fetching `%s'..."
 msgstr "Genero le voci..."
@@ -369,17 +360,17 @@ msgstr ""
 msgid " (Continuing; cross thumbs)"
 msgstr ""
 
-#: afm.cc:53
+#: afm.cc:59
 #, fuzzy, c-format
 msgid "can't find character number: %d"
 msgstr "non riesco a trovare il carattere `%s'"
 
-#: afm.cc:68
+#: afm.cc:74
 #, fuzzy, c-format
 msgid "can't find character called: `%s'"
 msgstr "non riesco a trovare il carattere `%s'"
 
-#: afm.cc:118
+#: afm.cc:124
 #, c-format
 msgid "Error parsing AFM file: `%s'"
 msgstr ""
@@ -757,7 +748,7 @@ msgstr "indicazione durata priva di senso"
 msgid "silly pitch"
 msgstr "indicazione altezza priva di senso"
 
-#: musical-request.cc:29
+#: musical-request.cc:28
 #, fuzzy, c-format
 msgid "Transposition by %s makes accidental larger than two"
 msgstr "la trasposizine di %s rende le alterazioni più che doppie"
@@ -969,7 +960,7 @@ msgstr "lo spartito contiene errori; non lo elaborer
 msgid "Now processing: `%s'"
 msgstr "stringa di escape sconosciuta: `\\%s'"
 
-#: script-engraver.cc:67
+#: script-engraver.cc:66
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -979,12 +970,12 @@ msgstr ""
 msgid "Separation_item:  I've been drinking too much"
 msgstr ""
 
-#: slur.cc:49
+#: slur.cc:48
 #, fuzzy
 msgid "Putting slur over rest.  Ignoring."
 msgstr "Metto uno slur sulla pausa."
 
-#: slur.cc:379
+#: slur.cc:383
 #, fuzzy
 msgid "Slur over rest?"
 msgstr "Metto uno slur sulla pausa."
@@ -1188,59 +1179,59 @@ msgstr "bisogna essere in Chord mode per gli accordi"
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:172
+#: lexer.ll:174
 msgid "EOF found inside a comment"
 msgstr "ho trovato un EOF in un commento"
 
-#: lexer.ll:186
+#: lexer.ll:188
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:210
+#: lexer.ll:212
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "indentificatore non definito: `%s'"
 
 #. backup rule
-#: lexer.ll:219
+#: lexer.ll:221
 #, fuzzy
 msgid "Missing end quote"
 msgstr "apice finale mancante"
 
 #. backup rule
-#: lexer.ll:241 lexer.ll:245
+#: lexer.ll:243 lexer.ll:247
 msgid "white expected"
 msgstr "aspettavo uno spazio bianco"
 
-#: lexer.ll:254
+#: lexer.ll:256
 msgid "Can't evaluate Scheme in safe mode"
 msgstr ""
 
-#: lexer.ll:347
+#: lexer.ll:349
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:455
+#: lexer.ll:457
 #, fuzzy, c-format
 msgid "invalid character: `%c'"
 msgstr "carattere illegale: `%c'"
 
-#: lexer.ll:536
+#: lexer.ll:538
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "stringa di escape sconosciuta: `\\%s'"
 
-#: lexer.ll:615
+#: lexer.ll:617
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr ""
 
-#: lexer.ll:627
+#: lexer.ll:629
 #, fuzzy, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "versione di mudela errata: %s (%s, %s)"
 
-#: lexer.ll:628
+#: lexer.ll:630
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
@@ -1472,6 +1463,10 @@ msgstr "mi spettavo una traccia MIDI"
 msgid "invalid track length"
 msgstr "lunghezza della traccia non valida"
 
+#, fuzzy
+#~ msgid "Fetching `%'s..."
+#~ msgstr "Genero le voci..."
+
 #, fuzzy
 #~ msgid "Lily output to %s..."
 #~ msgstr "Output di Lily in %s..."
diff --git a/po/ja.po b/po/ja.po
index 3e299805e2..51a1f80b5b 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: 2001-05-09 16:11+0200\n"
+"POT-Creation-Date: 2001-05-18 15:48+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"
@@ -13,169 +13,165 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ly2dvi.py:96
+#: ly2dvi.py:105
 msgid "Generate .dvi with LaTeX for LilyPond"
 msgstr ""
 
-#: data-file.cc:118 input.cc:85 ly2dvi.py:177 midi-parser.cc:100 mup2ly.py:93
+#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93
 #: update-lily.py:118 warn.cc:23
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: ly2dvi.py:182
-msgid "Report the error S.  Exit by raising an exception. Please"
-msgstr ""
-
-#: input.cc:90 ly2dvi.py:192 ly2dvi.py:790 mup2ly.py:98 mup2ly.py:188
+#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "¥¨¥é¡¼: "
 
-#: ly2dvi.py:193 mup2ly.py:100 update-lily.py:125
+#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125
 #, fuzzy
 msgid "Exiting ... "
 msgstr "¹Ô ..."
 
-#: ly2dvi.py:251 mup2ly.py:158 update-lily.py:183
+#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
 
-#: ly2dvi.py:255 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
+#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
 msgid "Options:"
 msgstr "¥ª¥×¥·¥ç¥ó:"
 
-#: ly2dvi.py:259 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
+#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
 #, c-format
 msgid "Report bugs to %s"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø"
 
-#: ly2dvi.py:286 mup2ly.py:185 update-lily.py:208
+#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208
 #, fuzzy, c-format
 msgid "Invoking `%s'"
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: ly2dvi.py:290 mup2ly.py:188 update-lily.py:211
+#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:292 mup2ly.py:190 update-lily.py:213
+#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:302
+#: ly2dvi.py:321
 #, fuzzy, c-format
 msgid "Cleaning %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: ly2dvi.py:317 mup2ly.py:214 update-lily.py:237
+#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237
 #, fuzzy, c-format
 msgid "no such setting: %s"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: ly2dvi.py:330 main.cc:112
+#: ly2dvi.py:349 main.cc:112
 msgid "write Makefile dependencies for every input file"
 msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à"
 
-#: ly2dvi.py:331 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
+#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
 msgid "this help"
 msgstr "¤³¤Î¥Ø¥ë¥×"
 
-#: ly2dvi.py:332 main.cc:110 main.cc:115
+#: ly2dvi.py:351 main.cc:110 main.cc:115
 msgid "DIR"
 msgstr "DIR"
 
-#: ly2dvi.py:332
+#: ly2dvi.py:351
 #, fuzzy
 msgid "add DIR to LilyPond's search path"
 msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ"
 
-#: ly2dvi.py:333
+#: ly2dvi.py:352
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:334
+#: ly2dvi.py:353
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:335 main.cc:113
+#: ly2dvi.py:354 main.cc:113
 msgid "produce MIDI output only"
 msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß"
 
-#: ly2dvi.py:336 main.cc:99 main.cc:111 main.cc:114
+#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114
 msgid "FILE"
 msgstr "FILE"
 
-#: ly2dvi.py:336
+#: ly2dvi.py:355
 #, fuzzy
 msgid "write ouput to FILE"
 msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
 
-#: ly2dvi.py:338
+#: ly2dvi.py:357
 #, fuzzy
 msgid "generate PostScript output"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:340 main.cc:118 mup2ly.py:1120 update-lily.py:255
+#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255
 #, fuzzy
 msgid "verbose"
 msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: ly2dvi.py:341 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
+#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
 msgid "print version number"
 msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨"
 
-#: ly2dvi.py:342 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
+#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
 msgid "show warranty and copyright"
 msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë"
 
-#: ly2dvi.py:364 ly2dvi.py:577 ly2dvi.py:602
+#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: ly2dvi.py:377
+#: ly2dvi.py:396
 #, fuzzy, c-format
 msgid "Analyzing %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: ly2dvi.py:433
+#: ly2dvi.py:452
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:475
+#: ly2dvi.py:494
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "̵¸ú¤Êʸ»ú: `%c'"
 
-#: ly2dvi.py:770 scores.cc:44
+#: ly2dvi.py:807 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "%s ¤Ø paper ½ÐÎÏ..."
 
-#: ly2dvi.py:780
+#: ly2dvi.py:817
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:782
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, fuzzy, c-format
 msgid "can't find file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: ly2dvi.py:790
+#: ly2dvi.py:830
 msgid "no files specified on command line."
 msgstr ""
 
@@ -293,12 +289,7 @@ msgstr ""
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:435
-#, fuzzy, c-format
-msgid "Fetching `%'s..."
-msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
-
-#: update-lily.py:448
+#: update-lily.py:435 update-lily.py:448
 #, fuzzy, c-format
 msgid "Fetching `%s'..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
@@ -369,17 +360,17 @@ msgstr "
 msgid " (Continuing; cross thumbs)"
 msgstr " (³¤±¤Þ¤¹ -- cross thumbs)"
 
-#: afm.cc:53
+#: afm.cc:59
 #, fuzzy, c-format
 msgid "can't find character number: %d"
 msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d"
 
-#: afm.cc:68
+#: afm.cc:74
 #, fuzzy, c-format
 msgid "can't find character called: `%s'"
 msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: afm.cc:118
+#: afm.cc:124
 #, c-format
 msgid "Error parsing AFM file: `%s'"
 msgstr ""
@@ -778,7 +769,7 @@ msgstr "
 msgid "silly pitch"
 msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á"
 
-#: musical-request.cc:29
+#: musical-request.cc:28
 #, c-format
 msgid "Transposition by %s makes accidental larger than two"
 msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿"
@@ -983,7 +974,7 @@ msgstr "
 msgid "Now processing: `%s'"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'"
 
-#: script-engraver.cc:67
+#: script-engraver.cc:66
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "²»Àá `%s' ¤Î²ò¼áÊýË¡¤¬È½¤ê¤Þ¤»¤ó"
@@ -994,11 +985,11 @@ msgstr "
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Single_malt_grouping_item:  °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿"
 
-#: slur.cc:49
+#: slur.cc:48
 msgid "Putting slur over rest.  Ignoring."
 msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£"
 
-#: slur.cc:379
+#: slur.cc:383
 msgid "Slur over rest?"
 msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?"
 
@@ -1197,58 +1188,58 @@ msgstr "
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:172
+#: lexer.ll:174
 msgid "EOF found inside a comment"
 msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: lexer.ll:186
+#: lexer.ll:188
 msgid "\\maininput disallowed outside init files"
 msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó"
 
-#: lexer.ll:210
+#: lexer.ll:212
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "̤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'"
 
 #. backup rule
-#: lexer.ll:219
+#: lexer.ll:221
 msgid "Missing end quote"
 msgstr "½ªÎ»¥¯¥ª¡¼¥È¤¬¤¢¤ê¤Þ¤»¤ó"
 
 #. backup rule
-#: lexer.ll:241 lexer.ll:245
+#: lexer.ll:243 lexer.ll:247
 msgid "white expected"
 msgstr "¶õÇò¤¬É¬ÍפǤ¹"
 
-#: lexer.ll:254
+#: lexer.ll:256
 msgid "Can't evaluate Scheme in safe mode"
 msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó"
 
-#: lexer.ll:347
+#: lexer.ll:349
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:455
+#: lexer.ll:457
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "̵¸ú¤Êʸ»ú: `%c'"
 
-#: lexer.ll:536
+#: lexer.ll:538
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'"
 
-#: lexer.ll:615
+#: lexer.ll:617
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "°ìÈָŤ¤ÆþÎϲÄǽ¥Ð¡¼¥¸¥ç¥ó: %s"
 
-#: lexer.ll:627
+#: lexer.ll:629
 #, fuzzy, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)"
 
-#: lexer.ll:628
+#: lexer.ll:630
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
@@ -1464,6 +1455,10 @@ msgstr "MIDI 
 msgid "invalid track length"
 msgstr "̵¸ú¤Ê¥È¥é¥Ã¥¯Ä¹¤Ç¤¹"
 
+#, fuzzy
+#~ msgid "Fetching `%'s..."
+#~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
+
 #, fuzzy
 #~ msgid "Lily output to %s..."
 #~ msgstr "Lily ¤Ï %s ¤Ë½ÐÎϤ·¤Þ¤¹..."
diff --git a/po/lilypond.pot b/po/lilypond.pot
index 2879496098..3ad5bfbb95 100644
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-05-09 16:11+0200\n"
+"POT-Creation-Date: 2001-05-18 15:48+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"
@@ -14,164 +14,160 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ly2dvi.py:96
+#: ly2dvi.py:105
 msgid "Generate .dvi with LaTeX for LilyPond"
 msgstr ""
 
-#: data-file.cc:118 input.cc:85 ly2dvi.py:177 midi-parser.cc:100 mup2ly.py:93
+#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93
 #: update-lily.py:118 warn.cc:23
 msgid "warning: "
 msgstr ""
 
-#: ly2dvi.py:182
-msgid "Report the error S.  Exit by raising an exception. Please"
-msgstr ""
-
-#: input.cc:90 ly2dvi.py:192 ly2dvi.py:790 mup2ly.py:98 mup2ly.py:188
+#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr ""
 
-#: ly2dvi.py:193 mup2ly.py:100 update-lily.py:125
+#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125
 msgid "Exiting ... "
 msgstr ""
 
-#: ly2dvi.py:251 mup2ly.py:158 update-lily.py:183
+#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183
 #, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr ""
 
-#: ly2dvi.py:255 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
+#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
 msgid "Options:"
 msgstr ""
 
-#: ly2dvi.py:259 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
+#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 
-#: ly2dvi.py:286 mup2ly.py:185 update-lily.py:208
+#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208
 #, c-format
 msgid "Invoking `%s'"
 msgstr ""
 
-#: ly2dvi.py:290 mup2ly.py:188 update-lily.py:211
+#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:292 mup2ly.py:190 update-lily.py:213
+#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:302
+#: ly2dvi.py:321
 #, c-format
 msgid "Cleaning %s..."
 msgstr ""
 
-#: ly2dvi.py:317 mup2ly.py:214 update-lily.py:237
+#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237
 #, c-format
 msgid "no such setting: %s"
 msgstr ""
 
-#: ly2dvi.py:330 main.cc:112
+#: ly2dvi.py:349 main.cc:112
 msgid "write Makefile dependencies for every input file"
 msgstr ""
 
-#: ly2dvi.py:331 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
+#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
 msgid "this help"
 msgstr ""
 
-#: ly2dvi.py:332 main.cc:110 main.cc:115
+#: ly2dvi.py:351 main.cc:110 main.cc:115
 msgid "DIR"
 msgstr ""
 
-#: ly2dvi.py:332
+#: ly2dvi.py:351
 msgid "add DIR to LilyPond's search path"
 msgstr ""
 
-#: ly2dvi.py:333
+#: ly2dvi.py:352
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:334
+#: ly2dvi.py:353
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:335 main.cc:113
+#: ly2dvi.py:354 main.cc:113
 msgid "produce MIDI output only"
 msgstr ""
 
-#: ly2dvi.py:336 main.cc:99 main.cc:111 main.cc:114
+#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114
 msgid "FILE"
 msgstr ""
 
-#: ly2dvi.py:336
+#: ly2dvi.py:355
 msgid "write ouput to FILE"
 msgstr ""
 
-#: ly2dvi.py:338
+#: ly2dvi.py:357
 msgid "generate PostScript output"
 msgstr ""
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:340 main.cc:118 mup2ly.py:1120 update-lily.py:255
+#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255
 msgid "verbose"
 msgstr ""
 
-#: ly2dvi.py:341 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
+#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
 msgid "print version number"
 msgstr ""
 
-#: ly2dvi.py:342 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
+#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
 msgid "show warranty and copyright"
 msgstr ""
 
-#: ly2dvi.py:364 ly2dvi.py:577 ly2dvi.py:602
+#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
 #, c-format
 msgid "Running %s..."
 msgstr ""
 
-#: ly2dvi.py:377
+#: ly2dvi.py:396
 #, c-format
 msgid "Analyzing %s..."
 msgstr ""
 
-#: ly2dvi.py:433
+#: ly2dvi.py:452
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:475
+#: ly2dvi.py:494
 #, c-format
 msgid "invalid value: %s"
 msgstr ""
 
-#: ly2dvi.py:770 scores.cc:44
+#: ly2dvi.py:807 scores.cc:44
 #, c-format
 msgid "dependencies output to `%s'..."
 msgstr ""
 
-#: ly2dvi.py:780
+#: ly2dvi.py:817
 #, c-format
 msgid "%s output to `%s'..."
 msgstr ""
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:782
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr ""
 
-#: ly2dvi.py:790
+#: ly2dvi.py:830
 msgid "no files specified on command line."
 msgstr ""
 
@@ -287,12 +283,7 @@ msgstr ""
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:435
-#, c-format
-msgid "Fetching `%'s..."
-msgstr ""
-
-#: update-lily.py:448
+#: update-lily.py:435 update-lily.py:448
 #, c-format
 msgid "Fetching `%s'..."
 msgstr ""
@@ -361,17 +352,17 @@ msgstr ""
 msgid " (Continuing; cross thumbs)"
 msgstr ""
 
-#: afm.cc:53
+#: afm.cc:59
 #, c-format
 msgid "can't find character number: %d"
 msgstr ""
 
-#: afm.cc:68
+#: afm.cc:74
 #, c-format
 msgid "can't find character called: `%s'"
 msgstr ""
 
-#: afm.cc:118
+#: afm.cc:124
 #, c-format
 msgid "Error parsing AFM file: `%s'"
 msgstr ""
@@ -713,7 +704,7 @@ msgstr ""
 msgid "silly pitch"
 msgstr ""
 
-#: musical-request.cc:29
+#: musical-request.cc:28
 #, c-format
 msgid "Transposition by %s makes accidental larger than two"
 msgstr ""
@@ -913,7 +904,7 @@ msgstr ""
 msgid "Now processing: `%s'"
 msgstr ""
 
-#: script-engraver.cc:67
+#: script-engraver.cc:66
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -923,11 +914,11 @@ msgstr ""
 msgid "Separation_item:  I've been drinking too much"
 msgstr ""
 
-#: slur.cc:49
+#: slur.cc:48
 msgid "Putting slur over rest.  Ignoring."
 msgstr ""
 
-#: slur.cc:379
+#: slur.cc:383
 msgid "Slur over rest?"
 msgstr ""
 
@@ -1121,58 +1112,58 @@ msgstr ""
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:172
+#: lexer.ll:174
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:186
+#: lexer.ll:188
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:210
+#: lexer.ll:212
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:219
+#: lexer.ll:221
 msgid "Missing end quote"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:241 lexer.ll:245
+#: lexer.ll:243 lexer.ll:247
 msgid "white expected"
 msgstr ""
 
-#: lexer.ll:254
+#: lexer.ll:256
 msgid "Can't evaluate Scheme in safe mode"
 msgstr ""
 
-#: lexer.ll:347
+#: lexer.ll:349
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:455
+#: lexer.ll:457
 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 
-#: lexer.ll:536
+#: lexer.ll:538
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:615
+#: lexer.ll:617
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr ""
 
-#: lexer.ll:627
+#: lexer.ll:629
 #, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr ""
 
-#: lexer.ll:628
+#: lexer.ll:630
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 0d664a06d9..94b175542a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,183 +7,178 @@
 # the TP robot wants them like this (I hope).
 # Of course, Han-Wen <hanwen@cs.uu.nl> also was FIRST AUTHOR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 1.3.59\n"
-"POT-Creation-Date: 2001-05-09 16:11+0200\n"
-"PO-Revision-Date: 2000-06-09 02:23+0200\n"
+"Project-Id-Version: lilypond 1.4.1\n"
+"POT-Creation-Date: 2001-05-18 15:48+0200\n"
+"PO-Revision-Date: 2001-05-09 23:29+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <janneke@gnu.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Date: 1998-05-26 11:26:28+0200\n"
+"Date: 2001-05-09 23:29+0200\n"
 "From:  <janneke@gnu.org>\n"
 "Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po "
 "--add-comments --keyword=_\n"
 "Files: bow.cc int.cc\n"
 
-#: ly2dvi.py:96
+#: ly2dvi.py:105
 msgid "Generate .dvi with LaTeX for LilyPond"
 msgstr "Genereer .dvi met LaTeX voor LilyPond"
 
-#: data-file.cc:118 input.cc:85 ly2dvi.py:177 midi-parser.cc:100 mup2ly.py:93
+#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93
 #: update-lily.py:118 warn.cc:23
 msgid "warning: "
 msgstr "waarschuwing: "
 
-#: ly2dvi.py:182
-msgid "Report the error S.  Exit by raising an exception. Please"
-msgstr ""
-
-#: input.cc:90 ly2dvi.py:192 ly2dvi.py:790 mup2ly.py:98 mup2ly.py:188
+#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "fout: "
 
-#: ly2dvi.py:193 mup2ly.py:100 update-lily.py:125
+#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125
 msgid "Exiting ... "
 msgstr "Beëidigen ..."
 
-#: ly2dvi.py:251 mup2ly.py:158 update-lily.py:183
+#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183
 #, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "Gebruik: %s [OPTIE]... BESTAND"
 
-#: ly2dvi.py:255 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
+#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
 msgid "Options:"
 msgstr "Opties:"
 
-#: ly2dvi.py:259 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
+#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 "Meld luizen in het programma aan %s;\n"
 "meld onjuistheden in de vertaling aan <janneke@gnu.org> of <hanwen@cs.uu.nl>"
 
-#: ly2dvi.py:286 mup2ly.py:185 update-lily.py:208
+#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208
 #, c-format
 msgid "Invoking `%s'"
 msgstr "Uitvoeren `%s'"
 
-#: ly2dvi.py:290 mup2ly.py:188 update-lily.py:211
+#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211
 #, c-format
 msgid "command exited with value %d"
 msgstr "opdracht eindigde met waarde %d"
 
-#: ly2dvi.py:292 mup2ly.py:190 update-lily.py:213
+#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213
 msgid "(ignored)"
 msgstr "(genegeerd)"
 
-#: ly2dvi.py:302
+#: ly2dvi.py:321
 #, c-format
 msgid "Cleaning %s..."
 msgstr "Schoonmaken %s..."
 
-#: ly2dvi.py:317 mup2ly.py:214 update-lily.py:237
+#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237
 #, c-format
 msgid "no such setting: %s"
 msgstr "geen dergelijke instelling: %s"
 
-#: ly2dvi.py:330 main.cc:112
+#: ly2dvi.py:349 main.cc:112
 msgid "write Makefile dependencies for every input file"
 msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand"
 
-#: ly2dvi.py:331 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
+#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
 msgid "this help"
 msgstr "deze hulp"
 
-#: ly2dvi.py:332 main.cc:110 main.cc:115
+#: ly2dvi.py:351 main.cc:110 main.cc:115
 msgid "DIR"
 msgstr "DIR"
 
-#: ly2dvi.py:332
+#: ly2dvi.py:351
 msgid "add DIR to LilyPond's search path"
 msgstr "voeg DIR toe aan LilyPonds zoekpad"
 
-#: ly2dvi.py:333
+#: ly2dvi.py:352
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr "bewaar alle uitvoer, en noem de directory %s.dir"
 
-#: ly2dvi.py:334
+#: ly2dvi.py:353
 msgid "don't run LilyPond"
 msgstr "draai LilyPond niet"
 
-#: ly2dvi.py:335 main.cc:113
+#: ly2dvi.py:354 main.cc:113
 msgid "produce MIDI output only"
 msgstr "produceer alleen MIDI uitvoer"
 
-#: ly2dvi.py:336 main.cc:99 main.cc:111 main.cc:114
+#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114
 msgid "FILE"
 msgstr "BESTAND"
 
-#: ly2dvi.py:336
+#: ly2dvi.py:355
 msgid "write ouput to FILE"
 msgstr "schrijf uitvoer naar BESTAND"
 
-#: ly2dvi.py:338
+#: ly2dvi.py:357
 msgid "generate PostScript output"
 msgstr "genereer PostScipt uitvoer"
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "KEY=VAL"
 msgstr "SEUTEL=WAARDE"
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "change global setting KEY to VAL"
 msgstr "verander globale instelling SLEUTEL in WAARDE"
 
-#: ly2dvi.py:340 main.cc:118 mup2ly.py:1120 update-lily.py:255
+#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255
 msgid "verbose"
 msgstr "breedsprakig"
 
-#: ly2dvi.py:341 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
+#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
 msgid "print version number"
 msgstr "druk versienummer af"
 
-#: ly2dvi.py:342 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
+#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
 msgid "show warranty and copyright"
 msgstr "toon garantie en auteursrechten"
 
-#: ly2dvi.py:364 ly2dvi.py:577 ly2dvi.py:602
+#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
 #, c-format
 msgid "Running %s..."
 msgstr "Uitvoeren %s..."
 
-#: ly2dvi.py:377
+#: ly2dvi.py:396
 #, c-format
 msgid "Analyzing %s..."
 msgstr "Analyseer %s..."
 
-#: ly2dvi.py:433
+#: ly2dvi.py:452
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr "geen lilypond uitvoer gevonden voor %s"
 
-#: ly2dvi.py:475
+#: ly2dvi.py:494
 #, c-format
 msgid "invalid value: %s"
 msgstr "ongeldige waarde: %s"
 
-#: ly2dvi.py:770 scores.cc:44
+#: ly2dvi.py:807 scores.cc:44
 #, c-format
 msgid "dependencies output to `%s'..."
 msgstr "afhankelijkheden uitvoer naar %s..."
 
-#: ly2dvi.py:780
+#: ly2dvi.py:817
 #, c-format
 msgid "%s output to `%s'..."
 msgstr "%s uitvoer naar `%s'..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:782
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "kan bestand niet vinden: `%s'"
 
-#: ly2dvi.py:790
+#: ly2dvi.py:830
 msgid "no files specified on command line."
 msgstr "geen bestanden gespecificeerd op de commandoregel."
 
@@ -299,12 +294,7 @@ msgstr "meest recente is: %s"
 msgid "relax, %s is up to date"
 msgstr "ontspan, %s is bij de tijd"
 
-#: update-lily.py:435
-#, c-format
-msgid "Fetching `%'s..."
-msgstr "Grijpen van `%s'..."
-
-#: update-lily.py:448
+#: update-lily.py:435 update-lily.py:448
 #, c-format
 msgid "Fetching `%s'..."
 msgstr "Grijpen van `%s'..."
@@ -373,17 +363,17 @@ msgstr "programmeerfout: "
 msgid " (Continuing; cross thumbs)"
 msgstr " (Ga verder; duim maar)"
 
-#: afm.cc:53
+#: afm.cc:59
 #, c-format
 msgid "can't find character number: %d"
 msgstr "kan teken niet vinden met nummer: %d"
 
-#: afm.cc:68
+#: afm.cc:74
 #, c-format
 msgid "can't find character called: `%s'"
 msgstr "kan teken niet vinden genaamd: `%s'"
 
-#: afm.cc:118
+#: afm.cc:124
 #, c-format
 msgid "Error parsing AFM file: `%s'"
 msgstr "Fout bij ontleden AFM bestand: `%s'"
@@ -749,7 +739,7 @@ msgstr "rare duur"
 msgid "silly pitch"
 msgstr "rare toonhoogte"
 
-#: musical-request.cc:29
+#: musical-request.cc:28
 #, c-format
 msgid "Transposition by %s makes accidental larger than two"
 msgstr "Transponering van %s geeft tripel kruizen/mollen"
@@ -951,7 +941,7 @@ msgstr "Partituur bevat fouten; zal hem niet verwerken"
 msgid "Now processing: `%s'"
 msgstr "Nu wordt verwerkt: `%s'"
 
-#: script-engraver.cc:67
+#: script-engraver.cc:66
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "Weet niet hoe articulatie te vertolken `%s'"
@@ -961,11 +951,11 @@ msgstr "Weet niet hoe articulatie te vertolken `%s'"
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Separation_item:  Ik heb te veel gedronken"
 
-#: slur.cc:49
+#: slur.cc:48
 msgid "Putting slur over rest.  Ignoring."
 msgstr "Zet bindingsboog over rust.  Negeer."
 
-#: slur.cc:379
+#: slur.cc:383
 msgid "Slur over rest?"
 msgstr "Boogje over rust?"
 
@@ -1162,58 +1152,58 @@ msgstr "Moet in Chord modus zijn voor accoorden"
 msgid "need integer number arg"
 msgstr "heb integer getal arg nogig"
 
-#: lexer.ll:172
+#: lexer.ll:174
 msgid "EOF found inside a comment"
 msgstr "EOF gevonden in een kommentaar"
 
-#: lexer.ll:186
+#: lexer.ll:188
 msgid "\\maininput disallowed outside init files"
 msgstr "\\maininput niet toegestaan buiten init bestanden"
 
-#: lexer.ll:210
+#: lexer.ll:212
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "verkeerde of ongedefiniëerde identifier: `%s'"
 
 #. backup rule
-#: lexer.ll:219
+#: lexer.ll:221
 msgid "Missing end quote"
 msgstr "Aanhalingsteken sluiten mist"
 
 #. backup rule
-#: lexer.ll:241 lexer.ll:245
+#: lexer.ll:243 lexer.ll:247
 msgid "white expected"
 msgstr "wit verwacht"
 
-#: lexer.ll:254
+#: lexer.ll:256
 msgid "Can't evaluate Scheme in safe mode"
 msgstr "Kan Scheme niet evalueren in veilige modus"
 
-#: lexer.ll:347
+#: lexer.ll:349
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr "Accolade gevonden aan het eind van liedtektst.  Een spatie vergeten?"
 
-#: lexer.ll:455
+#: lexer.ll:457
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ongeldig teken: `%c'"
 
-#: lexer.ll:536
+#: lexer.ll:538
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "onbekende ontsnapte string: `\\%s'"
 
-#: lexer.ll:615
+#: lexer.ll:617
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "Oudst ondersteunde invoerversie: %s"
 
-#: lexer.ll:627
+#: lexer.ll:629
 #, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "verkeerde lilypond versie: %s (%s, %s)"
 
-#: lexer.ll:628
+#: lexer.ll:630
 msgid "Consider converting the input with the convert-ly script"
 msgstr "Overweeg de invoer te converteren met het convert-ly script"
 
diff --git a/po/ru.po b/po/ru.po
index db2af92e7e..2f034c0409 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-05-09 16:11+0200\n"
+"POT-Creation-Date: 2001-05-18 15:48+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"
@@ -14,167 +14,163 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ly2dvi.py:96
+#: ly2dvi.py:105
 msgid "Generate .dvi with LaTeX for LilyPond"
 msgstr ""
 
-#: data-file.cc:118 input.cc:85 ly2dvi.py:177 midi-parser.cc:100 mup2ly.py:93
+#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93
 #: update-lily.py:118 warn.cc:23
 msgid "warning: "
 msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: "
 
-#: ly2dvi.py:182
-msgid "Report the error S.  Exit by raising an exception. Please"
-msgstr ""
-
-#: input.cc:90 ly2dvi.py:192 ly2dvi.py:790 mup2ly.py:98 mup2ly.py:188
+#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "ÏÛÉÂËÁ: "
 
-#: ly2dvi.py:193 mup2ly.py:100 update-lily.py:125
+#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125
 msgid "Exiting ... "
 msgstr ""
 
-#: ly2dvi.py:251 mup2ly.py:158 update-lily.py:183
+#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]"
 
-#: ly2dvi.py:255 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
+#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
 msgid "Options:"
 msgstr "ïÐÃÉÉ:"
 
-#: ly2dvi.py:259 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
+#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
 #, c-format
 msgid "Report bugs to %s"
 msgstr "óÏÏÂÝÁÊÔÅ ÏÂ ÏÛÉÂËÁÈ ÐÏ %s"
 
-#: ly2dvi.py:286 mup2ly.py:185 update-lily.py:208
+#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208
 #, fuzzy, c-format
 msgid "Invoking `%s'"
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: ly2dvi.py:290 mup2ly.py:188 update-lily.py:211
+#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:292 mup2ly.py:190 update-lily.py:213
+#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:302
+#: ly2dvi.py:321
 #, fuzzy, c-format
 msgid "Cleaning %s..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: ly2dvi.py:317 mup2ly.py:214 update-lily.py:237
+#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237
 #, fuzzy, c-format
 msgid "no such setting: %s"
 msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
 
-#: ly2dvi.py:330 main.cc:112
+#: ly2dvi.py:349 main.cc:112
 msgid "write Makefile dependencies for every input file"
 msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ"
 
-#: ly2dvi.py:331 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
+#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
 msgid "this help"
 msgstr "ÜÔÁ ÓÐÒÁ×ËÁ"
 
-#: ly2dvi.py:332 main.cc:110 main.cc:115
+#: ly2dvi.py:351 main.cc:110 main.cc:115
 msgid "DIR"
 msgstr "ëáô"
 
-#: ly2dvi.py:332
+#: ly2dvi.py:351
 #, fuzzy
 msgid "add DIR to LilyPond's search path"
 msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ"
 
-#: ly2dvi.py:333
+#: ly2dvi.py:352
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:334
+#: ly2dvi.py:353
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:335 main.cc:113
+#: ly2dvi.py:354 main.cc:113
 msgid "produce MIDI output only"
 msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI"
 
-#: ly2dvi.py:336 main.cc:99 main.cc:111 main.cc:114
+#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114
 msgid "FILE"
 msgstr "æáêì"
 
-#: ly2dvi.py:336
+#: ly2dvi.py:355
 #, fuzzy
 msgid "write ouput to FILE"
 msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ"
 
-#: ly2dvi.py:338
+#: ly2dvi.py:357
 msgid "generate PostScript output"
 msgstr ""
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:339
+#: ly2dvi.py:358
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:340 main.cc:118 mup2ly.py:1120 update-lily.py:255
+#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255
 #, fuzzy
 msgid "verbose"
 msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ"
 
-#: ly2dvi.py:341 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
+#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
 msgid "print version number"
 msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ"
 
-#: ly2dvi.py:342 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
+#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
 msgid "show warranty and copyright"
 msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright"
 
-#: ly2dvi.py:364 ly2dvi.py:577 ly2dvi.py:602
+#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: ly2dvi.py:377
+#: ly2dvi.py:396
 #, fuzzy, c-format
 msgid "Analyzing %s..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: ly2dvi.py:433
+#: ly2dvi.py:452
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:475
+#: ly2dvi.py:494
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'"
 
-#: ly2dvi.py:770 scores.cc:44
+#: ly2dvi.py:807 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..."
 
-#: ly2dvi.py:780
+#: ly2dvi.py:817
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "×Ù×ÏÄ MIDI × %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:782
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
-#: ly2dvi.py:790
+#: ly2dvi.py:830
 msgid "no files specified on command line."
 msgstr ""
 
@@ -292,12 +288,7 @@ msgstr ""
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:435
-#, fuzzy, c-format
-msgid "Fetching `%'s..."
-msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
-
-#: update-lily.py:448
+#: update-lily.py:435 update-lily.py:448
 #, fuzzy, c-format
 msgid "Fetching `%s'..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
@@ -366,17 +357,17 @@ msgstr "
 msgid " (Continuing; cross thumbs)"
 msgstr " (ðÒÏÄÏÌÖÁÀ; ÓËÒÅÓÔÉÔÅ ÐÁÌØÃÙ)"
 
-#: afm.cc:53
+#: afm.cc:59
 #, c-format
 msgid "can't find character number: %d"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ Ó ÎÏÍÅÒÏÍ: %d"
 
-#: afm.cc:68
+#: afm.cc:74
 #, c-format
 msgid "can't find character called: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ÐÏÄ ÎÁÚ×ÁÎÉÅÍ: `%s'"
 
-#: afm.cc:118
+#: afm.cc:124
 #, fuzzy, c-format
 msgid "Error parsing AFM file: `%s'"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÁÎÁÌÉÚÅ ÆÁÊÌÁ AFM"
@@ -730,7 +721,7 @@ msgstr "
 msgid "silly pitch"
 msgstr "ÇÌÕÐÙÊ ÔÏÎ"
 
-#: musical-request.cc:29
+#: musical-request.cc:28
 #, c-format
 msgid "Transposition by %s makes accidental larger than two"
 msgstr ""
@@ -935,7 +926,7 @@ msgstr ""
 msgid "Now processing: `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'"
 
-#: script-engraver.cc:67
+#: script-engraver.cc:66
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -946,11 +937,11 @@ msgstr ""
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Single_malt_grouping_item: Ñ ÌÉÛËÏÍ ÍÎÏÇÏ ×ÙÐÉÌ"
 
-#: slur.cc:49
+#: slur.cc:48
 msgid "Putting slur over rest.  Ignoring."
 msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ."
 
-#: slur.cc:379
+#: slur.cc:383
 msgid "Slur over rest?"
 msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?"
 
@@ -1149,58 +1140,58 @@ msgstr "
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:172
+#: lexer.ll:174
 msgid "EOF found inside a comment"
 msgstr "ëÏÎÅà ÆÁÊÌÁ ×ÎÕÔÒÉ ËÏÍÍÅÎÔÁÒÉÑ"
 
-#: lexer.ll:186
+#: lexer.ll:188
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:210
+#: lexer.ll:212
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÍÅÔËÁ/ËÏÍÁÎÄÁ: `%s'"
 
 #. backup rule
-#: lexer.ll:219
+#: lexer.ll:221
 msgid "Missing end quote"
 msgstr "ïÔÓÕÔÓ×ÕÅÔ ÚÁËÌÀÞÉÔÅÌØÎÁÑ ËÁ×ÙÞËÁ"
 
 #. backup rule
-#: lexer.ll:241 lexer.ll:245
+#: lexer.ll:243 lexer.ll:247
 msgid "white expected"
 msgstr "× ÔÏ ×ÒÅÍÑ ËÁË ÏÖÉÄÁÌÏÓØ"
 
-#: lexer.ll:254
+#: lexer.ll:256
 msgid "Can't evaluate Scheme in safe mode"
 msgstr "îÅ ÍÏÇÕ ×ÙÐÏÌÎÑÔØ ËÏÄ ÓÈÅÍÙ × ÂÅÚÏÐÁÓÎÏÍ ÒÅÖÉÍÅ"
 
-#: lexer.ll:347
+#: lexer.ll:349
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:455
+#: lexer.ll:457
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'"
 
-#: lexer.ll:536
+#: lexer.ll:538
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'"
 
-#: lexer.ll:615
+#: lexer.ll:617
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr ""
 
-#: lexer.ll:627
+#: lexer.ll:629
 #, fuzzy, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "ÎÅ×ÅÒÎÁÑ ×ÅÒÓÉÑ mudela: %s (%s, %s)"
 
-#: lexer.ll:628
+#: lexer.ll:630
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
@@ -1415,6 +1406,10 @@ msgstr "
 msgid "invalid track length"
 msgstr "ÎÅ×ÅÒÎÁÑ ÄÌÉÎÁ ÄÏÒÏÖËÉ"
 
+#, fuzzy
+#~ msgid "Fetching `%'s..."
+#~ msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
+
 #, fuzzy
 #~ msgid "Lily output to %s..."
 #~ msgstr "Lily ×ÙÈÏÄ × %s..."
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 81011a87ab..d81879fa64 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -16,7 +16,8 @@
 
 
 # Note: gettext work best if we use ' for docstrings and "
-# for gettextable strings
+#       for gettextable strings.
+#       --> DO NOT USE """ for docstrings.
 
 '''
 TODO:
@@ -191,7 +192,7 @@ def warning (s):
 def error (s):
 
 
-	"""Report the error S.  Exit by raising an exception. Please
+	'''Report the error S.  Exit by raising an exception. Please
 	do not abuse by trying to catch this error. If you donn't want
 	a stack trace, write to the output directly.
 
@@ -199,7 +200,7 @@ def error (s):
 
 	None
 	
-	"""
+	'''
 	
 	progress (_ ("error: ") + s)
 	raise _ ("Exiting ... ")
diff --git a/stepmake/make/stepmake.make b/stepmake/make/stepmake.make
index b98bd15401..f0fb538cab 100644
--- a/stepmake/make/stepmake.make
+++ b/stepmake/make/stepmake.make
@@ -65,7 +65,8 @@ LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
 # Don't try to outsmart us, you puny computer!
 # Well, UGH.  This only removes builtin rules from
 # subsequent $(MAKE)s, *not* from the current run!
-ifeq (0,${MAKELEVEL})
+ifeq ($(BUILTINS_REMOVED),)
+  export BUILTINS_REMOVED = yes
   MAKE:=$(MAKE) --no-builtin-rules
   include $(stepdir)/no-builtin-rules.make
 endif
-- 
2.39.2