From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Tue, 26 Dec 2006 10:41:50 +0000 (+0100)
Subject: Merge branch 'master' of git://git.sv.gnu.org/lilypond
X-Git-Tag: release/2.11.10-1~79^2~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=af770f3440264c18ce01525dce1aa76b86ace0d5;hp=78f563e58de2de28fd17067fd434a42cb9f055a5;p=lilypond.git

Merge branch 'master' of git://git.sv.gnu.org/lilypond
---

diff --git a/.gitignore b/.gitignore
index 9ceca56c96..7fe9d82c2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,6 @@ lily-[0-9a-f][0-9a-f][0-9a-f]*
 out-scons
 tags
 test-output-distance
+*.gcov
+*.gcda
+*.gcno
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 55f0809885..37a452a11f 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -1,7 +1,7 @@
 depth = ..
 
 NAME = documentation
-LANGS = fr # don't enable unpolished or broken translations
+LANGS = $(shell $(PYTHON) $(buildscript-dir)/langdefs.py)
 SUBDIRS=user bibliography pictures topdocs misc po $(LANGS)
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
@@ -39,8 +39,9 @@ new-lang:
 	cp fr/GNUmakefile $(ISOLANG)
 	cp fr/user/GNUmakefile $(ISOLANG)/user
 	sed -i -e 's/ISOLANG *= *fr/ISOLANG = $(ISOLANG)/' $(ISOLANG)/GNUmakefile $(ISOLANG)/user/GNUmakefile
-	$(PYTHON) $(depth)/buildscripts/texi-langutils.py -d $(outdir) -b "UNTRANSLATED NODE: IGNORE ME" -o doc.pot --skeleton --gettext ../user/lilypond.tely
+	$(PYTHON) $(buildscript-dir)/texi-langutils.py -d $(outdir) -b "UNTRANSLATED NODE: IGNORE ME" -o doc.pot --skeleton --gettext ../user/lilypond.tely
 	mv $(outdir)/*.*tely $(ISOLANG)/user
 	msgmerge -U po/lilypond-doc.pot $(outdir)/doc.pot
 	cp po/lilypond-doc.pot po/$(ISOLANG).po
-endif
\ No newline at end of file
+	@echo "***  Please add a language definition for $(ISOLANG) in buildscripts/langdefs.py  ***"
+endif
diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index df2928ed94..11c99de056 100644
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -44,6 +44,10 @@
 	    <li>
 	    <a class="title" href="user/lilypond/Tutorial.html">Tutorial</a>
 	      <br>(start here)
+
+	    <li>
+	    <a class="title" href="user/lilypond/Tutorial.fr.html">Tutoriel en français</a>
+	      <br>(for French-speaking users)
 	  </ul>
 	  </td>
 	  <td class="right-column">
diff --git a/Documentation/po/GNUmakefile b/Documentation/po/GNUmakefile
index 23939296d0..925cb7e5a1 100644
--- a/Documentation/po/GNUmakefile
+++ b/Documentation/po/GNUmakefile
@@ -14,7 +14,7 @@ messages: $(MO_FILES)
 	done
 
 po-update:
-	$(PYTHON) $(depth)/buildscripts/texi-langutils.py -d $(outdir) -o doc.pot --gettext ../$(depth)/Documentation/user/lilypond.tely
+	$(PYTHON) $(buildscript-dir)/texi-langutils.py -d $(outdir) -o doc.pot --gettext ../$(depth)/Documentation/user/lilypond.tely
 	msgmerge -U lilypond-doc.pot $(outdir)/doc.pot
 	for i in $(CATALOGS); do \
 	  msgmerge -U $$i.po lilypond-doc.pot; \
diff --git a/Documentation/po/fr.po b/Documentation/po/fr.po
index 990cb2a490..c6307b7017 100644
--- a/Documentation/po/fr.po
+++ b/Documentation/po/fr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-19 10:23+0100\n"
-"PO-Revision-Date: 2006-11-25 16:47+0100\n"
+"POT-Creation-Date: 2006-12-23 14:50+0100\n"
+"PO-Revision-Date: 2006-12-23 15:02+0100\n"
 "Last-Translator: John Mandereau <john.mandereau@free.fr>\n"
 "Language-Team: Français <lilypond-user-fr@gnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "Top"
 msgstr "Sommaire"
 
 msgid "GNU LilyPond --- The music typesetter"
-msgstr "GNU LilyPond -- le système de gravure musicale"
+msgstr "GNU LilyPond --- le système de gravure musicale"
 
 msgid "LilyPond command index"
 msgstr "Index des commandes LilyPond"
@@ -138,247 +138,248 @@ msgid "After the tutorial"
 msgstr "Après le tutoriel"
 
 msgid "Putting it all together"
-msgstr ""
+msgstr "Tout mettre en ordre"
 
 msgid "Extending the templates"
-msgstr ""
+msgstr "Étendre les modèles"
 
 msgid "How LilyPond files work"
-msgstr ""
+msgstr "Comment les fichiers LilyPond sont organisés"
 
 msgid "Score is a single musical expression"
-msgstr ""
+msgstr "La partition est une unique expression musicale"
 
 msgid "Working on LilyPond projects"
-msgstr ""
+msgstr "Travailler sur des projets LilyPond"
 
 msgid "Suggestions for writing LilyPond files"
-msgstr ""
+msgstr "Suggestions de saisie des fichiers LilyPond"
 
 msgid "General suggestions"
-msgstr ""
+msgstr "Suggestions générales"
 
 msgid "Typesetting existing music"
-msgstr ""
+msgstr "Graver de la musique existante"
 
 msgid "Large projects"
-msgstr ""
+msgstr "Vastes projets"
 
 msgid "Saving typing with identifiers and functions"
-msgstr ""
+msgstr "Économiser du temps grâce à des identificateurs et fonctions"
 
 msgid "Style sheets"
-msgstr ""
+msgstr "Feuilles de style"
 
 msgid "Updating old files"
-msgstr ""
+msgstr "Mettre à jour des anciens fichiers"
 
 msgid "Troubleshooting (taking it all apart)"
-msgstr ""
+msgstr "Résolution de problèmes --- tout remettre à plat"
 
 msgid "Tweaking output"
-msgstr ""
+msgstr "Retoucher les résultats"
 
 msgid "Moving objects"
-msgstr ""
+msgstr "Déplacer des objets"
 
 msgid "Fixing overlapping notation"
-msgstr ""
+msgstr "Corriger les collisions d'objets"
 
 msgid "Common tweaks"
-msgstr ""
+msgstr "Retouches courantes"
 
 msgid "Default files"
-msgstr ""
+msgstr "Fichiers fournis par LilyPond"
 
 msgid "Fitting music onto fewer pages"
-msgstr ""
+msgstr "Réduire le nombre de pages de la partition"
 
 msgid "Advanced tweaks with Scheme"
-msgstr ""
+msgstr "Retouches avancées avec Scheme"
 
 msgid "Basic notation"
-msgstr ""
+msgstr "Notation de base"
 
 msgid "Pitches"
-msgstr ""
+msgstr "Hauteurs"
 
 msgid "Normal pitches"
-msgstr ""
+msgstr "Hauteurs naturelles"
 
 msgid "Accidentals"
-msgstr ""
+msgstr "Altérations"
 
 msgid "Cautionary accidentals"
-msgstr ""
+msgstr "Altérations de précaution"
 
 msgid "Micro tones"
-msgstr ""
+msgstr "Altérations microtonales"
 
 msgid "Notes names in other languages"
-msgstr ""
+msgstr "Noms de note dans d'autres langues"
 
 msgid "Relative octaves"
-msgstr ""
+msgstr "Octaves relatives"
 
 msgid "Octave check"
-msgstr ""
+msgstr "Vérification d'octave"
 
 msgid "Transpose"
-msgstr ""
+msgstr "Transposition"
 
 msgid "Rests"
-msgstr ""
+msgstr "Silences"
 
 msgid "Skips"
-msgstr ""
+msgstr "Silences invisibles"
 
 msgid "Rhythms"
-msgstr ""
+msgstr "Rythme"
 
 msgid "Durations"
-msgstr ""
+msgstr "Durées"
 
 msgid "Augmentation dots"
-msgstr ""
+msgstr "Points d'addition"
 
 msgid "Tuplets"
-msgstr ""
+msgstr "Nolets"
 
 msgid "Scaling durations"
-msgstr ""
+msgstr "Changement d'échelle des durées"
 
 msgid "Bar check"
-msgstr ""
+msgstr "Vérification des limites de mesure"
 
 msgid "Barnumber check"
-msgstr ""
+msgstr "Vérification du numéro de mesure"
 
 msgid "Automatic note splitting"
-msgstr ""
+msgstr "Découpage automatique des notes"
 
 msgid "Multiple notes at once"
-msgstr ""
+msgstr "Notes simultanées"
 
 msgid "Chords"
-msgstr ""
+msgstr "Accords"
 
 msgid "Stems"
-msgstr ""
+msgstr "Hampes"
 
 msgid "Basic polyphony"
-msgstr ""
+msgstr "Polyphonie basique"
 
 msgid "Explicitly instantiating voices"
-msgstr ""
+msgstr "Instantiation explicite des voix"
 
 msgid "Collision Resolution"
-msgstr ""
+msgstr "Résolution des collisions"
 
 msgid "Staff notation"
-msgstr ""
+msgstr "Notation sur la portée"
 
 msgid "Clef"
-msgstr ""
+msgstr "Clé"
 
 msgid "Key signature"
-msgstr ""
+msgstr "Armure"
 
 msgid "Time signature"
-msgstr ""
+msgstr "Métrique"
 
 msgid "Partial measures"
-msgstr ""
+msgstr "Mesures incomplètes"
 
 msgid "Bar lines"
-msgstr ""
+msgstr "Barres de mesures"
 
 msgid "Unmetered music"
-msgstr ""
+msgstr "Musique sans métrique"
 
 msgid "System start delimiters"
-msgstr ""
+msgstr "Groupements de systèmes"
 
 msgid "Staff symbol"
-msgstr ""
+msgstr "Symbole de la portée"
 
 msgid "Writing music in parallel"
-msgstr ""
+msgstr "Saisir la musique en parallèle"
 
 msgid "Connecting notes"
-msgstr ""
+msgstr "Notation couvrant plusieurs notes"
 
 msgid "Ties"
-msgstr ""
+msgstr "Liaisons de prolongation"
 
 msgid "Slurs"
-msgstr ""
+msgstr "Liaisons d'articulation"
 
 msgid "Phrasing slurs"
-msgstr ""
+msgstr "Liaisons de phrasé"
 
 msgid "Laissez vibrer ties"
-msgstr ""
+msgstr "Liaisons « laissez vibrer »"
 
 msgid "Automatic beams"
-msgstr ""
+msgstr "Barres de ligature automatiques"
 
 msgid "Manual beams"
-msgstr ""
+msgstr "Barres de ligature manuelles"
 
 msgid "Grace notes"
-msgstr ""
+msgstr "Notes d'agrément"
 
 msgid "Expressive marks"
-msgstr ""
+msgstr "Signes d'interprétation"
 
 msgid "Articulations"
-msgstr ""
+msgstr "Articulations"
 
 msgid "Fingering instructions"
-msgstr ""
+msgstr "Doigtés"
 
 msgid "Dynamics"
-msgstr ""
+msgstr "Nuances"
 
 msgid "Breath marks"
-msgstr ""
+msgstr "Signes de respiration"
 
 msgid "Trills"
-msgstr ""
+msgstr "Trilles"
 
 msgid "Glissando"
-msgstr ""
+msgstr "Glissando"
 
 msgid "Arpeggio"
-msgstr ""
+msgstr "Arpège"
 
+#, fuzzy
 msgid "Falls and doits"
-msgstr ""
+msgstr "Chutes et sauts"
 
 msgid "Repeats"
-msgstr ""
+msgstr "Répétitions"
 
 msgid "Repeat types"
-msgstr ""
+msgstr "Types de répétitions"
 
 msgid "Repeat syntax"
-msgstr ""
+msgstr "Syntaxe des répétitions"
 
 msgid "Repeats and MIDI"
-msgstr ""
+msgstr "Répétitions et MIDI"
 
 msgid "Manual repeat commands"
-msgstr ""
+msgstr "Commandes de reprise manuelles"
 
 msgid "Tremolo repeats"
-msgstr ""
+msgstr "Répétitions en trémolo"
 
 msgid "Tremolo subdivisions"
-msgstr ""
+msgstr "Subdivisions de trémolo"
 
 msgid "Measure repeats"
-msgstr ""
+msgstr "Répétitions de mesure"
 
 msgid "Instrument-specific notation"
 msgstr ""
@@ -1184,3 +1185,6 @@ msgstr "Précédent&nbsp;:"
 msgid "Appendix"
 msgstr "Annexe"
 
+msgid "Footnotes"
+msgstr "Notes"
+
diff --git a/Documentation/po/lilypond-doc.pot b/Documentation/po/lilypond-doc.pot
index 13cf8cefa2..2ff82cea77 100644
--- a/Documentation/po/lilypond-doc.pot
+++ b/Documentation/po/lilypond-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-19 10:23+0100\n"
+"POT-Creation-Date: 2006-12-23 14:50+0100\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"
@@ -1182,3 +1182,6 @@ msgstr ""
 
 msgid "Appendix"
 msgstr ""
+
+msgid "Footnotes"
+msgstr ""
diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index c663700030..52d8d8cf76 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -79,7 +79,7 @@ You will need to install some additional packages to get mftrace to
 work.
 
 @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE}
-(version 1.6.7 or newer).  If you are installing binary packages, you
+(version 1.8.2 or newer).  If you are installing binary packages, you
 may need to install guile-devel or guile-dev or libguile-dev too.
 
 @item @uref{ftp://ftp.gnu.org/gnu/texinfo/,Texinfo} (version 4.8 or newer).
@@ -116,7 +116,8 @@ software
 @item @uref{http://www.freetype.org/,FontConfig} (version 2.2).
 @item @uref{http://www.pango.org/,Pango} (version 1.12 or newer).
 @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE}
-(version 1.8.0 or newer).
+(version 1.8.2 or newer), or patch 1.8.x with
+@uref{http://lilypond.org/vc/gub.darcs/patches/guile-1.8-rational.patch}.
 @item @uref{http://www.python.org,Python} (version 2.4 or newer).
 @item @uref{http://www.ghostscript.com,Ghostscript} (version 8.15 or
 newer. 8.50 recommended)
diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 42e4348cc6..e7e1b1aa89 100644
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -1287,25 +1287,16 @@ It is also possible to define melismata entirely in the lyrics. This
 can be done by entering @code{_} for every note that is part of the
 melisma.
 
-@lilypond[relative=1,verbatim,fragment]
+@lilypond[relative=1,verbatim,fragment,quote]
 { \set melismaBusyProperties = #'()
   c d( e) f f( e) e e  }
 \addlyrics
  { Ky -- _ _ ri __ _ _ _  e }
 @end lilypond
 
-In this case, you can also have ties and slurs in the melody, if you
+In this case, you can also have ties and slurs in the melody if you
 set @code{melismaBusyProperties}, as is done in the example above.
 
-@lilypond[relative=1,verbatim,fragment,quote]
-{
- \set melismaBusyProperties = #'()
-  c d( e) f f( e) e e
-}
-\addlyrics
- { Ky -- _ _ ri __ _ _ _  e }
-@end lilypond
-
 
 @node Lyrics independent of notes
 @subsubsection Lyrics independent of notes
diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index 21b9328860..b94c1da95a 100644
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -839,7 +839,9 @@ Horizontal spacing may be altered with the
 we compare the same music; once without altering
 the property, and then altered.  Larger values
 of @code{ly:make-moment} will produce smaller
-music.
+music.  Note that @code{ly:make-moment} constructs
+a duration, so @code{1 4} is a longer duration
+than @code{1 16}.
 
 @lilypond[relative,verbatim,line-width=12\cm]
 \score {
@@ -864,7 +866,7 @@ music.
     \context {
       \Score
       \override SpacingSpanner
-                #'base-shortest-duration = #(ly:make-moment 1 4)
+                #'base-shortest-duration = #(ly:make-moment 1 16)
     }
   }
 }
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 423d2154ca..702eb6e902 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -32,6 +32,14 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
+#
+# suggested settings
+#
+# CHECK_SOURCE=<input/regression/ reference dir>
+# LILYPOND_JOBS= -djob-count=X   ## for SMP/Multicore machine
+# 
+include local.make
+
 local-dist: dist-toplevel-txt-files dist-changelog
 
 dist-changelog:
@@ -41,9 +49,10 @@ dist-changelog:
 		cp $(top-src-dir)/ChangeLog $(distdir) ; \
 	fi
 
-default: $(outdir)/VERSION
+all: $(outdir)/VERSION
 
 $(outdir)/VERSION: $(config_make) VERSION
+	-mkdir -p $(outdir)
 	echo $(TOPLEVEL_VERSION) > $@
 
 dist-toplevel-txt-files:
@@ -56,8 +65,7 @@ doc:
 
 install-WWW:
 	-$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
-	cp -a $(outdir)/web-root/ $(DESTDIR)$(webdir)/
-
+	rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir)
 	$(MAKE) -C Documentation/user local-install-WWW
 	$(MAKE) -C Documentation/user install-info
 
@@ -80,46 +88,18 @@ local-install:
 final-install:
 	@true
 
-web-ext = html midi pdf png txt ly signature
-
-# For docball, issue `make web CONTENT_NEGOTIATION='
-CONTENT_NEGOTIATION = --content-negotiation
-footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) $(CONTENT_NEGOTIATION)
-footifymail = MAILADDRESS='http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs'
-
 
+# For online docs with content negotiation, issue `make web WEB_TARGETS=online'
+# For both online and offline docs, issue `make web WEB_TARGETS="offline online"'
+WEB_TARGETS = offline
 
 local-WWW-post:
 # need UTF8 setting in case this is hosted on a website. 
 	echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
 	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
-	echo '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/index.html">' > $(outdir)/index.html
-	echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(outdir)/index.html
-
-	cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
-
-	cd $(top-build-dir) && find Documentation input \
-		$(web-ext:%=-path '*/out-www/*.%' -or) -type l \
-		| grep -v 'lily-[0-9a-f]*.*pdf' \
-		| grep -v '/fr/' \
-		> $(outdir)/weblist
-	ls $(outdir)/*.html >> $(outdir)/weblist
-
-## urg: this is too hairy, should write a python script to do this.
-
-## rewrite file names so we lose out-www
-	rm -rf $(outdir)/web-root/ 
-	mkdir $(outdir)/web-root/
-## urg slow.
-	cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf-  -T- ) | \
-		tar -C $(outdir)/web-root/ -xf -  
-	for dir in $(outdir)/web-root/ ; do  \
-		cd $$dir && \
-		for a in `find . -name out-www`; do \
-			rsync -a  --link-dest $$a/ $$a/ $$a/.. ; \
-			rm -rf $$a ; \
-		done \
-	done
+	rm -rf $(outdir)/online-root
+	rm -rf $(outdir)/offline-root
+	$(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)"
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
@@ -224,3 +204,20 @@ $(config_h): config.hh.in
 	@echo '         rm $(config_h); ./autogen.sh'
 	@echo
 	@false
+
+
+test-clean:
+	$(MAKE) -C input/regression/ out=test clean
+
+test:
+## no aa-scaling, no PDF
+	$(MAKE) -C input/regression/ out=test LILYPOND_BOOK_LILYPOND_FLAGS="--backend=eps --formats=ps,png $(LILYPOND_JOBS) -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-test/collated-files.html 
+	@find input ly -name '*.ly' |grep -v 'out.*/' | xargs grep '\\version' -L | sed 's/^/**** Missing version: /g' 
+
+
+
+RESULT_DIR=$(top-build-dir)/out/test-results/
+check-test: test
+	rm -rf $(RESULT_DIR)
+	mkdir -p $(RESULT_DIR)
+	$(PYTHON) $(buildscript-dir)/output-distance.py --output-dir $(RESULT_DIR) $(CHECK_SOURCE) input/regression/out-test/
diff --git a/VERSION b/VERSION
index 5d51c9da27..30fb95aa47 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=11
-PATCH_LEVEL=4
+PATCH_LEVEL=5
 MY_PATCH_LEVEL=
 
diff --git a/buildscripts/add_html_footer.py b/buildscripts/add_html_footer.py
new file mode 100644
index 0000000000..2935d456cf
--- /dev/null
+++ b/buildscripts/add_html_footer.py
@@ -0,0 +1,219 @@
+#!@PYTHON@
+
+"""
+Print a nice footer.
+"""
+import re
+import os
+import time
+
+import langdefs
+
+default_header = r"""
+"""
+
+default_footer = r'''
+<div style="background-color: #e8ffe8; padding: 2; border: #c0ffc0 1px solid;">
+<p>
+<font size="-1">
+This page is for %(package_name)s-%(package_version)s (%(branch_str)s). <br>
+</font>
+<address><font size="-1">
+Report errors to <a href="%(mail_address_url)s">%(mail_address)s</a>.</font></address>
+</p>
+</div>
+'''
+
+header_tag = '<!-- header_tag -->'
+footer_tag = '<!-- footer_tag -->'
+
+def _ (s):
+    return s
+
+language_available = _ ("Other languages: %s.") % "%(language_menu)s"
+browser_language = _ ("Using <A HREF='%s'>automatic language selection</A>.") \
+           % "/web/about/browser-language"
+
+LANGUAGES_TEMPLATE = '''\
+<P>
+ %(language_available)s
+ <BR>
+ %(browser_language)s
+</P>
+''' % vars ()
+
+
+html_re = re.compile ('(.*?)(?:[.]([^/.]*))?[.]html$')
+
+def build_pages_dict (filelist):
+    """Build dictionnary of available translations of each page"""
+    pages_dict = {}
+    for f in filelist:
+        m = html_re.match (f)
+        if m:
+            g = m.groups()
+            if len (g) <= 1 or g[1] == None:
+                e = ''
+            else:
+                e = g[1]
+            if not g[0] in pages_dict.keys():
+                pages_dict[g[0]] = [e]
+            else:
+                pages_dict[g[0]].append (e)
+    return pages_dict
+
+
+def do_file (prefix, lang_ext, target, header, footer, pages_dict, out_root, name_filter,
+             package_name, package_version, branch_str, mail_address_url, mail_address):
+    file_name = langdefs.lang_file_name (prefix, lang_ext, '.html')
+    in_f = open (file_name)
+    s = in_f.read()
+    in_f.close()
+    
+    s = re.sub ('%', '%%', s)
+
+    ### add header
+    if re.search (header_tag, s) == None:
+        body = '<BODY BGCOLOR=WHITE TEXT=BLACK>'
+        s = re.sub ('(?i)<body>', body, s)
+        if re.search ('(?i)<BODY', s):
+            s = re.sub ('(?i)<body[^>]*>', body + header, s, 1)
+        elif re.search ('(?i)<html', s):                
+            s = re.sub ('(?i)<html>', '<HTML>' + header, s, 1)
+        else:
+            s = header + s
+
+        s = header_tag + '\n' + s
+
+        if re.search ('(?i)<!DOCTYPE', s) == None:
+            doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">\n'
+            s = doctype + s
+
+    # remove info's annoying's indication of referencing external document
+    s = re.sub (' \((lilypond|lilypond-internals|music-glossary)\)</a>',                                  '</a>', s)
+
+    # urg
+    # maybe find first node?
+    fallback_web_title = '-- --'
+    m = re.match ('.*?<title>(.*?)</title>', s, re.DOTALL)
+    if m:
+        fallback_web_title = m.group (1)
+    s = re.sub ('@WEB-TITLE@', fallback_web_title, s)
+
+    ### add footer
+    page_flavors = {}
+    if re.search (footer_tag, s) == None:
+        if re.search ('(?i)</body', s):
+            s = re.sub ('(?i)</body>', footer_tag + footer + '\n' + '</BODY>', s, 1)
+        elif re.search ('(?i)</html', s):                
+            s = re.sub ('(?i)</html>', footer_tag + footer + '\n' + '</HTML>', s, 1)
+        else:
+            s += footer_tag + footer + '\n'
+        
+        # Find available translations of this page.
+        available = []
+        missing = []
+        for l in langdefs.LANGUAGES:
+            e = l.webext
+            if lang_ext != e:
+                if e in pages_dict[prefix]:
+                    available.append (l)
+                elif lang_ext == '' and l.enabled: # English version of missing translated pages will be written
+                    missing.append (e)
+
+        if target == 'online':
+            # Strip .html, .png suffix for auto language selection (content
+            # negotiation).  The menu must keep the full extension, so do
+            # this before adding the menu.
+            page_flavors[file_name] = re.sub (
+                '''(href|src)=[\'"]([^/][.]*[^.:\'"]*)(.html|.png)(#[^"\']*|)[\'"]''',
+                '\\1="\\2\\4"', s)
+        elif target == 'offline':
+            if lang_ext == '':
+                page_flavors[file_name] = s
+                for e in missing:
+                    page_flavors[langdefs.lang_file_name (prefix, e, '.html')] = re.sub (
+                        '''href=[\'"]([^/][.]*[^.:\'"]*)(.html)(#[^"\']*|)[\'"]''',
+                        'href="\\1.' + e + '\\2\\3"', s)
+            else:
+                page_flavors[file_name] = re.sub (
+                    '''href=[\'"]([^/][.]*[^.:\'"]*)(.html)(#[^"\']*|)[\'"]''',
+                    'href="\\1.' + lang_ext + '\\2\\3"', s)
+
+        # Add menu after stripping: must not have autoselection for language menu.
+        language_menu = ''
+        for lang in available:
+            lang_file = lang.file_name (os.path.basename (prefix), '.html')
+            if language_menu != '':
+                language_menu += ', '
+            language_menu += '<a href="%s">%s</a>' % (lang_file, lang.name)
+
+        languages = ''
+        if language_menu:
+            languages = LANGUAGES_TEMPLATE % vars ()
+
+        # Put language menu before '</body>' and '</html>' tags
+        for k in page_flavors.keys():
+            if re.search ('(?i)</body', page_flavors[k]):
+                page_flavors[k] = re.sub ('(?i)</body>', languages + '</BODY>', page_flavors[k], 1)
+            elif re.search ('(?i)</html', page_flavors[k]):                
+                page_flavors[k] = re.sub ('(?i)</html>', languages + '</HTML>', page_flavors[k], 1)
+            else:
+                page_flavors[k] += languages
+    else:
+        for e in [l.webext for l in langdefs.LANGUAGES]:
+            if not e in pages_dict[prefix]:
+                page_flavors[langdefs.lang_file_name (prefix, e, '.html')] = s
+
+    for k in page_flavors.keys():
+        page_flavors[k] = page_flavors[k] % vars ()
+
+        out_f = open (os.path.join (out_root, name_filter (k)), 'w')
+        out_f.write (page_flavors[k])
+        out_f.close()
+
+
+def add_html_footer (package_name = '',
+                     package_version = '',
+                     header = default_header,
+                     footer = default_footer,
+                     target = 'offline',
+                     mail_address = '(address unknown)',
+                     pages_dict = {},
+                     out_root = '',
+                     name_filter = lambda s: s):
+    """Add header, footer to a number of HTML files
+
+    Arguments:
+     package_name=NAME         set package_name to NAME
+     package_version=VERSION   set package version to VERSION
+     header=TEXT               use TEXT as header
+     footer=TEXT               use TEXT as footer
+     targets=offline|online    set page processing depending on the target
+          offline is for reading HTML pages locally
+          online is for hosting the HTML pages on a website with content
+            negotiation
+     mail_address              set \"Report errors to\" link
+     pages_dict                a dictionnary returned by build_pages_dict()
+     out_root                  a path prefix where to write HTML pages
+     name_filter               a HTML file name filter
+    """
+    localtime = time.strftime ('%c %Z', time.localtime (time.time ()))
+
+    if re.search ("http://", mail_address):
+        mail_address_url = mail_address
+    else:
+        mail_address_url= 'mailto:' + mail_address
+
+    versiontup = package_version.split ('.')
+    branch_str = 'stable-branch'
+    if int ( versiontup[1]) %  2:
+        branch_str = 'development-branch'
+
+    for page, ext_list in pages_dict.items ():
+        for e in ext_list:
+            do_file (page, e, target, header, footer, pages_dict, out_root, name_filter,
+                     package_name, package_version, branch_str, mail_address_url, mail_address)
+        # if the page is translated, a .en.html symlink is necessary for content negotiation
+        if target == 'online' and ext_list != ['']:
+            os.symlink (os.path.basename (page) + '.html', os.path.join (out_root, name_filter (page + '.en.html')))
diff --git a/buildscripts/coverage.py b/buildscripts/coverage.py
new file mode 100644
index 0000000000..8b988d0dde
--- /dev/null
+++ b/buildscripts/coverage.py
@@ -0,0 +1,49 @@
+#!/bin/sh
+import os
+import glob
+import re
+
+cmds = """
+./configure --enable-config=cov --disable-optimising
+make conf=cov -j2
+make conf=cov test LILYPOND_JOBS=          
+
+cd out-cov
+ln ../lily/* .
+ln ../lily/out-conv/*cc .
+mkdir include
+ln ../lily/include/* include/
+for a in *[cyl] ; do  gcov -o ../lily/out-cov/  -p $a > $a.gcov-summary ; done 
+"""
+
+cmds = ''
+
+for c in cmds.split ('\n'):
+    os.system (c)
+
+os.chdir ('out-cov')
+
+#File 'accidental-engraver.cc'
+#Lines executed:87.70% of 252
+
+results = []
+for f in glob.glob ('*.gcov-summary'):
+    str = open (f).read ()
+    m = re.search ("File '([^']+.cc)'\s*Lines executed:([0-9.]+)% of ([0-9]+)", str)
+    if '/usr/lib' in m.group (1):
+        continue
+   
+    if m:
+        cov = float (m.group (2))
+        lines = int (m.group (3))
+        pain = lines * (100.0 - cov)
+        file = m.group (1)
+        tup = (pain, locals ().copy())
+        
+        results.append(tup)
+
+results.sort ()
+results.reverse()
+for (pain, d) in results:
+    print '%(cov)5.2f (%(lines)6d): %(file)s' % d
+
diff --git a/buildscripts/html-gettext.py b/buildscripts/html-gettext.py
index 97f8e5f6f6..3f401382ae 100644
--- a/buildscripts/html-gettext.py
+++ b/buildscripts/html-gettext.py
@@ -1,45 +1,45 @@
 #!@PYTHON@
 # html-gettext.py
 
-# Usage:  html-gettext.py [-o OUTDIR] LOCALEDIR LANG FILES
+# USAGE:  html-gettext.py [-o OUTDIR] BUILDSCRIPT-DIR LOCALEDIR LANG FILES
 #
 # -o OUTDIR specifies that output files should be written in OUTDIR
 #    rather than be overwritten
 #
-# LANG
-# LOCALEDIR should contain 'lilypond-doc' message catalogs
-
-
-### DATA
-# Currently, typo_rules[LANG] only defines the HTML-coded space occuring
-# before double punctuation characters (i.e. : ; ? ! ) for LANG
-
-typo_rules = { 'fr':'&nbsp;', 'default':'' }
-
-
-### PROGRAM
 
 import sys
 import re
 import os
-import string
-import gettext
 import getopt
+import gettext
 
 optlist, args = getopt.getopt(sys.argv[1:],'o:')
+buildscript_dir, localedir, lang = args[0:3]
 
 outdir = '.'
 for x in optlist:
 	if x[0] == '-o':
 		outdir = x[1]
 
-if args[1] in typo_rules.keys():
-	dbl_punct_char_separator = typo_rules[args[1]]
-else:
-	dbl_punct_char_separator = typo_rules['default']
+sys.path.append (buildscript_dir)
+import langdefs
+
+double_punct_char_separator = langdefs.LANGDICT[lang].double_punct_char_sep
+print localedir
+print lang
+t = gettext.translation('lilypond-doc', localedir, [lang])
+my_gettext = t.gettext
+
+html_codes = ((' -- ', ' &ndash; '),
+	      (' --- ', ' &mdash; '))
 
-t = gettext.translation('lilypond-doc', args[0], [args[1]])
-_ = t.gettext
+def _ (s):
+	for c in html_codes:
+		s = s.replace (c[1], c[0])
+	s = my_gettext (s)
+	for c in html_codes:
+		s = s.replace (c[0], c[1])
+	return s
 
 def link_gettext (m):
 	return '<link rel="' + m.group(1) + '" ' + m.group(2) + ' title="' + _(m.group(3)) + '">'
@@ -48,24 +48,24 @@ def title_gettext (m):
 	return '<title>' + _(m.group(1)) + ' - ' + m.group(2) + '</title>'
 
 def a_href_gettext (m):
-	if m.group(4) == ':':
-		s = dbl_punct_char_separator + ':'
-	elif m.group(4) == None:
+	if m.group(6) == ':':
+		s = double_punct_char_separator + ':'
+	elif m.group(6) == None:
 		s = ''
-	return '<a ' + (m.group(1) or '') + m.group(2) + _(m.group(3)) + '</a>' + s
+	return '<a ' + (m.group(1) or '') + m.group(2) + m.group(3) + _(m.group(4)) + m.group(5) + '</a>' + s
 
 def h_gettext (m):
-	return '<h' + m.group(1) + ' class="' + m.group(2) + '">' + \
-	       (m.group(3) or '') + _(m.group(4)) + '</h' + m.group(1) + '>'
+	return '<h' + m.group(1) + m.group(2) + '>' + \
+	       m.group(3) + _(m.group(4)) + '</h' + m.group(1) + '>'
 
-for filename in args[2:]:
+for filename in args[3:]:
 	f = open (filename, 'r')
 	page = f.read ()
 	f.close()
 	page = re.sub (r'<link rel="(up|prev|next)" (.*?) title="([^"]*?)">', link_gettext, page)
 	page = re.sub (r'<title>([^<]*?) - ([^<]*?)</title>', title_gettext, page)
-	page = re.sub (r'<a ((?:rel="\w+")? ?(?:accesskey="[^"]+?" ?)?)(href="[^"]+?">)([^<]+)</a>(:)?', a_href_gettext, page)
-	page = re.sub (r'<h(\d) class="(\w+)">([\d.]+ )?([^<]+)</h\1>', h_gettext, page)
+	page = re.sub (r'<a ((?:rel="\w+")? ?(?:accesskey="[^"]+?" ?)?)(href="[^"]+?">)((?:<code>|)(?:[\d.]+ |))([^<]+)(</code>|)</a>(:)?', a_href_gettext, page)
+	page = re.sub (r'<h(\d)( class="\w+"|)>([\d.]+ |)?([^<]+)</h\1>', h_gettext, page)
 	for w in ('Next:', 'Previous:', 'Up:'):
 		page = re.sub (w, _(w), page)
 	f = open (os.path.join (outdir, filename), 'w')
diff --git a/buildscripts/langdefs.py b/buildscripts/langdefs.py
new file mode 100644
index 0000000000..993398e002
--- /dev/null
+++ b/buildscripts/langdefs.py
@@ -0,0 +1,47 @@
+#!@PYTHON@
+
+"""
+Documentation i18n module
+"""
+
+def lang_file_name (p, langext, ext):
+    if langext != '':
+        return p + '.' + langext + ext
+    return p + ext
+
+class LanguageDef:
+    def __init__ (self, code, name, webext=None, double_punct_char_sep=''):
+        self.code = code
+        self.name = name
+        self.enabled = True
+        if webext == None:
+            self.webext = self.code
+        else:
+            self.webext = webext
+        self.double_punct_char_sep = double_punct_char_sep
+    
+    def file_name (self, prefix, ext):
+        return lang_file_name (prefix, self.webext, ext)
+
+
+# All language information needed for documentation i18n is defined
+# here. For each 'Documentation/ab' directory containing docs
+# translated in 'ab', there should be an entry in LANGUAGES.
+
+site = LanguageDef ('en', 'English', webext='')
+fr = LanguageDef ('fr', 'French', double_punct_char_sep='&nbsp;')
+#nl = LanguageDef ('nl', 'Nederlands')
+
+# Outdated or broken translations may be disabled
+# (please run 'make web-clean' before doing that):
+#fr.enabled = False
+
+LANGUAGES = (site, fr)
+
+if __name__ == '__main__':
+    print ' '.join ([l.code for l in LANGUAGES if l.enabled and l.code != 'en'])
+else:
+    import gettext
+    LANGDICT = {}
+    for l in LANGUAGES:
+        LANGDICT[l.code] = l
diff --git a/buildscripts/mirrortree.py b/buildscripts/mirrortree.py
new file mode 100644
index 0000000000..72a5672dcb
--- /dev/null
+++ b/buildscripts/mirrortree.py
@@ -0,0 +1,87 @@
+#!@PYTHON@
+
+import re
+import os
+
+def new_link_path (link, dir, r):
+    l = link.split ('/')
+    d = dir.split ('/')
+    i = 0
+    while i < len(d) and i < len(l) and l[i] == '..':
+        if r.match (d[i]):
+            del l[i]
+        else:
+            i += 1
+    return '/'.join ([x for x in l if not r.match (x)])
+
+def hardlink_tree (input_roots = [],
+                   process_dirs = '.*',
+                   strip_dir_names = '',
+                   exclude_dirs = '',
+                   process_files = '.*',
+                   find_files = '',
+                   exclude_files = '',
+                   target_pattern = '',
+                   targets = ['.']):
+    """Mirror trees for different targets by hardlinking files.
+
+    Arguments:
+     input_roots=DIRLIST      use DIRLIST as input tree roots list
+     process_dir=PATTERN      only process files in directories named PATTERN
+     strip_dir_names=PATTERN  strip directories names matching PATTERN 
+                                 (write their content to parent)
+     exclude_dir=PATTERN      don't recurse into directories named PATTERN
+     process_files=PATTERN    filters files which are hardlinked
+     find_files=PATTERN       find files named PATTERN. The files list will be returned.
+     exclude_files=PATTERN    exclude files named PATTERN
+     target_pattern=STRING    use STRING as target root directory name pattern
+     targets=DIRLIST          mkdir each directory in DIRLIST and mirrors the tree into each
+    """
+    process_files_re = re.compile (process_files)
+    find_files_re = re.compile (find_files)
+    exclude_dirs_re = re.compile (exclude_dirs)
+    exclude_files_re = re.compile (exclude_files)
+    process_dirs_re = re.compile (process_dirs)
+    strip_dir_names_re = re.compile (strip_dir_names)
+    do_strip_dir_names_re = re.compile ('/(?:' + strip_dir_names + ')')
+
+    found_files = []
+
+    if not '%s' in target_pattern:
+        target_pattern += '%s'
+    target_dirs = [target_pattern % s for s in targets]
+
+    map (os.mkdir, target_dirs)
+
+    for d in input_roots:
+        for in_dir, dirs, files in os.walk(d):
+            out_dir = strip_dir_names_re.sub ('', in_dir)
+            i = 0
+            while i < len(dirs):
+                if exclude_dirs_re.search (dirs[i]):
+                    del dirs[i]
+                else:
+                    if os.path.islink (os.path.join (in_dir, dirs[i])):
+                        files.append (dirs[i])
+                    i += 1
+            if not strip_dir_names_re.match (os.path.basename (in_dir)):
+                for t in target_dirs:
+                    p = os.path.join (t, out_dir)
+                    if not os.path.isdir (p):
+                        os.mkdir (p)
+            if not process_dirs_re.search (in_dir):
+                continue
+            for f in files:
+                if exclude_files_re.match (f):
+                    continue
+                in_file = os.path.join (in_dir, f)
+                if find_files_re.match (f):
+                    found_files.append (in_file)
+                if os.path.islink (in_file): # all symlinks are assumed to be relative and to point to files in the input trees
+                    link_path = new_link_path (os.path.normpath (os.readlink (in_file)), in_dir, do_strip_dir_names_re)
+                    for t in target_dirs:
+                        os.symlink (link_path, os.path.join (t, out_dir, f))
+                elif process_files_re.match (f):
+                    for t in target_dirs:
+                        os.link (in_file, os.path.join (t, out_dir, f))
+    return found_files
diff --git a/buildscripts/mutopia-index.py b/buildscripts/mutopia-index.py
index 8bb5af36ab..c73481aaba 100644
--- a/buildscripts/mutopia-index.py
+++ b/buildscripts/mutopia-index.py
@@ -148,7 +148,7 @@ hr { border:0; height:1; color: #000000; background-color: #000000; }\n
                 pictures = ['jpeg', 'png', 'xpm']
                 lst.write ('\n')
             else:
-                print "can't find" , `file_name`
+                print "cannot find" , `file_name`
 
         list_item (base + ext, 'The input', 'ASCII')
 
diff --git a/buildscripts/output-distance.py b/buildscripts/output-distance.py
index f19886afbf..5a83c490d0 100644
--- a/buildscripts/output-distance.py
+++ b/buildscripts/output-distance.py
@@ -17,7 +17,7 @@ INFTY = 1e6
 
 OUTPUT_EXPRESSION_PENALTY = 1
 ORPHAN_GROB_PENALTY = 1
-inspect_max_count = 0
+options = None
 
 def shorten_string (s):
     threshold = 15 
@@ -313,12 +313,68 @@ def compare_png_images (old, new, dir):
     system ("composite -quality 65 matte.png %(new)s %(dest)s" % locals ())
 
 class FileLink:
+    def text_record_string (self):
+        return '%-30f %-20s\n' % (self.distance (),
+                                  self.name ())
+    def distance (self):
+        return 0.0
+
+    def name (self):
+        return ''
+    
+    def link_files_for_html (self, old_dir, new_dir, dest_dir):
+        pass
+
+    def write_html_system_details (self, dir1, dir2, dest_dir):
+        pass
+        
+    def html_record_string (self,  old_dir, new_dir):
+        return ''
+
+class MidiFileLink (FileLink):
+    def get_midi (self, f):
+        s = open (f).read ()
+        s = re.sub ('LilyPond [0-9.]+', '', s)
+        return s
+    
+    def __init__ (self, f1, f2):
+        self.files = (f1, f2)
+
+        s1 = self.get_midi (self.files[0])
+        s2 = self.get_midi (self.files[1])
+        
+        self.same = (s1 == s2)
+        
+    def name (self):
+        name = os.path.split (self.files[0])[1]
+        name = re.sub ('.midi', '', name)
+        return name
+        
+    def distance (self):
+        ## todo: could use import MIDI to pinpoint
+        ## what & where changed.
+        if self.same:
+            return 0
+        else:
+            return 100;
+    def html_record_string (self, d1, d2):
+        return '''<tr>
+<td>
+%f
+</td>
+<td><tt>%s</tt></td>
+<td><tt>%s</tt></td>
+</tr>''' % ((self.distance(),) + self.files)
+
+class SignatureFileLink (FileLink):
     def __init__ (self):
         self.original_name = ''
         self.base_names = ('','')
         self.system_links = {}
         self._distance = None
-        
+    def name (self):
+        return self.original_name
+    
     def add_system_link (self, link, number):
         self.system_links[number] = link
 
@@ -338,10 +394,6 @@ class FileLink:
         
         return self._distance
 
-    def text_record_string (self):
-        return '%-30f %-20s\n' % (self.distance (),
-                             self.original_name)
-
     def source_file (self):
         for ext in ('.ly', '.ly.txt'):
             if os.path.exists (self.base_names[1] + ext):
@@ -394,10 +446,11 @@ class FileLink:
 
                     if f.endswith ('.png'):
                         png_linked[oldnew].append (f)
-
-        for (old,new) in zip (png_linked[0], png_linked[1]):
-            compare_png_images (old, new, dest_dir)
-
+                        
+        if options.compare_images:                
+            for (old,new) in zip (png_linked[0], png_linked[1]):
+                compare_png_images (old, new, dest_dir)
+                
     def html_record_string (self,  old_dir, new_dir):
         def img_cell (ly, img, name):
             if not name:
@@ -449,6 +502,11 @@ class FileLink:
 
         html_2  = self.base_names[1] + '.html'
         name = self.original_name
+
+        cell_1 = cell (self.base_names[0], name)
+        cell_2 = cell (self.base_names[1], name)
+        if options.compare_images:
+            cell_2 = cell_2.replace ('.png', '.compare.jpeg')
         
         html_entry = '''
 <tr>
@@ -460,9 +518,7 @@ class FileLink:
 %s
 %s
 </tr>
-''' % (self.distance (), html_2,
-       cell (self.base_names[0], name),
-       cell (self.base_names[1], name).replace ('.png', '.compare.jpeg'))
+''' % (self.distance (), html_2, cell_1, cell_2)
 
         return html_entry
 
@@ -577,23 +633,35 @@ class ComparisonData:
                 self.compare_trees (d1, d2)
     
     def compare_directories (self, dir1, dir2):
+        for ext in ['signature', 'midi']:
+            (paired, m1, m2) = paired_files (dir1, dir2, '*.' + ext)
 
-        (paired, m1, m2) = paired_files (dir1, dir2, '*.signature')
+            self.missing += [(dir1, m) for m in m1] 
+            self.added += [(dir2, m) for m in m2] 
 
-        self.missing += [(dir1, m) for m in m1] 
-        self.added += [(dir2, m) for m in m2] 
-
-        for p in paired:
-            if (inspect_max_count
-                and len (self.file_links) > inspect_max_count):
+            for p in paired:
+                if (options.max_count
+                    and len (self.file_links) > options.max_count):
+                    
+                    continue
                 
-                continue
-            
-            f2 = dir2 +  '/' + p
-            f1 = dir1 +  '/' + p
-            self.compare_files (f1, f2)
+                f2 = dir2 +  '/' + p
+                f1 = dir1 +  '/' + p
+                self.compare_files (f1, f2)
 
     def compare_files (self, f1, f2):
+        if f1.endswith ('signature'):
+            self.compare_signature_files (f1, f2)
+        elif f1.endswith ('midi'):
+            self.compare_midi_files (f1, f2)
+            
+    def compare_midi_files (self, f1, f2):
+        name = os.path.split (f1)[1]
+
+        file_link = MidiFileLink (f1, f2)
+        self.file_links[name] = file_link
+        
+    def compare_signature_files (self, f1, f2):
         name = os.path.split (f1)[1]
         name = re.sub ('-[0-9]+.signature', '', name)
         
@@ -601,10 +669,10 @@ class ComparisonData:
         try:
             file_link = self.file_links[name]
         except KeyError:
-            file_link = FileLink ()
+            file_link = SignatureFileLink ()
             self.file_links[name] = file_link
 
-        file_link.add_file_compare (f1,f2)
+        file_link.add_file_compare (f1, f2)
 
     def write_text_result_page (self, filename, threshold):
         out = None
@@ -762,12 +830,16 @@ def test_compare_trees ():
     ## radical diffs.
     system ('cp 19-1.signature dir2/20grob-1.signature')
     system ('cp 19-1.signature dir2/20grob-2.signature')
+    system ('cp 19multipage.midi dir1/midi-differ.midi')
+    system ('cp 20multipage.midi dir2/midi-differ.midi')
 
     compare_trees ('dir1', 'dir2', 'compare-dir1dir2', 0.5)
 
 
 def test_basic_compare ():
     ly_template = r"""
+
+\version "2.10.0"
 #(set! toplevel-score-handler print-score-with-defaults)
  #(set! toplevel-music-handler
   (lambda (p m)
@@ -778,7 +850,8 @@ def test_basic_compare ():
 \sourcefilename "my-source.ly"
  
 %(papermod)s
-\header { tagline = ##f } 
+\header { tagline = ##f }
+\score {
 <<
 \new Staff \relative c {
   c4^"%(userstring)s" %(extragrob)s
@@ -787,6 +860,9 @@ def test_basic_compare ():
   c4^"%(userstring)s" %(extragrob)s
   }
 >>
+\layout{}
+}
+
 """
 
     dicts = [{ 'papermod' : '',
@@ -805,7 +881,6 @@ def test_basic_compare ():
                'name' : '20grob',
                'extragrob': 'r2. \\break c1',
                'userstring': 'test' },
-                
              ]
 
     for d in dicts:
@@ -818,10 +893,14 @@ def test_basic_compare ():
 
     multipage_str = r'''
     #(set-default-paper-size "a6")
-    {c1 \pageBreak c1 }
+    \score {
+      \relative {c1 \pageBreak c1 }
+      \layout {}
+      \midi {}
+    }
     '''
 
-    open ('20multipage', 'w').write (multipage_str)
+    open ('20multipage', 'w').write (multipage_str.replace ('c1', 'd1'))
     open ('19multipage', 'w').write ('#(set-global-staff-size 19.5)\n' + multipage_str)
     system ('lilypond -ddump-signatures --png 19multipage 20multipage ')
  
@@ -911,6 +990,11 @@ def main ():
                   type="float",
                   help='threshold for geometric distance')
 
+    p.add_option ('--no-compare-images',
+                  dest="compare_images",
+                  default=True,
+                  action="store_false",
+                  help="Don't run graphical comparisons")
 
     p.add_option ('-o', '--output-dir',
                   dest="output_dir",
@@ -919,6 +1003,7 @@ def main ():
                   type="string",
                   help='where to put the test results [tree2/compare-tree1tree2]')
 
+    global options
     (options, a) = p.parse_args ()
 
     if options.run_test:
@@ -929,9 +1014,6 @@ def main ():
         p.print_usage()
         sys.exit (2)
 
-    global inspect_max_count
-    inspect_max_count = options.max_count
-
     name = options.output_dir
     if not name:
         name = a[0].replace ('/', '')
diff --git a/buildscripts/texi-langutils.py b/buildscripts/texi-langutils.py
index 09737639b7..62c87619dd 100644
--- a/buildscripts/texi-langutils.py
+++ b/buildscripts/texi-langutils.py
@@ -86,7 +86,7 @@ if make_gettext:
 	node_list = open (node_list_filename, 'w')
 	for texi_file in texi_files:
 		process_texi (texi_file, intro_blurb, node_blurb, make_skeleton, node_list)
-	for word in ('Up:', 'Next:', 'Previous:', 'Appendix'):
+	for word in ('Up:', 'Next:', 'Previous:', 'Appendix', 'Footnotes'):
 		node_list.write ('_("' + word + '")\n')
 	node_list.close ()
 	os.system ('xgettext -L Python --no-location -o ' + output_file + ' ' + node_list_filename)
diff --git a/buildscripts/www_post.py b/buildscripts/www_post.py
new file mode 100644
index 0000000000..1e182416c2
--- /dev/null
+++ b/buildscripts/www_post.py
@@ -0,0 +1,56 @@
+#!@PYTHON@
+
+## This is www_post.py. This script is the main stage
+## of toplevel GNUmakefile local-WWW-post target.
+
+# USAGE: www_post PACKAGE_NAME TOPLEVEL_VERSION BUILDSCRIPT-DIR OUTDIR TARGETS
+# please call me from top of the source directory
+
+import sys
+import os
+import re
+
+package_name, package_version, buildscript_dir, outdir, targets = sys.argv[1:]
+targets = targets.split (' ')
+outdir = os.path.normpath (outdir)
+doc_dirs = ['input', 'Documentation', outdir]
+target_pattern = os.path.join (outdir, '%s-root')
+
+static_files = {os.path.join (outdir, 'index.html'):
+               '''<META HTTP-EQUIV="refresh" content="0;URL=Documentation/index.html">
+<html><body>Redirecting to the documentation index...</body></html>\n''',
+               os.path.join (outdir, 'VERSION'):
+               package_version + '\n' }
+
+for f in static_files.keys():
+    open (f, 'w').write (static_files[f])
+
+
+sys.path.append (buildscript_dir)
+import mirrortree
+import add_html_footer
+import langdefs
+
+sys.stderr.write ("Mirrorring...\n")
+html_list = mirrortree.hardlink_tree (input_roots = doc_dirs,
+                          process_dirs = outdir,
+                          strip_dir_names = outdir,
+                          exclude_dirs = '(' +
+                                      '|'.join ([l.code for l in langdefs.LANGUAGES]) +
+                                      r'|po|out|\w*?-root)(/|$)',
+                          process_files = r'.*?\.(?:midi|pdf|png|txt|ly|signature)$|VERSION',
+                          exclude_files = r'lily-[0-9a-f]+.*\.pdf',
+                          target_pattern = target_pattern,
+                          targets = targets)
+html_dict = add_html_footer.build_pages_dict (html_list)
+strip_re = re.compile (outdir + '/')
+for t in targets:
+    sys.stderr.write ("Processing HTML pages for %s target...\n" % t)
+    add_html_footer.add_html_footer (
+        package_name = package_name,
+        package_version = package_version,
+        target = t,
+        mail_address = 'http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs',
+        pages_dict = html_dict,
+        out_root = target_pattern % t,
+        name_filter = lambda s: strip_re.sub ('', s))
diff --git a/configure.in b/configure.in
index 16cb3c3f21..8a1c5d59a6 100644
--- a/configure.in
+++ b/configure.in
@@ -107,7 +107,27 @@ STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.7)
+
+## should check for 1.8.2 ?  
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.0)
+
+
+## check rational bugfix.
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS"
+AC_MSG_CHECKING(GUILE rational bugfix)
+AC_TRY_CPP(
+#include <libguile.h>
+#ifdef SCM_FRACTION_REDUCED_BIT
+#error 
+#endif
+,
+AC_MSG_RESULT(ok),
+REQUIRED="$REQUIRED GUILE-with-rational-bugfix"
+AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt))
+CPPFLAGS="$save_CPPFLAGS"
+
+
 STEPMAKE_MAKEINFO(REQUIRED, 4.8)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
@@ -177,4 +197,9 @@ Type:
     make$mc install   to install LilyPond
     make$mc help      to see all possible targets
 
+Edit local.make for local Makefile overrides.
+
+
 EOF
+
+touch local.make
diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index bb51a01863..20f744ee41 100644
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -141,7 +141,7 @@ Getopt_long::report (Errorcod c)
 		 found_option_->to_string ());
       break;
     case E_NOARGEXPECT:
-      str += _f ("option `%s' doesn't allow an argument",
+      str += _f ("option `%s' does not allow an argument",
 		 found_option_->to_string ());
       break;
     case E_UNKNOWNOPTION:
diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 290d02b960..ac1a6d12fc 100644
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -28,7 +28,7 @@ class Rational
   */
   int sign_;
   unsigned int num_, den_;
-  void normalise ();
+  void normalize ();
   void copy (Rational const &);
 
 public:
@@ -43,9 +43,10 @@ public:
   Rational trunc_rat () const;
   Rational div_rat (Rational) const;
   Rational mod_rat (Rational) const;
+  Rational abs () const;
   void negate ();
   int to_int () const;
-  operator bool () const;
+
   operator double () const;
 
   Rational operator - () const;
@@ -54,8 +55,8 @@ public:
   */
   Rational ();
   Rational (int);
-  Rational (int, int);
-  Rational (double);
+  explicit Rational (int, int);
+  explicit Rational (double);
   Rational (Rational const &r) { copy (r);}
   Rational &operator = (Rational const &r)
   {
@@ -73,6 +74,7 @@ public:
 };
 
 #include "arithmetic-operator.hh"
+
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, /);
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, +);
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, *);
@@ -97,6 +99,6 @@ ostream &
 operator << (ostream &, Rational);
 #endif
 
-const Rational infinity_rat = INT_MAX;
+const Rational infinity_rat (INT_MAX);
 
 #endif // RATIONAL_HH
diff --git a/flower/rational.cc b/flower/rational.cc
index b82a35e667..6822703256 100644
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -30,10 +30,6 @@ Rational::operator double () const
   return 0.0;
 }
 
-Rational::operator bool () const
-{
-  return sign_ && num_;
-}
 
 #ifdef STREAM_SUPPORT
 ostream &
@@ -44,6 +40,12 @@ operator << (ostream &o, Rational r)
 }
 #endif
 
+Rational
+Rational::abs () const
+{
+  return Rational (num_, den_);
+}
+
 Rational
 Rational::trunc_rat () const
 {
@@ -59,29 +61,18 @@ Rational::Rational ()
 Rational::Rational (int n, int d)
 {
   sign_ = ::sign (n) * ::sign (d);
-  num_ = abs (n);
-  den_ = abs (d);
-  normalise ();
+  num_ = ::abs (n);
+  den_ = ::abs (d);
+  normalize ();
 }
 
 Rational::Rational (int n)
 {
   sign_ = ::sign (n);
-  num_ = abs (n);
+  num_ = ::abs (n);
   den_ = 1;
 }
 
-static inline
-int gcd (int a, int b)
-{
-  int t;
-  while ((t = a % b))
-    {
-      a = b;
-      b = t;
-    }
-  return b;
-}
 
 void
 Rational::set_infinite (int s)
@@ -113,8 +104,56 @@ Rational::mod_rat (Rational div) const
   return r;
 }
 
+
+/*
+  copy & paste from scm_gcd (GUILE).
+ */
+static int
+gcd (long u, long v) 
+{
+  long result = 0;
+  if (u == 0)
+    result = v;
+  else if (v == 0)
+    result = u;
+  else
+    {
+      long k = 1;
+      long t;
+      /* Determine a common factor 2^k */
+      while (!(1 & (u | v)))
+	{
+	  k <<= 1;
+	  u >>= 1;
+	  v >>= 1;
+	}
+      /* Now, any factor 2^n can be eliminated */
+      if (u & 1)
+	t = -v;
+      else
+	{
+	  t = u;
+	b3:
+	  t = t >> 1;
+	}
+      if (!(1 & t))
+	goto b3;
+      if (t > 0)
+	u = t;
+      else
+	v = -t;
+      t = u - v;
+      if (t != 0)
+	goto b3;
+      result = u * k;
+    }
+
+  return result;
+}
+
+
 void
-Rational::normalise ()
+Rational::normalize ()
 {
   if (!sign_)
     {
@@ -185,9 +224,9 @@ Rational::operator += (Rational r)
       int n = sign_ * num_ * (lcm / den_) + r.sign_ * r.num_ * (lcm / r.den_);
       int d = lcm;
       sign_ = ::sign (n) * ::sign (d);
-      num_ = abs (n);
-      den_ = abs (d);
-      normalise ();
+      num_ = ::abs (n);
+      den_ = ::abs (d);
+      normalize ();
     }
   return *this;
 }
@@ -217,19 +256,19 @@ Rational::Rational (double x)
 
       num_ = (unsigned int) (mantissa * FACT);
       den_ = (unsigned int) FACT;
-      normalise ();
+      normalize ();
       if (expt < 0)
 	den_ <<= -expt;
       else
 	num_ <<= expt;
-      normalise ();
+      normalize ();
     }
   else
     {
       num_ = 0;
       den_ = 1;
       sign_ = 0;
-      normalise ();
+      normalize ();
     }
 }
 
@@ -254,7 +293,7 @@ Rational::operator *= (Rational r)
   num_ *= r.num_;
   den_ *= r.den_;
 
-  normalise ();
+  normalize ();
  exit_func:
   return *this;
 }
diff --git a/input/GNUmakefile b/input/GNUmakefile
index e096a73471..4a45b45f4a 100644
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-SUBDIRS = test regression tutorial no-notation mutopia manual
+SUBDIRS = test regression tutorial midi no-notation mutopia manual
 
 examples = typography-demo les-nereides wilhelmus proportional bach-schenker cary
 
diff --git a/input/midi/GNUmakefile b/input/midi/GNUmakefile
new file mode 100644
index 0000000000..37d97aa000
--- /dev/null
+++ b/input/midi/GNUmakefile
@@ -0,0 +1,8 @@
+depth = ../..
+
+STEPMAKE_TEMPLATES=documentation texinfo tex
+LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+
+include $(depth)/make/stepmake.make
+TITLE=LilyPond MIDI Tests
+
diff --git a/input/midi/midi-drums.ly b/input/midi/midi-drums.ly
new file mode 100644
index 0000000000..2b799be25b
--- /dev/null
+++ b/input/midi/midi-drums.ly
@@ -0,0 +1,18 @@
+
+\version "2.10.0"
+
+\version "2.10.1" 
+
+\score {
+  \new DrumStaff <<
+    \drummode {
+      bd4 sn4 bd4 sn4
+      <<
+	{\voiceOne \repeat unfold 16 hh16 }
+	\new DrumVoice { \voiceTwo bd4 sn4 bd4 sn4 }
+      >> \oneVoice
+    }
+  >>
+  \layout {}
+  \midi {}
+}
diff --git a/input/midi/midi-grace.ly b/input/midi/midi-grace.ly
new file mode 100644
index 0000000000..213de79e37
--- /dev/null
+++ b/input/midi/midi-grace.ly
@@ -0,0 +1,22 @@
+\version "2.10.0"
+\header{ texidoc = "Tests MIDI output with grace notes. " }
+
+\score { 
+  \context Voice \relative c {
+    \new Voice = VoiceOne
+	\grace {
+  \override Stem  #'stroke-style = #"grace"
+   c8 
+  \revert Stem #'stroke-style }
+ d4 d d d d
+	\grace {
+  \override Stem  #'stroke-style = #"grace"
+   e16 f e f 
+  \revert Stem #'stroke-style }
+ d4 d d d d 
+	
+  }
+  \layout { }  
+  \midi { }
+}
+
diff --git a/input/midi/midi-lyric-barcheck.ly b/input/midi/midi-lyric-barcheck.ly
new file mode 100644
index 0000000000..5c06916af0
--- /dev/null
+++ b/input/midi/midi-lyric-barcheck.ly
@@ -0,0 +1,24 @@
+\version "2.10.0"
+\header {
+
+    texidoc = "Lyrics in MIDI are aligned to ties and beams:
+this examples causes no bar checks in MIDI.
+"
+
+
+    }
+\score {
+
+    <<\relative c'' \new Voice =  A {
+	\autoBeamOff
+	c8[ c] c2.
+	c1~c4 c2.
+	c4 ( d e) d
+	c1
+
+    }
+    \lyricsto "A" \lyrics { bla bla | bla bla | bla bla | bla }
+    >>
+    \layout {}
+      \midi {}
+    }
diff --git a/input/midi/midi-scales.ly b/input/midi/midi-scales.ly
new file mode 100644
index 0000000000..d6e8ed91c5
--- /dev/null
+++ b/input/midi/midi-scales.ly
@@ -0,0 +1,159 @@
+
+\version "2.10.0"
+% candidate for regression.  -gp
+\header {
+  texidoc="Converting LilyPond input to MIDI and then again back with
+  @code{midi2ly.py} is a reversible procedure in some simple cases,
+  which mean that the original @code{.ly} -file and the one converted 
+  back from the generated @code{.midi} -file do not differ.
+  Here are produced some scales.
+  
+  "
+}
+
+%{
+  This means, doing:
+
+    lilypond input/test/midi-scales.ly
+    midi2ly midi-scales.midi
+    diff -u input/test/midi-scales.ly midi-scales-midi.ly
+
+  should show no differences at all in \key commands or notes.
+
+  Therefore, do not reformat this file unless midi2ly changes.
+
+  1.7.30 reformatted, because
+  midi2ly now outpts 1 bar per line and adds bar checks and numbers.
+
+%}
+
+scales =  \relative c {
+
+  % [INSTRUMENT_NAME] bright acoustic
+  \key c \major  % sharp-major
+  c'4 d e f |
+  g a b c |
+
+  \key g \major
+  g a b c |
+  d e fis g |
+
+  \key d \major
+  d, e fis g |
+  a b cis d |
+
+  \key a \major
+  a b cis d |
+  e fis gis a |
+
+  \key e \major
+  e, fis gis a |
+  b cis dis e |
+
+  \key b \major
+  b cis dis e |
+  fis gis ais b |
+
+  \key fis \major
+  fis, gis ais b |
+  cis dis eis fis |
+
+  \key cis \major
+  cis, dis eis fis |
+  gis ais bis cis |
+
+  \key a \minor  % sharp-minor
+  a b c d |
+  e f gis a |
+
+  \key e \minor
+  e, fis g a |
+  b c dis e |
+
+  \key b \minor
+  b cis d e |
+  fis g ais b |
+
+  \key fis \minor
+  fis, gis a b |
+  cis d eis fis |
+
+  \key cis \minor
+  cis, dis e fis |
+  gis a bis cis |
+
+  \key gis \minor
+  gis ais b cis |
+  dis e fisis gis |
+
+  \key dis \minor
+  dis, eis fis gis |
+  ais b cisis dis |
+
+  \key ais \minor
+  ais bis cis dis |
+  eis fis gisis ais |
+
+  \key f \major  % flat-major
+  f, g a bes |
+  c d e f |
+
+  \key bes \major
+  bes c d ees |
+  f g a bes |
+
+  \key ees \major
+  ees,, f g aes |
+  bes c d ees |
+
+  \key aes \major
+  aes, bes c des |
+  ees f g aes |
+
+  \key des \major
+  des,, ees f ges |
+  aes bes c des |
+
+  \key ges \major
+  ges, aes bes ces |
+  des ees f ges |
+
+  \key ces \major
+  ces,, des ees fes |
+  ges aes bes ces |
+
+  \key d \minor  % flat-minor
+  d, e f g |
+  a bes cis d |
+
+  \key g \minor
+  g, a bes c |
+  d ees fis g |
+
+  \key c \minor
+  c,, d ees f |
+  g aes b c |
+
+  \key f \minor
+  f, g aes bes |
+  c des e f |
+
+  \key bes \minor
+  bes,, c des ees |
+  f ges a bes |
+
+  \key ees \minor
+  ees, f ges aes |
+  bes ces d ees |
+
+  \key aes \minor
+  aes, bes ces des |
+  ees fes g aes |
+}
+
+\score {
+  \context Voice \scales
+  \layout { }
+  \midi { }
+}
+
diff --git a/input/midi/midi-tuplets.ly b/input/midi/midi-tuplets.ly
new file mode 100644
index 0000000000..0a0f5ef1a9
--- /dev/null
+++ b/input/midi/midi-tuplets.ly
@@ -0,0 +1,35 @@
+\version "2.10.0"
+\header {
+texidoc = "
+
+Midi2ly tuplet test.
+
+@example
+  python scripts/midi2ly.py --duration-quant=32 \
+      --allow-tuplet=4*2/3 \
+      --allow-tuplet=8*2/3 \
+      --allow-tuplet=4*3/5 \
+      --allow-tuplet=8*3/5 \
+      tu.midi 
+@end example
+"
+}
+
+
+\score { 
+  \context Voice  \relative c' {
+
+    a1 a2 a2. a4 a4. a8 a8. a16 a16. a32 a32. a64
+
+    \times 2/3 { b4 b4 b4 }
+    \times 3/5 { b4 b4 b4 b4 b4 }
+
+    \times 2/3 { c8 c8 c8 }
+    \times 3/5 { c8 c8 c8 c8 c8 }
+
+  }
+  \layout { }  
+  \midi { }
+}
+
+
diff --git a/input/midi/midi-volume-equaliser.ly b/input/midi/midi-volume-equaliser.ly
new file mode 100644
index 0000000000..0ad06cb931
--- /dev/null
+++ b/input/midi/midi-volume-equaliser.ly
@@ -0,0 +1,161 @@
+\version "2.10.0"
+\header {
+  texidoc = "@cindex Midi Volume Equaliser
+The full orchestra plays a notes, where groups stop one after
+another. Use this to tune equalizer settings. "
+}
+
+#(set-global-staff-size 16)
+
+%{
+
+Override, see scm/midi.scm:
+
+#(set! instrument-equalizer-alist
+  (append 
+   '(
+     ("flute" . (0 . 0.7))
+   )
+   instrument-equalizer-alist))
+
+%}
+
+flauti =  \relative c' {
+  \set Staff.midiInstrument = #"flute"
+  \set Staff.instrumentName = #"2 Flauti"
+  \set Staff.shortInstrumentName = #"Fl."
+
+  c1\f R1*10
+}
+
+oboi =  \relative c' {
+  \set Staff.midiInstrument = #"oboe"
+  \set Staff.instrumentName = #"2 Oboi"
+  \set Staff.shortInstrumentName = #"Ob."
+
+  R1*1 c1\f R1*9
+}
+
+clarinetti =  \relative c' {
+  \set Staff.midiInstrument = #"clarinet"
+  \set Staff.instrumentName = #"Clarinetti"
+  \set Staff.shortInstrumentName = #"Cl"
+
+  R1*2 c1\f R1*8
+}
+
+fagotti =  \relative c' {
+  \set Staff.midiInstrument = #"bassoon"
+  \set Staff.instrumentName = #"2 Fagotti"
+  \set Staff.shortInstrumentName = #"Fg."
+
+  \clef bass
+  R1*3 c1\f R1*7
+}
+
+corni =  \relative c' {
+  \set Staff.midiInstrument = #"french horn"
+  \set Staff.instrumentName = #"Corni"
+  \set Staff.shortInstrumentName = #"Cor"
+
+  R1*4 c1\f R1*6
+}
+
+trombe =  \relative c' {
+  \set Staff.midiInstrument = #"trumpet"
+  \set Staff.instrumentName = #"Trombe"
+  \set Staff.shortInstrumentName = #"Tp."
+
+  \clef bass
+  R1*5 c1\f R1*5
+}
+
+timpani =  \relative c' {
+  \set Staff.midiInstrument = #"timpani"
+  \set Staff.instrumentName = #"Timpani"
+  \set Staff.shortInstrumentName = #"Timp."
+
+  R1*6 c1\f R1*4
+}
+
+violinoI =  \relative c' {
+  \set Staff.midiInstrument = #"violin"
+  \set Staff.instrumentName = #"Violino I "
+  \set Staff.shortInstrumentName = #"Vl. I "
+
+  R1*7 c1\f R1*3
+}
+
+violinoII =  \relative c' {
+  \set Staff.midiInstrument = #"violin"
+  \set Staff.instrumentName = #"Violino II "
+  \set Staff.shortInstrumentName = #"Vl. II "
+  
+  R1*8 c1\f R1*2
+}
+
+viola =  \relative c' {
+  \set Staff.midiInstrument = #"viola"
+  \set Staff.instrumentName = #"Viola"
+  \set Staff.shortInstrumentName = #"Vla."
+
+  \clef alto
+  R1*9 c1\f R1*1
+}
+
+violoncello =  \relative c' {
+  \set Staff.midiInstrument = #"cello"
+				%\set Staff.midiInstrument = #"contrabass"
+  \set Staff.instrumentName = #"Violoncello"
+  \set Staff.shortInstrumentName = #"Vc."
+  
+  \clef bass
+  R1*10 c1\f
+}
+
+
+\score {
+  << 
+    \new StaffGroup = "legni" << 
+      \new Staff = "flauti" \flauti
+      \new Staff = "oboi" \oboi
+      \new Staff = "clarinetti" \clarinetti 
+      \new Staff = "fagotti" \fagotti 
+    >>
+    \new StaffGroup = "ottoni" <<
+      \new Staff = "corni" \corni
+      \new Staff = "trombe" \trombe
+    >>
+    \new StaffGroup = "timpani" <<
+      \new Staff = "timpani" \timpani
+      { 
+	\skip 1 
+	%% Hmm: this forces a staff-bracket, that's good!
+	%% However, I can't find where is decided on staff-bracket yes/no
+      }
+    >>
+    \new StaffGroup = "archi" <<
+      \new GrandStaff = "violini" <<
+        \new Staff = "violino1" \violinoI
+        \new Staff = "violino2" \violinoII
+      >>
+      \new Staff = "viola" \viola
+      \new Staff = "violoncello" \violoncello
+    >>
+  >>
+
+  \layout {
+    \context {
+      \RemoveEmptyStaffContext
+    }
+  }
+  
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 60 1)
+    }
+  }
+}
+
+
diff --git a/input/midi/transposition.ly b/input/midi/transposition.ly
new file mode 100644
index 0000000000..2429fef5d3
--- /dev/null
+++ b/input/midi/transposition.ly
@@ -0,0 +1,14 @@
+\header
+{
+  texidoc =  "should deliver f' in MIDI"
+}
+\version "2.10.5"
+
+\score {
+  {
+    \transposition f
+    c''
+  }
+  \midi{}
+  \layout{}
+}
diff --git a/input/no-notation/midi-drums.ly b/input/no-notation/midi-drums.ly
deleted file mode 100644
index 2b799be25b..0000000000
--- a/input/no-notation/midi-drums.ly
+++ /dev/null
@@ -1,18 +0,0 @@
-
-\version "2.10.0"
-
-\version "2.10.1" 
-
-\score {
-  \new DrumStaff <<
-    \drummode {
-      bd4 sn4 bd4 sn4
-      <<
-	{\voiceOne \repeat unfold 16 hh16 }
-	\new DrumVoice { \voiceTwo bd4 sn4 bd4 sn4 }
-      >> \oneVoice
-    }
-  >>
-  \layout {}
-  \midi {}
-}
diff --git a/input/no-notation/midi-grace.ly b/input/no-notation/midi-grace.ly
deleted file mode 100644
index 108b03b2f0..0000000000
--- a/input/no-notation/midi-grace.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-#(ly:set-option 'old-relative)
-\version "2.10.0"
-\header{ texidoc = "Tests MIDI output with grace notes. " }
-
-\score { 
-  \context Voice \relative c {
-    \new Voice = VoiceOne
-	\grace {
-  \override Stem  #'stroke-style = #"grace"
-   c8 
-  \revert Stem #'stroke-style }
- d4 d d d d
-	\grace {
-  \override Stem  #'stroke-style = #"grace"
-   e16 f e f 
-  \revert Stem #'stroke-style }
- d4 d d d d 
-	
-  }
-  \layout { }  
-  \midi { }
-}
-
diff --git a/input/no-notation/midi-lyric-barcheck.ly b/input/no-notation/midi-lyric-barcheck.ly
deleted file mode 100644
index 7c22ef1fda..0000000000
--- a/input/no-notation/midi-lyric-barcheck.ly
+++ /dev/null
@@ -1,24 +0,0 @@
-\version "2.10.0"
-\header {
-
-    texidoc = "Lyrics in MIDI are aligned to ties and beams:
-this examples causes no bar checks in MIDI.
-"
-
-
-    }
-\score {
-
-    <<\relative c'' \new Voice =  A {
-	\autoBeamOff
-	c8[ c] c2.
-	c1~c4 c2.
-	c4 ( d e) d
-	c1
-
-    }
-    \lyricsto "A" \lyricmode\new Lyrics { bla bla | bla bla | bla bla | bla }
-    >>
-    \layout {}
-      \midi {}
-    }
diff --git a/input/no-notation/midi-scales.ly b/input/no-notation/midi-scales.ly
deleted file mode 100644
index d6e8ed91c5..0000000000
--- a/input/no-notation/midi-scales.ly
+++ /dev/null
@@ -1,159 +0,0 @@
-
-\version "2.10.0"
-% candidate for regression.  -gp
-\header {
-  texidoc="Converting LilyPond input to MIDI and then again back with
-  @code{midi2ly.py} is a reversible procedure in some simple cases,
-  which mean that the original @code{.ly} -file and the one converted 
-  back from the generated @code{.midi} -file do not differ.
-  Here are produced some scales.
-  
-  "
-}
-
-%{
-  This means, doing:
-
-    lilypond input/test/midi-scales.ly
-    midi2ly midi-scales.midi
-    diff -u input/test/midi-scales.ly midi-scales-midi.ly
-
-  should show no differences at all in \key commands or notes.
-
-  Therefore, do not reformat this file unless midi2ly changes.
-
-  1.7.30 reformatted, because
-  midi2ly now outpts 1 bar per line and adds bar checks and numbers.
-
-%}
-
-scales =  \relative c {
-
-  % [INSTRUMENT_NAME] bright acoustic
-  \key c \major  % sharp-major
-  c'4 d e f |
-  g a b c |
-
-  \key g \major
-  g a b c |
-  d e fis g |
-
-  \key d \major
-  d, e fis g |
-  a b cis d |
-
-  \key a \major
-  a b cis d |
-  e fis gis a |
-
-  \key e \major
-  e, fis gis a |
-  b cis dis e |
-
-  \key b \major
-  b cis dis e |
-  fis gis ais b |
-
-  \key fis \major
-  fis, gis ais b |
-  cis dis eis fis |
-
-  \key cis \major
-  cis, dis eis fis |
-  gis ais bis cis |
-
-  \key a \minor  % sharp-minor
-  a b c d |
-  e f gis a |
-
-  \key e \minor
-  e, fis g a |
-  b c dis e |
-
-  \key b \minor
-  b cis d e |
-  fis g ais b |
-
-  \key fis \minor
-  fis, gis a b |
-  cis d eis fis |
-
-  \key cis \minor
-  cis, dis e fis |
-  gis a bis cis |
-
-  \key gis \minor
-  gis ais b cis |
-  dis e fisis gis |
-
-  \key dis \minor
-  dis, eis fis gis |
-  ais b cisis dis |
-
-  \key ais \minor
-  ais bis cis dis |
-  eis fis gisis ais |
-
-  \key f \major  % flat-major
-  f, g a bes |
-  c d e f |
-
-  \key bes \major
-  bes c d ees |
-  f g a bes |
-
-  \key ees \major
-  ees,, f g aes |
-  bes c d ees |
-
-  \key aes \major
-  aes, bes c des |
-  ees f g aes |
-
-  \key des \major
-  des,, ees f ges |
-  aes bes c des |
-
-  \key ges \major
-  ges, aes bes ces |
-  des ees f ges |
-
-  \key ces \major
-  ces,, des ees fes |
-  ges aes bes ces |
-
-  \key d \minor  % flat-minor
-  d, e f g |
-  a bes cis d |
-
-  \key g \minor
-  g, a bes c |
-  d ees fis g |
-
-  \key c \minor
-  c,, d ees f |
-  g aes b c |
-
-  \key f \minor
-  f, g aes bes |
-  c des e f |
-
-  \key bes \minor
-  bes,, c des ees |
-  f ges a bes |
-
-  \key ees \minor
-  ees, f ges aes |
-  bes ces d ees |
-
-  \key aes \minor
-  aes, bes ces des |
-  ees fes g aes |
-}
-
-\score {
-  \context Voice \scales
-  \layout { }
-  \midi { }
-}
-
diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly
deleted file mode 100644
index 3bf8b4104c..0000000000
--- a/input/no-notation/midi-transposing.ly
+++ /dev/null
@@ -1,25 +0,0 @@
-#(ly:set-option 'old-relative)
-\version "2.10.0"
-
-\header { texidoc = "@cindex Transposing
-The transposing property leaves output invariant, but has effect on MIDI. "
-}
-
-\score { 
-  \context Voice \relative c {
-    % btw: this is not how transposing is done in lilypond
-	% this is a transposing performer, i.e. for midi-output only
-	\set Staff.transposing = #0 c
-	\set Staff.transposing = #2 c
-	\set Staff.transposing = #4 c
-	\set Staff.transposing = #5 c
-	\set Staff.transposing = #7 c
-	\set Staff.transposing = #9 c
-	\set Staff.transposing = #11 c
-	\set Staff.transposing = #12 c
-	
-  }
-  \layout { ragged-right = ##t } 
-  \midi { }
-}
-
diff --git a/input/no-notation/midi-tuplets.ly b/input/no-notation/midi-tuplets.ly
deleted file mode 100644
index 8169f36a45..0000000000
--- a/input/no-notation/midi-tuplets.ly
+++ /dev/null
@@ -1,36 +0,0 @@
-#(ly:set-option 'old-relative)
-\version "2.10.0"
-\header {
-texidoc = "
-
-Midi2ly tuplet test.
-
-@example
-  python scripts/midi2ly.py --duration-quant=32 \
-      --allow-tuplet=4*2/3 \
-      --allow-tuplet=8*2/3 \
-      --allow-tuplet=4*3/5 \
-      --allow-tuplet=8*3/5 \
-      tu.midi 
-@end example
-"
-}
-
-
-\score { 
-  \context Voice  \relative c' {
-
-    a1 a2 a2. a4 a4. a8 a8. a16 a16. a32 a32. a64
-
-    \times 2/3 { b4 b4 b4 }
-    \times 3/5 { b4 b4 b4 b4 b4 }
-
-    \times 2/3 { c8 c8 c8 }
-    \times 3/5 { c8 c8 c8 c8 c8 }
-
-  }
-  \layout { }  
-  \midi { }
-}
-
-
diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly
deleted file mode 100644
index 73c4f708e3..0000000000
--- a/input/no-notation/midi-volume-equaliser.ly
+++ /dev/null
@@ -1,167 +0,0 @@
-#(ly:set-option 'old-relative)
-\version "2.10.0"
-\header {
-texidoc = "@cindex Midi Volume Equaliser
-The full orchestra plays a notes, where groups stop one after
-another. Use this to tune equalizer settings. "
-}
-
-#(set-global-staff-size 16)
-
-%{
-
-Override, see scm/midi.scm:
-
-#(set! instrument-equalizer-alist
-      (append 
-       '(
-	 ("flute" . (0 . 0.7))
-        )
-      instrument-equalizer-alist))
-
-%}
-
-flauti =  \relative c' {
-  \set Staff.midiInstrument = #"flute"
-  \set Staff.instrumentName = #"2 Flauti"
-  \set Staff.shortInstrumentName = #"Fl."
-
-  c1\f R1*10
-}
-
-oboi =  \relative c' {
-  \set Staff.midiInstrument = #"oboe"
-  \set Staff.instrumentName = #"2 Oboi"
-  \set Staff.shortInstrumentName = #"Ob."
-
-  R1*1 c1\f R1*9
-}
-
-clarinetti =  \relative c' {
-  \set Staff.midiInstrument = #"clarinet"
-  \set Staff.instrumentName = #"Clarinetti"
-  \set Staff.shortInstrumentName = #"Cl"
-
-  R1*2 c1\f R1*8
-}
-
-fagotti =  \relative c' {
-  \set Staff.midiInstrument = #"bassoon"
-  \set Staff.instrumentName = #"2 Fagotti"
-  \set Staff.shortInstrumentName = #"Fg."
-
-  \clef bass
-  R1*3 c1\f R1*7
-}
-
-corni =  \relative c' {
-  \set Staff.midiInstrument = #"french horn"
-  \set Staff.instrumentName = #"Corni"
-  \set Staff.shortInstrumentName = #"Cor"
-
-  R1*4 c1\f R1*6
-}
-
-trombe =  \relative c' {
-  \set Staff.midiInstrument = #"trumpet"
-  \set Staff.instrumentName = #"Trombe"
-  \set Staff.shortInstrumentName = #"Tp."
-
-  \clef bass
-  R1*5 c1\f R1*5
-}
-
-timpani =  \relative c' {
-  \set Staff.midiInstrument = #"timpani"
-  \set Staff.instrumentName = #"Timpani"
-  \set Staff.shortInstrumentName = #"Timp."
-
-  R1*6 c1\f R1*4
-}
-
-violinoI =  \relative c' {
-  \set Staff.midiInstrument = #"violin"
-  \set Staff.instrumentName = #"Violino I "
-  \set Staff.shortInstrumentName = #"Vl. I "
-
-  R1*7 c1\f R1*3
-}
-
-violinoII =  \relative c' {
-  \set Staff.midiInstrument = #"violin"
-  \set Staff.instrumentName = #"Violino II "
-  \set Staff.shortInstrumentName = #"Vl. II "
- 
-  R1*8 c1\f R1*2
-}
-
-viola =  \relative c' {
-  \set Staff.midiInstrument = #"viola"
-  \set Staff.instrumentName = #"Viola"
-  \set Staff.shortInstrumentName = #"Vla."
-
-  \clef alto
-  R1*9 c1\f R1*1
-}
-
-violoncello =  \relative c' {
-  \set Staff.midiInstrument = #"cello"
-  %\set Staff.midiInstrument = #"contrabass"
-  \set Staff.instrumentName = #"Violoncello"
-  \set Staff.shortInstrumentName = #"Vc."
-  
-  \clef bass
-  R1*10 c1\f
-}
-
-
-\score {
-  << 
-    \new StaffGroup = "legni" << 
-      \new Staff = "flauti" \flauti
-      \new Staff = "oboi" \oboi
-      \new Staff = "clarinetti" \clarinetti 
-      \new Staff = "fagotti" \fagotti 
-    >>
-    \new StaffGroup = "ottoni" <<
-      \new Staff = "corni" \corni
-      \new Staff = "trombe" \trombe
-    >>
-    \new StaffGroup = "timpani" <<
-      \new Staff = "timpani" \timpani
-     { 
-       \skip 1 
-       % Hmm: this forces a staff-bracket, that's good!
-       % However, I can't find where is decided on staff-bracket yes/no
-     }
-    >>
-    \new StaffGroup = "archi" <<
-      \new GrandStaff = "violini" <<
-        \new Staff = "violino1" \violinoI
-        \new Staff = "violino2" \violinoII
-      >>
-      \new Staff = "viola" \viola
-      \new Staff = "violoncello" \violoncello
-    >>
-  >>
-
-  \layout {
-  	\layoutSixteen
-  	indent=100.0\mm
-  	line-width=150.0\mm
-    \context {
-      \RemoveEmptyStaffContext
-    }
-  }
-  
-  \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 60 1)
-      }
-    }
-
-
-}
-
-
diff --git a/input/regression/chord-names-languages.ly b/input/regression/chord-names-languages.ly
new file mode 100644
index 0000000000..f1ca5b4a49
--- /dev/null
+++ b/input/regression/chord-names-languages.ly
@@ -0,0 +1,47 @@
+\version "2.10.0"
+\header  {
+    texidoc = "@cindex Chord Names German
+The english naming of chords (default) can be changed to german 
+(@code{\germanChords} replaces B and Bes to H and B), semi-german 
+(@code{\semiGermanChords} replaces B and Bes to H and Bb), italian
+(@code{\italianChords} uses Do Re Mi Fa Sol La Si), or french
+(@code{\frenchChords} replaces Re to Ré).
+
+" }
+
+scm = \chordmode {
+    e1/d c:m
+    % c/c cis/cis
+    % yeah, we get the idea. -hwn
+    
+    % cisis/cisis ces/ces ceses/ceses
+    b/b bis/bis bes/bes
+    % beses/beses
+} 
+
+
+\layout {
+    ragged-right = ##t 
+    \context {\ChordNames \consists Instrument_name_engraver }
+}
+
+<<
+    \new ChordNames {
+	\set instrumentName = #"default"
+	\scm
+    }
+    \new ChordNames {
+	\set instrumentName = #"german"
+	\germanChords \scm }
+    \new ChordNames {
+	\set instrumentName = #"semi-german"
+	\semiGermanChords \scm }
+    \new ChordNames {
+	\set instrumentName = #"italian"
+	\italianChords \scm }
+    \new ChordNames {
+	\set instrumentName = #"french"
+	\frenchChords \scm }
+
+    \context Voice { \scm }
+>>
diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly
index 456bc1a629..cfad4a74bf 100644
--- a/input/regression/key-signature-scordatura.ly
+++ b/input/regression/key-signature-scordatura.ly
@@ -11,9 +11,9 @@ key signatures can be set invidually per pitch.
 }
 \relative c'
 \new Staff {
-    \set Staff.keySignature = #'(((1 .  2) . 1) ((0 . 3) . -1))
+    \set Staff.keySignature = #`(((1 .  2) . ,SHARP) ((0 . 3) . ,FLAT))
     f8 a c e
-    \set Staff.keySignature = #'(((1 .  2) . -1) ((0 . 4) . 2))
+    \set Staff.keySignature = #`(((1 .  2) . ,FLAT) ((0 . 4) . ,DOUBLE-SHARP))
     e a, g a
 }
 
diff --git a/input/regression/keys.ly b/input/regression/keys.ly
index 65ba2796e8..0a071d9bd6 100644
--- a/input/regression/keys.ly
+++ b/input/regression/keys.ly
@@ -25,7 +25,7 @@ are created also on a clef change.
     \break
     \key bes \major % \major
     c2 \clef alto c2   \key d \major \clef treble c2
-    \set Staff.keySignature = #'((2 . -1)  (6 . 3) (4 . -2))
+    \set Staff.keySignature = #`((2 . ,SEMI-FLAT)  (6 . ,THREE-Q-SHARP) (4 . ,FLAT))
     e2
 }
 
diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index d89f006030..64a1e8153d 100644
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -25,9 +25,10 @@ brackets above beats when the beats of a time signature are grouped.  "
 }
 \layout  {
   ragged-right = ##t
-  \context { \Staff
-	     \consists "Measure_grouping_engraver"
-	   }
+  \context {
+    \Staff
+    \consists "Measure_grouping_engraver"
+  }
 }
 
 
diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index a94f553d06..c7eb79955a 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -151,18 +151,18 @@ recent_enough (int bar_number, SCM alteration_def, SCM laziness)
   return (bar_number <= scm_to_int (scm_cdr (alteration_def)) + scm_to_int (laziness));
 }
 
-static int
+static Rational
 extract_alteration (SCM alteration_def)
 {
   if (scm_is_number (alteration_def))
-    return scm_to_int (alteration_def);
+    return ly_scm2rational (alteration_def);
   else if (scm_is_pair (alteration_def))
-    return scm_to_int (scm_car (alteration_def));
+    return ly_scm2rational (scm_car (alteration_def));
   else if (alteration_def == SCM_BOOL_F)
-    return 0;
+    return Rational (0);
   else
     assert (0);
-  return 0;
+  return Rational (0);
 }
 
 bool
@@ -215,13 +215,13 @@ number_accidentals_from_sig (bool *different, SCM sig, Pitch *pitch,
     }
   else
     {
-      int prev = extract_alteration (previous_alteration);
-      int alter = pitch->get_alteration ();
+      Rational prev = extract_alteration (previous_alteration);
+      Rational alter = pitch->get_alteration ();
 
       if (alter == prev)
 	num = 0;
-      else if ((abs (alter) < abs (prev)
-		|| prev * alter < 0) && alter != 0)
+      else if ((alter.abs () < prev.abs ()
+		|| (prev * alter).sign () < 0) && alter.sign ())
 	num = 2;
       *different = (alter != prev);
     }
@@ -376,7 +376,7 @@ Accidental_engraver::create_accidental (Accidental_entry *entry,
   else
     a = make_standard_accidental (note, support, entry->origin_engraver_);
 
-  SCM accs = scm_cons (scm_from_int (pitch->get_alteration ()),
+  SCM accs = scm_cons (scm_from_int (pitch->get_alteration () * Rational (4)),
 		       SCM_EOL);
   if (restore_natural)
     {
@@ -489,7 +489,7 @@ Accidental_engraver::stop_translation_timestep ()
 
       int n = pitch->get_notename ();
       int o = pitch->get_octave ();
-      int a = pitch->get_alteration ();
+      Rational a = pitch->get_alteration ();
       SCM key = scm_cons (scm_from_int (o), scm_from_int (n));
 
       SCM localsig = SCM_EOL;
@@ -515,7 +515,7 @@ Accidental_engraver::stop_translation_timestep ()
 		noteheads with the same notename.
 	      */
 	      localsig = ly_assoc_front_x (localsig, key,
-					   scm_cons (scm_from_int (a),
+					   scm_cons (ly_rational2scm (a),
 						     scm_from_int (barnum)));
 	      change = true;
 	    }
diff --git a/lily/accidental.cc b/lily/accidental.cc
index 060c97849d..6b9718f61c 100644
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -251,9 +251,6 @@ Accidental_interface::print (SCM smob)
   return mol.smobbed_copy ();
 }
 
-/*
-  TODO: should move avoid-slur into item?
-*/
 ADD_INTERFACE (Accidental_interface,
 	       "a single accidental",
 	       "accidentals "
diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 58cd7098cc..07c9ebe3c9 100644
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -60,7 +60,7 @@ Align_interface::stretch_after_break (SCM grob)
       for (vsize i = 0; i < elems.size (); i++)
 	elems[i]->relative_coordinate (common, Y_AXIS);
 
-      SCM details =  me_spanner->get_bound (LEFT)->get_property ("line-break-system-details");
+      SCM details = me_spanner->get_bound (LEFT)->get_property ("line-break-system-details");
       SCM extra_space_handle = scm_assoc (ly_symbol2scm ("fixed-alignment-extra-space"), details);
       
       Real extra_space = robust_scm2double (scm_is_pair (extra_space_handle)
@@ -326,7 +326,7 @@ Align_interface::get_pure_child_y_translation (Grob *me, Grob *ch, int start, in
 	return 0;
     }
 
-  programming_error (_ ("tried to get a translation for something that isn't my child"));
+  programming_error (_ ("tried to get a translation for something that is no child of mine"));
   return 0;
 }
 
diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index bf2aadd4bb..61b0a60e6f 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -170,7 +170,7 @@ All_font_metrics::find_font (string name)
 
   if (!f)
     {
-      error (_f ("can't find font: `%s'", name.c_str ()));
+      error (_f ("cannot find font: `%s'", name.c_str ()));
     }
 
   return f;
diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 5946b91c6d..8f617652bf 100644
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -148,8 +148,8 @@ Ambitus_engraver::finalize ()
 	    handle = scm_assoc (scm_from_int (p.get_notename ()),
 				start_key_sig_);
 
-	  int sig_alter = (handle != SCM_BOOL_F)
-	    ? scm_to_int (scm_cdr (handle)) : 0;
+	  Rational sig_alter = (handle != SCM_BOOL_F)
+	    ? ly_scm2rational (scm_cdr (handle)) : Rational (0);
 
 	  if (sig_alter == p.get_alteration ())
 	    {
@@ -158,7 +158,7 @@ Ambitus_engraver::finalize ()
 	    }
 	  else
 	    {
-	      SCM l = scm_list_1 (scm_from_int (p.get_alteration ()));
+	      SCM l = scm_list_1 (scm_from_int (int (Real (Rational (4) * p.get_alteration ()))));
 	      accidentals_[d]->set_property ("accidentals", l);
 	    }
 	}
diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index fe8c5539e1..4a3b9d4a41 100644
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -21,12 +21,12 @@ Audio_item::Audio_item ()
   audio_column_ = 0;
 }
 
-Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, int transposing_i)
+Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing)
 {
   pitch_ = p;
   length_mom_ = m;
   tied_ = 0;
-  transposing_ = transposing_i;
+  transposing_ = transposing;
   tie_event_ = tie_event;
 }
 
@@ -52,9 +52,9 @@ Audio_dynamic::Audio_dynamic (Real volume)
   volume_ = volume;
 }
 
-Audio_tempo::Audio_tempo (int per_minute_4_i)
+Audio_tempo::Audio_tempo (int per_minute_4)
 {
-  per_minute_4_ = per_minute_4_i;
+  per_minute_4_ = per_minute_4;
 }
 
 Audio_time_signature::Audio_time_signature (int beats, int one_beat)
diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index a935bfc05a..04ed126556 100644
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -60,7 +60,7 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
   if (current && current->id_string () == to_id)
     {
       string msg;
-      msg += _f ("can't change, already in translator: %s", to_id);
+      msg += _f ("cannot change, already in translator: %s", to_id);
     }
 
   if (current)
diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index cad443299c..53d1234547 100644
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -243,7 +243,7 @@ Beam_engraver::acknowledge_stem (Grob_info info)
   int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log ();
   if (durlog <= 2)
     {
-      ev->origin ()->warning (_ ("stem doesn't fit in beam"));
+      ev->origin ()->warning (_ ("stem does not fit in beam"));
       prev_start_ev_->origin ()->warning (_ ("beam was started here"));
       /*
 	don't return, since
diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index a0a1528597..e150a51594 100644
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -297,7 +297,7 @@ Beam::quanting (SCM smob, SCM posns)
 	    }
 	}
       if (mindist > 1e5)
-	programming_error ("can't find quant");
+	programming_error ("cannot find quant");
     }
 #endif
 
diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc
index 8966657e48..092c6b673d 100644
--- a/lily/beaming-pattern.cc
+++ b/lily/beaming-pattern.cc
@@ -30,8 +30,7 @@ Beam_rhythmic_element::de_grace ()
 {
   if (start_moment_.grace_part_)
     {
-      start_moment_.main_part_ = 
-	start_moment_.grace_part_; 
+      start_moment_.main_part_ = start_moment_.grace_part_; 
       start_moment_.grace_part_ = 0;
     }
 }
diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 55099a855e..8b8f191006 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -20,7 +20,7 @@ Change_iterator::error (string reason)
   string to_type = ly_symbol2string (get_music ()->get_property ("change-to-type"));
   string to_id = ly_scm2string (get_music ()->get_property ("change-to-id"));
 
-  string warn1 = _f ("can't change `%s' to `%s'", to_type, to_id)
+  string warn1 = _f ("cannot change `%s' to `%s'", to_type, to_id)
     + ": " + reason;
 
   /*
@@ -58,7 +58,7 @@ Change_iterator::process (Moment m)
   if (current && current->id_string () == to_id)
     {
       string msg;
-      msg += _f ("can't change, already in translator: %s", to_id);
+      msg += _f ("cannot change, already in translator: %s", to_id);
     }
 
   if (current)
@@ -79,7 +79,7 @@ Change_iterator::process (Moment m)
 	  }
 	else
 	  /* FIXME: constant error message.  */
-	  get_music ()->origin ()->warning (_ ("can't find context to switch to"));
+	  get_music ()->origin ()->warning (_ ("cannot find context to switch to"));
       }
     else
       {
diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc
index 52ed127306..cbc22cfc05 100644
--- a/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@ -173,7 +173,7 @@ Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count)
             {
               if (brk != end_brk)
                 {
-                  warning (_ ("couldn't find line breaking that satisfies constraints" ));
+                  warning (_ ("cannot find line breaking that satisfies constraints" ));
                   ret.push_back (space_line (brk, end_brk));
                 }
               /* build up the good solution */
@@ -190,7 +190,7 @@ Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count)
         }
     }
   /* if we get to here, just put everything on one line */
-  warning (_ ("couldn't find line breaking that satisfies constraints" ));
+  warning (_ ("cannot find line breaking that satisfies constraints" ));
   ret.push_back (space_line (0, end_brk));
   return ret;
 }
diff --git a/lily/context.cc b/lily/context.cc
index d4177e77bf..45a1562b1f 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -148,7 +148,7 @@ Context::create_unique_context (SCM name, string id, SCM operations)
     ret = daddy_context_->create_unique_context (name, id, operations);
   else
     {
-      warning (_f ("can't find or create new `%s'",
+      warning (_f ("cannot find or create new `%s'",
 		   ly_symbol2string (name).c_str ()));
       ret = 0;
     }
@@ -210,7 +210,7 @@ Context::find_create_context (SCM n, string id, SCM operations)
     ret = daddy_context_->find_create_context (n, id, operations);
   else
     {
-      warning (_f ("can't find or create `%s' called `%s'",
+      warning (_f ("cannot find or create `%s' called `%s'",
 		   ly_symbol2string (n).c_str (), id));
       ret = 0;
     }
@@ -385,7 +385,7 @@ Context::get_default_interpreter ()
       Context_def *t = unsmob_context_def (st);
       if (!t)
 	{
-	  warning (_f ("can't find or create: `%s'", name.c_str ()));
+	  warning (_f ("cannot find or create: `%s'", name.c_str ()));
 	  t = unsmob_context_def (this->definition_);
 	}
 
diff --git a/lily/dispatcher-scheme.cc b/lily/dispatcher-scheme.cc
index 2a2720656c..8500cf9811 100644
--- a/lily/dispatcher-scheme.cc
+++ b/lily/dispatcher-scheme.cc
@@ -38,10 +38,11 @@ LY_DEFINE (ly_add_listener, "ly:add-listener",
   SCM_ASSERT_TYPE (l, list, SCM_ARG1, __FUNCTION__, "listener");
   SCM_ASSERT_TYPE (d, disp, SCM_ARG2, __FUNCTION__, "dispatcher");
   
-  for (int arg=SCM_ARG3; scm_is_pair (cl); cl = scm_cdr (cl), arg++)
+  for (int arg = SCM_ARG3; scm_is_pair (cl); cl = scm_cdr (cl), arg++)
     {
-      SCM_ASSERT_TYPE (scm_symbol_p (cl), cl, arg, __FUNCTION__, "symbol");
-      d->add_listener (*l, scm_car (cl));
+      SCM sym = scm_car (cl);
+      SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, arg, __FUNCTION__, "symbol");
+      d->add_listener (*l, sym);
     }
 
   return SCM_UNDEFINED;
diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index 7aa463b576..49a8d27001 100644
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -65,7 +65,7 @@ Drum_note_performer::process_music ()
             }
 
 	  Audio_note *p = new Audio_note (*pit, get_event_length (n), 
-                                          tie_event, 0);
+                                          tie_event, Pitch (0, 0, 0));
 	  Audio_element_info info (p, n);
 	  announce_element (info);
 	  notes_.push_back (p);
diff --git a/lily/duration-scheme.cc b/lily/duration-scheme.cc
index fb4bb10263..361036256d 100644
--- a/lily/duration-scheme.cc
+++ b/lily/duration-scheme.cc
@@ -53,13 +53,13 @@ LY_DEFINE (ly_make_duration, "ly:make-duration",
 	   "(whole, half, quarter, etc.) and a number of augmentation\n"
 	   "dots. \n")
 {
-  SCM_ASSERT_TYPE (scm_integer_p (length) == SCM_BOOL_T,
+  SCM_ASSERT_TYPE (scm_is_integer (length),
 		   length, SCM_ARG1, __FUNCTION__, "integer");
 
   int dots = 0;
   if (dotcount != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (scm_integer_p (dotcount) == SCM_BOOL_T,
+      SCM_ASSERT_TYPE (scm_is_integer (dotcount),
 		       dotcount, SCM_ARG2, __FUNCTION__, "integer");
       dots = scm_to_int (dotcount);
     }
diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 8f64db1136..6882939d88 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -183,7 +183,7 @@ Dynamic_engraver::process_music ()
 	}
       else if (accepted_spanevents_drul_[STOP])
 	{
-	  accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
+	  accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
 	  stop_ev = 0;
 	}
     }
diff --git a/lily/freetype.cc b/lily/freetype.cc
index 4ee2acb60f..1988ed556e 100644
--- a/lily/freetype.cc
+++ b/lily/freetype.cc
@@ -16,6 +16,6 @@ init_freetype ()
 {
   int errorcode = FT_Init_FreeType (&freetype2_library);
   if (errorcode)
-    error ("can't initialize FreeType");
+    error ("cannot initialize FreeType");
 }
 
diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 59fc0bafb7..1cb51a10ff 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -296,7 +296,7 @@ LY_DEFINE (ly_stderr_redirect, "ly:stderr-redirect",
 	   1, 1, 0, (SCM file_name, SCM mode),
 	   "Redirect stderr to FILE-NAME, opened with MODE.")
 {
-  SCM_ASSERT_TYPE (scm_string_p (file_name), file_name, SCM_ARG1,
+  SCM_ASSERT_TYPE (scm_is_string (file_name), file_name, SCM_ARG1,
 		   __FUNCTION__, "file_name");
   char const *m = "w";
   if (mode != SCM_UNDEFINED && scm_string_p (mode))
diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index b23b168d69..bb410981a3 100644
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -81,7 +81,7 @@ Grace_engraver::consider_change_grace_settings ()
 	    }
 	  else
 	    {
-	      programming_error ("can't find context");
+	      programming_error ("cannot find context: ");
 	      scm_display (context_name, scm_current_error_port ());
 	    }
 	}
diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 9a7efcb4a5..73ba7e1fed 100644
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -209,7 +209,7 @@ provide_context_info (vector<Grob_info> primitives)
 
       if (prefix_set & PES_OR_FLEXA)
 	if (!i) // ligature may not start with 2nd head of pes or flexa
-	  primitive->warning (_ ("can't apply `\\~' on first head of ligature"));
+	  primitive->warning (_ ("cannot apply `\\~' on first head of ligature"));
 	else if (pitch > prev_pitch) // pes
 	  {
 	    prev_context_info |= PES_LOWER;
@@ -221,7 +221,7 @@ provide_context_info (vector<Grob_info> primitives)
 	    context_info |= FLEXA_RIGHT;
 	  }
 	else // (pitch == prev_pitch)
-	  primitive->warning (_ ("can't apply `\\~' on heads with identical pitch"));
+	  primitive->warning (_ ("cannot apply `\\~' on heads with identical pitch"));
       if (prev_prefix_set & DEMINUTUM)
 	context_info |= AFTER_DEMINUTUM;
 
diff --git a/lily/guile-init.cc b/lily/guile-init.cc
new file mode 100644
index 0000000000..77fd7c59f3
--- /dev/null
+++ b/lily/guile-init.cc
@@ -0,0 +1,54 @@
+/* 
+  guile-init.cc -- implement GUILE init routines.
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
+  
+*/
+
+#include  "lily-guile.hh"
+#include  "main.hh"
+#include  "warn.hh"
+
+/*
+  INIT
+*/
+
+
+typedef void (*Void_fptr) ();
+vector<Void_fptr> *scm_init_funcs_;
+
+void add_scm_init_func (void (*f) ())
+{
+  if (!scm_init_funcs_)
+    scm_init_funcs_ = new vector<Void_fptr>;
+
+  scm_init_funcs_->push_back (f);
+}
+
+void
+ly_init_ly_module (void *)
+{
+  for (vsize i = scm_init_funcs_->size (); i--;)
+    (scm_init_funcs_->at (i)) ();
+
+  if (be_verbose_global)
+    {
+      progress_indication ("[");
+      scm_display (scm_c_eval_string ("(%search-load-path \"lily.scm\")"),
+		   scm_current_error_port ());
+      progress_indication ("]\n");
+    }
+
+  scm_primitive_load_path (scm_makfrom0str ("lily.scm"));
+}
+
+SCM global_lily_module;
+
+void
+ly_c_init_guile ()
+{
+  global_lily_module = scm_c_define_module ("lily", ly_init_ly_module, 0);
+  scm_c_use_module ("lily");
+}
diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index 57c368154a..d129350af5 100644
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -56,7 +56,7 @@ Horizontal_bracket_engraver::listen_note_grouping (Stream_event *ev)
     {
       pop_count_++;
       if (pop_count_ > bracket_stack_.size ())
-	ev->origin ()->warning (_ ("don't have that many brackets"));
+	ev->origin ()->warning (_ ("do not have that many brackets"));
     }
   else
     {
diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index cb851575ba..65bea4d00b 100644
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -57,7 +57,7 @@ Includable_lexer::new_input (string name, Sources *sources)
   Source_file *file = sources->get_file (&name);
   if (!file)
     {
-      string msg = _f ("can't find file: `%s'", name);
+      string msg = _f ("cannot find file: `%s'", name);
       msg += "\n";
       msg += _f ("(search path: `%s')",
 		 sources->path_->to_string ().c_str ());
diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index 11f3cd31f5..e6f0c9ad91 100644
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -55,13 +55,14 @@ public:
 class Audio_note : public Audio_item
 {
 public:
-  Audio_note (Pitch p, Moment m, bool tie_event, int transposing_i);
+  Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposition);
 
   void tie_to (Audio_note *);
 
   Pitch pitch_;
   Moment length_mom_;
-  int transposing_;
+  Pitch transposing_;
+  
   Audio_note *tied_;
   bool tie_event_;
 };
diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 621849edc6..6aa25f828a 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -45,6 +45,8 @@ string gulp_file_to_string (string fn, bool must_exist, int size);
 
 string ly_scm2string (SCM s);
 string ly_symbol2string (SCM);
+Rational ly_scm2rational (SCM);
+SCM ly_rational2scm (Rational);
 SCM ly_offset2scm (Offset);
 Offset ly_scm2offset (SCM);
 SCM ly_chain_assoc (SCM key, SCM achain);
@@ -169,6 +171,10 @@ typedef SCM (*Scheme_function_2) (GUILE_ELLIPSIS);
 typedef SCM (*Scheme_function_3) (GUILE_ELLIPSIS);
 #endif
 
+
+/*
+  Inline these for performance reasons.
+ */
 #define scm_cdr ly_cdr
 #define scm_car ly_car
 
diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index c3082aaddd..d0b7c65b64 100644
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -135,6 +135,7 @@ class Property_iterator;
 class Rational;
 class Relative_octave_music;
 class Repeated_music;
+class Scale;
 class Scheme_hash_table;
 class Score;
 class Score_context;
diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 6ec530f68c..a7e7ceb512 100644
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -135,7 +135,7 @@ public:
   DECLARE_CLASSNAME(Midi_note);
 
   Moment get_length () const;
-  int get_pitch () const;
+  int get_semitone_pitch () const;
   int get_fine_tuning () const;
   virtual string to_string () const;
 
diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index f50d2d531c..65883d6345 100644
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -11,16 +11,7 @@
 
 #include "lily-proto.hh"
 #include "smobs.hh"
-
-#include "std-vector.hh"
-
-struct Scale
-{
-  vector<int> step_semitones_;
-  Scale ();
-  Scale (Scale const&);
-  DECLARE_SMOBS (Scale);
-};
+#include "rational.hh"
 
 
 /** A "tonal" pitch. This is a pitch used in diatonal western music
@@ -30,35 +21,27 @@ struct Scale
     Pitch is lexicographically ordered by (octave, notename,
     alteration).
 
-
-    TODO:
-
-    - add indeterminate octaves, so it can be used as a key in keySigature
 */
 class Pitch
 {
-private:				// fixme
-  /*
-    TODO: use SCM
-  */
-
-  int notename_;
-  int alteration_;
+private:
   int octave_;
+  int notename_;
+  Rational alteration_;
   Scale *scale_;
-  
+
   void transpose (Pitch);
   void up_to (int);
   void down_to (int);
-  void normalise ();
+  void normalize ();
 
 public:
-
   int get_octave () const;
   int get_notename () const;
-  int get_alteration () const;
+  Rational get_alteration () const;
 
-  Pitch (int octave, int notename, int accidental);
+  Pitch (int octave, int notename, Rational accidental);
+  Pitch (int octave, int notename);
   Pitch ();
 
   Pitch transposed (Pitch) const;
@@ -67,26 +50,38 @@ public:
   static int compare (Pitch const &, Pitch const &);
 
   int steps () const;
-  int semitone_pitch () const;
-  int quartertone_pitch () const;
+  Rational tone_pitch () const;
+  int rounded_semitone_pitch () const;
+  int rounded_quartertone_pitch () const;
+  Pitch negated () const;
   string to_string () const;
 
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
   DECLARE_SIMPLE_SMOBS (Pitch);
 };
 
-enum
-  {
-    DOUBLE_FLAT = -4,
-    THREE_Q_FLAT,
-    FLAT,
-    SEMI_FLAT,
-    NATURAL,
-    SEMI_SHARP,
-    SHARP,
-    THREE_Q_SHARP,
-    DOUBLE_SHARP,
-  };
+
+enum {
+  DOUBLE_FLAT = -4,
+  THREE_Q_FLAT,
+  FLAT,
+  SEMI_FLAT,
+  NATURAL,
+  SEMI_SHARP,
+  SHARP,
+  THREE_Q_SHARP,
+  DOUBLE_SHARP,
+};
+
+extern Rational  DOUBLE_FLAT_ALTERATION;
+extern Rational  THREE_Q_FLAT_ALTERATION;
+extern Rational  FLAT_ALTERATION;
+extern Rational  SEMI_FLAT_ALTERATION;
+extern Rational  NATURAL_ALTERATION;
+extern Rational  SEMI_SHARP_ALTERATION;
+extern Rational  SHARP_ALTERATION;
+extern Rational  THREE_Q_SHARP_ALTERATION;
+extern Rational  DOUBLE_SHARP_ALTERATION;
 
 SCM ly_pitch_diff (SCM pitch, SCM root);
 SCM ly_pitch_transpose (SCM p, SCM delta);
@@ -96,7 +91,6 @@ INSTANTIATE_COMPARE (Pitch, Pitch::compare);
 
 extern SCM pitch_less_proc;
 Pitch pitch_interval (Pitch const &from, Pitch const &to);
-extern Scale *default_global_scale;
 
 #endif /* MUSICAL_PITCH_HH */
 
diff --git a/lily/include/scale.hh b/lily/include/scale.hh
new file mode 100644
index 0000000000..58bec89eb5
--- /dev/null
+++ b/lily/include/scale.hh
@@ -0,0 +1,29 @@
+/* 
+  scale.hh -- declare Scale
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
+  
+*/
+
+#ifndef SCALE_HH
+#define SCALE_HH
+
+#include "smobs.hh"
+#include "rational.hh"
+#include "std-vector.hh"
+
+struct Scale
+{
+  vector<Rational> step_tones_;
+  Scale ();
+  Scale (Scale const&);
+  DECLARE_SMOBS (Scale);
+};
+
+extern Scale *default_global_scale;
+
+#endif /* SCALE_HH */
+
+
diff --git a/lily/include/score.hh b/lily/include/score.hh
index 71b2037efb..bcd967cda1 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -43,7 +43,6 @@ public:
 
 DECLARE_UNSMOB (Score, score);
 
-void default_rendering (SCM, SCM, SCM, SCM, SCM, SCM);
 SCM ly_render_output (SCM, SCM);
 SCM ly_run_translator (SCM, SCM, SCM);
 
diff --git a/lily/include/stream-event.hh b/lily/include/stream-event.hh
index 4e1688f6f4..9f226f48db 100644
--- a/lily/include/stream-event.hh
+++ b/lily/include/stream-event.hh
@@ -18,15 +18,16 @@ class Stream_event : public Prob
 public:
   Stream_event ();
   VIRTUAL_COPY_CONSTRUCTOR (Stream_event, Stream_event);
-  // todo: remove unneeded constructors
+
   Stream_event (SCM event_class, SCM mutable_props=SCM_EOL);
   Stream_event (SCM class_name, Input *);
-  Stream_event (Stream_event *ev);
 
   Input *origin () const;
   void set_spot (Input *i);
   bool internal_in_event_class (SCM class_name);
 
+  virtual SCM copy_mutable_properties () const;
+
   DECLARE_SCHEME_CALLBACK (undump, (SCM));
   DECLARE_SCHEME_CALLBACK (dump, (SCM));
 
@@ -36,5 +37,6 @@ public:
 
 Stream_event *unsmob_stream_event (SCM);
 DECLARE_TYPE_P (Stream_event);
+SCM ly_event_deep_copy (SCM);
 
 #endif /* STREAM_EVENT_HH */
diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index a256b8beb1..a900154032 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -98,7 +98,7 @@ Instrument_name_engraver::start_spanner ()
   if (system)
     Axis_group_interface::add_element (system, text_spanner_);
   else
-    text_spanner_->programming_error ("can't find root system");
+    text_spanner_->programming_error ("cannot find root system");
 }
 
 
diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 41cb7aed50..8bd0d1305f 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -18,13 +18,6 @@
 
 #include "translator.icc"
 
-/*
-  TODO: The representation  of key sigs is all fucked.
-*/
-
-/**
-   Make the key signature.
-*/
 class Key_engraver : public Engraver
 {
   void create_key (bool);
@@ -59,6 +52,24 @@ Key_engraver::Key_engraver ()
   cancellation_ = 0;
 }
 
+
+SCM
+make_qt_key (SCM rat_key)
+{
+  SCM qt_key = SCM_EOL;
+  SCM *tail = &qt_key;
+      
+  for (SCM s = rat_key; scm_is_pair (s); s = scm_cdr (s))
+    {
+      *tail = scm_cons (scm_cons (scm_caar (s),
+				  scm_from_int (Rational (4)* ly_scm2rational (scm_cdar (s)))),
+			SCM_EOL);
+      tail =  SCM_CDRLOC (*tail);
+    }
+
+  return qt_key;
+}
+
 void
 Key_engraver::create_key (bool is_default)
 {
@@ -83,10 +94,10 @@ Key_engraver::create_key (bool is_default)
 	  for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
 	    {
 	      SCM new_alter_pair = scm_assoc (scm_caar (s), key);
-	      int old_alter = scm_to_int (scm_cdar (s));
+	      Rational old_alter = ly_scm2rational (scm_cdar (s));
 	      if (new_alter_pair == SCM_BOOL_F
 		  || extranatural
-		     && (scm_to_int(scm_cdr(new_alter_pair))-old_alter)*old_alter < 0)
+		  && (ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter)*old_alter < Rational (0))
 		{
 		  *tail = scm_cons (scm_car (s), *tail);
 		  tail = SCM_CDRLOC (*tail);
@@ -99,12 +110,14 @@ Key_engraver::create_key (bool is_default)
 					 key_event_
 					 ? key_event_->self_scm () : SCM_EOL);
 	      
-	      cancellation_->set_property ("alteration-alist", restore);
+	      cancellation_->set_property ("alteration-alist", make_qt_key (restore));
 	      cancellation_->set_property ("c0-position",
 					   get_property ("middleCPosition"));
 	    }
 	}
-      item_->set_property ("alteration-alist", key);
+
+
+      item_->set_property ("alteration-alist", make_qt_key (key));
     }
 
   if (!is_default)
@@ -166,22 +179,36 @@ Key_engraver::read_event (Stream_event const *r)
   if (!scm_is_pair (p))
     return;
 
-  SCM n = scm_list_copy (p);
   SCM accs = SCM_EOL;
-  for (SCM s = get_property ("keyAlterationOrder");
-       scm_is_pair (s); s = scm_cdr (s))
+
+  SCM alist = scm_list_copy (p);
+  SCM order = get_property ("keyAlterationOrder");
+  for (SCM s = order;
+       scm_is_pair (s) && scm_is_pair (alist); s = scm_cdr (s))
     {
-      if (scm_is_pair (scm_member (scm_car (s), n)))
+      SCM head = scm_member (scm_car (s), alist);
+      
+      if (scm_is_pair (head))
 	{
-	  accs = scm_cons (scm_car (s), accs);
-	  n = scm_delete_x (scm_car (s), n);
+	  accs = scm_cons (scm_car (head), accs);
+	  alist = scm_delete_x (scm_car (head), alist);
 	}
     }
 
-  for (SCM s = n; scm_is_pair (s); s = scm_cdr (s))
-    if (scm_to_int (scm_cdar (s)))
-      accs = scm_cons (scm_car (s), accs);
-
+  if (scm_is_pair (alist))
+    {
+      bool warn = false;
+      for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
+	if (ly_scm2rational (scm_cdar (s)))
+	  {
+	    warn = true;
+	    accs = scm_cons (scm_car (s), accs);
+	  }
+
+      if (warn)
+	r->origin ()->warning ("No ordering for key signature alterations");      
+    }
+  
   context ()->set_property ("keySignature", accs);
   context ()->set_property ("tonic",
 			    r->get_property ("tonic"));
diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 61e3592630..762e8c4808 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -52,7 +52,7 @@ Key_performer::process_music ()
 
       Pitch key_do (0,
 		    scm_to_int (scm_caar (pitchlist)),
-		    scm_to_int (scm_cdar (pitchlist)));
+		    ly_scm2rational (scm_cdar (pitchlist)));
 
       Pitch c_do (0, 0, 0);
 
@@ -66,8 +66,8 @@ Key_performer::process_music ()
       SCM third = scm_assoc (scm_from_int (2),
 			     c_pitchlist);
       bool minor = (scm_is_pair (third)
-		    && scm_is_integer (scm_cdr (third))
-		    && scm_to_int (scm_cdr (third)) == FLAT);
+		    && scm_is_number (scm_cdr (third))
+		    && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION);
 
       audio_ = new Audio_key (scm_to_int (acc),
 			      !minor);
@@ -96,5 +96,7 @@ Key_performer::listen_key_change (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Key_performer,
-		"", "",
-		"", "");
+		"",
+		"",
+		"",
+		"");
diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 8b45adb2c8..d6513efd84 100644
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -160,4 +160,8 @@ Key_signature_interface::print (SCM smob)
 
 ADD_INTERFACE (Key_signature_interface,
 	       "A group of accidentals, to be printed as signature sign.",
-	       "style c0-position alteration-alist");
+
+	       "c0-position "
+	       "style "
+	       "alteration-alist "
+	       );
diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index ab7dfebadb..c4565f8e53 100644
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -90,7 +90,7 @@ Ligature_engraver::process_music ()
     {
       if (!ligature_)
 	{
-	  events_drul_[STOP]->origin ()->warning (_ ("can't find start of ligature"));
+	  events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature"));
 	  return;
 	}
 
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index d57a9f5730..dd5080b367 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -30,8 +30,10 @@ using namespace std;
 #include "version.hh"
 #include "warn.hh"
 
-// #define TEST_GC
 
+/*
+  symbols/strings.
+ */
 SCM
 ly_to_symbol (SCM scm)
 {
@@ -46,12 +48,6 @@ ly_to_string (SCM scm)
 		     scm_makfrom0str ("~S"), scm);
 }
 
-SCM
-ly_last (SCM list)
-{
-  return scm_car (scm_last_pair (list));
-}
-
 SCM
 ly_write2scm (SCM s)
 {
@@ -91,7 +87,7 @@ gulp_file_to_string (string fn, bool must_exist, int size)
     {
       if (must_exist)
 	{
-	  string e = _f ("can't find file: `%s'", fn);
+	  string e = _f ("cannot find file: `%s'", fn);
 	  e += " ";
 	  e += _f ("(load path: `%s')", global_path.to_string ());
 	  error (e);
@@ -122,6 +118,9 @@ extern "C" {
   }
 };
 
+/*
+  STRINGS
+ */
 string
 ly_scm2string (SCM str)
 {
@@ -149,6 +148,10 @@ ly_scm2newstr (SCM str, size_t *lenp)
   return 0;
 }
 
+
+/*
+  PAIRS
+*/
 SCM
 index_get_cell (SCM s, Direction d)
 {
@@ -174,77 +177,62 @@ is_number_pair (SCM p)
     && scm_is_number (scm_car (p)) && scm_is_number (scm_cdr (p));
 }
 
-typedef void (*Void_fptr) ();
-vector<Void_fptr> *scm_init_funcs_;
 
-void add_scm_init_func (void (*f) ())
+unsigned int
+ly_scm_hash (SCM s)
 {
-  if (!scm_init_funcs_)
-    scm_init_funcs_ = new vector<Void_fptr>;
-
-  scm_init_funcs_->push_back (f);
+  return scm_ihashv (s, ~1u);
 }
 
-void
-ly_init_ly_module (void *)
-{
-  for (vsize i = scm_init_funcs_->size (); i--;)
-    (scm_init_funcs_->at (i)) ();
 
-  if (be_verbose_global)
+bool
+is_axis (SCM s)
+{
+  if (scm_is_number (s))
     {
-      progress_indication ("[");
-      scm_display (scm_c_eval_string ("(%search-load-path \"lily.scm\")"),
-		   scm_current_error_port ());
-      progress_indication ("]\n");
+      int i = scm_to_int (s);
+      return i == 0 || i == 1;
     }
-
-  scm_primitive_load_path (scm_makfrom0str ("lily.scm"));
+  return false;
 }
 
-SCM global_lily_module;
-
-void
-ly_c_init_guile ()
+bool
+to_boolean (SCM s)
 {
-  global_lily_module = scm_c_define_module ("lily", ly_init_ly_module, 0);
-  scm_c_use_module ("lily");
+  return scm_is_bool (s) && ly_scm2bool (s);
 }
 
-unsigned int
-ly_scm_hash (SCM s)
+/*
+  DIRECTIONS
+ */
+Direction
+to_dir (SCM s)
 {
-  return scm_ihashv (s, ~1u);
+  return scm_is_integer (s) ? (Direction) scm_to_int (s) : CENTER;
 }
 
-bool
-is_direction (SCM s)
+Direction
+robust_scm2dir (SCM d, Direction def)
 {
-  if (scm_is_number (s))
-    {
-      int i = scm_to_int (s);
-      return i >= -1 && i <= 1;
-    }
-  return false;
+  if (is_direction (d))
+    def = to_dir (d);
+  return def;
 }
 
 bool
-is_axis (SCM s)
+is_direction (SCM s)
 {
   if (scm_is_number (s))
     {
       int i = scm_to_int (s);
-      return i == 0 || i == 1;
+      return i >= -1 && i <= 1;
     }
   return false;
 }
 
-Direction
-to_dir (SCM s)
-{
-  return scm_is_integer (s) ? (Direction) scm_to_int (s) : CENTER;
-}
-
+/*
+  INTERVALS
+ */
 Interval
 ly_scm2interval (SCM p)
 {
@@ -264,32 +252,40 @@ ly_interval2scm (Drul_array<Real> i)
   return scm_cons (scm_from_double (i[LEFT]), scm_from_double (i[RIGHT]));
 }
 
-bool
-to_boolean (SCM s)
+
+Interval
+robust_scm2interval (SCM k, Drul_array<Real> v)
 {
-  return scm_is_bool (s) && ly_scm2bool (s);
+  Interval i;
+  i[LEFT] = v[LEFT];
+  i[RIGHT] = v[RIGHT];
+  if (is_number_pair (k))
+    i = ly_scm2interval (k);
+  return i;
 }
 
-/* Appendable list L: the cdr contains the list, the car the last cons
-   in the list.  */
-SCM
-appendable_list ()
+Drul_array<Real>
+robust_scm2drul (SCM k, Drul_array<Real> v)
 {
-  SCM s = scm_cons (SCM_EOL, SCM_EOL);
-  scm_set_car_x (s, s);
-
-  return s;
+  if (is_number_pair (k))
+    v = ly_scm2interval (k);
+  return v;
 }
 
-void
-appendable_list_append (SCM l, SCM elt)
+Drul_array<bool>
+robust_scm2booldrul (SCM k, Drul_array<bool> def)
 {
-  SCM newcons = scm_cons (elt, SCM_EOL);
-
-  scm_set_cdr_x (scm_car (l), newcons);
-  scm_set_car_x (l, newcons);
+  if (scm_is_pair (k))
+    {
+      def[LEFT] = to_boolean (scm_car (k));
+      def[RIGHT] = to_boolean (scm_cdr (k));
+    }
+  return def;
 }
 
+/*
+  OFFSET
+*/
 SCM
 ly_offset2scm (Offset o)
 {
@@ -303,6 +299,13 @@ ly_scm2offset (SCM s)
 		 scm_to_double (scm_cdr (s)));
 }
 
+Offset
+robust_scm2offset (SCM k, Offset o)
+{
+  if (is_number_pair (k))
+    o = ly_scm2offset (k);
+  return o;
+}
 SCM
 ly_offsets2scm (vector<Offset> os)
 {
@@ -325,23 +328,12 @@ ly_scm2offsets (SCM s)
   return os;
 }
 
-SCM
-ly_deep_copy (SCM src)
-{
-  if (scm_is_pair (src))
-    return scm_cons (ly_deep_copy (scm_car (src)), ly_deep_copy (scm_cdr (src)));
-  else if (scm_is_vector (src))
-    {
-      int len = scm_c_vector_length (src);
-      SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);
-      for (int i = 0;i < len; i++)
-	{
-	  SCM si = scm_from_int (i);
-	  scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si)));
-	}
-    }
-  return src;
-}
+
+
+
+/*
+  ALIST
+*/
 
 /* looks the key up in the cdrs of the alist-keys
    - ignoring the car and ignoring non-pair keys.
@@ -373,27 +365,70 @@ ly_assoc_cdr (SCM key, SCM alist)
   return SCM_BOOL_F;
 }
 
+
+bool
+alist_equal_p (SCM a, SCM b)
+{
+  for (SCM s = a;
+       scm_is_pair (s); s = scm_cdr (s))
+    {
+      SCM key = scm_caar (s);
+      SCM val = scm_cdar (s);
+      SCM l = scm_assoc (key, b);
+
+      if (l == SCM_BOOL_F
+	  || !ly_is_equal (scm_cdr (l), val))
+
+	return false;
+    }
+  return true;
+}
+
 SCM
-ly_string_array_to_scm (vector<string> a)
+ly_alist_vals (SCM alist)
 {
-  SCM s = SCM_EOL;
-  for (vsize i = a.size (); i ; i--)
-    s = scm_cons (ly_symbol2scm (a[i - 1].c_str ()), s);
-  return s;
+  SCM x = SCM_EOL;
+  for (SCM p = alist; scm_is_pair (p); p = scm_cdr (p))
+    x = scm_cons (scm_cdar (p), x);
+  return x;
 }
 
-/* SYMBOLS is a whitespace separated list.  */
+/*
+  LISTS
+ */
+
+/* Return I-th element, or last elt L. If I < 0, then we take the first
+   element.
+
+   PRE: length (L) > 0  */
 SCM
-parse_symbol_list (char const *symbols)
+robust_list_ref (int i, SCM l)
 {
-  while (isspace (*symbols))
-    *symbols++;
-  string s = symbols;
-  replace_all (s, '\n', ' ');
-  replace_all (s, '\t', ' ');
-  return ly_string_array_to_scm (string_split (s, ' '));
+  while (i-- > 0 && scm_is_pair (scm_cdr (l)))
+    l = scm_cdr (l);
+  return scm_car (l);
 }
 
+
+SCM
+ly_deep_copy (SCM src)
+{
+  if (scm_is_pair (src))
+    return scm_cons (ly_deep_copy (scm_car (src)), ly_deep_copy (scm_cdr (src)));
+  else if (scm_is_vector (src))
+    {
+      int len = scm_c_vector_length (src);
+      SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);
+      for (int i = 0;i < len; i++)
+	{
+	  SCM si = scm_from_int (i);
+	  scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si)));
+	}
+    }
+  return src;
+}
+
+
 SCM
 ly_truncate_list (int k, SCM lst)
 {
@@ -412,6 +447,10 @@ ly_truncate_list (int k, SCM lst)
   return lst;
 }
 
+
+
+
+
 string
 print_scm_val (SCM val)
 {
@@ -456,7 +495,7 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol)
 
   if (type != SCM_EOL && !ly_is_procedure (type))
     {
-      warning (_f ("can't find property type-check for `%s' (%s).",
+      warning (_f ("cannot find property type-check for `%s' (%s).",
 		   ly_symbol2string (sym).c_str (),
 		   ly_symbol2string (type_symbol).c_str ())
 	       + "  " + _ ("perhaps a typing error?"));
@@ -506,51 +545,6 @@ ly_unique (SCM list)
   return scm_reverse_x (unique, SCM_EOL);
 }
 
-static int
-scm_default_compare (void const *a, void const *b)
-{
-  SCM pa = *(SCM *) a;
-  SCM pb = *(SCM *) b;
-  if (pa == pb)
-    return 0;
-  return pa < pb ? -1 : 1;
-}
-
-/*  Modify LST in place: qsort it.
-
-FIXME: unused, junk? */
-SCM
-ly_list_qsort_uniq_x (SCM lst)
-{
-  int len = scm_ilength (lst);
-  SCM *arr = new SCM[len];
-  int k = 0;
-  for (SCM s = lst; SCM_NNULLP (s); s = scm_cdr (s))
-    arr[k++] = scm_car (s);
-
-  assert (k == len);
-  qsort (arr, len, sizeof (SCM), &scm_default_compare);
-
-  SCM *tail = &lst;
-  for (int i = 0; i < len; i++)
-    if (!i || arr[i] != arr[i - 1])
-      {
-	SCM_SETCAR (*tail, arr[i]);
-	tail = SCM_CDRLOC (*tail);
-      }
-
-  *tail = SCM_EOL;
-  delete[] arr;
-
-  return lst;
-}
-
-/* tail add */
-SCM
-ly_snoc (SCM s, SCM list)
-{
-  return ly_append2 (list, scm_list_n (s, SCM_UNDEFINED));
-}
 
 /* Split list at member s, removing s.
    Return (BEFORE . AFTER)  */
@@ -607,18 +601,6 @@ int_list_to_slice (SCM l)
   return s;
 }
 
-/* Return I-th element, or last elt L. If I < 0, then we take the first
-   element.
-
-   PRE: length (L) > 0  */
-SCM
-robust_list_ref (int i, SCM l)
-{
-  while (i-- > 0 && scm_is_pair (scm_cdr (l)))
-    l = scm_cdr (l);
-  return scm_car (l);
-}
-
 Real
 robust_scm2double (SCM k, double x)
 {
@@ -627,51 +609,6 @@ robust_scm2double (SCM k, double x)
   return x;
 }
 
-Direction
-robust_scm2dir (SCM d, Direction def)
-{
-  if (is_direction (d))
-    def = to_dir (d);
-  return def;
-}
-
-Interval
-robust_scm2interval (SCM k, Drul_array<Real> v)
-{
-  Interval i;
-  i[LEFT] = v[LEFT];
-  i[RIGHT] = v[RIGHT];
-  if (is_number_pair (k))
-    i = ly_scm2interval (k);
-  return i;
-}
-
-Drul_array<Real>
-robust_scm2drul (SCM k, Drul_array<Real> v)
-{
-  if (is_number_pair (k))
-    v = ly_scm2interval (k);
-  return v;
-}
-
-Drul_array<bool>
-robust_scm2booldrul (SCM k, Drul_array<bool> def)
-{
-  if (scm_is_pair (k))
-    {
-      def[LEFT] = to_boolean (scm_car (k));
-      def[RIGHT] = to_boolean (scm_cdr (k));
-    }
-  return def;
-}
-
-Offset
-robust_scm2offset (SCM k, Offset o)
-{
-  if (is_number_pair (k))
-    o = ly_scm2offset (k);
-  return o;
-}
 
 string
 robust_scm2string (SCM k, string s)
@@ -689,6 +626,22 @@ robust_scm2int (SCM k, int o)
   return o;
 }
 
+
+SCM
+ly_rational2scm (Rational r)
+{
+  return scm_divide (scm_from_int (r.numerator ()), scm_from_int (r.denominator ()));
+}
+
+
+Rational
+ly_scm2rational (SCM r)
+{
+  return Rational (scm_to_int (scm_numerator (r)),
+		   scm_to_int (scm_denominator (r)));
+}
+
+
 SCM
 alist_to_hashq (SCM alist)
 {
@@ -705,33 +658,6 @@ alist_to_hashq (SCM alist)
   return tab;
 }
 
-bool
-alist_equal_p (SCM a, SCM b)
-{
-  for (SCM s = a;
-       scm_is_pair (s); s = scm_cdr (s))
-    {
-      SCM key = scm_caar (s);
-      SCM val = scm_cdar (s);
-      SCM l = scm_assoc (key, b);
-
-      if (l == SCM_BOOL_F
-	  || !ly_is_equal (scm_cdr (l), val))
-
-	return false;
-    }
-  return true;
-}
-
-SCM
-ly_alist_vals (SCM alist)
-{
-  SCM x = SCM_EOL;
-  for (SCM p = alist; scm_is_pair (p); p = scm_cdr (p))
-    x = scm_cons (scm_cdar (p), x);
-  return x;
-}
-
 SCM
 ly_hash2alist (SCM tab)
 {
@@ -750,6 +676,10 @@ procedure_arity (SCM proc)
   return scm_to_int (fixed);
 }
 
+/*
+  C++ interfacing.
+ */
+
 string
 mangle_cxx_identifier (string cxx_id)
 {
@@ -769,3 +699,40 @@ mangle_cxx_identifier (string cxx_id)
   return cxx_id;
 }
 
+
+
+SCM
+ly_string_array_to_scm (vector<string> a)
+{
+  SCM s = SCM_EOL;
+  for (vsize i = a.size (); i ; i--)
+    s = scm_cons (ly_symbol2scm (a[i - 1].c_str ()), s);
+  return s;
+}
+
+/* SYMBOLS is a whitespace separated list.  */
+SCM
+parse_symbol_list (char const *symbols)
+{
+  while (isspace (*symbols))
+    *symbols++;
+  string s = symbols;
+  replace_all (s, '\n', ' ');
+  replace_all (s, '\t', ' ');
+  return ly_string_array_to_scm (string_split (s, ' '));
+}
+
+
+bool
+ly_is_fraction (SCM x)
+{
+  return SCM_FRACTIONP(x);
+}
+
+struct ly_t_double_cell
+{
+  SCM a;
+  SCM b;
+  SCM c;
+  SCM d;
+};
diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 83c3826dbd..37dbc7a896 100644
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -85,7 +85,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
       if (dir != "" && dir != "." && dir != get_working_directory ())
 	{
 	  global_path.prepend (get_working_directory ());
-	  message (_f ("Changing working directory to `%s'",
+	  message (_f ("Changing working directory to: `%s'",
 		       dir.c_str ()));
 	  chdir (dir.c_str ());
 	}
@@ -103,7 +103,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
 
   if (init.length () && global_path.find (init).empty ())
     {
-      warning (_f ("can't find init file: `%s'", init));
+      warning (_f ("cannot find init file: `%s'", init));
       warning (_f ("(search path: `%s')",
 		   global_path.to_string ().c_str ()));
       exit (2);
@@ -113,7 +113,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
   bool error = false;
   if ((file_name != "-") && file_name.empty ())
     {
-      warning (_f ("can't find file: `%s'", file));
+      warning (_f ("cannot find file: `%s'", file));
       error = true;
     }
   else
diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index e71176c873..ae3943dbdb 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -124,7 +124,7 @@ Lily_parser::parse_file (string init, string name, string out_name)
 
   if (!define_spots_.empty ())
     {
-      define_spots_.back ().warning (_ ("braces don't match"));
+      define_spots_.back ().warning (_ ("braces do not match"));
       error_level_ = 1;
     }
 
diff --git a/lily/main.cc b/lily/main.cc
index 728cd89508..5aba63d78d 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -150,24 +150,24 @@ static Getopt_long *option_parser = 0;
 
 static Long_option_init options_static[]
 = {
-  {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps,eps,\nscm, svg, tex, texstr)\ndefault: PS")},
+  {_i ("BACK"), "backend", 'b', _i ("use backend BACK (eps, gnome, ps [default],\nscm, svg, tex, texstr)")},
 
-  {_i ("SYM=VAL"), "define-default", 'd',
-   _i ("set a Scheme program option. Uses #t if VAL is not specified\n"
-       "Try -dhelp for help.")},
+  {_i ("SYM[=VAL]"), "define-default", 'd',
+   _i ("set Scheme option SYM to VAL (default: #t)\n"
+       "Use -dhelp for help.")},
 
   {_i ("EXPR"), "evaluate", 'e', _i ("evaluate scheme code")},
   /* Bug in option parser: --output =foe is taken as an abbreviation
      for --output-format.  */
   {_i ("FORMATs"), "formats", 'f', _i ("dump FORMAT,...  Also as separate options:")},
   {0, "dvi", 0, _i ("generate DVI (tex backend only)")},
-  {0, "relocate", 0, _i ("relocate using directory of lilypond program")},
   {0, "pdf", 0, _i ("generate PDF (default)")},
   {0, "png", 0, _i ("generate PNG")},
   {0, "ps", 0, _i ("generate PostScript")},
   {0, "tex", 0, _i ("generate TeX (tex backend only)")},
-  {0, "help", 'h',  _i ("print this help")},
-  {_i ("FIELD"), "header", 'H',  _i ("dump a header field to file BASENAME.FIELD")},
+  {0, "help", 'h',  _i ("show this help and exit")},
+  {_i ("FIELD"), "header", 'H',  _i ("dump header field FIELD to file\n"
+				     "named BASENAME.FIELD")},
   {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
   {_i ("FILE"), "init", 'i',  _i ("use FILE as init file")},
 #if HAVE_CHROOT
@@ -177,8 +177,10 @@ static Long_option_init options_static[]
   {0, "no-print", 0, _i ("do not generate printed output")},
   {_i ("FILE"), "output", 'o',  _i ("write output to FILE (suffix will be added)")},
   {0, "preview", 'p',  _i ("generate a preview of the first system")},
-  {0, "safe-mode", 's',  _i ("disallow unsafe Scheme and PostScript operations")},
-  {0, "version", 'v',  _i ("print version number")},
+  {0, "relocate", 0, _i ("relocate using directory of lilypond program")},
+  {0, "safe-mode", 's',  _i ("disallow unsafe Scheme and PostScript\n"
+			     "operations")},
+  {0, "version", 'v',  _i ("show version number and exit")},
   {0, "verbose", 'V', _i ("be verbose")},
   {0, "warranty", 'w',  _i ("show warranty and copyright")},
   {0, 0, 0, 0}
@@ -320,7 +322,7 @@ do_chroot_jail ()
       if (errno == 0)
 	error (_f ("no such user: %s", components[USER_NAME]));
       else
-	error (_f ("can't get user id from user name: %s: %s",
+	error (_f ("cannot get user id from user name: %s: %s",
 		   components[USER_NAME],
 		   strerror (errno)));
       exit (3);
@@ -337,7 +339,7 @@ do_chroot_jail ()
       if (errno == 0)
 	error (_f ("no such group: %s", components[GROUP_NAME]));
       else
-	error (_f ("can't get group id from group name: %s: %s",
+	error (_f ("cannot get group id from group name: %s: %s",
 		   components[GROUP_NAME],
 		   strerror (errno)));
       exit (3);
@@ -345,26 +347,26 @@ do_chroot_jail ()
 
   if (chroot (components[JAIL].c_str ()))
     {
-      error (_f ("can't chroot to: %s: %s", components[JAIL],
+      error (_f ("cannot chroot to: %s: %s", components[JAIL],
 		 strerror (errno)));
       exit (3);
     }
 
   if (setgid (gid))
     {
-      error (_f ("can't change group id to: %d: %s", gid, strerror (errno)));
+      error (_f ("cannot change group id to: %d: %s", gid, strerror (errno)));
       exit (3);
     }
 
   if (setuid (uid))
     {
-      error (_f ("can't change user id to: %d: %s", uid, strerror (errno)));
+      error (_f ("cannot change user id to: %d: %s", uid, strerror (errno)));
       exit (3);
     }
 
   if (chdir (components[DIR].c_str ()))
     {
-      error (_f ("can't change working directory to: %s: %s", components[DIR],
+      error (_f ("cannot change working directory to: %s: %s", components[DIR],
 		 strerror (errno)));
       exit (3);
     }
diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 88d303b4e7..3fcdb4ca22 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -258,22 +258,19 @@ Midi_note::get_length () const
 int
 Midi_note::get_fine_tuning () const
 {
-  int ft = audio_->pitch_.quartertone_pitch ();
-  ft -= 2 * audio_->pitch_.semitone_pitch ();
-  ft *= 50; // 1 quarter tone = 50 cents
-  return ft;
+  Rational tune = (audio_->pitch_.tone_pitch ()
+		   + audio_->transposing_.tone_pitch ()) * Rational (2);
+  tune -= Rational (get_semitone_pitch ());
+
+  tune *= 100;
+  return (int) double (tune);
 }
 
 int
-Midi_note::get_pitch () const
+Midi_note::get_semitone_pitch () const
 {
-  int p = audio_->pitch_.semitone_pitch () + audio_->transposing_;
-  if (p == INT_MAX)
-    {
-      warning (_ ("silly pitch"));
-      p = 0;
-    }
-  return p;
+  return int (double ((audio_->pitch_.tone_pitch ()
+		       + audio_->transposing_.tone_pitch ()) * Rational (2)));
 }
 
 string
@@ -301,7 +298,7 @@ Midi_note::to_string () const
     }
 
   str += ::to_string ((char)status_byte);
-  str += ::to_string ((char) (get_pitch () + c0_pitch_));
+  str += ::to_string ((char) (get_semitone_pitch () + c0_pitch_));
   str += ::to_string ((char)dynamic_byte_);
 
   return str;
@@ -326,7 +323,7 @@ Midi_note_off::to_string () const
   Byte status_byte = (char) (0x80 + channel_);
 
   string str = ::to_string ((char)status_byte);
-  str += ::to_string ((char) (get_pitch () + Midi_note::c0_pitch_));
+  str += ::to_string ((char) (get_semitone_pitch () + Midi_note::c0_pitch_));
   str += ::to_string ((char)aftertouch_byte_);
 
   if (get_fine_tuning () != 0)
diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index d5b62fee59..b5d02f8400 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -25,7 +25,7 @@ Midi_stream::Midi_stream (string file_name)
   file_name_string_ = file_name;
   out_file_ = fopen (file_name.c_str (), "wb");
   if (!out_file_)
-    error (_f ("can't open for write: %s: %s", file_name, strerror (errno)));
+    error (_f ("cannot open for write: %s: %s", file_name, strerror (errno)));
 }
 
 Midi_stream::~Midi_stream ()
@@ -41,7 +41,7 @@ Midi_stream::operator << (string str)
   size_t written = fwrite (str.data (), sz, n, out_file_);
 
   if (written != sz * n)
-    warning (_ ("can't write to file: `%s'"));
+    warning (_ ("cannot write to file: `%s'"));
 
   return *this;
 }
diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 2979c9380c..c2aaa085b1 100644
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -63,7 +63,7 @@ Midi_walker::do_start_note (Midi_note *note)
   for (vsize i = 0; i < stop_note_queue.size (); i++)
     {
       /* if this pith already in queue */
-      if (stop_note_queue[i].val->get_pitch () == note->get_pitch ())
+      if (stop_note_queue[i].val->get_semitone_pitch () == note->get_semitone_pitch ())
 	{
 	  if (stop_note_queue[i].key < stop_mom)
 	    {
diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index 365c3f4344..82f52a5c00 100644
--- a/lily/music-scheme.cc
+++ b/lily/music-scheme.cc
@@ -191,23 +191,23 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist",
 	{
 	  Pitch orig (scm_to_int (scm_car (key)),
 		      scm_to_int (scm_cdr (key)),
-		      scm_to_int (alter));
+		      ly_scm2rational (alter));
 
 	  orig = orig.transposed (*p);
 
 	  SCM key = scm_cons (scm_from_int (orig.get_octave ()),
 			      scm_from_int (orig.get_notename ()));
 
-	  newlist = scm_cons (scm_cons (key, scm_from_int (orig.get_alteration ())),
+	  newlist = scm_cons (scm_cons (key, ly_rational2scm (orig.get_alteration ())),
 			      newlist);
 	}
       else if (scm_is_number (key))
 	{
-	  Pitch orig (0, scm_to_int (key), scm_to_int (alter));
+	  Pitch orig (0, scm_to_int (key), ly_scm2rational (alter));
 	  orig = orig.transposed (*p);
 
 	  key = scm_from_int (orig.get_notename ());
-	  alter = scm_from_int (orig.get_alteration ());
+	  alter = ly_rational2scm (orig.get_alteration ());
 	  newlist = scm_cons (scm_cons (key, alter), newlist);
 	}
     }
diff --git a/lily/music.cc b/lily/music.cc
index fb272aae03..83f88fbcd9 100644
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -138,7 +138,7 @@ Music::generic_to_relative_octave (Pitch last)
 	  Pitch expected_pit (scm_to_int (check),
 			      new_pit.get_notename (),
 			      new_pit.get_alteration ());
-	  origin ()->warning (_f ("octave check failed; expected \"%s\", found: %s",
+	  origin ()->warning (_f ("octave check failed; expected \"%s\", found: \"%s\"",
 				  expected_pit.to_string (),
 				  new_pit.to_string ()));
 	  new_pit = expected_pit;
@@ -184,7 +184,7 @@ Music::compress (Moment factor)
 }
 
 /*
-TODO: make transposition non-destructive
+  This mutates alist.  Hence, make sure that it is not changed 
 */
 SCM
 transpose_mutable (SCM alist, Pitch delta)
@@ -202,7 +202,7 @@ transpose_mutable (SCM alist, Pitch delta)
 	  Pitch transposed = p->transposed (delta);
 	  scm_set_cdr_x (entry, transposed.smobbed_copy ());
 
-	  if (abs (transposed.get_alteration ()) > DOUBLE_SHARP)
+	  if (transposed.get_alteration ().abs () > Rational (1,1))
 	    {
 	      warning (_f ("transposition by %s makes alteration larger than double",
 			   delta.to_string ()));
@@ -217,7 +217,8 @@ transpose_mutable (SCM alist, Pitch delta)
 	transpose_music_list (val, delta);
       else if (prop == ly_symbol2scm ("pitch-alist") &&
 	       scm_is_pair (val))
-	entry = scm_cons (prop, ly_transpose_key_alist (val, delta.smobbed_copy ()));
+	entry = scm_cons (prop,
+			  ly_transpose_key_alist (val, delta.smobbed_copy ()));
       retval = scm_cons (entry, retval);
     }
 
diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 594f24f337..1ae7794393 100644
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -93,7 +93,7 @@ New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 		       &fingerings_,
 		       ev, note_ev);
       else if (ev->in_event_class ("text-script-event"))
-	ev->origin ()->warning (_ ("can't add text scripts to individual note heads"));
+	ev->origin ()->warning (_ ("cannot add text scripts to individual note heads"));
       else if (ev->in_event_class ("script-event"))
 	add_script (inf.grob (), ev, note_ev);
       else if (ev->in_event_class ("string-number-event"))
diff --git a/lily/note-column.cc b/lily/note-column.cc
index a53c060069..ca85f08e12 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -121,7 +121,7 @@ Note_column::add_head (Grob *me, Grob *h)
     }
 
   if (both)
-    me->warning (_ ("can't have note heads and rests together on a stem"));
+    me->warning (_ ("cannot have note heads and rests together on a stem"));
   else
     Axis_group_interface::add_element (me, h);
 }
diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 8d9dfb44c1..6bfc82211b 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -38,11 +38,10 @@ Note_performer::process_music ()
 {
   if (note_evs_.size ())
     {
-      int transposing = 0;
-
+      Pitch transposing;
       SCM prop = get_property ("instrumentTransposition");
       if (unsmob_pitch (prop))
-	transposing = unsmob_pitch (prop)->semitone_pitch ();
+	transposing = *unsmob_pitch (prop);
 
       while (note_evs_.size ())
 	{
@@ -67,7 +66,7 @@ Note_performer::process_music ()
                 }
 
 	      Audio_note *p = new Audio_note (*pitp, get_event_length (n), 
-                                              tie_event, - transposing);
+                                              tie_event, transposing.negated ());
 	      Audio_element_info info (p, n);
 	      announce_element (info);
 	      notes_.push_back (p);
diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index d34654e770..2f2e5fdaad 100644
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -30,11 +30,11 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
     {
       FT_Byte *buffer = (FT_Byte *) malloc (*length);
       if (buffer == NULL)
-	error (_f ("can't allocate %lu bytes", *length));
+	error (_f ("cannot allocate %lu bytes", *length));
 
       error_code = FT_Load_Sfnt_Table (face, tag, 0, buffer, length);
       if (error_code)
-	error (_f ("can't load font table: %s", tag_str));
+	error (_f ("cannot load font table: %s", tag_str));
 
       return buffer;
     }
diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index 95fd4a5782..4bf03f2e13 100644
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -82,7 +82,7 @@ LY_DEFINE (ly_output_description, "ly:output-description",
   return ell;
 }
 
-LY_DEFINE (ly_layout_def_p, "ly:layout-def?",
+LY_DEFINE (ly_output_def_p, "ly:output-def?",
 	   1, 0, 0, (SCM def),
 	   "Is @var{def} a layout definition?")
 {
diff --git a/lily/page-turn-page-breaking.cc b/lily/page-turn-page-breaking.cc
index c6a1381f36..911e83467b 100644
--- a/lily/page-turn-page-breaking.cc
+++ b/lily/page-turn-page-breaking.cc
@@ -202,7 +202,7 @@ Page_turn_page_breaking::calc_subproblem (vsize ending_breakpoint)
       if (start == 0 && end == 1
 	  && this_start_best.first_page_number_ == 1
 	  && this_start_best.page_count_ > 1)
-	warning (_ ("couldn't fit the first page turn onto a single page. "
+	warning (_ ("cannot fit the first page turn onto a single page.  "
 		    "Consider setting first-page-number to an even number."));
 
       if (this_start_best.demerits_ < best.demerits_)
diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index bddeffe150..c66d1d6ae9 100644
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -91,9 +91,9 @@ Paper_book::output (SCM output_channel)
 {
   if (scm_is_pair (performances_))
     {
-      SCM proc = ly_lily_module_constant ("paper-book-write-midis");
-
-      scm_call_2 (proc, self_scm (), output_channel);
+      SCM proc = ly_lily_module_constant ("write-performances-midis");
+ 
+      scm_call_2 (proc, performances (), output_channel);
     }
 
   if (scores_ == SCM_EOL)
diff --git a/lily/parser.yy b/lily/parser.yy
index 64d6103d44..ebb322d773 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -136,7 +136,7 @@ SCM make_music_relative (Pitch start, SCM music, Input loc);
 SCM run_music_function (Lily_parser *, SCM expr);
 SCM get_first_context_id (SCM type, Music *m);
 SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list);
-SCM make_chord_step (int step, int alter);
+SCM make_chord_step (int step, Rational alter);
 SCM make_simple_markup (SCM a);
 bool is_duration (int t);
 bool is_regular_identifier (SCM id);
@@ -1661,7 +1661,7 @@ steno_tonic_pitch:
 		$$ = p.smobbed_copy ();
 	}
 	| TONICNAME_PITCH sub_quotes	 {
-		Pitch p =* unsmob_pitch ($1);
+		Pitch p = *unsmob_pitch ($1);
 
 		p = p.transposed (Pitch (-$2,0,0));
 		$$ = p.smobbed_copy ();
@@ -2063,10 +2063,10 @@ step_number:
 		$$ = make_chord_step ($1, 0);
         }
 	| bare_unsigned '+' {
-		$$ = make_chord_step ($1, SHARP);
+		$$ = make_chord_step ($1, SHARP_ALTERATION);
 	}
 	| bare_unsigned CHORD_MINUS {
-		$$ = make_chord_step ($1, FLAT);
+		$$ = make_chord_step ($1, FLAT_ALTERATION);
 	}
 	;	
 
@@ -2470,10 +2470,10 @@ set_music_properties (Music *p, SCM a)
 
 
 SCM
-make_chord_step (int step, int alter)
+make_chord_step (int step, Rational alter)
 {
 	if (step == 7)
-		alter += FLAT;
+		alter += FLAT_ALTERATION;
 
 	while (step < 0)
 		step += 7;
diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index 8c919cb36f..debc884360 100644
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -298,7 +298,7 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed)
       if (!mixed)
 	{
 	  if (!p->start_ev_)
-	    p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
+	    p->event_drul_[STOP]->origin ()->warning (_f ("cannot find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
 	  else
 	    s = scm_cadr (strings);
 	  p->start_ev_ = p->event_drul_[START];
@@ -309,7 +309,7 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed)
       if (!mixed)
 	{
 	  if (!p->start_ev_)
-	    p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
+	    p->event_drul_[STOP]->origin ()->warning (_f ("cannot find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
 	  else
 	    s = scm_caddr (strings);
 	  p->start_ev_ = 0;
@@ -344,7 +344,7 @@ Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, bool mixed)
 {
   if (!p->bracket_ && p->event_drul_[STOP])
     {
-      string msg = _f ("can't find start of piano pedal bracket: `%s'", p->type_->base_name_.c_str ());
+      string msg = _f ("cannot find start of piano pedal bracket: `%s'", p->type_->base_name_.c_str ());
       p->event_drul_[STOP]->origin ()->warning (msg);
       p->event_drul_[STOP] = 0;
     }
diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index 67d16d4019..1ab27bca07 100644
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -90,7 +90,7 @@ Piano_pedal_performer::process_music ()
       if (p->event_drul_[STOP])
 	{
 	  if (!p->start_event_)
-	    p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", pedal_type));
+	    p->event_drul_[STOP]->origin ()->warning (_f ("cannot find start of piano pedal: `%s'", pedal_type));
 	  else
 	    {
 	      Audio_piano_pedal *a = new Audio_piano_pedal;
diff --git a/lily/pitch-scheme.cc b/lily/pitch-scheme.cc
index 3beb9f43cf..e45cd841b7 100644
--- a/lily/pitch-scheme.cc
+++ b/lily/pitch-scheme.cc
@@ -22,22 +22,33 @@ LY_DEFINE (ly_pitch_transpose, "ly:pitch-transpose",
 
 /* Should add optional args.  */
 LY_DEFINE (ly_make_pitch, "ly:make-pitch",
-	   3, 0, 0, (SCM octave, SCM note, SCM alter),
+	   2, 1, 0, (SCM octave, SCM note, SCM alter),
 	   "@var{octave} is specified by an integer, "
 	   "zero for the octave containing middle C.  "
 	   "@var{note} is a number from 0 to 6, "
 	   "with 0 corresponding to C and 6 corresponding to B.  "
-	   "The @var{alter} is zero for a natural, negative for "
-	   "flats, or positive for sharps. ")
+	   "The @var{alter} is a rational number of whole tones for alteration.")
 {
-  SCM_ASSERT_TYPE (scm_integer_p (octave) == SCM_BOOL_T, octave, SCM_ARG1, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (scm_integer_p (note) == SCM_BOOL_T, note, SCM_ARG2, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (scm_integer_p (alter) == SCM_BOOL_T, alter, SCM_ARG3, __FUNCTION__, "integer");
-
-  Pitch p (scm_to_int (octave), scm_to_int (note), scm_to_int (alter));
+  SCM_ASSERT_TYPE (scm_is_integer (octave), octave, SCM_ARG1, __FUNCTION__, "integer");
+  SCM_ASSERT_TYPE (scm_is_integer (note), note, SCM_ARG2, __FUNCTION__, "integer");
+  SCM_ASSERT_TYPE (scm_is_rational (alter),
+		   alter, SCM_ARG3, __FUNCTION__, "rational");
+  
+  Pitch p (scm_to_int (octave), scm_to_int (note),
+	   ly_scm2rational (alter));
+  
   return p.smobbed_copy ();
 }
 
+LY_DEFINE (ly_pitch_negate, "ly:pitch-negate", 1, 0, 0,
+	   (SCM p),
+	   "Negate @var{p}.")
+{
+  Pitch *pp = unsmob_pitch (p);
+  SCM_ASSERT_TYPE (pp, p, SCM_ARG1, __FUNCTION__, "Pitch");
+  return pp->negated ().smobbed_copy ();
+}
+
 LY_DEFINE (ly_pitch_steps, "ly:pitch-steps", 1, 0, 0,
 	   (SCM p),
 	   "Number of steps counted from middle C of the pitch @var{p}.")
@@ -63,9 +74,9 @@ LY_DEFINE (ly_pitch_alteration, "ly:pitch-alteration",
 {
   Pitch *p = unsmob_pitch (pp);
   SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->get_alteration ();
+  Rational q = p->get_alteration ();
 
-  return scm_from_int (q);
+  return ly_rational2scm (q);
 }
 
 LY_DEFINE (pitch_notename, "ly:pitch-notename",
@@ -84,7 +95,7 @@ LY_DEFINE (ly_pitch_quartertones, "ly:pitch-quartertones",
 {
   Pitch *p = unsmob_pitch (pp);
   SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->quartertone_pitch ();
+  int q = p->rounded_quartertone_pitch ();
   return scm_from_int (q);
 }
 
@@ -94,7 +105,7 @@ LY_DEFINE (ly_pitch_semitones, "ly:pitch-semitones",
 {
   Pitch *p = unsmob_pitch (pp);
   SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->semitone_pitch ();
+  int q = p->rounded_semitone_pitch ();
   return scm_from_int (q);
 }
 
diff --git a/lily/pitch.cc b/lily/pitch.cc
index 566b729e24..880dc79edf 100644
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -9,25 +9,26 @@
 #include "pitch.hh"
 
 #include "main.hh"
+#include "scale.hh"
 #include "string-convert.hh"
 #include "warn.hh"
 
 #include "ly-smobs.icc"
 
-Pitch::Pitch (int o, int n, int a)
+
+Pitch::Pitch (int o, int n, Rational a)
 {
   notename_ = n;
   alteration_ = a;
   octave_ = o;
   scale_ = default_global_scale; 
-  normalise ();
+  normalize ();
 }
 
 /* FIXME: why is octave == 0 and default not middleC ? */
 Pitch::Pitch ()
 {
   notename_ = 0;
-  alteration_ = 0;
   scale_ = default_global_scale; 
   octave_ = 0;
 }
@@ -37,7 +38,7 @@ Pitch::compare (Pitch const &m1, Pitch const &m2)
 {
   int o = m1.octave_ - m2.octave_;
   int n = m1.notename_ - m2.notename_;
-  int a = m1.alteration_ - m2.alteration_;
+  Rational a = m1.alteration_ - m2.alteration_;
 
   if (o)
     return o;
@@ -45,76 +46,69 @@ Pitch::compare (Pitch const &m1, Pitch const &m2)
     return n;
   if (a)
     return a;
+  
   return 0;
 }
 
 int
 Pitch::steps () const
 {
-  return notename_ + octave_ * scale_->step_semitones_.size ();
+  return notename_ + octave_ * scale_->step_tones_.size ();
 }
 
-/* Should be settable from input?  */
-// static Byte diatonic_scale_semitones[ ] = { 0, 2, 4, 5, 7, 9, 11 };
-
-
-
-/* Calculate pitch height in 12th octave steps.  Don't assume
-   normalised pitch as this function is used to normalise the pitch.  */
-int
-Pitch::semitone_pitch () const
+Rational
+Pitch::tone_pitch () const
 {
   int o = octave_;
   int n = notename_;
   while (n < 0)
     {
-      n += scale_->step_semitones_.size ();
+      n += scale_->step_tones_.size ();
       o--;
     }
 
-  if (alteration_ % 2)
-    programming_error ("semitone_pitch () called on quarter tone alteration.");
+  Rational tones ((o + n / scale_->step_tones_.size ()) * 6, 1);
+  tones += scale_->step_tones_[n % scale_->step_tones_.size ()];
 
-  return ((o + n / scale_->step_semitones_.size ()) * 12
-	  + scale_->step_semitones_[n % scale_->step_semitones_.size ()]
-	  + (alteration_ / 2));
+  tones += alteration_;
+  
+  return tones;
 }
 
+/* Calculate pitch height in 12th octave steps.  Don't assume
+   normalized pitch as this function is used to normalize the pitch.  */
 int
-Pitch::quartertone_pitch () const
+Pitch::rounded_semitone_pitch () const
 {
-  int o = octave_;
-  int n = notename_;
-  while (n < 0)
-    {
-      n += scale_->step_semitones_.size ();
-      o--;
-    }
+  return int (double (tone_pitch () * Rational (2)));
+}
 
-  return ((o + n / scale_->step_semitones_.size ()) * 24
-	  + 2 * scale_->step_semitones_[n % scale_->step_semitones_.size ()]
-	  + alteration_);
+int
+Pitch::rounded_quartertone_pitch () const
+{
+  return int (double (tone_pitch () * Rational (4)));
 }
 
 void
-Pitch::normalise ()
+Pitch::normalize ()
 {
-  int pitch = quartertone_pitch ();
-  while (notename_ >= (int) scale_->step_semitones_.size ())
+  Rational pitch = tone_pitch ();
+  while (notename_ >= (int) scale_->step_tones_.size ())
     {
-      notename_ -= scale_->step_semitones_.size ();
+      notename_ -= scale_->step_tones_.size ();
       octave_++;
-      alteration_ -= quartertone_pitch () - pitch;
+      alteration_ -= tone_pitch () - pitch;
     }
   while (notename_ < 0)
     {
-      notename_ += scale_->step_semitones_.size ();
+      notename_ += scale_->step_tones_.size ();
       octave_--;
-      alteration_ -= quartertone_pitch () - pitch;
+      alteration_ -= tone_pitch () - pitch;
     }
-  while (alteration_ > DOUBLE_SHARP)
+
+  while (alteration_ > Rational (1))
     {
-      if (notename_ == 6)
+      if (notename_ == int (scale_->step_tones_.size ()))
 	{
 	  notename_ = 0;
 	  octave_++;
@@ -122,47 +116,46 @@ Pitch::normalise ()
       else
 	notename_++;
 
-      alteration_ = 0;
-      alteration_ -= quartertone_pitch () - pitch;
+      alteration_ = Rational (0);
+      alteration_ -= tone_pitch () - pitch;
     }
-
-  while (alteration_ < DOUBLE_FLAT)
+  while (alteration_ < Rational(-1))
     {
       if (notename_ == 0)
 	{
-	  notename_ = 6;
+	  notename_ = scale_->step_tones_.size ();
 	  octave_--;
 	}
       else
 	notename_--;
 
       alteration_ = 0;
-      alteration_ -= quartertone_pitch () - pitch;
+      alteration_ -= tone_pitch () - pitch;
     }
 }
 
-/* WHugh, wat een intervaas */
 void
 Pitch::transpose (Pitch delta)
 {
-  int new_semi = quartertone_pitch () +delta.quartertone_pitch ();
+  Rational new_alter = tone_pitch () + delta.tone_pitch ();
+
   octave_ += delta.octave_;
   notename_ += delta.notename_;
-  alteration_ += new_semi - quartertone_pitch ();
+  alteration_ += new_alter - tone_pitch ();
 
-  normalise ();
+  normalize ();
 }
 
 Pitch
 pitch_interval (Pitch const &from, Pitch const &to)
 {
-  int sound = to.quartertone_pitch () - from.quartertone_pitch ();
+  Rational sound = to.tone_pitch () - from.tone_pitch ();
   Pitch pt (to.get_octave () - from.get_octave (),
 	    to.get_notename () - from.get_notename (),
 
 	    to.get_alteration () - from.get_alteration ());
 
-  return pt.transposed (Pitch (0, 0, sound - pt.quartertone_pitch ()));
+  return pt.transposed (Pitch (0, 0, sound - pt.tone_pitch ()));
 }
 
 /* FIXME
@@ -173,11 +166,12 @@ char const *accname[] = {"eses", "eseh", "es", "eh", "",
 string
 Pitch::to_string () const
 {
-  int n = (notename_ + 2) % scale_->step_semitones_.size ();
+  int n = (notename_ + 2) % scale_->step_tones_.size ();
   string s = ::to_string (char (n + 'a'));
-  if (alteration_)
-    s += string (accname[alteration_ - DOUBLE_FLAT]);
-
+      Rational qtones = alteration_ * Rational (4,1);
+      int qt = int (rint (Real (qtones)));
+      
+      s += string (accname[qt + 4]);
   if (octave_ >= 0)
     {
       int o = octave_ + 1;
@@ -294,7 +288,7 @@ Pitch::get_notename () const
   return notename_;
 }
 
-int
+Rational
 Pitch::get_alteration () const
 {
   return alteration_;
@@ -307,3 +301,12 @@ Pitch::transposed (Pitch d) const
   p.transpose (d);
   return p;
 }
+
+Rational FLAT_ALTERATION (-1, 2);
+Rational SHARP_ALTERATION (1, 2);
+
+Pitch
+Pitch::negated () const
+{
+  return pitch_interval (*this, Pitch ());
+}
diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index da74dafcdd..d29f6f42ca 100644
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -83,7 +83,7 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
 
   SCM handle = scm_assoc (key, keysig);
   bool print_acc
-    = (handle == SCM_BOOL_F) || p->get_alteration () == 0;
+    = (handle == SCM_BOOL_F) || p->get_alteration () == Rational (0);
 
   if (trill_head_)
     {
@@ -110,7 +110,8 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
       trill_accidental_ = make_item ("TrillPitchAccidental", ev->self_scm ());
 
       // fixme: naming -> alterations
-      trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (p->get_alteration ())));
+      trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (Rational (4) 
+										* p->get_alteration ())));
       Side_position_interface::add_support (trill_accidental_, trill_head_);
       
       trill_head_->set_object ("accidental-grob", trill_accidental_->self_scm ());
diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index 849472c329..c55aae3428 100644
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -244,7 +244,8 @@ Quote_iterator::process (Moment m)
 		    mp = *me_pitch;
 
 		  Pitch diff = pitch_interval (qp, mp);
-
+		  ev = ev->clone ();
+		  
 		  SCM props =  transpose_mutable (ev->get_property_alist (true), diff);
 		  ev = new Stream_event (ev->get_property ("class"), props);
 		  transposed_musics_ = scm_cons (ev->unprotect (), transposed_musics_);
diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index 388e2f2d0f..cc1efe3d21 100644
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -45,5 +45,6 @@ Relative_octave_check::relative_callback (SCM music, SCM last_pitch)
     }
 
   return Pitch (p.get_octave () + delta_oct,
-		p.get_notename (), p.get_alteration ()).smobbed_copy ();
+		p.get_notename (),
+		p.get_alteration ()).smobbed_copy ();
 }
diff --git a/lily/relocate.cc b/lily/relocate.cc
index ac4c31bac4..a60b262c5e 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -41,7 +41,8 @@ sane_putenv (char const *key, string value, bool overwrite)
       char *s = strdup (combine.c_str ());
 
       if (be_verbose_global)
-	progress_indication (_f ("Setting %s to %s\n" , key, value.c_str ())); 
+	progress_indication (_f ("Setting %s to %s" , key, value.c_str ())
+			     + "\n");
 			     
       return putenv (s);
     }
@@ -192,7 +193,7 @@ setup_paths (char const *argv0_ptr)
 #endif /* __MINGW32__ */
 
 	  if (argv0_abs.empty ())
-	    programming_error ("can't find absolute argv0.");
+	    programming_error ("cannot find absolute argv0");
 	}
 
       string bindir = dir_name (argv0_abs);
@@ -350,12 +351,13 @@ void
 read_relocation_file (string filename)
 {
   if (be_verbose_global)
-    progress_indication (_f ("Relocation file %s\n", filename.c_str ()));
+    progress_indication (_f ("Relocation file: %s", filename.c_str ())
+			 + "\n");
       
   char const *cname = filename.c_str ();
   FILE *f = fopen (cname, "r");
   if (!f)
-    error (_f ("can't open file %s", cname));
+    error (_f ("cannot open file: `%s'", cname));
 
   while (!feof (f))
     {
diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 3e82328837..f748b56a82 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -148,7 +148,7 @@ Rest_collision::calc_positioning_done (SCM smob)
 	  if (d)
 	    ordered_rests[d].push_back (rests[i]);
 	  else
-	    rests[d]->warning (_ ("can't resolve rest collision: rest direction not set"));
+	    rests[d]->warning (_ ("cannot resolve rest collision: rest direction not set"));
 	}
 
       Direction d = LEFT;
diff --git a/lily/scale.cc b/lily/scale.cc
index b71f43fe20..89e8103887 100644
--- a/lily/scale.cc
+++ b/lily/scale.cc
@@ -7,35 +7,41 @@
   
 */
 
-#include  "pitch.hh"
+#include "scale.hh"
 
 #include "ly-smobs.icc"
 
+/*
+  todo: put string <-> pitch here too.
+
+*/
 LY_DEFINE (ly_make_scale, "ly:make-scale",
 	   1, 0, 0, (SCM steps),
 	   "Create a scale. Takes a vector of ints as argument")
 {
   bool type_ok = scm_is_vector (steps);
 
-  vector<int> semitones; 
+  vector<Rational> semitones; 
   if (type_ok)
     {
       int len = scm_c_vector_length (steps);
       for (int i = 0 ; i < len; i++)
 	{
 	  SCM step = scm_c_vector_ref (steps, i);
-	  type_ok = type_ok && scm_is_integer (step);
+	  type_ok = type_ok && scm_is_rational (step);
 	  if (type_ok)
-	    semitones.push_back (scm_to_int (step));
+	    {
+	      Rational from_c (scm_to_int (scm_numerator (step)),
+			       scm_to_int (scm_denominator (step)));
+	      semitones.push_back (from_c);
+	    }
 	}
     }
-
   
   SCM_ASSERT_TYPE (type_ok, steps, SCM_ARG1, __FUNCTION__, "vector of int");
 
-
   Scale *s = new Scale;
-  s->step_semitones_ = semitones;
+  s->step_tones_ = semitones;
 
   SCM retval =  s->self_scm ();
 
@@ -96,7 +102,7 @@ Scale::Scale ()
 
 Scale::Scale (Scale const &src)
 {
-  step_semitones_ = src.step_semitones_;
+  step_tones_ = src.step_tones_;
   smobify_self ();
 }
 
diff --git a/lily/scheme-listener-scheme.cc b/lily/scheme-listener-scheme.cc
index b8946871c0..7e8370068f 100644
--- a/lily/scheme-listener-scheme.cc
+++ b/lily/scheme-listener-scheme.cc
@@ -16,7 +16,7 @@ LY_DEFINE (ly_make_listener, "ly:make-listener",
 	   "\n"
 	   " @var{callback} should take exactly one argument." )
 {
-  SCM_ASSERT_TYPE (scm_procedure_p (callback), callback, SCM_ARG1, __FUNCTION__, "procedure");
+  SCM_ASSERT_TYPE (ly_is_procedure (callback), callback, SCM_ARG1, __FUNCTION__, "procedure");
   Scheme_listener *l = new Scheme_listener (callback);
   SCM listener = GET_LISTENER (l->call).smobbed_copy ();
   l->unprotect ();
diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index c188de3704..b48219ad44 100644
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -12,6 +12,9 @@
 #include "output-def.hh"
 #include "global-context.hh"
 #include "lilypond-key.hh"
+#include "music-output.hh"
+#include "paper-score.hh"
+#include "paper-book.hh"
 
 LY_DEFINE (ly_make_score, "ly:make-score",
 	   1, 0, 0,
@@ -27,6 +30,49 @@ LY_DEFINE (ly_make_score, "ly:make-score",
   return score->unprotect ();
 }
 
+LY_DEFINE (ly_score_output_defs, "ly:score-output-defs",
+	   1, 0, 0, (SCM score),
+	   "All output defs in a score.")
+{
+  Score *sc = unsmob_score (score);
+  SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score");
+
+  SCM l = SCM_EOL;
+  for (vsize i = 0; i < sc->defs_.size (); i++)
+    l = scm_cons (sc->defs_[i]->self_scm(), l);
+  return scm_reverse_x (l, SCM_EOL);
+}
+
+
+
+LY_DEFINE (ly_score_header, "ly:score-header",
+	   1, 0, 0, (SCM score),
+	   "return score header.")
+{
+  Score *sc = unsmob_score (score);
+  SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score");
+  return sc->header_;
+}
+
+
+LY_DEFINE (ly_score_music, "ly:score-music",
+	   1, 0, 0, (SCM score),
+	   "return score music.")
+{
+  Score *sc = unsmob_score (score);
+  SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score");
+  return sc->get_music ();
+}
+
+LY_DEFINE (ly_score_error_p, "ly:score-error?",
+	   1, 0, 0, (SCM score),
+	   "Was there an error in the score?")
+{
+  Score *sc = unsmob_score (score);
+  SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score");
+  return scm_from_bool (sc->error_found_);
+}
+
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
 	   2, 1, 0, (SCM score, SCM layout, SCM key),
 	   "Run @var{score} through @var{layout}, an output definition, "
@@ -69,47 +115,66 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
   return output;
 }
 
-LY_DEFINE (ly_score_process, "ly:score-process",
-	   5, 0, 0,
-	   (SCM score_smob,
-	    SCM default_header,
-	    SCM default_paper,
-	    SCM default_layout,
-	    SCM basename),
-	   "Print score without page-layout: just print the systems.")
+LY_DEFINE (ly_score_process, "ly:render-music-as-systems",
+	   5, 0, 0, (SCM music,
+		     SCM outdef,
+		     SCM book_outputdef,
+		     SCM header,
+		     SCM outname),
+	   "Create output using a default \\book block. ")
 {
-  Score *score = unsmob_score (score_smob);
+  SCM_ASSERT_TYPE(unsmob_music(music), music,
+		  SCM_ARG1, __FUNCTION__, "music");
+  SCM_ASSERT_TYPE(unsmob_output_def (outdef), outdef,
+		  SCM_ARG2, __FUNCTION__, "output def");
+  SCM_ASSERT_TYPE(unsmob_output_def (book_outputdef), book_outputdef,
+		  SCM_ARG3, __FUNCTION__, "output def");
+  SCM_ASSERT_TYPE(scm_is_string (outname), outname,
+		  SCM_ARG5, __FUNCTION__, "string");
+  
+  
+  SCM scaled_def = outdef;
+  SCM scaled_bookdef = book_outputdef;
+
+  Output_def *bpd = unsmob_output_def (book_outputdef);
+
+  /* ugh .  */
+  assert (bpd->c_variable ("is-paper") == SCM_BOOL_T);
+
+  Real scale = scm_to_double (bpd->c_variable ("output-scale"));
+
+  Output_def *def = scale_output_def (unsmob_output_def (outdef), scale);
+  Output_def *bdef = scale_output_def (bpd, scale);
+  def->parent_ = bdef;
+
+  scaled_def = def->self_scm ();
+  scaled_bookdef = bdef->self_scm ();
 
-  SCM_ASSERT_TYPE (score, score_smob, SCM_ARG1, __FUNCTION__, "score");
+  def->unprotect ();
+  bdef->unprotect ();
 
-  // allow header to be undefined.
-  SCM_ASSERT_TYPE (unsmob_output_def (default_paper),
-		   default_header, SCM_ARG3, __FUNCTION__, "\\paper block");
-  SCM_ASSERT_TYPE (unsmob_output_def (default_layout),
-		   default_header, SCM_ARG4, __FUNCTION__, "\\layout block");
+  SCM context = ly_run_translator (music, scaled_def, SCM_BOOL_F);
+  SCM output_as_scm = ly_format_output (context);
+  Music_output *output = unsmob_music_output (output_as_scm);
 
-  Object_key *key = new Lilypond_general_key (0, score->user_key_, 0);
+  Paper_score *pscore = dynamic_cast<Paper_score *> (output);
+  assert (pscore);
 
-  if (score->error_found_)
-    return SCM_UNSPECIFIED;
+  /* ugh, this is strange, Paper_book without a Book object. */
+  Paper_book *paper_book = new Paper_book ();
+  paper_book->header_ = header;
+  paper_book->paper_ = unsmob_output_def (scaled_bookdef);
 
-  SCM header = ly_is_module (score->header_)
-    ? score->header_
-    : default_header;
+  if (ly_is_module (header))
+    paper_book->add_score (header);
 
-  for (vsize i = 0; i < score->defs_.size (); i++)
-    default_rendering (score->get_music (), score->defs_[i]->self_scm (),
-		       default_paper, header, basename, key->self_scm ());
+  paper_book->add_score (pscore->self_scm ());
+  paper_book->classic_output (outname);
+  paper_book->unprotect ();
 
-  if (score->defs_.empty ())
-    {
-      default_rendering (score->get_music (),
-			 default_layout,
-			 default_paper,
-			 header, basename, key->self_scm ());
-    }
+  scm_remember_upto_here_1 (scaled_def);
+  scm_remember_upto_here_1 (scaled_bookdef);
 
-  key->unprotect ();
   return SCM_UNSPECIFIED;
 }
 
diff --git a/lily/score.cc b/lily/score.cc
index 52a48538b8..63169ca462 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -106,58 +106,6 @@ Score::Score (Score const &s)
     ly_module_copy (header_, s.header_);
 }
 
-void
-default_rendering (SCM music, SCM outdef,
-		   SCM book_outputdef,
-		   SCM header,
-		   SCM outname,
-		   SCM key)
-{
-  SCM scaled_def = outdef;
-  SCM scaled_bookdef = book_outputdef;
-
-  Output_def *bpd = unsmob_output_def (book_outputdef);
-
-  /* ugh.  */
-  if (bpd->c_variable ("is-paper") == SCM_BOOL_T)
-    {
-      Real scale = scm_to_double (bpd->c_variable ("output-scale"));
-
-      Output_def *def = scale_output_def (unsmob_output_def (outdef), scale);
-      Output_def *bdef = scale_output_def (bpd, scale);
-      def->parent_ = bdef;
-
-      scaled_def = def->self_scm ();
-      scaled_bookdef = bdef->self_scm ();
-
-      def->unprotect ();
-      bdef->unprotect ();
-    }
-
-  SCM context = ly_run_translator (music, scaled_def, key);
-  
-  SCM output_as_scm = ly_format_output (context);
-  Music_output *output = unsmob_music_output (output_as_scm);
-
-  if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
-    {
-      /* ugh, this is strange, Paper_book without a Book object. */
-      Paper_book *paper_book = new Paper_book ();
-      paper_book->header_ = header;
-      paper_book->paper_ = unsmob_output_def (scaled_bookdef);
-
-      if (ly_is_module (header))
-	paper_book->add_score (header);
-
-      paper_book->add_score (pscore->self_scm ());
-      paper_book->classic_output (outname);
-      paper_book->unprotect ();
-    }
-
-  scm_remember_upto_here_1 (scaled_def);
-  scm_remember_upto_here_1 (output_as_scm);
-  scm_remember_upto_here_1 (scaled_bookdef);
-}
 
 /*
   Format score, return list of Music_output objects.
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index c3354a6700..1719864361 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -99,7 +99,7 @@ make_script_from_event (Grob *p,  Context *tg,
   if (art == SCM_BOOL_F)
     {
       /* FIXME: */
-      warning (_ ("don't know how to interpret articulation: "));
+      warning (_ ("do not know how to interpret articulation: "));
       warning (_ ("scheme encoding: "));
       scm_write (art_type, scm_current_error_port ());
       message ("");
diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc
index 4c63ce73d2..9f986e7c7f 100644
--- a/lily/self-aligment-interface.cc
+++ b/lily/self-aligment-interface.cc
@@ -35,7 +35,7 @@ Self_alignment_interface::aligned_on_self (Grob *me, Axis a)
     {
       Interval ext (me->extent (me, a));
       if (ext.is_empty ())
-	programming_error ("can't align on self: empty element");
+	programming_error ("cannot align on self: empty element");
       else
 	return scm_from_double (- ext.linear_combination (scm_to_double (align)));
     }
@@ -106,7 +106,7 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
 
   Interval ext (me->extent (me, a));
   if (ext.is_empty ())
-    programming_error ("can't align on self: empty element");
+    programming_error ("cannot align on self: empty element");
   else
     x -= ext.linear_combination (align);
 
diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 864ea77473..64853b8284 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -80,7 +80,8 @@ Slur_engraver::listen_slur (Stream_event *ev)
     ASSIGN_EVENT_ONCE (events_[START], ev);
   else if (d == STOP)
     ASSIGN_EVENT_ONCE (events_[STOP], ev);
-  else ev->origin ()->warning (_ ("Invalid direction of slur-event"));
+  else ev->origin ()->warning (_f ("direction of %s invalid: %d",
+				   "slur-event", int (d)));
 }
 
 void
@@ -162,7 +163,7 @@ Slur_engraver::process_music ()
   if (events_[STOP])
     {
       if (slurs_.size () == 0)
-	events_[STOP]->origin ()->warning (_ ("can't end slur"));
+	events_[STOP]->origin ()->warning (_ ("cannot end slur"));
 
       
       end_slurs_ = slurs_;
@@ -208,7 +209,12 @@ Slur_engraver::stop_translation_timestep ()
   
   
   for (vsize i = 0; i < end_slurs_.size (); i++)
-    announce_end_grob (end_slurs_[i], SCM_EOL);
+    {
+      Spanner * s = dynamic_cast<Spanner*> (end_slurs_[i]);
+      if (!s->get_bound (RIGHT))
+	s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn")));
+      announce_end_grob (s, SCM_EOL);
+    }
   end_slurs_.clear ();
   events_[START] = events_[STOP] = 0;
 }
diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 34e20519c9..4e6167a650 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -442,7 +442,7 @@ Slur_score_state::get_closest_index (SCM inspect_quants) const
 	}
     }
   if (mindist > 1e5)
-    programming_error ("can't not find quant");
+    programming_error ("cannot find quant");
   return opt_idx;
 }
 
diff --git a/lily/source-file.cc b/lily/source-file.cc
index 310c7938d3..4415e8dad7 100644
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -51,7 +51,7 @@ gulp_file (string filename, int desired_size)
   FILE *f = fopen (filename.c_str (), "rb");
   if (!f)
     {
-      warning (_f ("can't open file: `%s'", filename.c_str ()));
+      warning (_f ("cannot open file: `%s'", filename.c_str ()));
 
       vector<char> cxx_arr;
       return cxx_arr;
diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc
index 2cd69fa4ff..835801d94a 100644
--- a/lily/spacing-basic.cc
+++ b/lily/spacing-basic.cc
@@ -115,7 +115,7 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
 
   if (! shortest_playing_len.to_bool ())
     {
-      programming_error ("can't find a ruling note at " + Paper_column::when_mom (lc).to_string ());
+      programming_error ("cannot find a ruling note at: " + Paper_column::when_mom (lc).to_string ());
       shortest_playing_len = 1;
     }
 
diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index c0eecf9328..8f6355b26e 100644
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -228,7 +228,7 @@ Spacing_spanner::prune_loose_columns (Grob *me, vector<Grob*> *cols,
 	  extract_grob_set (unsmob_grob (rns), "right-items", right_items);
 	  if (right_items.size () == 0 || !unsmob_grob (lns))
 	    {
-	      c->programming_error ("Can't determine neighbors for floating column. ");
+	      c->programming_error ("Cannot determine neighbors for floating column. ");
 	      c->set_object ("between-cols", scm_cons (cols->at (i-1)->self_scm (),
 						       cols->at (i+1)->self_scm ()));
 	    }
diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index 28e2ea675d..e5938f0852 100644
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -84,7 +84,7 @@ Span_dynamic_performer::process_music ()
     {
       if (!span_start_event_)
 	{
-	  span_events_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
+	  span_events_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
 	  span_events_[STOP] = 0;
 	}
       else
diff --git a/lily/stream-event-scheme.cc b/lily/stream-event-scheme.cc
index 1f890782a4..46f19b2ee2 100644
--- a/lily/stream-event-scheme.cc
+++ b/lily/stream-event-scheme.cc
@@ -13,12 +13,13 @@ LY_DEFINE (ly_make_stream_event, "ly:make-stream-event",
 	   "Creates a stream event of class @var{cl} with the given mutable property list.\n" )
 {
   SCM_ASSERT_TYPE (scm_is_symbol (cl), cl, SCM_ARG1, __FUNCTION__, "symbol");
-  if (proplist != SCM_UNDEFINED)
-    {
-      SCM_ASSERT_TYPE (scm_list_p (proplist), proplist, SCM_ARG2, __FUNCTION__, "association list");
-    }
-  else
+
+  /* should be scm_list_p, but scm_list_p is expensive. */
+  SCM_ASSERT_TYPE (scm_is_pair (proplist), proplist, SCM_ARG2, __FUNCTION__, "association list");
+  
+  if (proplist == SCM_UNDEFINED)
     proplist = SCM_EOL;
+
   Stream_event *e = new Stream_event (cl, proplist);
   return e->unprotect ();
 }
@@ -42,3 +43,20 @@ LY_DEFINE (ly_event_set_property, "ly:event-set-property!",
   SCM_ASSERT_TYPE (sc, ev, SCM_ARG1, __FUNCTION__, "event");
   return ly_prob_set_property_x (ev, sym, val);
 }
+
+LY_DEFINE (ly_event_deep_copy, "ly:event-deep-copy",
+	   1, 0, 0, (SCM m),
+	   "Copy @var{m} and all sub expressions of @var{m}")
+{
+  SCM copy = m;
+  if (Stream_event *ev = unsmob_stream_event (m))
+    {
+      ev = ev->clone ();
+      copy = ev->unprotect ();
+    }
+  else if (scm_is_pair (m))
+    copy = scm_cons (ly_event_deep_copy (scm_car (m)),
+		     ly_event_deep_copy (scm_cdr (m)));
+
+  return copy;
+}
diff --git a/lily/stream-event.cc b/lily/stream-event.cc
index ff736d8832..12219884b1 100644
--- a/lily/stream-event.cc
+++ b/lily/stream-event.cc
@@ -35,11 +35,10 @@ Stream_event::Stream_event (SCM class_name, Input *origin)
     set_spot (origin);
 }
 
-Stream_event::Stream_event (Stream_event *ev)
-  : Prob (ly_symbol2scm ("Stream_event"), SCM_EOL)
+SCM
+Stream_event::copy_mutable_properties () const
 {
-  mutable_property_alist_ = scm_copy_tree (ev->mutable_property_alist_);
-  immutable_property_alist_ = ev->immutable_property_alist_;
+  return ly_event_deep_copy (mutable_property_alist_);
 }
 
 Input *
diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index a9e6556734..4fb33f7199 100644
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -113,7 +113,7 @@ Tab_note_heads_engraver::process_music ()
 
       while (!string_found)
 	{
-	  int fret = unsmob_pitch (scm_pitch)->semitone_pitch ()
+	  int fret = unsmob_pitch (scm_pitch)->rounded_semitone_pitch ()
 	    - scm_to_int (scm_list_ref (string_tunings, scm_from_int (tab_string - 1)));
 	  if (fret < min_fret)
 	    tab_string += high_string_one ? 1 : -1;
diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 28f88fd76f..2994956a50 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -58,7 +58,7 @@ Text_spanner_engraver::process_music ()
   if (event_drul_[STOP])
     {
       if (!span_)
-	event_drul_[STOP]->origin ()->warning (_ ("can't find start of text spanner"));
+	event_drul_[STOP]->origin ()->warning (_ ("cannot find start of text spanner"));
       else
 	{
 	  finished_ = span_;
diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index a55f313735..527091267f 100644
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -48,7 +48,7 @@ Tie_formatting_problem::get_attachment (Real y, Drul_array<int> columns) const
       Tuple2<int> key (columns[d], int (d));
       Chord_outline_map::const_iterator i (chord_outlines_.find (key));
       if (i == chord_outlines_.end ())
-	programming_error ("Can't find chord outline");
+	programming_error ("Cannot find chord outline");
       else
 	attachments[d] = i->second.height (y);
     }
diff --git a/lily/tie.cc b/lily/tie.cc
index 2aab6ac2b1..73041c6a83 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -300,6 +300,7 @@ ADD_INTERFACE (Tie,
 	       "dash-period "
 	       "details "
 	       "direction "
+	       "head-direction "
 	       "line-thickness " 
 	       "quant-score "
 	       "staff-position "
diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index b25d6154e5..0fa39c662a 100644
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -148,7 +148,7 @@ Translator_group::create_child_translator (SCM sev)
     {
       Translator *type = get_translator (scm_car (s));
       if (!type)
-	warning (_f ("can't find: `%s'", ly_symbol2string (scm_car (s)).c_str ()));
+	warning (_f ("cannot find: `%s'", ly_symbol2string (scm_car (s)).c_str ()));
       else
 	{
 	  Translator *tr = type->clone ();
diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 3f07d5b5ac..844af53736 100644
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -65,7 +65,7 @@ Trill_spanner_engraver::process_music ()
   if (event_drul_[STOP])
     {
       if (!span_)
-	event_drul_[STOP]->origin ()->warning (_ ("can't find start of trill spanner"));
+	event_drul_[STOP]->origin ()->warning (_ ("cannot find start of trill spanner"));
       else
 	{
 	  finished_ = span_;
diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 441fdd7610..66930ce6bd 100644
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -72,7 +72,8 @@ Tuplet_engraver::listen_tuplet_span (Stream_event *ev)
       tuplets_.pop_back ();
     }
   else 
-    programming_error (_ ("invalid direction of tuplet-span-event"));
+    programming_error (_f ("direction of %s invalid: %d",
+			   "tuplet-span-event", int (dir)));
 }
 
 void
diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 41b0c7cc78..532ac965e6 100644
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -141,7 +141,7 @@ Volta_engraver::process_music ()
 
   if (end && !volta_span_)
     /* fixme: be more verbose.  */
-    warning (_ ("can't end volta spanner"));
+    warning (_ ("cannot end volta spanner"));
   else if (end)
     {
       end_volta_span_ = volta_span_;
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index f69cc77fbc..fc0b867e82 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -554,8 +554,8 @@ AncientRemoveEmptyStaffContext = \context {
   printKeyCancellation = ##t
   keyAlterationOrder = #`(
     (6 . ,FLAT) (2  . ,FLAT) (5 . ,FLAT ) (1  . ,FLAT) (4  . ,FLAT) (0  . ,FLAT) (3  . ,FLAT)
-    (3  . ,SHARP) (0 . ,SHARP) (4 . ,SHARP) (1 . ,SHARP) (5 . ,SHARP) (2 . ,SHARP) (6 . ,SHARP)
-    (6 . ,DOUBLE-FLAT) (2  . ,DOUBLE-FLAT) (5 . ,DOUBLE-FLAT ) (1  . ,DOUBLE-FLAT) (4  . ,DOUBLE-FLAT) (0  . ,DOUBLE-FLAT) (3 . ,DOUBLE-FLAT)
+    (3 . ,SHARP) (0 . ,SHARP) (4 . ,SHARP) (1 . ,SHARP) (5 . ,SHARP) (2 . ,SHARP) (6 . ,SHARP)
+    (6 . ,DOUBLE-FLAT) (2 . ,DOUBLE-FLAT) (5 . ,DOUBLE-FLAT ) (1 . ,DOUBLE-FLAT) (4 . ,DOUBLE-FLAT) (0 . ,DOUBLE-FLAT) (3 . ,DOUBLE-FLAT)
     (3  . ,DOUBLE-SHARP) (0 . ,DOUBLE-SHARP) (4 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (5 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (6 . ,DOUBLE-SHARP)
   )
 
diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 077c965bd5..05ed471320 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -610,9 +610,8 @@ transposition =
 
    (context-spec-music
     (make-property-set 'instrumentTransposition
-		       (ly:pitch-diff (ly:make-pitch 0 0 0) (pitch-of-note pitch-note)))
-        'Staff
-))
+		       (ly:pitch-negate (pitch-of-note pitch-note)))
+        'Staff))
 
 tweak = #(define-music-function (parser location sym val arg)
 	   (symbol? scheme? ly:music?)
diff --git a/make/doclang-targets.make b/make/doclang-targets.make
index 7547e39ea6..6d46749eef 100644
--- a/make/doclang-targets.make
+++ b/make/doclang-targets.make
@@ -15,7 +15,7 @@ MAKEINFO = LANG=$(ISOLANG) $(MAKEINFO_PROGRAM) --force
 $(outdir)/lilypond/index.html: $(outdir)/lilypond.nexi doc-po
 	mkdir -p $(dir $@)
 	-$(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
-	find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) $(top-src-dir)/buildscripts/html-gettext.py $(depth)/Documentation/po/$(outdir) $(ISOLANG)
+	find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) $(buildscript-dir)/html-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG)
 
 $(outdir)/lilypond.html: $(outdir)/lilypond.nexi
 	-$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index e26aab9227..1e60313993 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -28,8 +28,8 @@ LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) -I $(input-
 ANTI_ALIAS_FACTOR=2
 LILYPOND_JOBS=$(if $(CPU_COUNT),-djob-count=$(CPU_COUNT),)
 LILYPOND_BOOK_LILYPOND_FLAGS=--backend=eps --formats=ps,png,pdf $(LILYPOND_JOBS) -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -dcheck-internal-types -ddump-signatures -danti-alias-factor=$(ANTI_ALIAS_FACTOR)
-
-LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) $(LILYPOND_BOOK_LILYPOND_FLAGS)"
+LILYPOND_BOOK_VERBOSE = --verbose
+LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) $(LILYPOND_BOOK_LILYPOND_FLAGS)"  $(LILYPOND_BOOK_VERBOSE)
 TEXINPUTS=$(top-src-dir)/tex/::
 export TEXINPUTS
 
diff --git a/make/ly-rules.make b/make/ly-rules.make
index e7dbb42719..8b59dc9619 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -2,18 +2,18 @@
 
 
 $(outdir)/%.latex:  %.doc
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --verbose $(LILYPOND_BOOK_FLAGS) $<
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir)  $(LILYPOND_BOOK_FLAGS) $<
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
 	rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.*tex 2>/dev/null)
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
 
 
 $(outdir)/%.texi: $(outdir)/%.tely
 	rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.*tex 2>/dev/null)
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
 #
 # DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
 #	rm -f $<
@@ -22,7 +22,7 @@ $(outdir)/%.texi: $(outdir)/%.tely
 # for plain info doco: don't run lilypond
 $(outdir)/%.nexi: %.tely
 	rm -f $(outdir)/$*.texi
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) --process='true' $<
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) --process='true' $<
 	mv -f $(outdir)/$*.texinfo $@ 2>/dev/null || mv -f $(outdir)/$*.texi $@
 
 $(outdir)/%.info: $(outdir)/%.nexi
diff --git a/make/lysdoc-targets.make b/make/lysdoc-targets.make
index 090c6c753c..2de20828a9 100644
--- a/make/lysdoc-targets.make
+++ b/make/lysdoc-targets.make
@@ -1,5 +1,5 @@
 
 
-local-WWW: $(outdir)/$(NAME).html $(outdir)/$(NAME).pdf
+local-WWW: $(outdir)/collated-files.html $(outdir)/collated-files.pdf
 
 #.PRECIOUS: $(outdir)/$(NAME).texi
diff --git a/po/cs.po b/po/cs.po
index 1309db8c54..3b0152d231 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
-"PO-Revision-Date: 2002-09-28 10:27+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
+"PO-Revision-Date: 2006-12-23 15:31+0100\n"
 "Last-Translator: Tomá¹ Kopeèek <xkopec14@stud.fit.vutbr.cz>\n"
 "Language-Team: Czech <cz@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -71,149 +71,160 @@ msgid "Running %s..."
 msgstr "Bì¾í %s..."
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "varování: %s\n"
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
-#, fuzzy
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr "zapisuje výstup do SOUBORu"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr ""
+"Chyby v programu oznamujte na adrese %s (pouze anglicky),\n"
+"pøipomínky k pøekladu zasílejte na <cs@li.org> (èesky)."
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+#, fuzzy
+msgid "Examples:"
+msgstr "Pøíklad:"
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, fuzzy, c-format, python-format
 msgid "warning: %s"
 msgstr "varování: %s\n"
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, fuzzy, c-format, python-format
 msgid "error: %s"
 msgstr "chyba: %s\n"
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 #, fuzzy
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 "Distribuováno ve znìní licence GNU General Public License. Program je "
 "nabízen BEZ jakékoliv ZÁRUKY"
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "Zpracovávám `%s'..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "nelze otevøít soubor: `%s'"
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "nelze nalézt implicitní font: `%s'"
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR"
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr "zapisuje výstup do SOUBORu"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "SOUBOR"
 
-#: etf2ly.py:1204 midi2ly.py:899
-#, fuzzy
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr "vypisuje záruku a copyright"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr ""
+
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, fuzzy, python-format
 msgid "Exiting (%d)..."
 msgstr "Konèím ... "
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s by"
@@ -228,7 +239,8 @@ msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr ""
 
 #: lilypond-book.py:135
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr ""
 
 #: lilypond-book.py:138
@@ -236,6 +248,10 @@ msgstr ""
 msgid "add DIR to include path"
 msgstr "pøidává ADRESÁØ do vyhledávací cesty"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "ADRESÁØ"
+
 #: lilypond-book.py:143
 #, fuzzy
 msgid "write output to DIR"
@@ -249,149 +265,149 @@ msgstr ""
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "vypisuje více informací"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "vypisuje záruku a copyright"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, fuzzy, python-format
 msgid "file not found: %s"
 msgstr "klíè `%s' nebyl nalezen"
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, fuzzy, python-format
 msgid "Opening filter `%s'"
 msgstr "nelze nalézt soubor: `%s'"
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr "Hlá¹ení chyby je takovéto:"
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 #, fuzzy
 msgid "Writing snippets..."
 msgstr "Zapisuji `%s'..."
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 #, fuzzy
 msgid "Processing..."
 msgstr "Zpracovávám `%s'..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 #, fuzzy
 msgid "All snippets are up to date..."
 msgstr "uvolnìte se, %s je aktuální"
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "nelze nalézt implicitní font: `%s'"
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, fuzzy, python-format
 msgid "%s is up to date."
 msgstr "uvolnìte se, %s je aktuální"
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "Zapisuji `%s'..."
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, fuzzy, python-format
 msgid "Reading %s..."
 msgstr "Odstraòuji %s..."
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 #, fuzzy
 msgid "Dissecting..."
 msgstr "Prohledávám `%s'..."
 
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, fuzzy, python-format
 msgid "Compiling %s..."
 msgstr "Odstraòuji %s..."
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, fuzzy, python-format
 msgid "Processing include: %s"
 msgstr "Zpracovávám `%s'..."
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, fuzzy, python-format
 msgid "Removing `%s'"
 msgstr "Vyvolávám `%s'"
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, fuzzy, python-format
 msgid "Writing fonts to %s..."
 msgstr "nelze vytvoøit adresáø: `%s'"
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "varování: "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "chyba: "
 
@@ -404,9 +420,10 @@ msgstr "Kon
 msgid "%s output to `%s'..."
 msgstr "výstup %s se zapisuje do `%s'..."
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
-msgstr "Pøevádí MIDI na zdrojový text pro LilyPond."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
+msgstr "Pøevede soubor mup na zdrojový text LilyPondu."
 
 #: midi2ly.py:875
 msgid "print absolute pitches"
@@ -450,34 +467,60 @@ msgstr "zpracuje ka
 
 #: midi2ly.py:905
 #, fuzzy
-msgid "example"
+msgid "Examples"
 msgstr "Pøíklad:"
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "na pøíkazové øádce nebyly zadány ¾ádné soubory."
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Toto je svobodný software. Je chránìn GNU General Public License \n"
+"a vy jste vítáni k jeho zmìnì a (nebo) ¹íøení jeho kopií za dodr¾ení\n"
+"urèitých podmínek. Pro více informací spus»te program takto: `%s --"
+"warranty'.\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "zapisuje výstup do SOUBORu"
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "volba `%s' vy¾aduje argument"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: getopt-long.cc:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "volba `%s' nemá argumenty"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "neznámá volba: `%s'"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "neplatný argument `%s' pro volbu `%s'"
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, fuzzy, c-format
 msgid "programming error: %s"
 msgstr "chyba programrátora: %s (Pokraèuji: dr¾te mi palce)\n"
@@ -486,86 +529,75 @@ msgstr "chyba programr
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, fuzzy, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr "Sazba posuvek musí zaèínat jménem kontextu: %s"
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr "Posuvka `%s' nebyla nalezena"
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "nelze nalézt font: `%s'"
 
-#: all-font-metrics.cc:165
-#, fuzzy
-msgid "loading default font"
-msgstr "Nahrávám implicitní font"
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "nelze nalézt implicitní font: `%s'"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(vyhledávací cesta: `%s')"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-#, fuzzy
-msgid "giving up"
-msgstr "Vzdávám"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "nelze zmìnit `%s' na `%s'"
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -579,19 +611,20 @@ msgstr "tr
 msgid "unterminated beam"
 msgstr "neukonèený trámec"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr "no¾ka musí mít strukturu Rhythmic"
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+#, fuzzy
+msgid "stem does not fit in beam"
 msgstr "no¾ka se nevejde pod trámec"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr "trámec byl zaèat zde"
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 #, fuzzy
 msgid "no feasible beam position"
 msgstr "Nebylo nalezeno vhodné místo pro øádkový zlom"
@@ -601,24 +634,24 @@ msgstr "Nebylo nalezeno vhodn
 msgid "removing beam with no stems"
 msgstr "trámec má ménì ne¾ dvì viditelné no¾ky"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, fuzzy, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Není záznam pro rozestup %s a `%s'"
 
 #: change-iterator.cc:23
 #, fuzzy, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "nelze zmìnit `%s' na `%s'"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "nelze nalézt kontext `%s'"
 
 #. We could change the current translator's id, but that would make
@@ -650,7 +683,7 @@ msgstr "neukon
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr "klíè `%s' nebyl nalezen"
@@ -665,7 +698,7 @@ msgstr "nezn
 msgid "junking empty cluster"
 msgstr "matoucí osamocený porrectus"
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
@@ -673,26 +706,26 @@ msgstr ""
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
 #, fuzzy
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "nelze nalézt ¾ádný vhodný font"
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, fuzzy, c-format
 msgid "program has no such type: `%s'"
 msgstr "Program nemá takový typ"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "nelze nalézt nebo vytvoøit: `%s'"
 
 #: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "nelze nalézt nebo vytvoøit `%s' nazvaný `%s'"
 
 #: context.cc:276
@@ -702,7 +735,7 @@ msgstr ""
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "nelze nalézt nebo vytvoøit: `%s'"
 
 #: custos.cc:77
@@ -710,17 +743,22 @@ msgstr "nelze nal
 msgid "custos `%s' not found"
 msgstr "kustod `%s' nebyl nalezen"
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, fuzzy, c-format
 msgid "Unknown event class %s"
 msgstr "neznámý pøekladaè: `%s':"
 
+#: dots.cc:38
+#, fuzzy, c-format
+msgid "dot `%s' not found"
+msgstr "pomlka `%s' nebyla nalezena, "
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "nelze nalézt zaèátek (de)crescenda"
 
 #: dynamic-engraver.cc:195
@@ -740,11 +778,7 @@ msgstr "Crescendo za
 msgid "unterminated (de)crescendo"
 msgstr "neukonèené (de)crescendo"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "neukonené prodlou¾ení"
 
@@ -767,15 +801,15 @@ msgstr "nelze vytvo
 msgid "adding font directory: %s"
 msgstr "nelze vytvoøit adresáø: `%s'"
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "neukonèená ligatura"
@@ -808,47 +842,38 @@ msgstr ""
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "nelze nalézt zaèátek ligatury"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, fuzzy, c-format
 msgid "Unknown interface `%s'"
 msgstr "neznámý pøekladaè: `%s':"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 #, fuzzy
 msgid "decrescendo too small"
 msgstr "Text_spanner je pøíli¹ malý"
 
-#: hairpin.cc:180
-#, fuzzy
-msgid "crescendo too small"
-msgstr "Text_spanner je pøíli¹ malý"
-
-#: horizontal-bracket-engraver.cc:58
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:59
+msgid "do not have that many brackets"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 #, fuzzy
 msgid "conflicting note group events"
 msgstr "Nalezeny konfliktní tóniny."
@@ -867,96 +892,101 @@ msgstr "neukon
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "nelze nalézt soubor: `%s'"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(vyhledávací cesta: `%s')"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "neznámá pozice"
 
-#: ligature-engraver.cc:95
+#: ligature-engraver.cc:93
 #, fuzzy
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr "nelze nalézt zaèátek ligatury"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr "chybí pravá hranice"
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 #, fuzzy
 msgid "already have a ligature"
 msgstr "ligatura ji¾ existuje"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr "chybí levá hranice"
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 #, fuzzy
 msgid "unterminated ligature"
 msgstr "neukonèená ligatura"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 #, fuzzy
 msgid "ignoring rest: ligature may not contain rest"
 msgstr "ligatura by nemìla obsahovat pomlku; ignoruji pomlku"
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 #, fuzzy
 msgid "ligature was started here"
 msgstr "ligatura byla zaèata zde"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(nahrávací cesta: `%s')"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, fuzzy, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr "Nelze nalézt kontrolu typu vlastnosti pro `%s' (%s)."
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 #, fuzzy
 msgid "perhaps a typing error?"
 msgstr "Mo¾ná se stal pøeklep?"
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 #, fuzzy
 msgid "doing assignment anyway"
 msgstr "Pøesto pøiøazuji."
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, fuzzy, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr "Kontrola typu `%s' selhala; hodnota `%s' musí být typu `%s'"
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "Název identifikátoru je klíèové slovo: `%s'"
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "chyba na konci souboru: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, fuzzy, c-format
 msgid "deprecated function called: %s"
 msgstr "nelze nalézt znak nazvaný: `%s'"
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:88
 #, fuzzy, c-format
-msgid "Changing working directory to `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr "nelze vytvoøit adresáø: `%s'"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, fuzzy, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "nelze nalézt soubor: `%s'"
 
 #: lily-parser-scheme.cc:125
@@ -964,21 +994,21 @@ msgstr "nelze nal
 msgid "Processing `%s'"
 msgstr "Zpracovávám `%s'..."
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Analyzuji..."
 
-#: lily-parser.cc:126
+#: lily-parser.cc:127
 #, fuzzy
-msgid "braces don't match"
+msgid "braces do not match"
 msgstr "Poèet závorek nesouhlasí"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, fuzzy, c-format
 msgid "cannot find Voice `%s'"
 msgstr "nelze nalézt soubor: `%s'"
 
-#: main.cc:117
+#: main.cc:116
 #, fuzzy, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -991,7 +1021,7 @@ msgstr ""
 "urèitých podmínek. Pro více informací spus»te program takto: `%s --"
 "warranty'.\n"
 
-#: main.cc:123
+#: main.cc:122
 #, fuzzy
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
@@ -1003,7 +1033,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1019,134 +1049,134 @@ msgstr ""
 "GNU General Public License. Pokud se tak nestalo, napi¹te Free Software\n"
 "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139. USA\n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
+#: main.cc:155
 #, fuzzy
-msgid "SYM=VAL"
+msgid "SYM[=VAL]"
 msgstr "KLÍÈ=HODN"
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr "VÝRAZ"
 
-#: main.cc:160
+#: main.cc:159
 #, fuzzy
 msgid "evaluate scheme code"
 msgstr "Nelze vvyhodnotit Scheme v bezpeèném módu"
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 #, fuzzy
 msgid "generate DVI (tex backend only)"
 msgstr "vytváøí PDF výstup"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 #, fuzzy
 msgid "generate PDF (default)"
 msgstr "vytváøí PDF výstup"
 
-#: main.cc:167
+#: main.cc:165
 #, fuzzy
 msgid "generate PNG"
 msgstr "vytváøí PDF výstup"
 
-#: main.cc:168
+#: main.cc:166
 #, fuzzy
 msgid "generate PostScript"
 msgstr "vytváøí PostScriptový výstup"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:170
-msgid "print this help"
-msgstr "tato nápovìda"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr "POLE"
 
-#: main.cc:171
+#: main.cc:169
 #, fuzzy
-msgid "dump a header field to file BASENAME.FIELD"
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr "zapísuje pole hlavièky do BASENAME.POLE"
 
-#: main.cc:172
-msgid "DIR"
-msgstr "ADRESÁØ"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "pøidává ADRESÁØ do vyhledávací cesty"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "pou¾ívá SOUBOR jako inicializaèní soubor"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "vytváøí PostScriptový výstup"
 
-#: main.cc:179
+#: main.cc:178
 #, fuzzy
 msgid "write output to FILE (suffix will be added)"
 msgstr "zapisuje výstup do SOUBORu"
 
-#: main.cc:180
+#: main.cc:179
 #, fuzzy
 msgid "generate a preview of the first system"
 msgstr "vytvoøí obrázek prvního systému"
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "vypisuje èíslo verze"
 
-#: main.cc:223
+#: main.cc:224
 #, fuzzy, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1154,81 +1184,81 @@ msgid ""
 msgstr "Copyright (c) %s by"
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR..."
 
-#: main.cc:252
+#: main.cc:253
 #, fuzzy, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Sází hudbu a/nebo pøehrává MIDI ze SOUBORu."
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Pøepínaèe:"
 
-#: main.cc:262
+#: main.cc:263
 #, fuzzy, c-format
 msgid "Report bugs via %s"
 msgstr ""
 "Chyby v programu oznamujte na adrese %s (pouze anglicky),\n"
 "pøipomínky k pøekladu zasílejte na <cs@li.org> (èesky)."
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:322
+#: main.cc:323
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "takové nastavení neexistuje: `%s'"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "neexistující kontext: %s"
 
-#: main.cc:341
+#: main.cc:342
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "nelze zmìnit `%s' na `%s'"
 
-#: main.cc:349
+#: main.cc:350
 #, fuzzy, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "nelze vytvoøit adresáø: `%s'"
 
-#: main.cc:356
+#: main.cc:357
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "nelze zmìnit `%s' na `%s'"
 
-#: main.cc:362
+#: main.cc:363
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "nelze zmìnit `%s' na `%s'"
 
-#: main.cc:368
+#: main.cc:369
 #, fuzzy, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "nelze vytvoøit adresáø: `%s'"
 
 #: main.cc:415
@@ -1236,7 +1266,7 @@ msgstr "nelze vytvo
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1250,40 +1280,40 @@ msgstr ""
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr "ligatura s ménì ne¾ dvìma hlavièkami -> vynechávám"
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 #, fuzzy
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr "nelze urèit vý¹ku poèátku ligatury -> vynechávám"
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 #, fuzzy
 msgid "single note ligature - skipping"
 msgstr "interval ligatury je prima -> vynechávám"
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr "interval ligatury je prima -> vynechávám"
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 #, fuzzy
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr "menzurální ligatura: délka není ani jedna z L, B, S -> vynechávám"
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1291,7 +1321,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr "neznámý pøípad"
 
@@ -1310,115 +1340,118 @@ msgstr "Mensural_ligature: (join_left == 0)"
 msgid "no such MIDI instrument: `%s'"
 msgstr "takový nástroj neexistuje: `%s'"
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "podivná vý¹ka"
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
 #: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "nelze otevøít soubor: `%s'"
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "nelze otevøít soubor: `%s'"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:208
+#: music.cc:207
 #, fuzzy, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "Transpozice o %s vytváøí více posuvek ne¾ dvì"
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "Pøíli¹ mnoho kolizí notových sloupcù. Ignoruji je."
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, fuzzy, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr "notová hlavièka `%s' nebyla nalezena"
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "nelze otevøít soubor: `%s'"
 
 #: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "nelze nalézt font: `%s'"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 msgid "Drawing systems..."
 msgstr ""
 
-#: pango-font.cc:215
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "`%s' není PostScriptovým souborem"
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1457,15 +1490,15 @@ msgstr "neuzav
 msgid "Track..."
 msgstr "Stopa ... "
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI výstup do `%s'..."
@@ -1474,23 +1507,23 @@ msgstr "MIDI v
 msgid "unterminated phrasing slur"
 msgstr "neukonèené frázovací legato"
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "nelze nalézt zaèátek pedálu piana: `%s'"
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, fuzzy, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "nelze nalézt zaèátek pedálu piana: `%s'"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, fuzzy, c-format
 msgid "no such internal option: %s"
 msgstr "Neznámá interní volba!"
@@ -1500,111 +1533,110 @@ msgstr "Nezn
 msgid "not a grob name, `%s'"
 msgstr "Není jménem grobu, `%s'."
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "nelze vytvoøit adresáø: `%s'"
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "neexistující kontext: %s"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "neexistující kontext: %s"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "Relocation file %s\n"
+msgid "Relocation file: %s"
 msgstr "nelze otevøít soubor: `%s'"
 
-#: relocate.cc:358
-#, fuzzy, c-format
-msgid "can't open file %s"
-msgstr "nelze otevøít soubor: `%s'"
-
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "pøíli¹ mnoho kolidujících pomlk"
 
-#: rest.cc:143
+#: rest.cc:144
 #, fuzzy, c-format
 msgid "rest `%s' not found"
 msgstr "pomlka `%s' nebyla nalezena, "
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "nelze nalézt `%s'"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 #, fuzzy
 msgid "Music font has not been installed properly."
 msgstr "Písma nebyla správnì nainstalována. Konèím"
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(vyhledávací cesta: `%s')"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "V partituøe je tøeba hudby"
 
-#: score.cc:223
+#: score.cc:226
 #, fuzzy
 msgid "this is the previous music"
 msgstr "Toto je záznam chyb:\n"
 
-#: score.cc:228
+#: score.cc:231
 #, fuzzy
 msgid "errors found, ignoring music expression"
 msgstr "Nalezeny chyby/*, nezpracovávám partituru*/"
@@ -1612,7 +1644,7 @@ msgstr "Nalezeny chyby/*, nezpracov
 #. FIXME:
 #: script-engraver.cc:102
 #, fuzzy
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr "Nevím, jak interpretovat artikulaèní znaménko `%s'"
 
 #: script-engraver.cc:103
@@ -1624,17 +1656,18 @@ msgstr ""
 msgid "No spring between column %d and next one"
 msgstr "Chybí pru¾ný výplnìk mezi sloupcem %d a následujícím"
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "neukonèená ligatura"
 
-#: slur-engraver.cc:165
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "nelze nalézt: `%s'"
 
 #: source-file.cc:74
@@ -1646,58 +1679,58 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr "délka tremola je pøíli¹ velká"
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, fuzzy, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "Pøidávám hlavièku k nekompatibilní no¾ce (typ = %d)"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 #, fuzzy
 msgid "weird stem size, check for narrow beams"
 msgstr "Podivná velikost no¾ky; zkontrolujte úzké trámce"
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr "praporek `%s' nebyl nalezen"
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr "symbol praporku `%s' nebyl nalezen"
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr "Poèet prvkù je %d."
 
-#: system.cc:270
+#: system.cc:276
 #, fuzzy, c-format
 msgid "Grob count %d"
 msgstr "Poèet grobù je %d "
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr "nelze nalézt zaèátek textového pøeklenutí"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr "ji¾ obsahuje textové pøeklenutí"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr "neukonèené textové pøeklenutí"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "osamocená ligatura"
 
@@ -1706,14 +1739,14 @@ msgstr "osamocen
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
@@ -1724,43 +1757,39 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr "neznámý pøekladaè: `%s':"
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "nelze nalézt: `%s'"
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "nelze nalézt zaèátek textového pøeklenutí"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "ji¾ obsahuje textové pøeklenutí"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
@@ -1783,275 +1812,286 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr "Mensural_ligature: (join_left == 0)"
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "nelze nalézt zaèátek textového pøeklenutí"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 #, fuzzy
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr "Ji¾ má repetici. Pøedèasnì ji ukonèuji."
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "ji¾ obsahuje textové pøeklenutí"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+#, fuzzy
+msgid "giving up"
+msgstr "Vzdávám"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 #, fuzzy
 msgid "second argument must be pitch list"
 msgstr "Druhý argument musí být symbol"
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 #, fuzzy
 msgid "have to be in Lyric mode for lyrics"
 msgstr "Pro zápis textu musíte být v módu Lyric"
 
-#: parser.yy:1612
+#: parser.yy:1604
 #, fuzzy
 msgid "expecting string as script definition"
 msgstr "Oèekáván øetìzec jako definice skriptu"
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "není délkou: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 #, fuzzy
 msgid "have to be in Note mode for notes"
 msgstr "Pro zápis not musíte být v módu Note"
 
-#: parser.yy:2004
+#: parser.yy:1987
 #, fuzzy
 msgid "have to be in Chord mode for chords"
 msgstr "Pro zápis akordù musíte být v módu Chord"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, fuzzy, c-format
 msgid "Renaming input to: `%s'"
 msgstr "Matoucí po¾adavek: `%s'"
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "uvnitø poznámky nalezen konec souboru"
 
-#: lexer.ll:290
+#: lexer.ll:288
 #, fuzzy
 msgid "\\maininput not allowed outside init files"
 msgstr "\\maininput není povolen mimo inicializaèní soubory"
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "¹patný nebo nedefinovaný identifikátor: `%s'"
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 #, fuzzy
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr "Na konci textu byla nalezena závorka. Zapomnìl jste na mezeru?"
 
-#: lexer.ll:561
+#: lexer.ll:559
 #, fuzzy
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr "Na konci textu byla nalezena závorka. Zapomnìl jste na mezeru?"
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "neplatný znak: `%c'"
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "neznámá escape sekvence: `\\%s'"
 
-#: lexer.ll:882
-#, fuzzy, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "Nesprávná verze lilypondu: %s (%s, %s)"
+#: lexer.ll:880 lexer.ll:881
+#, c-format
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:883
+#: lexer.ll:881 lexer.ll:882
 #, fuzzy
-msgid "Consider updating the input with the convert-ly script"
+msgid "consider updating the input with the convert-ly script"
 msgstr "Zva¾te konverzi zdrojového textu pomocí skriptu convert-ly"
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, fuzzy, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, fuzzy, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Vyvolávám `%s'"
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr ""
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Converting to `~a'..."
 msgstr "Zapisuji `%s'..."
 
-#: backend-library.scm:110
-#, fuzzy, lisp-format
+#: backend-library.scm:108
+#, fuzzy, scheme-format
 msgid "Converting to ~a..."
 msgstr "Zapisuji `%s'..."
 
-#: backend-library.scm:156
-#, lisp-format
+#: backend-library.scm:145
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "není délkou: %d"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:737
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, fuzzy, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "nelze nalézt kontext `%s'"
 
-#: define-music-types.scm:757
-#, fuzzy, lisp-format
+#: define-music-types.scm:774
+#, fuzzy, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "neznámý pøekladaè: `%s':"
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
+#, fuzzy, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "nelze nalézt znak èíslo: %d"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "neznámý pøekladaè: `%s':"
 
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "Zpracovávám `%s'..."
 
 #: documentation-lib.scm:150
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Writing ~S..."
 msgstr "Zapisuji `%s'..."
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, fuzzy, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "nelze nalézt znak èíslo: %d"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "Zapisuji `%s'..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:379
-#, fuzzy, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "Nevím, jak interpretovat artikulaèní znaménko `%s'"
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2060,56 +2100,56 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "jméno souboru by nemìlo obsahovat mezery: `%s'"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 #, fuzzy
 msgid "Calculating page breaks..."
 msgstr "Poèítám pozice sloupcù..."
 
-#: lily-library.scm:510
-#, fuzzy, lisp-format
+#: lily-library.scm:593
+#, fuzzy, scheme-format
 msgid "unknown unit: ~S"
 msgstr "neznámý pøekladaè: `%s':"
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "nelze nalézt: `%s'"
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "závislosti se zapisují do `%s'..."
 
@@ -2117,49 +2157,49 @@ msgstr "z
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
+#: music-functions.scm:213
 #, fuzzy
-msgid "More alternatives than repeats. Junking excess alternatives"
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr "Více alternativ ne¾ opakování. Zahazuji nadbyteèné alternativy."
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, fuzzy, lisp-format
+#: music-functions.scm:538
+#, fuzzy, scheme-format
 msgid "music expected: ~S"
 msgstr "oèekávána mezera (whitespace)"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "nelze nalézt font: `%s'"
 
-#: music-functions.scm:953
-#, fuzzy, lisp-format
+#: music-functions.scm:942
+#, fuzzy, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "neznámá sazba posuvek: %s. Ignorováno"
 
@@ -2168,42 +2208,42 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "undefined: ~S"
 msgstr "nedefinované left_head"
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
+#, fuzzy, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "nelze nalézt zaèátek ligatury"
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr ""
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, lisp-format
+#: paper.scm:129
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "neznámý pøekladaè: `%s':"
 
@@ -2211,16 +2251,52 @@ msgstr "nezn
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, fuzzy, lisp-format
+#: ps-to-png.scm:88
+#, fuzzy, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "pøíkaz skonèil s návratovou hodnotou %d"
 
 #: to-xml.scm:190
-#, fuzzy
-msgid "assertion failed"
+#, fuzzy, scheme-format
+msgid "assertion failed: ~S"
 msgstr "Spu¹tìní LaTeXu selhalo"
 
+#, fuzzy
+#~ msgid "show warranty"
+#~ msgstr "vypisuje záruku a copyright"
+
+#~ msgid "Convert MIDI to LilyPond source."
+#~ msgstr "Pøevádí MIDI na zdrojový text pro LilyPond."
+
+#, fuzzy
+#~ msgid "example"
+#~ msgstr "Pøíklad:"
+
+#, fuzzy
+#~ msgid "loading default font"
+#~ msgstr "Nahrávám implicitní font"
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "nelze nalézt implicitní font: `%s'"
+
+#, fuzzy
+#~ msgid "crescendo too small"
+#~ msgstr "Text_spanner je pøíli¹ malý"
+
+#~ msgid "print this help"
+#~ msgstr "tato nápovìda"
+
+#~ msgid "silly pitch"
+#~ msgstr "podivná vý¹ka"
+
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "nelze otevøít soubor: `%s'"
+
+#, fuzzy
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "Nesprávná verze lilypondu: %s (%s, %s)"
+
 #~ msgid "no one to print a tremolos"
 #~ msgstr "není nikdo, kdo by tiskl tremola"
 
@@ -2237,7 +2313,7 @@ msgstr "Spu
 #~ msgid "no one to print a repeat brace"
 #~ msgstr "není nikdo, kdo by tiskl repetièní svorku"
 
-#~ msgid "can't find `%s' context"
+#~ msgid "cannot find `%s' context"
 #~ msgstr "nelze nalézt kontext `%s'"
 
 #~ msgid "Optimal demerits: %f"
@@ -2272,7 +2348,7 @@ msgstr "Spu
 #~ msgstr ""
 #~ "%s: TFM soubor má %u parametrù, co¾ je více ne¾ %u, které lze obslou¾it"
 
-#~ msgid "can't find ascii character: %d"
+#~ msgid "cannot find ascii character: %d"
 #~ msgstr "nelze nalézt ascii znak: %d"
 
 #~ msgid "no one to print a tuplet start bracket"
@@ -2291,12 +2367,9 @@ msgstr "Spu
 #~ msgstr "Více alternativ ne¾ opakování. Zahazuji nadbyteèné alternativy."
 
 #, fuzzy
-#~ msgid "can't find signature for music function"
+#~ msgid "cannot find signature for music function"
 #~ msgstr "nelze nalézt kontext `%s'"
 
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR"
-
 #~ msgid "(ignored)"
 #~ msgstr "(ignorováno)"
 
@@ -2325,12 +2398,6 @@ msgstr "Spu
 #~ msgid "command exited with value %d"
 #~ msgstr "pøíkaz skonèil s návratovou hodnotou %d"
 
-#~ msgid "Example:"
-#~ msgstr "Pøíklad:"
-
-#~ msgid "Convert mup to LilyPond source."
-#~ msgstr "Pøevede soubor mup na zdrojový text LilyPondu."
-
 #~ msgid "debug"
 #~ msgstr "debug"
 
@@ -2354,7 +2421,7 @@ msgstr "Spu
 #~ msgstr "Zapisuji `%s'..."
 
 #, fuzzy
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "nelze otevøít soubor: `%s'"
 
 #, fuzzy
@@ -2385,7 +2452,7 @@ msgstr "Spu
 #~ msgstr "nelze vytvoøit adresáø: `%s'"
 
 #, fuzzy
-#~ msgid "can't handle a percent repeat of length: %s"
+#~ msgid "cannot handle a percent repeat of length: %s"
 #~ msgstr "Nevím, jak zpracovat procentové opakování této délky."
 
 #~ msgid "lilypond -e EXPR means:"
@@ -2451,7 +2518,7 @@ msgstr "Spu
 #~ msgstr "nepøíli¹ záva¾ná chyba: "
 
 #, fuzzy
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "nelze nalézt font: `%s'"
 
 #, fuzzy
@@ -2494,7 +2561,7 @@ msgstr "Spu
 #~ msgid "Programming error: "
 #~ msgstr "chyba programrátora: %s (Pokraèuji: dr¾te mi palce)\n"
 
-#~ msgid "Can't switch translators, I'm there already"
+#~ msgid "Cannot switch translators, I'm there already"
 #~ msgstr "Nelze pøepnout pøekladaèe. Ji¾ jsem tam."
 
 #, fuzzy
@@ -2523,11 +2590,11 @@ msgstr "Spu
 #~ msgstr "FIXME: slouèení zmìn tóniny"
 
 #, fuzzy
-#~ msgid "kpathsea can't find %s file: `%s'"
+#~ msgid "kpathsea cannot find %s file: `%s'"
 #~ msgstr "Kpathsea nemù¾e nalézt TFM soubor `%s'"
 
 #, fuzzy
-#~ msgid "kpathsea can't find file: `%s'"
+#~ msgid "kpathsea cannot find file: `%s'"
 #~ msgstr "Kpathsea nemù¾e nalézt TFM soubor `%s'"
 
 #, fuzzy
@@ -2558,10 +2625,6 @@ msgstr "Spu
 #~ msgid "kpathsea can not find TFM file: `%s'"
 #~ msgstr "Kpathsea nemù¾e nalézt TFM soubor `%s'"
 
-#, fuzzy
-#~ msgid "Cannot switch translators, I'm there already"
-#~ msgstr "Nelze pøepnout pøekladaèe. Ji¾ jsem tam."
-
 #, fuzzy
 #~ msgid "Converting to `~a.ps'..."
 #~ msgstr "Zapisuji `%s'..."
@@ -2580,7 +2643,7 @@ msgstr "Spu
 #~ msgid "keep all output, output to directory %s.dir"
 #~ msgstr "ponechává ve¹keré výstupy, výstupní adresáø pojmenuje %s.dir"
 
-#~ msgid "don't run LilyPond"
+#~ msgid "do not run LilyPond"
 #~ msgstr "nespou¹tí LilyPond"
 
 #~ msgid "produce MIDI output only"
@@ -2640,7 +2703,7 @@ msgstr "Spu
 #~ msgstr "výstup %s se zapisuje do `%s'..."
 
 #, fuzzy
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "nelze nalézt soubor: `%s'"
 
 #, fuzzy
@@ -2656,7 +2719,7 @@ msgstr "Spu
 #~ msgstr "pøidává ADRESÁØ do závislostí"
 
 #, fuzzy
-#~ msgid "don't run lilypond"
+#~ msgid "do not run lilypond"
 #~ msgstr "nespou¹tí LilyPond"
 
 #~ msgid "write Makefile dependencies for every input file"
@@ -2795,7 +2858,7 @@ msgstr "Spu
 #~ msgid "from musical definition: %s"
 #~ msgstr "z hudební definice: %s"
 
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr "nelze nalézt zaèátek frázovacího legata"
 
 #, fuzzy
@@ -2923,5 +2986,5 @@ msgstr "Spu
 #~ msgid "Slur over rest?"
 #~ msgstr "Ligaturu pøes pomlku?"
 
-#~ msgid "Can't specify direction for this request"
+#~ msgid "Cannot specify direction for this request"
 #~ msgstr "Nelze urèit smìr pro tento po¾adavek"
diff --git a/po/da.po b/po/da.po
index 67e0903b99..81fc38df62 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
-"PO-Revision-Date: 2002-09-07 21:00+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
+"PO-Revision-Date: 2006-12-23 16:14+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
@@ -72,146 +72,157 @@ msgid "Running %s..."
 msgstr "Kør %s..."
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "advarsel: %s\n"
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "Brug: %s [FLAG]... FIL"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
-#, fuzzy
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr "skriv uddata til FIL"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr ""
+"Rapportér programfejl til %s\n"
+".Rapportér fejl i oversættelsen til <dansk@klid.dk>."
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+#, fuzzy
+msgid "Examples:"
+msgstr "Eksempel:"
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, fuzzy, c-format, python-format
 msgid "warning: %s"
 msgstr "advarsel: %s\n"
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, fuzzy, c-format, python-format
 msgid "error: %s"
 msgstr "fejl: %s\n"
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "Behandler \"%s\"..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "kan ikke åbne fil: \"%s\""
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "kan ikke finde standardskrifttype: \"%s\""
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "Brug: %s [FLAG]... FIL"
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr "skriv uddata til FIL"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "FIL"
 
-#: etf2ly.py:1204 midi2ly.py:899
-#, fuzzy
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr "vis garanti og copyright"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr ""
+
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, fuzzy, python-format
 msgid "Exiting (%d)..."
 msgstr "Afslutter... "
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright © %s af"
@@ -226,7 +237,8 @@ msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr ""
 
 #: lilypond-book.py:135
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr ""
 
 #: lilypond-book.py:138
@@ -234,6 +246,10 @@ msgstr ""
 msgid "add DIR to include path"
 msgstr "tilføj KATALOG til søgestien"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "KATALOG"
+
 #: lilypond-book.py:143
 #, fuzzy
 msgid "write output to DIR"
@@ -247,152 +263,152 @@ msgstr ""
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
 # Førklaring til --verbose (borde være længre)
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "vær udførlig"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "vis garanti og copyright"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, fuzzy, python-format
 msgid "file not found: %s"
 msgstr "Symbol ikke fundet, "
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, fuzzy, python-format
 msgid "Opening filter `%s'"
 msgstr "Renser \"%s\"..."
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr ""
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 #, fuzzy
 msgid "Writing snippets..."
 msgstr "Skriver \"%s\"..."
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 #, fuzzy
 msgid "Processing..."
 msgstr "Behandler..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 #, fuzzy
 msgid "All snippets are up to date..."
 msgstr "slap af, %s er seneste version"
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "kan ikke finde standardskrifttype: \"%s\""
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, fuzzy, python-format
 msgid "%s is up to date."
 msgstr "slap af, %s er seneste version"
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "Skriver \"%s\"..."
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
 # hær er det spørg om rensning af en temporærkatalog
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, fuzzy, python-format
 msgid "Reading %s..."
 msgstr "Renser %s..."
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 #, fuzzy
 msgid "Dissecting..."
 msgstr "Lister \"%s\"..."
 
 # hær er det spørg om rensning af en temporærkatalog
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, fuzzy, python-format
 msgid "Compiling %s..."
 msgstr "Renser %s..."
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, fuzzy, python-format
 msgid "Processing include: %s"
 msgstr "Behandler \"%s\"..."
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, fuzzy, python-format
 msgid "Removing `%s'"
 msgstr "Starter \"%s\""
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, fuzzy, python-format
 msgid "Writing fonts to %s..."
 msgstr "kan ikke oprette katalog: \"%s\""
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "advarsel: "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "fejl: "
 
@@ -407,9 +423,10 @@ msgstr "Afslutter... "
 msgid "%s output to `%s'..."
 msgstr "%s udskrevet til \"%s\"..."
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
-msgstr "Konvertér MIDI til LilyPond-klide."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
+msgstr "Konvertér mup til LilyPond-kilde."
 
 #: midi2ly.py:875
 msgid "print absolute pitches"
@@ -454,34 +471,59 @@ msgstr ""
 
 #: midi2ly.py:905
 #, fuzzy
-msgid "example"
+msgid "Examples"
 msgstr "Eksempel:"
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "ingen filer angivne på kommandolinjen."
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Dette er frit programmel. Det dækkes af \"GNU General Public License\",\n"
+"og du må ændre og/eller distribuere kopier af det under visse\n"
+"betingelser. Kør \"%s --warranty\" for mere information.\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "skriv uddata til FIL"
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "flag \"%s\" kræver et argument"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: getopt-long.cc:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "flag.gan \"%s\" tillader intet argument"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "ukendt flag: \"%s\""
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "ugyldigt argument \"%s\" til flag \"%s\""
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, fuzzy, c-format
 msgid "programming error: %s"
 msgstr "programmeringsfejl: "
@@ -490,86 +532,75 @@ msgstr "programmeringsfejl: "
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "kan ikke finde skrifttype: \"%s\""
 
-#: all-font-metrics.cc:165
-#, fuzzy
-msgid "loading default font"
-msgstr "Indlæser standardskrifttype"
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "kan ikke finde standardskrifttype: \"%s\""
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(søgesti: \"%s\")"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-#, fuzzy
-msgid "giving up"
-msgstr "Giver op"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "kan ikke ændre \"%s\" til \"%s\""
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -583,19 +614,20 @@ msgstr "har allerede en bj
 msgid "unterminated beam"
 msgstr "uafsluttet bjælke"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr "nodehals skal have en rytmisk struktur"
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+#, fuzzy
+msgid "stem does not fit in beam"
 msgstr "nodehalsen passer ikke i bjælke"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr "bjælken startede her"
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 #, fuzzy
 msgid "no feasible beam position"
 msgstr "Ingen mulig linjebrydning fandtes"
@@ -605,24 +637,24 @@ msgstr "Ingen mulig linjebrydning fandtes"
 msgid "removing beam with no stems"
 msgstr "bjælke har mindre end to synlige nodehalse"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Ingen mellemrums-indgang fra %s til `%s'"
 
 #: change-iterator.cc:23
 #, fuzzy, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "kan ikke ændre \"%s\" til \"%s\""
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "kan ikke finde omgivelsen \"%s\""
 
 #. We could change the current translator's id, but that would make
@@ -654,7 +686,7 @@ msgstr "ikke-afsluttet akkordtremolo"
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
@@ -668,7 +700,7 @@ msgstr "ukendt overs
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
@@ -676,26 +708,26 @@ msgstr ""
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
 #, fuzzy
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "kunne ikke finde nogen skrifttype som opfylder "
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, fuzzy, c-format
 msgid "program has no such type: `%s'"
 msgstr "Programmet har ingen sådan type"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "kan ikke finde eller oprette: \"%s\""
 
 #: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "kan ikke finde eller oprette \"%s\" kaldet \"%s\""
 
 #: context.cc:276
@@ -705,7 +737,7 @@ msgstr ""
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "kan ikke finde eller oprette: \"%s\""
 
 #: custos.cc:77
@@ -713,17 +745,22 @@ msgstr "kan ikke finde eller oprette: \"%s\""
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, fuzzy, c-format
 msgid "Unknown event class %s"
 msgstr "ukendt oversætter: \"%s\""
 
+#: dots.cc:38
+#, fuzzy, c-format
+msgid "dot `%s' not found"
+msgstr "Symbol ikke fundet, "
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "kan ikke finde starten på crescendo/diminuendo"
 
 #: dynamic-engraver.cc:195
@@ -743,11 +780,7 @@ msgstr "Cresc startede her"
 msgid "unterminated (de)crescendo"
 msgstr "uafsluttet crescendo/diminuendo"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "uafsluttet udvider"
 
@@ -770,15 +803,15 @@ msgstr "kan ikke oprette katalog: \"%s\""
 msgid "adding font directory: %s"
 msgstr "kan ikke oprette katalog: \"%s\""
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "uafsluttet legatobue"
@@ -811,45 +844,37 @@ msgstr ""
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "kan ikke finde start på legatobue"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, fuzzy, c-format
 msgid "Unknown interface `%s'"
 msgstr "ukendt oversætter: \"%s\""
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr "diminuendo for lille"
 
-#: hairpin.cc:180
-msgid "crescendo too small"
-msgstr "crescendo for lille"
-
-#: horizontal-bracket-engraver.cc:58
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:59
+msgid "do not have that many brackets"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 #, fuzzy
 msgid "conflicting note group events"
 msgstr "Konfliktende tonartssignaturer fundet."
@@ -868,96 +893,101 @@ msgstr "uafsluttet bindestreg"
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "kan ikke finde fil: \"%s\""
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(søgesti: \"%s\")"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "ukendt position"
 
-#: ligature-engraver.cc:95
+#: ligature-engraver.cc:93
 #, fuzzy
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr "kan ikke finde start på legatobue"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr "Ingen højrekant"
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 #, fuzzy
 msgid "already have a ligature"
 msgstr "har allerede en bjælke"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr "Ingen venstrekant"
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 #, fuzzy
 msgid "unterminated ligature"
 msgstr "uafsluttet legatobue"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 #, fuzzy
 msgid "ligature was started here"
 msgstr "bjælken startede her"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(indlæsningssøgesti: \"%s\")"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, fuzzy, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr "Kan ikke finde typetjek for egenskab af '%s' (%s)."
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 #, fuzzy
 msgid "perhaps a typing error?"
 msgstr "Måske lavede du en tastefejl?"
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 #, fuzzy
 msgid "doing assignment anyway"
 msgstr "Laver tildeling aligevel."
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, fuzzy, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 "Typekontrol for \"%s\" mislykkedes; værdi \"%s\" skal have typen \"%s\""
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "Identificerernavn er et nøgleord: \"%s\""
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "fejl ved filslutning: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, fuzzy, c-format
 msgid "deprecated function called: %s"
 msgstr "kan ikke finde tegn som hedder: \"%s\""
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:88
 #, fuzzy, c-format
-msgid "Changing working directory to `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr "kan ikke oprette katalog: \"%s\""
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, fuzzy, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "kan ikke finde fil: \"%s\""
 
 #: lily-parser-scheme.cc:125
@@ -965,21 +995,21 @@ msgstr "kan ikke finde fil: \"%s\""
 msgid "Processing `%s'"
 msgstr "Behandler \"%s\"..."
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Tolker..."
 
-#: lily-parser.cc:126
+#: lily-parser.cc:127
 #, fuzzy
-msgid "braces don't match"
+msgid "braces do not match"
 msgstr "Klammer passer ikke"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, fuzzy, c-format
 msgid "cannot find Voice `%s'"
 msgstr "kan ikke finde fil: \"%s\""
 
-#: main.cc:117
+#: main.cc:116
 #, fuzzy, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -991,7 +1021,7 @@ msgstr ""
 "og du må ændre og/eller distribuere kopier af det under visse\n"
 "betingelser. Kør \"%s --warranty\" for mere information.\n"
 
-#: main.cc:123
+#: main.cc:122
 #, fuzzy
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
@@ -1003,7 +1033,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1021,134 +1051,133 @@ msgstr ""
 "dette program. Hvis ikke, skriv til Free Software Foundation, Inc., 59\n"
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
+#: main.cc:155
 #, fuzzy
-msgid "SYM=VAL"
+msgid "SYM[=VAL]"
 msgstr "NØGLE=VÆRDI"
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr "UDTR"
 
-#: main.cc:160
+#: main.cc:159
 #, fuzzy
 msgid "evaluate scheme code"
 msgstr "Kan ikke evaluere Scheme i sikker tilstand"
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 #, fuzzy
 msgid "generate DVI (tex backend only)"
 msgstr "lav PDF-uddata"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 #, fuzzy
 msgid "generate PDF (default)"
 msgstr "lav PDF-uddata"
 
-#: main.cc:167
+#: main.cc:165
 #, fuzzy
 msgid "generate PNG"
 msgstr "lav PDF-uddata"
 
-#: main.cc:168
+#: main.cc:166
 #, fuzzy
 msgid "generate PostScript"
 msgstr "lav PostScript-uddata"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-# forklaring af flag -h
-#: main.cc:170
-msgid "print this help"
-msgstr "denne hjælp"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr "FELT"
 
-#: main.cc:171
+#: main.cc:169
 #, fuzzy
-msgid "dump a header field to file BASENAME.FIELD"
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr "skriv rubrikfelt til BASENAVN.FELT"
 
-#: main.cc:172
-msgid "DIR"
-msgstr "KATALOG"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "tilføj KATALOG til søgestien"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "brug FIL som init-fil"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "lav PostScript-uddata"
 
-#: main.cc:179
+#: main.cc:178
 #, fuzzy
 msgid "write output to FILE (suffix will be added)"
 msgstr "skriv uddata til FIL"
 
-#: main.cc:180
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr ""
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "vis versionsnummer"
 
-#: main.cc:223
+#: main.cc:224
 #, fuzzy, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1156,81 +1185,81 @@ msgid ""
 msgstr "Copyright © %s af"
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Brug: %s [FLAG]... FIL..."
 
-#: main.cc:252
+#: main.cc:253
 #, fuzzy, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Typesæt musik og/eller afspil MIDI fra FIL."
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Flag:"
 
-#: main.cc:262
+#: main.cc:263
 #, fuzzy, c-format
 msgid "Report bugs via %s"
 msgstr ""
 "Rapportér programfejl til %s\n"
 ".Rapportér fejl i oversættelsen til <dansk@klid.dk>."
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:322
+#: main.cc:323
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "indstillingen findes ikke: '%s'"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "omgivelse findes ikke: %s"
 
-#: main.cc:341
+#: main.cc:342
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "kan ikke ændre \"%s\" til \"%s\""
 
-#: main.cc:349
+#: main.cc:350
 #, fuzzy, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "kan ikke oprette katalog: \"%s\""
 
-#: main.cc:356
+#: main.cc:357
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "kan ikke ændre \"%s\" til \"%s\""
 
-#: main.cc:362
+#: main.cc:363
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "kan ikke ændre \"%s\" til \"%s\""
 
-#: main.cc:368
+#: main.cc:369
 #, fuzzy, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "kan ikke oprette katalog: \"%s\""
 
 #: main.cc:415
@@ -1238,7 +1267,7 @@ msgstr "kan ikke oprette katalog: \"%s\""
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1252,37 +1281,37 @@ msgstr ""
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1290,7 +1319,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr ""
 
@@ -1307,116 +1336,119 @@ msgstr ""
 msgid "no such MIDI instrument: `%s'"
 msgstr "instrumentet findes ikke: \"%s\""
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "tåbelig tone"
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
 #: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "kan ikke åbne fil: \"%s\""
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "kan ikke åbne fil: \"%s\""
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:208
+#: music.cc:207
 #, fuzzy, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "Transponering med %s medfører løst fortegn større end to"
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "For mange overlappende nodekolonner. Ignorerer dem."
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr ""
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "kan ikke åbne fil: \"%s\""
 
 #: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "kan ikke finde skrifttype: \"%s\""
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 #, fuzzy
 msgid "Drawing systems..."
 msgstr "Laver stemmer..."
 
-#: pango-font.cc:215
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "ikke en PostScript fil: '%s'"
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1455,15 +1487,15 @@ msgstr "uafsluttet udvider"
 msgid "Track..."
 msgstr "Spor... "
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI-uddata til \"%s\"..."
@@ -1472,23 +1504,23 @@ msgstr "MIDI-uddata til \"%s\"..."
 msgid "unterminated phrasing slur"
 msgstr "uafsluttet fraseringsbue"
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "kan ikke finde start på pianopedal: \"%s\""
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, fuzzy, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "kan ikke finde start på pianopedal: \"%s\""
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, fuzzy, c-format
 msgid "no such internal option: %s"
 msgstr "instrumentet findes ikke: \"%s\""
@@ -1498,109 +1530,108 @@ msgstr "instrumentet findes ikke: \"%s\""
 msgid "not a grob name, `%s'"
 msgstr ""
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "kan ikke oprette katalog: \"%s\""
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "omgivelse findes ikke: %s"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "omgivelse findes ikke: %s"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
-#, fuzzy, c-format
-msgid "Relocation file %s\n"
-msgstr "kan ikke åbne fil: \"%s\""
-
-#: relocate.cc:358
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "can't open file %s"
+msgid "Relocation file: %s"
 msgstr "kan ikke åbne fil: \"%s\""
 
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "for mange kolliderende pauser"
 
-#: rest.cc:143
+#: rest.cc:144
 #, fuzzy, c-format
 msgid "rest `%s' not found"
 msgstr "Symbol ikke fundet, "
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "kan ikke finde: '%s'"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr ""
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(søgesti: \"%s\")"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "Behøver musik i partitur"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 #, fuzzy
 msgid "errors found, ignoring music expression"
 msgstr "Fejl fundne/*, behandler ikke partitur*/"
@@ -1608,7 +1639,7 @@ msgstr "Fejl fundne/*, behandler ikke partitur*/"
 #. FIXME:
 #: script-engraver.cc:102
 #, fuzzy
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr "Kan ikke tolke artikulering \"%s\""
 
 #: script-engraver.cc:103
@@ -1621,17 +1652,18 @@ msgstr "Scheme-flag:"
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "uafsluttet legatobue"
 
-#: slur-engraver.cc:165
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "kan ikke finde start på legatobue"
 
 #: source-file.cc:74
@@ -1643,58 +1675,58 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, fuzzy, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "Tilføjer nodehoved til inkompatibel nodehals (type = %d)"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 #, fuzzy
 msgid "weird stem size, check for narrow beams"
 msgstr "Mærkelig nodehalsstørrelse; tjek for smalle bjælker"
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr "Elementantal %d."
 
-#: system.cc:270
+#: system.cc:276
 #, fuzzy, c-format
 msgid "Grob count %d"
 msgstr "Elementantal %d "
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr "kan ikke finde start på tekstbro"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr "har allerede en tekstbro"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr "uafsluttet tekstbro"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "ensom bindebue"
 
@@ -1703,14 +1735,14 @@ msgstr "ensom bindebue"
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
@@ -1720,43 +1752,39 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr "ukendt oversætter: \"%s\""
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "kan ikke finde: \"%s\""
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "kan ikke finde start på tekstbro"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "har allerede en tekstbro"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
@@ -1774,275 +1802,286 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "kan ikke finde start på tekstbro"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 #, fuzzy
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr "Har allerede en volte-bro. Stopper denne for tidligt."
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "har allerede en tekstbro"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+#, fuzzy
+msgid "giving up"
+msgstr "Giver op"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 #, fuzzy
 msgid "second argument must be pitch list"
 msgstr "Andet argument skal være et symbol"
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 #, fuzzy
 msgid "have to be in Lyric mode for lyrics"
 msgstr "Skal være i teksttilstand (Lyric mode) for tekst"
 
-#: parser.yy:1612
+#: parser.yy:1604
 #, fuzzy
 msgid "expecting string as script definition"
 msgstr "Forventer streng som skriptdefinition"
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "ikke en tidslængde: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 #, fuzzy
 msgid "have to be in Note mode for notes"
 msgstr "Skal være i nodetilstand (Note mode) for noder"
 
-#: parser.yy:2004
+#: parser.yy:1987
 #, fuzzy
 msgid "have to be in Chord mode for chords"
 msgstr "Skal være i akkordtilstand (Chord mode) for akkord"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, fuzzy, c-format
 msgid "Renaming input to: `%s'"
 msgstr "Renser \"%s\"..."
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "filslutning fundet inden i en kommentar"
 
-#: lexer.ll:290
+#: lexer.ll:288
 #, fuzzy
 msgid "\\maininput not allowed outside init files"
 msgstr "\\maininput forbudt udenfor init-filer"
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "fejlagtig eller udefineret identificerer: \"%s\""
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 #, fuzzy
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr "Krølleparentes fundet i slutning af tekst. Glemte du et mellemrum?"
 
-#: lexer.ll:561
+#: lexer.ll:559
 #, fuzzy
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr "Krølleparentes fundet i slutning af tekst. Glemte du et mellemrum?"
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ugyldigt tegn: \"%c\""
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "ukendt \"escaped\" streng: \"\\%s\""
 
-#: lexer.ll:882
-#, fuzzy, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "fejlagtig lilypond-version: %s (%s, %s)"
+#: lexer.ll:880 lexer.ll:881
+#, c-format
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:883
+#: lexer.ll:881 lexer.ll:882
 #, fuzzy
-msgid "Consider updating the input with the convert-ly script"
+msgid "consider updating the input with the convert-ly script"
 msgstr "Overvej at konvertere inddata med skriptet \"convert-ly\""
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, fuzzy, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, fuzzy, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Starter \"%s\""
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr ""
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Converting to `~a'..."
 msgstr "Skriver \"%s\"..."
 
-#: backend-library.scm:110
-#, fuzzy, lisp-format
+#: backend-library.scm:108
+#, fuzzy, scheme-format
 msgid "Converting to ~a..."
 msgstr "Skriver \"%s\"..."
 
-#: backend-library.scm:156
-#, fuzzy, lisp-format
+#: backend-library.scm:145
+#, fuzzy, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "skriver rubrikfelt \"%s\" til \"%s\"..."
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "ikke en tidslængde: %d"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:737
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, fuzzy, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "kan ikke finde omgivelsen \"%s\""
 
-#: define-music-types.scm:757
-#, fuzzy, lisp-format
+#: define-music-types.scm:774
+#, fuzzy, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "ukendt oversætter: \"%s\""
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
+#, fuzzy, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "kan ikke finde tegnnummer: %d"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "ukendt oversætter: \"%s\""
 
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "Behandler..."
 
 #: documentation-lib.scm:150
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Writing ~S..."
 msgstr "Skriver \"%s\"..."
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, fuzzy, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "kan ikke finde tegnnummer: %d"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "Skriver \"%s\"..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:379
-#, fuzzy, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "Kan ikke tolke artikulering \"%s\""
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2051,57 +2090,57 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "filnavn bør ikke indeholde mellemrum: '%s'"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 #, fuzzy
 msgid "Calculating page breaks..."
 msgstr "Beregner kolonnepositioner..."
 
-#: lily-library.scm:510
-#, fuzzy, lisp-format
+#: lily-library.scm:593
+#, fuzzy, scheme-format
 msgid "unknown unit: ~S"
 msgstr "ukendt oversætter: \"%s\""
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "kan ikke finde: \"%s\""
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
 # hær er det spørg om skrivning til en fil
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "afhængigheder udskrevet til \"%s\"..."
 
@@ -2109,50 +2148,50 @@ msgstr "afh
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
+#: music-functions.scm:213
 #, fuzzy
-msgid "More alternatives than repeats. Junking excess alternatives"
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 "Flere alternativer end gentagelser. Stryger tiloversblevne alternativer."
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, fuzzy, lisp-format
+#: music-functions.scm:538
+#, fuzzy, scheme-format
 msgid "music expected: ~S"
 msgstr "forventede mellemrum"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "kan ikke finde skrifttype: \"%s\""
 
-#: music-functions.scm:953
-#, fuzzy, lisp-format
+#: music-functions.scm:942
+#, fuzzy, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "ukendt oversætter: \"%s\""
 
@@ -2161,42 +2200,42 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
+#, fuzzy, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "kan ikke finde start på bjælke"
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr ""
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, lisp-format
+#: paper.scm:129
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "ukendt oversætter: \"%s\""
 
@@ -2204,15 +2243,52 @@ msgstr "ukendt overs
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, fuzzy, lisp-format
+#: ps-to-png.scm:88
+#, fuzzy, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "kommandoen afsluttede med værdi %d"
 
 #: to-xml.scm:190
-msgid "assertion failed"
+#, scheme-format
+msgid "assertion failed: ~S"
 msgstr ""
 
+#, fuzzy
+#~ msgid "show warranty"
+#~ msgstr "vis garanti og copyright"
+
+#~ msgid "Convert MIDI to LilyPond source."
+#~ msgstr "Konvertér MIDI til LilyPond-klide."
+
+#, fuzzy
+#~ msgid "example"
+#~ msgstr "Eksempel:"
+
+#, fuzzy
+#~ msgid "loading default font"
+#~ msgstr "Indlæser standardskrifttype"
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "kan ikke finde standardskrifttype: \"%s\""
+
+#~ msgid "crescendo too small"
+#~ msgstr "crescendo for lille"
+
+# forklaring af flag -h
+#~ msgid "print this help"
+#~ msgstr "denne hjælp"
+
+#~ msgid "silly pitch"
+#~ msgstr "tåbelig tone"
+
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "kan ikke åbne fil: \"%s\""
+
+#, fuzzy
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "fejlagtig lilypond-version: %s (%s, %s)"
+
 #~ msgid "no one to print a tremolos"
 #~ msgstr "der er ingen som kan skrive en tremolo"
 
@@ -2223,7 +2299,7 @@ msgstr ""
 #~ msgid "no one to print a repeat brace"
 #~ msgstr "der er ingen som kan skrive et gentagelsestegn"
 
-#~ msgid "can't find `%s' context"
+#~ msgid "cannot find `%s' context"
 #~ msgstr "kan ikke finde omgivelsen \"%s\""
 
 #, fuzzy
@@ -2251,7 +2327,7 @@ msgstr ""
 #~ msgstr ""
 #~ "%s: TFM-fil har %u parametre, hvilket er mere end de %u jeg kan håndtere"
 
-#~ msgid "can't find ascii character: %d"
+#~ msgid "cannot find ascii character: %d"
 #~ msgstr "kan ikke finde ASCII-tegn: %d"
 
 #~ msgid "no one to print a tuplet start bracket"
@@ -2271,12 +2347,9 @@ msgstr ""
 #~ "Flere alternativer end gentagelser. Stryger tiloversblevne alternativer."
 
 #, fuzzy
-#~ msgid "can't find signature for music function"
+#~ msgid "cannot find signature for music function"
 #~ msgstr "kan ikke finde omgivelsen \"%s\""
 
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "Brug: %s [FLAG]... FIL"
-
 #, fuzzy
 #~ msgid "Opening pipe `%s'"
 #~ msgstr "Renser \"%s\"..."
@@ -2306,12 +2379,6 @@ msgstr ""
 #~ msgid "command exited with value %d"
 #~ msgstr "kommandoen afsluttede med værdi %d"
 
-#~ msgid "Example:"
-#~ msgstr "Eksempel:"
-
-#~ msgid "Convert mup to LilyPond source."
-#~ msgstr "Konvertér mup til LilyPond-kilde."
-
 #~ msgid "debug"
 #~ msgstr "fejlsøgningsuddata"
 
@@ -2332,7 +2399,7 @@ msgstr ""
 #~ msgstr "Skriver \"%s\"..."
 
 #, fuzzy
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "kan ikke åbne fil: \"%s\""
 
 #, fuzzy
@@ -2363,7 +2430,7 @@ msgstr ""
 #~ msgstr "kan ikke oprette katalog: \"%s\""
 
 #, fuzzy
-#~ msgid "can't handle a percent repeat of length: %s"
+#~ msgid "cannot handle a percent repeat of length: %s"
 #~ msgstr ""
 #~ "Véd ikke hvordan en procenttegnsgentagelse (percent) af denne længde skal "
 #~ "håndteres."
@@ -2415,7 +2482,7 @@ msgstr ""
 #~ msgstr "ikke-fatal fejl: "
 
 #, fuzzy
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "kan ikke finde skrifttype: \"%s\""
 
 #, fuzzy
@@ -2454,9 +2521,6 @@ msgstr ""
 #~ msgid "Programming error: "
 #~ msgstr "programmeringsfejl: "
 
-#~ msgid "Can't switch translators, I'm there already"
-#~ msgstr "Kan ikke skifte oversætter, jeg er her allerede"
-
 #~ msgid "I'm one myself"
 #~ msgstr "Jeg er selv én"
 
@@ -2479,11 +2543,11 @@ msgstr ""
 #~ msgstr "FIX: tonartsskiftsfletning"
 
 #, fuzzy
-#~ msgid "kpathsea can't find %s file: `%s'"
+#~ msgid "kpathsea cannot find %s file: `%s'"
 #~ msgstr "Kpathsea kunne ikke finde TMF-fil: \"%s\""
 
 #, fuzzy
-#~ msgid "kpathsea can't find file: `%s'"
+#~ msgid "kpathsea cannot find file: `%s'"
 #~ msgstr "Kpathsea kunne ikke finde TMF-fil: \"%s\""
 
 #, fuzzy
@@ -2514,10 +2578,6 @@ msgstr ""
 #~ msgid "kpathsea can not find TFM file: `%s'"
 #~ msgstr "Kpathsea kunne ikke finde TMF-fil: \"%s\""
 
-#, fuzzy
-#~ msgid "Cannot switch translators, I'm there already"
-#~ msgstr "Kan ikke skifte oversætter, jeg er her allerede"
-
 #, fuzzy
 #~ msgid "Converting to `~a.ps'..."
 #~ msgstr "Skriver \"%s\"..."
@@ -2532,7 +2592,7 @@ msgstr ""
 #~ msgid "keep all output, output to directory %s.dir"
 #~ msgstr "behold al uddata, udskrivo i kataloget %s.dir"
 
-#~ msgid "don't run LilyPond"
+#~ msgid "do not run LilyPond"
 #~ msgstr "kør ikke LilyPond"
 
 #~ msgid "produce MIDI output only"
@@ -2577,7 +2637,7 @@ msgstr ""
 #~ msgstr "%s udskrevet til \"%s\"..."
 
 #, fuzzy
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "kan ikke finde fil: \"%s\""
 
 #, fuzzy
@@ -2593,7 +2653,7 @@ msgstr ""
 #~ msgstr "tilføj KATALOG efter afhængigheder"
 
 #, fuzzy
-#~ msgid "don't run lilypond"
+#~ msgid "do not run lilypond"
 #~ msgstr "kør ikke LilyPond"
 
 #~ msgid "write Makefile dependencies for every input file"
@@ -2687,7 +2747,7 @@ msgstr ""
 #~ msgid "from musical definition: %s"
 #~ msgstr "fra musikdefinition: %s"
 
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr "kan ikke finde start på fraseringsbue"
 
 #~ msgid "unbound spanner `%s'"
@@ -2785,7 +2845,7 @@ msgstr ""
 #~ msgid "Text_spanner too small"
 #~ msgstr "Tekst_bro for lille"
 
-#~ msgid "Can't specify direction for this request"
+#~ msgid "Cannot specify direction for this request"
 #~ msgstr "Kan ikke angive retning for denne forespørgsel"
 
 #~ msgid "Generate .dvi with LaTeX for LilyPond"
@@ -2799,7 +2859,7 @@ msgstr ""
 #~ msgstr "EOF i en streng"
 
 # det handlar om mmap hær
-#~ msgid "can't map file"
+#~ msgid "cannot map file"
 #~ msgstr "kan ikke lave \"mmap\" på filen"
 
 #~ msgid "<stdin>"
@@ -2852,7 +2912,7 @@ msgstr ""
 #~ msgstr "for mange noder for pausesammenstød"
 
 #~ msgid ""
-#~ "Can't find property type-check for `%s'.  Perhaps you made a typing "
+#~ "Cannot find property type-check for `%s'.  Perhaps you made a typing "
 #~ "error? Doing assignment anyway."
 #~ msgstr ""
 #~ "Kan ikke finde egenskabstypekontrol for \"%s\". Måske har du lavet en "
@@ -2911,25 +2971,25 @@ msgstr ""
 #~ msgid "enable debugging output"
 #~ msgstr "aktivér fejlsøgningsuddata"
 
-#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgid "do not output tuplets, double dots or rests, smallest is 32"
 #~ msgstr "udskriv ikke tupler, dobbeltpunktninger eller pauser, mindste er 32"
 
 #~ msgid "set FILE as default output"
 #~ msgstr "sæt FIL som standarduddata"
 
-#~ msgid "don't output tuplets"
+#~ msgid "do not output tuplets"
 #~ msgstr "udskriv ikke tupler"
 
 #~ msgid "be quiet"
 #~ msgstr "vær stille"
 
-#~ msgid "don't output rests or skips"
+#~ msgid "do not output rests or skips"
 #~ msgstr "udskriv ikke pauser eller hop"
 
 #~ msgid "set smallest duration"
 #~ msgstr "indstil mindste længde"
 
-#~ msgid "don't timestamp the output"
+#~ msgid "do not timestamp the output"
 #~ msgstr "tidsstempl ikke uddata"
 
 #~ msgid "assume no double dotted notes"
@@ -2971,7 +3031,7 @@ msgstr ""
 #~ msgid "invalid number of tracks"
 #~ msgstr "ugyldigt antal spor"
 
-#~ msgid "can't handle non-metrical time"
+#~ msgid "cannot handle non-metrical time"
 #~ msgstr "kan ikke håndtere ikke-metrisk tid"
 
 #~ msgid "Junking note-end event: channel = %d, pitch = %d"
diff --git a/po/de.po b/po/de.po
index 03aaa5d665..0b8c20f511 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 2.9.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-20 12:53+0100\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
 "PO-Revision-Date: 2006-10-26 08:39+0200\n"
 "Last-Translator: Roland Stigge <stigge@antcom.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -16,96 +16,104 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: convertrules.py:9
+#: convertrules.py:12
 #, python-format
 msgid "Not smart enough to convert %s"
 msgstr "%s kann nicht umgewandelt werden"
 
-#: convertrules.py:10
+#: convertrules.py:13
 msgid "Please refer to the manual for details, and update manually."
 msgstr "Für Details Benutzerhandbuch lesen und manuell aktualisieren."
 
-#: convertrules.py:11
+#: convertrules.py:14
 #, python-format
 msgid "%s has been replaced by %s"
 msgstr "%s wurde durch %s ersetzt"
 
-#: convertrules.py:2395
+#: convertrules.py:2398
 msgid "LilyPond source must be UTF-8"
 msgstr "LilyPond-Quelle muss UTF-8 sein"
 
-#: convertrules.py:2398
+#: convertrules.py:2401
 msgid "Try the texstrings backend"
 msgstr "Das texstrings-Backend probieren"
 
-#: convertrules.py:2401
+#: convertrules.py:2404
 #, python-format
 msgid "Do something like: %s"
 msgstr "Folgendes versuchen: %s"
 
-#: convertrules.py:2404
+#: convertrules.py:2407
 msgid "Or save as UTF-8 in your editor"
 msgstr "Oder als UTF-8 im Editor sichern"
 
-#: fontextract.py:25
+#: fontextract.py:26
 #, python-format
 msgid "Scanning %s"
 msgstr "Warnung: %s"
 
-#: fontextract.py:70
+#: fontextract.py:71
 #, python-format
 msgid "Extracted %s"
 msgstr "%s ausgepackt"
 
-#: fontextract.py:85
+#: fontextract.py:86
 #, python-format
 msgid "Writing fonts to %s"
 msgstr "Schreiben der Schriftarten nach %s"
 
-#: lilylib.py:82
+#: lilylib.py:85 lilylib.py:136
 #, python-format
 msgid "Invoking `%s'"
 msgstr "`%s' wird aufgerufen"
 
-#: lilylib.py:84
+#: lilylib.py:87 lilylib.py:138
 #, python-format
 msgid "Running %s..."
 msgstr "%s wird ausgeführt..."
 
-#: lilylib.py:165
-#, python-format
-msgid "Usage: %s\n"
+#: lilylib.py:203
+#, fuzzy, python-format
+msgid "Usage: %s"
 msgstr "Aufruf: %s\n"
 
-#: abc2ly.py:1357
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "Aufruf: %s [OPTIONEN]... DATEI"
+
+#: abc2ly.py:1351
+#, fuzzy, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 "Dieses Programm wandelt ABC-Musikdateien in LilyPond-Eingabe um\n"
 "(siehe auch http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt)."
 
-#: abc2ly.py:1360
-msgid "set output filename to FILE"
-msgstr "Ausgabedateiname auf DATEI setzen"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
+msgstr "Ausgabe in DATEI schreiben"
 
-#: abc2ly.py:1362
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr "bzgl. Erfolg streng sein"
 
-#: abc2ly.py:1364
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr "ABC's Prinzip der Balken beibehalten"
 
-#: convert-ly.py:49
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr "Melden Sie Fehler an %s"
+
+#: convert-ly.py:41
+#, fuzzy
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 "LilyPond auf neuere Version bringen. Standardmäßig wird von der Version vom\n"
 "Kommando \\version zur aktuellen LilyPond-Version gegangen.\n"
@@ -115,403 +123,447 @@ msgstr ""
 "  convert-ly -e old.ly\n"
 "  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
 
-#: convert-ly.py:67 lilypond-book.py:115 warn.cc:48 input.cc:81
+#: convert-ly.py:43 lilypond-book.py:73
+#, fuzzy
+msgid "Examples:"
+msgstr "Beispiel:"
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, c-format, python-format
 msgid "warning: %s"
 msgstr "Warnung: %s"
 
-#: convert-ly.py:70 lilypond-book.py:118 warn.cc:54 input.cc:87 input.cc:95
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, c-format, python-format
 msgid "error: %s"
 msgstr "Fehler: %s"
 
-#: convert-ly.py:86 etf2ly.py:1200 lilypond-book.py:138 midi2ly.py:114
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr "Vertrieben unter den Bedingungen der GNU General Public License."
 
-#: convert-ly.py:87 etf2ly.py:1201 lilypond-book.py:139 midi2ly.py:115
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr "Es wird OHNE GARANTIE ausgeliefert."
 
-#: convert-ly.py:98 convert-ly.py:118
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr "VERSION"
 
-#: convert-ly.py:100
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr "bei VERSION anfangen [Standard: \\version in Datei gefunden]"
 
-#: convert-ly.py:103
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr "vor Ort ändern"
 
-#: convert-ly.py:106
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr "kein Kommando \\version hinzufügen, falls es fehlt"
 
-#: convert-ly.py:112
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+#, fuzzy
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr "Regeln ausdrucken [Standard: --from=0, --to=@TOPLEVEL_VERSION@]"
 
-#: convert-ly.py:117
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr "zu VERSION konvertieren [Standard: @TOPLEVEL_VERSION@]"
 
-#: convert-ly.py:164
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr "Anwenden der Umwandlung: "
 
-#: convert-ly.py:176
-msgid "error while converting"
+#: convert-ly.py:166
+#, fuzzy
+msgid "Error while converting"
 msgstr "Fehler beim Umwandeln"
 
-#: convert-ly.py:178 score-engraver.cc:73
-msgid "Aborting"
-msgstr "Abbruch"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
+msgstr ""
 
-#: convert-ly.py:202
+#: convert-ly.py:190
 #, python-format
 msgid "Processing `%s'... "
 msgstr "»%s« wird verarbeitet..."
 
-#: convert-ly.py:289 source-file.cc:56
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "Kann Datei nicht öffnen: `%s'"
 
-#: convert-ly.py:296
-#, python-format
-msgid "can't determine version for `%s'. Skipping"
+#: convert-ly.py:284
+#, fuzzy, python-format
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "Version für »%s« kann nicht erkannt werden. Wird übersprungen"
 
-#: etf2ly.py:1208
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "Aufruf: %s [OPTIONEN]... DATEI"
+
+#: etf2ly.py:1198
+#, fuzzy
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 "Enigma Transport-Format ist ein von Coda Music Technology's Finale\n"
 "verwendetes Format. Dieses Programm wird eine Teilmenge von ETF in\n"
 "eine von Lilypond-verwendbare Datei umwandeln."
 
-#: etf2ly.py:1211 midi2ly.py:901
-msgid "write output to FILE"
-msgstr "Ausgabe in DATEI schreiben"
-
-#: etf2ly.py:1212 midi2ly.py:902 main.cc:172 main.cc:178
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "DATEI"
 
-#: etf2ly.py:1214 midi2ly.py:915
-msgid "show warranty"
-msgstr "Gewährleistung anzeigen"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
+msgstr "Informationen zu Gewährleistung und Copyright anzeigen"
 
-#: lilypond-book.py:88
+#: lilypond-book.py:71
+#, fuzzy
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-"   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-"   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-"   lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr "LilyPond-Teile in Mischdatei (HTML, LaTeX oder texinfo) verarbeiten"
+
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
-"LilyPond-Auszüge in gemischtem HTML-, LaTeX- oder texinfo-Dokument verarbeiten.\n"
-"\n"
-"Beispiel-Aufrufe:\n"
-"\n"
-"   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BUCH\n"
-"   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BUCH\n"
-"   lilypond-book --process='lilypond -I include' BUCH\n"
 
-#: lilypond-book.py:104
+#: lilypond-book.py:87
 #, python-format
 msgid "Exiting (%d)..."
 msgstr "Beenden (%d)..."
 
-#: lilypond-book.py:136
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s bei"
 
-#: lilypond-book.py:147
+#: lilypond-book.py:129
 msgid "FILTER"
 msgstr "FILTER"
 
-#: lilypond-book.py:150
+#: lilypond-book.py:132
 msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr "Auszüge durch FILTER [convert-ly -n -] leiten (Pipe)"
 
-#: lilypond-book.py:152
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
-msgstr "Ausgabeformat FORMAT (texi [Vorgabe], texi-html, latex, html) verwenden"
+#: lilypond-book.py:135
+#, fuzzy
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
+msgstr ""
+"Ausgabeformat FORMAT (texi [Vorgabe], texi-html, latex, html) verwenden"
 
-#: lilypond-book.py:154
+#: lilypond-book.py:138
 msgid "add DIR to include path"
 msgstr "VERZ zum Einfügepfad hinzufügen"
 
-#: lilypond-book.py:159
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "VERZ"
+
+#: lilypond-book.py:143
 msgid "write output to DIR"
 msgstr "Ausgabe in DATEI schreiben"
 
-#: lilypond-book.py:162
+#: lilypond-book.py:147
 msgid "COMMAND"
 msgstr "BEFEHL"
 
-#: lilypond-book.py:163
+#: lilypond-book.py:148
 msgid "process ly_files using COMMAND FILE..."
 msgstr "ly_files mit BEFEHL DATEI... verarbeiten"
 
-#: lilypond-book.py:168
-msgid "extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with dvips -h INPUT.psfonts"
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
+#, fuzzy
+msgid ""
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
-"alle PostScript-Schriftarten für LaTeX entnehmen und in EINGABE.psfonts schreiben.\n"
+"alle PostScript-Schriftarten für LaTeX entnehmen und in EINGABE.psfonts "
+"schreiben.\n"
 "Dies muss mit dvips -h EINGABE.psfonts verwendet werden"
 
-#: lilypond-book.py:171 midi2ly.py:912 main.cc:182
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "wortreich sein"
 
-#: lilypond-book.py:177 main.cc:183
-msgid "show warranty and copyright"
-msgstr "Informationen zu Gewährleistung und Copyright anzeigen"
-
-#: lilypond-book.py:734
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr "Datei `%s' nicht gefunden"
 
-#: lilypond-book.py:963
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr "veraltete ly-option verwendet: %s=%s"
 
-#: lilypond-book.py:966
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr "Übersetzung im Kompatibilitätsmodus: %s=%s"
 
-#: lilypond-book.py:970
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr "veraltete ly-option verwendet: %s"
 
-#: lilypond-book.py:973
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr "Übersetzung im Kompatibilitätsmodus: %s"
 
-#: lilypond-book.py:992
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr "unbekannte Option ignoriert: %s"
 
-#: lilypond-book.py:1327
+#: lilypond-book.py:1388
 #, python-format
 msgid "Opening filter `%s'"
 msgstr "Filter »%s« wird geöffnet"
 
-#: lilypond-book.py:1344
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr "»%s« gescheitert (%d)"
 
-#: lilypond-book.py:1345
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr "Das Fehlerprotokoll lautet wie folgt:"
 
-#: lilypond-book.py:1512
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
+msgstr ""
+
+#: lilypond-book.py:1586
 msgid "Writing snippets..."
 msgstr "Auszüge werden geschrieben..."
 
-#: lilypond-book.py:1517
+#: lilypond-book.py:1591
 msgid "Processing..."
 msgstr "Verarbeiten..."
 
-#: lilypond-book.py:1521
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr "Alle Auszüge sind auf dem neuesten Stand..."
 
-#: lilypond-book.py:1531
+#: lilypond-book.py:1605
 #, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "Format für %s kann nicht ermittelt werden"
 
-#: lilypond-book.py:1542
+#: lilypond-book.py:1616
 #, python-format
 msgid "%s is up to date."
 msgstr "%s ist aktuell."
 
-#: lilypond-book.py:1548
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "»%s« wird geschrieben..."
 
-#: lilypond-book.py:1595
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr "Ausgabe würde Eingabedatei überschreiben; verwenden Sie --output."
 
-#: lilypond-book.py:1599
+#: lilypond-book.py:1681
 #, python-format
 msgid "Reading %s..."
 msgstr "%s lesen..."
 
-#: lilypond-book.py:1618
+#: lilypond-book.py:1700
 msgid "Dissecting..."
 msgstr "Zerlegen..."
 
-#: lilypond-book.py:1634
+#: lilypond-book.py:1716
 #, python-format
 msgid "Compiling %s..."
 msgstr "%s kompilieren..."
 
-#: lilypond-book.py:1643
+#: lilypond-book.py:1725
 #, python-format
 msgid "Processing include: %s"
 msgstr "Einfügung wird verarbeitet: %s"
 
-#: lilypond-book.py:1657
+#: lilypond-book.py:1739
 #, python-format
 msgid "Removing `%s'"
 msgstr "»%s« wird gelöscht"
 
-#: lilypond-book.py:1717
+#: lilypond-book.py:1815
 #, python-format
 msgid "Writing fonts to %s..."
 msgstr "Schriftarten werden nach %s geschrieben..."
 
-#: lilypond-book.py:1729
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr "Option --psfonts nicht verwendet"
 
-#: lilypond-book.py:1730
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr "Verarbeitung mit dvips wird keine Schriftarten haben"
 
-#: lilypond-book.py:1736
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr "DVIPS-Aufruf:"
 
-#: midi2ly.py:122 lily-library.scm:489 lily-library.scm:497
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "Warnung: "
 
-#: midi2ly.py:125 midi2ly.py:941
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "Fehler: "
 
-#: midi2ly.py:126
+#: midi2ly.py:110
 msgid "Exiting ... "
 msgstr "Beenden ... "
 
-#: midi2ly.py:873
+#: midi2ly.py:857
 #, python-format
 msgid "%s output to `%s'..."
 msgstr "%s nach »%s« ausgeben..."
 
-#: midi2ly.py:887
-msgid "Convert MIDI to LilyPond source."
-msgstr "MIDI nach LilyPond-Quelltext konvertieren."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
+msgstr "mup nach LilyPond-Quelltext konvertieren."
 
-#: midi2ly.py:891
+#: midi2ly.py:875
 msgid "print absolute pitches"
 msgstr "Absolute Tonhöhen ausgeben"
 
-#: midi2ly.py:893 midi2ly.py:905
+#: midi2ly.py:877 midi2ly.py:889
 msgid "DUR"
 msgstr "DAUER"
 
-#: midi2ly.py:894
+#: midi2ly.py:878
 msgid "quantise note durations on DUR"
 msgstr "Notenlängen auf DAUER quantisieren"
 
-#: midi2ly.py:897
+#: midi2ly.py:881
 msgid "print explicit durations"
 msgstr "Explizite Notenlängen ausgeben"
 
-#: midi2ly.py:898
+#: midi2ly.py:882
 msgid "set key: ALT=+sharps|-flats; MINOR=1"
 msgstr "Tonart setzen: VORZ=+Kreuze|-B's; MOLL=1"
 
-#: midi2ly.py:899
+#: midi2ly.py:883
 msgid "ALT[:MINOR]"
 msgstr "VORZ[:MOLL]"
 
-#: midi2ly.py:904
+#: midi2ly.py:888
 msgid "quantise note starts on DUR"
 msgstr "Notenanfänge auf DAUER quantisieren"
 
-#: midi2ly.py:907
+#: midi2ly.py:891
 msgid "DUR*NUM/DEN"
 msgstr "DAUER*ZÄHLER/NENNER"
 
 # tuplet = Wertaufteilung nach: Peter Giger: Die Kunst des Rhythmus, Seite 25
-#: midi2ly.py:910
+#: midi2ly.py:894
 msgid "allow tuplet durations DUR*NUM/DEN"
 msgstr "Wertaufteilungsdauern DAUER*ZÄHLER/NENNER erlauben"
 
-#: midi2ly.py:918
+#: midi2ly.py:902
 msgid "treat every text as a lyric"
 msgstr "Jeden Text als Liedtext behandeln"
 
-#: midi2ly.py:921
-msgid "example"
-msgstr "Beispiel"
+#: midi2ly.py:905
+#, fuzzy
+msgid "Examples"
+msgstr "Beispiel:"
 
-#: midi2ly.py:942
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "Keine Dateien auf der Kommandozeile angegeben."
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Dieses Programm ist Freie Software. Sie wird von der GNU General Public "
+"License\n"
+"geschützt, und Sie können sie gerne ändern und/oder Kopien unter bestimmten\n"
+"Bedingungen weitergeben. Rufen Sie »%s --warranty« für weitere\n"
+"Informationen auf.\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+msgid "set output filename to FILE"
+msgstr "Ausgabedateiname auf DATEI setzen"
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "Option »%s« benötigt ein Argument"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: getopt-long.cc:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "Option `%s' erlaubt kein Argument"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "unerkannte Option: »%s«"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "ungültiges Argument »%s« für Option »%s«"
 
-#: warn.cc:68 grob.cc:462
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr "Programmierfehler: %s"
 
-#: warn.cc:69
+#: warn.cc:69 input.cc:83
 msgid "continuing, cross fingers"
 msgstr "Fortsetzung, die Finger kreuzen"
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr "Vorzeichensatzliste muss mit Kontextnamen beginnen: %s"
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr "unbekannte Option ignoriert: %s"
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr "Paar oder Kontextname für Vorzeichenregel erwartet, %s gefunden"
 
-#: accidental.cc:239 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr "Vorzeichen `%s' nicht gefunden"
 
-#: align-interface.cc:160
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
@@ -519,100 +571,103 @@ msgstr ""
 "vertikale Ausrichtung vor Zeilenumbruch aufgerufen.\n"
 "Nur Zeilenzusammenfassungen mit PianoStaff erzeugen."
 
-#: all-font-metrics.cc:213
-#, c-format
-msgid "can't find font: `%s'"
-msgstr "Schriftart kann nicht gefunden werden: »%s«"
-
-#: all-font-metrics.cc:214
-msgid "loading default font"
-msgstr "Standardschriftart wird geladen"
-
-#: all-font-metrics.cc:224
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "Standardschriftart kann nicht gefunden werden: »%s«"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
+msgstr ""
 
-#: all-font-metrics.cc:225 includable-lexer.cc:62 lily-parser-scheme.cc:97
+#: all-font-metrics.cc:173
 #, c-format
-msgid "(search path: `%s')"
-msgstr "(Suchpfad: »%s«)"
-
-#: all-font-metrics.cc:226 volta-engraver.cc:157
-msgid "giving up"
-msgstr "aufgeben"
+msgid "cannot find font: `%s'"
+msgstr "Schriftart kann nicht gefunden werden: »%s«"
 
-#: apply-context-iterator.cc:34
+#: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr "Argument für \\applycontext ist keine Prozedur"
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "kann nicht geändert werden, bereits im Übersetzer: %s"
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr "Axis_group_engraver: vertikale Gruppe hat bereits einen Vater"
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr "gibt es zwei Axis_group_engravers?"
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr "entfernen dieser vertikalen Gruppe"
 
+#: axis-group-interface.cc:96
+msgid "tried to calculate pure-height at a non-breakpoint"
+msgstr ""
+
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr "Taktüberprüfung gescheitert bei: %s"
 
-#: beam-engraver.cc:136
+#: beam-engraver.cc:128
 msgid "already have a beam"
 msgstr "Balken bereits vorhanden"
 
-#: beam-engraver.cc:205
+#: beam-engraver.cc:196
 msgid "unterminated beam"
 msgstr "unbegrenzter Balken"
 
-#: beam-engraver.cc:246 chord-tremolo-engraver.cc:162
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr "Notenhals muss rhythmische Struktur aufweisen"
 
-#: beam-engraver.cc:259
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+#, fuzzy
+msgid "stem does not fit in beam"
 msgstr "Notenhals passt nicht zum Balken"
 
-#: beam-engraver.cc:260
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr "Balken wurde hier begonnen"
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 msgid "no feasible beam position"
 msgstr "Keine praktikable Balkenposition"
 
-#: beam.cc:126
-msgid "removing beam with less than two stems"
+#: beam.cc:144
+#, fuzzy
+msgid "removing beam with no stems"
 msgstr "Balken mit weniger als zwei Notenhälsen wird entfernt"
 
-#: beam.cc:981
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
-msgstr "Keine funktionsfähige Anfangskonfiguration gefunden: Es kann evtl. keine optimale Balkenneigung gefunden werden"
+msgstr ""
+"Keine funktionsfähige Anfangskonfiguration gefunden: Es kann evtl. keine "
+"optimale Balkenneigung gefunden werden"
 
-#: break-align-interface.cc:194
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Kein Leerraumeintrag von %s nach »%s«"
 
 #: change-iterator.cc:23
 #, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "»%s« kann nicht nach »%s« geändert werden"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "es kann kein Kontext zum Umschalten gefunden werden"
 
 #. We could change the current translator's id, but that would make
@@ -630,20 +685,21 @@ msgstr "kein Umschalten zum gleichen Kontexttypen: %s"
 msgid "none of these in my family"
 msgstr "keiner davon befindet sich in meiner Familie"
 
-#: chord-tremolo-engraver.cc:96
-#, c-format
-msgid "expect 2 elements for chord tremolo, found %d"
-msgstr "2 Elemente für Akkord-Tremolo erwartet, %d gefunden"
+#: chord-tremolo-engraver.cc:88
+#, fuzzy
+msgid "No tremolo to end"
+msgstr "Kein Bindebogen zu beenden"
 
-#: chord-tremolo-engraver.cc:132
+#: chord-tremolo-engraver.cc:110
 msgid "unterminated chord tremolo"
 msgstr "unbegrenztes Akkord-Tremolo"
 
-#: chord-tremolo-iterator.cc:60
-msgid "no one to print a tremolos"
-msgstr "niemand vorhanden für Tremoloausgabe"
+#: chord-tremolo-iterator.cc:33
+#, c-format
+msgid "expect 2 elements for chord tremolo, found %d"
+msgstr "2 Elemente für Akkord-Tremolo erwartet, %d gefunden"
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr "Schlüssel »%s« nicht gefunden"
@@ -657,61 +713,44 @@ msgstr "unbekannter Gruppierungsstil: »%s«"
 msgid "junking empty cluster"
 msgstr "Leere Menge wird verworfen"
 
-#: coherent-ligature-engraver.cc:86
-#, c-format
-msgid "gotcha: ptr=%ul"
-msgstr "erwischt: ptr=%ul"
-
-#: coherent-ligature-engraver.cc:93
-msgid "distance undefined, assuming 0.1"
-msgstr "Abstand undefiniert, 0.1 angenommen"
-
-#: coherent-ligature-engraver.cc:96
-#, c-format
-msgid "distance=%f"
-msgstr "Abstand=%f"
-
-#: coherent-ligature-engraver.cc:136
+#: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr "Coherent_ligature_engraver: setze »spacing-increment=0.01«: ptr=%ul"
 
-#: constrained-breaking.cc:124
-msgid "no system number set in constrained-breaking"
-msgstr "keine Systemzahl bei Bedingungsverletzung gesetzt"
-
 #. if we get to here, just put everything on one line
-#: constrained-breaking.cc:225 constrained-breaking.cc:241
-msgid "couldn't find line breaking that satisfies constraints"
-msgstr "es können keine Zeilenumbrüche gefunden werden, die die Bedingungen erfüllen"
+#: constrained-breaking.cc:176 constrained-breaking.cc:193
+msgid "cannot find line breaking that satisfies constraints"
+msgstr ""
+"es können keine Zeilenumbrüche gefunden werden, die die Bedingungen erfüllen"
 
-#: context-def.cc:123
+#: context-def.cc:130
 #, c-format
 msgid "program has no such type: `%s'"
 msgstr "Das Programm hat keinen solchen Typen: »%s«"
 
-#: context-def.cc:311
-#, c-format
-msgid "can't find: `%s'"
-msgstr "»%s« kann nicht gefunden werden"
-
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr "Symbol-Argumente für \\override und \\revert benötigt"
 
-#: context.cc:160
+#: context.cc:151
 #, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "ein neues »%s« kann weder gefunden noch erzeugt werden"
 
-#: context.cc:222
+#: context.cc:213
 #, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "»%s« (»%s« genannt) kann weder gefunden noch erzeugt werden"
 
 #: context.cc:276
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "Invalid CreateContext event: Cannot create %s context"
+msgstr ""
+
+#: context.cc:388
+#, c-format
+msgid "cannot find or create: `%s'"
 msgstr "»%s« kann weder gefunden noch erzeugt werden"
 
 #: custos.cc:77
@@ -719,143 +758,132 @@ msgstr "»%s« kann weder gefunden noch erzeugt werden"
 msgid "custos `%s' not found"
 msgstr "custos »%s« nicht gefunden"
 
-#: dynamic-engraver.cc:181 span-dynamic-performer.cc:84
-msgid "can't find start of (de)crescendo"
+#: dispatcher.cc:71
+msgid "Event class should be a symbol"
+msgstr ""
+
+#: dispatcher.cc:78
+#, fuzzy, c-format
+msgid "Unknown event class %s"
+msgstr "Unbekannte Schnittstelle »%s«"
+
+#: dots.cc:38
+#, fuzzy, c-format
+msgid "dot `%s' not found"
+msgstr "Pause »%s« nicht gefunden"
+
+#: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
+msgid "cannot find start of (de)crescendo"
 msgstr "Anfang des (De-) Crescendos kann nicht gefunden werden"
 
-#: dynamic-engraver.cc:190
+#: dynamic-engraver.cc:195
 msgid "already have a decrescendo"
 msgstr "Decrescendo bereits vorhanden"
 
-#: dynamic-engraver.cc:192
+#: dynamic-engraver.cc:197
 msgid "already have a crescendo"
 msgstr "Crescendo bereits vorhanden"
 
-#: dynamic-engraver.cc:195
+#: dynamic-engraver.cc:200
 msgid "cresc starts here"
 msgstr "Crescendo beginnt hier"
 
-#: dynamic-engraver.cc:318
+#: dynamic-engraver.cc:323
 msgid "unterminated (de)crescendo"
 msgstr "unbegrenztes (De-) Crescendo"
 
-#: event-chord-iterator.cc:53 output-property-music-iterator.cc:31
-#, c-format
-msgid "junking event: `%s'"
-msgstr "Ereignis wird ignoriert: »%s«"
-
 #: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "unbegrenzte Erweiterung"
 
-#: folded-repeat-iterator.cc:63
-msgid "no one to print a repeat brace"
-msgstr "niemand zur Erzeugung einer Wiederholung"
-
 #: font-config.cc:28
 msgid "Initializing FontConfig..."
 msgstr "FontConfig wird initialisiert..."
 
-#: font-config.cc:38
-#, c-format
-msgid "Rebuilding FontConfig cache %s. this may take a while..."
+#: font-config.cc:44
+#, fuzzy, c-format
+msgid "Rebuilding FontConfig cache %s, this may take a while..."
 msgstr "FontConfig-Cache %s wird erneuert. Dies kann eine Weile dauern..."
 
-#: font-config.cc:49 font-config.cc:51
+#: font-config.cc:55
+#, fuzzy, c-format
+msgid "failed adding font directory: %s"
+msgstr "Schriftartverzeichnis wird hinzugefügt: %s"
+
+#: font-config.cc:57
 #, c-format
 msgid "adding font directory: %s"
 msgstr "Schriftartverzeichnis wird hinzugefügt: %s"
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr "Unendlichkeit oder NaN bei Umwandlung einer Real-Zahl gefunden"
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr "auf Null gesetzt"
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 msgid "unterminated glissando"
 msgstr "unbegrenztes Glissando."
 
-#: global-context-scheme.cc:50 global-context-scheme.cc:77
+#: global-context-scheme.cc:91 global-context-scheme.cc:107
 msgid "no music found in score"
 msgstr "keine Musik in der Partitur gefunden"
 
-#: global-context-scheme.cc:68
+#: global-context-scheme.cc:97
 msgid "Interpreting music... "
 msgstr "Interpretation der Musik..."
 
-#: global-context-scheme.cc:88
+#: global-context-scheme.cc:120
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "verstrichene Zeit: %.2f Sekunden"
 
-#: global-context.cc:159
-#, c-format
-msgid "can't find `%s' context"
-msgstr "Kontext »%s« kann nicht gefunden werden"
-
-#: gourlay-breaking.cc:202
-#, c-format
-msgid "Optimal demerits: %f"
-msgstr "Optimale Bewertung: %f"
-
-#: gourlay-breaking.cc:207
-msgid "no feasible line breaking found"
-msgstr "Keine praktikablen Zeilenumbrüche gefunden"
-
-#: gourlay-breaking.cc:215
-msgid "can't find line breaking that satisfies constraints"
-msgstr "es können keine Zeilenumbrüche gefunden werden, die die Bedingungen erfüllen"
-
-#: gregorian-ligature-engraver.cc:61
+#: gregorian-ligature-engraver.cc:59
 #, c-format
 msgid "\\%s ignored"
 msgstr "\\%s ignoriert"
 
-#: gregorian-ligature-engraver.cc:66
+#: gregorian-ligature-engraver.cc:64
 #, c-format
 msgid "implied \\%s added"
 msgstr "implizites \\%s hinzugefügt"
 
 #. ligature may not start with 2nd head of pes or flexa
-#: gregorian-ligature-engraver.cc:214
-msgid "can't apply `\\~' on first head of ligature"
+#: gregorian-ligature-engraver.cc:212
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "»\\~« kann nicht auf ersten Kopf der Bindung angewendet werden"
 
 #. (pitch == prev_pitch)
-#: gregorian-ligature-engraver.cc:226
-msgid "can't apply `\\~' on heads with identical pitch"
+#: gregorian-ligature-engraver.cc:224
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr "»\\~« kann nicht auf Köpfe mit gleicher Höhe angewendet werden"
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, c-format
 msgid "Unknown interface `%s'"
 msgstr "Unbekannte Schnittstelle »%s«"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr "Grob »%s« hat keine Schnittstelle für Eigenschaft »%s«"
 
-#: grob.cc:242
+#: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr "Unendlichkeit oder NaN bei Umwandlung einer Real-Zahl gefunden"
 
-#: hairpin.cc:149
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr "Decrescendo zu kurz"
 
-#: hairpin.cc:150
-msgid "crescendo too small"
-msgstr "Crescendo zu kurz"
-
-#: horizontal-bracket-engraver.cc:58
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:59
+#, fuzzy
+msgid "do not have that many brackets"
 msgstr "so viele Klammern gibt es nicht"
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 msgid "conflicting note group events"
 msgstr "in Konflikt stehende Notengruppenereignisse"
 
@@ -871,72 +899,77 @@ msgstr "unbegrenzter Bindestrich; entfernt"
 msgid "include files are not allowed in safe mode"
 msgstr "eingefügte Dateien sind im abgesicherten Modus nicht erlaubt"
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:104
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "Datei »%s« kann nicht gefunden werden"
 
-#: input.cc:103 source-file.cc:153 source-file.cc:168
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(Suchpfad: »%s«)"
+
+#: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "Position unbekannt"
 
-#: ligature-engraver.cc:100
-msgid "can't find start of ligature"
+#: ligature-engraver.cc:93
+msgid "cannot find start of ligature"
 msgstr "Anfang der Bindung kann nicht gefunden werden"
 
-#: ligature-engraver.cc:105
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr "keine rechte Begrenzung"
 
-#: ligature-engraver.cc:127
+#: ligature-engraver.cc:120
 msgid "already have a ligature"
 msgstr "habe bereits eine Bindung"
 
-#: ligature-engraver.cc:136
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr "keine linke Begrenzung"
 
-#: ligature-engraver.cc:180
+#: ligature-engraver.cc:173
 msgid "unterminated ligature"
 msgstr "unbegrenzte Bindung"
 
-#: ligature-engraver.cc:209
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr "Pause wird ignoriert: Bindung darf keine Pause enthalten"
 
-#: ligature-engraver.cc:210
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr "Bindung wurde hier begonnen"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(Lade-Pfad: `%s')"
 
-#: lily-guile.cc:441
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr "Eigenschafts-Typprüfung für »%s« (%s) kann nicht gefunden werden."
 
-#: lily-guile.cc:444
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr "vielleicht ein Tippfehler?"
 
-#: lily-guile.cc:450
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr "Zuweisung wird trotzdem durchgeführt"
 
-#: lily-guile.cc:462
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr "Typprüfung für »%s« gescheitert; Wert »%s« muss vom Typ »%s« sein"
 
-#: lily-lexer.cc:223
+#: lily-lexer.cc:254
 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "Bezeichnername ist ein Schlüsselwort: »%s«"
 
-#: lily-lexer.cc:238
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "Fehler am Dateiende (EOF): %s"
@@ -946,30 +979,31 @@ msgstr "Fehler am Dateiende (EOF): %s"
 msgid "deprecated function called: %s"
 msgstr "veraltete Funktion aufgerufen: %s"
 
-#: lily-parser-scheme.cc:76
-#, c-format
-msgid "Changing working directory to `%s'"
+#: lily-parser-scheme.cc:88
+#, fuzzy, c-format
+msgid "Changing working directory to: `%s'"
 msgstr "aktuelles Verzeichnis kann nicht zu »%s« geändert werden"
 
-#: lily-parser-scheme.cc:96
+#: lily-parser-scheme.cc:106
 #, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "Init-Datei kann nicht gefunden werden: »%s«"
 
-#: lily-parser-scheme.cc:114
+#: lily-parser-scheme.cc:125
 #, c-format
 msgid "Processing `%s'"
 msgstr "»%s« wird verarbeitet"
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Analysieren..."
 
-#: lily-parser.cc:126
-msgid "braces don't match"
+#: lily-parser.cc:127
+#, fuzzy
+msgid "braces do not match"
 msgstr "Klammern passen nicht zueinander"
 
-#: lyric-combine-music-iterator.cc:256
+#: lyric-combine-music-iterator.cc:291
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr "Stimme kann nicht gefunden werden: »%s«"
@@ -982,12 +1016,14 @@ msgid ""
 "under certain conditions.  Invoke as `%s --warranty' for more\n"
 "information.\n"
 msgstr ""
-"Dieses Programm ist Freie Software. Sie wird von der GNU General Public License\n"
+"Dieses Programm ist Freie Software. Sie wird von der GNU General Public "
+"License\n"
 "geschützt, und Sie können sie gerne ändern und/oder Kopien unter bestimmten\n"
 "Bedingungen weitergeben. Rufen Sie »%s --warranty« für weitere\n"
 "Informationen auf.\n"
 
 #: main.cc:122
+#, fuzzy
 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"
@@ -998,7 +1034,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1015,7 +1051,8 @@ msgstr ""
 "\n"
 "    Sie sollten eine Kopie (siehe Datei COPYING) der GNU General Public\n"
 "License zusammen mit diesem Programm erhalten haben. Falls nicht, schreiben\n"
-"Sie bitte an die Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
+"Sie bitte an die Free Software Foundation, Inc., 59 Temple Place - Suite "
+"330,\n"
 "Boston, MA 02111-1307, USA.\n"
 
 #: main.cc:153
@@ -1023,23 +1060,25 @@ msgid "BACK"
 msgstr "ZURÜCK"
 
 #: main.cc:153
+#, fuzzy
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 "Backend BACK verwenden (gnome, ps, eps,\n"
 "scm, svg, tex, texstr)\n"
 "Standard: PS"
 
 #: main.cc:155
-msgid "SYM=VAL"
+#, fuzzy
+msgid "SYM[=VAL]"
 msgstr "SYM=WERT"
 
 #: main.cc:156
+#, fuzzy
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 "Eine Scheme-Programmoption setzen. #t wird verwendet, wenn WERT\n"
 "nicht angegeben wurde. -dhelp für Hilfe verwenden."
@@ -1067,41 +1106,36 @@ msgid "generate DVI (tex backend only)"
 msgstr "DVI erzeugen (nur TeX-Backend)"
 
 #: main.cc:164
-msgid "relocate using directory of lilypond program"
-msgstr "wiederfinden mit Hilfe des Lilypond-Programmverzeichnisses"
-
-#: main.cc:165
 msgid "generate PDF (default)"
 msgstr "PDF erzeugen (Standard)"
 
-#: main.cc:166
+#: main.cc:165
 msgid "generate PNG"
 msgstr "PNG erzeugen"
 
-#: main.cc:167
+#: main.cc:166
 msgid "generate PostScript"
 msgstr "PostScript erzeugen"
 
-#: main.cc:168
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr "TeX erzeugen (nur TeX-Backend)"
 
-#: main.cc:169
-msgid "print this help"
-msgstr "diese Hilfe ausgeben"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:170
+#: main.cc:169
 msgid "FIELD"
 msgstr "FELD"
 
-#: main.cc:170
-msgid "dump a header field to file BASENAME.FIELD"
+#: main.cc:169
+#, fuzzy
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr "Header-Feld in BASISNAME.FELD schreiben"
 
-#: main.cc:171
-msgid "DIR"
-msgstr "VERZ"
-
 #: main.cc:171
 msgid "add DIR to search path"
 msgstr "VERZ zum Suchpfad hinzufügen"
@@ -1135,14 +1169,22 @@ msgid "generate a preview of the first system"
 msgstr "ein Bild des ersten Systems erzeugen"
 
 #: main.cc:180
-msgid "disallow unsafe Scheme and PostScript operations"
-msgstr "unsichere Scheme- und PostScript-Operationen verweigern"
+msgid "relocate using directory of lilypond program"
+msgstr "wiederfinden mit Hilfe des Lilypond-Programmverzeichnisses"
 
 #: main.cc:181
-msgid "print version number"
+#, fuzzy
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
+msgstr "unsichere Scheme- und PostScript-Operationen verweigern"
+
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "Versionsnummer ausgeben"
 
-#: main.cc:221
+#: main.cc:224
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1152,125 +1194,125 @@ msgstr ""
 "%s und anderen."
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:248
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Aufruf: %s [OPTION]... DATEI..."
 
-#: main.cc:250
+#: main.cc:253
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Musiksatz und/oder MIDI aus DATEI erzeugen."
 
-#: main.cc:252
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr "LilyPond erzeugt ansprechende Musiknotation."
 
-#: main.cc:254
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr "Für weitere Informationen: siehe %s"
 
-#: main.cc:256
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Optionen:"
 
-#: main.cc:260
+#: main.cc:263
 #, c-format
 msgid "Report bugs via %s"
 msgstr "Melden Sie Fehler an %s"
 
-#: main.cc:306
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr "%d Argumente mit Kerker erwartet, %u gefunden"
 
-#: main.cc:320
+#: main.cc:323
 #, c-format
 msgid "no such user: %s"
 msgstr "kein solcher Benutzer: %s"
 
-#: main.cc:322
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr "Benutzer-ID von Benutzer kann nicht gefunden werden: %s: %s"
 
-#: main.cc:337
+#: main.cc:340
 #, c-format
 msgid "no such group: %s"
 msgstr "keine solche Gruppe: %s"
 
-#: main.cc:339
+#: main.cc:342
 #, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "Gruppen-ID kann nicht von Gruppennamen ermittelt werden: %s: %s"
 
-#: main.cc:347
+#: main.cc:350
 #, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "kein chroot möglich nach: %s: %s"
 
-#: main.cc:354
+#: main.cc:357
 #, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "Gruppen-ID kann nicht geändert werden in: %d: %s"
 
-#: main.cc:360
+#: main.cc:363
 #, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "Benutzer-ID kann nicht geändert werden in: %d: %s"
 
-#: main.cc:366
+#: main.cc:369
 #, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "aktuelles Verzeichnis kann nicht geändert werden in: %s: %s"
 
-#: main.cc:413
+#: main.cc:415
 #, c-format
 msgid "Evaluating %s"
 msgstr "%s wird ausgewertet"
 
-#: main.cc:627
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr "Ausnahme gefangen: %s"
 
 #. FIXME: constant error message.
-#: mark-engraver.cc:131
+#: mark-engraver.cc:154
 msgid "rehearsalMark must have integer value"
 msgstr "rehearsalMark muss Ganzzahlwert haben"
 
-#: mark-engraver.cc:137
+#: mark-engraver.cc:160
 msgid "mark label must be a markup object"
 msgstr "Marke muss ein Markierungsobjekt sein"
 
-#: mensural-ligature-engraver.cc:77
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr "Bindung mit weniger als 2 Notenköpfen -> überspringen"
 
-#: mensural-ligature-engraver.cc:104
+#: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr "Tonhöhe der Bindung kann nicht ermittelt werden -> überspringen"
 
-#: mensural-ligature-engraver.cc:118
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr "Bindung einer einzelnen Note -> überspringen"
 
-#: mensural-ligature-engraver.cc:130
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr "Prime unter Bindung -> überspringen"
 
-#: mensural-ligature-engraver.cc:142
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr "Mensuralbindung: Dauer weder Mx, L, B noch S -> überspringen"
 
-#: mensural-ligature-engraver.cc:190
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr "Halb-Brevis muss von einem weiteren gefolgt werden -> überspringen"
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
@@ -1278,7 +1320,7 @@ msgstr ""
 "Halb-Brevis kann nur am Anfang einer Bindung auftreten,\n"
 "und es können nur null oder zwei davon auftreten"
 
-#: mensural-ligature-engraver.cc:228
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1290,7 +1332,7 @@ msgstr ""
 "muss die vorletzte Note eine weitere sein,\n"
 "oder die Bindung muss LB oder SSB sein"
 
-#: mensural-ligature-engraver.cc:348
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr "unbehandelter case-Zweig"
 
@@ -1307,102 +1349,118 @@ msgstr "Mensural_ligature: (join_right == 0)"
 msgid "no such MIDI instrument: `%s'"
 msgstr "kein solches MIDI-Instrument: `%s'"
 
-#: midi-item.cc:264
-msgid "silly pitch"
-msgstr "sinnlose Tonhöhe"
-
-#: midi-item.cc:280
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
-msgstr "Experimentell: temporäre Feinabstimmung (von %d Hundertsteln) des Kanals."
+msgstr ""
+"Experimentell: temporäre Feinabstimmung (von %d Hundertsteln) des Kanals."
 
 #: midi-stream.cc:28
 #, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "Datei kann nicht zum Schreiben geöffnet werden: %s: %s"
 
 #: midi-stream.cc:44
 #, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "in Datei konnte nicht geschrieben werden: »%s«"
 
-#: music.cc:140
-#, c-format
-msgid "octave check failed; expected %s, found: %s"
+#: music-iterator.cc:171
+msgid "Sending non-event to context"
+msgstr ""
+
+#: music.cc:141
+#, fuzzy, c-format
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr "Oktavenüberprüfung gescheitert; %s erwartet, %s gefunden"
 
-#: music.cc:203
+#: music.cc:207
 #, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "Transponieren um %s erzeugt Vorzeichen größer als zwei"
 
-#: new-fingering-engraver.cc:84
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr "es kann kein Text zu einzelnen Notenköpfen hinzugefügt werden"
 
-#.
-#. music for the softenon children?
-#.
-#: new-fingering-engraver.cc:153
-msgid "music for the martians."
-msgstr "Musik für Marsmenschen."
-
-#: new-fingering-engraver.cc:261
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr "Keine Platzierung für Griffe gefunden"
 
-#: new-fingering-engraver.cc:262
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr "Platzierung darunter"
 
-#: note-collision.cc:405
+#: note-collision.cc:457
 msgid "ignoring too many clashing note columns"
 msgstr "zu viele kollidierende Notenspalten werden ignoriert"
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr "Notenköpfe und Pausen können nicht zusammen an einem Hals auftreten"
 
-#: note-head.cc:67
-#, c-format
-msgid "note head `%s' not found"
+#: note-head.cc:63
+#, fuzzy, c-format
+msgid "none of note heads `%s' or `%s' found"
 msgstr "Notenkopf »%s« nicht gefunden"
 
-#: note-heads-engraver.cc:84
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr "NoteEvent ohne Tonhöhe"
 
 #: open-type-font.cc:33
 #, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "es können keine %lu Bytes angefordert werden"
 
 #: open-type-font.cc:37
 #, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "Schriftarttabelle kann nicht geladen werden: %s"
 
-#: open-type-font.cc:108
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr "nicht unterstütztes Format: %s"
 
-#: open-type-font.cc:110
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr "unbekannter Fehler: %d beim Lesen der Schriftartdatei: %s"
 
-#: open-type-font.cc:183 open-type-font.cc:307
-#, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+#: open-type-font.cc:173 open-type-font.cc:297
+#, fuzzy, c-format
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr "FT_Get_Glyph_Name() gab Fehler zurück: %d"
 
-#: pango-font.cc:157
+#: page-turn-page-breaking.cc:205
+msgid ""
+"cannot fit the first page turn onto a single page.  Consider setting first-"
+"page-number to an even number."
+msgstr ""
+
+#: page-turn-page-breaking.cc:218
+#, c-format
+msgid "Calculating page and line breaks (%d possible page breaks)..."
+msgstr ""
+
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
+msgid "Drawing systems..."
+msgstr ""
+
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "Keine PostScript-Schriftartname für Schriftart: »%s«"
 
-#: pango-font.cc:205
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr "FreeType-Ansicht hat keinen PostScript-Schriftartnamen"
 
@@ -1411,12 +1469,16 @@ msgstr "FreeType-Ansicht hat keinen PostScript-Schriftartnamen"
 msgid "Layout output to `%s'..."
 msgstr "Layout nach »%s« ausgeben..."
 
-#: paper-score.cc:104
+#: paper-score.cc:105
+msgid "Calculating line breaks..."
+msgstr "Zeilenumbrüche werden berechnet..."
+
+#: paper-score.cc:118
 #, c-format
 msgid "Element count %d (spanners %d) "
 msgstr "Elementanzahl: %d (Klammern: %d)"
 
-#: paper-score.cc:108
+#: paper-score.cc:122
 msgid "Preprocessing graphical objects..."
 msgstr "Vorverarbeitung der grafischen Elemente..."
 
@@ -1424,114 +1486,102 @@ msgstr "Vorverarbeitung der grafischen Elemente..."
 msgid "GUILE signaled an error for the expression beginning here"
 msgstr "GUILE signalisierte einen Fehler für den hier beginnenden Ausdruck"
 
-#: percent-repeat-engraver.cc:209
+#: percent-repeat-engraver.cc:200
 msgid "unterminated percent repeat"
 msgstr "unbegrenzte Prozentwiederholung"
 
-#: percent-repeat-iterator.cc:52
-msgid "no one to print a percent"
-msgstr "nichts bekannt, ein Prozent auszugeben"
-
-#: performance.cc:46
+#: performance.cc:45
 msgid "Track..."
 msgstr "Spur..."
 
-#: performance.cc:70
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr "MIDI-Kanal zurückgesprungen"
 
-#: performance.cc:71
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr "Abbildung modulo 16"
 
-#: performance.cc:90
-msgid "Creator: "
-msgstr "Erzeuger: "
-
-#: performance.cc:110
-msgid "at "
-msgstr "bei "
-
-#: performance.cc:162
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI-Ausgabe nach »%s«..."
 
-#: phrasing-slur-engraver.cc:170
+#: phrasing-slur-engraver.cc:146
 msgid "unterminated phrasing slur"
 msgstr "nicht beendeter Phrasierungsbogen"
 
-#: piano-pedal-engraver.cc:223
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr "3 Striche für Piano-Pedal erwartet, %ld gefunden"
 
-#: piano-pedal-engraver.cc:238 piano-pedal-engraver.cc:249
-#: piano-pedal-performer.cc:82
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
+#: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "kann keinen Anfang für Pedal finden: »%s«"
 
-#: piano-pedal-engraver.cc:296
+#: piano-pedal-engraver.cc:347
 #, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "kann keinen Anfang für Piano-Pedal finden: »%s«"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, c-format
 msgid "no such internal option: %s"
 msgstr "keine solche interne Option: %s"
 
-#: property-iterator.cc:81
+#: property-iterator.cc:74
 #, c-format
 msgid "not a grob name, `%s'"
 msgstr "Kein Name für grafische Objekte (grob): »%s«"
 
-#: quote-iterator.cc:255
-#, c-format
-msgid "in quotation: junking event %s"
-msgstr "in Zitat: Ereignis %s wird verworfen"
-
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr "Oktavprüfung gescheitert, Rückgabe: "
 
-#: relocate.cc:52
+#: relocate.cc:44
+#, fuzzy, c-format
+msgid "Setting %s to %s"
+msgstr "Schreiben der Schriftarten nach %s"
+
+#: relocate.cc:59
 #, c-format
 msgid "no such file: %s for %s"
 msgstr "keine solche Datei: %s für %s"
 
-#: relocate.cc:62 relocate.cc:80
+#: relocate.cc:69 relocate.cc:87
 #, c-format
 msgid "no such directory: %s for %s"
 msgstr "kein solches Verzeichnis: %s für %s"
 
-#: relocate.cc:72
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr "%s=%s (voranstellen)\n"
 
-#: relocate.cc:104
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr "Verlagerung: Übersetzungsvorsilbe=%s, neue Vorsilbe=%s"
 
-#: relocate.cc:130
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr "Verlagerung: framework_prefix=%s"
 
-#: relocate.cc:212
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr "Verlagerung: ist absolut: argv0=%s"
 
-#: relocate.cc:219
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr "Verlagerung: von cwd: argv0=%s"
 
-#: relocate.cc:228
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
@@ -1540,15 +1590,25 @@ msgstr ""
 "Verlagerung: von PATH=%s\n"
 "argv0=%s"
 
-#: rest-collision.cc:149
-msgid "can't resolve rest collision: rest direction not set"
+#: relocate.cc:354
+#, fuzzy, c-format
+msgid "Relocation file: %s"
+msgstr "Verlagerung: ist absolut: argv0=%s"
+
+#: relocate.cc:390
+#, c-format
+msgid "Unknown relocation command %s"
+msgstr ""
+
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr "Restkollision kann nicht aufgelöst werden: Restrichtung nicht gesetzt"
 
-#: rest-collision.cc:163 rest-collision.cc:208
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "zu viele kollidierende Pausen"
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr "Pause »%s« nicht gefunden"
@@ -1567,38 +1627,48 @@ msgstr "Musik-Schriftart wurde nicht ordnungsgemäß installiert."
 msgid "Search path `%s'"
 msgstr "Suchpfad »%s«"
 
-#: score.cc:211
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr "Abbruch"
+
+#: score.cc:225
 msgid "already have music in score"
 msgstr "es ist bereits Musik in der Partitur"
 
-#: score.cc:212
+#: score.cc:226
 msgid "this is the previous music"
 msgstr "Dies ist die vorhergehende Musik"
 
-#: score.cc:217
+#: score.cc:231
 msgid "errors found, ignoring music expression"
 msgstr "Fehler gefunden, musikalischer Ausdruck wird ignoriert"
 
 #. FIXME:
-#: script-engraver.cc:105
-msgid "don't know how to interpret articulation: "
+#: script-engraver.cc:102
+#, fuzzy
+msgid "do not know how to interpret articulation: "
 msgstr "Keine Interpretation für Artikulation bekannt: "
 
-#: script-engraver.cc:106
+#: script-engraver.cc:103
 msgid "scheme encoding: "
 msgstr "Schemakodierung: "
 
-#: simple-spacer.cc:406
+#: simple-spacer.cc:375
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr "Kein (dynamischer) Abstand zwischen Spalte %d und Nachfolger"
 
-#: slur-engraver.cc:176
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
+msgstr ""
+
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "unbegrenzter Bogen"
 
-#: slur-engraver.cc:185
-msgid "can't end slur"
+#: slur-engraver.cc:166
+msgid "cannot end slur"
 msgstr "Bindebogen kann nicht beendet werden"
 
 #: source-file.cc:74
@@ -1606,103 +1676,77 @@ msgstr "Bindebogen kann nicht beendet werden"
 msgid "expected to read %d characters, got %d"
 msgstr "%d Zeichen erwartet, %d erhalten"
 
-#: spacing-spanner.cc:48
-#, c-format
-msgid "Global shortest duration is %s"
-msgstr "Kleinste globale Zeiteinheit ist %s"
+#: staff-symbol-engraver.cc:62
+msgid "staff-span event has no direction"
+msgstr ""
 
-#: stem-engraver.cc:93
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr "Tremolodauer ist zu lang"
 
 #. FIXME:
-#: stem-engraver.cc:130
+#: stem-engraver.cc:129
 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "Notenkopf wird zu inkompatiblem Hals (Typ = %d) hinzugefügt"
 
-#: stem-engraver.cc:132
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr "vielleicht sollte die Eingabe mehrstimmig sein"
 
-#: stem.cc:98
+#: stem.cc:105
 msgid "weird stem size, check for narrow beams"
 msgstr "Eigenartige Notenhalslänge; auf enge Balken überprüfen"
 
-#: stem.cc:592
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr "Fähnchen »%s« nicht gefunden"
 
-#: stem.cc:603
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr "Fähnchenstrich »%s« nicht gefunden"
 
-#: system.cc:181
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr "Elementanzahl: %d."
 
-#: system.cc:268
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr "Anzahl der grafischen Objekte (grob): %d"
 
-#: system.cc:289
-msgid "Calculating line breaks..."
-msgstr "Zeilenumbrüche werden berechnet..."
-
-#: text-spanner-engraver.cc:62
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr "Anfang der Textklammer kann nicht gefunden werden"
 
-#: text-spanner-engraver.cc:74
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr "Textklammer bereits vorhanden"
 
-#: text-spanner-engraver.cc:134
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr "unbegrenzte Textklammer"
 
-#. Not using ngettext's plural feature here, as this message is
-#. more of a programming error.
-#: tfm-reader.cc:107
-#, c-format
-msgid "TFM header of `%s' has only %u word (s)"
-msgstr "TFM Header von »%s« hat nur %u Wort(e)"
-
-#: tfm-reader.cc:140
-#, c-format
-msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
-msgstr "%s: TFM-Datei hat %u Parameter - mehr als die Maximalzahl %u"
-
-#: tfm.cc:72
-#, c-format
-msgid "can't find ascii character: %d"
-msgstr "folgendes ASCII-Zeichen kann nicht gefunden werden: %d"
-
-#: tie-engraver.cc:181
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "einsamer Bindebogen"
 
-#: time-scaled-music-iterator.cc:24
-msgid "no one to print a tuplet start bracket"
-msgstr "nichts für die Ausgabe einer öffnenden Wertaufteilungsklammer vorhanden"
-
 #.
 #. Todo: should make typecheck?
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr "seltsame Taktart gefunden: %d/%d"
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr "Taktart »%s« nicht gefunden; Rückkehr zum nummerierten Stil"
@@ -1712,24 +1756,39 @@ msgstr "Taktart »%s« nicht gefunden; Rückkehr zum nummerierten Stil"
 msgid "unknown translator: `%s'"
 msgstr "unbekannter Übersetzer: »%s«"
 
-#: trill-spanner-engraver.cc:71
-msgid "can't find start of trill spanner"
+#: translator-group.cc:151
+#, c-format
+msgid "cannot find: `%s'"
+msgstr "»%s« kann nicht gefunden werden"
+
+#: translator.cc:332
+#, c-format
+msgid "Two simultaneous %s events, junking this one"
+msgstr ""
+
+#: translator.cc:333
+#, c-format
+msgid "Previous %s event here"
+msgstr ""
+
+#: trill-spanner-engraver.cc:68
+msgid "cannot find start of trill spanner"
 msgstr "Anfang des Trillers kann nicht gefunden werden"
 
-#: trill-spanner-engraver.cc:83
+#: trill-spanner-engraver.cc:80
 msgid "already have a trill spanner"
 msgstr "Triller bereits aktiv"
 
-#: trill-spanner-engraver.cc:142
-msgid "unterminated trill spanner"
-msgstr "unbegrenzter Triller"
-
-#: vaticana-ligature-engraver.cc:347
+#: vaticana-ligature-engraver.cc:388
 #, c-format
-msgid "ignored prefix (es) `%s' of this head according to restrictions of the selected ligature style"
-msgstr "Vorzeichen (es) »%s« dieses Kopfes gemäß den Einschränkungen des ausgewählten Bindungs-Stils ignoriert"
+msgid ""
+"ignored prefix (es) `%s' of this head according to restrictions of the "
+"selected ligature style"
+msgstr ""
+"Vorzeichen (es) »%s« dieses Kopfes gemäß den Einschränkungen des "
+"ausgewählten Bindungs-Stils ignoriert"
 
-#: vaticana-ligature-engraver.cc:584
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr "Vaticana_ligature_engraver: setzen »spacing-increment = %f«: ptr=%ul"
@@ -1747,271 +1806,280 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr "Vaticana_ligature: nichts zusammengefügt (delta_pitch == 0)"
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:142
-msgid "can't end volta spanner"
+#: volta-engraver.cc:144
+msgid "cannot end volta spanner"
 msgstr "Anfang der Textklammer kann nicht gefunden werden"
 
-#: volta-engraver.cc:152
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr "Wiederholungskasten bereits vorhanden, wird vorzeitig beendet"
 
-#: volta-engraver.cc:156
+#: volta-engraver.cc:158
 msgid "also already have an ended spanner"
 msgstr "endende Textklammer auch bereits vorhanden"
 
-#. no longer valid with dashes in \paper{} block.
-#: parser.yy:535
-msgid "identifier should have alphabetic characters only"
-msgstr "Bezeichner sollte nur aus alphabetischen Zeichen bestehen"
+#: volta-engraver.cc:159
+msgid "giving up"
+msgstr "aufgeben"
 
-#: parser.yy:705
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
-msgstr "\\paper kann nicht in \\source verwendet werden; stattdessen \\layout verwenden"
+msgstr ""
+"\\paper kann nicht in \\source verwendet werden; stattdessen \\layout "
+"verwenden"
 
-#: parser.yy:729
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr "Für Papier-Block wird \\paper benötigt"
 
-#: parser.yy:879
-msgid "more alternatives than repeats"
-msgstr "mehr Alternativen als Wiederholungen"
-
-#: parser.yy:916
-#, c-format
-msgid "expect 2 elements for Chord tremolo, found %d"
-msgstr "2 Elemente für Akkord-Tremolo erwartet, %d gefunden"
-
-#: parser.yy:1316
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr "Grob-Name sollte alphanumerisch sein"
 
-#: parser.yy:1681
+#: parser.yy:1475
 msgid "second argument must be pitch list"
 msgstr "zweites Argument muss eine Tonhöhenliste sein"
 
-#: parser.yy:1724 parser.yy:1729 parser.yy:2235
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 msgid "have to be in Lyric mode for lyrics"
 msgstr "muss in Liedtextmodus sein um Liedtext setzen zu können"
 
-#: parser.yy:1822
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr "Zeichenkette als Skriptdefinition erwartet"
 
-#: parser.yy:1981 parser.yy:2031
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "keine gültige Dauer: %d"
 
-#: parser.yy:2154
+#: parser.yy:1926
 msgid "have to be in Note mode for notes"
 msgstr "Muss im Notenmodus sein für Noten"
 
-#: parser.yy:2248
+#: parser.yy:1987
 msgid "have to be in Chord mode for chords"
 msgstr "Muss im Akkordmodus sein für Akkorde"
 
-#: parser.yy:2730
-msgid "music head function must return Music object"
-msgstr "Musikkopf-Funktion muss Musikobjekt zurückliefern."
-
-#: lexer.ll:158
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr "verirrtes UTF-8 BOM gefunden"
 
-#: lexer.ll:162
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr "UTF-8 BOM wird übersprungen"
 
-#: lexer.ll:206
+#: lexer.ll:235
 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr "Eingabe in »%s« umbenannt"
 
-#: lexer.ll:214
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr "zitierte Zeichenkette hinter \\version erwartet"
 
-#: lexer.ll:218
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr "zitierte Zeichenkette hinter \\sourcefilename erwartet"
 
-#: lexer.ll:231
+#: lexer.ll:260
+#, fuzzy
+msgid "integer expected after \\sourcefileline"
+msgstr "zitierte Zeichenkette hinter \\sourcefilename erwartet"
+
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "EOF innerhalb eines Kommentares gefunden"
 
-#: lexer.ll:246
+#: lexer.ll:288
 msgid "\\maininput not allowed outside init files"
 msgstr "\\maininput ist außerhalb von Init-Dateien nicht erlaubt"
 
-#: lexer.ll:270
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "falscher oder ungültiger Bezeichner: »%s«"
 
 #. backup rule
-#: lexer.ll:279
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr "schließendes Anführungszeichen fehlt"
 
-#: lexer.ll:441
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
-msgstr "Klammer am Ende von Liedtext gefunden. Haben Sie ein Leerzeichen vergessen?"
+msgstr ""
+"Klammer am Ende von Liedtext gefunden. Haben Sie ein Leerzeichen vergessen?"
 
-#: lexer.ll:540
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
-msgstr "Klammer am Ende des Auszugs gefunden. Haben Sie ein Leerzeichen vergessen?"
+msgstr ""
+"Klammer am Ende des Auszugs gefunden. Haben Sie ein Leerzeichen vergessen?"
 
-#: lexer.ll:640
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "Ungültiges Zeichen: »%c«"
 
-#: lexer.ll:727
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "Ungültige Fluchtsequenz: »\\%s«"
 
-#: lexer.ll:824
+#: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "Falsche lilypond-Version: %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:825
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:881 lexer.ll:882
+#, fuzzy
+msgid "consider updating the input with the convert-ly script"
 msgstr "Erwägen Sie die Aktualisierung der Eingabe mit dem Skript convert-ly"
 
-#. TODO: print location
-#: lexer.ll:945
-msgid "can't find signature for music function"
-msgstr "Signatur für Musikfunktion kann nicht gefunden werden"
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
 
-#: backend-library.scm:19 lily.scm:439 ps-to-png.scm:88
-#, lisp-format
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, scheme-format
 msgid "Invoking `~a'..."
 msgstr "»~s« wird aufgerufen..."
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr "»~a« gescheitert (~a)"
 
-#: backend-library.scm:84 framework-tex.scm:339 framework-tex.scm:364
-#, lisp-format
+#: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
+#, scheme-format
 msgid "Converting to `~a'..."
 msgstr "Konvertierung nach »~a«..."
 
-#: backend-library.scm:100
-#, lisp-format
+#: backend-library.scm:108
+#, scheme-format
 msgid "Converting to ~a..."
 msgstr "Konvertierung nach ~a..."
 
 #: backend-library.scm:145
-#, lisp-format
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "Kopfzeile »~a« wird nach »~a« geschrieben"
 
-#: define-context-properties.scm:13 define-grob-properties.scm:10
+#: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr "Symbol ~S redefiniert"
 
-#: define-markup-commands.scm:251
+#: define-event-classes.scm:119
+#, scheme-format
+msgid "event class ~A seems to be unused"
+msgstr ""
+
+#. should be programming-error
+#: define-event-classes.scm:125
+#, scheme-format
+msgid "translator listens to nonexisting event class ~A"
+msgstr ""
+
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr "keine Systeme in \\score-Markup gefunden, hat es einen \\layout-Block?"
 
-#: define-markup-commands.scm:1205
-#, lisp-format
+#: define-markup-commands.scm:1297
+#, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "keine gültige Dauer: ~a"
 
-#: define-music-types.scm:738
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr "Symbol erwartet: ~S"
 
-#: define-music-types.scm:741
-#, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "Musikobjekt kann nicht gefunden werden: ~S"
 
-#: define-music-types.scm:761
-#, lisp-format
+#: define-music-types.scm:774
+#, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "unbekannter Wiederholungstyp »~S«"
 
-#: define-music-types.scm:762
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr "Siehe music-types.scm für unterstützte Wiederholungen"
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr "Paar erwartet in doc ~s"
 
 #: document-backend.scm:135
-#, lisp-format
-msgid "can't find interface for property: ~S"
+#, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "Schnittstelle für Eigenschaft ~S kann nicht gefunden werden"
 
 #: document-backend.scm:145
-#, lisp-format
+#, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "Unbekannte Grob-Schnittstelle: ~S"
 
 #: documentation-lib.scm:45
-#, lisp-format
+#, scheme-format
 msgid "Processing ~S..."
 msgstr "~S wird verarbeitet..."
 
 #: documentation-lib.scm:150
-#, lisp-format
+#, scheme-format
 msgid "Writing ~S..."
 msgstr "~S wird geschrieben..."
 
 #: documentation-lib.scm:172
-#, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "Beschreibung für Eigenschaft ~S (~S) kann nicht gefunden werden"
 
-#: framework-eps.scm:71 framework-eps.scm:72
-#, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, scheme-format
 msgid "Writing ~a..."
 msgstr "~a wird geschrieben..."
 
-#: framework-ps.scm:275
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr "~S=~S kann nicht eingebettet werden"
 
-#: framework-ps.scm:326
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr "Eine zu ~a passende Datei kann nicht aus ~a gewonnen werden"
 
-#: framework-ps.scm:343
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#: framework-ps.scm:349
+#, fuzzy, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr "Unbekannte Einbettung ~S=~S"
 
-#: framework-ps.scm:373
-#, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "Unbekannte Schriftsatzeinbettung ~s ~s ~s"
 
-#: framework-ps.scm:579
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr "<stdout> kann nicht in ~S konvertiert werden"
 
-#: framework-ps.scm:596 framework-ps.scm:599
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr "~S kann nicht mit PostScript-Backend erzeugt werden"
 
-#: framework-ps.scm:606
+#: framework-ps.scm:758
+#, fuzzy
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2023,145 +2091,303 @@ msgstr ""
 "\n"
 "  lilypond -b eps <file>\n"
 "\n"
-"oder die Lilypond-Buch-spezifischen Einstellungen aus der Eingabe entfernen.\n"
+"oder die Lilypond-Buch-spezifischen Einstellungen aus der Eingabe "
+"entfernen.\n"
 
-#: framework-tex.scm:356
-#, lisp-format
+#: framework-tex.scm:360
+#, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "TeX-Dateiname darf keine Leerzeichen enthalten: »~a«"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr "Fehler bei Balkenzuschnitt. (~S,~S) erwartet, ~S gefunden."
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr "Fehler bei Balkenzuschnitt. ~S 0 erwartet, ~S gefunden."
 
-#: layout-page-layout.scm:439
+#: layout-page-layout.scm:357
 msgid "Calculating page breaks..."
 msgstr "Zeilenumbrüche werden berechnet..."
 
-#: lily-library.scm:458
-#, lisp-format
+#: lily-library.scm:593
+#, scheme-format
 msgid "unknown unit: ~S"
 msgstr "unbekannte Einheit: ~S"
 
-#: lily-library.scm:491
-#, lisp-format
-msgid "no \\version statement found,  add~afor future compatibility"
-msgstr "keine \\version-Anweisung gefunden, ~a für zukünftige Kompatibilität hinzufügen"
+#: lily-library.scm:626
+#, fuzzy, scheme-format
+msgid "no \\version statement found, please add~afor future compatibility"
+msgstr ""
+"keine \\version-Anweisung gefunden, ~a für zukünftige Kompatibilität "
+"hinzufügen"
 
-#: lily-library.scm:498
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr "alte relative Kompatibilität nicht verwendet"
 
-#: lily.scm:172
-#, lisp-format
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
+msgstr "»%s« kann nicht gefunden werden"
+
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr "falscher Typ für Argument ~a; ~a erwartet, ~s gefunden"
 
-#: lily.scm:377 lily.scm:429
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr "gescheiterte Dateien: ~S"
 
-#: lily.scm:419
-#, lisp-format
+#: lily.scm:579
+#, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "Ausgabeumleitung nach ~a..."
 
-#: markup.scm:88
-#, lisp-format
+#: ly-syntax-constructors.scm:40
+#, fuzzy
+msgid "Music head function must return Music object"
+msgstr "Musikkopf-Funktion muss Musikobjekt zurückliefern."
+
+#: ly-syntax-constructors.scm:136
+#, scheme-format
+msgid "Invalid property operation ~a"
+msgstr ""
+
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr "Falsche Anzahl an Argumenten: ~A erwartet, ~A gefunden: ~S"
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr "Ungültiges Argument an Position ~A. ~A erwartet, ~S gefunden."
 
-#: music-functions.scm:533
-#, lisp-format
+#: music-functions.scm:213
+#, fuzzy
+msgid "More alternatives than repeats.  Junking excess alternatives"
+msgstr "mehr Alternativen als Wiederholungen"
+
+#: music-functions.scm:232
+#, fuzzy, scheme-format
+msgid "expecting 2 elements for chord tremolo, found ~a"
+msgstr "2 Elemente für Akkord-Tremolo erwartet, %d gefunden"
+
+#: music-functions.scm:538
+#, scheme-format
 msgid "music expected: ~S"
 msgstr "Musik erwartet: ~S"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:584
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr "Taktüberprüfung gescheitert. bei ~a erwartet, stattdessen bei ~a"
 
-#: music-functions.scm:739
-#, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "zitierte Musik »~S« kann nicht gefunden werden"
 
-#: music-functions.scm:947
-#, lisp-format
+#: music-functions.scm:942
+#, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "unbekannter Vorzeichenstil: ~S"
 
-#: output-ps.scm:282
+#: output-ps.scm:315
 msgid "utf-8-string encountered in PS backend"
 msgstr "UTF-8-Zeichenkette in PostScript-Backend gefunden"
 
-#: output-svg.scm:41
-#, lisp-format
+#: output-svg.scm:42
+#, scheme-format
 msgid "undefined: ~S"
 msgstr "nicht definiert: ~S"
 
-#: output-svg.scm:121
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#: output-svg.scm:132
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr "Pango-Beschreibung kann nicht entschlüsselt werden: ~a"
 
 #: output-tex.scm:98
-#, lisp-format
-msgid "can't find ~a in ~a"
+#, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "~a kann nicht in ~a gefunden werden"
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr "Nicht auf höchster Ebene im Gültigkeitsbereich"
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr "Dies ist kein \\layout {} Objekt, ~S"
 
+#: paper.scm:129
+#, scheme-format
+msgid "Unknown papersize: ~a"
+msgstr ""
+
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:142
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
-msgstr "#(set-paper-size ..) muss innerhalb von \\paper { ... } verwendet werden"
+msgstr ""
+"#(set-paper-size ..) muss innerhalb von \\paper { ... } verwendet werden"
 
-#: parser-clef.scm:124
-#, lisp-format
+#: parser-clef.scm:126
+#, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "unbekannter Notenschlüsseltyp »~a«"
 
-#: parser-clef.scm:125
+#: parser-clef.scm:127
 msgid "see scm/clef.scm for supported clefs"
 msgstr "unterstützte Notenschlüssel können in scm/clef.scm gefunden werden"
 
-#: ps-to-png.scm:97
-#, lisp-format
+#: ps-to-png.scm:88
+#, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "~a mit Rückgabewert ~S beendet"
 
 #: to-xml.scm:190
-msgid "assertion failed"
+#, fuzzy, scheme-format
+msgid "assertion failed: ~S"
 msgstr "Behauptung gescheitert"
 
+#~ msgid "silly pitch"
+#~ msgstr "sinnlose Tonhöhe"
+
+#~ msgid "show warranty"
+#~ msgstr "Gewährleistung anzeigen"
+
+#~ msgid ""
+#~ "Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
+#~ "\n"
+#~ "Example usage:\n"
+#~ "\n"
+#~ "   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
+#~ "   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" "
+#~ "BOOK\n"
+#~ "   lilypond-book --process='lilypond -I include' BOOK\n"
+#~ msgstr ""
+#~ "LilyPond-Auszüge in gemischtem HTML-, LaTeX- oder texinfo-Dokument "
+#~ "verarbeiten.\n"
+#~ "\n"
+#~ "Beispiel-Aufrufe:\n"
+#~ "\n"
+#~ "   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BUCH\n"
+#~ "   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" "
+#~ "BUCH\n"
+#~ "   lilypond-book --process='lilypond -I include' BUCH\n"
+
+#~ msgid "Convert MIDI to LilyPond source."
+#~ msgstr "MIDI nach LilyPond-Quelltext konvertieren."
+
+#~ msgid "example"
+#~ msgstr "Beispiel"
+
+#~ msgid "loading default font"
+#~ msgstr "Standardschriftart wird geladen"
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "Standardschriftart kann nicht gefunden werden: »%s«"
+
+#~ msgid "no one to print a tremolos"
+#~ msgstr "niemand vorhanden für Tremoloausgabe"
+
+#~ msgid "gotcha: ptr=%ul"
+#~ msgstr "erwischt: ptr=%ul"
+
+#~ msgid "distance undefined, assuming 0.1"
+#~ msgstr "Abstand undefiniert, 0.1 angenommen"
+
+#~ msgid "distance=%f"
+#~ msgstr "Abstand=%f"
+
+#~ msgid "no system number set in constrained-breaking"
+#~ msgstr "keine Systemzahl bei Bedingungsverletzung gesetzt"
+
+#~ msgid "couldnnot find line breaking that satisfies constraints"
+#~ msgstr ""
+#~ "es können keine Zeilenumbrüche gefunden werden, die die Bedingungen "
+#~ "erfüllen"
+
+#~ msgid "junking event: `%s'"
+#~ msgstr "Ereignis wird ignoriert: »%s«"
+
+#~ msgid "no one to print a repeat brace"
+#~ msgstr "niemand zur Erzeugung einer Wiederholung"
+
+#~ msgid "cannot find `%s' context"
+#~ msgstr "Kontext »%s« kann nicht gefunden werden"
+
+#~ msgid "Optimal demerits: %f"
+#~ msgstr "Optimale Bewertung: %f"
+
+#~ msgid "no feasible line breaking found"
+#~ msgstr "Keine praktikablen Zeilenumbrüche gefunden"
+
+#~ msgid "crescendo too small"
+#~ msgstr "Crescendo zu kurz"
+
+#~ msgid "print this help"
+#~ msgstr "diese Hilfe ausgeben"
+
+#~ msgid "music for the martians."
+#~ msgstr "Musik für Marsmenschen."
+
+#~ msgid "no one to print a percent"
+#~ msgstr "nichts bekannt, ein Prozent auszugeben"
+
+#~ msgid "Creator: "
+#~ msgstr "Erzeuger: "
+
+#~ msgid "at "
+#~ msgstr "bei "
+
+#~ msgid "in quotation: junking event %s"
+#~ msgstr "in Zitat: Ereignis %s wird verworfen"
+
+#~ msgid "Global shortest duration is %s"
+#~ msgstr "Kleinste globale Zeiteinheit ist %s"
+
+#~ msgid "TFM header of `%s' has only %u word (s)"
+#~ msgstr "TFM Header von »%s« hat nur %u Wort(e)"
+
+#~ msgid ""
+#~ "%s: TFM file has %u parameters, which is more than the %u I can handle"
+#~ msgstr "%s: TFM-Datei hat %u Parameter - mehr als die Maximalzahl %u"
+
+#~ msgid "cannot find ascii character: %d"
+#~ msgstr "folgendes ASCII-Zeichen kann nicht gefunden werden: %d"
+
+#~ msgid "no one to print a tuplet start bracket"
+#~ msgstr ""
+#~ "nichts für die Ausgabe einer öffnenden Wertaufteilungsklammer vorhanden"
+
+#~ msgid "unterminated trill spanner"
+#~ msgstr "unbegrenzter Triller"
+
+#~ msgid "identifier should have alphabetic characters only"
+#~ msgstr "Bezeichner sollte nur aus alphabetischen Zeichen bestehen"
+
+#~ msgid "expect 2 elements for Chord tremolo, found %d"
+#~ msgstr "2 Elemente für Akkord-Tremolo erwartet, %d gefunden"
+
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "Falsche lilypond-Version: %s (%s, %s)"
+
+#~ msgid "cannot find signature for music function"
+#~ msgstr "Signatur für Musikfunktion kann nicht gefunden werden"
+
 #~ msgid "lilylib module"
 #~ msgstr "Modul lilylib"
 
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "Aufruf: %s [OPTIONEN]... DATEI"
-
 #~ msgid "Binary %s has version %s, looking for version %s"
 #~ msgstr "Binärdatei %s hat Version %s, bei Suche nach Version %s"
 
@@ -2182,19 +2408,25 @@ msgstr "Behauptung gescheitert"
 
 #~ msgid ""
 #~ "  -e, --edit             edit in place\n"
-#~ "  -f, --from=VERSION     start from VERSION [default: \\version found in file]\n"
+#~ "  -f, --from=VERSION     start from VERSION [default: \\version found in "
+#~ "file]\n"
 #~ "  -h, --help             print this help\n"
 #~ "  -n, --no-version       do not add \\version command if missing\n"
-#~ "  -s, --show-rules       print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]\n"
-#~ "  -t, --to=VERSION       convert to VERSION [default: @TOPLEVEL_VERSION@]\n"
+#~ "  -s, --show-rules       print rules [default: --from=0, --"
+#~ "to=@TOPLEVEL_VERSION@]\n"
+#~ "  -t, --to=VERSION       convert to VERSION [default: "
+#~ "@TOPLEVEL_VERSION@]\n"
 #~ "  -v, --version          print program version"
 #~ msgstr ""
 #~ "  -e, --edit             auf der Stelle ändern\n"
-#~ "  -f, --from=VERSION     von VERSION starten [Standard: in Datei gefundene \\version]\n"
+#~ "  -f, --from=VERSION     von VERSION starten [Standard: in Datei "
+#~ "gefundene \\version]\n"
 #~ "  -h, --help             diese Hilfe ausgeben\n"
 #~ "  -n, --no-version       Befehl \\version nicht verwenden, wenn er fehlt\n"
-#~ "  -s, --show-rules       Regeln ausgeben [Standard: --from=0, --to=@TOPLEVEL_VERSION@]\n"
-#~ "  -t, --to=VERSION       in VERSION umwandeln [Standard: @TOPLEVEL_VERSION@]\n"
+#~ "  -s, --show-rules       Regeln ausgeben [Standard: --from=0, --"
+#~ "to=@TOPLEVEL_VERSION@]\n"
+#~ "  -t, --to=VERSION       in VERSION umwandeln [Standard: "
+#~ "@TOPLEVEL_VERSION@]\n"
 #~ "  -v, --version          Programmversion ausgeben"
 
 #~ msgid "%s: skipping: `%s'"
@@ -2218,12 +2450,6 @@ msgstr "Behauptung gescheitert"
 #~ msgid "command exited with value %d"
 #~ msgstr "Kommando mit Rückgabewert %d beendet"
 
-#~ msgid "Example:"
-#~ msgstr "Beispiel:"
-
-#~ msgid "Convert mup to LilyPond source."
-#~ msgstr "mup nach LilyPond-Quelltext konvertieren."
-
 #~ msgid "debug"
 #~ msgstr "Fehlersuche"
 
@@ -2257,7 +2483,7 @@ msgstr "Behauptung gescheitert"
 #~ msgid "Wrote `%s'"
 #~ msgstr "`%s' geschrieben"
 
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "dlopen erfolglos: %s: %s"
 
 #~ msgid "install package: %s or %s"
@@ -2279,13 +2505,17 @@ msgstr "Behauptung gescheitert"
 #~ msgstr "Passt nicht: `%s'"
 
 #~ msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
-#~ msgstr "Bauen Sie alle .afm-Dateien neu, und löschen Sie alle .pk- und .tfm-Dateien."
+#~ msgstr ""
+#~ "Bauen Sie alle .afm-Dateien neu, und löschen Sie alle .pk- und .tfm-"
+#~ "Dateien."
 
 #~ msgid "Rerun with -V to show font paths."
 #~ msgstr "Starten Sie erneut mit -V, um Suchpfade für Schriftarten anzuzeigen"
 
 #~ msgid "A script for removing font-files is delivered with the source-code:"
-#~ msgstr "Ein Skript zum Entfernen von Schriftartdateien wird mit dem Quellcode ausgeliefert:"
+#~ msgstr ""
+#~ "Ein Skript zum Entfernen von Schriftartdateien wird mit dem Quellcode "
+#~ "ausgeliefert:"
 
 #~ msgid "beam has less than two visible stems"
 #~ msgstr "Balken hat weniger als zwei sichtbare Notenhälse"
@@ -2306,11 +2536,12 @@ msgstr "Behauptung gescheitert"
 #~ msgid "run in safe mode"
 #~ msgstr "im sicheren Modus laufen lassen"
 
-#~ msgid "can't handle a percent repeat of length: %s"
+#~ msgid "cannot handle a percent repeat of length: %s"
 #~ msgstr "Prozentwiederholung der Länge %s kann nicht behandelt werden"
 
 #~ msgid "rest direction not set.  Cannot resolve collision."
-#~ msgstr "Pausenrichtung nicht gesetzt. Kollision kann nicht aufgelöst werden."
+#~ msgstr ""
+#~ "Pausenrichtung nicht gesetzt. Kollision kann nicht aufgelöst werden."
 
 #~ msgid "lilypond -e EXPR means:"
 #~ msgstr "lilypond -e AUSD bedeutet:"
@@ -2318,11 +2549,16 @@ msgstr "Behauptung gescheitert"
 #~ msgid "  Evalute the Scheme EXPR before parsing any .ly files."
 #~ msgstr "  Das Schema AUSD vor der Analyse aller .ly-Dateien auswerten"
 
-#~ msgid "  Multiple -e options may be given, they will be evaluated sequentially."
-#~ msgstr "  Mehrere -e Optionen dürfen angegeben werden, sie werden sequentiell ausgewertet"
+#~ msgid ""
+#~ "  Multiple -e options may be given, they will be evaluated sequentially."
+#~ msgstr ""
+#~ "  Mehrere -e Optionen dürfen angegeben werden, sie werden sequentiell "
+#~ "ausgewertet"
 
-#~ msgid "  The function ly:set-option allows for access to some internal variables."
-#~ msgstr "  Die Funktion ly:set-option erlaubt Zugriff auf einige interne Variablen."
+#~ msgid ""
+#~ "  The function ly:set-option allows for access to some internal variables."
+#~ msgstr ""
+#~ "  Die Funktion ly:set-option erlaubt Zugriff auf einige interne Variablen."
 
 #~ msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
 #~ msgstr "Aufruf: lilypond -e \"(ly:set-option SYMBOL WERT)\""
@@ -2408,7 +2644,7 @@ msgstr "Behauptung gescheitert"
 #~ msgid "Could not find bounding box of `~a'"
 #~ msgstr "Begrenzungskasten von »~a« konnte nicht gefunden werden"
 
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "CFF/PFA/PFB-Schriftart ~S=~S kann nicht gefunden werden"
 
 #~ msgid "unknown bar glyph: `~S'"
@@ -2441,7 +2677,7 @@ msgstr "Behauptung gescheitert"
 #~ msgid "keep all output, output to directory %s.dir"
 #~ msgstr "Alle Ausgaben aufbewahren, ins Verzeichnis %s.dir ausgeben"
 
-#~ msgid "don't run LilyPond"
+#~ msgid "do not run LilyPond"
 #~ msgstr "LilyPond nicht aufrufen"
 
 #~ msgid "produce MIDI output only"
@@ -2503,10 +2739,14 @@ msgstr "Behauptung gescheitert"
 #~ msgstr "Keine Dateien auf der Kommandozeile angegeben"
 
 #~ msgid "Running LilyPond failed. Rerun with --verbose for a trace."
-#~ msgstr "LilyPond-Aufruf gescheitert. Versuchen Sie es erneut mit --verbose für ein Protokoll (Trace)."
+#~ msgstr ""
+#~ "LilyPond-Aufruf gescheitert. Versuchen Sie es erneut mit --verbose für "
+#~ "ein Protokoll (Trace)."
 
 #~ msgid "Failed to make PS file. Rerun with --verbose for a trace."
-#~ msgstr "Erzeugung der PS-Datei gescheitert. Versuchen Sie es erneut mit --verbose für ein Protokoll."
+#~ msgstr ""
+#~ "Erzeugung der PS-Datei gescheitert. Versuchen Sie es erneut mit --verbose "
+#~ "für ein Protokoll."
 
 #~ msgid "%s output to <stdout>..."
 #~ msgstr "Ausgabe von %s nach <stdout>..."
@@ -2514,13 +2754,13 @@ msgstr "Behauptung gescheitert"
 #~ msgid "%s output to %s..."
 #~ msgstr "Ausgabe von %s nach %s..."
 
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "Kann Datei nicht finden: `%s.%s'"
 
 #~ msgid "Accidental rule must be pair or context-name; Found %s"
 #~ msgstr "Vorzeichensatz paarweise oder mit Kontextname erwartet; %s gefunden"
 
-#~ msgid "Can't switch translators, I'm there already"
+#~ msgid "Cannot switch translators, I'm there already"
 #~ msgstr "Kann Übersetzer nicht ändern, ist bereits geschehen"
 
 #~ msgid "I'm one myself"
@@ -2577,13 +2817,10 @@ msgstr "Behauptung gescheitert"
 #~ msgid "Install the ec-mftraced package from %s. Aborting"
 #~ msgstr "Abbruch. Paket ec-mftraced von %s installieren."
 
-#~ msgid "No slur to end"
-#~ msgstr "Kein Bindebogen zu beenden"
-
 #~ msgid "Huh?  Got %d, expected %d characters"
 #~ msgstr "Hä? %d Zeichen erhalten, %d erwartet"
 
-#~ msgid "Don't you want polyphonic voices instead?"
+#~ msgid "Donnot you want polyphonic voices instead?"
 #~ msgstr "Wollen Sie nicht stattdessen Mehrstimmigkeit?"
 
 #~ msgid "No volta spanner to end"
@@ -2623,10 +2860,9 @@ msgstr "Behauptung gescheitert"
 #~ msgstr "Schreibe HTML-Menü `%s'..."
 
 #~ msgid "Running LaTeX failed. Rerun with --verbose for a trace."
-#~ msgstr "LaTeX-Aufruf gescheitert. Versuchen Sie es erneut mit --verbose für ein Protokoll."
-
-#~ msgid "Process LilyPond snippets in hybrid HTML, LaTeX or texinfo document"
-#~ msgstr "LilyPond-Teile in Mischdatei (HTML, LaTeX oder texinfo) verarbeiten"
+#~ msgstr ""
+#~ "LaTeX-Aufruf gescheitert. Versuchen Sie es erneut mit --verbose für ein "
+#~ "Protokoll."
 
 #~ msgid "DIM"
 #~ msgstr "GROE"
@@ -2643,8 +2879,11 @@ msgstr "Behauptung gescheitert"
 #~ msgid "pass OPT quoted to the lilypond command line"
 #~ msgstr "OPT \"zitiert\" an die LilyPond-Kommandozeile übergeben"
 
-#~ msgid "force fontsize for all inline lilypond. DIM is assumed to be in points"
-#~ msgstr "Schriftgröße für eingebettetes LilyPond erzwingen. Einheit für GROE: Punkte"
+#~ msgid ""
+#~ "force fontsize for all inline lilypond. DIM is assumed to be in points"
+#~ msgstr ""
+#~ "Schriftgröße für eingebettetes LilyPond erzwingen. Einheit für GROE: "
+#~ "Punkte"
 
 #~ msgid "deprecated, use --force-music-fontsize"
 #~ msgstr "veraltet, verwenden Sie --force-music-fontsize"
@@ -2661,10 +2900,10 @@ msgstr "Behauptung gescheitert"
 #~ msgid "prepend PREF before each -M dependency"
 #~ msgstr "stelle PRÄF den -M Abhängigkeiten voran"
 
-#~ msgid "don't run lilypond"
+#~ msgid "do not run lilypond"
 #~ msgstr "LilyPond nicht aufrufen"
 
-#~ msgid "don't generate pictures"
+#~ msgid "do not generate pictures"
 #~ msgstr "keine Bilder generieren"
 
 #~ msgid "strip all lilypond blocks from output"
@@ -2676,11 +2915,16 @@ msgstr "Behauptung gescheitert"
 #~ msgid "where to place generated files"
 #~ msgstr "Ziel der generierten Dateien"
 
-#~ msgid "round filled box horizontal extent smaller than blot; decreasing blot"
-#~ msgstr "Breite des abgerundeten Kastens kleiner als Kreisdurchmesser; verkleinere Kreis"
+#~ msgid ""
+#~ "round filled box horizontal extent smaller than blot; decreasing blot"
+#~ msgstr ""
+#~ "Breite des abgerundeten Kastens kleiner als Kreisdurchmesser; verkleinere "
+#~ "Kreis"
 
 #~ msgid "round filled box vertical extent smaller than blot; decreasing blot"
-#~ msgstr "Höhe des abgerundeten Kastens kleiner als Kreisdurchmesser; verkleinere Kreis"
+#~ msgstr ""
+#~ "Höhe des abgerundeten Kastens kleiner als Kreisdurchmesser; verkleinere "
+#~ "Kreis"
 
 #~ msgid "use output format EXT"
 #~ msgstr "Ausgabeformat EXT benutzen"
@@ -2691,7 +2935,7 @@ msgstr "Behauptung gescheitert"
 #~ msgid "prepend DIR to dependencies"
 #~ msgstr "stelle VERZ den Abhängigkeiten voran"
 
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr "kann Anfang des Phrasierungsbogens nicht finden"
 
 #~ msgid "Where SYMBOL VAL pair is any of:"
@@ -2730,22 +2974,29 @@ msgstr "Behauptung gescheitert"
 #~ msgid "Symbol is not a parent context: %s. Ignored"
 #~ msgstr "Symbol ist kein Elternkontext: %s. Ignoriert"
 
-#~ msgid "can't find character number: %d"
+#~ msgid "cannot find character number: %d"
 #~ msgstr "Zeichennummer kann nicht gefunden werden: %d"
 
-#~ msgid "can't find character called: `%s'"
+#~ msgid "cannot find character called: `%s'"
 #~ msgstr "Zeichen kann nicht gefunden werden: `%s'"
 
 #~ msgid "Beam has less than two stems. Removing beam."
 #~ msgstr "Balken hat weniger als zwei Notenhälse. Notenhals wird entfernt."
 
-#~ msgid "Not sure that we can find a nice beam slope (no viable initial configuration found)."
-#~ msgstr "Es kann wahrscheinlich keine optimale Balkenneigung ermittelt werden (keine funktionsfähige Anfangskonfiguration gefunden)"
+#~ msgid ""
+#~ "Not sure that we can find a nice beam slope (no viable initial "
+#~ "configuration found)."
+#~ msgstr ""
+#~ "Es kann wahrscheinlich keine optimale Balkenneigung ermittelt werden "
+#~ "(keine funktionsfähige Anfangskonfiguration gefunden)"
 
-#~ msgid "Nothing to connect extender to on the left.  Ignoring extender event."
-#~ msgstr "Nichts vorhanden, um die Erweiterung nach links zu verbinden. Erweiterungsanforderung wird ignoriert."
+#~ msgid ""
+#~ "Nothing to connect extender to on the left.  Ignoring extender event."
+#~ msgstr ""
+#~ "Nichts vorhanden, um die Erweiterung nach links zu verbinden. "
+#~ "Erweiterungsanforderung wird ignoriert."
 
-#~ msgid "couldn't find any font satisfying "
+#~ msgid "couldnnot find any font satisfying "
 #~ msgstr "konnte keine passende Schriftart finden für "
 
 #~ msgid ""
@@ -2756,7 +3007,9 @@ msgstr "Behauptung gescheitert"
 #~ "Grob %s endet, bevor dies erwartet wurde."
 
 #~ msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen event."
-#~ msgstr "Nichts vorhanden, um den Bindestrich nach links zu verbinden. Bindestrichanforderung wird ignoriert."
+#~ msgstr ""
+#~ "Nichts vorhanden, um den Bindestrich nach links zu verbinden. "
+#~ "Bindestrichanforderung wird ignoriert."
 
 #~ msgid "Score contains errors; will not process it"
 #~ msgstr "Noten enthalten Fehler; keine weitere Verarbeitung"
@@ -2789,7 +3042,8 @@ msgstr "Behauptung gescheitert"
 #~ msgstr "Mensural_ligature: delta-pitch undefiniert bei flexa %d; nehme 0 an"
 
 #~ msgid "Mensural_ligature:flexa-width undefined on flexa %d; assuming 2.0"
-#~ msgstr "Mensural_ligature: flexa-width undefiniert bei flexa %d; nehme 2.0 an"
+#~ msgstr ""
+#~ "Mensural_ligature: flexa-width undefiniert bei flexa %d; nehme 2.0 an"
 
 #~ msgid "silly duration"
 #~ msgstr "sinnlose Dauer"
@@ -2816,7 +3070,8 @@ msgstr "Behauptung gescheitert"
 #~ msgstr "Staff_symbol: Einrückung reicht über das Zeilenende hinaus"
 
 #~ msgid "Error syncing file (disk full?)"
-#~ msgstr "Datei konnte nicht synchronisiert (geschrieben) werden. (Platte voll?)"
+#~ msgstr ""
+#~ "Datei konnte nicht synchronisiert (geschrieben) werden. (Platte voll?)"
 
 #~ msgid "No ties were created!"
 #~ msgstr "Es wurden keine Bindebögen erzeugt!"
@@ -2831,7 +3086,8 @@ msgstr "Behauptung gescheitert"
 #~ msgstr "Vaticana_ligature:delta-pitch -> Kombination wird ignoriert"
 
 #~ msgid "First argument must be a procedure taking one argument"
-#~ msgstr "Das erste Argument muss eine Prozedur sein, welche ein Argument erwartet"
+#~ msgstr ""
+#~ "Das erste Argument muss eine Prozedur sein, welche ein Argument erwartet"
 
 #~ msgid "Expecting musical-pitch value"
 #~ msgstr "Erwarte musikalischen Tonhöhenwert"
@@ -2920,5 +3176,5 @@ msgstr "Behauptung gescheitert"
 #~ msgid "Text_spanner too small"
 #~ msgstr "Textklammer zu klein"
 
-#~ msgid "Can't specify direction for this request"
+#~ msgid "Cannot specify direction for this request"
 #~ msgstr "Es kann keine Richtung für diese Anforderung angegeben werden"
diff --git a/po/es.po b/po/es.po
index 9d53d30066..f3ef51bf81 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.4.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
-"PO-Revision-Date: 2002-06-28 15:46CET\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
+"PO-Revision-Date: 2006-12-23 16:15+0100\n"
 "Last-Translator: Quique <quique@sindominio.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -71,146 +71,154 @@ msgid "Running %s..."
 msgstr "Ejecutando %s..."
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "advertencia: "
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "Sintaxis: %s [OPTIONS]... FICHERO"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
-#, fuzzy
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr "escribir la salida en el FICHERO"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr "Informar de gazapos a %s."
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+msgid "Examples:"
+msgstr ""
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, fuzzy, c-format, python-format
 msgid "warning: %s"
 msgstr "advertencia: "
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, fuzzy, c-format, python-format
 msgid "error: %s"
 msgstr "error: "
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "Procesando `%s'..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "no se puede abrir el fichero: `%s'"
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "no puedo encontrar la fuente por defecto: `%s'"
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "Sintaxis: %s [OPTIONS]... FICHERO"
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr "escribir la salida en el FICHERO"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "FICHERO"
 
-#: etf2ly.py:1204 midi2ly.py:899
-#, fuzzy
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr "mostrar los avisos de garantía y de copyright"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:78
+msgid "BOOK"
+msgstr ""
+
+#: lilypond-book.py:87
 #, fuzzy, python-format
 msgid "Exiting (%d)..."
 msgstr "Saliendo..."
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s "
@@ -226,7 +234,8 @@ msgstr ""
 
 #: lilypond-book.py:135
 #, fuzzy
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr "utilizar el formato de salida EXT (scm, ps, tex o as) "
 
 #: lilypond-book.py:138
@@ -234,6 +243,10 @@ msgstr "utilizar el formato de salida EXT (scm, ps, tex o as) "
 msgid "add DIR to include path"
 msgstr "añadir DIR a la ruta de búsqueda"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "DIR"
+
 #: lilypond-book.py:143
 #, fuzzy
 msgid "write output to DIR"
@@ -247,149 +260,149 @@ msgstr ""
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "ser prolijo"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "mostrar los avisos de garantía y de copyright"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, fuzzy, python-format
 msgid "Opening filter `%s'"
 msgstr "Limpiando `%s'..."
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr ""
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 #, fuzzy
 msgid "Writing snippets..."
 msgstr "Escribiendo `%s'..."
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 #, fuzzy
 msgid "Processing..."
 msgstr "Procesando..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 #, fuzzy
 msgid "All snippets are up to date..."
 msgstr "calma, %s está al día"
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "no puedo encontrar la fuente por defecto: `%s'"
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, fuzzy, python-format
 msgid "%s is up to date."
 msgstr "calma, %s está al día"
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "Escribiendo `%s'..."
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, fuzzy, python-format
 msgid "Reading %s..."
 msgstr "Limpiando %s..."
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 #, fuzzy
 msgid "Dissecting..."
 msgstr "Listando `%s'..."
 
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, fuzzy, python-format
 msgid "Compiling %s..."
 msgstr "Limpiando %s..."
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, fuzzy, python-format
 msgid "Processing include: %s"
 msgstr "Procesando `%s'..."
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, fuzzy, python-format
 msgid "Removing `%s'"
 msgstr "Invocando `%s'"
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, fuzzy, python-format
 msgid "Writing fonts to %s..."
 msgstr "no se puede crear el directorio: `%s'"
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "advertencia: "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "error: "
 
@@ -402,9 +415,10 @@ msgstr "Saliendo..."
 msgid "%s output to `%s'..."
 msgstr "%s producidos en `%s'..."
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
-msgstr ""
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
+msgstr "Convertir mup a ly."
 
 #: midi2ly.py:875
 msgid "print absolute pitches"
@@ -448,34 +462,60 @@ msgid "treat every text as a lyric"
 msgstr ""
 
 #: midi2ly.py:905
-msgid "example"
+msgid "Examples"
 msgstr ""
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "no se ha especificado ningún fichero en la línea de órdenes."
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Este software es libre. Está protegido por la Licencia Pública\n"
+"General de GNU, y quedas invitado a modificarlo y/o distribuir copias de\n"
+"él bajo ciertas condiciones. Invócalo como `%s --warranty' para más\n"
+"información.\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "escribir la salida en el FICHERO"
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "la opción `%s' requiere un argumento"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: getopt-long.cc:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "la opción `%s' no permite argumentos"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "opción no reconocida: `%s'"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "argúmento no válido `%s' para la opción `%s'"
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, fuzzy, c-format
 msgid "programming error: %s"
 msgstr "error de programación: "
@@ -484,86 +524,75 @@ msgstr "error de programaci
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "no encuentro la fuente: `%s'"
 
-#: all-font-metrics.cc:165
-#, fuzzy
-msgid "loading default font"
-msgstr "Cargando la fuente por defecto"
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "no puedo encontrar la fuente por defecto: `%s'"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(ruta de búsqueda: `%s')"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-#, fuzzy
-msgid "giving up"
-msgstr "Abandonando"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "no puedo cambiar de `%s' a `%s'"
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -577,19 +606,19 @@ msgstr ""
 msgid "unterminated beam"
 msgstr ""
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr ""
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+msgid "stem does not fit in beam"
 msgstr ""
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr ""
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 #, fuzzy
 msgid "no feasible beam position"
 msgstr "No se ha encontrado ninguna ruptura de línea factible"
@@ -598,24 +627,24 @@ msgstr "No se ha encontrado ninguna ruptura de l
 msgid "removing beam with no stems"
 msgstr ""
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, fuzzy, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "No se añade el traductor: `%s'"
 
 #: change-iterator.cc:23
 #, fuzzy, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "no puedo cambiar de `%s' a `%s'"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "no se puede encontrar el contexto de `%s'"
 
 #. We could change the current translator's id, but that would make
@@ -646,7 +675,7 @@ msgstr "acorde de tr
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
@@ -660,7 +689,7 @@ msgstr "traductor desconocido: `%s'"
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
@@ -668,26 +697,26 @@ msgstr ""
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
 #, fuzzy
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "no he podido encontrar ninguna fuente satisfactoria "
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, fuzzy, c-format
 msgid "program has no such type: `%s'"
 msgstr "El programa no tiene este tipo"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "no se puede encontrar o crear: `%s'"
 
 #: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "no se puede encontrar o crear `%s' llamado `%s'"
 
 #: context.cc:276
@@ -697,7 +726,7 @@ msgstr ""
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "no se puede encontrar o crear: `%s'"
 
 #: custos.cc:77
@@ -705,17 +734,22 @@ msgstr "no se puede encontrar o crear: `%s'"
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, fuzzy, c-format
 msgid "Unknown event class %s"
 msgstr "traductor desconocido: `%s'"
 
+#: dots.cc:38
+#, c-format
+msgid "dot `%s' not found"
+msgstr ""
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "no puedo encontrar el principio del (de)crescendo"
 
 #: dynamic-engraver.cc:195
@@ -734,11 +768,7 @@ msgstr ""
 msgid "unterminated (de)crescendo"
 msgstr "(de)crescendo sin terminar"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "prolongación sin terminar"
 
@@ -761,15 +791,15 @@ msgstr "no se puede crear el directorio: `%s'"
 msgid "adding font directory: %s"
 msgstr "no se puede crear el directorio: `%s'"
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "prolongación sin terminar"
@@ -802,45 +832,37 @@ msgstr ""
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "no puedo encontrar el principio del (de)crescendo"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, fuzzy, c-format
 msgid "Unknown interface `%s'"
 msgstr "traductor desconocido: `%s'"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr "decrescendo demasiado pequeño"
 
-#: hairpin.cc:180
-msgid "crescendo too small"
-msgstr "crescendo demasiado pequeño"
-
-#: horizontal-bracket-engraver.cc:58
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:59
+msgid "do not have that many brackets"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 msgid "conflicting note group events"
 msgstr ""
 
@@ -858,92 +880,97 @@ msgstr "acorde de tr
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "no puedo encontrar el fichero: `%s'"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(ruta de búsqueda: `%s')"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "posición desconocida"
 
-#: ligature-engraver.cc:95
+#: ligature-engraver.cc:93
 #, fuzzy
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr "no puedo encontrar el principio del (de)crescendo"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr ""
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 #, fuzzy
 msgid "already have a ligature"
 msgstr "ya tengo un crescendo"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr ""
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 #, fuzzy
 msgid "unterminated ligature"
 msgstr "prolongación sin terminar"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr ""
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(ruta de carga: `%s')"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "El nombre del identificativo es una palabra clave: `%s'"
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "error al final del fichero (EOF): %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, fuzzy, c-format
 msgid "deprecated function called: %s"
 msgstr "no puedo encontrar el carácter llamado: `%s'"
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:88
 #, fuzzy, c-format
-msgid "Changing working directory to `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr "no se puede crear el directorio: `%s'"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, fuzzy, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "no puedo encontrar el fichero: `%s'"
 
 #: lily-parser-scheme.cc:125
@@ -951,20 +978,20 @@ msgstr "no puedo encontrar el fichero: `%s'"
 msgid "Processing `%s'"
 msgstr "Procesando `%s'..."
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Analizando..."
 
-#: lily-parser.cc:126
-msgid "braces don't match"
+#: lily-parser.cc:127
+msgid "braces do not match"
 msgstr ""
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, fuzzy, c-format
 msgid "cannot find Voice `%s'"
 msgstr "no puedo encontrar el fichero: `%s'"
 
-#: main.cc:117
+#: main.cc:116
 #, fuzzy, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -977,7 +1004,7 @@ msgstr ""
 "él bajo ciertas condiciones. Invócalo como `%s --warranty' para más\n"
 "información.\n"
 
-#: main.cc:123
+#: main.cc:122
 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"
@@ -988,138 +1015,138 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
+#: main.cc:155
 #, fuzzy
-msgid "SYM=VAL"
+msgid "SYM[=VAL]"
 msgstr "CLAVE=VALOR"
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr "EXPR"
 
-#: main.cc:160
+#: main.cc:159
 msgid "evaluate scheme code"
 msgstr ""
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 #, fuzzy
 msgid "generate DVI (tex backend only)"
 msgstr "generar una salida PostScript"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 #, fuzzy
 msgid "generate PDF (default)"
 msgstr "generar una salida PostScript"
 
-#: main.cc:167
+#: main.cc:165
 #, fuzzy
 msgid "generate PNG"
 msgstr "generar una salida PostScript"
 
-#: main.cc:168
+#: main.cc:166
 #, fuzzy
 msgid "generate PostScript"
 msgstr "generar una salida PostScript"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:170
-msgid "print this help"
-msgstr "esta ayuda"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr "CAMPO"
 
-#: main.cc:171
+#: main.cc:169
 #, fuzzy
-msgid "dump a header field to file BASENAME.FIELD"
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr "escribir campo de cabecera a BASENAME.FIELD"
 
-#: main.cc:172
-msgid "DIR"
-msgstr "DIR"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "añadir DIR a la ruta de búsqueda"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "usar FICHERO como fichero de inicialización"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "generar una salida PostScript"
 
-#: main.cc:179
+#: main.cc:178
 #, fuzzy
 msgid "write output to FILE (suffix will be added)"
 msgstr "escribir la salida en el FICHERO"
 
-#: main.cc:180
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr ""
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "mostrar número de versión"
 
-#: main.cc:223
+#: main.cc:224
 #, fuzzy, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1127,79 +1154,79 @@ msgid ""
 msgstr "Copyright (c) %s "
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Sintaxis: %s [OPCIÓN]... FICHERO..."
 
-#: main.cc:252
+#: main.cc:253
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Opciones: "
 
-#: main.cc:262
+#: main.cc:263
 #, fuzzy, c-format
 msgid "Report bugs via %s"
 msgstr "Informar de gazapos a %s."
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:322
+#: main.cc:323
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "no existe tal parámetro: %s"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "no hay tal contexto: %s"
 
-#: main.cc:341
+#: main.cc:342
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "no puedo cambiar de `%s' a `%s'"
 
-#: main.cc:349
+#: main.cc:350
 #, fuzzy, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "no se puede crear el directorio: `%s'"
 
-#: main.cc:356
+#: main.cc:357
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "no puedo cambiar de `%s' a `%s'"
 
-#: main.cc:362
+#: main.cc:363
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "no puedo cambiar de `%s' a `%s'"
 
-#: main.cc:368
+#: main.cc:369
 #, fuzzy, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "no se puede crear el directorio: `%s'"
 
 #: main.cc:415
@@ -1207,7 +1234,7 @@ msgstr "no se puede crear el directorio: `%s'"
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1221,37 +1248,37 @@ msgstr ""
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1259,7 +1286,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr ""
 
@@ -1276,116 +1303,119 @@ msgstr ""
 msgid "no such MIDI instrument: `%s'"
 msgstr "no hay este instrumento: `%s'"
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr ""
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
 #: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "no se puede abrir el fichero: `%s'"
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "no se puede abrir el fichero: `%s'"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:208
+#: music.cc:207
 #, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr ""
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "Demasiadas columnas de notas que chocan entre sí. Se las ignora."
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr ""
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "no se puede abrir el fichero: `%s'"
 
 #: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "no encuentro la fuente: `%s'"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 #, fuzzy
 msgid "Drawing systems..."
 msgstr "Creando voces..."
 
-#: pango-font.cc:215
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "no es un fichero PostScript: `%s'"
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1423,15 +1453,15 @@ msgstr "prolongaci
 msgid "Track..."
 msgstr "Pista ... "
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "Salida MIDI a `%s'..."
@@ -1440,23 +1470,23 @@ msgstr "Salida MIDI a `%s'..."
 msgid "unterminated phrasing slur"
 msgstr ""
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr ""
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, fuzzy, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "no puedo encontrar el principio del (de)crescendo"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, fuzzy, c-format
 msgid "no such internal option: %s"
 msgstr "no hay este instrumento: `%s'"
@@ -1466,109 +1496,108 @@ msgstr "no hay este instrumento: `%s'"
 msgid "not a grob name, `%s'"
 msgstr ""
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "no se puede crear el directorio: `%s'"
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "no hay tal contexto: %s"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "no hay tal contexto: %s"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
-#, fuzzy, c-format
-msgid "Relocation file %s\n"
-msgstr "no se puede abrir el fichero: `%s'"
-
-#: relocate.cc:358
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "can't open file %s"
+msgid "Relocation file: %s"
 msgstr "no se puede abrir el fichero: `%s'"
 
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr ""
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr ""
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "no se puede encontrar: `%s'"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr ""
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(ruta de búsqueda: `%s')"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "ya tengo un crescendo"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 #, fuzzy
 msgid "errors found, ignoring music expression"
 msgstr ""
@@ -1578,7 +1607,7 @@ msgstr ""
 #. FIXME:
 #: script-engraver.cc:102
 #, fuzzy
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr "No se sabe como interpretar la articulación `%s'"
 
 #: script-engraver.cc:103
@@ -1590,17 +1619,18 @@ msgstr ""
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr ""
 
-#: slur-engraver.cc:165
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "no se puede encontrar: `%s'"
 
 #: source-file.cc:74
@@ -1612,57 +1642,57 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr ""
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 msgid "weird stem size, check for narrow beams"
 msgstr ""
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr "Elementos contados %d."
 
-#: system.cc:270
+#: system.cc:276
 #, fuzzy, c-format
 msgid "Grob count %d"
 msgstr "Elementos contados %d"
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr ""
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr ""
 
@@ -1671,14 +1701,14 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
@@ -1688,43 +1718,39 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr "traductor desconocido: `%s'"
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "no se puede encontrar: `%s'"
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "no puedo encontrar el principio del (de)crescendo"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "ya tengo un crescendo"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
@@ -1742,268 +1768,279 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "no puedo encontrar el principio del (de)crescendo"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "ya tengo un crescendo"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+#, fuzzy
+msgid "giving up"
+msgstr "Abandonando"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 #, fuzzy
 msgid "second argument must be pitch list"
 msgstr "El segundo argumento debe ser un símbolo"
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1612
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "no es una duración: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 msgid "have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:2004
+#: parser.yy:1987
 msgid "have to be in Chord mode for chords"
 msgstr ""
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, fuzzy, c-format
 msgid "Renaming input to: `%s'"
 msgstr "Limpiando `%s'..."
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:290
+#: lexer.ll:288
 msgid "\\maininput not allowed outside init files"
 msgstr ""
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "identificativo equivocado o no definido: `%s'"
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:561
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "carácter no válido: `%c'"
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:882
-#, fuzzy, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "versión de lilypond incorrecta: %s (%s, %s)"
+#: lexer.ll:880 lexer.ll:881
+#, c-format
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:883
+#: lexer.ll:881 lexer.ll:882
 #, fuzzy
-msgid "Consider updating the input with the convert-ly script"
+msgid "consider updating the input with the convert-ly script"
 msgstr ""
 "Considere la conversión de la entrada con ayuda del guión (script) convert-ly"
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, fuzzy, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, fuzzy, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Invocando `%s'"
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr ""
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Converting to `~a'..."
 msgstr "Escribiendo `%s'..."
 
-#: backend-library.scm:110
-#, fuzzy, lisp-format
+#: backend-library.scm:108
+#, fuzzy, scheme-format
 msgid "Converting to ~a..."
 msgstr "Escribiendo `%s'..."
 
-#: backend-library.scm:156
-#, fuzzy, lisp-format
+#: backend-library.scm:145
+#, fuzzy, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "escribiendo el campo de cabecera `%s' a `%s'"
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "no es una duración: %d"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:737
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, fuzzy, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "no se puede encontrar el contexto de `%s'"
 
-#: define-music-types.scm:757
-#, fuzzy, lisp-format
+#: define-music-types.scm:774
+#, fuzzy, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "traductor desconocido: `%s'"
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
+#, fuzzy, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "no puedo encontrar el carácter número: %d"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "traductor desconocido: `%s'"
 
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "Procesando..."
 
 #: documentation-lib.scm:150
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Writing ~S..."
 msgstr "Escribiendo `%s'..."
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, fuzzy, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "no puedo encontrar el carácter número: %d"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "Escribiendo `%s'..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:379
-#, fuzzy, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "No se sabe como interpretar la articulación `%s'"
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2012,56 +2049,56 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "el nombre del fichero no debería contener espacios: `%s'"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 #, fuzzy
 msgid "Calculating page breaks..."
 msgstr "Calculando las posiciones de las columnas"
 
-#: lily-library.scm:510
-#, fuzzy, lisp-format
+#: lily-library.scm:593
+#, fuzzy, scheme-format
 msgid "unknown unit: ~S"
 msgstr "traductor desconocido: `%s'"
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "no se puede encontrar: `%s'"
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "dependencias producidas en `%s'..."
 
@@ -2069,48 +2106,48 @@ msgstr "dependencias producidas en `%s'..."
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
-msgid "More alternatives than repeats. Junking excess alternatives"
+#: music-functions.scm:213
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, lisp-format
+#: music-functions.scm:538
+#, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "no encuentro la fuente: `%s'"
 
-#: music-functions.scm:953
-#, fuzzy, lisp-format
+#: music-functions.scm:942
+#, fuzzy, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "traductor desconocido: `%s'"
 
@@ -2119,42 +2156,42 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "undefined: ~S"
 msgstr "prolongación sin terminar"
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
+#, fuzzy, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "no encuentro la fuente: `%s'"
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr ""
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, lisp-format
+#: paper.scm:129
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "traductor desconocido: `%s'"
 
@@ -2162,15 +2199,41 @@ msgstr "traductor desconocido: `%s'"
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, fuzzy, lisp-format
+#: ps-to-png.scm:88
+#, fuzzy, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "fin de la orden con valor %d"
 
 #: to-xml.scm:190
-msgid "assertion failed"
+#, scheme-format
+msgid "assertion failed: ~S"
 msgstr ""
 
+#, fuzzy
+#~ msgid "show warranty"
+#~ msgstr "mostrar los avisos de garantía y de copyright"
+
+#, fuzzy
+#~ msgid "loading default font"
+#~ msgstr "Cargando la fuente por defecto"
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "no puedo encontrar la fuente por defecto: `%s'"
+
+#~ msgid "crescendo too small"
+#~ msgstr "crescendo demasiado pequeño"
+
+#~ msgid "print this help"
+#~ msgstr "esta ayuda"
+
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "no se puede abrir el fichero: `%s'"
+
+#, fuzzy
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "versión de lilypond incorrecta: %s (%s, %s)"
+
 #~ msgid "no one to print a tremolos"
 #~ msgstr "ninguno para la impresión de trémolos"
 
@@ -2181,7 +2244,7 @@ msgstr ""
 #~ msgid "no one to print a repeat brace"
 #~ msgstr "ninguno para la impresión de llaves repetidas"
 
-#~ msgid "can't find `%s' context"
+#~ msgid "cannot find `%s' context"
 #~ msgstr "no se puede encontrar el contexto de `%s'"
 
 #, fuzzy
@@ -2208,12 +2271,9 @@ msgstr ""
 #~ msgstr "El identificativo debería contener solamente caracteres alfabéticos"
 
 #, fuzzy
-#~ msgid "can't find signature for music function"
+#~ msgid "cannot find signature for music function"
 #~ msgstr "no se puede encontrar el contexto de `%s'"
 
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "Sintaxis: %s [OPTIONS]... FICHERO"
-
 #, fuzzy
 #~ msgid "Opening pipe `%s'"
 #~ msgstr "Limpiando `%s'..."
@@ -2242,10 +2302,6 @@ msgstr ""
 #~ msgid "command exited with value %d"
 #~ msgstr "fin de la orden con valor %d"
 
-#, fuzzy
-#~ msgid "Convert mup to LilyPond source."
-#~ msgstr "Convertir mup a ly."
-
 #~ msgid "debug"
 #~ msgstr "depurar"
 
@@ -2266,7 +2322,7 @@ msgstr ""
 #~ msgstr "Escribiendo `%s'..."
 
 #, fuzzy
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "no se puede abrir el fichero: `%s'"
 
 #, fuzzy
@@ -2337,7 +2393,7 @@ msgstr ""
 #~ msgstr "error no fatal: "
 
 #, fuzzy
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "no encuentro la fuente: `%s'"
 
 #, fuzzy
@@ -2364,9 +2420,6 @@ msgstr ""
 #~ msgid "Programming error: "
 #~ msgstr "error de programación: "
 
-#~ msgid "Can't switch translators, I'm there already"
-#~ msgstr "No puedo pasar de un traductor al otro, ya estoy allí"
-
 #~ msgid "I'm one myself"
 #~ msgstr "Yo mismo soy uno"
 
@@ -2377,11 +2430,11 @@ msgstr ""
 #~ msgstr "EXT"
 
 #, fuzzy
-#~ msgid "kpathsea can't find %s file: `%s'"
+#~ msgid "kpathsea cannot find %s file: `%s'"
 #~ msgstr "no puedo encontrar el fichero: `%s'"
 
 #, fuzzy
-#~ msgid "kpathsea can't find file: `%s'"
+#~ msgid "kpathsea cannot find file: `%s'"
 #~ msgstr "no puedo encontrar el fichero: `%s'"
 
 #, fuzzy
@@ -2408,10 +2461,6 @@ msgstr ""
 #~ msgid "kpathsea can not find TFM file: `%s'"
 #~ msgstr "no puedo encontrar el fichero: `%s'"
 
-#, fuzzy
-#~ msgid "Cannot switch translators, I'm there already"
-#~ msgstr "No puedo pasar de un traductor al otro, ya estoy allí"
-
 #, fuzzy
 #~ msgid "Converting to `~a.ps'..."
 #~ msgstr "Escribiendo `%s'..."
@@ -2426,7 +2475,7 @@ msgstr ""
 #~ msgid "keep all output, output to directory %s.dir"
 #~ msgstr "conservar todas las salidas, y nombrar el directorio %s.dir"
 
-#~ msgid "don't run LilyPond"
+#~ msgid "do not run LilyPond"
 #~ msgstr "no ejecutar LilyPond"
 
 #~ msgid "produce MIDI output only"
@@ -2467,7 +2516,7 @@ msgstr ""
 #~ msgstr "%s producidos en `%s'..."
 
 #, fuzzy
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "no puedo encontrar el fichero: `%s'"
 
 #, fuzzy
@@ -2483,7 +2532,7 @@ msgstr ""
 #~ msgstr "añadir el prefijo DIR a las dependencias"
 
 #, fuzzy
-#~ msgid "don't run lilypond"
+#~ msgid "do not run lilypond"
 #~ msgstr "no ejecutar LilyPond"
 
 #~ msgid "write Makefile dependencies for every input file"
@@ -2605,7 +2654,7 @@ msgstr ""
 #~ msgid "Generate .dvi with LaTeX for LilyPond"
 #~ msgstr "Generar un fichero .dvi con la ayuda de LaTeX para LilyPond"
 
-#~ msgid "can't map file"
+#~ msgid "cannot map file"
 #~ msgstr "no es posible producir el fichero map"
 
 #~ msgid "This binary was compiled with the following options:"
@@ -2649,13 +2698,13 @@ msgstr ""
 #~ msgid "be quiet"
 #~ msgstr "trabajar en silencio"
 
-#~ msgid "don't output rests or skips"
+#~ msgid "do not output rests or skips"
 #~ msgstr "no producir pausas o saltos"
 
 #~ msgid "set smallest duration"
 #~ msgstr "definir la duración más pequeña"
 
-#~ msgid "don't timestamp the output"
+#~ msgid "do not timestamp the output"
 #~ msgstr "no datar la salida"
 
 #~ msgid "assume no double dotted notes"
@@ -2697,7 +2746,7 @@ msgstr ""
 #~ msgid "invalid number of tracks"
 #~ msgstr "número de pistas no válido"
 
-#~ msgid "can't handle non-metrical time"
+#~ msgid "cannot handle non-metrical time"
 #~ msgstr "no se pueden manejar tiempos no métricos"
 
 #~ msgid "invalid running status"
diff --git a/po/fi.po b/po/fi.po
index 39bc41a695..bf843bb63e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-04 02:13+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
 "PO-Revision-Date: 2006-11-04 02:19+0200\n"
 "Last-Translator: hjunes\n"
 "Language-Team:  <en@li.org>\n"
@@ -75,39 +75,47 @@ msgid "Running %s..."
 msgstr "Ajetaan %s..."
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
+#, fuzzy, python-format
+msgid "Usage: %s"
 msgstr "Käyttö: %s\n"
 
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "Käyttö: %s [OPTIO]... TIEDOSTO..."
+
 #: abc2ly.py:1351
+#, fuzzy, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 "Tämä ohjelma kääntää ABC-musiikkitiedostoja (katso\n"
 "http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) LilyPond-syötteeksi."
 
-#: abc2ly.py:1354
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr "tulosta tiedostoon TIEDOSTO"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr "ole tarkka onnistumisesta"
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr "säilytä ABC:n palkkimerkinnät"
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr "Raportoi virheet osoitteeseen %s"
+
 #: convert-ly.py:41
+#, fuzzy
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 "Päivitä LilyPond syöte uudempaan versioon.  Oletuksena päivittää\n"
 "versiosta joka on annettu \\version komennolla nykyiseksi LilyPond "
@@ -117,122 +125,121 @@ msgstr ""
 "  convert-ly -e old.ly\n"
 "  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+#, fuzzy
+msgid "Examples:"
+msgstr "esimerkki"
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, c-format, python-format
 msgid "warning: %s"
 msgstr "varoitus: %s"
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, c-format, python-format
 msgid "error: %s"
 msgstr "virhe: %s"
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr "Levitettävissä ehdoilla GNU General Public License."
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr "Se toimitetaan ILMAN TAKUUTA."
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr "VERSIO"
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr "aloita versiosta VERSIO [oletus: \\version joka on tiedostossa]"
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr "editoi paikassaan"
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr "älä lisää \\version komentoa jos se puuttuu"
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+#, fuzzy
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr "tulosta säännöt [oletus: --from=0, --to=@TOPLEVEL_VERSION@]"
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr "muunnaa versioon VERSIO [oletus: @TOPLEVEL_VERSION@]"
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr "Toteutetaan muunnos: "
 
 #: convert-ly.py:166
-msgid "error while converting"
+#, fuzzy
+msgid "Error while converting"
 msgstr "virhe muunnettaessa"
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
-msgstr "Keskeytetään"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
+msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, python-format
 msgid "Processing `%s'... "
 msgstr "Prosessoidaan `%s'... "
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "tiedostoa ei voitu avata: `%s'"
 
-#: convert-ly.py:286
-#, python-format
-msgid "can't determine version for `%s'. Skipping"
+#: convert-ly.py:284
+#, fuzzy, python-format
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "ei voitu määrittää `%s':lle versiota. Sivuutetaan"
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "Käyttö: %s [OPTIO]... TIEDOSTO..."
+
 #: etf2ly.py:1198
+#, fuzzy
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 "Enigma Transport Format on Coda Music Technology:n Finale-tuotteen\n"
 "tallennusmuoto. Tämä ohjelma muuntaa ETF-muodon osajoukon\n"
 "LilyPondilla käytettäväksi."
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr "tulosta tiedostoon TIEDOSTO"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "TIEDOSTO"
 
-#: etf2ly.py:1204 midi2ly.py:899
-msgid "show warranty"
-msgstr "näytä takuusitoumus"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
+msgstr "näytä takuu ja copyright"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook "
-"document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
 msgstr ""
-"Käsittele HTML, LaTeX, texinfo tai DocBook -documenttiin sisällytetyt "
-"LilyPond palaset.\n"
-"Käyttöesimerkkejä:\n"
-"\n"
-"   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-"   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-"   lilypond-book --process='lilypond -I include' BOOK\n"
 
-#: lilypond-book.py:86
+#: lilypond-book.py:78
+msgid "BOOK"
+msgstr ""
+
+#: lilypond-book.py:87
 #, python-format
 msgid "Exiting (%d)..."
 msgstr "Lopetetaan (%d)..."
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s by"
@@ -246,13 +253,20 @@ msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr "putkita palaset kohteen FILTER läpi [convert-ly -n -]"
 
 #: lilypond-book.py:135
-msgid "use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
-msgstr "käytä tulostusmuotona formaattia FMT (texi [oletus], texi-html, latex, html, docbook)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
+msgstr ""
+"käytä tulostusmuotona formaattia FMT (texi [oletus], texi-html, latex, html, "
+"docbook)"
 
 #: lilypond-book.py:138
 msgid "add DIR to include path"
 msgstr "lisää HAKEMISTO hakupolkuun"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "HAKEMISTO"
+
 #: lilypond-book.py:143
 msgid "write output to DIR"
 msgstr "tulosta polkuun HAKEMISTO"
@@ -265,7 +279,11 @@ msgstr "KOMENTO"
 msgid "process ly_files using COMMAND FILE..."
 msgstr "prosessoi ly_tiedostot käyttäen komentoa COMMAND FILE..."
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
 "extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
 "must use this with dvips -h INPUT.psfonts"
@@ -273,139 +291,136 @@ msgstr ""
 "poimi kaikki PostScript-fontit tiedostoon INPUT.psfonts LaTeX:ia varten\n"
 "tätä täytyy käyttää dvips -h INPUT.psfonts :in kanssa"
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "tulosta runsaasti käsittelytietoa"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "näytä takuu ja copyright"
-
-#: lilypond-book.py:778
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr "tiedostoa %s ei löydy"
 
-#: lilypond-book.py:1009
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr "vanhentunut ly-optio käytössä: %s=%s"
 
-#: lilypond-book.py:1012
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr "yhteensopivuusmuodon käännös: %s=%s"
 
-#: lilypond-book.py:1016
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr "vanhentunut ly-optio käytössä: %s"
 
-#: lilypond-book.py:1019
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr "yhteensopivuusmuodon käännös: %s"
 
-#: lilypond-book.py:1038
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr "sivuutetaan tuntematon ly -optio: %s"
 
-#: lilypond-book.py:1391
+#: lilypond-book.py:1388
 #, python-format
 msgid "Opening filter `%s'"
 msgstr "Avataan filtteri `%s'"
 
-#: lilypond-book.py:1408
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr "`%s' epäonnistui (%d)"
 
-#: lilypond-book.py:1409
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr "Virheloki on seuraava:"
 
-#: lilypond-book.py:1479
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+#, fuzzy
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr "Ei voitu löytää \\begin{document} LaTeX-documentista"
 
-#: lilypond-book.py:1589
+#: lilypond-book.py:1586
 msgid "Writing snippets..."
 msgstr "Kirjoitetaan palasia..."
 
-#: lilypond-book.py:1594
+#: lilypond-book.py:1591
 msgid "Processing..."
 msgstr "Prosessoidaan..."
 
-#: lilypond-book.py:1598
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr "Kaikki palaset on päivitetty..."
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1605
 #, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "ei löytynyt formaattia: %s"
 
-#: lilypond-book.py:1619
+#: lilypond-book.py:1616
 #, python-format
 msgid "%s is up to date."
 msgstr "%s on päivitetty."
 
-#: lilypond-book.py:1625
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "Kirjoitetaan `%s'..."
 
-#: lilypond-book.py:1680
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr "Tuloste kirjautuisi syötetiedoston päälle; käytä --output."
 
-#: lilypond-book.py:1684
+#: lilypond-book.py:1681
 #, python-format
 msgid "Reading %s..."
 msgstr "Luetaan %s..."
 
-#: lilypond-book.py:1703
+#: lilypond-book.py:1700
 msgid "Dissecting..."
 msgstr "Analysoidaan..."
 
-#: lilypond-book.py:1719
+#: lilypond-book.py:1716
 #, python-format
 msgid "Compiling %s..."
 msgstr "Kootaan %s..."
 
-#: lilypond-book.py:1728
+#: lilypond-book.py:1725
 #, python-format
 msgid "Processing include: %s"
 msgstr "Prosessoidaan sisällytetävä: %s"
 
-#: lilypond-book.py:1742
+#: lilypond-book.py:1739
 #, python-format
 msgid "Removing `%s'"
 msgstr "Poistetaan `%s'"
 
-#: lilypond-book.py:1819
+#: lilypond-book.py:1815
 #, python-format
 msgid "Writing fonts to %s..."
 msgstr "Kirjoitetaan fontteja hakemistoon %s..."
 
-#: lilypond-book.py:1834
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr "optiota --psfonts=FILE ei käytetty"
 
-#: lilypond-book.py:1835
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr "prosessointi dvips:illä ei sisällä fontteja"
 
-#: lilypond-book.py:1838
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr "DVIPS käyttö:"
 
-#: midi2ly.py:106 lily-library.scm:557 lily-library.scm:565
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "varoitus: "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "virhe: "
 
@@ -418,8 +433,9 @@ msgstr "Lopettaa ... "
 msgid "%s output to `%s'..."
 msgstr "%s tulostetaan paikkaan `%s'..."
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
 msgstr "Muunna MIDI LilyPond -muotoon."
 
 #: midi2ly.py:875
@@ -465,34 +481,59 @@ msgid "treat every text as a lyric"
 msgstr "käsittele kaikki tekstit lyriikkana"
 
 #: midi2ly.py:905
-msgid "example"
+#, fuzzy
+msgid "Examples"
 msgstr "esimerkki"
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "tiedostoja ei annettu komentorivillä."
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Tämä on ilmaisohjelmisto. Siihen sovelletaan GNU General Public License\n"
+"ja olet tervetullut muuttamaan ohjelmaa ja/tai levittämään siitä kopioita\n"
+"tietyillä ehdoilla. Suorita `%s --warranty' saadaksesi lisäinformaatiota.\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+msgid "set output filename to FILE"
+msgstr "tulosta tiedostoon TIEDOSTO"
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "optio `%s' vaatii argumentin"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: getopt-long.cc:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "optio `%s' ei salli argumenttia"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "tunnistamaton optio: `%s'"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "epäkelpo argumentti `%s' optiolle `%s'"
 
-#: warn.cc:68 grob.cc:557 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr "ohjelmointivirhe: %s"
@@ -501,27 +542,27 @@ msgstr "ohjelmointivirhe: %s"
 msgid "continuing, cross fingers"
 msgstr "jatketaan, ristitään kädet"
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr "Korotusmerkkien ladontalista täytyy alkaa konteksti-nimellä: %s"
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr "sivutetaan tuntematan etumerkki: %s"
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr "pari tai konteksti-nimi oletettiin korotusmerkkisäännölle, löytyi %s"
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr "korotusmerkkiä `%s' ei löydy"
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
@@ -529,40 +570,23 @@ msgstr ""
 "pystysyora sijoittelu kutsuttiin ennen rivinkatkaisua.\n"
 "Viivaston ylittävät ladokkeet tehdään vain PianoStaff:in yhteydessä."
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+#, fuzzy
+msgid "tried to get a translation for something that is no child of mine"
 msgstr "yritettiin saada käännösteksti jollekin, joka ei ole lapseni"
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "ei löytynyt fonttia: `%s'"
 
-#: all-font-metrics.cc:165
-msgid "loading default font"
-msgstr "ladataan oletusfontti"
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "ei löytynyt oletusfonttia: `%s'"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(hakupolku: `%s')"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-msgid "giving up"
-msgstr "luovutetaan"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr "\\applycontext vaatii funktioargumentin"
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "ei voitu vaihtaa, oli jo tulkitsijassa: %s"
 
 #: axis-group-engraver.cc:78
@@ -577,10 +601,19 @@ msgstr "onko käytössä kaksi Axis_group_engraver:ia?"
 msgid "removing this vertical group"
 msgstr "poistetaan tämä vertikaaliryhmä"
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr "yritettiin laskea korkeus ei-katkaisukohdassa"
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -599,14 +632,15 @@ msgid "stem must have Rhythmic structure"
 msgstr "varrella on oltava Rhytmic -rakenne"
 
 #: beam-engraver.cc:246
-msgid "stem doesn't fit in beam"
+#, fuzzy
+msgid "stem does not fit in beam"
 msgstr "varsi ei sovi palkkiin"
 
 #: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr "palkki aloitettiin täältä"
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 msgid "no feasible beam position"
 msgstr "ei löytynyt sopivaa palkin paikkaa"
 
@@ -614,23 +648,23 @@ msgstr "ei löytynyt sopivaa palkin paikkaa"
 msgid "removing beam with no stems"
 msgstr "poistetaan palkki jolla ei ole parrua"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr "toimivaa alkuasettelua ei löytynyt: hyvää palkkikaltevuuta ei löytyne"
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Ei välistyksen syöttöä paikasta %s paikkaan `%s'"
 
 #: change-iterator.cc:23
 #, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "ei voitu vaihtaa `%s' tilalle `%s'"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "ei löytynyt kontekstia johon vaihtaa"
 
 #. We could change the current translator's id, but that would make
@@ -661,7 +695,7 @@ msgstr "päättämätön sointutremolo"
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr "odotettiin 2 elementtiä sointutremololle, löytyi %d"
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr "avainta `%s' ei löydy"
@@ -678,11 +712,13 @@ msgstr "heitetään pois tyhjä klusteri"
 #: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
-msgstr "Coherent_ligature_engraver: asetetaan `spacing-increment=0.01': ptr=%ul"
+msgstr ""
+"Coherent_ligature_engraver: asetetaan `spacing-increment=0.01': ptr=%ul"
 
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
-msgid "couldn't find line breaking that satisfies constraints"
+#, fuzzy
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "ei löytynyt rivinkatkaisukohtaa joka täyttäisi ehdot"
 
 #: context-def.cc:130
@@ -690,18 +726,18 @@ msgstr "ei löytynyt rivinkatkaisukohtaa joka täyttäisi ehdot"
 msgid "program has no such type: `%s'"
 msgstr "ohjelmalla ei ole tyyppiä: `%s'"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr "tarvitaan symboliargumentti funktioille \\override ja \\revert"
 
 #: context.cc:151
 #, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "ei löydetty tai ei luotu uutta `%s'"
 
 #: context.cc:213
 #, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "ei löydetty tai ei luotu `%s' nimeltä `%s'"
 
 #: context.cc:276
@@ -711,7 +747,7 @@ msgstr "Epäkelpo CreateContext-tapahtuma: Ei voitu luoda %s-kontekstia"
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "ei löydetty tai ei luotu: `%s'"
 
 #: custos.cc:77
@@ -719,11 +755,11 @@ msgstr "ei löydetty tai ei luotu: `%s'"
 msgid "custos `%s' not found"
 msgstr "custos `%s' ei löytynyt"
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr "Tapamahtumaluokan tulisi olla symboli"
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, c-format
 msgid "Unknown event class %s"
 msgstr "Tuntematon tapahtumaluokka %s"
@@ -734,7 +770,7 @@ msgid "dot `%s' not found"
 msgstr "pistettä `%s' ei löytynyt"
 
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "ei löytynyt alkua (de)crescendolle"
 
 #: dynamic-engraver.cc:195
@@ -753,11 +789,7 @@ msgstr "cresc aloitettiin tästä"
 msgid "unterminated (de)crescendo"
 msgstr "päättämätön (de)crescendo"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr "ei aseteta luonnin takaisinkutsua: ei ole proseduuri"
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "päättämätön pidennys"
 
@@ -768,7 +800,8 @@ msgstr "Alustetaan FontConfig..."
 #: font-config.cc:44
 #, c-format
 msgid "Rebuilding FontConfig cache %s, this may take a while..."
-msgstr "Käännetään uudelleen FontConfig-välimuisti %s. tämä voi kestää hetken..."
+msgstr ""
+"Käännetään uudelleen FontConfig-välimuisti %s. tämä voi kestää hetken..."
 
 #: font-config.cc:55
 #, c-format
@@ -780,15 +813,15 @@ msgstr "ei onnistuttu lisäämään fonttihakemistoa: %s"
 msgid "adding font directory: %s"
 msgstr "lisätään fonttihakemisto: %s"
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr "ääretön tai NaN kohdattiin kun tehtiin reaalilukumuunnosta"
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr "asetetaan nollaksi"
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 msgid "unterminated glissando"
 msgstr "päättämätön glissando"
 
@@ -817,45 +850,38 @@ msgstr "lisättiin vihjattu \\%s"
 
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "di voitu käyttää `\\~' ligaturen alkupäässä"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr "ei voitu käyttää `\\~' identtisien nuotinkorkeuksien päissä"
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, c-format
 msgid "Unknown interface `%s'"
 msgstr "Tuntematon rajapinta `%s'"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr "Ladokkeella `%s' ei ole rajapintaa ominaisuudella `%s'"
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr "ei aseteta muutoksen takaisinkutsua: ei ole proseduuri"
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr "ääretön tai NaN kohdattiin"
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr "liian lyhyt decrescendo"
 
-#: hairpin.cc:180
-msgid "crescendo too small"
-msgstr "liian lyhyt crescendo"
-
-#: horizontal-bracket-engraver.cc:57
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:59
+#, fuzzy
+msgid "do not have that many brackets"
 msgstr "ei ole käytössä niin monia sulkeita"
 
-#: horizontal-bracket-engraver.cc:66
+#: horizontal-bracket-engraver.cc:68
 msgid "conflicting note group events"
 msgstr "ristiriitainen nuottiryhmä -tapaus"
 
@@ -871,17 +897,22 @@ msgstr "päättämätön tavuviiva"
 msgid "include files are not allowed in safe mode"
 msgstr "sisällytettävät tiedostot eivät ole sallittuja turvatilassa"
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:117
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "tiedostoa ei löydy: `%s'"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(hakupolku: `%s')"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "sijainti tuntematon"
 
 #: ligature-engraver.cc:93
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr "ei löytynyt alkua ligature:lle"
 
 #: ligature-engraver.cc:98
@@ -908,73 +939,74 @@ msgstr "ligature ei voi sisältää taukoa; sivuutetaan tauko"
 msgid "ligature was started here"
 msgstr "ligature alkoi tästä"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(hakupolku: `%s')"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr "Ei löytynyt tyyppitarkistusta ominaisuudelle `%s' (%s)."
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr "ehkä näppäilyvirhe?"
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr "suoritetaan tehtävä joka tapauksessa"
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr "tyypin `%s' tarkistus epäonnistui; arvon `%s' on oltava tyyppiä `%s'"
 
-#: lily-lexer.cc:233
+#: lily-lexer.cc:254
 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "tunnistenimi on avainsana: `%s'"
 
-#: lily-lexer.cc:248
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "virhe tiedoston lopussa (EOF): %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, c-format
 msgid "deprecated function called: %s"
 msgstr "vanhentunut funktiokutsu: %s"
 
-#: lily-parser-scheme.cc:89
-#, c-format
-msgid "Changing working directory to `%s'"
+#: lily-parser-scheme.cc:88
+#, fuzzy, c-format
+msgid "Changing working directory to: `%s'"
 msgstr "Vaihdetaan työhakemistoksi `%s'"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "tiedostoa ei löydy: `%s'"
 
-#: lily-parser-scheme.cc:126
+#: lily-parser-scheme.cc:125
 #, c-format
 msgid "Processing `%s'"
 msgstr "Prosessoidaan `%s'"
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Jäsennetään..."
 
-#: lily-parser.cc:125
-msgid "braces don't match"
+#: lily-parser.cc:127
+#, fuzzy
+msgid "braces do not match"
 msgstr "aaltosulkumerkit eivät täsmää"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr "ei löydetty Voice `%s'"
 
-#: main.cc:117
+#: main.cc:116
 #, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -986,7 +1018,7 @@ msgstr ""
 "ja olet tervetullut muuttamaan ohjelmaa ja/tai levittämään siitä kopioita\n"
 "tietyillä ehdoilla. Suorita `%s --warranty' saadaksesi lisäinformaatiota.\n"
 
-#: main.cc:123
+#: main.cc:122
 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"
@@ -1016,103 +1048,100 @@ msgstr ""
 "Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr "PÄÄ"
 
-#: main.cc:154
+#: main.cc:153
+#, fuzzy
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 "käytä päänä PÄÄ (gnome, ps, eps,\n"
 "scm, svg, tex, texstr)\n"
 "default: PS"
 
-#: main.cc:156
-msgid "SYM=VAL"
+#: main.cc:155
+#, fuzzy
+msgid "SYM[=VAL]"
 msgstr "SYM=VAL"
 
-#: main.cc:157
+#: main.cc:156
+#, fuzzy
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 "aseta Scheme -ohjelman optio. Käyttää #t jos VAL ei ole määritelty\n"
 "Koeta -dhelp saadaksesi lisäapua."
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr "LAUSEKE"
 
-#: main.cc:160
+#: main.cc:159
 msgid "evaluate scheme code"
 msgstr "suorita scheme koodi"
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr "FORMAATIT"
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr "vedosta FORMAATTI,...  Myös erilliset optiot:"
 
-#: main.cc:164
+#: main.cc:163
 msgid "generate DVI (tex backend only)"
 msgstr "tuota DVI (vain käytettäessä tex -päätä)"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr "paikallista käyttäen lilypond ohjelman hakemistoa"
-
-#: main.cc:166
+#: main.cc:164
 msgid "generate PDF (default)"
 msgstr "tuota PDF (oletus)"
 
-#: main.cc:167
+#: main.cc:165
 msgid "generate PNG"
 msgstr "tuota PNG"
 
-#: main.cc:168
+#: main.cc:166
 msgid "generate PostScript"
 msgstr "tuota PostScript"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr "tuota TeX (vain käytettäessä tex -päätä)"
 
-#: main.cc:170
-msgid "print this help"
-msgstr "näytä tämä opaste"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr "KENTTÄ"
 
-#: main.cc:171
-msgid "dump a header field to file BASENAME.FIELD"
+#: main.cc:169
+#, fuzzy
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr "kirjoita otsake tiedostoon PERUSNIMI.KENTTÄ"
 
-#: main.cc:172
-msgid "DIR"
-msgstr "HAKEMISTO"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "lisää HAKEMISTO hakupolkuun"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "käytä TIEDOSTO alustustiedostona"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr "USER,GROUP,JAIL,DIR"
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
@@ -1120,27 +1149,35 @@ msgstr ""
 "käytä chroot-hakemistona JAIL, ole USER:GROUP\n"
 "ja siirry hakemistoon DIR"
 
-#: main.cc:178
+#: main.cc:177
 msgid "do not generate printed output"
 msgstr "älä tuota tulostetta"
 
-#: main.cc:179
+#: main.cc:178
 msgid "write output to FILE (suffix will be added)"
 msgstr "tulosta tiedostoon TIEDOSTO (pääte lisätään)"
 
-#: main.cc:180
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr "tee kuva ensimmäisestä kokonaisuudesta"
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr "paikallista käyttäen lilypond ohjelman hakemistoa"
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+#, fuzzy
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr "älä salli turvattomia Scheme ja PostScript -operaatioita"
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "tulosta versionumero"
 
-#: main.cc:223
+#: main.cc:224
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1150,79 +1187,79 @@ msgstr ""
 "%s  ja muut."
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Käyttö: %s [OPTIO]... TIEDOSTO..."
 
-#: main.cc:252
+#: main.cc:253
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Lado musiikki ja/tai tuota MIDI tiedostosta TIEDOSTO."
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr "LilyPond tuottaa kaunista musiikkinotaatiota."
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr "Lisätietoja varten, katso %s"
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Optiot:"
 
-#: main.cc:262
+#: main.cc:263
 #, c-format
 msgid "Report bugs via %s"
 msgstr "Raportoi virheet osoitteeseen %s"
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr "odotettiin %d argumenttia chroot-vankilalle, löytyi: %u"
 
-#: main.cc:322
+#: main.cc:323
 #, c-format
 msgid "no such user: %s"
 msgstr "käyttäjää ei löydy: `%s'"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr "ei saatu käyttäjä-id:tä käyttäjänimestä: %s: %s"
 
-#: main.cc:339
+#: main.cc:340
 #, c-format
 msgid "no such group: %s"
 msgstr "ryhmää ei ole: %s"
 
-#: main.cc:341
+#: main.cc:342
 #, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "ei voitu saada ryhmä -id:tä ryhmänimestä: %s: %s"
 
-#: main.cc:349
+#: main.cc:350
 #, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "chroot ei onnistunut: %s: %s"
 
-#: main.cc:356
+#: main.cc:357
 #, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "ei voitu korvata ryhmän id:tä : %d: %s"
 
-#: main.cc:362
+#: main.cc:363
 #, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "ei voitu vaihtaa käyttäjä-id:tä : %d: %s"
 
-#: main.cc:368
+#: main.cc:369
 #, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "työhakemiston vaihto ei onnistunut: %s: %s"
 
 #: main.cc:415
@@ -1230,7 +1267,7 @@ msgstr "työhakemiston vaihto ei onnistunut: %s: %s"
 msgid "Evaluating %s"
 msgstr "Määritetään %s"
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr "napattiin poikkeus: %s"
@@ -1305,111 +1342,109 @@ msgstr "Mensural_ligature: (join_right == 0)"
 msgid "no such MIDI instrument: `%s'"
 msgstr "ei löytynyt MIDI-instrumenttia: `%s'"
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "sekava äänenkorkeus"
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr "kokeellinen: viritetään väliaisesti (%d senttiä) kanavaa."
 
 #: midi-stream.cc:28
 #, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "tiedostoa ei voitu avata kirjoitettavaksi: %s: `%s'"
 
 #: midi-stream.cc:44
 #, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "tiedostoon ei voitu kirjoittaa: `%s'"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr "Lähetetään ei-tapahtuma kontekstille"
 
-#: music.cc:142
-#, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+#: music.cc:141
+#, fuzzy, c-format
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr "oktaavitarkistus epäonnistui; oletettiin \"%s\", löydettiin: %s"
 
-#: music.cc:208
+#: music.cc:207
 #, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "transponointi %s:N verran tekee muutokset suuremmaksi kuin kaksi"
 
-#: new-fingering-engraver.cc:95
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr "ei voitu lisätä tekstinpätkiä yksittäisiin nuotteihin"
 
-#: new-fingering-engraver.cc:238
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr "sormitukselle ei löytynyt paikkaa"
 
-#: new-fingering-engraver.cc:239
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr "sijoitetaan alle"
 
-#: note-collision.cc:438
+#: note-collision.cc:457
 msgid "ignoring too many clashing note columns"
 msgstr "liian monta törmäävää nuottisaraketta"
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr "ei voinut olla nuotinpäitä ja taukoja yhtäaikaa palkissa"
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr "yhtäkään nuottipäistä `%s' tai `%s' ei löytynyt"
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr "NoteEvent ilman nuottikorkeutta"
 
 #: open-type-font.cc:33
 #, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "ei voitu varata %lu bittiä"
 
 #: open-type-font.cc:37
 #, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "ei voitu ladata fonttitaulukkoa: `%s'"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr "tukematon fonttimuoto: %s"
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr "tuntematon virhe: %d lukee fonttitiedostoa: %s"
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
 msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr "FT_Get_Glyph_Name() palautti virheen: %u"
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
+#, fuzzy
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 "Ei voitu sovittaa ensimmäistä sivunkääntöä yhdelle sivulle. Harkitse "
 "ensimmäisen sivunumeron (first-page-number) asettamista parittomaksi."
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
-msgstr "Lasketaan sivujen ja rivien katkaisuja (%d mahdollista sivunkatkaisua)..."
+msgstr ""
+"Lasketaan sivujen ja rivien katkaisuja (%d mahdollista sivunkatkaisua)..."
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 msgid "Drawing systems..."
 msgstr "Piirretään tahteja..."
 
-#: pango-font.cc:194
+#: pango-font.cc:181
 #, c-format
 msgid ""
 "Glyph has no name, but font supports glyph naming.\n"
@@ -1418,12 +1453,12 @@ msgstr ""
 "Ladokkeella ei ole nimea, mutta kirjasin tukee ladokkeen nimeämistä.\n"
 "Sivuutetaan ladoke U+%0X, tiedostossa %s"
 
-#: pango-font.cc:237
+#: pango-font.cc:224
 #, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "ei PostScript fonttinimeä fontille `%s'"
 
-#: pango-font.cc:285
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr "FreeType muodolla ei ollut PostScript fonttinimeä"
 
@@ -1457,15 +1492,15 @@ msgstr "päättämätön prosenttitoisto"
 msgid "Track..."
 msgstr "Jälki..."
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr "MIDI kanava kietaistiin ympäri"
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr "kuvataan uudelleen modulo 16"
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "Tehdään MIDI-tuloste `%s'..."
@@ -1474,23 +1509,23 @@ msgstr "Tehdään MIDI-tuloste `%s'..."
 msgid "unterminated phrasing slur"
 msgstr "päättämätön fraaseerauskaari"
 
-#: piano-pedal-engraver.cc:283
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr "odotettiin 3 merkkijonoa pianopedaalille, löytyi: %ld"
 
-#: piano-pedal-engraver.cc:298 piano-pedal-engraver.cc:309
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "ei löydetty alkua pianopedaalille: `%s'"
 
-#: piano-pedal-engraver.cc:344
+#: piano-pedal-engraver.cc:347
 #, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "ei löydetty alkua pianopedaalimerkinnälle: `%s'"
 
-#: program-option.cc:199
+#: program-option.cc:205
 #, c-format
 msgid "no such internal option: %s"
 msgstr "tuntematon sisäinen optio: %s"
@@ -1500,51 +1535,51 @@ msgstr "tuntematon sisäinen optio: %s"
 msgid "not a grob name, `%s'"
 msgstr "ei ole graafisen objektin (grob) nimi, `%s'"
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr "Oktaavitarkistus epäonnistui, saatiin: "
 
 #: relocate.cc:44
-#, c-format
-msgid "Setting %s to %s\n"
+#, fuzzy, c-format
+msgid "Setting %s to %s"
 msgstr "Asetetaan %s kohtaan %s\n"
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, c-format
 msgid "no such file: %s for %s"
 msgstr "tiedostoa ei löydy: %s kohteelle %s"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, c-format
 msgid "no such directory: %s for %s"
 msgstr "hakemistoa ei löydy: %s kohteelle %s"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr "%s=%s (painota)\n"
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr "Paikantaminen: käännös-etuliite=%s, uusi etuliite=%s"
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr "Paikantaminen: framework_prefix=%s"
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr "Paikantaminen: absoluuttinen: argv0=%s"
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr "Paikantaminen: nykyisestä polusta: argv0=%s"
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
@@ -1553,63 +1588,63 @@ msgstr ""
 "Paikantaminen: polusta PATH=%s\n"
 "argv0=%s"
 
-#: relocate.cc:353
-#, c-format
-msgid "Relocation file %s\n"
+#: relocate.cc:354
+#, fuzzy, c-format
+msgid "Relocation file: %s"
 msgstr "Paikannustiedosto %s\n"
 
-#: relocate.cc:358
-#, c-format
-msgid "can't open file %s"
-msgstr "ei voitu avata tiedostoa %s"
-
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr "Tuntematon paikannuskomento %s"
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr "ei voida määrittää taukojen törmäystä: tauon suuntaa ei asetettu"
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "liian monta törmäävää taukoa"
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr "taukoa `%s' ei löytynyt, "
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, c-format
 msgid "cannot find `%s'"
 msgstr "`%s' ei lyötynyt"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr "Fontteja ei oltu asennettu kunnolla."
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, c-format
 msgid "Search path `%s'"
 msgstr "Hakupolku `%s'"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr "Keskeytetään"
+
+#: score.cc:225
 msgid "already have music in score"
 msgstr "viivastolla on jo musiikkia"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr "tämä on edellinen musiikki"
 
-#: score.cc:228
+#: score.cc:231
 msgid "errors found, ignoring music expression"
 msgstr "virheitä löytyi, sivuutetaan musiikki-ilmaisu"
 
 #. FIXME:
 #: script-engraver.cc:102
-msgid "don't know how to interpret articulation: "
+#, fuzzy
+msgid "do not know how to interpret articulation: "
 msgstr "ei tiedetä kuinka tulkita artikulaatio: "
 
 #: script-engraver.cc:103
@@ -1621,16 +1656,17 @@ msgstr "scheme koodaus: "
 msgid "No spring between column %d and next one"
 msgstr "Ei jousta sarakkeen %d ja sitä seuraavan välillä"
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
-msgstr "Tuntematon kaari-tapahtuman suunta"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
+msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "päättämätön kaari"
 
-#: slur-engraver.cc:165
-msgid "can't end slur"
+#: slur-engraver.cc:166
+msgid "cannot end slur"
 msgstr "ei löytynyt kaaren loppua"
 
 #: source-file.cc:74
@@ -1642,57 +1678,57 @@ msgstr "odotettiin %d merkkiä, saatiin %d"
 msgid "staff-span event has no direction"
 msgstr "viivastot ylittävällä tapahtumalla ei ole suuntaa"
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr "tremolon kesto on liian pitkä"
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "lisätään nuottipää sopimattomaan varteen (tyyppi = %d)"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr "ehkä syötteen täytyisi määrittää moniäänisiä ääniä"
 
-#: stem.cc:104
+#: stem.cc:105
 msgid "weird stem size, check for narrow beams"
 msgstr "outo varren koko, koeta lyhyempiä palkkeja"
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr "lippua `%s' ei löydetty"
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr "lipun piirtoa `%s' ei löytynyt"
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr "Elementtien määrä: %d."
 
-#: system.cc:270
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr "Graafisien objektien (grob) määrä: %d "
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr "ei löydetty alkua tekstileikkeelle"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr "tekstileike löytyi jo"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr "päättämätön tekstileike"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "yksinäinen sidos"
 
@@ -1701,14 +1737,14 @@ msgstr "yksinäinen sidos"
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr "löydettiin outo aikamerkintä: %d/%d"
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr "aikamerkintäsymbolia `%s' ei löytynyt; vaihdetaan numeroituun tyyliin"
@@ -1718,9 +1754,9 @@ msgstr "aikamerkintäsymbolia `%s' ei löytynyt; vaihdetaan numeroituun tyyliin"
 msgid "unknown translator: `%s'"
 msgstr "tuntematon tulkitsija: `%s'"
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "ei löytynyt `%s'"
 
 #: translator.cc:332
@@ -1733,18 +1769,14 @@ msgstr "Kaksi samanaikaista %s-tapahtumaa, hylätään tämä"
 msgid "Previous %s event here"
 msgstr "Edellinen %s-tapahtuma täällä"
 
-#: trill-spanner-engraver.cc:67
-msgid "can't find start of trill spanner"
+#: trill-spanner-engraver.cc:68
+msgid "cannot find start of trill spanner"
 msgstr "ei löydetty alkua trilliladokkeelle"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 msgid "already have a trill spanner"
 msgstr "trilliladoke löytyi jo"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr "tuntematon tuplettiväli-tapahtuman suunta"
-
 #: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
@@ -1757,7 +1789,8 @@ msgstr ""
 #: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
-msgstr "Vaticana_ligature_engraver: asetetaan `spacing-increment = %f': ptr=%ul"
+msgstr ""
+"Vaticana_ligature_engraver: asetetaan `spacing-increment = %f': ptr=%ul"
 
 #: vaticana-ligature.cc:84
 msgid "flexa-height undefined; assuming 0"
@@ -1772,52 +1805,56 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr "Vaticana_ligature: nollayhdiste (delta_pitch == 0)"
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
-msgid "can't end volta spanner"
+#: volta-engraver.cc:144
+msgid "cannot end volta spanner"
 msgstr "ei löydetty loppua volta ladokkeelle"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr "löytyi ja volta-ladoke, lopetetaan se ennenaikaisesti"
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 msgid "also already have an ended spanner"
 msgstr "myös tekstileike päätettiin jo"
 
-#: parser.yy:703
+#: volta-engraver.cc:159
+msgid "giving up"
+msgstr "luovutetaan"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr "\\paper ei voi olla käytössä \\score:ssa, käytä \\layout sen sijaan"
 
-#: parser.yy:727
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr "tarvitaan \\paper paperiryhmälle"
 
-#: parser.yy:1173
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr "Graafiseen objectiin täytyy olla kirjain tai numero"
 
-#: parser.yy:1476
+#: parser.yy:1475
 msgid "second argument must be pitch list"
 msgstr "toisen argumentin on oltava äänenkorkeuslista"
 
-#: parser.yy:1503 parser.yy:1508 parser.yy:1973
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 msgid "have to be in Lyric mode for lyrics"
 msgstr "täytyy olla Lyrics -moodissa lyriikkaa varten"
 
-#: parser.yy:1605
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr "oletetaan merkkijonon olevan skriptimäärittely"
 
-#: parser.yy:1760 parser.yy:1810
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "ei ole kesto: %d"
 
-#: parser.yy:1927
+#: parser.yy:1926
 msgid "have to be in Note mode for notes"
 msgstr "täytyy olla Note -moodissa nuotteja varten"
 
-#: parser.yy:1988
+#: parser.yy:1987
 msgid "have to be in Chord mode for chords"
 msgstr "täytyy olla Chord -moodissa sointuja varten"
 
@@ -1884,151 +1921,160 @@ msgstr "tuntematon koodinvaihtomerkillinen merkkijono: `\\\\%s'"
 
 #: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "Epäkelpo lilypond versio: %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
 #: lexer.ll:881 lexer.ll:882
-msgid "Consider updating the input with the convert-ly script"
+#, fuzzy
+msgid "consider updating the input with the convert-ly script"
 msgstr "Harkitse syötteen päivittämistä convert-ly scriptillä"
 
-#: backend-library.scm:19 lily.scm:494 ps-to-png.scm:88
-#, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Kutsutaan `~a'..."
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr "`~a' epäonnistui (~a)"
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, lisp-format
+#, scheme-format
 msgid "Converting to `~a'..."
 msgstr "Muunnetaan kohteeksi `~a'..."
 
-#: backend-library.scm:110
-#, lisp-format
+#: backend-library.scm:108
+#, scheme-format
 msgid "Converting to ~a..."
 msgstr "Muunnetaan kohteeksi `~a'..."
 
-#: backend-library.scm:156
-#, lisp-format
+#: backend-library.scm:145
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "Kirjoitetaan otsaketietue `~a' kohteeseen `~a'..."
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr "symbol ~S määriteltiin uudelleen"
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr "tapahtumaluokka ~A näkyy olevan käyttämätön"
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr "kääntäjä kuuntelee olematonta tapahtumaluokkaa ~A"
 
-#: define-markup-commands.scm:265
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
-msgstr "systeemejä ei löytynyt \\score merkinnässä, onko siinä \\layout blokkia?"
+msgstr ""
+"systeemejä ei löytynyt \\score merkinnässä, onko siinä \\layout blokkia?"
 
-#: define-markup-commands.scm:1284
-#, lisp-format
+#: define-markup-commands.scm:1297
+#, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "ei ole sallittu keston merkkijono: ~a"
 
-#: define-music-types.scm:743
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr "odotettiin symboli: ~S"
 
-#: define-music-types.scm:746
-#, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "ei löytynyt musiikkiobjektia: ~S"
 
-#: define-music-types.scm:766
-#, lisp-format
+#: define-music-types.scm:774
+#, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "tuntematon toistotyyppi `~S'"
 
-#: define-music-types.scm:767
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr "Katso tiedostosta music-types.scm tuetut toistotyypit"
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr "pari odotettiin dokumentissa ~s"
 
 #: document-backend.scm:135
-#, lisp-format
-msgid "can't find interface for property: ~S"
+#, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "ei löytynyt rajapintaa ominaisuudelle: ~S"
 
 #: document-backend.scm:145
-#, lisp-format
+#, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "tuntematon ladoke-rajapinta: ~S"
 
 #: documentation-lib.scm:45
-#, lisp-format
+#, scheme-format
 msgid "Processing ~S..."
 msgstr "Prosessoidaan ~S..."
 
 #: documentation-lib.scm:150
-#, lisp-format
+#, scheme-format
 msgid "Writing ~S..."
 msgstr "Kirjoitetaan ~S..."
 
 #: documentation-lib.scm:172
-#, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "ei löytynyt kuvausta ominaisuudelle ~S (~S)"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, scheme-format
 msgid "Writing ~a..."
 msgstr "Kirjoitetaan ~a..."
 
 #: framework-ps.scm:279
-#, lisp-format
-msgid "can't embed ~S=~S"
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr "ei voitu upottaa ~S=~S"
 
 #: framework-ps.scm:332
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr "Ei voitu poimia sopivaa tiedoa ~a:sta ~a:han"
 
 #: framework-ps.scm:349
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#, fuzzy, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr "ei tiedetä kuinka upottaa ~S=~S"
 
 #: framework-ps.scm:380
-#, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "ei tiedetä kuinka sijoittaa fontti ~s ~s ~s"
 
-#: framework-ps.scm:731
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr "ei voida konvertoida <stdout> ~S:ksi"
 
-#: framework-ps.scm:750 framework-ps.scm:753
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr "ei voida generoida ~S käyttäen postscript päänä"
 
-#: framework-ps.scm:760
+#: framework-ps.scm:758
+#, fuzzy
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2042,57 +2088,57 @@ msgstr ""
 "tai poista lilypond-book -ominaiset asetukset syötteestä.\n"
 
 #: framework-tex.scm:360
-#, lisp-format
+#, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "TeX -tiedostoniemessä ei saa olla välilyöntejä: `~a'"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr "Virhe palkin laskennassa.  Odotettiin (~S,~S), löytyi ~S."
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr "Virhe palkin laskennassa.  Odotettiin ~S 0, löytyi ~S."
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 msgid "Calculating page breaks..."
 msgstr "Lasketaan sivunvaihtoja..."
 
-#: lily-library.scm:526
-#, lisp-format
+#: lily-library.scm:593
+#, scheme-format
 msgid "unknown unit: ~S"
 msgstr "tuntematon yksikkö: ~S"
 
-#: lily-library.scm:559
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 "ei löytynyt \\version-määrittelyä, ole hyvä ja lisää~a yhteensopivuuden "
 "varalle"
 
-#: lily-library.scm:566
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr "vanhaa relative -yhteensopivuutta ei käytetty"
 
-#: lily.scm:142
-#, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "Ei löydetty ~A"
 
-#: lily.scm:207
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr "väärä tyyppi argumentille ~a.  Odotettiin ~a, löytyi ~s"
 
-#: lily.scm:423 lily.scm:484
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr "epäonniset tiedostot: ~S"
 
-#: lily.scm:474
-#, lisp-format
+#: lily.scm:579
+#, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "Ohjataan tulosteet paikkaan ~a..."
 
@@ -2100,48 +2146,50 @@ msgstr "Ohjataan tulosteet paikkaan ~a..."
 msgid "Music head function must return Music object"
 msgstr "Music-pääfunktion täytyy palauttaa Music-objekti"
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr "Tuntematon ominaisuustoiminta ~a"
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr "Väärä argumenttin määrä.  Odotettiin: ~A, löytyi ~A: ~S"
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr "Väärä argumentti paikassa ~A.  Odotettiin: ~A, löytyi: ~S."
 
-#: music-functions.scm:210
-msgid "More alternatives than repeats. Junking excess alternatives"
-msgstr "Enemmän vaihtoehtoja kuin kertauksia. Hylätään ylimääräiset vaihtoehdot"
+#: music-functions.scm:213
+#, fuzzy
+msgid "More alternatives than repeats.  Junking excess alternatives"
+msgstr ""
+"Enemmän vaihtoehtoja kuin kertauksia. Hylätään ylimääräiset vaihtoehdot"
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr "odotettiin 2 elementtiä sointutremololle, löytyi ~a"
 
-#: music-functions.scm:535
-#, lisp-format
+#: music-functions.scm:538
+#, scheme-format
 msgid "music expected: ~S"
 msgstr "oletettiin musiikkia: ~S"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr "Tahtiviivan tarkistus epäonnistui.  Odotettiin: ~a, löytyi: ~a"
 
-#: music-functions.scm:745
-#, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "ei löytynyt lainusmerkittyä musiikkai `~S'"
 
-#: music-functions.scm:953
-#, lisp-format
+#: music-functions.scm:942
+#, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "tuntematan kortusmerkkityyli: ~S"
 
@@ -2150,18 +2198,18 @@ msgid "utf-8-string encountered in PS backend"
 msgstr "utf8-merkkijono havaittu PS päässä"
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr "määrittämätön: ~S"
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr "decypher ei onnistunut Pango kuvauksessa: ~a"
 
 #: output-tex.scm:98
-#, lisp-format
-msgid "can't find ~a in ~a"
+#, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "ei löytynyt ~a paikassa ~a"
 
 #: paper.scm:69
@@ -2169,12 +2217,12 @@ msgid "Not in toplevel scope"
 msgstr "Ei huipputason piirissä"
 
 #: paper.scm:117
-#, lisp-format
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr "Tämä ei ole \\layout {} objekti, ~S"
 
 #: paper.scm:129
-#, lisp-format
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr "Tuntematon paperikoko: ~a"
 
@@ -2185,7 +2233,7 @@ msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr "Täytyy käyttää #(set-paper-size .. ) \\paper { ... } :n sisällä"
 
 #: parser-clef.scm:126
-#, lisp-format
+#, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "tuntematon avaimen tyyppi: `~a'"
 
@@ -2193,12 +2241,67 @@ msgstr "tuntematon avaimen tyyppi: `~a'"
 msgid "see scm/clef.scm for supported clefs"
 msgstr "katso tiedostosta scm/clef.scm tuetut avaimet"
 
-#: ps-to-png.scm:97
-#, lisp-format
+#: ps-to-png.scm:88
+#, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "~a komento lopetettiin tilassa: ~S"
 
 #: to-xml.scm:190
-msgid "assertion failed"
+#, fuzzy, scheme-format
+msgid "assertion failed: ~S"
 msgstr "ajaminen epäonnistui"
 
+#~ msgid "silly pitch"
+#~ msgstr "sekava äänenkorkeus"
+
+#~ msgid "show warranty"
+#~ msgstr "näytä takuusitoumus"
+
+#~ msgid ""
+#~ "Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook "
+#~ "document.\n"
+#~ "\n"
+#~ "Example usage:\n"
+#~ "\n"
+#~ " lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
+#~ " lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
+#~ " lilypond-book --process='lilypond -I include' BOOK\n"
+#~ msgstr ""
+#~ "Käsittele HTML, LaTeX, texinfo tai DocBook -documenttiin sisällytetyt "
+#~ "LilyPond palaset.\n"
+#~ "Käyttöesimerkkejä:\n"
+#~ "\n"
+#~ "   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
+#~ "   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" "
+#~ "BOOK\n"
+#~ "   lilypond-book --process='lilypond -I include' BOOK\n"
+
+#~ msgid "loading default font"
+#~ msgstr "ladataan oletusfontti"
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "ei löytynyt oletusfonttia: `%s'"
+
+#~ msgid "not setting creation callback: not a procedure"
+#~ msgstr "ei aseteta luonnin takaisinkutsua: ei ole proseduuri"
+
+#~ msgid "not setting modification callback: not a procedure"
+#~ msgstr "ei aseteta muutoksen takaisinkutsua: ei ole proseduuri"
+
+#~ msgid "crescendo too small"
+#~ msgstr "liian lyhyt crescendo"
+
+#~ msgid "print this help"
+#~ msgstr "näytä tämä opaste"
+
+#~ msgid "cannot open file %s"
+#~ msgstr "ei voitu avata tiedostoa %s"
+
+#~ msgid "Invalid direction of slur-event"
+#~ msgstr "Tuntematon kaari-tapahtuman suunta"
+
+#~ msgid "invalid direction of tuplet-span-event"
+#~ msgstr "tuntematon tuplettiväli-tapahtuman suunta"
+
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "Epäkelpo lilypond versio: %s (%s, %s)"
diff --git a/po/fr.po b/po/fr.po
index 19bffbe72c..fd9eca07f7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,15 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-20 23:29+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
 "PO-Revision-Date: 2006-10-22 11:13+0200\n"
 "Last-Translator: John Mandereau <john.mandereau@free.fr>\n"
 "Language-Team: Français <lilypond-user-fr@gnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);X-Generator: KBabel 1.11.4\n"
 
 #: convertrules.py:12
 #, python-format
@@ -78,39 +77,47 @@ msgid "Running %s..."
 msgstr "Exécution de %s..."
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
+#, fuzzy, python-format
+msgid "Usage: %s"
 msgstr "Utilisation : %s\n"
 
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "Utilisation : %s [OPTIONS]... FICHIER..."
+
 #: abc2ly.py:1351
+#, fuzzy, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 "Ce programme convertit les fichiers musicaux ABC (voir\n"
 "http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) vers le format LilyPond."
 
-#: abc2ly.py:1354
-msgid "set output filename to FILE"
-msgstr "produire la sortie dans FICHIER"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
+msgstr "produire la sortie dans le FICHIER"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr "être strict sur la réussite"
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr "préserver la notion de lien de croches d'ABC"
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr "Rapporter toute anomalie à %s"
+
 #: convert-ly.py:41
+#, fuzzy
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 "Mettre à jour le fichier source vers une version plus récente. Par défaut,\n"
 "de la version indiquée par la commande \\version vers la version courante\n"
@@ -121,123 +128,121 @@ msgstr ""
 "  convert-ly -e ancien.ly\\n\n"
 "  convert-ly --from=2.3.28 --to=2.5.21 toto.ly\n"
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+#, fuzzy
+msgid "Examples:"
+msgstr "Exemple"
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, c-format, python-format
 msgid "warning: %s"
 msgstr "AVERTISSEMENT : %s"
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, c-format, python-format
 msgid "error: %s"
 msgstr "ERREUR : %s"
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr "Distribué selon les termes de la GNU General Public License."
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr "Le logiciel est distribué SANS GARANTIE."
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr "VERSION"
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr "partir de la VERSION [par défaut : \\version trouvée dans le fichier]"
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr "éditer le fichier d'origine"
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr "ne pas ajouter la commande \\version si elle est absente"
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+#, fuzzy
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr "afficher les règles [par défaut : --from=0, --to=@TOPLEVEL_VERSION@]"
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr "convertir jusqu'à la VERSION [par défaut : @TOPLEVEL_VERSION@]"
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr "Conversion en cours : "
 
 #: convert-ly.py:166
-msgid "error while converting"
+#, fuzzy
+msgid "Error while converting"
 msgstr "erreur lors de la conversion"
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
-msgstr "Abandon"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
+msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, python-format
 msgid "Processing `%s'... "
 msgstr "Traitement de « %s »... "
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "impossible d'ouvrir le fichier : « %s »"
 
-#: convert-ly.py:286
-#, python-format
-msgid "can't determine version for `%s'. Skipping"
+#: convert-ly.py:284
+#, fuzzy, python-format
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "impossible de déterminer la version pour « %s ». Au suivant"
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "Utilisation : %s [OPTIONS]... FICHIER..."
+
 #: etf2ly.py:1198
+#, fuzzy
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 "Enigma Transport Format est utilisé par Finale, de Coda Music Technology.\n"
 "Ce programme convertit partiellement un fichier ETF en un fichier LilyPond "
 "exploitable."
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr "produire la sortie dans le FICHIER"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "FICHIER"
 
-#: etf2ly.py:1204 midi2ly.py:899
-msgid "show warranty"
-msgstr "afficher la notice de garantie"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
+msgstr "afficher les notices de garantie et de droit d'auteur"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook "
-"document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr ""
+
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
-"Traite des extraits LilyPond dans un document hybride HTML, LaTeX, "
-"Texinfo ou DocBook.\n"
-"Exemples d'utilisation :\n"
-"\n"
-"   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" LIVRE\n"
-"   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" LIVRE\n"
-"   lilypond-book --process='lilypond -I include' LIVRE\n"
-"\n"
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, python-format
 msgid "Exiting (%d)..."
 msgstr "Fin d'exécution (%d)..."
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s détenu par"
@@ -251,13 +256,20 @@ msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr "passer les extraits à travers le FILTRE [convert-ly -n -]"
 
 #: lilypond-book.py:135
-msgid "use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
-msgstr "utiliser le format de sortie FORMAT (texi (par défaut), texi-html, latex, html, docbook)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
+msgstr ""
+"utiliser le format de sortie FORMAT (texi (par défaut), texi-html, latex, "
+"html, docbook)"
 
 #: lilypond-book.py:138
 msgid "add DIR to include path"
 msgstr "ajouter le RÉPERTOIRE au chemin de recherche des inclusions"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "RÉPERTOIRE"
+
 #: lilypond-book.py:143
 msgid "write output to DIR"
 msgstr "produire la sortie dans le RÉPERTOIRE"
@@ -270,147 +282,149 @@ msgstr "COMMANDE"
 msgid "process ly_files using COMMAND FILE..."
 msgstr "traiter les fichiers_ly en utilisant COMMANDE FICHIER..."
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
+#, fuzzy
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 "extraire toutes les polices PostScript dans INPUT.psfonts\n"
 "pour LaTex. Ceci devra être accompagné de dvips -h INPUT.psfonts"
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "passer en mode verbeux"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "afficher les notices de garantie et de droit d'auteur"
-
-#: lilypond-book.py:778
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr "fichier non trouvé : %s"
 
-#: lilypond-book.py:1009
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr "l'option ly-option est obsolète : %s=%s"
 
-#: lilypond-book.py:1012
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr "traduction en mode de compatibilité : %s=%s"
 
-#: lilypond-book.py:1016
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr "l'option ly-option est obsolète : %s"
 
-#: lilypond-book.py:1019
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr "traduction en mode de compatibilité : %s"
 
-#: lilypond-book.py:1038
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr "option ly inconnue et ignorée : %s"
 
-#: lilypond-book.py:1391
+#: lilypond-book.py:1388
 #, python-format
 msgid "Opening filter `%s'"
 msgstr "Ouverture du filtre « %s »"
 
-#: lilypond-book.py:1408
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr "« %s » a échoué (%d)"
 
-#: lilypond-book.py:1409
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr "Le journal d'erreurs est comme suit :"
 
-#: lilypond-book.py:1479
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+#, fuzzy
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr "Impossible de trouver \\begin{document} dans le document LaTeX"
 
-#: lilypond-book.py:1589
+#: lilypond-book.py:1586
 msgid "Writing snippets..."
 msgstr "Écriture des extraits..."
 
-#: lilypond-book.py:1594
+#: lilypond-book.py:1591
 msgid "Processing..."
 msgstr "Traitement..."
 
-#: lilypond-book.py:1598
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr "Tous les extraits sont à jour..."
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1605
 #, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "impossible de déterminer le format pour : %s"
 
-#: lilypond-book.py:1619
+#: lilypond-book.py:1616
 #, python-format
 msgid "%s is up to date."
 msgstr "%s est à jour."
 
-#: lilypond-book.py:1625
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "Écriture de « %s »..."
 
-#: lilypond-book.py:1680
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr "La sortie écraserait le fichier d'entrée ; utiliser --output."
 
-#: lilypond-book.py:1684
+#: lilypond-book.py:1681
 #, python-format
 msgid "Reading %s..."
 msgstr "Lecture de %s..."
 
-#: lilypond-book.py:1703
+#: lilypond-book.py:1700
 msgid "Dissecting..."
 msgstr "Dissection en cours..."
 
-#: lilypond-book.py:1719
+#: lilypond-book.py:1716
 #, python-format
 msgid "Compiling %s..."
 msgstr "Compilation de %s..."
 
-#: lilypond-book.py:1728
+#: lilypond-book.py:1725
 #, python-format
 msgid "Processing include: %s"
 msgstr "Traitement d'inclusion : %s"
 
-#: lilypond-book.py:1742
+#: lilypond-book.py:1739
 #, python-format
 msgid "Removing `%s'"
 msgstr "Suppression de « %s »"
 
-#: lilypond-book.py:1819
+#: lilypond-book.py:1815
 #, python-format
 msgid "Writing fonts to %s..."
 msgstr "Écriture des polices dans %s..."
 
-#: lilypond-book.py:1834
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr "option --psfonts inutilisée"
 
-#: lilypond-book.py:1835
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr "le traitement avec dvips n'aura pas de polices"
 
-#: lilypond-book.py:1838
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr "utilisation de DVIPS :"
 
-#: midi2ly.py:106 lily-library.scm:557 lily-library.scm:565
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "AVERTISSEMENT : "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "ERREUR : "
 
@@ -423,8 +437,9 @@ msgstr "Fin d'exécution... "
 msgid "%s output to `%s'..."
 msgstr "%s reproduit dans « %s »..."
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
 msgstr "Convertir du format MIDI au format source LilyPond."
 
 #: midi2ly.py:875
@@ -468,34 +483,62 @@ msgid "treat every text as a lyric"
 msgstr "traiter chaque texte comme des paroles"
 
 #: midi2ly.py:905
-msgid "example"
+#, fuzzy
+msgid "Examples"
 msgstr "Exemple"
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "aucun fichier spécifié en ligne de commande."
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Ce programme est un logiciel libre. Il est couvert par la licence GNU "
+"General\n"
+"Public License, et vous êtes libre de le modifier et/ou d'en distribuer "
+"des \n"
+"copies sous certaines conditions. Appelez « %s --warranty » pour plus "
+"d'informations.\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+msgid "set output filename to FILE"
+msgstr "produire la sortie dans FICHIER"
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "l'option « %s » requiert un argument"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: getopt-long.cc:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "l'option « %s » ne reçoit pas d'argument"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "option non reconnue : « %s »"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "argument « %s » invalide pour l'option « %s »"
 
-#: warn.cc:68 grob.cc:556 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr "erreur de programmation : %s"
@@ -504,31 +547,31 @@ msgstr "erreur de programmation : %s"
 msgid "continuing, cross fingers"
 msgstr "poursuite ; croisons les doigts"
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 "la saisie d'une liste d'altérations accidentelles doit débuter \n"
 "par un nom de contexte : %s"
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr "altération accidentelle inconnue, donc ignorée : %s"
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 "paire ou nom de contexte attendu pour la règle d'altération accidentelle,\n"
 " %s trouvé"
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr "altération accidentelle « %s » non trouvée"
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
@@ -537,58 +580,51 @@ msgstr ""
 "N'utilisez les lignes inter-portées (cross-staff spanners) que dans une "
 "double portée (PianoStaff)."
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
-msgstr "tentative d'obtenir une traduction pour quelque chose qui n'est pas mon fils"
+#: align-interface.cc:329
+#, fuzzy
+msgid "tried to get a translation for something that is no child of mine"
+msgstr ""
+"tentative d'obtenir une traduction pour quelque chose qui n'est pas mon fils"
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "impossible de trouver la police : « %s »"
 
-#: all-font-metrics.cc:165
-msgid "loading default font"
-msgstr "chargement de la police par défaut"
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "impossible de trouver la police par défaut : « %s »"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(chemin de recherche : « %s »)"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-msgid "giving up"
-msgstr "abandon"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr "l'argument de \\applycontext n'est pas une procédure"
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "impossible de faire un changement, c'est déjà dans le traducteur : %s"
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr "Axis_group_engraver : le groupe vertical a déjà un parent"
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr "y a-t-il deux Axis_group_engravers ?"
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr "retrait de ce groupe vertical"
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr "tentative de calculer une hauteur pure ailleurs qu'à un point d'arrêt"
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -602,19 +638,20 @@ msgstr "lien déjà présent"
 msgid "unterminated beam"
 msgstr "lien non terminé"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr "la hampe doit avoir une structure Rhythmic"
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+#, fuzzy
+msgid "stem does not fit in beam"
 msgstr "la hampe ne s'insère pas dans le lien"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr "le lien a débuté ici"
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 msgid "no feasible beam position"
 msgstr "nulle part où positionner le lien"
 
@@ -622,25 +659,25 @@ msgstr "nulle part où positionner le lien"
 msgid "removing beam with no stems"
 msgstr "suppression du lien ayant moins de deux hampes"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 "pas de configuration initiale viable repérée : la pente du lien pourrait \n"
 "être mauvaise"
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Pas d'entrée d'espacement entre %s et « %s »"
 
 #: change-iterator.cc:23
 #, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "impossible de changer « %s » en « %s »"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "impossible de repérer le contexte vers lequel commuter"
 
 #. We could change the current translator's id, but that would make
@@ -671,7 +708,7 @@ msgstr "accord de trémolo non terminé"
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr "attendait 2 éléments pour l'accord de trémolo, %d trouvé(s)"
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr "clé « %s » non trouvée"
@@ -688,30 +725,32 @@ msgstr "rejet d'un cluster vide"
 #: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
-msgstr "Coherent_ligature_engraver : initialise `spacing-increment=0.01': ptr=%ul"
+msgstr ""
+"Coherent_ligature_engraver : initialise `spacing-increment=0.01': ptr=%ul"
 
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
-msgid "couldn't find line breaking that satisfies constraints"
+#, fuzzy
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "impossible de trouver un saut de ligne qui satisfasse aux contraintes"
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, c-format
 msgid "program has no such type: `%s'"
 msgstr "le programme n'a pas de tel type : « %s »"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr "nécessite des arguments symboliques pour \\override et \\revert"
 
 #: context.cc:151
 #, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "impossible de trouver ou créer un nouveau « %s »"
 
 #: context.cc:213
 #, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "impossible de trouver ou créer « %s » appelé « %s »"
 
 #: context.cc:276
@@ -721,7 +760,7 @@ msgstr "Événement CreateContext invalide : impossible de créer le contexte %s
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "impossible de trouver ou créer : « %s »"
 
 #: custos.cc:77
@@ -729,11 +768,11 @@ msgstr "impossible de trouver ou créer : « %s »"
 msgid "custos `%s' not found"
 msgstr "custode « %s » non trouvée"
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr "La classe Event devrait être un symbole"
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, c-format
 msgid "Unknown event class %s"
 msgstr "Classe d'événement inconnue : « %s »"
@@ -744,7 +783,7 @@ msgid "dot `%s' not found"
 msgstr "point « %s » introuvable"
 
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "impossible de trouver le début du (de)crescendo"
 
 #: dynamic-engraver.cc:195
@@ -763,11 +802,7 @@ msgstr "le crescendo débute ici"
 msgid "unterminated (de)crescendo"
 msgstr "(de)crescendo non terminé"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr "ne peut paramétrer le callback de création : il n'est pas une procédure"
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "prolongation non terminée"
 
@@ -790,17 +825,17 @@ msgstr "échec d'ajout du répertoire de polices : « %s »"
 msgid "adding font directory: %s"
 msgstr "ajout d'un répertoire de polices : « %s »"
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 "infini ou valeur non numérique rencontré lors de la conversion d'un nombre "
 "réel"
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr "initialisation à zéro"
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 msgid "unterminated glissando"
 msgstr "glissando non terminé"
 
@@ -829,27 +864,24 @@ msgstr "\\%s implicite ajouté"
 
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "Impossible d'appliquer '\\~' à la première tête de ligature"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr "impossible d'appliquer '\\~' à des têtes ayant la même hauteur"
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, c-format
 msgid "Unknown interface `%s'"
 msgstr "Interface inconnue : « %s »"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
-msgstr "L'objet graphique (Grob) « %s » n'a pas d'interface pour la propriété « %s »"
-
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr "ne peut paramétrer le callback de modification : il n'est pas une procédure"
+msgstr ""
+"L'objet graphique (Grob) « %s » n'a pas d'interface pour la propriété « %s »"
 
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
@@ -857,19 +889,16 @@ msgstr ""
 "infini ou valeur non numérique rencontré lors de la conversion d'un nombre "
 "réel"
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr "decrescendo trop court"
 
-#: hairpin.cc:180
-msgid "crescendo too small"
-msgstr "crescendo trop court"
-
-#: horizontal-bracket-engraver.cc:57
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:59
+#, fuzzy
+msgid "do not have that many brackets"
 msgstr "n'a pas autant de crochets"
 
-#: horizontal-bracket-engraver.cc:66
+#: horizontal-bracket-engraver.cc:68
 msgid "conflicting note group events"
 msgstr "événements de groupe de notes conflictuels"
 
@@ -885,17 +914,22 @@ msgstr "trait d'union sans suite ; escamoté"
 msgid "include files are not allowed in safe mode"
 msgstr "l'inclusion de fichiers n'est pas permise en mode sécurisé"
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "impossible de trouver le fichier : « %s »"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(chemin de recherche : « %s »)"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "position inconnue"
 
 #: ligature-engraver.cc:93
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr "impossible de trouver le début d'une ligature"
 
 #: ligature-engraver.cc:98
@@ -922,54 +956,54 @@ msgstr "le silence est ignoré : une ligature ne peut contenir de silence"
 msgid "ligature was started here"
 msgstr "la ligature a débuté ici"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(chemin de chargement : « %s »)"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr "Vérification de type de propriété pour « %s » (%s) non trouvée."
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr "s'agit-il d'une faute de frappe ?"
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr "affectation faite malgré tout"
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 "la vérification du type de « %s » a échoué ; \n"
 "   la valeur « %s » doit être du type « %s »"
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "le nom de l'identificateur est un mot clé : « %s »"
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "erreur à la fin du fichier (EOF) : %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, c-format
 msgid "deprecated function called: %s"
 msgstr "appel à une fonction obsolète : %s"
 
-#: lily-parser-scheme.cc:89
-#, c-format
-msgid "Changing working directory to `%s'"
+#: lily-parser-scheme.cc:88
+#, fuzzy, c-format
+msgid "Changing working directory to: `%s'"
 msgstr "impossible de changer le répertoire de travail pour : %s"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "impossible de trouver le fichier d'initialisation : « %s »"
 
 #: lily-parser-scheme.cc:125
@@ -977,20 +1011,21 @@ msgstr "impossible de trouver le fichier d'initialisation : « %s »"
 msgid "Processing `%s'"
 msgstr "Traitement de « %s »"
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Analyse syntaxique..."
 
-#: lily-parser.cc:126
-msgid "braces don't match"
+#: lily-parser.cc:127
+#, fuzzy
+msgid "braces do not match"
 msgstr "accolades non pairées"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr "impossible de repérer la voix Voice « %s »"
 
-#: main.cc:117
+#: main.cc:116
 #, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -1005,7 +1040,7 @@ msgstr ""
 "copies sous certaines conditions. Appelez « %s --warranty » pour plus "
 "d'informations.\n"
 
-#: main.cc:123
+#: main.cc:122
 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"
@@ -1031,110 +1066,106 @@ msgstr ""
 "la licence GNU General Public License pour plus de détails.\n"
 "\n"
 "    Vous devriez avoir reçu avec ce logiciel une copie de la\n"
-"licence GNU General Public License ; dans le cas contraire, écrivez "
-"à\n"
+"licence GNU General Public License ; dans le cas contraire, écrivez à\n"
 "la Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
 "02111-1307,\n"
 "USA.\n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr "BACK"
 
-#: main.cc:154
+#: main.cc:153
+#, fuzzy
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 "utiliser le support BACK (gnome, ps, eps,\n"
 "scm, svg, tex, texstr)\n"
 "par défaut : PS"
 
-#: main.cc:156
-msgid "SYM=VAL"
+#: main.cc:155
+#, fuzzy
+msgid "SYM[=VAL]"
 msgstr "SYM=VAL"
 
-#: main.cc:157
+#: main.cc:156
+#, fuzzy
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 "définit une option en langage Scheme. Utilise #t si VAL n'est pas "
 "spécifiée.\n"
 "Tenter -dhelp pour obtenir de l'aide."
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr "EXPR"
 
-#: main.cc:160
+#: main.cc:159
 msgid "evaluate scheme code"
 msgstr "évalue du code Scheme"
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr "FORMATs"
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr "produire FORMAT,... Aussi comme options séparées :"
 
-#: main.cc:164
+#: main.cc:163
 msgid "generate DVI (tex backend only)"
 msgstr "générer le DVI (uniquement pour tex)"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr "redétermine le chemin d'exécution de LilyPond"
-
-#: main.cc:166
+#: main.cc:164
 msgid "generate PDF (default)"
 msgstr "générer le PDF (par défaut)"
 
-#: main.cc:167
+#: main.cc:165
 msgid "generate PNG"
 msgstr "générer le PNG"
 
-#: main.cc:168
+#: main.cc:166
 msgid "generate PostScript"
 msgstr "générer le PostScript"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr "générer le TeX (uniquement pour tex)"
 
-#: main.cc:170
-msgid "print this help"
-msgstr "afficher cet aide-mémoire"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr "CHAMP"
 
-#: main.cc:171
-msgid "dump a header field to file BASENAME.FIELD"
+#: main.cc:169
+#, fuzzy
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr "écrire un champ d'en-tête dans le fichier BASENAME.CHAMP"
 
-#: main.cc:172
-msgid "DIR"
-msgstr "RÉPERTOIRE"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "ajouter le RÉPERTOIRE au chemin de recherche"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "utiliser le FICHIER comme fichier d'initialisation"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr "UTILISATEUR,GROUPE,CAGE,RÉPERTOIRE"
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
@@ -1142,27 +1173,35 @@ msgstr ""
 "chroot dans CAGE, devenir UTILISATEUR:GROUPE\n"
 "et cd dans RÉPERTOIRE"
 
-#: main.cc:178
+#: main.cc:177
 msgid "do not generate printed output"
 msgstr "ne pas générer la sortie imprimée"
 
-#: main.cc:179
+#: main.cc:178
 msgid "write output to FILE (suffix will be added)"
 msgstr "produire la sortie dans le FICHIER (adjonction automatique du suffixe)"
 
-#: main.cc:180
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr "produire une image du premier système"
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr "redétermine le chemin d'exécution de LilyPond"
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+#, fuzzy
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr "rejette les opérations Scheme et PostScript non sûres"
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "affiche le numéro de version"
 
-#: main.cc:223
+#: main.cc:224
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1172,81 +1211,82 @@ msgstr ""
 "%s et autres."
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Utilisation : %s [OPTIONS]... FICHIER..."
 
-#: main.cc:252
+#: main.cc:253
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Composer la musique et/ou produire du MIDI à partir du FICHIER"
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr "LilyPond produit une jolie notation musicale."
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr "Pour plus d'information, voir %s"
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Options :"
 
-#: main.cc:262
+#: main.cc:263
 #, c-format
 msgid "Report bugs via %s"
 msgstr "Rapporter toute anomalie à %s"
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr "attendait %d arguments avec la cage, %u trouvés"
 
-#: main.cc:322
+#: main.cc:323
 #, c-format
 msgid "no such user: %s"
 msgstr "utilisateur inconnu : « %s »"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 "impossible de repérer l'id d'utilisateur à partir du nom d'utilisateur : %"
 "s : %s"
 
-#: main.cc:339
+#: main.cc:340
 #, c-format
 msgid "no such group: %s"
 msgstr "groupe inconnu : %s"
 
-#: main.cc:341
+#: main.cc:342
 #, c-format
-msgid "can't get group id from group name: %s: %s"
-msgstr "impossible de repérer l'id de groupe à partir du nom de groupe : %s : %s"
+msgid "cannot get group id from group name: %s: %s"
+msgstr ""
+"impossible de repérer l'id de groupe à partir du nom de groupe : %s : %s"
 
-#: main.cc:349
+#: main.cc:350
 #, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "impossible de chrooter vers : %s : %s"
 
-#: main.cc:356
+#: main.cc:357
 #, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "impossible de changer l'id de groupe vers : %d : %s"
 
-#: main.cc:362
+#: main.cc:363
 #, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "impossible de changer l'id d'utilisateur vers : %d : %s"
 
-#: main.cc:368
+#: main.cc:369
 #, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "impossible de changer le répertoire de travail vers : %s : %s"
 
 #: main.cc:415
@@ -1254,7 +1294,7 @@ msgstr "impossible de changer le répertoire de travail vers : %s : %s"
 msgid "Evaluating %s"
 msgstr "Èvaluation de %s"
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr "Exception capturée : %s"
@@ -1274,7 +1314,8 @@ msgstr "ligature ayant moins de 2 têtes -> escamotage"
 
 #: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
-msgstr "impossible de déterminer la hauteur de la primitive de ligature -> escamotage"
+msgstr ""
+"impossible de déterminer la hauteur de la primitive de ligature -> escamotage"
 
 #: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
@@ -1329,125 +1370,123 @@ msgstr "Mensural_ligature : (join_right == 0)"
 msgid "no such MIDI instrument: `%s'"
 msgstr "instrument MIDI inconnu : « %s »"
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "hauteur étrange"
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr "expérimental : ajustement temporaire (de %d centièmes) du canal."
 
 #: midi-stream.cc:28
 #, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "impossible d'ouvrir le fichier en écriture : %s : %s"
 
 #: midi-stream.cc:44
 #, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "impossible d'écrire dans le fichier : « %s »"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr "Envoi d'un non-événement au contexte"
 
-#: music.cc:142
-#, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+#: music.cc:141
+#, fuzzy, c-format
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr "la vérification d'octave a échoué ; attendait %s, a obtenu : %s"
 
-#: music.cc:208
+#: music.cc:207
 #, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "La transposition de %s crée des altérations supérieures aux doubles"
 
-#: new-fingering-engraver.cc:95
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr "impossible d'ajouter du texte à des têtes de notes individuelles"
 
-#: new-fingering-engraver.cc:238
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr "aucun emplacement trouvé pour des doigtés"
 
-#: new-fingering-engraver.cc:239
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr "on les place en dessous"
 
-#: note-collision.cc:438
+#: note-collision.cc:457
 msgid "ignoring too many clashing note columns"
 msgstr "trop de notes se chevauchent. On les ignore."
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr "impossible de superposer une note et un silence"
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr "tête de note « %s » ou « %s » non trouvée"
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr "NoteEvent sans hauteur"
 
 #: open-type-font.cc:33
 #, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "impossible d'allouer %lu octets"
 
 #: open-type-font.cc:37
 #, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "impossible de charger la table de police : %s"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr "format de police non supporté : %s"
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr "erreur non répertoriée : %d à la lecture du fichier de police %s"
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
 msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr "FT_Get_Glyph_Name() a renvoyé l'erreur : %u"
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
+#, fuzzy
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 "impossible de cadrer la première tourne de page sur une seule page. "
 "Envisagez de définir un nombre pair pour first-page-number."
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr "Calcul des sauts de page et de ligne (%d sauts de pages possibles)..."
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 msgid "Drawing systems..."
 msgstr "Dessin des systèmes..."
 
-#: pango-font.cc:196
+#: pango-font.cc:181
 #, c-format
 msgid ""
 "Glyph has no name, but font supports glyph naming.\n"
 "Skipping glyph U+%0X, file %s"
 msgstr ""
-"Le glyphe n'a pas de nom, mais la fonte prend en charge le nommage de glyphes.\n"
+"Le glyphe n'a pas de nom, mais la fonte prend en charge le nommage de "
+"glyphes.\n"
 "Glyphe U+%0X ignoré dans le fichier %s"
 
-#: pango-font.cc:235
+#: pango-font.cc:224
 #, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "aucun nom de police PostScript correspondant à « %s »"
 
-#: pango-font.cc:283
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr "Caractère FreeType sans nom de police PostScript"
 
@@ -1481,15 +1520,15 @@ msgstr "répétition en pourcent non terminée"
 msgid "Track..."
 msgstr "Piste..."
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr "Bouclage du canal MIDI"
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr "réaffectation modulo 16"
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "Sortie MIDI vers « %s »..."
@@ -1498,23 +1537,24 @@ msgstr "Sortie MIDI vers « %s »..."
 msgid "unterminated phrasing slur"
 msgstr "liaison de phrasé non terminée"
 
-#: piano-pedal-engraver.cc:283
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
-msgstr "nécessite 3 cordes pour les pédales du piano, mais seulement %ld trouvées"
+msgstr ""
+"nécessite 3 cordes pour les pédales du piano, mais seulement %ld trouvées"
 
-#: piano-pedal-engraver.cc:298 piano-pedal-engraver.cc:309
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "impossible de repérer le début de la pédale de piano : « %s »"
 
-#: piano-pedal-engraver.cc:344
+#: piano-pedal-engraver.cc:347
 #, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "impossible de trouver le début du crochet de pédale de piano : « %s »"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, c-format
 msgid "no such internal option: %s"
 msgstr "option interne inconnue : %s"
@@ -1524,51 +1564,51 @@ msgstr "option interne inconnue : %s"
 msgid "not a grob name, `%s'"
 msgstr "n'est pas un nom d'objet graphique (grob), « %s »"
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr "Échec de la vérification de l'octave, a obtenu : "
 
 #: relocate.cc:44
-#, c-format
-msgid "Setting %s to %s\n"
+#, fuzzy, c-format
+msgid "Setting %s to %s"
 msgstr "Affectation à %s de la valeur %s\n"
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, c-format
 msgid "no such file: %s for %s"
 msgstr "fichier inexistant : %s pour %s"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, c-format
 msgid "no such directory: %s for %s"
 msgstr "répertoire inexistant : %s pour %s"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr "%s=%s (préfixage)\n"
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr "Réaffectation : prefixe de compilation=%s, nouveau préfixe=%s"
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr "Réaffectation : framework_prefix=%s"
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr "Réaffectation : est absolu : argv0=%s"
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr "Réaffectation : à partir du répertoire courant : argv0=%s"
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
@@ -1577,63 +1617,63 @@ msgstr ""
 "Réaffectation : à partir de PATH=%s\n"
 "argv0=%s"
 
-#: relocate.cc:353
-#, c-format
-msgid "Relocation file %s\n"
+#: relocate.cc:354
+#, fuzzy, c-format
+msgid "Relocation file: %s"
 msgstr "Fichier de relocation %s\n"
 
-#: relocate.cc:358
-#, c-format
-msgid "can't open file %s"
-msgstr "impossible d'ouvrir le fichier « %s »"
-
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr "Commande de relocation inconnue %s"
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr "collision de silences insoluble : direction du silence non fixée"
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "trop de silences en collision"
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr "silence « %s » non repéré"
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, c-format
 msgid "cannot find `%s'"
 msgstr "impossible de trouver « %s »"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr "Les polices musicales n'ont pas été installées correctement."
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, c-format
 msgid "Search path `%s'"
 msgstr "Chemin de recherche : « %s »"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr "Abandon"
+
+#: score.cc:225
 msgid "already have music in score"
 msgstr "il y a déjà de la musique dans la partition"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr "voici la musique précédente"
 
-#: score.cc:228
+#: score.cc:231
 msgid "errors found, ignoring music expression"
 msgstr "erreur repérée dans l'expression musicale. Elle sera ignorée."
 
 #. FIXME:
 #: script-engraver.cc:102
-msgid "don't know how to interpret articulation: "
+#, fuzzy
+msgid "do not know how to interpret articulation: "
 msgstr "ne sait comment interpréter l'articulation : "
 
 #: script-engraver.cc:103
@@ -1645,16 +1685,17 @@ msgstr "encodage Scheme : "
 msgid "No spring between column %d and next one"
 msgstr "Pas de tension entre la colonne %d et la suivante"
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
-msgstr "Direction invalide de slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
+msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "liaison non terminée"
 
-#: slur-engraver.cc:165
-msgid "can't end slur"
+#: slur-engraver.cc:166
+msgid "cannot end slur"
 msgstr "impossible de terminer la liaison"
 
 #: source-file.cc:74
@@ -1666,57 +1707,57 @@ msgstr "était censé lire %d caractères ; il y en a %d"
 msgid "staff-span event has no direction"
 msgstr "L'événement staff-span n'a pas de direction"
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr "durée du trémolo trop longue"
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "ajout d'une tête de note à une hampe incompatible (type = %d)"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr "la source devrait peut-être spécifier des voix polyphoniques"
 
-#: stem.cc:104
+#: stem.cc:105
 msgid "weird stem size, check for narrow beams"
 msgstr "taille de hampe bizarre ; vérifier la présence de liens étroits"
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr "crochet `%s' non repéré"
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr "type de crochet `%s' non repéré"
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr "%d éléments dénombrés."
 
-#: system.cc:270
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr "%d objets graphiques (grobs) dénombrés"
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr "impossible de repérer le point de départ de l'extension de texte"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr "a déjà une extension du texte"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr "extension du texte non terminée"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "liaison de prolongation orpheline"
 
@@ -1725,14 +1766,14 @@ msgstr "liaison de prolongation orpheline"
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr "chiffrage de mesure étrange : %d/%d"
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
@@ -1744,34 +1785,30 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr "traducteur inconnu : « %s »"
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "impossible de trouver : « %s »"
 
-#: translator.cc:331
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr "Deux événements %s simultanés, rejet de celui-ci"
 
-#: translator.cc:332
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr "Événement %s précédent ici"
 
-#: trill-spanner-engraver.cc:67
-msgid "can't find start of trill spanner"
+#: trill-spanner-engraver.cc:68
+msgid "cannot find start of trill spanner"
 msgstr "impossible de repérer le point de départ de l'extension de trille"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 msgid "already have a trill spanner"
 msgstr "a déjà une extension de trille"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr "direction invalide de tuplet-span-event"
-
-#: vaticana-ligature-engraver.cc:382
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
@@ -1780,7 +1817,7 @@ msgstr ""
 "préfixe(s) ignoré(s) « %s » pour cette tête de note selon les restrictions "
 "du style de ligature sélectionné"
 
-#: vaticana-ligature-engraver.cc:708
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr "Vaticana_ligature_engraver : fixé `spacing-increment = %f' : ptr=%ul"
@@ -1798,264 +1835,276 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr "Ligature vaticane : aucun joint (delta_pitch == 0)"
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
-msgid "can't end volta spanner"
+#: volta-engraver.cc:144
+msgid "cannot end volta spanner"
 msgstr "ne sait où terminer l'extension de reprise"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr "a déjà une extension de reprise, fin prématurée de celle-ci"
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 msgid "also already have an ended spanner"
 msgstr "a déjà une extension terminée"
 
-#: parser.yy:703 parser.yy:704
+#: volta-engraver.cc:159
+msgid "giving up"
+msgstr "abandon"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr "dans la section \\score, utiliser \\layout au lieu de \\paper"
 
-#: parser.yy:727 parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr "\\paper est nécessaire pour définir les paramètres de la page"
 
-#: parser.yy:1173 parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr "Un nom de Grob devrait être alphanumérique"
 
-#: parser.yy:1476 parser.yy:1477
+#: parser.yy:1475
 msgid "second argument must be pitch list"
 msgstr "le second argument doit être une liste de hauteurs"
 
-#: parser.yy:1503 parser.yy:1508 parser.yy:1973 parser.yy:1504 parser.yy:1509
-#: parser.yy:1974
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 msgid "have to be in Lyric mode for lyrics"
 msgstr "doit être en mode Lyric pour des paroles"
 
-#: parser.yy:1605 parser.yy:1606
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr "chaîne attendue comme définition de script"
 
-#: parser.yy:1760 parser.yy:1810 parser.yy:1761 parser.yy:1811
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "n'est pas une durée : %d"
 
-#: parser.yy:1927 parser.yy:1928
+#: parser.yy:1926
 msgid "have to be in Note mode for notes"
 msgstr "doit être en mode Note pour des notes"
 
-#: parser.yy:1988 parser.yy:1989
+#: parser.yy:1987
 msgid "have to be in Chord mode for chords"
 msgstr "doit être en mode Chord pour des accords"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr "parasitage par UTF-8 BOM"
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr "Escamotage d'UTF-8 BOM"
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr "La source a été renommée en « %s »"
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr "\\version doit être suivi d'une chaîne entre guillemets"
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr "\\sourcefilename doit être suivi d'une chaîne entre guillemets"
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr "\\sourcefilename doit être suivi d'une valeur entière"
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "Fin de fichier (EOF) au mileu d'un commentaire"
 
-#: lexer.ll:290
+#: lexer.ll:288
 msgid "\\maininput not allowed outside init files"
 msgstr "\\maininput n'est pas permis en dehors des fichiers d'initialisation"
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "identificateur erroné ou non défini : « %s »"
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr "absence de guillemet fermant"
 
-#: lexer.ll:468
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr "Accolade repérée à la fin d'une parole. Manquerait-il un espace ?"
 
-#: lexer.ll:561
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr "Accolade repérée à la fin d'un \"markup\". Manquerait-il un espace ?"
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "caractère invalide : « %c »"
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "chaîne d'échappement inconnue : « \\%s »"
 
-#: lexer.ll:882
+#: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "Version de LilyPond incorrecte : %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:883
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:881 lexer.ll:882
+#, fuzzy
+msgid "consider updating the input with the convert-ly script"
 msgstr "Envisagez la mise à jour de la source à l'aide du script convert-ly"
 
-#: backend-library.scm:19 lily.scm:487 ps-to-png.scm:88
-#, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Invocation de « ~a »..."
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr "« ~a » a mis (~a) en échec"
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, lisp-format
+#, scheme-format
 msgid "Converting to `~a'..."
 msgstr "Conversion en « ~a »..."
 
-#: backend-library.scm:110
-#, lisp-format
+#: backend-library.scm:108
+#, scheme-format
 msgid "Converting to ~a..."
 msgstr "Conversion en ~a..."
 
-#: backend-library.scm:156
-#, lisp-format
+#: backend-library.scm:145
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "Écriture du champ d'en-tête « ~a » dans « ~a »..."
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr "symbole ~S redéfini"
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr "la classe d'événement ~A semble être inutilisée"
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr "le traducteur écoute la classe d'événements inexistante ~A"
 
-#: define-markup-commands.scm:265
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
-msgstr "pas de système trouvé dans le bloc \\score, contient-il un bloc \\layout ?"
+msgstr ""
+"pas de système trouvé dans le bloc \\score, contient-il un bloc \\layout ?"
 
-#: define-markup-commands.scm:1281
-#, lisp-format
+#: define-markup-commands.scm:1297
+#, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "chaîne de durée invalide : ~a"
 
-#: define-music-types.scm:743
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr "symbole attendu : ~S"
 
-#: define-music-types.scm:746
-#, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "impossible de trouver l'objet de type musique : ~S"
 
-#: define-music-types.scm:766
-#, lisp-format
+#: define-music-types.scm:774
+#, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "type de répétition inconnu : « ~S »"
 
-#: define-music-types.scm:767
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr "Consulter music-types.scm pour les types de répétitions reconnus"
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr "le document ~s devrait contenir une paire"
 
 #: document-backend.scm:135
-#, lisp-format
-msgid "can't find interface for property: ~S"
+#, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "impossible de trouver l'interface pour la propriété ~S"
 
 #: document-backend.scm:145
-#, lisp-format
+#, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "interface d'objet graphique (Grob) inconnue : ~S"
 
 #: documentation-lib.scm:45
-#, lisp-format
+#, scheme-format
 msgid "Processing ~S..."
 msgstr "Traitement de ~S..."
 
 #: documentation-lib.scm:150
-#, lisp-format
+#, scheme-format
 msgid "Writing ~S..."
 msgstr "Écriture de ~S..."
 
 #: documentation-lib.scm:172
-#, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "impossible de trouver une description pour la propriété ~S (~S)"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, scheme-format
 msgid "Writing ~a..."
 msgstr "Écriture de ~a..."
 
 #: framework-ps.scm:279
-#, lisp-format
-msgid "can't embed ~S=~S"
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr "intégration impossible : ~S=~S"
 
 #: framework-ps.scm:332
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr "impossible d'extraire le fichier ~a à partir de ~a"
 
 #: framework-ps.scm:349
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#, fuzzy, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr "imposible de réaliser l'intégration ~S=~S"
 
 #: framework-ps.scm:380
-#, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "impossible d'intégrer les polices ~s ~s ~s"
 
-#: framework-ps.scm:731
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr "impossible de convertir <stdout> en ~S"
 
-#: framework-ps.scm:750 framework-ps.scm:753
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr "impossible de générer ~S à l'aide du support postscript"
 
-#: framework-ps.scm:760
+#: framework-ps.scm:758
+#, fuzzy
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2070,57 +2119,57 @@ msgstr ""
 "ou supprimez du fichier source les paramètres spécifiques à lilypond-book.\n"
 
 #: framework-tex.scm:360
-#, lisp-format
+#, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "un nom de fichier Tex ne peut contenir d'espace : « ~a »"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr "Erreur de définition du lien : attendait (~S,~S), ~S trouvé."
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr "Erreur de définition du lien : attendait ~S 0, repéré ~S."
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 msgid "Calculating page breaks..."
 msgstr "Calcul des sauts de page..."
 
-#: lily-library.scm:526
-#, lisp-format
+#: lily-library.scm:593
+#, scheme-format
 msgid "unknown unit: ~S"
 msgstr "unité inconnue : « ~S »"
 
-#: lily-library.scm:559
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 "pas de déclaration \\version trouvée, ajoutez ~a pour une compatibilité "
 "future"
 
-#: lily-library.scm:566
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr "compatibilité avec l'ancien mode relatif non utilisée"
 
-#: lily.scm:137
-#, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "impossible de trouver ~A"
 
-#: lily.scm:202
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr "type d'argument erroné pour ~a. Attendait ~a, a trouvé ~s"
 
-#: lily.scm:416 lily.scm:477
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr "erreur sur les fichiers : ~S"
 
-#: lily.scm:467
-#, lisp-format
+#: lily.scm:579
+#, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "Redirection de la sortie vers ~a..."
 
@@ -2128,50 +2177,52 @@ msgstr "Redirection de la sortie vers ~a..."
 msgid "Music head function must return Music object"
 msgstr "Une fonction musicale primitive devrait renvoyer un objet Music"
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr "Opération de propriété invalide ~a"
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr "Nombre d'arguments erroné. Attendu : ~A, trouvé ~A : ~S"
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr "Argument invalide à la position ~A. ~A attendu, ~S trouvé."
 
-#: music-functions.scm:210
-msgid "More alternatives than repeats. Junking excess alternatives"
-msgstr "Plus d'alternatives que de répétitions. Ignore les alternatives en surnombre"
+#: music-functions.scm:213
+#, fuzzy
+msgid "More alternatives than repeats.  Junking excess alternatives"
+msgstr ""
+"Plus d'alternatives que de répétitions. Ignore les alternatives en surnombre"
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr "attendait 2 éléments pour l'accord de trémolo, ~a trouvé(s)"
 
-#: music-functions.scm:535
-#, lisp-format
+#: music-functions.scm:538
+#, scheme-format
 msgid "music expected: ~S"
 msgstr "attendait une expression musicale : ~S"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 "Échec du contrôle de barre de mesure. \n"
 "Aurait dû se trouver à ~a au lieu de ~a"
 
-#: music-functions.scm:745
-#, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "impossible de trouver la citation de musique « ~S »"
 
-#: music-functions.scm:953
-#, lisp-format
+#: music-functions.scm:942
+#, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "style d'altération inconnu : ~S"
 
@@ -2180,18 +2231,18 @@ msgid "utf-8-string encountered in PS backend"
 msgstr "le support PS a rencontré une chaîne utf8"
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr "~S indéfini"
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr "la description de Pango ne peut être déchiffrée : ~a"
 
 #: output-tex.scm:98
-#, lisp-format
-msgid "can't find ~a in ~a"
+#, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "impossible de trouver ~a dans ~a"
 
 #: paper.scm:69
@@ -2199,12 +2250,12 @@ msgid "Not in toplevel scope"
 msgstr "N'est pas au niveau de portée globale"
 
 #: paper.scm:117
-#, lisp-format
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr "~S n'est pas un objet de \\layout {}"
 
 #: paper.scm:129
-#, lisp-format
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr "Taille de papier inconnue : ~a"
 
@@ -2215,7 +2266,7 @@ msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr "#(set-paper-size ..) doit être dans la section \\paper { ... }"
 
 #: parser-clef.scm:126
-#, lisp-format
+#, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "type de clef inconnu : « ~a »"
 
@@ -2223,12 +2274,71 @@ msgstr "type de clef inconnu : « ~a »"
 msgid "see scm/clef.scm for supported clefs"
 msgstr "consultez scm/clef.scm pour les clefs reconnues"
 
-#: ps-to-png.scm:97
-#, lisp-format
+#: ps-to-png.scm:88
+#, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "~a terminé avec l'état : ~S"
 
 #: to-xml.scm:190
-msgid "assertion failed"
+#, fuzzy, scheme-format
+msgid "assertion failed: ~S"
 msgstr "erreur d'assertion"
 
+#~ msgid "silly pitch"
+#~ msgstr "hauteur étrange"
+
+#~ msgid "show warranty"
+#~ msgstr "afficher la notice de garantie"
+
+#~ msgid ""
+#~ "Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook "
+#~ "document.\n"
+#~ "\n"
+#~ "Example usage:\n"
+#~ "\n"
+#~ " lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
+#~ " lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
+#~ " lilypond-book --process='lilypond -I include' BOOK\n"
+#~ msgstr ""
+#~ "Traite des extraits LilyPond dans un document hybride HTML, LaTeX, "
+#~ "Texinfo ou DocBook.\n"
+#~ "Exemples d'utilisation :\n"
+#~ "\n"
+#~ "   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" LIVRE\n"
+#~ "   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" "
+#~ "LIVRE\n"
+#~ "   lilypond-book --process='lilypond -I include' LIVRE\n"
+#~ "\n"
+
+#~ msgid "loading default font"
+#~ msgstr "chargement de la police par défaut"
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "impossible de trouver la police par défaut : « %s »"
+
+#~ msgid "not setting creation callback: not a procedure"
+#~ msgstr ""
+#~ "ne peut paramétrer le callback de création : il n'est pas une procédure"
+
+#~ msgid "not setting modification callback: not a procedure"
+#~ msgstr ""
+#~ "ne peut paramétrer le callback de modification : il n'est pas une "
+#~ "procédure"
+
+#~ msgid "crescendo too small"
+#~ msgstr "crescendo trop court"
+
+#~ msgid "print this help"
+#~ msgstr "afficher cet aide-mémoire"
+
+#~ msgid "cannot open file %s"
+#~ msgstr "impossible d'ouvrir le fichier « %s »"
+
+#~ msgid "Invalid direction of slur-event"
+#~ msgstr "Direction invalide de slur-event"
+
+#~ msgid "invalid direction of tuplet-span-event"
+#~ msgstr "direction invalide de tuplet-span-event"
+
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "Version de LilyPond incorrecte : %s (%s, %s)"
diff --git a/po/it.po b/po/it.po
index 0e707e8aee..1d7ecfed34 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Date: 1998-05-30 00:17:12+0200\n"
 "From:  <jantien@xs4all.nl>\n"
@@ -71,145 +71,154 @@ msgid "Running %s..."
 msgstr "Genero le voci..."
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "attenzione: "
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "Uso: %s [OPZIONE]... [FILE]"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr ""
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+msgid "Report bugs via"
+msgstr ""
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
+msgstr ""
+
+#: convert-ly.py:43 lilypond-book.py:73
+msgid "Examples:"
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, fuzzy, c-format, python-format
 msgid "warning: %s"
 msgstr "attenzione: "
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, fuzzy, c-format, python-format
 msgid "error: %s"
 msgstr "errore: "
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "Elaboro..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "non posso aprire il file: `%s'"
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "non trovo il file: `%s'"
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "Uso: %s [OPZIONE]... [FILE]"
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr ""
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr ""
 
-#: etf2ly.py:1204 midi2ly.py:899
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
 #, fuzzy
-msgid "show warranty"
+msgid "show warranty and copyright"
 msgstr "  -w, --warranty         mostra la garanzia e il copyright\n"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr ""
+
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, fuzzy, python-format
 msgid "Exiting (%d)..."
 msgstr "Genero le voci..."
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s di"
@@ -223,7 +232,8 @@ msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr ""
 
 #: lilypond-book.py:135
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr ""
 
 #: lilypond-book.py:138
@@ -231,6 +241,10 @@ msgstr ""
 msgid "add DIR to include path"
 msgstr "  -I, --include=DIR      aggiunge DIR ai path di ricerca\n"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr ""
+
 #: lilypond-book.py:143
 msgid "write output to DIR"
 msgstr ""
@@ -243,149 +257,148 @@ msgstr ""
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr ""
 
-#: lilypond-book.py:168 main.cc:184
-#, fuzzy
-msgid "show warranty and copyright"
-msgstr "  -w, --warranty         mostra la garanzia e il copyright\n"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, fuzzy, python-format
 msgid "Opening filter `%s'"
 msgstr "Genero le voci..."
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr ""
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 #, fuzzy
 msgid "Writing snippets..."
 msgstr "Genero le voci..."
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 #, fuzzy
 msgid "Processing..."
 msgstr "Elaboro..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "non trovo il file: `%s'"
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, python-format
 msgid "%s is up to date."
 msgstr ""
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, fuzzy, python-format
 msgid "Writing `%s'..."
 msgstr "Genero le voci..."
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, fuzzy, python-format
 msgid "Reading %s..."
 msgstr "Genero le voci..."
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 #, fuzzy
 msgid "Dissecting..."
 msgstr "Genero le voci..."
 
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, fuzzy, python-format
 msgid "Compiling %s..."
 msgstr "Genero le voci..."
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, fuzzy, python-format
 msgid "Processing include: %s"
 msgstr "Elaboro..."
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, fuzzy, python-format
 msgid "Removing `%s'"
 msgstr "Genero le voci..."
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, fuzzy, python-format
 msgid "Writing fonts to %s..."
 msgstr "non trovo e non posso creare `%s'"
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "attenzione: "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "errore: "
 
@@ -398,8 +411,9 @@ msgstr ""
 msgid "%s output to `%s'..."
 msgstr "L'output MIDI è inviato a %s..."
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, python-format
+msgid "Convert %s to LilyPond input."
 msgstr ""
 
 #: midi2ly.py:875
@@ -445,34 +459,55 @@ msgid "treat every text as a lyric"
 msgstr ""
 
 #: midi2ly.py:905
-msgid "example"
+msgid "Examples"
 msgstr ""
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr ""
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+msgid "set output filename to FILE"
+msgstr ""
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "l'opzione `%s' richiede un argomento"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: getopt-long.cc:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "opzione `%s' non accetta argomenti"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "opzione non riconosciuta: `%s'"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "argomento `%s' non valido per l'opzione `%s'"
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr ""
@@ -481,85 +516,75 @@ msgstr ""
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, fuzzy, c-format
-msgid "can't find font: `%s'"
-msgstr "non trovo il file: `%s'"
-
-#: all-font-metrics.cc:165
-#, fuzzy
-msgid "loading default font"
+msgid "cannot find font: `%s'"
 msgstr "non trovo il file: `%s'"
 
-#: all-font-metrics.cc:172
-#, fuzzy, c-format
-msgid "can't find default font: `%s'"
-msgstr "non trovo il file: `%s'"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, fuzzy, c-format
-msgid "(search path: `%s')"
-msgstr "(Il path di caricamento è `%s'"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-msgid "giving up"
-msgstr ""
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "non posso cambiare `%s' in `%s'"
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, fuzzy, c-format
 msgid "barcheck failed at: %s"
@@ -574,20 +599,21 @@ msgstr ""
 msgid "unterminated beam"
 msgstr "beam non terminato"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 #, fuzzy
 msgid "stem must have Rhythmic structure"
 msgstr "I gambi devono avere una struttura ritmica."
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+#, fuzzy
+msgid "stem does not fit in beam"
 msgstr "il gambo non rientra nel beam"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr ""
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 msgid "no feasible beam position"
 msgstr ""
 
@@ -596,24 +622,24 @@ msgstr ""
 msgid "removing beam with no stems"
 msgstr "beam con meno di due gambi"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, fuzzy, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "traduttore sconosciuto `%s'"
 
 #: change-iterator.cc:23
 #, fuzzy, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "non posso cambiare `%s' in `%s'"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "Non trovo il contesto dello Score"
 
 #. We could change the current translator's id, but that would make
@@ -645,7 +671,7 @@ msgstr "beam non terminato"
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
@@ -659,7 +685,7 @@ msgstr "tipo di chiave sconosciuto"
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
@@ -667,26 +693,26 @@ msgstr ""
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
 #, fuzzy
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "la soluzione non soddisfa i vincoli"
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, c-format
 msgid "program has no such type: `%s'"
 msgstr ""
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "non trovo e non posso creare `%s'"
 
 #: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "non trovo e non posso creare '%s' chiamato '%s'"
 
 #: context.cc:276
@@ -696,7 +722,7 @@ msgstr ""
 
 #: context.cc:388
 #, fuzzy, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "non trovo e non posso creare `%s'"
 
 #: custos.cc:77
@@ -704,18 +730,23 @@ msgstr "non trovo e non posso creare `%s'"
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, fuzzy, c-format
 msgid "Unknown event class %s"
 msgstr "tipo di chiave sconosciuto"
 
+#: dots.cc:38
+#, c-format
+msgid "dot `%s' not found"
+msgstr ""
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
 #, fuzzy
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "non trovo un (de)crescendo fino alla fine"
 
 #: dynamic-engraver.cc:195
@@ -738,11 +769,7 @@ msgstr "un cambio di tempo non 
 msgid "unterminated (de)crescendo"
 msgstr "crescendo non terminato"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "extender non terminato"
 
@@ -765,15 +792,15 @@ msgstr "non trovo e non posso creare `%s'"
 msgid "adding font directory: %s"
 msgstr "non trovo e non posso creare `%s'"
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "slur non terminato"
@@ -806,46 +833,37 @@ msgstr ""
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "non trovo le estremità di %s"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, fuzzy, c-format
 msgid "Unknown interface `%s'"
 msgstr "tipo di chiave sconosciuto"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr ""
 
-#: hairpin.cc:180
-#, fuzzy
-msgid "crescendo too small"
-msgstr "troppo piccolo"
-
-#: horizontal-bracket-engraver.cc:58
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:59
+msgid "do not have that many brackets"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 #, fuzzy
 msgid "conflicting note group events"
 msgstr "richieste di timing in conflitto"
@@ -864,93 +882,98 @@ msgstr "beam non terminato"
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "non trovo il file: `%s'"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, fuzzy, c-format
+msgid "(search path: `%s')"
+msgstr "(Il path di caricamento è `%s'"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "posizione sconosciuta"
 
-#: ligature-engraver.cc:95
+#: ligature-engraver.cc:93
 #, fuzzy
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr "non trovo le estremità di %s"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr ""
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 #, fuzzy
 msgid "already have a ligature"
 msgstr "crescendo non terminato"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr ""
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 #, fuzzy
 msgid "unterminated ligature"
 msgstr "slur non terminato"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 #, fuzzy
 msgid "ligature was started here"
 msgstr "un cambio di tempo non è ammesso in questo punto"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, fuzzy, c-format
 msgid "(load path: `%s')"
 msgstr "(Il path di caricamento è `%s'"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "Il nome dell'identificatore è una parola chiave (`%s')"
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "errore alla fine del file: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, fuzzy, c-format
 msgid "deprecated function called: %s"
 msgstr "non riesco a trovare il carattere `%s'"
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:88
 #, fuzzy, c-format
-msgid "Changing working directory to `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr "non trovo e non posso creare `%s'"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, fuzzy, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "non trovo il file: `%s'"
 
 #: lily-parser-scheme.cc:125
@@ -958,21 +981,21 @@ msgstr "non trovo il file: `%s'"
 msgid "Processing `%s'"
 msgstr "Elaboro..."
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Analisi..."
 
-#: lily-parser.cc:126
+#: lily-parser.cc:127
 #, fuzzy
-msgid "braces don't match"
+msgid "braces do not match"
 msgstr "le bretelle no si accoppiano"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, fuzzy, c-format
 msgid "cannot find Voice `%s'"
 msgstr "Non trovo il file `%s'"
 
-#: main.cc:117
+#: main.cc:116
 #, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -981,7 +1004,7 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: main.cc:123
+#: main.cc:122
 #, fuzzy
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
@@ -993,7 +1016,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1014,131 +1037,130 @@ msgstr ""
 "Cambridge, MA 02136\n"
 "USA.\n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
-msgid "SYM=VAL"
+#: main.cc:155
+msgid "SYM[=VAL]"
 msgstr ""
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "evaluate scheme code"
 msgstr ""
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 #, fuzzy
 msgid "generate DVI (tex backend only)"
 msgstr "vincoli degenerati"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 #, fuzzy
 msgid "generate PDF (default)"
 msgstr "vincoli degenerati"
 
-#: main.cc:167
+#: main.cc:165
 #, fuzzy
 msgid "generate PNG"
 msgstr "vincoli degenerati"
 
-#: main.cc:168
+#: main.cc:166
 #, fuzzy
 msgid "generate PostScript"
 msgstr "vincoli degenerati"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:170
-msgid "print this help"
+#: main.cc:168
+msgid "show this help and exit"
 msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr ""
 
-#: main.cc:171
-msgid "dump a header field to file BASENAME.FIELD"
-msgstr ""
-
-#: main.cc:172
-msgid "DIR"
+#: main.cc:169
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:172
+#: main.cc:171
 #, fuzzy
 msgid "add DIR to search path"
 msgstr "  -I, --include=DIR      aggiunge DIR ai path di ricerca\n"
 
-#: main.cc:173
+#: main.cc:172
 #, fuzzy
 msgid "use FILE as init file"
 msgstr "  -i, --init=NOMEFILE    usa NOMEFILE come file iniziale\n"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "vincoli degenerati"
 
-#: main.cc:179
+#: main.cc:178
 msgid "write output to FILE (suffix will be added)"
 msgstr ""
 
-#: main.cc:180
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr ""
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+msgid "show version number and exit"
 msgstr ""
 
-#: main.cc:223
+#: main.cc:224
 #, fuzzy, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1146,79 +1168,79 @@ msgid ""
 msgstr "Copyright (c) %s di"
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Uso: %s [OPZIONE]... [FILE]..."
 
-#: main.cc:252
+#: main.cc:253
 #, fuzzy, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Stampa partitura oppure suona una song MIDI da FILE o <stdin>."
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Opzioni: "
 
-#: main.cc:262
+#: main.cc:263
 #, c-format
 msgid "Report bugs via %s"
 msgstr ""
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:322
+#: main.cc:323
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "% strumento:"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "% strumento:"
 
-#: main.cc:341
+#: main.cc:342
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "non posso cambiare `%s' in `%s'"
 
-#: main.cc:349
+#: main.cc:350
 #, fuzzy, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "non trovo e non posso creare `%s'"
 
-#: main.cc:356
+#: main.cc:357
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "non posso cambiare `%s' in `%s'"
 
-#: main.cc:362
+#: main.cc:363
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "non posso cambiare `%s' in `%s'"
 
-#: main.cc:368
+#: main.cc:369
 #, fuzzy, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "non trovo e non posso creare `%s'"
 
 #: main.cc:415
@@ -1226,7 +1248,7 @@ msgstr "non trovo e non posso creare `%s'"
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1240,37 +1262,37 @@ msgstr ""
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1278,7 +1300,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr ""
 
@@ -1295,116 +1317,119 @@ msgstr ""
 msgid "no such MIDI instrument: `%s'"
 msgstr "% strumento:"
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "indicazione altezza priva di senso"
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
 #: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "non posso aprire il file: `%s'"
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "non posso aprire il file: `%s'"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:208
+#: music.cc:207
 #, fuzzy, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "la trasposizine di %s rende le alterazioni più che doppie"
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "Troppe collisioni tra colonne di note. Le ignoro."
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr ""
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "non posso maneggiare %s"
 
 #: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "non trovo il file: `%s'"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 #, fuzzy
 msgid "Drawing systems..."
 msgstr "Genero le voci..."
 
-#: pango-font.cc:215
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "non posso aprire il file: `%s'"
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1442,15 +1467,15 @@ msgstr "beam non terminato"
 msgid "Track..."
 msgstr "traccia "
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "L'output MIDI è inviato a %s..."
@@ -1460,23 +1485,23 @@ msgstr "L'output MIDI 
 msgid "unterminated phrasing slur"
 msgstr "slur non terminato"
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, fuzzy, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "non risco a trovare una ruling note a %s"
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, fuzzy, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "non risco a trovare una ruling note a %s"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, fuzzy, c-format
 msgid "no such internal option: %s"
 msgstr "% strumento:"
@@ -1486,117 +1511,116 @@ msgstr "% strumento:"
 msgid "not a grob name, `%s'"
 msgstr ""
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "non trovo e non posso creare `%s'"
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "% strumento:"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "% strumento:"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
-#, fuzzy, c-format
-msgid "Relocation file %s\n"
-msgstr "non posso aprire il file: `%s'"
-
-#: relocate.cc:358
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "can't open file %s"
+msgid "Relocation file: %s"
 msgstr "non posso aprire il file: `%s'"
 
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 #, fuzzy
 msgid "too many colliding rests"
 msgstr "Troppi crescendi"
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr ""
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "non trovo `%s'"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr ""
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(Il path di caricamento è `%s'"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "ho bisogno di musica nello spartito"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 #, fuzzy
 msgid "errors found, ignoring music expression"
 msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/"
 
 #. FIXME:
 #: script-engraver.cc:102
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr ""
 
 #: script-engraver.cc:103
@@ -1609,17 +1633,18 @@ msgstr "Opzioni: "
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "slur non terminato"
 
-#: slur-engraver.cc:165
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "non posso maneggiare %s"
 
 #: source-file.cc:74
@@ -1631,61 +1656,61 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr ""
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 #, fuzzy
 msgid "weird stem size, check for narrow beams"
 msgstr "dimensione del gambo poco ortodossa; check for narrow beams"
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:270
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: text-spanner-engraver.cc:60
+#: text-spanner-engraver.cc:61
 #, fuzzy
-msgid "can't find start of text spanner"
+msgid "cannot find start of text spanner"
 msgstr "non trovo le estremità di %s"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 #, fuzzy
 msgid "already have a text spanner"
 msgstr "crescendo non terminato"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 #, fuzzy
 msgid "unterminated text spanner"
 msgstr "extender non terminato"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr ""
 
@@ -1694,14 +1719,14 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
@@ -1711,43 +1736,39 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr "traduttore sconosciuto `%s'"
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, fuzzy, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "non trovo `%s'"
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "non trovo le estremità di %s"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "crescendo non terminato"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
@@ -1765,268 +1786,278 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "non trovo le estremità di %s"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "crescendo non terminato"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+msgid "giving up"
+msgstr ""
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 #, fuzzy
 msgid "have to be in Lyric mode for lyrics"
 msgstr "bisogna essere in Lyric mode per i testi"
 
-#: parser.yy:1612
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "non è una durata: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 #, fuzzy
 msgid "have to be in Note mode for notes"
 msgstr "bisogna essere in Note mode per le note"
 
-#: parser.yy:2004
+#: parser.yy:1987
 #, fuzzy
 msgid "have to be in Chord mode for chords"
 msgstr "bisogna essere in Chord mode per gli accordi"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, fuzzy, c-format
 msgid "Renaming input to: `%s'"
 msgstr "Genero le voci..."
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "ho trovato un EOF in un commento"
 
-#: lexer.ll:290
+#: lexer.ll:288
 msgid "\\maininput not allowed outside init files"
 msgstr ""
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "indentificatore non definito: `%s'"
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:561
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, fuzzy, c-format
 msgid "invalid character: `%c'"
 msgstr "carattere illegale: `%c'"
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "stringa di escape sconosciuta: `\\%s'"
 
-#: lexer.ll:882
-#, fuzzy, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "versione di mudela errata: %s (%s, %s)"
+#: lexer.ll:880 lexer.ll:881
+#, c-format
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:883
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:881 lexer.ll:882
+msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, fuzzy, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, fuzzy, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Genero le voci..."
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr ""
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Converting to `~a'..."
 msgstr "Genero le voci..."
 
-#: backend-library.scm:110
-#, fuzzy, lisp-format
+#: backend-library.scm:108
+#, fuzzy, scheme-format
 msgid "Converting to ~a..."
 msgstr "Genero le voci..."
 
-#: backend-library.scm:156
-#, fuzzy, lisp-format
+#: backend-library.scm:145
+#, fuzzy, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "scrivo il file delle dipendenze: `%s'..."
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "non è una durata: %d"
 
-#: define-music-types.scm:734
-#, fuzzy, lisp-format
+#: define-music-types.scm:751
+#, fuzzy, scheme-format
 msgid "symbol expected: ~S"
 msgstr "aspettavo %s"
 
-#: define-music-types.scm:737
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, fuzzy, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "non trovo `%s'"
 
-#: define-music-types.scm:757
-#, fuzzy, lisp-format
+#: define-music-types.scm:774
+#, fuzzy, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "tipo di chiave sconosciuto"
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
+#, fuzzy, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "non riesco a trovare il carattere `%s'"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "tipo di chiave sconosciuto"
 
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "Elaboro..."
 
 #: documentation-lib.scm:150
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Writing ~S..."
 msgstr "Genero le voci..."
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, fuzzy, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "non riesco a trovare il carattere `%s'"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "Genero le voci..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:379
-#, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2035,56 +2066,56 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, lisp-format
+#, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr ""
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 #, fuzzy
 msgid "Calculating page breaks..."
 msgstr "Calcolo delle posizioni della colonne..."
 
-#: lily-library.scm:510
-#, fuzzy, lisp-format
+#: lily-library.scm:593
+#, fuzzy, scheme-format
 msgid "unknown unit: ~S"
 msgstr "traduttore sconosciuto `%s'"
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "non trovo"
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "L'output stampato è inviato a %s..."
 
@@ -2092,48 +2123,48 @@ msgstr "L'output stampato 
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
-msgid "More alternatives than repeats. Junking excess alternatives"
+#: music-functions.scm:213
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, fuzzy, lisp-format
+#: music-functions.scm:538
+#, fuzzy, scheme-format
 msgid "music expected: ~S"
 msgstr "aspettavo %s"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "non trovo il file: `%s'"
 
-#: music-functions.scm:953
-#, fuzzy, lisp-format
+#: music-functions.scm:942
+#, fuzzy, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "stringa di escape sconosciuta: `\\%s'"
 
@@ -2142,18 +2173,18 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
+#, fuzzy, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "non trovo le estremità di %s"
 
 #: paper.scm:69
@@ -2161,24 +2192,24 @@ msgstr "non trovo le estremit
 msgid "Not in toplevel scope"
 msgstr "non c'è un traduttore di livello massimo"
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, fuzzy, lisp-format
+#: paper.scm:129
+#, fuzzy, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr "variabile paper sconosciuta: `%s'"
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "tipo di chiave sconosciuto"
 
@@ -2186,27 +2217,55 @@ msgstr "tipo di chiave sconosciuto"
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, lisp-format
+#: ps-to-png.scm:88
+#, scheme-format
 msgid "~a exited with status: ~S"
 msgstr ""
 
 #: to-xml.scm:190
-msgid "assertion failed"
+#, scheme-format
+msgid "assertion failed: ~S"
 msgstr ""
 
+#~ msgid "silly pitch"
+#~ msgstr "indicazione altezza priva di senso"
+
 #, fuzzy
-#~ msgid "junking event: `%s'"
-#~ msgstr "Cosa? Non è una richiesta: `%s'"
+#~ msgid "show warranty"
+#~ msgstr "  -w, --warranty         mostra la garanzia e il copyright\n"
 
 #, fuzzy
-#~ msgid "can't find `%s' context"
-#~ msgstr "non trovo `%s'"
+#~ msgid "loading default font"
+#~ msgstr "non trovo il file: `%s'"
+
+#, fuzzy
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "non trovo il file: `%s'"
 
 #, fuzzy
-#~ msgid "can't find line breaking that satisfies constraints"
+#~ msgid "couldnnot find line breaking that satisfies constraints"
 #~ msgstr "la soluzione non soddisfa i vincoli"
 
+#, fuzzy
+#~ msgid "crescendo too small"
+#~ msgstr "troppo piccolo"
+
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "non posso aprire il file: `%s'"
+
+#, fuzzy
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "versione di mudela errata: %s (%s, %s)"
+
+#, fuzzy
+#~ msgid "junking event: `%s'"
+#~ msgstr "Cosa? Non è una richiesta: `%s'"
+
+#, fuzzy
+#~ msgid "cannot find `%s' context"
+#~ msgstr "non trovo `%s'"
+
 #~ msgid "Creator: "
 #~ msgstr "Autore: "
 
@@ -2219,7 +2278,7 @@ msgstr ""
 #~ msgstr "Cosa? Non è una richiesta: `%s'"
 
 #, fuzzy
-#~ msgid "can't find ascii character: %d"
+#~ msgid "cannot find ascii character: %d"
 #~ msgstr "non riesco a trovare il carattere `%s'"
 
 #, fuzzy
@@ -2227,13 +2286,9 @@ msgstr ""
 #~ msgstr "extender non terminato"
 
 #, fuzzy
-#~ msgid "can't find signature for music function"
+#~ msgid "cannot find signature for music function"
 #~ msgstr "Non trovo il contesto dello Score"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "Uso: %s [OPZIONE]... [FILE]"
-
 #, fuzzy
 #~ msgid "Opening pipe `%s'"
 #~ msgstr "Genero le voci..."
@@ -2263,7 +2318,7 @@ msgstr ""
 #~ msgstr "Genero le voci..."
 
 #, fuzzy
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "non posso aprire il file: `%s'"
 
 #, fuzzy
@@ -2283,7 +2338,7 @@ msgstr ""
 #~ msgstr "non trovo e non posso creare `%s'"
 
 #, fuzzy
-#~ msgid "can't handle a percent repeat of length: %s"
+#~ msgid "cannot handle a percent repeat of length: %s"
 #~ msgstr "non so manipolare tasti vuoti"
 
 #, fuzzy
@@ -2327,7 +2382,7 @@ msgstr ""
 #~ msgstr "Errore non fatale: "
 
 #, fuzzy
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "non trovo il file: `%s'"
 
 #, fuzzy
@@ -2367,11 +2422,11 @@ msgstr ""
 #~ msgstr "apice finale mancante"
 
 #, fuzzy
-#~ msgid "kpathsea can't find %s file: `%s'"
+#~ msgid "kpathsea cannot find %s file: `%s'"
 #~ msgstr "Non trovo il file `%s'"
 
 #, fuzzy
-#~ msgid "kpathsea can't find file: `%s'"
+#~ msgid "kpathsea cannot find file: `%s'"
 #~ msgstr "Non trovo il file `%s'"
 
 #, fuzzy
@@ -2435,7 +2490,7 @@ msgstr ""
 #~ msgstr "L'output MIDI è inviato a %s..."
 
 #, fuzzy
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "non trovo il file: `%s'"
 
 #, fuzzy
@@ -2493,7 +2548,7 @@ msgstr ""
 #~ msgstr "della definizione musicale: %s"
 
 #, fuzzy
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr "non trovo le estremità di %s"
 
 #, fuzzy
@@ -2505,7 +2560,7 @@ msgstr ""
 #~ msgstr "Spanner non legato `%s'"
 
 #, fuzzy
-#~ msgid "can't find start of slur"
+#~ msgid "cannot find start of slur"
 #~ msgstr "non trovo le estremità di %s"
 
 #, fuzzy
@@ -2542,7 +2597,7 @@ msgstr ""
 #~ msgid "Slur over rest?"
 #~ msgstr "Metto uno slur sulla pausa."
 
-#~ msgid "can't map file"
+#~ msgid "cannot map file"
 #~ msgstr "non posso mappare il documento"
 
 #, fuzzy
@@ -2604,7 +2659,7 @@ msgstr ""
 #~ msgstr "  -D, --debug            abilita l'output di debugging\n"
 
 #, fuzzy
-#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgid "do not output tuplets, double dots or rests, smallest is 32"
 #~ msgstr ""
 #~ "  -n, --no-silly         assume che non ci siano gruppetti o doppi punti, "
 #~ "la figura più piccola è 32\n"
@@ -2618,7 +2673,7 @@ msgstr ""
 #~ msgstr "indicazione durata priva di senso"
 
 #, fuzzy
-#~ msgid "don't timestamp the output"
+#~ msgid "do not timestamp the output"
 #~ msgstr ""
 #~ "  -T, --no-timestamps    non inserisce marcatori temporali nell'output\n"
 
@@ -2653,7 +2708,7 @@ msgstr ""
 #~ msgstr "Numero di tracce non valido"
 
 #, fuzzy
-#~ msgid "can't handle non-metrical time"
+#~ msgid "cannot handle non-metrical time"
 #~ msgstr "tempo non metrico"
 
 #~ msgid "invalid running status"
@@ -2691,7 +2746,7 @@ msgstr ""
 #~ msgstr "Eccezione di virgola mobile"
 
 #, fuzzy
-#~ msgid "can't set mem-checking!"
+#~ msgid "cannot set mem-checking!"
 #~ msgstr "non posso settare mem-checking"
 
 #, fuzzy
@@ -2730,7 +2785,7 @@ msgstr ""
 #~ msgid "Huh?  Not a Request: `%s'"
 #~ msgstr "Cosa? Non è una richiesta: `%s'"
 
-#~ msgid "can't find both ends of %s"
+#~ msgid "cannot find both ends of %s"
 #~ msgstr "non trovo le estremità di %s"
 
 #, fuzzy
@@ -2791,7 +2846,7 @@ msgstr ""
 #~ msgid "redeclaration of `\\%s'"
 #~ msgstr "doppia dichiarazione di `\\%s'"
 
-#~ msgid "Can't solve this casting problem exactly; revert to Word_wrap"
+#~ msgid "Cannot solve this casting problem exactly; revert to Word_wrap"
 #~ msgstr ""
 #~ "Non posso risolvere esattamente questo problema di conversione; ritorno "
 #~ "al Word_wrap"
@@ -2817,17 +2872,17 @@ msgstr ""
 #~ msgid "ugh, this measure is too long"
 #~ msgstr "ops, questa misura è troppo lunga"
 
-#~ msgid "I don't fit; put me on Montignac"
+#~ msgid "I do not fit; put me on Montignac"
 #~ msgstr "Non ci sto; mettimi su Montignac"
 
 #~ msgid "More than one music block"
 #~ msgstr "Più di un blocco di musica"
 
-#~ msgid "can't abbreviate"
+#~ msgid "cannot abbreviate"
 #~ msgstr "non posso abbreviare"
 
 #, fuzzy
-#~ msgid "can't abbreviate tuplet"
+#~ msgid "cannot abbreviate tuplet"
 #~ msgstr "non posso abbreviare"
 
 #~ msgid "Invalid midi format"
@@ -2837,7 +2892,7 @@ msgstr ""
 #~ msgstr "Interpreto...\n"
 
 #, fuzzy
-#~ msgid "don't timestamp the output "
+#~ msgid "do not timestamp the output "
 #~ msgstr ""
 #~ "  -T, --no-timestamps    non inserisce marcatori temporali nell'output\n"
 
@@ -2889,7 +2944,7 @@ msgstr ""
 #~ msgid "please fix me"
 #~ msgstr "correggimi, per favore"
 
-#~ msgid "stem at %s doesn't fit in beam"
+#~ msgid "stem at %s doesnnot fit in beam"
 #~ msgstr "il gambo a $s non rientra nel beam"
 
 #~ msgid "No stem direction set. Ignoring column in clash."
diff --git a/po/ja.po b/po/ja.po
index 330dc6aef4..7822ee346d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.2.17\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
-"PO-Revision-Date: 2000-03-29 20:50+0900\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
+"PO-Revision-Date: 2006-12-23 16:15+0100\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -71,147 +71,155 @@ msgid "Running %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "·Ù¹ð: "
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
 #, fuzzy
-msgid "set output filename to FILE"
+msgid "write output to FILE"
 msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø."
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
+msgstr ""
+
+#: convert-ly.py:43 lilypond-book.py:73
+msgid "Examples:"
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, fuzzy, c-format, python-format
 msgid "warning: %s"
 msgstr "·Ù¹ð: "
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, fuzzy, c-format, python-format
 msgid "error: %s"
 msgstr "¥¨¥é¡¼: "
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
-msgstr "½ªÎ»¤·¤Þ¤¹"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
+msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "½èÍýÃæ..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, fuzzy, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-#, fuzzy
-msgid "write output to FILE"
-msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "FILE"
 
-#: etf2ly.py:1204 midi2ly.py:899
-#, fuzzy
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:78
+msgid "BOOK"
+msgstr ""
+
+#: lilypond-book.py:87
 #, fuzzy, python-format
 msgid "Exiting (%d)..."
 msgstr "¹Ô ..."
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s by"
@@ -227,7 +235,8 @@ msgstr ""
 
 #: lilypond-book.py:135
 #, fuzzy
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦"
 
 #: lilypond-book.py:138
@@ -235,6 +244,10 @@ msgstr "
 msgid "add DIR to include path"
 msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "DIR"
+
 #: lilypond-book.py:143
 #, fuzzy
 msgid "write output to DIR"
@@ -248,149 +261,149 @@ msgstr ""
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 #, fuzzy
 msgid "be verbose"
 msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, fuzzy, python-format
 msgid "Opening filter `%s'"
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr ""
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 #, fuzzy
 msgid "Writing snippets..."
 msgstr "¹Ô ..."
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 #, fuzzy
 msgid "Processing..."
 msgstr "½èÍýÃæ..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, python-format
 msgid "%s is up to date."
 msgstr ""
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, fuzzy, python-format
 msgid "Writing `%s'..."
 msgstr "¹Ô ..."
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, fuzzy, python-format
 msgid "Reading %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 #, fuzzy
 msgid "Dissecting..."
 msgstr "¹Ô ..."
 
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, fuzzy, python-format
 msgid "Compiling %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, fuzzy, python-format
 msgid "Processing include: %s"
 msgstr "½èÍýÃæ..."
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, fuzzy, python-format
 msgid "Removing `%s'"
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, fuzzy, python-format
 msgid "Writing fonts to %s..."
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "¥¨¥é¡¼: "
 
@@ -404,8 +417,9 @@ msgstr "
 msgid "%s output to `%s'..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, python-format
+msgid "Convert %s to LilyPond input."
 msgstr ""
 
 #: midi2ly.py:875
@@ -451,34 +465,64 @@ msgid "treat every text as a lyric"
 msgstr ""
 
 #: midi2ly.py:905
-msgid "example"
+msgid "Examples"
 msgstr ""
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr ""
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"This is free software.  It is covered by the GNU General Public License,\n"
+"and you are welcome to change it and/or distribute copies of it under\n"
+"certain conditions.  Invoke as `%s --warranty' for more information.\n"
+"\n"
+"-- »²¹ÍÌõ\n"
+"¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤Ë´ð¤Å¤­¡¢Æ±°ì¾ò·ï¤Ç\n"
+"¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n"
+"`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
+
+#: getopt-long.cc:140
 #, fuzzy, c-format
 msgid "option `%s' requires an argument"
 msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹"
 
-#: getopt-long.cc:145
+#: getopt-long.cc:144
 #, fuzzy, c-format
-msgid "option `%s' doesn't allow an argument"
+msgid "option `%s' does not allow an argument"
 msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òµö²Ä¤·¤Þ¤»¤ó"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó: `%s'"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "¥ª¥×¥·¥ç¥ó `%2$s' ¤ËÂФ¹¤ë̵¸ú¤Ê°ú¿ô `%1$s'"
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, fuzzy, c-format
 msgid "programming error: %s"
 msgstr "¥×¥í¥°¥é¥à¾å¤Î¥¨¥é¡¼: "
@@ -487,86 +531,75 @@ msgstr "
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, fuzzy, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr "¥·¥ã¡¼¥×¤¬Â¿¤¹¤®¤Þ¤¹ (%s)"
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, fuzzy, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: all-font-metrics.cc:165
-#, fuzzy
-msgid "loading default font"
-msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹"
-
-#: all-font-metrics.cc:172
-#, fuzzy, c-format
-msgid "can't find default font: `%s'"
-msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(¸¡º÷¥Ñ¥¹: `%s')"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-#, fuzzy
-msgid "giving up"
-msgstr "Äü¤á¤Þ¤·¤¿"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -582,22 +615,22 @@ msgstr "
 msgid "unterminated beam"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 #, fuzzy
 msgid "stem must have Rhythmic structure"
 msgstr "ÉäÈø¤Ï¥ê¥º¥à¹½Â¤¤ò»ý¤¿¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: beam-engraver.cc:245
+#: beam-engraver.cc:246
 #, fuzzy
-msgid "stem doesn't fit in beam"
+msgid "stem does not fit in beam"
 msgstr "ÉäÈø¤¬³Ã¤ÎÃæ¤Ë¤ª¤µ¤Þ¤ê¤Þ¤»¤ó"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 #, fuzzy
 msgid "beam was started here"
 msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿"
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 msgid "no feasible beam position"
 msgstr ""
 
@@ -606,24 +639,24 @@ msgstr ""
 msgid "removing beam with no stems"
 msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, fuzzy, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'"
 
 #: change-iterator.cc:23
 #, fuzzy, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #. We could change the current translator's id, but that would make
@@ -656,7 +689,7 @@ msgstr "
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
@@ -670,7 +703,7 @@ msgstr "
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
@@ -678,26 +711,26 @@ msgstr ""
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
 #, fuzzy
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "¤½¤Î²ò·è¤ÏÀ©¸Â¤òËþ¤¿¤·¤Þ¤»¤ó"
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, fuzzy, c-format
 msgid "program has no such type: `%s'"
 msgstr "¥×¥í¥°¥é¥à¤Ë¤Ï¤½¤ÎÍͤʥ¿¥¤¥×¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
 #: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "`%2$s' ¤Ë¸Æ¤Ð¤ì¤¿ `%1$s' ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó"
 
 #: context.cc:276
@@ -707,7 +740,7 @@ msgstr ""
 
 #: context.cc:388
 #, fuzzy, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
 #: custos.cc:77
@@ -715,18 +748,23 @@ msgstr "
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, fuzzy, c-format
 msgid "Unknown event class %s"
 msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
 
+#: dots.cc:38
+#, c-format
+msgid "dot `%s' not found"
+msgstr ""
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
 #, fuzzy
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #: dynamic-engraver.cc:195
@@ -749,11 +787,7 @@ msgstr "
 msgid "unterminated (de)crescendo"
 msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À"
 
@@ -776,15 +810,15 @@ msgstr "
 msgid "adding font directory: %s"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
@@ -817,47 +851,38 @@ msgstr ""
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, fuzzy, c-format
 msgid "Unknown interface `%s'"
 msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr ""
 
-#: hairpin.cc:180
+#: horizontal-bracket-engraver.cc:59
 #, fuzzy
-msgid "crescendo too small"
-msgstr "¥¯¥ì¥Ã¥·¥§¥ó¥É"
-
-#: horizontal-bracket-engraver.cc:58
-#, fuzzy
-msgid "don't have that many brackets"
+msgid "do not have that many brackets"
 msgstr "¤½¤ó¤Ê¤ËÂô»³¤Î¥ª¥¯¥¿¡¼¥Ö (%s) ¤ò»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤"
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 #, fuzzy
 msgid "conflicting note group events"
 msgstr "Çï»Ò¤ÎÍ׵᤬¶¥¹ç¤·¤Þ¤¹"
@@ -876,93 +901,98 @@ msgstr "
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, fuzzy, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(¸¡º÷¥Ñ¥¹: `%s')"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "°ÌÃÖ¤¬È½¤ê¤Þ¤»¤ó"
 
-#: ligature-engraver.cc:95
+#: ligature-engraver.cc:93
 #, fuzzy
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr ""
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 #, fuzzy
 msgid "already have a ligature"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr ""
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 #, fuzzy
 msgid "unterminated ligature"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 #, fuzzy
 msgid "ligature was started here"
 msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(Æɹþ¥Ñ¥¹: `%s')"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "¼±ÊÌ»Ò̾¤Ï¥­¡¼¥ï¡¼¥É¤Ç¤¹: `%s'"
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "EOF ¤Î¤È¤³¤í¤Ç¥¨¥é¡¼: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, fuzzy, c-format
 msgid "deprecated function called: %s"
 msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:88
 #, fuzzy, c-format
-msgid "Changing working directory to `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, fuzzy, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
 #: lily-parser-scheme.cc:125
@@ -970,21 +1000,21 @@ msgstr "
 msgid "Processing `%s'"
 msgstr "½èÍýÃæ..."
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "¹½Ê¸²òÀÏÃæ..."
 
-#: lily-parser.cc:126
+#: lily-parser.cc:127
 #, fuzzy
-msgid "braces don't match"
+msgid "braces do not match"
 msgstr "¥Ö¥ì¡¼¥¹¤¬°ìÃפ·¤Þ¤»¤ó"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, fuzzy, c-format
 msgid "cannot find Voice `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: main.cc:117
+#: main.cc:116
 #, fuzzy, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -1001,7 +1031,7 @@ msgstr ""
 "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n"
 "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n"
 
-#: main.cc:123
+#: main.cc:122
 #, fuzzy
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
@@ -1013,7 +1043,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1049,132 +1079,132 @@ msgstr ""
 "¤Ç¤¹(COPYING ¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢Free Software Foundation,\n"
 "Inc., 675 Mass Ave, Cambridge, MA 02139, USA ¤Ë¼ê»æ¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
-msgid "SYM=VAL"
+#: main.cc:155
+msgid "SYM[=VAL]"
 msgstr ""
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 #, fuzzy
 msgid "evaluate scheme code"
 msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó"
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 #, fuzzy
 msgid "generate DVI (tex backend only)"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 #, fuzzy
 msgid "generate PDF (default)"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: main.cc:167
+#: main.cc:165
 #, fuzzy
 msgid "generate PNG"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: main.cc:168
+#: main.cc:166
 #, fuzzy
 msgid "generate PostScript"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:170
-msgid "print this help"
-msgstr "¤³¤Î¥Ø¥ë¥×"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 #, fuzzy
 msgid "FIELD"
 msgstr "FILE"
 
-#: main.cc:171
-msgid "dump a header field to file BASENAME.FIELD"
+#: main.cc:169
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:172
-msgid "DIR"
-msgstr "DIR"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: main.cc:179
+#: main.cc:178
 #, fuzzy
 msgid "write output to FILE (suffix will be added)"
 msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
 
-#: main.cc:180
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr ""
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨"
 
-#: main.cc:223
+#: main.cc:224
 #, fuzzy, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1182,79 +1212,79 @@ msgid ""
 msgstr "Copyright (c) %s by"
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..."
 
-#: main.cc:252
+#: main.cc:253
 #, fuzzy, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë."
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "¥ª¥×¥·¥ç¥ó:"
 
-#: main.cc:262
+#: main.cc:263
 #, fuzzy, c-format
 msgid "Report bugs via %s"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø."
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:322
+#: main.cc:323
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: main.cc:341
+#: main.cc:342
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: main.cc:349
+#: main.cc:350
 #, fuzzy, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: main.cc:356
+#: main.cc:357
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: main.cc:362
+#: main.cc:363
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: main.cc:368
+#: main.cc:369
 #, fuzzy, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
 #: main.cc:415
@@ -1262,7 +1292,7 @@ msgstr "
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1276,37 +1306,37 @@ msgstr ""
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1314,7 +1344,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr ""
 
@@ -1331,116 +1361,119 @@ msgstr ""
 msgid "no such MIDI instrument: `%s'"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á"
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
 #: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:208
+#: music.cc:207
 #, fuzzy, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿"
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£"
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr ""
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
 #: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 #, fuzzy
 msgid "Drawing systems..."
 msgstr "²»À¼¤òºîÀ®Ãæ..."
 
-#: pango-font.cc:215
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1478,15 +1511,15 @@ msgstr "
 msgid "Track..."
 msgstr "¥È¥é¥Ã¥¯ ..."
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
@@ -1496,23 +1529,23 @@ msgstr "%s 
 msgid "unterminated phrasing slur"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, fuzzy, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, fuzzy, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, fuzzy, c-format
 msgid "no such internal option: %s"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
@@ -1522,109 +1555,108 @@ msgstr "
 msgid "not a grob name, `%s'"
 msgstr ""
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
-#, fuzzy, c-format
-msgid "Relocation file %s\n"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
-
-#: relocate.cc:358
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "can't open file %s"
+msgid "Relocation file: %s"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "µÙÉä¤Î¾×Æͤ¬Â¿¤¹¤®¤Þ¤¹"
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr ""
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr ""
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(¸¡º÷¥Ñ¥¹: `%s')"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr "½ªÎ»¤·¤Þ¤¹"
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "³ÚÉè¤Ë¤Ï³Ú¶Ê¤¬É¬ÍפǤ¹"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 #, fuzzy
 msgid "errors found, ignoring music expression"
 msgstr "¥¨¥é¡¼¤òȯ¸«/*, ³ÚÉè¤ò½èÍý¤·¤Þ¤»¤ó*/"
@@ -1632,7 +1664,7 @@ msgstr "
 #. FIXME:
 #: script-engraver.cc:102
 #, fuzzy
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr "²»Àá `%s' ¤Î²ò¼áÊýË¡¤¬È½¤ê¤Þ¤»¤ó"
 
 #: script-engraver.cc:103
@@ -1645,17 +1677,18 @@ msgstr "
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
 
-#: slur-engraver.cc:165
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
 #: source-file.cc:74
@@ -1667,61 +1700,61 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, fuzzy, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 #, fuzzy
 msgid "weird stem size, check for narrow beams"
 msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤"
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:270
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: text-spanner-engraver.cc:60
+#: text-spanner-engraver.cc:61
 #, fuzzy
-msgid "can't find start of text spanner"
+msgid "cannot find start of text spanner"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 #, fuzzy
 msgid "already have a text spanner"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 #, fuzzy
 msgid "unterminated text spanner"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "°ì¤Ä¤À¤±¤Î¥¿¥¤"
 
@@ -1730,14 +1763,14 @@ msgstr "
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
@@ -1747,43 +1780,39 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'"
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, fuzzy, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
@@ -1801,269 +1830,280 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+#, fuzzy
+msgid "giving up"
+msgstr "Äü¤á¤Þ¤·¤¿"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 #, fuzzy
 msgid "have to be in Lyric mode for lyrics"
 msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: parser.yy:1612
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 #, fuzzy
 msgid "have to be in Note mode for notes"
 msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: parser.yy:2004
+#: parser.yy:1987
 #, fuzzy
 msgid "have to be in Chord mode for chords"
 msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, fuzzy, c-format
 msgid "Renaming input to: `%s'"
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: lexer.ll:290
+#: lexer.ll:288
 #, fuzzy
 msgid "\\maininput not allowed outside init files"
 msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó"
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "̤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'"
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:561
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "̵¸ú¤Êʸ»ú: `%c'"
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'"
 
-#: lexer.ll:882
-#, fuzzy, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)"
+#: lexer.ll:880 lexer.ll:881
+#, c-format
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
+
+#: lexer.ll:881 lexer.ll:882
+msgid "consider updating the input with the convert-ly script"
+msgstr ""
 
-#: lexer.ll:883
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
 msgstr ""
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, fuzzy, lisp-format
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, fuzzy, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr ""
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Converting to `~a'..."
 msgstr "¹Ô ..."
 
-#: backend-library.scm:110
-#, fuzzy, lisp-format
+#: backend-library.scm:108
+#, fuzzy, scheme-format
 msgid "Converting to ~a..."
 msgstr "¹Ô ..."
 
-#: backend-library.scm:156
-#, fuzzy, lisp-format
+#: backend-library.scm:145
+#, fuzzy, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..."
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:737
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, fuzzy, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: define-music-types.scm:757
-#, fuzzy, lisp-format
+#: define-music-types.scm:774
+#, fuzzy, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
+#, fuzzy, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
 
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "½èÍýÃæ..."
 
 #: documentation-lib.scm:150
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Writing ~S..."
 msgstr "¹Ô ..."
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, fuzzy, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "¹Ô ..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:379
-#, fuzzy, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "²»Àá `%s' ¤Î²ò¼áÊýË¡¤¬È½¤ê¤Þ¤»¤ó"
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2072,56 +2112,56 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "´û¤Ë´Þ¤ó¤Ç¤¤¤Þ¤¹: `%s'"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 #, fuzzy
 msgid "Calculating page breaks..."
 msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..."
 
-#: lily-library.scm:510
-#, fuzzy, lisp-format
+#: lily-library.scm:593
+#, fuzzy, scheme-format
 msgid "unknown unit: ~S"
 msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'"
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "%s ¤Ø paper ½ÐÎÏ..."
 
@@ -2129,49 +2169,49 @@ msgstr "%s 
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
+#: music-functions.scm:213
 #, fuzzy
-msgid "More alternatives than repeats. Junking excess alternatives"
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£"
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, fuzzy, lisp-format
+#: music-functions.scm:538
+#, fuzzy, scheme-format
 msgid "music expected: ~S"
 msgstr "¶õÇò¤¬É¬ÍפǤ¹"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: music-functions.scm:953
-#, fuzzy, lisp-format
+#: music-functions.scm:942
+#, fuzzy, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'"
 
@@ -2180,18 +2220,18 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
+#, fuzzy, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #: paper.scm:69
@@ -2199,24 +2239,24 @@ msgstr "
 msgid "Not in toplevel scope"
 msgstr "ºÇ¾å°Ì¤Î¥È¥é¥ó¥¹¥ì¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, fuzzy, lisp-format
+#: paper.scm:129
+#, fuzzy, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr "paper ÊÑ¿ô¤ÎÃͤ¬È½¤ê¤Þ¤»¤ó: `%s'"
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
 
@@ -2224,15 +2264,50 @@ msgstr "
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, lisp-format
+#: ps-to-png.scm:88
+#, scheme-format
 msgid "~a exited with status: ~S"
 msgstr ""
 
 #: to-xml.scm:190
-msgid "assertion failed"
+#, scheme-format
+msgid "assertion failed: ~S"
 msgstr ""
 
+#, fuzzy
+#~ msgid "show warranty"
+#~ msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë"
+
+#, fuzzy
+#~ msgid "loading default font"
+#~ msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹"
+
+#, fuzzy
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
+
+#, fuzzy
+#~ msgid "couldnnot find line breaking that satisfies constraints"
+#~ msgstr "¤½¤Î²ò·è¤ÏÀ©¸Â¤òËþ¤¿¤·¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "crescendo too small"
+#~ msgstr "¥¯¥ì¥Ã¥·¥§¥ó¥É"
+
+#~ msgid "print this help"
+#~ msgstr "¤³¤Î¥Ø¥ë¥×"
+
+#~ msgid "silly pitch"
+#~ msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á"
+
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
+
+#, fuzzy
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)"
+
 #, fuzzy
 #~ msgid "no one to print a tremolos"
 #~ msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -2245,13 +2320,9 @@ msgstr ""
 #~ msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
 
 #, fuzzy
-#~ msgid "can't find `%s' context"
+#~ msgid "cannot find `%s' context"
 #~ msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#, fuzzy
-#~ msgid "can't find line breaking that satisfies constraints"
-#~ msgstr "¤½¤Î²ò·è¤ÏÀ©¸Â¤òËþ¤¿¤·¤Þ¤»¤ó"
-
 #, fuzzy
 #~ msgid "no one to print a percent"
 #~ msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -2276,7 +2347,7 @@ msgstr ""
 #~ msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó"
 
 #, fuzzy
-#~ msgid "can't find ascii character: %d"
+#~ msgid "cannot find ascii character: %d"
 #~ msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'"
 
 #~ msgid "no one to print a tuplet start bracket"
@@ -2291,13 +2362,9 @@ msgstr ""
 #~ msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£"
 
 #, fuzzy
-#~ msgid "can't find signature for music function"
+#~ msgid "cannot find signature for music function"
 #~ msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
-
 #, fuzzy
 #~ msgid "Opening pipe `%s'"
 #~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
@@ -2331,7 +2398,7 @@ msgstr ""
 #~ msgstr "¹Ô ..."
 
 #, fuzzy
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
 #, fuzzy
@@ -2355,7 +2422,7 @@ msgstr ""
 #~ msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
 #, fuzzy
-#~ msgid "can't handle a percent repeat of length: %s"
+#~ msgid "cannot handle a percent repeat of length: %s"
 #~ msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó"
 
 #, fuzzy
@@ -2403,7 +2470,7 @@ msgstr ""
 #~ msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
 
 #, fuzzy
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
 #, fuzzy
@@ -2435,7 +2502,7 @@ msgstr ""
 #~ msgid "Programming error: "
 #~ msgstr "¥×¥í¥°¥é¥à¾å¤Î¥¨¥é¡¼: "
 
-#~ msgid "Can't switch translators, I'm there already"
+#~ msgid "Cannot switch translators, I'm there already"
 #~ msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 
 #, fuzzy
@@ -2462,11 +2529,11 @@ msgstr ""
 #~ msgstr "FIXME: ¥­¡¼Êѹ¹¤Î¥Þ¡¼¥¸"
 
 #, fuzzy
-#~ msgid "kpathsea can't find %s file: `%s'"
+#~ msgid "kpathsea cannot find %s file: `%s'"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
 #, fuzzy
-#~ msgid "kpathsea can't find file: `%s'"
+#~ msgid "kpathsea cannot find file: `%s'"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
 #, fuzzy
@@ -2493,10 +2560,6 @@ msgstr ""
 #~ msgid "kpathsea can not find TFM file: `%s'"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#, fuzzy
-#~ msgid "Cannot switch translators, I'm there already"
-#~ msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
-
 #, fuzzy
 #~ msgid "Converting to `~a.ps'..."
 #~ msgstr "¹Ô ..."
@@ -2537,7 +2600,7 @@ msgstr ""
 #~ msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
 #, fuzzy
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
 #, fuzzy
@@ -2624,7 +2687,7 @@ msgstr ""
 #~ msgstr "²»³ÚŪÄêµÁ¤è¤ê: %s"
 
 #, fuzzy
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, fuzzy
@@ -2679,11 +2742,11 @@ msgstr ""
 #~ msgid "Slur over rest?"
 #~ msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?"
 
-#~ msgid "Can't specify direction for this request"
+#~ msgid "Cannot specify direction for this request"
 #~ msgstr "¤³¤ÎÍ×µá¤ËÂФ¹¤ëÊý¸þ¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
 #, fuzzy
-#~ msgid "can't map file"
+#~ msgid "cannot map file"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó"
 
 #~ msgid "This binary was compiled with the following options:"
@@ -2755,7 +2818,7 @@ msgstr ""
 #~ msgstr "¥Ç¥Ð¥Ã¥°½ÐÎϤòÍ­¸ú"
 
 #, fuzzy
-#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgid "do not output tuplets, double dots or rests, smallest is 32"
 #~ msgstr "ÉäÅÀ¤äÊ£ÉäÅÀ¤ò¤Ê¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹¡¢ºÇ¾®¤Ï 32"
 
 #~ msgid "set FILE as default output"
@@ -2767,7 +2830,7 @@ msgstr ""
 #~ msgid "set smallest duration"
 #~ msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹"
 
-#~ msgid "don't timestamp the output"
+#~ msgid "do not timestamp the output"
 #~ msgstr "½ÐÎϤ˥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤"
 
 #~ msgid "assume no double dotted notes"
@@ -2796,7 +2859,7 @@ msgstr ""
 #~ msgstr "̵¸ú¤Ê¥È¥é¥Ã¥¯¿ô"
 
 #, fuzzy
-#~ msgid "can't handle non-metrical time"
+#~ msgid "cannot handle non-metrical time"
 #~ msgstr "±¤Î§¤Ë¤Ê¤é¤Ê¤¤Çï»Ò¤Ï°·¤¨¤Þ¤»¤ó"
 
 #~ msgid "Junking note-end event: channel = %d, pitch = %d"
@@ -2841,7 +2904,7 @@ msgstr ""
 #~ msgstr "ÉâÆ°¾®¿ôÅÀÎã³°"
 
 #, fuzzy
-#~ msgid "can't set mem-checking!"
+#~ msgid "cannot set mem-checking!"
 #~ msgstr "¥á¥â¥ê¥Á¥§¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
 
 #, fuzzy
@@ -2903,7 +2966,7 @@ msgstr ""
 #~ msgstr "¾®À᤬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£È¿Éü¤ò̵»ë¤·¤Þ¤¹¡£"
 
 #, fuzzy
-#~ msgid "can't find both ends of %s"
+#~ msgid "cannot find both ends of %s"
 #~ msgstr "%s ¤Îξü¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #~ msgid "slur"
@@ -2964,7 +3027,7 @@ msgstr ""
 #~ msgid "Ineq_constrained_qp::solve (): Constraint off by %f"
 #~ msgstr "Ineq_constrained_qp::solve (): À©¸Â¤ò %f ¤Ç²ò½ü"
 
-#~ msgid "Didn't converge!"
+#~ msgid "Didnnot converge!"
 #~ msgstr "¼ý«¤·¤Þ¤»¤ó¤Ç¤·¤¿!"
 
 #~ msgid "too much degeneracy"
@@ -2997,7 +3060,7 @@ msgstr ""
 #~ msgid "improbable offset for object type: `%s'"
 #~ msgstr "¥ª¥Ö¥¸¥§¥¯¥È·¿¤Ë¤È¤Ã¤Æ¤¢¤ê¤½¤¦¤Ë¤Ê¤¤¥ª¥Õ¥»¥Ã¥È: `%s'"
 
-#~ msgid "Can't solve this casting problem exactly; reverting to Word_wrap"
+#~ msgid "Cannot solve this casting problem exactly; reverting to Word_wrap"
 #~ msgstr "Àµ³Î¤Ë¥­¥ã¥¹¥È¤ò²ò·è¤Ç¤­¤Þ¤»¤ó -- Word_wrap ¤ËÉüµ¢¤·¤Þ¤¹"
 
 #~ msgid "%s elements"
@@ -3048,7 +3111,7 @@ msgstr ""
 #~ msgid "Generating stupido solution"
 #~ msgstr "Çϼ¯¤²¤¿²ò·è¤òÀ¸À®Ãæ"
 
-#~ msgid "I don't fit; put me on Montignac"
+#~ msgid "I do not fit; put me on Montignac"
 #~ msgstr "¾å¼ê¤¯¤Ï¤Þ¤ê¤Þ¤»¤ó -- Montignac ¤Î¤È¤³¤í¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤"
 
 #~ msgid "More than one music block"
@@ -3057,10 +3120,10 @@ msgstr ""
 #~ msgid "Need even number of args for shape array"
 #~ msgstr "shape ÇÛÎó¤Ø¤Î°ú¿ô¤Ï¶ö¿ô¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#~ msgid "Can't abbreviate"
+#~ msgid "Cannot abbreviate"
 #~ msgstr "¾Êά¤Ç¤­¤Þ¤»¤ó"
 
-#~ msgid "Can't abbreviate tuplet"
+#~ msgid "Cannot abbreviate tuplet"
 #~ msgstr "¥¿¥×¥ì¥Ã¥È¤ò¾Êά¤Ç¤­¤Þ¤»¤ó"
 
 #~ msgid "assume no tuplets"
diff --git a/po/lilypond.pot b/po/lilypond.pot
index cd4383b741..8caa983b72 100644
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-20 23:29+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\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"
@@ -74,144 +74,152 @@ msgstr ""
 
 #: lilylib.py:203
 #, python-format
-msgid "Usage: %s\n"
+msgid "Usage: %s"
+msgstr ""
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, python-format
+msgid "%s [OPTION]... FILE"
 msgstr ""
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr ""
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+msgid "Report bugs via"
+msgstr ""
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+msgid "Examples:"
+msgstr ""
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, c-format, python-format
 msgid "warning: %s"
 msgstr ""
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, c-format, python-format
 msgid "error: %s"
 msgstr ""
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, python-format
 msgid "Processing `%s'... "
 msgstr ""
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr ""
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
+msgstr ""
+
+#: etf2ly.py:1196
+#, python-format
+msgid "%s [OPTION]... ETF-FILE"
 msgstr ""
 
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
-msgstr ""
-
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr ""
 
-#: etf2ly.py:1204 midi2ly.py:899
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr ""
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook "
-"document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr ""
+
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, python-format
 msgid "Exiting (%d)..."
 msgstr ""
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr ""
@@ -233,6 +241,10 @@ msgstr ""
 msgid "add DIR to include path"
 msgstr ""
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr ""
+
 #: lilypond-book.py:143
 msgid "write output to DIR"
 msgstr ""
@@ -245,145 +257,145 @@ msgstr ""
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
-msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
-msgid "be verbose"
+#: lilypond-book.py:157
+msgid ""
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
+msgid "be verbose"
 msgstr ""
 
-#: lilypond-book.py:778
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:1009
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:1012
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:1016
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:1019
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:1038
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1391
+#: lilypond-book.py:1388
 #, python-format
 msgid "Opening filter `%s'"
 msgstr ""
 
-#: lilypond-book.py:1408
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilypond-book.py:1409
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr ""
 
-#: lilypond-book.py:1479
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1589
+#: lilypond-book.py:1586
 msgid "Writing snippets..."
 msgstr ""
 
-#: lilypond-book.py:1594
+#: lilypond-book.py:1591
 msgid "Processing..."
 msgstr ""
 
-#: lilypond-book.py:1598
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1605
 #, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr ""
 
-#: lilypond-book.py:1619
+#: lilypond-book.py:1616
 #, python-format
 msgid "%s is up to date."
 msgstr ""
 
-#: lilypond-book.py:1625
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr ""
 
-#: lilypond-book.py:1680
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1684
+#: lilypond-book.py:1681
 #, python-format
 msgid "Reading %s..."
 msgstr ""
 
-#: lilypond-book.py:1703
+#: lilypond-book.py:1700
 msgid "Dissecting..."
 msgstr ""
 
-#: lilypond-book.py:1719
+#: lilypond-book.py:1716
 #, python-format
 msgid "Compiling %s..."
 msgstr ""
 
-#: lilypond-book.py:1728
+#: lilypond-book.py:1725
 #, python-format
 msgid "Processing include: %s"
 msgstr ""
 
-#: lilypond-book.py:1742
+#: lilypond-book.py:1739
 #, python-format
 msgid "Removing `%s'"
 msgstr ""
 
-#: lilypond-book.py:1819
+#: lilypond-book.py:1815
 #, python-format
 msgid "Writing fonts to %s..."
 msgstr ""
 
-#: lilypond-book.py:1834
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1835
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1838
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:557 lily-library.scm:565
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr ""
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr ""
 
@@ -396,8 +408,9 @@ msgstr ""
 msgid "%s output to `%s'..."
 msgstr ""
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, python-format
+msgid "Convert %s to LilyPond input."
 msgstr ""
 
 #: midi2ly.py:875
@@ -441,34 +454,55 @@ msgid "treat every text as a lyric"
 msgstr ""
 
 #: midi2ly.py:905
-msgid "example"
+msgid "Examples"
 msgstr ""
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr ""
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+msgid "set output filename to FILE"
+msgstr ""
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr ""
 
-#: getopt-long.cc:145
+#: getopt-long.cc:144
 #, c-format
-msgid "option `%s' doesn't allow an argument"
+msgid "option `%s' does not allow an argument"
 msgstr ""
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr ""
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr ""
 
-#: warn.cc:68 grob.cc:556 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr ""
@@ -477,84 +511,75 @@ msgstr ""
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
-msgstr ""
-
-#: all-font-metrics.cc:164
-#, c-format
-msgid "can't find font: `%s'"
-msgstr ""
-
-#: all-font-metrics.cc:165
-msgid "loading default font"
-msgstr ""
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
+#: all-font-metrics.cc:173
 #, c-format
-msgid "(search path: `%s')"
-msgstr ""
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-msgid "giving up"
+msgid "cannot find font: `%s'"
 msgstr ""
 
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr ""
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -568,19 +593,19 @@ msgstr ""
 msgid "unterminated beam"
 msgstr ""
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr ""
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+msgid "stem does not fit in beam"
 msgstr ""
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr ""
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 msgid "no feasible beam position"
 msgstr ""
 
@@ -588,23 +613,23 @@ msgstr ""
 msgid "removing beam with no stems"
 msgstr ""
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr ""
 
 #: change-iterator.cc:23
 #, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr ""
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr ""
 
 #. We could change the current translator's id, but that would make
@@ -635,7 +660,7 @@ msgstr ""
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
@@ -656,26 +681,26 @@ msgstr ""
 
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, c-format
 msgid "program has no such type: `%s'"
 msgstr ""
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr ""
 
 #: context.cc:213
 #, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr ""
 
 #: context.cc:276
@@ -685,7 +710,7 @@ msgstr ""
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr ""
 
 #: custos.cc:77
@@ -693,11 +718,11 @@ msgstr ""
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, c-format
 msgid "Unknown event class %s"
 msgstr ""
@@ -708,7 +733,7 @@ msgid "dot `%s' not found"
 msgstr ""
 
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr ""
 
 #: dynamic-engraver.cc:195
@@ -727,11 +752,7 @@ msgstr ""
 msgid "unterminated (de)crescendo"
 msgstr ""
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr ""
 
@@ -754,15 +775,15 @@ msgstr ""
 msgid "adding font directory: %s"
 msgstr ""
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 msgid "unterminated glissando"
 msgstr ""
 
@@ -791,45 +812,37 @@ msgstr ""
 
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr ""
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, c-format
 msgid "Unknown interface `%s'"
 msgstr ""
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr ""
 
-#: hairpin.cc:180
-msgid "crescendo too small"
-msgstr ""
-
-#: horizontal-bracket-engraver.cc:57
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:59
+msgid "do not have that many brackets"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:66
+#: horizontal-bracket-engraver.cc:68
 msgid "conflicting note group events"
 msgstr ""
 
@@ -845,9 +858,14 @@ msgstr ""
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
+msgstr ""
+
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
 msgstr ""
 
 #: input.cc:112 source-file.cc:168 source-file.cc:183
@@ -855,7 +873,7 @@ msgid "position unknown"
 msgstr ""
 
 #: ligature-engraver.cc:93
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr ""
 
 #: ligature-engraver.cc:98
@@ -882,52 +900,52 @@ msgstr ""
 msgid "ligature was started here"
 msgstr ""
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr ""
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr ""
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, c-format
 msgid "deprecated function called: %s"
 msgstr ""
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:88
 #, c-format
-msgid "Changing working directory to `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr ""
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr ""
 
 #: lily-parser-scheme.cc:125
@@ -935,20 +953,20 @@ msgstr ""
 msgid "Processing `%s'"
 msgstr ""
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr ""
 
-#: lily-parser.cc:126
-msgid "braces don't match"
+#: lily-parser.cc:127
+msgid "braces do not match"
 msgstr ""
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr ""
 
-#: main.cc:117
+#: main.cc:116
 #, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -957,7 +975,7 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: main.cc:123
+#: main.cc:122
 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"
@@ -974,124 +992,123 @@ msgid ""
 "Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
-msgid "SYM=VAL"
+#: main.cc:155
+msgid "SYM[=VAL]"
 msgstr ""
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "evaluate scheme code"
 msgstr ""
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 msgid "generate DVI (tex backend only)"
 msgstr ""
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 msgid "generate PDF (default)"
 msgstr ""
 
-#: main.cc:167
+#: main.cc:165
 msgid "generate PNG"
 msgstr ""
 
-#: main.cc:168
+#: main.cc:166
 msgid "generate PostScript"
 msgstr ""
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:170
-msgid "print this help"
+#: main.cc:168
+msgid "show this help and exit"
 msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr ""
 
-#: main.cc:171
-msgid "dump a header field to file BASENAME.FIELD"
-msgstr ""
-
-#: main.cc:172
-msgid "DIR"
+#: main.cc:169
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr ""
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 msgid "do not generate printed output"
 msgstr ""
 
-#: main.cc:179
+#: main.cc:178
 msgid "write output to FILE (suffix will be added)"
 msgstr ""
 
-#: main.cc:180
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr ""
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+msgid "show version number and exit"
 msgstr ""
 
-#: main.cc:223
+#: main.cc:224
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1099,79 +1116,79 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
-#: main.cc:252
+#: main.cc:253
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr ""
 
-#: main.cc:262
+#: main.cc:263
 #, c-format
 msgid "Report bugs via %s"
 msgstr ""
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:322
+#: main.cc:323
 #, c-format
 msgid "no such user: %s"
 msgstr ""
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, c-format
 msgid "no such group: %s"
 msgstr ""
 
-#: main.cc:341
+#: main.cc:342
 #, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr ""
 
-#: main.cc:349
+#: main.cc:350
 #, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr ""
 
-#: main.cc:356
+#: main.cc:357
 #, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr ""
 
-#: main.cc:362
+#: main.cc:363
 #, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr ""
 
-#: main.cc:368
+#: main.cc:369
 #, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr ""
 
 #: main.cc:415
@@ -1179,7 +1196,7 @@ msgstr ""
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1248,121 +1265,117 @@ msgstr ""
 msgid "no such MIDI instrument: `%s'"
 msgstr ""
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr ""
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
 #: midi-stream.cc:28
 #, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr ""
 
 #: midi-stream.cc:44
 #, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr ""
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:208
+#: music.cc:207
 #, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr ""
 
-#: new-fingering-engraver.cc:95
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:238
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:239
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:438
+#: note-collision.cc:457
 msgid "ignoring too many clashing note columns"
 msgstr ""
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr ""
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr ""
 
 #: open-type-font.cc:37
 #, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr ""
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
 msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 msgid "Drawing systems..."
 msgstr ""
 
-#: pango-font.cc:196
+#: pango-font.cc:181
 #, c-format
 msgid ""
 "Glyph has no name, but font supports glyph naming.\n"
 "Skipping glyph U+%0X, file %s"
 msgstr ""
 
-#: pango-font.cc:235
+#: pango-font.cc:224
 #, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr ""
 
-#: pango-font.cc:283
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1396,15 +1409,15 @@ msgstr ""
 msgid "Track..."
 msgstr ""
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr ""
@@ -1413,23 +1426,23 @@ msgstr ""
 msgid "unterminated phrasing slur"
 msgstr ""
 
-#: piano-pedal-engraver.cc:283
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:298 piano-pedal-engraver.cc:309
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr ""
 
-#: piano-pedal-engraver.cc:344
+#: piano-pedal-engraver.cc:347
 #, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr ""
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, c-format
 msgid "no such internal option: %s"
 msgstr ""
@@ -1439,114 +1452,113 @@ msgstr ""
 msgid "not a grob name, `%s'"
 msgstr ""
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
 #: relocate.cc:44
 #, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr ""
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, c-format
 msgid "no such file: %s for %s"
 msgstr ""
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, c-format
 msgid "no such directory: %s for %s"
 msgstr ""
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
+#: relocate.cc:354
 #, c-format
-msgid "Relocation file %s\n"
+msgid "Relocation file: %s"
 msgstr ""
 
-#: relocate.cc:358
-#, c-format
-msgid "can't open file %s"
-msgstr ""
-
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr ""
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr ""
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, c-format
 msgid "cannot find `%s'"
 msgstr ""
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr ""
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, c-format
 msgid "Search path `%s'"
 msgstr ""
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:225
 msgid "already have music in score"
 msgstr ""
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 msgid "errors found, ignoring music expression"
 msgstr ""
 
 #. FIXME:
 #: script-engraver.cc:102
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr ""
 
 #: script-engraver.cc:103
@@ -1558,16 +1570,17 @@ msgstr ""
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr ""
 
-#: slur-engraver.cc:165
-msgid "can't end slur"
+#: slur-engraver.cc:166
+msgid "cannot end slur"
 msgstr ""
 
 #: source-file.cc:74
@@ -1579,57 +1592,57 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr ""
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 msgid "weird stem size, check for narrow beams"
 msgstr ""
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:270
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr ""
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr ""
 
@@ -1638,14 +1651,14 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
@@ -1655,41 +1668,37 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr ""
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr ""
 
-#: translator.cc:331
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:332
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
-msgid "can't find start of trill spanner"
+#: trill-spanner-engraver.cc:68
+msgid "cannot find start of trill spanner"
 msgstr ""
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 msgid "already have a trill spanner"
 msgstr ""
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:382
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:708
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
@@ -1707,264 +1716,273 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
-msgid "can't end volta spanner"
+#: volta-engraver.cc:144
+msgid "cannot end volta spanner"
 msgstr ""
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 msgid "also already have an ended spanner"
 msgstr ""
 
-#: parser.yy:703 parser.yy:704
+#: volta-engraver.cc:159
+msgid "giving up"
+msgstr ""
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:727 parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1173 parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1476 parser.yy:1477
+#: parser.yy:1475
 msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1503 parser.yy:1508 parser.yy:1973 parser.yy:1504 parser.yy:1509
-#: parser.yy:1974
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1605 parser.yy:1606
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1760 parser.yy:1810 parser.yy:1761 parser.yy:1811
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:1927 parser.yy:1928
+#: parser.yy:1926
 msgid "have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:1988 parser.yy:1989
+#: parser.yy:1987
 msgid "have to be in Chord mode for chords"
 msgstr ""
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr ""
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:290
+#: lexer.ll:288
 msgid "\\maininput not allowed outside init files"
 msgstr ""
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:561
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:882
+#: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
-#: lexer.ll:883
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:881 lexer.ll:882
+msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: backend-library.scm:19 lily.scm:487 ps-to-png.scm:88
-#, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, scheme-format
 msgid "Invoking `~a'..."
 msgstr ""
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr ""
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, lisp-format
+#, scheme-format
 msgid "Converting to `~a'..."
 msgstr ""
 
-#: backend-library.scm:110
-#, lisp-format
+#: backend-library.scm:108
+#, scheme-format
 msgid "Converting to ~a..."
 msgstr ""
 
-#: backend-library.scm:156
-#, lisp-format
+#: backend-library.scm:145
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:265
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1281
-#, lisp-format
+#: define-markup-commands.scm:1297
+#, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
 
-#: define-music-types.scm:743
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:746
-#, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, scheme-format
+msgid "cannot find music object: ~S"
 msgstr ""
 
-#: define-music-types.scm:766
-#, lisp-format
+#: define-music-types.scm:774
+#, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr ""
 
-#: define-music-types.scm:767
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, lisp-format
-msgid "can't find interface for property: ~S"
+#, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr ""
 
 #: document-backend.scm:145
-#, lisp-format
+#, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr ""
 
 #: documentation-lib.scm:45
-#, lisp-format
+#, scheme-format
 msgid "Processing ~S..."
 msgstr ""
 
 #: documentation-lib.scm:150
-#, lisp-format
+#, scheme-format
 msgid "Writing ~S..."
 msgstr ""
 
 #: documentation-lib.scm:172
-#, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr ""
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, scheme-format
 msgid "Writing ~a..."
 msgstr ""
 
 #: framework-ps.scm:279
-#, lisp-format
-msgid "can't embed ~S=~S"
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
 #: framework-ps.scm:332
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
 #: framework-ps.scm:349
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
 #: framework-ps.scm:380
-#, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: framework-ps.scm:731
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:750 framework-ps.scm:753
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:760
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -1973,55 +1991,55 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, lisp-format
+#, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr ""
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 msgid "Calculating page breaks..."
 msgstr ""
 
-#: lily-library.scm:526
-#, lisp-format
+#: lily-library.scm:593
+#, scheme-format
 msgid "unknown unit: ~S"
 msgstr ""
 
-#: lily-library.scm:559
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:566
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:137
-#, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, scheme-format
+msgid "cannot find: ~A"
 msgstr ""
 
-#: lily.scm:202
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:416 lily.scm:477
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:467
-#, lisp-format
+#: lily.scm:579
+#, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
 
@@ -2029,48 +2047,48 @@ msgstr ""
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
-msgid "More alternatives than repeats. Junking excess alternatives"
+#: music-functions.scm:213
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, lisp-format
+#: music-functions.scm:538
+#, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr ""
 
-#: music-functions.scm:953
-#, lisp-format
+#: music-functions.scm:942
+#, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 
@@ -2079,18 +2097,18 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, lisp-format
-msgid "can't find ~a in ~a"
+#, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr ""
 
 #: paper.scm:69
@@ -2098,12 +2116,12 @@ msgid "Not in toplevel scope"
 msgstr ""
 
 #: paper.scm:117
-#, lisp-format
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
 #: paper.scm:129
-#, lisp-format
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
@@ -2114,7 +2132,7 @@ msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, lisp-format
+#, scheme-format
 msgid "unknown clef type `~a'"
 msgstr ""
 
@@ -2122,11 +2140,12 @@ msgstr ""
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, lisp-format
+#: ps-to-png.scm:88
+#, scheme-format
 msgid "~a exited with status: ~S"
 msgstr ""
 
 #: to-xml.scm:190
-msgid "assertion failed"
+#, scheme-format
+msgid "assertion failed: ~S"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index aeb66b0ea7..018819a135 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,18 +1,18 @@
 # nl.po -- GNU LilyPond's dutch language file
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Jan Nieuwenhuizen <janneke@gnu.org>, Han-Wen Nienhuys <hanwen@cs.uu.nl>.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Jan Nieuwenhuizen <janneke@gnu.org>, Han-Wen Nienhuys <hanwen@cs.uu.nl>.
 # Jan Nieuwenhuizen <janneke@gnu.org>, 1998.
 # Han-Wen Nienhuys <hanwen@cs.uu.nl>, 1998.
 #
-# Don't change the format of the first three lines,
-# the TP robot wants them like this (I hope).
-# Of course, Han-Wen <hanwen@cs.uu.nl> also was FIRST AUTHOR.
+# Donnot change the format of the first three lines,
+# the TP robot needs them to be like this.
+# Of course, Han-Wen <hanwen@xs4all.nl> also is FIRST AUTHOR.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.5.22\n"
+"Project-Id-Version: lilypond 2.11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
-"PO-Revision-Date: 2005-04-25 21:59+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
+"PO-Revision-Date: 2006-12-24 10:45+0100\n"
 "Last-Translator: Jan Nieuwenhuizen <janneke@gnu.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 #: convertrules.py:12
 #, python-format
 msgid "Not smart enough to convert %s"
-msgstr "niet slim genoeg om %s te converteren"
+msgstr "Niet slim genoeg om %s te converteren"
 
 #: convertrules.py:13
 msgid "Please refer to the manual for details, and update manually."
@@ -82,155 +82,164 @@ msgstr "Draaien van %s..."
 
 #: lilylib.py:203
 #, python-format
-msgid "Usage: %s\n"
-msgstr ""
+msgid "Usage: %s"
+msgstr "Gebruik: %s"
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "%s [OPTIE]... BESTAND"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
+"abc2ly converteert ABC muziekbestanden (zie\n"
+"%s) naar LilyPond invoer."
 
-#: abc2ly.py:1354
-#, fuzzy
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr "schrijf uitvoer naar BESTAND"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
-msgstr ""
+msgstr "wees strict over succes"
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
+msgstr "behoud ABC's notie van waardestrepen"
+
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+msgid "Report bugs via"
 msgstr ""
+"Meld fouten in het programma via %;\n"
+"meld onjuistheden in de vertaling aan <janneke@gnu.org> of <hanwen@xs4all."
+"nl>."
 
 #: convert-ly.py:41
-#, fuzzy
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
-"Actualiseer LilyPond invoer naar nieuwer versie.  Standaard, gaande van\n"
-"versie uit de \\versie uitdrukking, naar de huidige LilyPond versie."
+"Actualiseer LilyPond invoer naar nieuwere versie.  Standaard, actualiseer\n"
+"vanaf versie uit de \\versie uitdrukking, naar de huidige LilyPond versie."
+
+#: convert-ly.py:43 lilypond-book.py:73
+msgid "Examples:"
+msgstr "Voorbeelden:"
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, c-format, python-format
 msgid "warning: %s"
 msgstr "waarschuwing: %s"
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, c-format, python-format
 msgid "error: %s"
 msgstr "fout: %s"
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr "Verspreid onder de voorwaarden van de GNU General Public License."
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr "Er is GEEN GARANTIE."
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
-msgstr ""
+msgstr "VERSIE"
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
-msgstr ""
+msgstr "begin bij VERSIE [standaard: \\version gevonden in bestand]"
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
-msgstr ""
+msgstr "bewerk bestand ter plekke"
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
-msgstr ""
+msgstr "voeg geen \\version commando toe als het niet aanwezig is"
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
-msgstr ""
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+msgstr "toon regels [standaard: --from=0, --to=@TOPLEVEL_VERSION@]"
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
-msgstr ""
+msgstr "converteer naar VERSIE [standaard: @TOPLEVEL_VERSION@]"
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr "toepassen van conversie: "
 
 #: convert-ly.py:166
-#, fuzzy
-msgid "error while converting"
+msgid "Error while converting"
 msgstr "%s: fout tijdens converteren"
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
-msgstr "Afbreken"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
+msgstr "Stop na de laatste succesvolle regel"
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, python-format
 msgid "Processing `%s'... "
 msgstr "Verwerken van `%s'..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "kan bestand niet openen: `%s'"
 
-#: convert-ly.py:286
-#, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
-msgstr "%s: kan versie niet bepalen voor %s"
+#: convert-ly.py:284
+#, python-format
+msgid "cannot determine version for `%s'.  Skipping"
+msgstr "kan versie niet bepalen voor `%s'.  Overslaan"
+
+#: etf2ly.py:1196
+#, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "%s [OPTIE]... ETF-BESTAND"
 
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
+"Enigma Transport Format is een format dat wordt gebruikt door Coda\n"
+"Music Technology's Finale produkt.  Dit programma converteert een\n"
+"subset van ETF naar een gebruiksklaar lilypondbestand."
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr "schrijf uitvoer naar BESTAND"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "BESTAND"
 
-#: etf2ly.py:1204 midi2ly.py:899
-#, fuzzy
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr "toon garantie en auteursrechten"
 
-#: lilypond-book.py:70
-#, fuzzy
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
 msgstr ""
-"Verwerk LilyPond snippers in hybride HTML, LaTeX of texinfo document.\n"
-"Gebruiksvoorbeeld:\n"
-"   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOEK\n"
-"   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOEK\n"
-"   lilypond-book --process='lilypond -I invoeging' BOEK\n"
+"Verwerk LilyPond snippers in hybride HTML, LaTeX, texinfo of DocBook "
+"dokument."
+
+#: lilypond-book.py:78
+msgid "BOOK"
+msgstr "BOEK"
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, python-format
 msgid "Exiting (%d)..."
 msgstr "Afsluiten (%d)..."
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s"
@@ -244,16 +253,20 @@ msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr "pijp snippers door FILTER [convert-ly -n -]"
 
 #: lilypond-book.py:135
-#, fuzzy
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr ""
-"gebruik uitvoerformaat FMT (texi [standaard],\n"
-"\t\t texi-html, latex, html)"
+"gebruik uitvoerformat FORMAT (texi [standaard], texi-html, latex, html, "
+"docbook)"
 
 #: lilypond-book.py:138
 msgid "add DIR to include path"
 msgstr "voeg MAP toe aan zoekpad"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "MAP"
+
 #: lilypond-book.py:143
 msgid "write output to DIR"
 msgstr "schrijf uitvoer naar MAP"
@@ -266,149 +279,147 @@ msgstr "OPDRACHT"
 msgid "process ly_files using COMMAND FILE..."
 msgstr "verwerk ly_bestanden met OPDRACHT BESTAND..."
 
-#: lilypond-book.py:159
-#, fuzzy
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr "Maak PDF bestanden voor gebruik met PDFTeX"
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
-"extract alle PostScript fonts naar BESTAND voor LaTeX\n"
-"\t moet dit gebruiken met dvips -h FILE"
+"extraheer alle PostScript fonts naar BESTAND voor LaTeX\n"
+"dit dient gebruikt te worden met dvips -h BESTAND"
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "wees breedsprakig"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "toon garantie en auteursrechten"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr "bestand niet gevonden: %s"
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr "verouderde ly-optie gebruikt: %s=%s"
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr "compatibiliteitsmodus vertaling: %s=%s"
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr "verouderde ly-optie gebruikt: %s"
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr "compatibiliteitsmodus vertaling: %s"
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr "negeren van onbekende ly optie: %s"
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, python-format
 msgid "Opening filter `%s'"
 msgstr "Open filter `%s'"
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr "`%s' gefaald (%d)"
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr "De foutlog is als volgend:"
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
-msgstr ""
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
+msgstr "kan \\begin{document} niet vinden in LaTeX dokument"
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 msgid "Writing snippets..."
 msgstr "Schrijven van snippers..."
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 msgid "Processing..."
 msgstr "Verwerken..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr "Alle snippers zijn actueel..."
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "kan formaat niet bepalen voor: %s"
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, python-format
 msgid "%s is up to date."
 msgstr "%s is actueel."
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "Schrijven van `%s'..."
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr "Uitvoer zou invoerbestand overschrijven; gebruik --output."
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, python-format
 msgid "Reading %s..."
 msgstr "Lezen %s..."
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 msgid "Dissecting..."
 msgstr "Ontleden..."
 
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, python-format
 msgid "Compiling %s..."
 msgstr "Samenstellen %s..."
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, python-format
 msgid "Processing include: %s"
 msgstr "Verwerken van invoegsel: %s"
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, python-format
 msgid "Removing `%s'"
 msgstr "Verwijderen van `%s'"
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, python-format
 msgid "Writing fonts to %s..."
 msgstr "Schrijven van fonts naar %s"
 
-#: lilypond-book.py:1758
-#, fuzzy
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
-msgstr "optie --psfonts=BESTAND niet gebruikt"
+msgstr "optie --psfonts niet gebruikt"
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr "verwerking met dvips zal geen fonts hebben"
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr "DVIPS gebruik:"
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "waarschuwing: "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "fout: "
 
@@ -421,9 +432,10 @@ msgstr "Be
 msgid "%s output to `%s'..."
 msgstr "%s uitvoer naar `%s'..."
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
-msgstr "Converteer MIDI naar LilyPond broncode."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, python-format
+msgid "Convert %s to LilyPond input."
+msgstr "Converteer %s naar LilyPond invoer."
 
 #: midi2ly.py:875
 msgid "print absolute pitches"
@@ -466,35 +478,59 @@ msgid "treat every text as a lyric"
 msgstr "behandel elke tekst als liedtekts"
 
 #: midi2ly.py:905
-#, fuzzy
-msgid "example"
+msgid "Examples"
 msgstr "Voorbeelden"
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "geen bestanden gespecificeerd op de commandoregel."
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr "musicxml2ly BESTAND.xml"
+
+#: musicxml2ly.py:476
+#, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Dit is vrije programmatuur.  Het valt onder de GNU Algemene Openbare\n"
+"Licentie (General Public Licence), en u wordt uitgenodigd het te\n"
+"veranderen en/of te verspreiden onder bepaalde voorwaarden.  Roep aan\n"
+"als `%s --warranty' voor meer informatie."
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr "Gebruik lxml.etree; gebruikt minder geheugen en processortijd."
+
+#: musicxml2ly.py:503
+msgid "set output filename to FILE"
+msgstr "zet uitvoerbestandnaam op BESTAND"
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "optie `%s' vereist een argument"
 
-#: getopt-long.cc:145
+#: getopt-long.cc:144
 #, c-format
-msgid "option `%s' doesn't allow an argument"
+msgid "option `%s' does not allow an argument"
 msgstr "optie `%s' staat geen argument toe"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "onbekende optie: `%s'"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "onjuist argument: `%s' voor optie `%s'"
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr "programmeerfout: %s"
@@ -503,83 +539,79 @@ msgstr "programmeerfout: %s"
 msgid "continuing, cross fingers"
 msgstr "ga verder; duim maar"
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr "voorteken zetlijst moet beginnen met context-naam: %s"
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr "negeren van onbekend voorteken: %s"
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
-msgstr ""
+msgstr "paar of context-naam verwacht voor toevallig teken regel, gevonden: %s"
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr "voorteken `%s' niet gevonden"
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
+"vertikale uitlijning aangeroepen voor regelbreuk\n"
+"Gebruik alleen spanners over notenbalken heen met PianoStaff"
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
+"probeerde een verplaatsing te verkrijgen voor iets wat geen kind van mij is"
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "kan font niet vinden: `%s'"
 
-#: all-font-metrics.cc:165
-msgid "loading default font"
-msgstr "laden van standaardfont"
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "kan standaardfont niet vinden: `%s'"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(zoekpad: `%s')"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-msgid "giving up"
-msgstr "geef op"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr "\\applycontext argument is geen procedure"
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, c-format
-msgid "can't change, already in translator: %s"
-msgstr "kan niet wisselen, al in translator: %s"
+msgid "cannot change, already in translator: %s"
+msgstr "kan niet wisselen, al in vertaler: %s"
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr "Axis_group_engraver: verticale groep heeft al een ouder"
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr "zijn er twee Axis_group_engravers?"
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr "verwijder deze verticale groep"
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
+msgstr "probeerde pure-hoogte te berekenen op een niet-breekpunt"
+
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
 msgstr ""
+"een buiten-notenbalk object moet een richting hebben, gebruik "
+"standaardwaarde omhoog"
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr "buiten-notenbalk object %s heeft lege afmetingen"
 
 #: bar-check-iterator.cc:73
 #, c-format
@@ -594,47 +626,45 @@ msgstr "heb al een waardestreep"
 msgid "unterminated beam"
 msgstr "onbeëindigde waardestreep"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr "stok moet Ritmische structuur hebben"
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+msgid "stem does not fit in beam"
 msgstr "stok past niet in waardestreep"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr "waardestreep werd hier gestart"
 
-#: beam-quanting.cc:306
-#, fuzzy
+#: beam-quanting.cc:307
 msgid "no feasible beam position"
-msgstr "geen werkbare regelafbreuk gevonden"
+msgstr "geen werkbare waardestreeppositie gevonden"
 
 #: beam.cc:144
-#, fuzzy
 msgid "removing beam with no stems"
-msgstr "verwijderen van waardestreep met minder dan twee stokken"
+msgstr "verwijderen van waardestreep zonder stokken"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 "geen werkbare initiële configuratie gevonden: kan wellicht geen goede "
 "waardestreephelling kunnen vinden"
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Geen spatiëringswaarde van %s naar`%s'"
 
 #: change-iterator.cc:23
 #, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "kan `%s' niet in `%s' veranderen"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "kan `%s' niet wisselen in `%s'"
 
 #. We could change the current translator's id, but that would make
@@ -654,7 +684,7 @@ msgstr "geen van deze in mijn gezin"
 
 #: chord-tremolo-engraver.cc:88
 msgid "No tremolo to end"
-msgstr ""
+msgstr "Geen tremolo om te beëindigen"
 
 #: chord-tremolo-engraver.cc:110
 msgid "unterminated chord tremolo"
@@ -665,7 +695,7 @@ msgstr "onbe
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr "verwacht 2 elementen voor akkoordtremolo, %d gevonden"
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr "sleutel `%s' niet gevonden"
@@ -679,44 +709,43 @@ msgstr "onbekende klusterstijl `%s'"
 msgid "junking empty cluster"
 msgstr "verschroot lege cluster"
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr "Coherent_ligature_engraver: zet `spacing-increment=0.01': ptr=%ul"
 
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
-#, fuzzy
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "kan geen regelbreuk vinden die aan voorwaarden voldoet"
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, c-format
 msgid "program has no such type: `%s'"
 msgstr "programma heeft geen dergelijk type: `%s'"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr "heb symbool-argumenten nodig voor \\override en \\revert"
 
 #: context.cc:151
 #, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "kan niet vinden of nieuw maken `%s'"
 
 #: context.cc:213
 #, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "kan niet vinden of maken `%s' genaamd `%s'"
 
 #: context.cc:276
 #, c-format
 msgid "Invalid CreateContext event: Cannot create %s context"
-msgstr ""
+msgstr "Ongeldig CreateContext gebeurtenis: Kan %s context niet maken"
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "kan niet vinden of scheppen: `%s'"
 
 #: custos.cc:77
@@ -724,17 +753,22 @@ msgstr "kan niet vinden of scheppen: `%s'"
 msgid "custos `%s' not found"
 msgstr "custode `%s' niet gevonden"
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
-msgstr ""
+msgstr "Gebeurtenis klasse zou hoort een symbool te zijn"
 
-#: dispatcher.cc:79
-#, fuzzy, c-format
+#: dispatcher.cc:78
+#, c-format
 msgid "Unknown event class %s"
-msgstr "onbekende interface `%s'"
+msgstr "Onbekende gebeurtenis klasse `%s'"
+
+#: dots.cc:38
+#, c-format
+msgid "dot `%s' not found"
+msgstr "punt `%s' niet gevonden"
 
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "kan start van (de)crescendo niet vinden"
 
 #: dynamic-engraver.cc:195
@@ -753,11 +787,7 @@ msgstr "cresc is hier gestart"
 msgid "unterminated (de)crescendo"
 msgstr "onbeëindigd (de)crescendo"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "onbeëindigde extender"
 
@@ -768,27 +798,27 @@ msgstr "Initialiseren van FontConfig..."
 #: font-config.cc:44
 #, c-format
 msgid "Rebuilding FontConfig cache %s, this may take a while..."
-msgstr ""
+msgstr "Herbouwen van FontConfig cache %s, dit kan wel even duren..."
 
 #: font-config.cc:55
-#, fuzzy, c-format
+#, c-format
 msgid "failed adding font directory: %s"
-msgstr "toevoegen van font map: %s"
+msgstr "toevoegen van font map gefaald: %s"
 
 #: font-config.cc:57
 #, c-format
 msgid "adding font directory: %s"
 msgstr "toevoegen van font map: %s"
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr "oneindig of NaN tegengekomen tijdens converteren van Reëel getal"
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr "zet op nul"
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 msgid "unterminated glissando"
 msgstr "onbeëindigde glissando"
 
@@ -817,49 +847,37 @@ msgstr "impliciede \\%s toegevoeg"
 
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
-#, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
-msgstr "Kan `\\~' niet op eerste noot van ligatuur toepassen; negeer `\\~'"
+msgid "cannot apply `\\~' on first head of ligature"
+msgstr "Kan `\\~' niet op eerste noot van ligatuur toepassen"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-#, fuzzy
-msgid "can't apply `\\~' on heads with identical pitch"
-msgstr ""
-"Kan `\\~' niet toepassen op noten met identieke toonhoogte; negeer `\\~'"
+msgid "cannot apply `\\~' on heads with identical pitch"
+msgstr "kan `\\~' niet toepassen op noten met identieke toonhoogte"
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, c-format
 msgid "Unknown interface `%s'"
 msgstr "onbekende interface `%s'"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr "Grob `%s' heeft geen interface voor eigenschap `%s'"
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
-#, fuzzy
 msgid "Infinity or NaN encountered"
-msgstr "oneindig of NaN tegengekomen tijdens converteren van Reëel getal"
+msgstr "Oneindig of NaN tegengekomen"
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr "decrescendo te klein"
 
-#: hairpin.cc:180
-msgid "crescendo too small"
-msgstr "crescendo te klein"
+#: horizontal-bracket-engraver.cc:59
+msgid "do not have that many brackets"
+msgstr "zoveel haken heb ik niet"
 
-#: horizontal-bracket-engraver.cc:58
-msgid "don't have that many brackets"
-msgstr "heb niet zoveel haken"
-
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 msgid "conflicting note group events"
 msgstr "Tegenstrijdige nootgroeperingsgebeurtenissen"
 
@@ -875,89 +893,94 @@ msgstr "verwijderen van onafgesloten streepje"
 msgid "include files are not allowed in safe mode"
 msgstr "invoegbestanden zijn niet toegestaan in veilige modus"
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "kan bestand niet vinden: `%s'"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(zoekpad: `%s')"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "positie onbekend"
 
-#: ligature-engraver.cc:95
-msgid "can't find start of ligature"
+#: ligature-engraver.cc:93
+msgid "cannot find start of ligature"
 msgstr "kan begin van ligatuur niet vinden"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr "geen rechterkant"
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 msgid "already have a ligature"
 msgstr "heb al een ligatuur"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr "geen linkerkant"
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 msgid "unterminated ligature"
 msgstr "onbeëindigde ligatuur"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr "negeer rust: ligatuur mag geen rust bevatten"
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr "ligatuur werd hier gestart"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(zoekpad: `%s')"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr "kan geen type-controle vinden voor property `%s' (%s)"
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr "misschien een typefout?"
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr "voer toewijzing toch door"
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr "type contole gefaald voor `%s'; waarde `%s' moet type hebben: `%s'"
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "identifier naam is een sleutelwoord: `%s'"
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "fout bij EOF: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, c-format
 msgid "deprecated function called: %s"
 msgstr "verouderde functie aangeroepen: %s"
 
-#: lily-parser-scheme.cc:89
-#, fuzzy, c-format
-msgid "Changing working directory to `%s'"
-msgstr "kan werkmap niet veranderen in: %s: %s"
+#: lily-parser-scheme.cc:88
+#, c-format
+msgid "Changing working directory to: `%s'"
+msgstr "Veranderen van werkmap naar: `%s'"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "kan init bestand niet vinden: `%s'"
 
 #: lily-parser-scheme.cc:125
@@ -965,20 +988,20 @@ msgstr "kan init bestand niet vinden: `%s'"
 msgid "Processing `%s'"
 msgstr "Verwerken van `%s'"
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Ontleden..."
 
-#: lily-parser.cc:126
-msgid "braces don't match"
+#: lily-parser.cc:127
+msgid "braces do not match"
 msgstr "haakjes paren niet"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr "kan Voice niet vinden: `%s'"
 
-#: main.cc:117
+#: main.cc:116
 #, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -991,7 +1014,7 @@ msgstr ""
 "veranderen en/of te verspreiden onder bepaalde voorwaarden.  Roep aan\n"
 "als `%s --warranty' voor meer informatie.\n"
 
-#: main.cc:123
+#: main.cc:122
 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"
@@ -1002,7 +1025,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1020,133 +1043,142 @@ msgstr ""
 "    Als het goed is, heeft u bij dit programma een exemplaar (zie het\n"
 "bestand COPYING) ontvangen van de GNU Algemene Openbare Licentie;\n"
 "zoniet, schrijf dan naar de Free Software Foundation, Inc.,\n"
-"675 Mass Ave, Cambridge, MA 02139, USA.\n"
+"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
-msgstr "BACK"
+msgstr "ACHTER"
 
-#: main.cc:154
-#, fuzzy
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
-"gebruik backend BACK (gnome, ps [default],\n"
-"                                       scm, svg, tex, texstr)"
+"gebruik achterkant ACHTER (eps, gnome,\n"
+"ps [standaard], scm, svg, tex, texstr)"
 
-#: main.cc:156
-msgid "SYM=VAL"
-msgstr ""
+#: main.cc:155
+msgid "SYM[=VAL]"
+msgstr "SYM[=WAARDE]"
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
+"Zet Scheme programma optie SYM to WAARDE\n"
+"(standaard: #t)\n"
+"Gebruik -dhelp voor hulp."
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr "EXPR"
 
-#: main.cc:160
+#: main.cc:159
 msgid "evaluate scheme code"
-msgstr ""
+msgstr "evalueer scheme code"
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr "FORMAATen"
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr "dump FORMAAT,...  Ook als separate opties:"
 
-#: main.cc:164
+#: main.cc:163
 msgid "generate DVI (tex backend only)"
 msgstr "genereer DVI (alleen tex backend)"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 msgid "generate PDF (default)"
 msgstr "genereer PDF (standaard)"
 
-#: main.cc:167
+#: main.cc:165
 msgid "generate PNG"
 msgstr "genereer PNG"
 
-#: main.cc:168
+#: main.cc:166
 msgid "generate PostScript"
 msgstr "genereer PostScipt"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr "genereer TeX (alleen tex backend)"
 
-#: main.cc:170
-msgid "print this help"
-msgstr "toon deze hulp"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr "toon deze hulp en sluit af"
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr "VELD"
 
-#: main.cc:171
-#, fuzzy
-msgid "dump a header field to file BASENAME.FIELD"
-msgstr "schrijf kop veld naar BASISNAAM.VELD"
-
-#: main.cc:172
-msgid "DIR"
-msgstr "MAP"
+#: main.cc:169
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
+msgstr ""
+"schrijf kopveld VELD naar bestand\n"
+"genaamd BASISNAAM.VELD"
 
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "voeg DIR toe aan zoekpad"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "gebruik BESTAND als initialisatiebestand"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr "GEBR,GROEP,GEVANG,DIR"
 
-#: main.cc:175
-#, fuzzy
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 "chroot naar GEVANG, word GEBR:GROEP\n"
-"                                       en cd naar DIR"
+"en cd naar MAP"
 
-#: main.cc:178
+#: main.cc:177
 msgid "do not generate printed output"
 msgstr "genereer geen afdrukuitvoer"
 
-#: main.cc:179
+#: main.cc:178
 msgid "write output to FILE (suffix will be added)"
-msgstr "schrijf uitvoer naar BESTAND (extensie wordt toegevoegd)"
+msgstr ""
+"schrijf uitvoer naar BESTAND\n"
+"(extensie wordt toegevoegd)"
 
-#: main.cc:180
+#: main.cc:179
 msgid "generate a preview of the first system"
-msgstr "maak een voorvertoning van het eerste systeem"
+msgstr ""
+"maak een voorvertoning van het eerste\n"
+"systeem"
+
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+"verhuis aan de hand van de map van het\n"
+"lilypond programma"
 
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
+"sta geen onveilige Scheme of PostScript\n"
+"operaties toe"
 
-#: main.cc:182
-msgid "print version number"
-msgstr "druk versienummer af"
+#: main.cc:183
+msgid "show version number and exit"
+msgstr "toon versienummer en sluit af"
 
-#: main.cc:223
+#: main.cc:224
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1156,92 +1188,92 @@ msgstr ""
 "%s  en anderen."
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Gebruik: %s [OPTIE]... BESTAND..."
 
-#: main.cc:252
+#: main.cc:253
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Zet muziek en of produceer MIDI van BESTAND."
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr "LilyPond produceert prachtige muzieknotatie."
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr "Voor meer informatie, zie %s"
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Opties:"
 
-#: main.cc:262
-#, fuzzy, c-format
+#: main.cc:263
+#, c-format
 msgid "Report bugs via %s"
 msgstr ""
 "Meld fouten in het programma aan %s;\n"
 "meld onjuistheden in de vertaling aan <janneke@gnu.org> of <hanwen@cs.uu.nl>."
 
-#: main.cc:308
-#, fuzzy, c-format
+#: main.cc:309
+#, c-format
 msgid "expected %d arguments with jail, found: %u"
-msgstr "verwacht %d argumenten voor gevang, %d gevonden"
+msgstr "verwachtte %d argumenten voor gevang, gevonden: %d"
 
-#: main.cc:322
+#: main.cc:323
 #, c-format
 msgid "no such user: %s"
 msgstr "onbekende gebruiker: %s"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr "kan gebruikers id niet krijgen van gebruikersnaam: %s: %s"
 
-#: main.cc:339
+#: main.cc:340
 #, c-format
 msgid "no such group: %s"
 msgstr "onbekende groep: %s"
 
-#: main.cc:341
+#: main.cc:342
 #, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "kan groep id niet krijgen van groepnaam: %s: %s"
 
-#: main.cc:349
+#: main.cc:350
 #, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "kan niet chrooten naar: %s: %s"
 
-#: main.cc:356
+#: main.cc:357
 #, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "kan groep id niet veranderen in: %d: %s"
 
-#: main.cc:362
+#: main.cc:363
 #, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "kan kan gebruiker id niet veranderen in: %d: %s"
 
-#: main.cc:368
+#: main.cc:369
 #, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "kan werkmap niet veranderen in: %s: %s"
 
 #: main.cc:415
 #, c-format
 msgid "Evaluating %s"
-msgstr ""
+msgstr "Evalueren van %s"
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
-msgstr ""
+msgstr "exceptie gevangen: %s"
 
 #. FIXME: constant error message.
 #: mark-engraver.cc:154
@@ -1252,45 +1284,51 @@ msgstr "rehearsalMark moet een natuurlijk getal zijn"
 msgid "mark label must be a markup object"
 msgstr "mark etiket moet een markup zijn"
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr "ligatuur met minder dan 2 bolletjes -> overslaan"
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr "kan toonhoogte van primitieve ligatuur niet bepalen -> overslaan"
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr "enkelnootse ligatuur - overslaan"
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr "prieminterval binnen ligatuur -> overslaan"
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr "mensural ligature: lengte geen van Mx, L, S -> overslaan"
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
-msgstr ""
+msgstr "semibrevis moet worden gevolgd door een andere -> overslaan"
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
+"semibrevi kunnen alleen aan het begin van een ligatuur voorkomen,\n"
+"en het mogen er uitsluitend een of twee zijn"
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
 "the penultimate note must be another one,\n"
 "or the ligatura must be LB or SSB"
 msgstr ""
+"ongeldig ligatuur einde:\n"
+"als de laatste noot een dalende brevis is,\n"
+"moet de penultimate note een andere zijn,\n"
+"of de ligatuur moet LB of SSB zijn"
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr "onverwachte zaakdoorval"
 
@@ -1305,116 +1343,123 @@ msgstr "Mensural_ligature: (join_right) == 0)"
 #: midi-item.cc:152
 #, c-format
 msgid "no such MIDI instrument: `%s'"
-msgstr "geen dergelijk MIDI instrument: `%s'"
-
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "rare toonhoogte"
+msgstr "onbekend MIDI instrument: `%s'"
 
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr "experimenteel: tijdelijke fijnafstemming (%d centen) van kanaal."
 
 #: midi-stream.cc:28
 #, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "kan bestand niet openen om te schrijven: %s: %s"
 
 #: midi-stream.cc:44
 #, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "kon niet naar bestand schrijven: `%s'"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
-msgstr ""
+msgstr "Zenden van niet-gebeurtenis naar context"
 
-#: music.cc:142
-#, fuzzy, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
-msgstr "oktaafcontrole gefaald; verwachtte %s, vond: %s"
+#: music.cc:141
+#, c-format
+msgid "octave check failed; expected \"%s\", found: \"%s\""
+msgstr "oktaafcontrole gefaald; verwachtte \"%s\", vond: \"%s\""
 
-#: music.cc:208
+#: music.cc:207
 #, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "transponering met %s maakt voorteken groter dan dubbel"
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr "can tektscripts niet toevoegen aan individuele notenbolletjes"
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr "geen plaatsing gevonden voor vingers"
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr "plaats onder"
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 msgid "ignoring too many clashing note columns"
 msgstr "negeren van te veel botsende nootkolommen."
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr "kan notenbolletjes en rusten niet samen op een stok zetten"
 
-#: note-head.cc:69
-#, fuzzy, c-format
+#: note-head.cc:63
+#, c-format
 msgid "none of note heads `%s' or `%s' found"
-msgstr "nootbolletje `%s' niet gevonden"
+msgstr "geen van notenbolletjes `%s' of `%s' gevonden"
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
-msgstr ""
+msgstr "NootGebeurtenis zonder toonhoogte"
 
 #: open-type-font.cc:33
-#, fuzzy, c-format
-msgid "can't allocate %lu bytes"
-msgstr "kan geen %d bytes alloceren"
+#, c-format
+msgid "cannot allocate %lu bytes"
+msgstr "kan geen %lu bytes alloceren"
 
 #: open-type-font.cc:37
 #, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "kan fonttabel niet laden: %s"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr "niet-ondersteund font formaat: %s"
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr "onbekende fout: %d tijdens lezen van fontbestand: %s"
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
-msgstr ""
+msgid "FT_Get_Glyph_Name() returned error: %u"
+msgstr "FT_Get_Glyph_Name() gaf fout: %u"
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
+"kan de eerste paginaomslag niet op eerste pagina gepast krijgen.  Overweeg\n"
+"first-page-number op een even getal te zetten."
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
-msgstr ""
+msgstr "Berekenen van pagina en regelbreuken (%d mogelijke pagina breuken)..."
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 msgid "Drawing systems..."
+msgstr "Tekenen van systemen..."
+
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
 msgstr ""
+"Vorm heeft geen naam, terwijl het font vormnamen ondersteunt<\n"
+"Overslaan van vorm U+%0X, bestand %s"
 
-#: pango-font.cc:215
+#: pango-font.cc:224
 #, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "geen PostScript fontnaam voor font: `%s'"
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr "FreeType gezicht heeft geen PostScript fontnaam"
 
@@ -1448,15 +1493,15 @@ msgstr "onbe
 msgid "Track..."
 msgstr "Spoor... "
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
-msgstr ""
+msgstr "MIDI kanaal is klokje rond"
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
-msgstr ""
+msgstr "herafbeelden modulo 16"
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI uitvoer naar %s..."
@@ -1465,23 +1510,23 @@ msgstr "MIDI uitvoer naar %s..."
 msgid "unterminated phrasing slur"
 msgstr "onbeëindigde fraseringsboog"
 
-#: piano-pedal-engraver.cc:304
-#, fuzzy, c-format
+#: piano-pedal-engraver.cc:286
+#, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
-msgstr "verwacht 3 strings voor pianopedalen, %d gevonden"
+msgstr "verwacht 3 teksten voor pianopedalen, gevonden: %ld"
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "kan start van piano pedaal niet vinden: `%s'"
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "kan start van piano pedaal haak niet vinden: `%s'"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, c-format
 msgid "no such internal option: %s"
 msgstr "onbekende interne optie: %s"
@@ -1491,114 +1536,115 @@ msgstr "onbekende interne optie: %s"
 msgid "not a grob name, `%s'"
 msgstr "geen grobnaam, `%s'"
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr "Oktaafcontorle gefaald, heb:"
 
 #: relocate.cc:44
-#, fuzzy, c-format
-msgid "Setting %s to %s\n"
-msgstr "Schrijven van fonts naar %s"
+#, c-format
+msgid "Setting %s to %s"
+msgstr "Zetten van %s op %s"
 
-#: relocate.cc:58
-#, fuzzy, c-format
+#: relocate.cc:59
+#, c-format
 msgid "no such file: %s for %s"
-msgstr "onbekend symbool: %s: %s"
+msgstr "onbekend bestand: %s voor %s"
 
-#: relocate.cc:68 relocate.cc:86
-#, fuzzy, c-format
+#: relocate.cc:69 relocate.cc:87
+#, c-format
 msgid "no such directory: %s for %s"
-msgstr "onbekend symbool: %s: %s"
+msgstr "onbekende map: %s voor %s"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
-msgstr ""
+msgstr "%s=%s (voorvoegen)\n"
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
-msgstr ""
+msgstr "Verhuizing: samenstel voorvoegel=%s, nieuw voorvoegsel=%s"
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
-msgstr ""
+msgstr "Verhuizing: draadwerk_voorvoegel=%s"
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
-msgstr ""
+msgstr "Verhuizing: is absoluut: argv0=%s"
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
-msgstr ""
+msgstr "Verhuizing: van cwd: argv0=%s"
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
+"Verhuizing: van PATH=%s\n"
+"argv0=%s"
 
-#: relocate.cc:353
-#, fuzzy, c-format
-msgid "Relocation file %s\n"
-msgstr "kan bestand niet openen: `%s'"
-
-#: relocate.cc:358
-#, fuzzy, c-format
-msgid "can't open file %s"
-msgstr "kan bestand niet openen: `%s'"
+#: relocate.cc:354
+#, c-format
+msgid "Relocation file: %s"
+msgstr "Verhuisbestand: %s"
 
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
-msgstr ""
+msgstr "Onbekend verhuizingscommando %s"
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
-msgstr ""
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
+msgstr "kan rust bosting niet oplossen: richting van de rust is niet gezet"
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "te veel botsende rusten"
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr "rust `%s' niet gevonden"
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, c-format
 msgid "cannot find `%s'"
 msgstr "kan niet vinden `%s'"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr "Muziekfont is niet correect geïnstalleerd."
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, c-format
 msgid "Search path `%s'"
 msgstr "Zoekpad: `%s'"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr "Afbreken"
+
+#: score.cc:225
 msgid "already have music in score"
 msgstr "heb al muziek nodig in score"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr "dit is de vorige muziek"
 
-#: score.cc:228
+#: score.cc:231
 msgid "errors found, ignoring music expression"
 msgstr "fouten gevonden, negeer muziekexpressie"
 
 #. FIXME:
 #: script-engraver.cc:102
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr "weet niet hoe articulatie te vertolken: "
 
 #: script-engraver.cc:103
@@ -1610,16 +1656,17 @@ msgstr "scheme codering: "
 msgid "No spring between column %d and next one"
 msgstr "Geen veer tussen kolom %d en de volgende"
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
-msgstr ""
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
+msgstr "richting van %s ongeldig: %d"
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "onbeëindigde bindingsboog"
 
-#: slur-engraver.cc:165
-msgid "can't end slur"
+#: slur-engraver.cc:166
+msgid "cannot end slur"
 msgstr "kan legatoboog niet beëindigen"
 
 #: source-file.cc:74
@@ -1629,59 +1676,59 @@ msgstr "verwacht %d karakters te lezen, kreeg %d"
 
 #: staff-symbol-engraver.cc:62
 msgid "staff-span event has no direction"
-msgstr ""
+msgstr "notenbalk-span gebeurtenis heeft geen richting"
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr "tremololengte is te lang"
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "voeg nootbolletje toe aan onverenigbare stok (type = %d)"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr "misschien moet invoer polyfonische stemmen specificeren"
 
-#: stem.cc:104
+#: stem.cc:105
 msgid "weird stem size, check for narrow beams"
 msgstr "vreemde stoklengte; controleer op krappe waardestrepen"
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr "vlag `%s' niet gevonden"
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr "vlag streep `%s' niet gevonden"
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr "Aantal elementen: %d."
 
-#: system.cc:270
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr "Aantal grobs %d"
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr "kan start van tekst spanner niet vinden"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr "heb al een tekst spanner"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr "onbeëindigde tekst spanner"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "eenzame overbinding"
 
@@ -1690,14 +1737,14 @@ msgstr "eenzame overbinding"
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr "vreemde maatsoort gevonden: %d/%d"
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr "maatsoortsymbool `%s' niet gevonden; val terug op numerieke stijl"
@@ -1707,34 +1754,30 @@ msgstr "maatsoortsymbool `%s' niet gevonden; val terug op numerieke stijl"
 msgid "unknown translator: `%s'"
 msgstr "onbekende translator: `%s'"
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "kan niet vinden: `%s'"
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
-msgstr ""
+msgstr "Twee gelijktijdige %s gebeurtenissen, verschroot deze"
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
-msgstr ""
+msgstr "Vorige %s gebeurtinis hier"
 
-#: trill-spanner-engraver.cc:67
-msgid "can't find start of trill spanner"
+#: trill-spanner-engraver.cc:68
+msgid "cannot find start of trill spanner"
 msgstr "kan start van triller spanner niet vinden"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 msgid "already have a trill spanner"
 msgstr "heb al een tekst spanner"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
@@ -1744,7 +1787,7 @@ msgstr ""
 "de\n"
 "geselecteerde ligatuurstijl"
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
@@ -1752,7 +1795,7 @@ msgstr ""
 
 #: vaticana-ligature.cc:84
 msgid "flexa-height undefined; assuming 0"
-msgstr ""
+msgstr "flexa-hoogte ongedefiniëerd; uitgaan van 0"
 
 #: vaticana-ligature.cc:89
 msgid "ascending vaticana style flexa"
@@ -1763,420 +1806,437 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr "Vaticana_ligature: nulsamenvoeging (delta_pitch == 0)"
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
-msgid "can't end volta spanner"
+#: volta-engraver.cc:144
+msgid "cannot end volta spanner"
 msgstr "kan volta spanner niet beëindigen"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr "heb al een volta spanner, beëindig die voortijdig"
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 msgid "also already have an ended spanner"
 msgstr "heb ook al een beëidingde spanner"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+msgid "giving up"
+msgstr "geef op"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr "\\paper kan niet worden gebruikt in \\score, gebruik \\layout"
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr "heb \\paper nodig voor paper blok"
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
-msgstr ""
+msgstr "Grob naam zou alfanumeriek moeten zijn"
 
-#: parser.yy:1481
+#: parser.yy:1475
 msgid "second argument must be pitch list"
 msgstr "tweede argument moet een toonhoogtelijst zijn"
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 msgid "have to be in Lyric mode for lyrics"
 msgstr "moet in Lyric modus zijn voor liedteksten"
 
-#: parser.yy:1612
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr "verwacht string voor script definitie"
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "geen duur: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 msgid "have to be in Note mode for notes"
 msgstr "moet in Note modus zijn voor noten"
 
-#: parser.yy:2004
+#: parser.yy:1987
 msgid "have to be in Chord mode for chords"
 msgstr "moet in Chord modus zijn voor accoorden"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
-msgstr ""
+msgstr "losse UTF-8 BOM tegengekomen"
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
-msgstr ""
+msgstr "Overslaan van UTF-8 BOM"
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr "Hernoem invoer naar: `%s'"
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr "tekst tussen aanhalingstekens verwacht na \\version"
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr "tekst tussen aanhalingstekens verwacht na \\sourcefilename"
 
-#: lexer.ll:262
-#, fuzzy
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
-msgstr "tekst tussen aanhalingstekens verwacht na \\sourcefilename"
+msgstr "geheel getal verwacht na \\sourcefileline"
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "EOF gevonden in een kommentaar"
 
-#: lexer.ll:290
+#: lexer.ll:288
 msgid "\\maininput not allowed outside init files"
 msgstr "\\maininput niet toegestaan buiten init bestanden"
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "verkeerde of ongedefiniëerde identifier: `%s'"
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr "aanhalingstekens sluite mist"
 
-#: lexer.ll:468
+#: lexer.ll:466
 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:561
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr "Accolade gevonden aan het eind van een opmaak.  Een spatie vergeten?"
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ongeldig teken: `%c'"
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "onbekende ontsnapte string: `\\%s'"
 
-#: lexer.ll:882
+#: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "Verkeerde lilypond versie: %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
+msgstr "bestand te oud: %s (oudste ondersteund: %s)"
+
+#: lexer.ll:881 lexer.ll:882
+msgid "consider updating the input with the convert-ly script"
+msgstr "overweeg het actualiseren van de invoer met het convert-ly script"
 
-#: lexer.ll:883
-msgid "Consider updating the input with the convert-ly script"
-msgstr "Overweeg het actualiseren van de invoer met het convert-ly script"
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr "programma te oud: %s (bestand vereist: %s)"
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, lisp-format
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Inroepen van `~a'..."
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr "`~a' gefaald (~a)"
 
 # lisp-format
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, lisp-format
+#, scheme-format
 msgid "Converting to `~a'..."
 msgstr "Converteren naar `~a'..."
 
 # lisp-format
-#: backend-library.scm:110
-#, lisp-format
+#: backend-library.scm:108
+#, scheme-format
 msgid "Converting to ~a..."
 msgstr "Converteren naar ~a..."
 
-#: backend-library.scm:156
-#, lisp-format
+#: backend-library.scm:145
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "Schrijven van header veld `~a' naar `~a'..."
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
-msgstr ""
+msgstr "symbool ~S hergedefiniëerd"
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
-msgstr ""
+msgstr "gebeurtenisklasse ~A schijnt ongebruikt te zijn"
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
-msgstr ""
+msgstr "vertaler luistert naar nietbestaande gebeurtenisklasse ~A"
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr "geen systemen gevonden in \\score markup, heeft het een \\layout blok?"
 
-#: define-markup-commands.scm:1249
-#, lisp-format
+#: define-markup-commands.scm:1297
+#, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "geen geldige duurtekst: ~a"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
-msgstr ""
+msgstr "symbool verwacht: ~S"
 
-#: define-music-types.scm:737
-#, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "kan muziekobject niet vinden: ~S"
 
-#: define-music-types.scm:757
-#, lisp-format
+#: define-music-types.scm:774
+#, scheme-format
 msgid "unknown repeat type `~S'"
-msgstr "onbekend type herhaling `~S'"
+msgstr "onbekend herhaaltype `~S'"
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
-msgstr ""
+msgstr "Zie music-types.scm voor ondersteunde herhalingen"
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
-msgstr ""
+msgstr "paar verwacht in doc ~s"
 
 #: document-backend.scm:135
-#, lisp-format
-msgid "can't find interface for property: ~S"
-msgstr "kan interface voor property niet vinden: ~S"
+#, scheme-format
+msgid "cannot find interface for property: ~S"
+msgstr "kan grob bediening voor eigenschap niet vinden: ~S"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, scheme-format
 msgid "unknown Grob interface: ~S"
-msgstr "onbekende interface: ~S"
+msgstr "onbekende Grob bediening: ~S"
 
 #: documentation-lib.scm:45
-#, lisp-format
+#, scheme-format
 msgid "Processing ~S..."
 msgstr "Verwerken van ~S..."
 
 #: documentation-lib.scm:150
-#, lisp-format
+#, scheme-format
 msgid "Writing ~S..."
 msgstr "Schrijven van ~S..."
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
-msgstr "kan geen beschrijving vinden voor property ~S"
+#, scheme-format
+msgid "cannot find description for property ~S (~S)"
+msgstr "kan beschrijving voor eigenschap niet vinden ~S (~S)"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, scheme-format
 msgid "Writing ~a..."
 msgstr "Schrijven van ~a..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
-msgstr ""
-
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
-msgstr ""
-
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
-msgstr ""
-
-#: framework-ps.scm:379
-#, fuzzy, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
-msgstr "weet niet hoe articulatie te vertolken: "
-
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
-msgstr "kan <stdout> niet converteren naar ~S"
-
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
-msgstr "kan ~S niet genereren, gebruikmakend van het postscript backend"
-
-#: framework-ps.scm:639
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
+msgstr "kan niet inbedden ~S=~S"
+
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
+msgstr "kan bestand dat past op ~a niet uit ~a extraheren"
+
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
+msgstr "weet niet hoe ~S=~S in te bedden"
+
+#: framework-ps.scm:380
+#, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
+msgstr "weet niet hoe font in te bedden: ~s ~s ~s"
+
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
+msgstr "kan <stduit> niet converteren naar ~S"
+
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
+msgstr "kan ~S niet genereren, gebruikmakend van de postscript achterkant"
+
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
 "\n"
 "or remove the lilypond-book specific settings from the input.\n"
 msgstr ""
+"\n"
+"De PostScript achterkant ondersteund het 'klassieke'\n"
+"draadwerk niet.  Gebruik de EPS achterkant,<\n"
+"\n"
+"  lilypond -b eps <bestand>\n"
+"\n"
+"of verwijder de lilypond-book specfieke instellingen uit de invoer.\n"
 
 #: framework-tex.scm:360
-#, lisp-format
+#, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "TeX bestandsnaam mag geen spaties bevatten: `~a'"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
-msgstr ""
+msgstr "Fout in waardestreep kwantisering.  Verwacht (~S,~S) gevonden ~S."
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
-msgstr ""
+msgstr "Fout in waardestreep kwantisering.  Verwacht ~S 0, gevonden ~S."
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 msgid "Calculating page breaks..."
 msgstr "Berekenen van pagina-afbreuken..."
 
-#: lily-library.scm:510
-#, lisp-format
+#: lily-library.scm:593
+#, scheme-format
 msgid "unknown unit: ~S"
 msgstr "onbekende eenheid: ~S"
 
-#: lily-library.scm:543
-#, fuzzy, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
-"geen \\version uitdrukking gevonden,  voeg~atoe voor toekomstige "
+"geen \\version uitdrukking gevonden, voeg~atoe voor toekomstige "
 "compatibiliteit"
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr "oude relative compatibiliteit niet gebruikt"
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
-msgstr "kan niet vinden: `%s'"
+#: lily.scm:144
+#, scheme-format
+msgid "cannot find: ~A"
+msgstr "kan niet vinden: ~A"
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr "verkeert type voor argument ~a.  Verwacht ~a, gevonden ~s"
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr "gefaalde bestanden: ~S"
 
 # lisp-format
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, scheme-format
 msgid "Redirecting output to ~a..."
-msgstr "Converteren naar ~a..."
+msgstr "Omleiden van uitvoer naar ~a..."
 
 #: ly-syntax-constructors.scm:40
 msgid "Music head function must return Music object"
-msgstr ""
+msgstr "Muziek hoofd functie moet Muziek object teruggeven"
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
-msgstr ""
+msgstr "Ongeldige eigenschap operatie ~a"
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
-msgstr "verkeerd aantal argumenten ~a.  Verwacht ~A, gevonden ~A: ~S"
+msgstr "verkeerd aantal argumenten.  Verwacht: ~A, gevonden ~A: ~S"
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
-msgstr ""
+msgstr "Ongeldig argument in positie ~A.  Verwach: ~A, gevonden: ~S."
 
-#: music-functions.scm:210
-#, fuzzy
-msgid "More alternatives than repeats. Junking excess alternatives"
-msgstr "meer alternatieven dan herhalingen"
+#: music-functions.scm:213
+msgid "More alternatives than repeats.  Junking excess alternatives"
+msgstr ""
+"Meer alternatieven dan herhalingen.  Verschroten van overtollige "
+"alternatieven"
 
-#: music-functions.scm:229
-#, fuzzy, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
-msgstr "verwacht 2 elementen voor akkoordtremolo, %d gevonden"
+msgstr "verwacht 2 elementen voor akkoordtremolo, ~a gevonden"
 
-#: music-functions.scm:535
-#, lisp-format
+#: music-functions.scm:538
+#, scheme-format
 msgid "music expected: ~S"
-msgstr ""
+msgstr "muziek verwacht: ~S"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
-msgstr ""
+msgstr "Maat controle gefaald.  Verwacht bij ~a te zijn, maar ben bij ~a"
 
-#: music-functions.scm:745
-#, lisp-format
-msgid "can't find quoted music `~S'"
-msgstr "kan aangehaalde muziek niet vinden `~S'"
+#: music-functions.scm:748
+#, scheme-format
+msgid "cannot find quoted music: `~S'"
+msgstr "kan aangehaalde muziek niet vinden: `~S'"
 
-#: music-functions.scm:953
-#, lisp-format
+#: music-functions.scm:942
+#, scheme-format
 msgid "unknown accidental style: ~S"
-msgstr "onbekende voortekenstijl: ~S"
+msgstr "onbekende toevallig teken stijl: ~S"
 
 #: output-ps.scm:315
 msgid "utf-8-string encountered in PS backend"
-msgstr ""
+msgstr "utf-8-string tegengekomen in in PS achtereinde"
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
-msgstr ""
+msgstr "ongedefiniëerd: ~S"
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
-msgstr ""
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
+msgstr "kan Pango fontbeschrijving niet ontcijferen: ~a"
 
 #: output-tex.scm:98
-#, lisp-format
-msgid "can't find ~a in ~a"
+#, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "kan ~a niet vinden in ~a"
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr "Niet in topniveau scope"
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
-msgstr ""
+msgstr "Dit is geen \\layout {} object, ~S"
 
-#: paper.scm:126
-#, lisp-format
+#: paper.scm:129
+#, scheme-format
 msgid "Unknown papersize: ~a"
-msgstr ""
+msgstr "Onbekende papiergrootte: ~a"
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr "Moet #(set-paper-size .. ) gebruiken in \\paper { ... }"
 
 #: parser-clef.scm:126
-#, lisp-format
+#, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "onbekend sleuteltype `~a'"
 
@@ -2184,326 +2244,12 @@ msgstr "onbekend sleuteltype `~a'"
 msgid "see scm/clef.scm for supported clefs"
 msgstr "zie scm/clef.scm voor ondersteunde sleutels"
 
-#: ps-to-png.scm:97
-#, fuzzy, lisp-format
+#: ps-to-png.scm:88
+#, scheme-format
 msgid "~a exited with status: ~S"
-msgstr "%s eindigde met status: %d"
+msgstr "%a sloot af met status: ~S"
 
 #: to-xml.scm:190
-msgid "assertion failed"
-msgstr ""
-
-#~ msgid "no one to print a tremolos"
-#~ msgstr "niemand om tremolos af te drukken"
-
-#~ msgid "gotcha: ptr=%ul"
-#~ msgstr "hebbes: ptr=%ul"
-
-#~ msgid "distance undefined, assuming 0.1"
-#~ msgstr "afstand ongedefinieerd, gebruik 0.1"
-
-#~ msgid "distance=%f"
-#~ msgstr "afstand=%f"
-
-#~ msgid "junking event: `%s'"
-#~ msgstr "verschroot gebeurtenis: `%s'"
-
-#~ msgid "no one to print a repeat brace"
-#~ msgstr "niemand om een herhalings haak af te drukken"
-
-#~ msgid "can't find `%s' context"
-#~ msgstr "kan `%s' context niet vinden"
-
-#~ msgid "Optimal demerits: %f"
-#~ msgstr "Optimale foutscore: %f"
-
-#~ msgid "no feasible line breaking found"
-#~ msgstr "geen werkbare regelafbreuk gevonden"
-
-#~ msgid "can't find line breaking that satisfies constraints"
-#~ msgstr "kan geen regelbreuk vinden die aan voorwaarden voldoet"
-
-#~ msgid "music for the martians."
-#~ msgstr "muziek voor de marsmannetjes."
-
-#~ msgid "no one to print a percent"
-#~ msgstr "niemand om een procent herhaling af te drukken"
-
-#~ msgid "Creator: "
-#~ msgstr "Schepper: "
-
-#~ msgid "at "
-#~ msgstr "dd "
-
-#~ msgid "in quotation: junking event %s"
-#~ msgstr "in aanhaling: verschroten van gebeurtenis %s"
-
-#~ msgid "Global shortest duration is %s"
-#~ msgstr "Globaal kortste lengte is %s"
-
-#~ msgid "TFM header of `%s' has only %u word (s)"
-#~ msgstr "TFM kop van `%s' heeft slechts %u woord(en)"
-
-#~ msgid ""
-#~ "%s: TFM file has %u parameters, which is more than the %u I can handle"
-#~ msgstr ""
-#~ "%s: TFM bestand heeft %u parameters, wat meer is dan de %u die ik aan kan"
-
-#~ msgid "can't find ascii character: %d"
-#~ msgstr "kan ascii teken niet vinden: %d"
-
-#~ msgid "no one to print a tuplet start bracket"
-#~ msgstr "niemand om een x-ool start haak af te drukken"
-
-#~ msgid "unterminated trill spanner"
-#~ msgstr "onbeëindigde trill spanner"
-
-#~ msgid "identifier should have alphabetic characters only"
-#~ msgstr "identifier zou uitsluitend alfabetische tekens moeten hebben"
-
-#~ msgid "can't find signature for music function"
-#~ msgstr "kan signatuur van muziekfunctie niet vinden"
-
-#~ msgid "lilylib module"
-#~ msgstr "lilylib module"
-
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "Gebruik: %s [OPTIE]... BESTAND"
-
-#~ msgid "Binary %s has version %s, looking for version %s"
-#~ msgstr "Binair programma %s heeft versie %s, zocht naar versie %s"
-
-#~ msgid "Opening pipe `%s'"
-#~ msgstr "Openen van pijp `%s'..."
-
-#~ msgid "`%s' failed (%s)"
-#~ msgstr "`%s' gefaald (%s)"
-
-#~ msgid "(ignored)"
-#~ msgstr "(genegeerd)"
-
-#~ msgid "Cleaning %s..."
-#~ msgstr "Schoonmaken van %s..."
-
-#~ msgid "Usage: %s [OPTION]... [FILE]..."
-#~ msgstr "Gebruik: %s [OPTIE]... [BESTAND]..."
-
-#~ msgid ""
-#~ "  -e, --edit             edit in place\n"
-#~ "  -f, --from=VERSION     start from VERSION [default: \\version found in "
-#~ "file]\n"
-#~ "  -h, --help             print this help\n"
-#~ "  -n, --no-version       do not add \\version command if missing\n"
-#~ "  -s, --show-rules       print rules [default: --from=0, --"
-#~ "to=@TOPLEVEL_VERSION@]\n"
-#~ "  -t, --to=VERSION       convert to VERSION [default: "
-#~ "@TOPLEVEL_VERSION@]\n"
-#~ "  -v, --version          print program version"
-#~ msgstr ""
-#~ "  -e, --edit             verander ter plekke\n"
-#~ "  -f, --from=VERSIE      begin bij VERSIE [standaard: \\version uit "
-#~ "bestand]\n"
-#~ "  -h, --help             toon deze hulp\n"
-#~ "  -n, --no-version       voeg geen \\version uitdrukking toe als die "
-#~ "ontbreekt\n"
-#~ "  -s, --show-rules       toon regels [standaard: --from=0, --"
-#~ "to=@TOPLEVEL_VERSION@]\n"
-#~ "  -t, --to=VERSION       converteer naar VERSIE [standaard: "
-#~ "@TOPLEVEL_VERSION@]\n"
-#~ "  -v, --version          toon programmaversie"
-
-#~ msgid "%s: skipping: `%s'"
-#~ msgstr "%s: overslaan: `%s'"
-
-#~ msgid "FMT"
-#~ msgstr "FMT"
-
-#~ msgid "print version information"
-#~ msgstr "toon versieinformatie"
-
-#~ msgid "getopt says: `%s'"
-#~ msgstr "getopt zegt: `%s'"
-
-#~ msgid "Not in FILE:LINE:COL format: "
-#~ msgstr "Niet in BESTAND:REGEL:KOLOM formaat: "
-
-#~ msgid "Command failed: `%s' (status %d)"
-#~ msgstr "Opdracht gefaald: `%s' (status %d)"
-
-#~ msgid "command exited with value %d"
-#~ msgstr "opdracht eindigde met waarde %d"
-
-#~ msgid "Example:"
-#~ msgstr "Voorbeeld:"
-
-#~ msgid "Convert mup to LilyPond source."
-#~ msgstr "Converteer mup naar LilyPond broncode."
-
-#~ msgid "debug"
-#~ msgstr "debug"
-
-#~ msgid "define macro NAME [optional expansion EXP]"
-#~ msgstr "definieer macro NAAM [optionele expansie EXP]"
-
-#~ msgid "only pre-process"
-#~ msgstr "alleen pre-processen"
-
-#~ msgid "no such context: %s"
-#~ msgstr "geen context als: `%s'"
-
-#~ msgid "Processing `%s'..."
-#~ msgstr "Verwerken van `%s'..."
-
-#~ msgid "Convert PostScript to PNG image."
-#~ msgstr "Converteer PostScript naar PNG plaatje."
-
-#~ msgid "PAPER"
-#~ msgstr "PAPIER"
-
-#~ msgid "use papersize PAPER"
-#~ msgstr "gebruike papiermaat PAPIER"
-
-#~ msgid "RES"
-#~ msgstr "RES"
-
-#~ msgid "set the resolution of the preview to RES"
-#~ msgstr "zet de resolutie voor het testbeeld op RES"
-
-#~ msgid "Wrote `%s'"
-#~ msgstr "Geschreven `%s'..."
-
-#~ msgid "can't dlopen: %s: %s"
-#~ msgstr "kan bestand niet openen: `%s'"
-
-#~ msgid "install package: %s or %s"
-#~ msgstr "installeer pakket: %s of %s"
-
-#~ msgid "error opening kpathsea library"
-#~ msgstr "fout bij openen van kpathsea bibliotheek"
-
-#~ msgid "aborting"
-#~ msgstr "afbreken"
-
-#~ msgid "parsing AFM file: `%s'"
-#~ msgstr "bij ontleden AFM-bestand: `%s'"
-
-#~ msgid "checksum mismatch for font file: `%s'"
-#~ msgstr "checksum fout voor fontbestand: `%s'"
-
-#~ msgid "does not match: `%s'"
-#~ msgstr "komt niet overeen met: `%s'"
-
-#~ msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
-#~ msgstr ""
-#~ "Herbouw alle .afm bestanden en verwijder alle .pk en .tfm bestanden."
-
-#~ msgid "Rerun with -V to show font paths."
-#~ msgstr "Draai opnieuw met -V voor het tonen van fontpaden."
-
-#~ msgid "A script for removing font-files is delivered with the source-code:"
-#~ msgstr ""
-#~ "Een script ter verwijdering van fontbestanden is meegeleverd bij de bron-"
-#~ "code:"
-
-#~ msgid "beam has less than two visible stems"
-#~ msgstr "waardestreep heeft minder dan twee zichtbare stokken"
-
-#~ msgid "initializing FontConfig"
-#~ msgstr "initialiseren van FontConfig"
-
-#~ msgid "adding lilypond directory: %s"
-#~ msgstr "toevoegen van lilypond map: %s"
-
-#~ msgid ""
-#~ "set scheme option, for help use\n"
-#~ "                                       -e '(ly:option-usage)'"
-#~ msgstr ""
-#~ "zet scheme optie, voor help doe\n"
-#~ "                                       -e '(ly:option-usage)'"
-
-#~ msgid "run in safe mode"
-#~ msgstr "draai in veilige modus"
-
-#~ msgid "can't handle a percent repeat of length: %s"
-#~ msgstr "kan procent herhaling van deze lengte niet afhandelen"
-
-#~ msgid "rest direction not set.  Cannot resolve collision."
-#~ msgstr "rustrichting niet gezet.  Kan botsing niet voorkomen."
-
-#~ msgid "lilypond -e EXPR means:"
-#~ msgstr "lilypond -e EXPR betekent:"
-
-#~ msgid "  Evalute the Scheme EXPR before parsing any .ly files."
-#~ msgstr "  Evalueer de Scheme EXPR alvorens enig .ly bestand te ontleden."
-
-#~ msgid ""
-#~ "  Multiple -e options may be given, they will be evaluated sequentially."
-#~ msgstr ""
-#~ "  Verscheidene -e opties mogen worden gegeven, deze zullen sequentieel "
-#~ "worden geëvalueerd."
-
-#~ msgid ""
-#~ "  The function ly:set-option allows for access to some internal variables."
-#~ msgstr ""
-#~ "  De functie ly:set-option verschaft toegang tot bepaalde interne "
-#~ "variabelen."
-
-#~ msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
-#~ msgstr "Gebruik: lilypond -e \"(ly:set-option SYMBOOL WAARDE)\""
-
-#~ msgid "Use help as SYMBOL to get online help."
-#~ msgstr "Gebruik help als symbool voor online hulp."
-
-#~ msgid "Separation_item:  I've been drinking too much"
-#~ msgstr "Separation_item:  Ik heb te veel gedronken"
-
-#~ msgid "removing tuplet bracket across linebreak"
-#~ msgstr "verwijderen van tuplet haak over regelbreuk"
-
-#~ msgid "tag must be symbol or list of symbols"
-#~ msgstr "tag moet symbool of lijst van symbolen zijn"
-
-#~ msgid "need integer number arg"
-#~ msgstr "heb integer getal arg nogig"
-
-#~ msgid "suspect duration in beam: %s"
-#~ msgstr "verdachte duur in waardestreep: %s"
-
-#~ msgid "syntax error: cannot back up"
-#~ msgstr "syntaxis fout, kan niet terugtrekken "
-
-#~ msgid "Reading a token: "
-#~ msgstr "Lezen van een token: "
-
-#~ msgid "syntax error, unexpected %s"
-#~ msgstr "syntaxis fout, onverwachte %s"
-
-#~ msgid "syntax error, unexpected %s, expecting %s"
-#~ msgstr "syntaxis fout, onverwachte %s, verwacht %s"
-
-#~ msgid "syntax error, unexpected %s, expecting %s or %s"
-#~ msgstr "syntaxis fout, onverwachte %s, verwacht %s of %s"
-
-#~ msgid "syntax error, unexpected %s, expecting %s or %s or %s"
-#~ msgstr "syntaxis fout, onverwachte %s, verwacht %s of %s of %s"
-
-#~ msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s"
-#~ msgstr "syntaxis fout, onverwachte %s, verwacht %s of %s of %s of %s"
-
-#~ msgid "syntax error; also memory exhausted"
-#~ msgstr "syntaxis fout: virtual geheugen ook uitgeput"
-
-#~ msgid "syntax error"
-#~ msgstr "syntaxis fout"
-
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
-#~ msgstr "kan CFF/PFA/PFB font niet vinden: ~S=~S"
-
-#~ msgid "unknown bar glyph: `~S'"
-#~ msgstr "onbekend type maatstreep: `~S'"
-
-#~ msgid "Extracting fonts to %s..."
-#~ msgstr "Schrijven van fonts naar %s..."
-
-#~ msgid "Writing %s..."
-#~ msgstr "Schrijven van `%s'..."
+#, scheme-format
+msgid "assertion failed: ~S"
+msgstr "assertie gefaald: ~S"
diff --git a/po/ru.po b/po/ru.po
index 4553ff75ef..cf49539a67 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
+"PO-Revision-Date: 2006-12-23 16:16+0100\n"
 "Last-Translator: August S.Sigov <august@infran.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -72,147 +72,155 @@ msgid "Running %s..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: "
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
 #, fuzzy
-msgid "set output filename to FILE"
+msgid "write output to FILE"
 msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr "óÏÏÂÝÁÊÔÅ ÏÂ ÏÛÉÂËÁÈ ÐÏ %s."
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
+msgstr ""
+
+#: convert-ly.py:43 lilypond-book.py:73
+msgid "Examples:"
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, fuzzy, c-format, python-format
 msgid "warning: %s"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: "
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, fuzzy, c-format, python-format
 msgid "error: %s"
 msgstr "ÏÛÉÂËÁ: "
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
-msgstr "óÏ×ÅÒÛÁÀ ÈÁÒÁËÉÒÉ"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
+msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "ïÂÒÁÂÁÔÙ×ÁÀ..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'"
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]"
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-#, fuzzy
-msgid "write output to FILE"
-msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "æáêì"
 
-#: etf2ly.py:1204 midi2ly.py:899
-#, fuzzy
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr ""
+
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, fuzzy, python-format
 msgid "Exiting (%d)..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by"
@@ -228,7 +236,8 @@ msgstr ""
 
 #: lilypond-book.py:135
 #, fuzzy
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû"
 
 #: lilypond-book.py:138
@@ -236,6 +245,10 @@ msgstr "
 msgid "add DIR to include path"
 msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "ëáô"
+
 #: lilypond-book.py:143
 #, fuzzy
 msgid "write output to DIR"
@@ -249,149 +262,149 @@ msgstr ""
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 #, fuzzy
 msgid "be verbose"
 msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, fuzzy, python-format
 msgid "Opening filter `%s'"
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr ""
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 #, fuzzy
 msgid "Writing snippets..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 #, fuzzy
 msgid "Processing..."
 msgstr "ïÂÒÁÂÁÔÙ×ÁÀ..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'"
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, python-format
 msgid "%s is up to date."
 msgstr ""
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, fuzzy, python-format
 msgid "Writing `%s'..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, fuzzy, python-format
 msgid "Reading %s..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 #, fuzzy
 msgid "Dissecting..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, fuzzy, python-format
 msgid "Compiling %s..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, fuzzy, python-format
 msgid "Processing include: %s"
 msgstr "ïÂÒÁÂÁÔÙ×ÁÀ..."
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, fuzzy, python-format
 msgid "Removing `%s'"
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, fuzzy, python-format
 msgid "Writing fonts to %s..."
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "ÏÛÉÂËÁ: "
 
@@ -404,8 +417,9 @@ msgstr ""
 msgid "%s output to `%s'..."
 msgstr "×Ù×ÏÄ MIDI × %s..."
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, python-format
+msgid "Convert %s to LilyPond input."
 msgstr ""
 
 #: midi2ly.py:875
@@ -449,34 +463,60 @@ msgid "treat every text as a lyric"
 msgstr ""
 
 #: midi2ly.py:905
-msgid "example"
+msgid "Examples"
 msgstr ""
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr ""
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"üÔÏ Ó×ÏÂÏÄÎÏÅ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ. ïÎÏ ÏÈÒÁÎÑÅÔÓÑ ïÂÝÅÊ ïÔËÒÙÔÏÊ\n"
+"ìÉÃÅÎÚÉÅÊ GNU, É ÷Ù ÍÏÖÅÔÅ ÉÚÍÅÎÑÔØ ÅÇÏ É/ÉÌÉ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÅÇÏ ËÏÐÉÉ\n"
+"ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n"
+"ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ"
+
+#: getopt-long.cc:140
 #, 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:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "ÏÐÃÉÑ `%s' ÎÅ ÄÏÐÕÓËÁÅÔ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÁÒÇÕÍÅÎÔÁ"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ: `%s'"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ ÏÐÃÉÉ `%s'"
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, fuzzy, c-format
 msgid "programming error: %s"
 msgstr "ÏÛÉÂËÁ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ: "
@@ -485,86 +525,75 @@ msgstr "
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ: `%s'"
 
-#: all-font-metrics.cc:165
-#, fuzzy
-msgid "loading default font"
-msgstr "úÁÇÒÕÖÁÀ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(ÐÕÔØ ÐÏÉÓËÁ: `%s')"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-#, fuzzy
-msgid "giving up"
-msgstr "óÄÁÀÓØ"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "ÎÅ ÍÏÇÕ ÓÍÅÎÉÔØ `%s' ÎÁ `%s'"
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -578,19 +607,20 @@ msgstr "
 msgid "unterminated beam"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÇÒÕÐÐÉÒÏ×ËÁ ÛÔÉÌÅÊ"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr "ÛÔÉÌØ ÄÏÌÖÅÎ ÉÍÅÔØ ÒÉÔÍÏ×ÕÀ ÓÔÒÕËÔÕÒÕ"
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+#, fuzzy
+msgid "stem does not fit in beam"
 msgstr "ÛÔÉÌØ ÎÅ ×ÌÅÚÁÅÔ × ÇÒÕÐÐÉÒÏ×ËÕ"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ"
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 #, fuzzy
 msgid "no feasible beam position"
 msgstr "îÅ ÎÁÊÄÅÎÏ ÕÄÏ×ÌÅÔ×ÏÒÉÔÅÌØÎÏÇÏ ÒÁÚÒÙ×Á ÓÔÒÏËÉ"
@@ -600,24 +630,24 @@ msgstr "
 msgid "removing beam with no stems"
 msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, fuzzy, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ ÂÕÍÁÇÉ: `%s'"
 
 #: change-iterator.cc:23
 #, fuzzy, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÓÍÅÎÉÔØ `%s' ÎÁ `%s'"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'"
 
 #. We could change the current translator's id, but that would make
@@ -648,7 +678,7 @@ msgstr "
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
@@ -662,33 +692,33 @@ msgstr "
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
 
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, c-format
 msgid "program has no such type: `%s'"
 msgstr ""
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
 #: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ÐÏÄ ÎÁÚ×ÁÎÉÅÍ: `%s'"
 
 #: context.cc:276
@@ -698,7 +728,7 @@ msgstr ""
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
 #: custos.cc:77
@@ -706,17 +736,22 @@ msgstr "
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, fuzzy, c-format
 msgid "Unknown event class %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ËÌÀÞÁ"
 
+#: dots.cc:38
+#, c-format
+msgid "dot `%s' not found"
+msgstr ""
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÁÞÁÌÏ (ÄÅ)ËÒÅÝÅÎÄÏ"
 
 #: dynamic-engraver.cc:195
@@ -736,11 +771,7 @@ msgstr "
 msgid "unterminated (de)crescendo"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ (ÄÅ)ËÒÅÝÅÎÄÏ"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ"
 
@@ -763,15 +794,15 @@ msgstr "
 msgid "adding font directory: %s"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ"
@@ -804,47 +835,38 @@ msgstr ""
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, fuzzy, c-format
 msgid "Unknown interface `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ËÌÀÞÁ"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr ""
 
-#: hairpin.cc:180
-#, fuzzy
-msgid "crescendo too small"
-msgstr "ËÒÅÝÅÎÄÏ"
-
-#: horizontal-bracket-engraver.cc:58
+#: horizontal-bracket-engraver.cc:59
 #, fuzzy
-msgid "don't have that many brackets"
+msgid "do not have that many brackets"
 msgstr "îÅÔ ÔÁËÏÇÏ ËÏÌÉÞÅÓÔ×Á ÏËÔÁ× (%s)"
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 msgid "conflicting note group events"
 msgstr ""
 
@@ -862,93 +884,98 @@ msgstr "
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(ÐÕÔØ ÐÏÉÓËÁ: `%s')"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "ÐÏÌÏÖÅÎÉÅ ÎÅÉÚ×ÅÓÔÎÏ"
 
-#: ligature-engraver.cc:95
+#: ligature-engraver.cc:93
 #, fuzzy
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr ""
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 #, fuzzy
 msgid "already have a ligature"
 msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr ""
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 #, fuzzy
 msgid "unterminated ligature"
 msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 #, fuzzy
 msgid "ligature was started here"
 msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(ÐÕÔØ ÚÁÇÒÕÚËÉ: `%s')"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "éÍÑ ËÏÍÁÎÄÙ Ñ×ÌÑÅÔÓÑ ËÌÀÞÅ×ÙÍ ÓÌÏ×ÏÍ: `%s'"
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "ÏÛÍÂËÁ × ËÏÎÃÅ ÆÁÊÌÁ: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, c-format
 msgid "deprecated function called: %s"
 msgstr ""
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:88
 #, fuzzy, c-format
-msgid "Changing working directory to `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, fuzzy, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
 #: lily-parser-scheme.cc:125
@@ -956,21 +983,21 @@ msgstr "
 msgid "Processing `%s'"
 msgstr "ïÂÒÁÂÁÔÙ×ÁÀ..."
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "òÁÚÂÉÒÁÀ..."
 
-#: lily-parser.cc:126
+#: lily-parser.cc:127
 #, fuzzy
-msgid "braces don't match"
+msgid "braces do not match"
 msgstr "æÉÇÕÒÎÙÅ ÓËÏÂËÉ ÎÅ ÓÏ×ÐÁÄÁÀÔ"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, fuzzy, c-format
 msgid "cannot find Voice `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
-#: main.cc:117
+#: main.cc:116
 #, fuzzy, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -983,7 +1010,7 @@ msgstr ""
 "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n"
 "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: main.cc:123
+#: main.cc:122
 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"
@@ -994,134 +1021,134 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
-msgid "SYM=VAL"
+#: main.cc:155
+msgid "SYM[=VAL]"
 msgstr ""
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 #, fuzzy
 msgid "evaluate scheme code"
 msgstr "îÅ ÍÏÇÕ ×ÙÐÏÌÎÑÔØ ËÏÄ ÓÈÅÍÙ × ÂÅÚÏÐÁÓÎÏÍ ÒÅÖÉÍÅ"
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 msgid "generate DVI (tex backend only)"
 msgstr ""
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 msgid "generate PDF (default)"
 msgstr ""
 
-#: main.cc:167
+#: main.cc:165
 msgid "generate PNG"
 msgstr ""
 
-#: main.cc:168
+#: main.cc:166
 msgid "generate PostScript"
 msgstr ""
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:170
-msgid "print this help"
-msgstr "ÜÔÁ ÓÐÒÁ×ËÁ"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 #, fuzzy
 msgid "FIELD"
 msgstr "æáêì"
 
-#: main.cc:171
-msgid "dump a header field to file BASENAME.FIELD"
+#: main.cc:169
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:172
-msgid "DIR"
-msgstr "ëáô"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ"
 
-#: main.cc:179
+#: main.cc:178
 #, fuzzy
 msgid "write output to FILE (suffix will be added)"
 msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ"
 
-#: main.cc:180
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr ""
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ"
 
-#: main.cc:223
+#: main.cc:224
 #, fuzzy, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1129,79 +1156,79 @@ msgid ""
 msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by"
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..."
 
-#: main.cc:252
+#: main.cc:253
 #, fuzzy, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ."
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "ïÐÃÉÉ:"
 
-#: main.cc:262
+#: main.cc:263
 #, fuzzy, c-format
 msgid "Report bugs via %s"
 msgstr "óÏÏÂÝÁÊÔÅ ÏÂ ÏÛÉÂËÁÈ ÐÏ %s."
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:322
+#: main.cc:323
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
 
-#: main.cc:341
+#: main.cc:342
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "ÎÅ ÍÏÇÕ ÓÍÅÎÉÔØ `%s' ÎÁ `%s'"
 
-#: main.cc:349
+#: main.cc:350
 #, fuzzy, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
-#: main.cc:356
+#: main.cc:357
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "ÎÅ ÍÏÇÕ ÓÍÅÎÉÔØ `%s' ÎÁ `%s'"
 
-#: main.cc:362
+#: main.cc:363
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "ÎÅ ÍÏÇÕ ÓÍÅÎÉÔØ `%s' ÎÁ `%s'"
 
-#: main.cc:368
+#: main.cc:369
 #, fuzzy, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
 #: main.cc:415
@@ -1209,7 +1236,7 @@ msgstr "
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1223,37 +1250,37 @@ msgstr ""
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1261,7 +1288,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr ""
 
@@ -1278,116 +1305,119 @@ msgstr ""
 msgid "no such MIDI instrument: `%s'"
 msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "ÇÌÕÐÙÊ ÔÏÎ"
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
 #: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:208
+#: music.cc:207
 #, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr ""
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ."
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr ""
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
 
 #: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ: `%s'"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 #, fuzzy
 msgid "Drawing systems..."
 msgstr "óÏÚÄÁÀ ÇÏÌÏÓÁ..."
 
-#: pango-font.cc:215
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1425,15 +1455,15 @@ msgstr "
 msgid "Track..."
 msgstr "äÏÒÏÖËÁ ..."
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "×Ù×ÏÄ MIDI × %s..."
@@ -1443,23 +1473,23 @@ msgstr "
 msgid "unterminated phrasing slur"
 msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ"
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, fuzzy, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, fuzzy, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, fuzzy, c-format
 msgid "no such internal option: %s"
 msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
@@ -1469,116 +1499,115 @@ msgstr "
 msgid "not a grob name, `%s'"
 msgstr ""
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "Relocation file %s\n"
+msgid "Relocation file: %s"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
 
-#: relocate.cc:358
-#, fuzzy, c-format
-msgid "can't open file %s"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
-
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÎÁÌÅÚÁÀÝÉÈ ÐÁÕÚ"
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr ""
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ: `%s'"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr ""
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(ÐÕÔØ ÐÏÉÓËÁ: `%s')"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr "óÏ×ÅÒÛÁÀ ÈÁÒÁËÉÒÉ"
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 #, fuzzy
 msgid "errors found, ignoring music expression"
 msgstr "îÁÊÄÅÎÙ ÏÛÉÂËÉ/*, ÎÅ ÏÂÒÁÂÁÔÙ×ÁÀ ÎÏÔÙ*/"
 
 #. FIXME:
 #: script-engraver.cc:102
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr ""
 
 #: script-engraver.cc:103
@@ -1591,17 +1620,18 @@ msgstr "
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ"
 
-#: slur-engraver.cc:165
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
 #: source-file.cc:74
@@ -1613,60 +1643,60 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, fuzzy, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 msgid "weird stem size, check for narrow beams"
 msgstr ""
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:270
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: text-spanner-engraver.cc:60
+#: text-spanner-engraver.cc:61
 #, fuzzy
-msgid "can't find start of text spanner"
+msgid "cannot find start of text spanner"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 #, fuzzy
 msgid "already have a text spanner"
 msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 #, fuzzy
 msgid "unterminated text spanner"
 msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr ""
 
@@ -1675,14 +1705,14 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
@@ -1692,43 +1722,39 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr ""
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ: `%s'"
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
@@ -1746,269 +1772,280 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+#, fuzzy
+msgid "giving up"
+msgstr "óÄÁÀÓØ"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 #, fuzzy
 msgid "second argument must be pitch list"
 msgstr "÷ÔÏÒÏÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÓÉÍ×ÏÌÏÍ"
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 #, fuzzy
 msgid "have to be in Lyric mode for lyrics"
 msgstr "äÏÌÖÅÎ ÂÙÔØ × ìÉÒÉÞÅÓËÏÍ ÒÅÖÉÍÅ ÄÌÑ ÌÉÒÉËÉ"
 
-#: parser.yy:1612
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "ÎÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 #, fuzzy
 msgid "have to be in Note mode for notes"
 msgstr "äÏÌÖÅÎ ÂÙÔØ × îÏÔÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÎÏÔ"
 
-#: parser.yy:2004
+#: parser.yy:1987
 #, fuzzy
 msgid "have to be in Chord mode for chords"
 msgstr "äÏÌÖÅÎ ÂÙÔØ × áËËÏÒÄÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÁËËÏÒÄÏ×"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, fuzzy, c-format
 msgid "Renaming input to: `%s'"
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "ëÏÎÅà ÆÁÊÌÁ ×ÎÕÔÒÉ ËÏÍÍÅÎÔÁÒÉÑ"
 
-#: lexer.ll:290
+#: lexer.ll:288
 msgid "\\maininput not allowed outside init files"
 msgstr ""
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÍÅÔËÁ/ËÏÍÁÎÄÁ: `%s'"
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:561
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'"
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'"
 
-#: lexer.ll:882
-#, fuzzy, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "ÎÅ×ÅÒÎÁÑ ×ÅÒÓÉÑ mudela: %s (%s, %s)"
+#: lexer.ll:880 lexer.ll:881
+#, c-format
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
+
+#: lexer.ll:881 lexer.ll:882
+msgid "consider updating the input with the convert-ly script"
+msgstr ""
 
-#: lexer.ll:883
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
 msgstr ""
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, fuzzy, lisp-format
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, fuzzy, scheme-format
 msgid "Invoking `~a'..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr ""
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Converting to `~a'..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: backend-library.scm:110
-#, fuzzy, lisp-format
+#: backend-library.scm:108
+#, fuzzy, scheme-format
 msgid "Converting to ~a..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: backend-library.scm:156
-#, fuzzy, lisp-format
+#: backend-library.scm:145
+#, fuzzy, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..."
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "ÎÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ: %d"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:737
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, fuzzy, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'"
 
-#: define-music-types.scm:757
-#, fuzzy, lisp-format
+#: define-music-types.scm:774
+#, fuzzy, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ËÌÀÞÁ"
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
+#, fuzzy, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ Ó ÎÏÍÅÒÏÍ: %d"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ËÌÀÞÁ"
 
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "ïÂÒÁÂÁÔÙ×ÁÀ..."
 
 #: documentation-lib.scm:150
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Writing ~S..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, fuzzy, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ Ó ÎÏÍÅÒÏÍ: %d"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:379
-#, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2017,56 +2054,56 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "õÖÅ ÓÏÄÅÒÖÉÔ: `%s'"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 #, fuzzy
 msgid "Calculating page breaks..."
 msgstr "÷ÙÞÉÓÌÑÀ ÐÏÚÉÃÉÉ ÓÔÏÌÂÃÏ×"
 
-#: lily-library.scm:510
-#, lisp-format
+#: lily-library.scm:593
+#, scheme-format
 msgid "unknown unit: ~S"
 msgstr ""
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ: `%s'"
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..."
 
@@ -2074,48 +2111,48 @@ msgstr "\"
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
-msgid "More alternatives than repeats. Junking excess alternatives"
+#: music-functions.scm:213
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, fuzzy, lisp-format
+#: music-functions.scm:538
+#, fuzzy, scheme-format
 msgid "music expected: ~S"
 msgstr "× ÔÏ ×ÒÅÍÑ ËÁË ÏÖÉÄÁÌÏÓØ"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ: `%s'"
 
-#: music-functions.scm:953
-#, fuzzy, lisp-format
+#: music-functions.scm:942
+#, fuzzy, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'"
 
@@ -2124,42 +2161,42 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
+#, fuzzy, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr ""
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, fuzzy, lisp-format
+#: paper.scm:129
+#, fuzzy, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ ÂÕÍÁÇÉ: `%s'"
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ËÌÀÞÁ"
 
@@ -2167,15 +2204,45 @@ msgstr "
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, lisp-format
+#: ps-to-png.scm:88
+#, scheme-format
 msgid "~a exited with status: ~S"
 msgstr ""
 
 #: to-xml.scm:190
-msgid "assertion failed"
+#, scheme-format
+msgid "assertion failed: ~S"
 msgstr ""
 
+#, fuzzy
+#~ msgid "show warranty"
+#~ msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright"
+
+#, fuzzy
+#~ msgid "loading default font"
+#~ msgstr "úÁÇÒÕÖÁÀ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'"
+
+#, fuzzy
+#~ msgid "crescendo too small"
+#~ msgstr "ËÒÅÝÅÎÄÏ"
+
+#~ msgid "print this help"
+#~ msgstr "ÜÔÁ ÓÐÒÁ×ËÁ"
+
+#~ msgid "silly pitch"
+#~ msgstr "ÇÌÕÐÙÊ ÔÏÎ"
+
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
+
+#, fuzzy
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "ÎÅ×ÅÒÎÁÑ ×ÅÒÓÉÑ mudela: %s (%s, %s)"
+
 #, fuzzy
 #~ msgid "no one to print a tremolos"
 #~ msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ"
@@ -2187,7 +2254,7 @@ msgstr ""
 #~ msgid "no one to print a repeat brace"
 #~ msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ"
 
-#~ msgid "can't find `%s' context"
+#~ msgid "cannot find `%s' context"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'"
 
 #, fuzzy
@@ -2210,7 +2277,7 @@ msgstr ""
 #~ msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÚÁÐÒÏÓ: `%s'"
 
 #, fuzzy
-#~ msgid "can't find ascii character: %d"
+#~ msgid "cannot find ascii character: %d"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'"
 
 #, fuzzy
@@ -2218,13 +2285,9 @@ msgstr ""
 #~ msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ"
 
 #, fuzzy
-#~ msgid "can't find signature for music function"
+#~ msgid "cannot find signature for music function"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]"
-
 #, fuzzy
 #~ msgid "Opening pipe `%s'"
 #~ msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
@@ -2258,7 +2321,7 @@ msgstr ""
 #~ msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
 #, fuzzy
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
 
 #, fuzzy
@@ -2282,7 +2345,7 @@ msgstr ""
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
 #, fuzzy
-#~ msgid "can't handle a percent repeat of length: %s"
+#~ msgid "cannot handle a percent repeat of length: %s"
 #~ msgstr "îÅ ÚÎÁÀ, ÞÔÏ ÄÅÌÁÔØ Ó ÐÕÓÔÙÍÉ ËÌÀÞÁÍÉ"
 
 #, fuzzy
@@ -2330,7 +2393,7 @@ msgstr ""
 #~ msgstr "ÎÅ ÓÍÅÒÔÅÌØÎÁÑ ÏÛÉÂËÁ: "
 
 #, fuzzy
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ: `%s'"
 
 #, fuzzy
@@ -2366,7 +2429,7 @@ msgstr ""
 #~ msgid "Programming error: "
 #~ msgstr "ÏÛÉÂËÁ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ: "
 
-#~ msgid "Can't switch translators, I'm there already"
+#~ msgid "Cannot switch translators, I'm there already"
 #~ msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ"
 
 #, fuzzy
@@ -2389,11 +2452,11 @@ msgstr ""
 #~ msgstr "éóðòá÷øíåîñ: ÓÌÉÑÎÉÅ ÓÍÅÎÙ ËÌÀÞÁ"
 
 #, fuzzy
-#~ msgid "kpathsea can't find %s file: `%s'"
+#~ msgid "kpathsea cannot find %s file: `%s'"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
 #, fuzzy
-#~ msgid "kpathsea can't find file: `%s'"
+#~ msgid "kpathsea cannot find file: `%s'"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
 #, fuzzy
@@ -2412,10 +2475,6 @@ msgstr ""
 #~ msgid "kpathsea can not find TFM file: `%s'"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
-#, fuzzy
-#~ msgid "Cannot switch translators, I'm there already"
-#~ msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ"
-
 #, fuzzy
 #~ msgid "Converting to `~a.ps'..."
 #~ msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
@@ -2448,7 +2507,7 @@ msgstr ""
 #~ msgstr "×Ù×ÏÄ MIDI × %s..."
 
 #, fuzzy
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
 #, fuzzy
@@ -2529,7 +2588,7 @@ msgstr ""
 #~ msgstr "ÉÚ ÍÕÚÙËÁÌØÎÏÊ ÎÏÔÁÃÉÉ %s"
 
 #, fuzzy
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
 #, fuzzy
@@ -2571,10 +2630,10 @@ msgstr ""
 #~ msgid "Slur over rest?"
 #~ msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?"
 
-#~ msgid "Can't specify direction for this request"
+#~ msgid "Cannot specify direction for this request"
 #~ msgstr "îÅ ÍÏÇÕ ÕËÁÚÁÔØ ÎÁÐÒÁ×ÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ÚÁÐÒÏÓÁ"
 
-#~ msgid "can't map file"
+#~ msgid "cannot map file"
 #~ msgstr "ÎÅ ÍÏÇÕ ÏÔÏÂÒÁÚÉÔØ ÆÁÊÌ × ÐÁÍÑÔØ"
 
 #~ msgid "This binary was compiled with the following options:"
@@ -2619,14 +2678,14 @@ msgstr ""
 #~ msgid "set FILE as default output"
 #~ msgstr "ÕÓÔÁÎÏ×ÉÔØ æáêì ÄÌÑ ×Ù×ÏÄÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#~ msgid "don't output tuplets"
+#~ msgid "do not output tuplets"
 #~ msgstr "ÎÅ ×Ù×ÏÄÉÔØ ÓËÏÂÙ ÔÒÉÏÌÅÊ"
 
 #~ msgid "be quiet"
 #~ msgstr "ÂÙÔØ ÍÏÌÞÁÌÉ×ÙÍ"
 
 #, fuzzy
-#~ msgid "don't output rests or skips"
+#~ msgid "do not output rests or skips"
 #~ msgstr "ÎÅ ×Ù×ÏÄÉÔØ ÓËÏÂÙ ÔÒÉÏÌÅÊ"
 
 #~ msgid "set smallest duration"
@@ -2697,7 +2756,7 @@ msgstr ""
 #~ msgid "floating point exception"
 #~ msgstr "ÉÓËÌÀÞÅÎÉÅ ÁÒÉÆÍÅÔÉËÉ Ó ÐÌÁ×ÁÀÝÅÊ ÚÁÐÑÔÏÊ"
 
-#~ msgid "can't set mem-checking!"
+#~ msgid "cannot set mem-checking!"
 #~ msgstr "ÎÅ ÍÏÇÕ ×ËÌÀÞÉÔØ ÐÒÏ×ÅÒËÕ ÐÁÍÑÔÉ"
 
 #, fuzzy
@@ -2745,7 +2804,7 @@ msgstr ""
 #~ msgid "Huh?  Not a Request: `%s'"
 #~ msgstr "á? îå úÁÐÒÏÓ: `%s'"
 
-#~ msgid "can't find both ends of %s"
+#~ msgid "cannot find both ends of %s"
 #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÏÂÁ ËÏÎÃÁ Õ %s"
 
 #~ msgid "slur"
@@ -2766,7 +2825,7 @@ msgstr ""
 #~ msgid "score does not have any columns"
 #~ msgstr "ÆÒÁÇÍÅÎÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓÔÏÌÂÃÏ×"
 
-#~ msgid "can't find start of chord tremolo"
+#~ msgid "cannot find start of chord tremolo"
 #~ msgstr "ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ"
 
 #~ msgid "already have a chord tremolo"
@@ -2778,5 +2837,5 @@ msgstr ""
 #~ msgid "More than one music block"
 #~ msgstr "âÏÌÅÅ ÏÄÎÏÇÏ ÍÕÚÙËÁÌØÎÏÇÏ ÂÌÏËÁ"
 
-#~ msgid "can't put stem tremolo on tuplet"
+#~ msgid "cannot put stem tremolo on tuplet"
 #~ msgstr "ÎÅ ÍÏÇÕ ÐÏÍÅÓÔÉÔØ ÛÔÉÌÅ×ÏÅ ÔÒÅÍÏÌÏ ÎÁ ÇÒÕÐÐÉÒÏ×ËÕ"
diff --git a/po/rw.po b/po/rw.po
index 2fef2c24dc..90cd321693 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -81,152 +81,162 @@ msgid "Running %s..."
 msgstr ""
 
 #: lilylib.py:203
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "Iburira"
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
 #, python-format
-msgid "Usage: %s\n"
+msgid "%s [OPTION]... FILE"
 msgstr ""
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
 #, fuzzy
-msgid "set output filename to FILE"
+msgid "write output to FILE"
 msgstr "Kwandika Ibisohoka Kuri"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr "Kuri"
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+#, fuzzy
+msgid "Examples:"
+msgstr "Urugero:"
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, fuzzy, c-format, python-format
 msgid "warning: %s"
 msgstr "Iburira"
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, fuzzy, c-format, python-format
 msgid "error: %s"
 msgstr "Ikosa"
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 #, fuzzy
 msgid "Distributed under terms of the GNU General Public License."
 msgstr "Bya i"
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 #, fuzzy
 msgid "It comes with NO WARRANTY."
 msgstr "Na:"
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
 # svtools/source\dialogs\prnsetup.src:STR_SVT_PRNDLG_PROCESSING.text
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "Inonosora"
 
 # sfx2/source\appl\app.src:STR_ERR_NOFILE.text
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, fuzzy, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "Ntibishoboka gufungura idosiye$."
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "Imiterere kugirango"
 
+#: etf2ly.py:1196
+#, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr ""
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-#, fuzzy
-msgid "write output to FILE"
-msgstr "Kwandika Ibisohoka Kuri"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "IDOSIYE"
 
-#: etf2ly.py:1204 midi2ly.py:899
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
 #, fuzzy
-msgid "show warranty"
+msgid "show warranty and copyright"
 msgstr "Garagaza Na Uburenganzira bw'umuhimbyi"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 #, fuzzy
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
-msgstr "0."
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr "in Cyangwa Inyandiko"
+
+#: lilypond-book.py:78
+msgid "BOOK"
+msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, python-format
 msgid "Exiting (%d)..."
 msgstr ""
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, fuzzy, python-format
 msgid "Copyright (c) %s by"
 msgstr "C ku"
@@ -243,7 +253,8 @@ msgstr "Gihinguranya GUHINDURA N"
 
 #: lilypond-book.py:135
 #, fuzzy
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr "Gukoresha Ibisohoka Imiterere Mburabuzi HTML HTML"
 
 #: lilypond-book.py:138
@@ -251,6 +262,10 @@ msgstr "Gukoresha Ibisohoka Imiterere Mburabuzi HTML HTML"
 msgid "add DIR to include path"
 msgstr "Kongeramo Kuri Gushyiramo Inzira"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr ""
+
 #: lilypond-book.py:143
 #, fuzzy
 msgid "write output to DIR"
@@ -267,151 +282,150 @@ msgstr "Icyo wifuza"
 msgid "process ly_files using COMMAND FILE..."
 msgstr "ikoresha"
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr ""
 
-#: lilypond-book.py:168 main.cc:184
-#, fuzzy
-msgid "show warranty and copyright"
-msgstr "Garagaza Na Uburenganzira bw'umuhimbyi"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, fuzzy, python-format
 msgid "file not found: %s"
 msgstr "Dosiye ntibonetse"
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, fuzzy, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr "Bitemewe. Ihitamo"
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, fuzzy, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr "Bihuye neza Ubwoko Umwandiko wahinduwe ururimi"
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, fuzzy, python-format
 msgid "deprecated ly-option used: %s"
 msgstr "Bitemewe. Ihitamo"
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, fuzzy, python-format
 msgid "compatibility mode translation: %s"
 msgstr "Bihuye neza Ubwoko Umwandiko wahinduwe ururimi"
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, fuzzy, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr "Kitazwi Ihitamo"
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, fuzzy, python-format
 msgid "Opening filter `%s'"
 msgstr "Muyunguruzi..."
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, fuzzy, python-format
 msgid "`%s' failed (%d)"
 msgstr "`%s'Byanze"
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 #, fuzzy
 msgid "The error log is as follows:"
 msgstr "Ikosa LOG ni Nka"
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 msgid "Writing snippets..."
 msgstr ""
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 msgid "Processing..."
 msgstr "Inonosora..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 #, fuzzy
 msgid "All snippets are up to date..."
 msgstr "Hejuru Kuri Itariki"
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "Imiterere kugirango"
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, fuzzy, python-format
 msgid "%s is up to date."
 msgstr "Hejuru Kuri Itariki"
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr ""
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 #, fuzzy
 msgid "Output would overwrite input file; use --output."
 msgstr "Guhindura Iyinjiza IDOSIYE Gukoresha Ibisohoka"
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, python-format
 msgid "Reading %s..."
 msgstr ""
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 msgid "Dissecting..."
 msgstr ""
 
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, python-format
 msgid "Compiling %s..."
 msgstr ""
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, fuzzy, python-format
 msgid "Processing include: %s"
 msgstr "Gushyiramo"
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, python-format
 msgid "Removing `%s'"
 msgstr ""
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, fuzzy, python-format
 msgid "Writing fonts to %s..."
 msgstr "Inonosora..."
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 #, fuzzy
 msgid "warning: "
 msgstr "Iburira!"
 
 # starmath/source\smres.src:RID_ERR_IDENT.text
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 #, fuzzy
 msgid "error: "
 msgstr "IKOSA"
@@ -425,9 +439,9 @@ msgstr ""
 msgid "%s output to `%s'..."
 msgstr "%sIbisohoka Kuri"
 
-#: midi2ly.py:871
-#, fuzzy
-msgid "Convert MIDI to LilyPond source."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
 msgstr "Kuri Inkomoko"
 
 #: midi2ly.py:875
@@ -479,35 +493,59 @@ msgstr "buri Umwandiko Nka a"
 
 #: midi2ly.py:905
 #, fuzzy
-msgid "example"
+msgid "Examples"
 msgstr "Urugero:"
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 #, fuzzy
 msgid "no files specified on command line."
 msgstr "Oya Idosiye ku Komandi: Umurongo"
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Porogaramu ni Kigenga ni ku i Na Urakaza neza Kuri Guhindura>> Na Cyangwa "
+"Gukwirakwiza Amakopi Bya Nka kugirango"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "Kwandika Ibisohoka Kuri"
+
+#: getopt-long.cc:140
 #, fuzzy, c-format
 msgid "option `%s' requires an argument"
 msgstr "Ihitamo"
 
-#: getopt-long.cc:145
+#: getopt-long.cc:144
 #, fuzzy, c-format
-msgid "option `%s' doesn't allow an argument"
+msgid "option `%s' does not allow an argument"
 msgstr "Ihitamo Kwemerera"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, fuzzy, c-format
 msgid "unrecognized option: `%s'"
 msgstr "Ihitamo"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, fuzzy, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "Sibyo Kuri Ihitamo"
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, fuzzy, c-format
 msgid "programming error: %s"
 msgstr "Ikosa"
@@ -516,87 +554,76 @@ msgstr "Ikosa"
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, fuzzy, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr "Urutonde Na: Imvugiro Izina:"
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, fuzzy, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr "Kitazwi"
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, fuzzy, c-format
 msgid "accidental `%s' not found"
 msgstr "OYA Byabonetse"
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, fuzzy, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "Gushaka Intego- nyuguti"
 
-#: all-font-metrics.cc:165
-#, fuzzy
-msgid "loading default font"
-msgstr "Mburabuzi Intego- nyuguti"
-
-#: all-font-metrics.cc:172
-#, fuzzy, c-format
-msgid "can't find default font: `%s'"
-msgstr "Gushaka Mburabuzi Intego- nyuguti"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, fuzzy, c-format
-msgid "(search path: `%s')"
-msgstr "(Gushaka Inzira"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-#, fuzzy
-msgid "giving up"
-msgstr "Hejuru"
-
 #: apply-context-iterator.cc:31
 #, fuzzy
 msgid "\\applycontext argument is not a procedure"
 msgstr "\\aUmumaro"
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "Guhindura>> Kuri"
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, fuzzy, c-format
 msgid "barcheck failed at: %s"
@@ -611,21 +638,21 @@ msgstr "a"
 msgid "unterminated beam"
 msgstr ""
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 #, fuzzy
 msgid "stem must have Rhythmic structure"
 msgstr "Imiterere"
 
-#: beam-engraver.cc:245
+#: beam-engraver.cc:246
 #, fuzzy
-msgid "stem doesn't fit in beam"
+msgid "stem does not fit in beam"
 msgstr "in"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr ""
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 #, fuzzy
 msgid "no feasible beam position"
 msgstr "Umurongo Byabonetse"
@@ -635,25 +662,25 @@ msgstr "Umurongo Byabonetse"
 msgid "removing beam with no stems"
 msgstr "Na: Birutwa"
 
-#: beam.cc:995
+#: beam.cc:1007
 #, fuzzy
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr "Oya Iboneza Byabonetse Gicurasi OYA Gushaka IMANURA"
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, fuzzy, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Isigamwanya Icyinjijwe Bivuye Kuri"
 
 #: change-iterator.cc:23
 #, fuzzy, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "Guhindura>> Kuri"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "Gushaka Imvugiro"
 
 #. We could change the current translator's id, but that would make
@@ -686,7 +713,7 @@ msgstr ""
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, fuzzy, c-format
 msgid "clef `%s' not found"
 msgstr "OYA Byabonetse"
@@ -700,33 +727,33 @@ msgstr "Kitazwi IMISUSIRE"
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, fuzzy, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr "Igenamiterere Isigamwanya Iyongeragaciro 0"
 
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, fuzzy, c-format
 msgid "program has no such type: `%s'"
 msgstr "Oya Ubwoko"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "Gushaka Cyangwa Kurema"
 
 #: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "Gushaka Cyangwa Kurema"
 
 #: context.cc:276
@@ -736,7 +763,7 @@ msgstr ""
 
 #: context.cc:388
 #, fuzzy, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "Gushaka Cyangwa Kurema"
 
 #: custos.cc:77
@@ -744,18 +771,23 @@ msgstr "Gushaka Cyangwa Kurema"
 msgid "custos `%s' not found"
 msgstr "OYA Byabonetse"
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, fuzzy, c-format
 msgid "Unknown event class %s"
 msgstr "Kitazwi IMISUSIRE"
 
+#: dots.cc:38
+#, fuzzy, c-format
+msgid "dot `%s' not found"
+msgstr "OYA Byabonetse"
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
 #, fuzzy
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "Gushaka Gutangira Bya"
 
 #: dynamic-engraver.cc:195
@@ -776,11 +808,7 @@ msgstr ""
 msgid "unterminated (de)crescendo"
 msgstr ""
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr ""
 
@@ -803,15 +831,15 @@ msgstr "Dosiye ntibonetse"
 msgid "adding font directory: %s"
 msgstr ""
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "Umwandiko"
@@ -843,48 +871,39 @@ msgstr "S Kyongewe"
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "Gushaka Gutangira Bya"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, fuzzy, c-format
 msgid "Unknown interface `%s'"
 msgstr "Kitazwi IMISUSIRE"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 #, fuzzy
 msgid "decrescendo too small"
 msgstr "Gitoya"
 
-#: hairpin.cc:180
-#, fuzzy
-msgid "crescendo too small"
-msgstr "Gitoya"
-
-#: horizontal-bracket-engraver.cc:58
+#: horizontal-bracket-engraver.cc:59
 #, fuzzy
-msgid "don't have that many brackets"
+msgid "do not have that many brackets"
 msgstr "Udusodeko"
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 #, fuzzy
 msgid "conflicting note group events"
 msgstr "Impugukirwa Itsinda Ibyabaye"
@@ -902,97 +921,102 @@ msgstr ""
 msgid "include files are not allowed in safe mode"
 msgstr "Gushyiramo Idosiye OYA"
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, fuzzy, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "Gushaka IDOSIYE"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, fuzzy, c-format
+msgid "(search path: `%s')"
+msgstr "(Gushaka Inzira"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 #, fuzzy
 msgid "position unknown"
 msgstr "Ibirindiro Kitazwi"
 
-#: ligature-engraver.cc:95
+#: ligature-engraver.cc:93
 #, fuzzy
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr "Gushaka Gutangira Bya"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 #, fuzzy
 msgid "no right bound"
 msgstr "Oya Iburyo:"
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 #, fuzzy
 msgid "already have a ligature"
 msgstr "a"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 #, fuzzy
 msgid "no left bound"
 msgstr "Oya Ibumoso:"
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 msgid "unterminated ligature"
 msgstr ""
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 #, fuzzy
 msgid "ignoring rest: ligature may not contain rest"
 msgstr "Gicurasi OYA"
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr ""
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, fuzzy, c-format
 msgid "(load path: `%s')"
 msgstr "(Ibirimo Inzira"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, fuzzy, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr "Gushaka indangakintu Ubwoko Kugenzura... kugirango"
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 #, fuzzy
 msgid "perhaps a typing error?"
 msgstr "a Kwandika: Ikosa"
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 #, fuzzy
 msgid "doing assignment anyway"
 msgstr "Igenera"
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, fuzzy, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr "Kugenzura... kugirango Byanze Agaciro Bya Ubwoko"
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "Izina: ni a Ijambo- banze"
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, fuzzy, c-format
 msgid "error at EOF: %s"
 msgstr "Ikosa ku"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, fuzzy, c-format
 msgid "deprecated function called: %s"
 msgstr "Bitemewe. Ihitamo"
 
-#: lily-parser-scheme.cc:89
-#, c-format
-msgid "Changing working directory to `%s'"
-msgstr ""
+#: lily-parser-scheme.cc:88
+#, fuzzy, c-format
+msgid "Changing working directory to: `%s'"
+msgstr "Dosiye ntibonetse"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, fuzzy, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "Gushaka IDOSIYE"
 
 # svtools/source\dialogs\prnsetup.src:STR_SVT_PRNDLG_PROCESSING.text
@@ -1001,21 +1025,21 @@ msgstr "Gushaka IDOSIYE"
 msgid "Processing `%s'"
 msgstr "Inonosora"
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr ""
 
-#: lily-parser.cc:126
+#: lily-parser.cc:127
 #, fuzzy
-msgid "braces don't match"
+msgid "braces do not match"
 msgstr "BIHUYE"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, fuzzy, c-format
 msgid "cannot find Voice `%s'"
 msgstr "Gushaka"
 
-#: main.cc:117
+#: main.cc:116
 #, fuzzy, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -1026,7 +1050,7 @@ msgstr ""
 "Porogaramu ni Kigenga ni ku i Na Urakaza neza Kuri Guhindura>> Na Cyangwa "
 "Gukwirakwiza Amakopi Bya Nka kugirango"
 
-#: main.cc:123
+#: main.cc:122
 #, fuzzy
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
@@ -1038,7 +1062,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1047,137 +1071,135 @@ msgstr ""
 "ATARIIGIHARWE i Cyangwa A i kugirango Birenzeho Birambuye BYAKIRIWE a "
 "Gukoporora Kuri i IDOSIYE Bya Na: iyi Porogaramu NIBA OYA Kwandika"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
-msgid "SYM=VAL"
+#: main.cc:155
+msgid "SYM[=VAL]"
 msgstr ""
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "evaluate scheme code"
 msgstr ""
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 msgid "generate DVI (tex backend only)"
 msgstr ""
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 #, fuzzy
 msgid "generate PDF (default)"
 msgstr "Ibisohoka"
 
-#: main.cc:167
+#: main.cc:165
 #, fuzzy
 msgid "generate PNG"
 msgstr "Ipaji Ishusho"
 
-#: main.cc:168
+#: main.cc:166
 #, fuzzy
 msgid "generate PostScript"
 msgstr "Ibisohoka"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:170
-#, fuzzy
-msgid "print this help"
-msgstr "Gucapa iyi Ifashayobora"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
 # wizards/source\formwizard\dbwizres.src:RID_DB_REPORT_WIZARD_START_+_71.text
-#: main.cc:171
+#: main.cc:169
 #, fuzzy
 msgid "FIELD"
 msgstr "Umwanya"
 
-#: main.cc:171
+#: main.cc:169
 #, fuzzy
-msgid "dump a header field to file BASENAME.FIELD"
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr "Kwandika Umutwempangano Umwanya Kuri"
 
-#: main.cc:172
-msgid "DIR"
-msgstr ""
-
-#: main.cc:172
+#: main.cc:171
 #, fuzzy
 msgid "add DIR to search path"
 msgstr "Kongeramo Kuri Gushaka Inzira"
 
-#: main.cc:173
+#: main.cc:172
 #, fuzzy
 msgid "use FILE as init file"
 msgstr "Gukoresha Nka IDOSIYE"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "OYA Ibisohoka"
 
-#: main.cc:179
+#: main.cc:178
 #, fuzzy
 msgid "write output to FILE (suffix will be added)"
 msgstr "Kwandika Ibisohoka Kuri"
 
-#: main.cc:180
+#: main.cc:179
 #, fuzzy
 msgid "generate a preview of the first system"
 msgstr "Ubwoko a() y'Ishusho Bya i Itangira Sisitemu"
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
+#: main.cc:183
 #, fuzzy
-msgid "print version number"
+msgid "show version number and exit"
 msgstr "Gucapa Verisiyo Umubare"
 
-#: main.cc:223
+#: main.cc:224
 #, fuzzy, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1185,79 +1207,79 @@ msgid ""
 msgstr "C Na Ibindi"
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
-#: main.cc:252
+#: main.cc:253
 #, fuzzy, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Na Cyangwa Bivuye"
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:256
+#: main.cc:257
 #, fuzzy, c-format
 msgid "For more information, see %s"
 msgstr "Birenzeho Ibisobanuro"
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Amahitamo:"
 
-#: main.cc:262
+#: main.cc:263
 #, fuzzy, c-format
 msgid "Report bugs via %s"
 msgstr "Kuri"
 
-#: main.cc:308
+#: main.cc:309
 #, fuzzy, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr "3. Ikurikiranyanyuguti kugirango"
 
-#: main.cc:322
+#: main.cc:323
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "Oya Igenamiterere"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "Oya Imvugiro"
 
-#: main.cc:341
+#: main.cc:342
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "Guhindura>> Kuri"
 
-#: main.cc:349
+#: main.cc:350
 #, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr ""
 
-#: main.cc:356
+#: main.cc:357
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "Guhindura>> Kuri"
 
-#: main.cc:362
+#: main.cc:363
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "Guhindura>> Kuri"
 
-#: main.cc:368
+#: main.cc:369
 #, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr ""
 
 #: main.cc:415
@@ -1265,7 +1287,7 @@ msgstr ""
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1279,42 +1301,42 @@ msgstr ""
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 #, fuzzy
 msgid "ligature with less than 2 heads -> skipping"
 msgstr "Na: Birutwa 2. Gusimbuka:%s"
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 #, fuzzy
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr "OYA Bya Gusimbuka:%s"
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 #, fuzzy
 msgid "single note ligature - skipping"
 msgstr "Intera muri Gusimbuka:%s"
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 #, fuzzy
 msgid "prime interval within ligature -> skipping"
 msgstr "Intera muri Gusimbuka:%s"
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 #, fuzzy
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr "Igihe- ngombwa Ntacyo Bya Gusimbuka:%s"
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1322,7 +1344,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 #, fuzzy
 msgid "unexpected case fall-through"
 msgstr "Gihinguranya"
@@ -1342,11 +1364,7 @@ msgstr "0"
 msgid "no such MIDI instrument: `%s'"
 msgstr "Oya"
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr ""
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, fuzzy, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr "Bya a"
@@ -1354,105 +1372,112 @@ msgstr "Bya a"
 # sfx2/source\appl\app.src:STR_ERR_NOFILE.text
 #: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "Ntibishoboka gufungura idosiye$."
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "OYA Kwandika IDOSIYE"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, fuzzy, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr "Kugenzura... Byanze Ikitezwe: Byabonetse"
 
-#: music.cc:208
+#: music.cc:207
 #, fuzzy, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "ku Kinini"
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "Kwirengagiza"
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, fuzzy, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr "Impugukirwa OYA Byabonetse"
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 # sfx2/source\appl\app.src:STR_ERR_NOFILE.text
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "Ntibishoboka gufungura idosiye$."
 
 #: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "Gushaka Intego- nyuguti"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 msgid "Drawing systems..."
 msgstr ""
 
-#: pango-font.cc:215
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "OYA a IDOSIYE"
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1490,15 +1515,15 @@ msgstr "Ku ijana Gusubiramo"
 msgid "Track..."
 msgstr ""
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, fuzzy, c-format
 msgid "MIDI output to `%s'..."
 msgstr "Ibisohoka Kuri"
@@ -1507,23 +1532,23 @@ msgstr "Ibisohoka Kuri"
 msgid "unterminated phrasing slur"
 msgstr ""
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, fuzzy, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr "3. Ikurikiranyanyuguti kugirango"
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, fuzzy, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "Gushaka Gutangira Bya"
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, fuzzy, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "Gushaka Gutangira Bya"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, fuzzy, c-format
 msgid "no such internal option: %s"
 msgstr "By'imbere Ihitamo"
@@ -1533,52 +1558,52 @@ msgstr "By'imbere Ihitamo"
 msgid "not a grob name, `%s'"
 msgstr "a Izina:"
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 #, fuzzy
 msgid "Failed octave check, got: "
 msgstr "Kugenzura..."
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "Inonosora..."
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "Oya Imvugiro"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "Oya Imvugiro"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
@@ -1586,67 +1611,65 @@ msgid ""
 msgstr ""
 
 # sfx2/source\appl\app.src:STR_ERR_NOFILE.text
-#: relocate.cc:353
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "Relocation file %s\n"
+msgid "Relocation file: %s"
 msgstr "Ntibishoboka gufungura idosiye$."
 
-# sfx2/source\appl\app.src:STR_ERR_NOFILE.text
-#: relocate.cc:358
-#, fuzzy, c-format
-msgid "can't open file %s"
-msgstr "Ntibishoboka gufungura idosiye$."
-
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr ""
 
-#: rest.cc:143
+#: rest.cc:144
 #, fuzzy, c-format
 msgid "rest `%s' not found"
 msgstr "OYA Byabonetse"
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "Gushaka"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 #, fuzzy
 msgid "Music font has not been installed properly."
 msgstr "OYA"
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(Gushaka Inzira"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "in a"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 msgid "errors found, ignoring music expression"
 msgstr ""
 
 #. FIXME:
 #: script-engraver.cc:102
 #, fuzzy
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr "Kuri"
 
 #: script-engraver.cc:103
@@ -1659,17 +1682,18 @@ msgstr "Imisobekere:"
 msgid "No spring between column %d and next one"
 msgstr "Rasoro hagati Inkingi Na Komeza>>"
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr ""
 
-#: slur-engraver.cc:165
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "Gushaka"
 
 #: source-file.cc:74
@@ -1681,62 +1705,62 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 #, fuzzy
 msgid "tremolo duration is too long"
 msgstr "Igihe- ngombwa ni"
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, fuzzy, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "Impugukirwa Kuri Ubwoko"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 #, fuzzy
 msgid "weird stem size, check for narrow beams"
 msgstr "Ingano Kugenzura... kugirango"
 
-#: stem.cc:627
+#: stem.cc:641
 #, fuzzy, c-format
 msgid "flag `%s' not found"
 msgstr "Ibendera OYA Byabonetse"
 
-#: stem.cc:638
+#: stem.cc:652
 #, fuzzy, c-format
 msgid "flag stroke `%s' not found"
 msgstr "Ibendera Akarongo OYA Byabonetse"
 
-#: system.cc:178
+#: system.cc:180
 #, fuzzy, c-format
 msgid "Element count %d."
 msgstr "IBARA"
 
-#: system.cc:270
+#: system.cc:276
 #, fuzzy, c-format
 msgid "Grob count %d"
 msgstr "IBARA"
 
-#: text-spanner-engraver.cc:60
+#: text-spanner-engraver.cc:61
 #, fuzzy
-msgid "can't find start of text spanner"
+msgid "cannot find start of text spanner"
 msgstr "Gushaka Gutangira Bya Umwandiko"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 #, fuzzy
 msgid "already have a text spanner"
 msgstr "a Umwandiko"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 #, fuzzy
 msgid "unterminated text spanner"
 msgstr "Umwandiko"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr ""
 
@@ -1745,14 +1769,14 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, fuzzy, c-format
 msgid "strange time signature found: %d/%d"
 msgstr "Igihe Isinya"
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, fuzzy, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr "Igihe Isinya IKIMENYETSO OYA Byabonetse Kuri Iriho Imibare IMISUSIRE"
@@ -1762,43 +1786,39 @@ msgstr "Igihe Isinya IKIMENYETSO OYA Byabonetse Kuri Iriho Imibare IMISUSIRE"
 msgid "unknown translator: `%s'"
 msgstr "Kitazwi Umusemuzi"
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, fuzzy, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "Gushaka"
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "Gushaka Gutangira Bya Umwandiko"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "a Umwandiko"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, fuzzy, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr "Imbanziriza Bya iyi Kuri Amabwiriza Bya i Byahiswemo IMISUSIRE"
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, fuzzy, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr "Igenamiterere Isigamwanya Iyongeragaciro"
@@ -1818,276 +1838,287 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr "Zeru 0"
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "Gushaka Gutangira Bya Umwandiko"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 #, fuzzy
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr "a"
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "a Umwandiko"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+#, fuzzy
+msgid "giving up"
+msgstr "Hejuru"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 #, fuzzy
 msgid "second argument must be pitch list"
 msgstr "Urutonde"
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 #, fuzzy
 msgid "have to be in Lyric mode for lyrics"
 msgstr "Kuri in Ubwoko kugirango"
 
-#: parser.yy:1612
+#: parser.yy:1604
 #, fuzzy
 msgid "expecting string as script definition"
 msgstr "Ikurikiranyanyuguti Nka IYANDIKA Insobanuro"
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, fuzzy, c-format
 msgid "not a duration: %d"
 msgstr "OYA a Igihe- ngombwa"
 
-#: parser.yy:1940
+#: parser.yy:1926
 #, fuzzy
 msgid "have to be in Note mode for notes"
 msgstr "Kuri in Ubwoko kugirango Ibisobanuro"
 
-#: parser.yy:2004
+#: parser.yy:1987
 #, fuzzy
 msgid "have to be in Chord mode for chords"
 msgstr "Kuri in Ubwoko kugirango"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, fuzzy, c-format
 msgid "Renaming input to: `%s'"
 msgstr "Iyinjiza Kuri"
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 #, fuzzy
 msgid "EOF found inside a comment"
 msgstr "Byabonetse Mo Imbere a Icyo wongeraho"
 
-#: lexer.ll:290
+#: lexer.ll:288
 #, fuzzy
 msgid "\\maininput not allowed outside init files"
 msgstr "\\mOYA Hanze Idosiye"
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "Cyangwa kidasobanuye Ikiranga"
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 #, fuzzy
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr "Byabonetse ku Impera Bya a Umwanya"
 
-#: lexer.ll:561
+#: lexer.ll:559
 #, fuzzy
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr "Byabonetse ku Impera Bya a Umwanya"
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, fuzzy, c-format
 msgid "invalid character: `%c'"
 msgstr "Sibyo Inyuguti"
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, fuzzy, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "Kitazwi Ikurikiranyanyuguti"
 
-#: lexer.ll:882
-#, fuzzy, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "Verisiyo"
+#: lexer.ll:880 lexer.ll:881
+#, c-format
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:883
+#: lexer.ll:881 lexer.ll:882
 #, fuzzy
-msgid "Consider updating the input with the convert-ly script"
+msgid "consider updating the input with the convert-ly script"
 msgstr "Ivugurura i Iyinjiza Na: i GUHINDURA IYANDIKA"
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, scheme-format
 msgid "Invoking `~a'..."
 msgstr ""
 
 #: backend-library.scm:24
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "`~a' failed (~a)"
 msgstr "`%s'Byanze"
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, lisp-format
+#, scheme-format
 msgid "Converting to `~a'..."
 msgstr ""
 
-#: backend-library.scm:110
-#, lisp-format
+#: backend-library.scm:108
+#, scheme-format
 msgid "Converting to ~a..."
 msgstr ""
 
-#: backend-library.scm:156
-#, lisp-format
+#: backend-library.scm:145
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "OYA a Igihe- ngombwa"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:737
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, fuzzy, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "Gushaka"
 
-#: define-music-types.scm:757
-#, fuzzy, lisp-format
+#: define-music-types.scm:774
+#, fuzzy, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "Kitazwi IMISUSIRE"
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
+#, fuzzy, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "Gushaka Mburabuzi Intego- nyuguti"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "By'imbere Ihitamo"
 
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "Inonosora..."
 
 #: documentation-lib.scm:150
-#, lisp-format
+#, scheme-format
 msgid "Writing ~S..."
 msgstr ""
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, fuzzy, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "Gushaka Mburabuzi Intego- nyuguti"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "Inonosora..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
-msgstr ""
+#: framework-ps.scm:349
+#, fuzzy, scheme-format
+msgid "do not know how to embed ~S=~S"
+msgstr "Kuri"
 
-#: framework-ps.scm:379
-#, fuzzy, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "Kuri"
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2096,56 +2127,56 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "Izina ry'idosiye: OYA Imyanya"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 #, fuzzy
 msgid "Calculating page breaks..."
 msgstr "Umurongo Amataruka"
 
-#: lily-library.scm:510
-#, fuzzy, lisp-format
+#: lily-library.scm:593
+#, fuzzy, scheme-format
 msgid "unknown unit: ~S"
 msgstr "Kitazwi Umusemuzi"
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "Gushaka"
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "Ibisohoka Kuri"
 
@@ -2153,48 +2184,48 @@ msgstr "Ibisohoka Kuri"
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
-msgid "More alternatives than repeats. Junking excess alternatives"
+#: music-functions.scm:213
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, lisp-format
+#: music-functions.scm:538
+#, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "Gushaka"
 
-#: music-functions.scm:953
-#, fuzzy, lisp-format
+#: music-functions.scm:942
+#, fuzzy, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "Kitazwi"
 
@@ -2203,42 +2234,42 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
+#, fuzzy, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "Gushaka Gutangira Bya"
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr ""
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, lisp-format
+#: paper.scm:129
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "Kitazwi IMISUSIRE"
 
@@ -2246,16 +2277,64 @@ msgstr "Kitazwi IMISUSIRE"
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, fuzzy, lisp-format
+#: ps-to-png.scm:88
+#, fuzzy, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "Komandi: Na: Agaciro"
 
 #: to-xml.scm:190
-#, fuzzy
-msgid "assertion failed"
+#, fuzzy, scheme-format
+msgid "assertion failed: ~S"
 msgstr "Byanze"
 
+#, fuzzy
+#~ msgid "show warranty"
+#~ msgstr "Garagaza Na Uburenganzira bw'umuhimbyi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
+#~ "\n"
+#~ "Example usage:\n"
+#~ "\n"
+#~ " lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
+#~ " lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
+#~ " lilypond-book --process='lilypond -I include' BOOK\n"
+#~ msgstr "0."
+
+#, fuzzy
+#~ msgid "Convert MIDI to LilyPond source."
+#~ msgstr "Kuri Inkomoko"
+
+#, fuzzy
+#~ msgid "example"
+#~ msgstr "Urugero:"
+
+#, fuzzy
+#~ msgid "loading default font"
+#~ msgstr "Mburabuzi Intego- nyuguti"
+
+#, fuzzy
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "Gushaka Mburabuzi Intego- nyuguti"
+
+#, fuzzy
+#~ msgid "crescendo too small"
+#~ msgstr "Gitoya"
+
+#, fuzzy
+#~ msgid "print this help"
+#~ msgstr "Gucapa iyi Ifashayobora"
+
+# sfx2/source\appl\app.src:STR_ERR_NOFILE.text
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "Ntibishoboka gufungura idosiye$."
+
+#, fuzzy
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "Verisiyo"
+
 #, fuzzy
 #~ msgid "no one to print a tremolos"
 #~ msgstr "Oya Kuri Gucapa a"
@@ -2274,7 +2353,7 @@ msgstr "Byanze"
 #~ msgstr "Oya Kuri Gucapa a Gusubiramo"
 
 #, fuzzy
-#~ msgid "can't find `%s' context"
+#~ msgid "cannot find `%s' context"
 #~ msgstr "Gushaka Imvugiro"
 
 #, fuzzy
@@ -2312,7 +2391,7 @@ msgstr "Byanze"
 #~ msgstr "%s:IDOSIYE Ibigenga ni Birenzeho i"
 
 #, fuzzy
-#~ msgid "can't find ascii character: %d"
+#~ msgid "cannot find ascii character: %d"
 #~ msgstr "Gushaka ASCII Inyuguti"
 
 #, fuzzy
@@ -2328,7 +2407,7 @@ msgstr "Byanze"
 #~ msgstr "Inyuguti"
 
 #, fuzzy
-#~ msgid "can't find signature for music function"
+#~ msgid "cannot find signature for music function"
 #~ msgstr "Gushaka Imvugiro"
 
 #, fuzzy
@@ -2359,14 +2438,6 @@ msgstr "Byanze"
 #~ msgid "command exited with value %d"
 #~ msgstr "Komandi: Na: Agaciro"
 
-#, fuzzy
-#~ msgid "Example:"
-#~ msgstr "Urugero:"
-
-#, fuzzy
-#~ msgid "Convert mup to LilyPond source."
-#~ msgstr "Kuri Inkomoko"
-
 # Debug menu items
 #, fuzzy
 #~ msgid "debug"
@@ -2395,7 +2466,7 @@ msgstr "Byanze"
 
 # sfx2/source\appl\app.src:STR_ERR_NOFILE.text
 #, fuzzy
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "Ntibishoboka gufungura idosiye$."
 
 #, fuzzy
@@ -2437,7 +2508,7 @@ msgstr "Byanze"
 #~ msgstr "Gukoresha in Ubwoko"
 
 #, fuzzy
-#~ msgid "can't handle a percent repeat of length: %s"
+#~ msgid "cannot handle a percent repeat of length: %s"
 #~ msgstr "Kuri a Ku ijana Gusubiramo Bya iyi Uburebure"
 
 #, fuzzy
@@ -2515,7 +2586,7 @@ msgstr "Byanze"
 #~ msgstr "Ikosa"
 
 #, fuzzy
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "Gushaka Intego- nyuguti"
 
 #, fuzzy
@@ -2555,7 +2626,7 @@ msgstr "Byanze"
 #~ msgstr "Ikosa"
 
 #, fuzzy
-#~ msgid "Can't switch translators, I'm there already"
+#~ msgid "Cannot switch translators, I'm there already"
 #~ msgstr "Hindura"
 
 #, fuzzy
@@ -2618,7 +2689,7 @@ msgstr "Byanze"
 #~ msgstr "Gumana: Byose Ibisohoka Ibisohoka Kuri bushyinguro"
 
 #, fuzzy
-#~ msgid "don't run LilyPond"
+#~ msgid "do not run LilyPond"
 #~ msgstr "Gukoresha"
 
 #, fuzzy
@@ -2705,13 +2776,9 @@ msgstr "Byanze"
 #~ msgstr "%sIbisohoka Kuri"
 
 #, fuzzy
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "Gushaka IDOSIYE"
 
-#, fuzzy
-#~ msgid "Process LilyPond snippets in hybrid HTML, LaTeX or texinfo document"
-#~ msgstr "in Cyangwa Inyandiko"
-
 #, fuzzy
 #~ msgid "DIM"
 #~ msgstr "Byijimye"
@@ -2750,11 +2817,11 @@ msgstr "Byanze"
 #~ msgstr "Mbere"
 
 #, fuzzy
-#~ msgid "don't run lilypond"
+#~ msgid "do not run lilypond"
 #~ msgstr "Gukoresha"
 
 #, fuzzy
-#~ msgid "don't generate pictures"
+#~ msgid "do not generate pictures"
 #~ msgstr "Amashusho"
 
 #, fuzzy
@@ -2820,7 +2887,7 @@ msgstr "Byanze"
 #~ msgstr "urupapuro Ibisohoka Kuri"
 
 #, fuzzy
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr "Gushaka Gutangira Bya"
 
 #, fuzzy
diff --git a/po/sv.po b/po/sv.po
index 7a7100036a..95774a1e74 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.7.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
-"PO-Revision-Date: 2003-08-23 13:30+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
+"PO-Revision-Date: 2006-12-23 16:16+0100\n"
 "Last-Translator: Martin Norbäck <d95mback@dtek.chalmers.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -71,146 +71,159 @@ msgid "Running %s..."
 msgstr "Kör %s..."
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "varning: %s\n"
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "Användning: %s [FLAGGA]... FIL"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
-#, fuzzy
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr "skriv utdata till FIL"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr ""
+"Rapportera programfel till %s\n"
+"Rapportera fel i översättningen till <sv@li.org>"
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+#, fuzzy
+msgid "Examples:"
+msgstr "Exempel:"
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, fuzzy, c-format, python-format
 msgid "warning: %s"
 msgstr "varning: %s\n"
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, fuzzy, c-format, python-format
 msgid "error: %s"
 msgstr "fel: %s\n"
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr "Distribueras under GNU General Public License."
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr "INGEN GARANTI ges för programmet."
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "Behandlar \"%s\"..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "kan inte öppna fil: \"%s\""
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "kan inte hitta standardtypsnitt: \"%s\""
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "Användning: %s [FLAGGA]... FIL"
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr "skriv utdata till FIL"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "FIL"
 
-#: etf2ly.py:1204 midi2ly.py:899
-#, fuzzy
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr "visa garanti och copyright"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
+#, fuzzy
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr ""
+"Bearbeta LilyPond-stycken i ett hybriddokument i html, LaTex eller texinfo"
+
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, python-format
 msgid "Exiting (%d)..."
 msgstr "Avslutar (%d)... "
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright © %s av"
@@ -226,7 +239,8 @@ msgstr ""
 
 #: lilypond-book.py:135
 #, fuzzy
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr "använd utdataformat FMT (texi [standard], texi-html, latex, html)"
 
 #: lilypond-book.py:138
@@ -234,6 +248,10 @@ msgstr "anv
 msgid "add DIR to include path"
 msgstr "lägg till KATALOG till sökvägen"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "KATALOG"
+
 #: lilypond-book.py:143
 #, fuzzy
 msgid "write output to DIR"
@@ -247,151 +265,151 @@ msgstr ""
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "var utförlig"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "visa garanti och copyright"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, fuzzy, python-format
 msgid "file not found: %s"
 msgstr "klav \"%s\" hittades inte"
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, fuzzy, python-format
 msgid "Opening filter `%s'"
 msgstr "Öppnar rör \"%s\"..."
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr "\"%s\" misslyckades (%d)"
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr "Felloggen är följande:"
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 #, fuzzy
 msgid "Writing snippets..."
 msgstr "Skriver \"%s\"..."
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 #, fuzzy
 msgid "Processing..."
 msgstr "Behandlar..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 #, fuzzy
 msgid "All snippets are up to date..."
 msgstr "lugn, %s är senaste versionen"
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "kan inte hitta standardtypsnitt: \"%s\""
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, fuzzy, python-format
 msgid "%s is up to date."
 msgstr "lugn, %s är senaste versionen"
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "Skriver \"%s\"..."
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
 # här är det fråga om rensning av en temporärkatalog
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, fuzzy, python-format
 msgid "Reading %s..."
 msgstr "Rensar %s..."
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 #, fuzzy
 msgid "Dissecting..."
 msgstr "Listar \"%s\"..."
 
 # här är det fråga om rensning av en temporärkatalog
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, fuzzy, python-format
 msgid "Compiling %s..."
 msgstr "Rensar %s..."
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, fuzzy, python-format
 msgid "Processing include: %s"
 msgstr "Behandlar \"%s\"..."
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, fuzzy, python-format
 msgid "Removing `%s'"
 msgstr "Startar \"%s\""
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, fuzzy, python-format
 msgid "Writing fonts to %s..."
 msgstr "kan inte skapa katalog: \"%s\""
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "varning: "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "fel: "
 
@@ -406,10 +424,10 @@ msgstr "Avslutar... "
 msgid "%s output to `%s'..."
 msgstr "%s skrivet till \"%s\"..."
 
-#: midi2ly.py:871
-#, fuzzy
-msgid "Convert MIDI to LilyPond source."
-msgstr "Konvertera MIDI till LilyPond"
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
+msgstr "Konvertera mup till LilyPond"
 
 #: midi2ly.py:875
 msgid "print absolute pitches"
@@ -453,34 +471,59 @@ msgstr "tolka all text som lyrik"
 
 #: midi2ly.py:905
 #, fuzzy
-msgid "example"
+msgid "Examples"
 msgstr "Exempel:"
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "inga filer angivna på kommandoraden."
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Det här är fri programvara. Den täcks av \"GNU General Public License\",\n"
+"och du får ändra och/eller distribuera kopior av den under vissa\n"
+"villkor. Kör \"%s --warranty\" för mer information.\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "skriv utdata till FIL"
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "flaggan \"%s\" kräver ett argument"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: getopt-long.cc:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "flaggan \"%s\" tillåter inget argument"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "okänd flagga: \"%s\""
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "ogiltigt argument \"%s\" till flaggan \"%s\""
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, fuzzy, c-format
 msgid "programming error: %s"
 msgstr "programmeringsfel: "
@@ -489,86 +532,75 @@ msgstr "programmeringsfel: "
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, fuzzy, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr "Lista av höjningar/säkningar måste börja med context-name: %s"
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr "höjning/säkning \"%s\" hittades inte"
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "kan inte hitta typsnitt: \"%s\""
 
-#: all-font-metrics.cc:165
-#, fuzzy
-msgid "loading default font"
-msgstr "Läser in standardtypsnitt"
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "kan inte hitta standardtypsnitt: \"%s\""
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(sökväg: \"%s\")"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-#, fuzzy
-msgid "giving up"
-msgstr "Ger upp"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "kan inte ändra \"%s\" till \"%s\""
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -582,19 +614,20 @@ msgstr "har redan en balk"
 msgid "unterminated beam"
 msgstr "oavslutad balk"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr "skaft måste ha en rytmisk struktur"
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+#, fuzzy
+msgid "stem does not fit in beam"
 msgstr "skaftet passar inte i balken"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr "balken startade här"
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 #, fuzzy
 msgid "no feasible beam position"
 msgstr "Ingen lämplig radbrytning hittades"
@@ -604,24 +637,24 @@ msgstr "Ingen l
 msgid "removing beam with no stems"
 msgstr "balk har mindre än två synliga skaft"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Ingen avståndsdata från %s till \"%s\""
 
 #: change-iterator.cc:23
 #, fuzzy, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "kan inte ändra \"%s\" till \"%s\""
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "kan inte hitta omgivningen \"%s\""
 
 #. We could change the current translator's id, but that would make
@@ -653,7 +686,7 @@ msgstr "icke avslutat ackordtremolo"
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr "klav \"%s\" hittades inte"
@@ -667,7 +700,7 @@ msgstr "ok
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, fuzzy, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
@@ -676,26 +709,26 @@ msgstr ""
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
 #, fuzzy
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "kunde inte hitta något typsnitt som uppfyller "
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, fuzzy, c-format
 msgid "program has no such type: `%s'"
 msgstr "Programmet har ingen sådan typ"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "kan inte hitta eller skapa: \"%s\""
 
 #: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "kan inte hitta eller skapa \"%s\" kallad \"%s\""
 
 #: context.cc:276
@@ -705,7 +738,7 @@ msgstr ""
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "kan inte hitta eller skapa: \"%s\""
 
 #: custos.cc:77
@@ -713,17 +746,22 @@ msgstr "kan inte hitta eller skapa: \"%s\""
 msgid "custos `%s' not found"
 msgstr "custos \"%s\" hittades inte"
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, fuzzy, c-format
 msgid "Unknown event class %s"
 msgstr "okänd klusterstil: \"%s\""
 
+#: dots.cc:38
+#, fuzzy, c-format
+msgid "dot `%s' not found"
+msgstr "paus \"%s\" hittades inte, "
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "kan inte hitta start på crescendo/diminuendo"
 
 #: dynamic-engraver.cc:195
@@ -743,11 +781,7 @@ msgstr "Cresc startade h
 msgid "unterminated (de)crescendo"
 msgstr "oavslutat crescendo/diminuendo"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "oavslutad utökare"
 
@@ -770,15 +804,15 @@ msgstr "kan inte skapa katalog: \"%s\""
 msgid "adding font directory: %s"
 msgstr "kan inte skapa katalog: \"%s\""
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "Oavslutat glissando."
@@ -811,46 +845,38 @@ msgstr "implicit \\%s tillagt"
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "kan inte hitta start på ligatur"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, fuzzy, c-format
 msgid "Unknown interface `%s'"
 msgstr "okänd klusterstil: \"%s\""
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr "diminuendo för litet"
 
-#: hairpin.cc:180
-msgid "crescendo too small"
-msgstr "crescendo för litet"
-
-#: horizontal-bracket-engraver.cc:58
+#: horizontal-bracket-engraver.cc:59
 #, fuzzy
-msgid "don't have that many brackets"
+msgid "do not have that many brackets"
 msgstr "Har inte så många klamrar"
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 #, fuzzy
 msgid "conflicting note group events"
 msgstr "Motsägande notgrupphändelser."
@@ -869,93 +895,98 @@ msgstr "oavslutat bindestreck"
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "kan inte hitta fil: \"%s\""
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(sökväg: \"%s\")"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "okänd position"
 
-#: ligature-engraver.cc:95
-msgid "can't find start of ligature"
+#: ligature-engraver.cc:93
+msgid "cannot find start of ligature"
 msgstr "kan inte hitta start på ligatur"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr "ingen högergräns"
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 msgid "already have a ligature"
 msgstr "har redan en ligatur"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr "ingen vänstergräns"
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 msgid "unterminated ligature"
 msgstr "oavslutad ligatur"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 #, fuzzy
 msgid "ignoring rest: ligature may not contain rest"
 msgstr "ligatur får inte innehålla paus; ignorerar paus"
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr "ligaturen startade här"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(inläsningssökväg: \"%s\""
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, fuzzy, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr "Kan inte hitta egenskapstypkontroll för \"%s\" (%s)"
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 #, fuzzy
 msgid "perhaps a typing error?"
 msgstr "Kanske har du gjort ett skrivfel?"
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 #, fuzzy
 msgid "doing assignment anyway"
 msgstr "Gör tilldelningen ändå."
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, fuzzy, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 "Typkontroll för \"%s\" misslyckades. Värde \"%s\" måste ha typen \"%s\""
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "Identifierarnamn är ett nyckelord: \"%s\""
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "fel vid filslut: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, fuzzy, c-format
 msgid "deprecated function called: %s"
 msgstr "kan inte hitta tecken som heter: \"%s\""
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:88
 #, fuzzy, c-format
-msgid "Changing working directory to `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr "kan inte skapa katalog: \"%s\""
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, fuzzy, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "kan inte hitta fil: \"%s\""
 
 #: lily-parser-scheme.cc:125
@@ -963,21 +994,21 @@ msgstr "kan inte hitta fil: \"%s\""
 msgid "Processing `%s'"
 msgstr "Behandlar \"%s\"..."
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Tolkar..."
 
-#: lily-parser.cc:126
+#: lily-parser.cc:127
 #, fuzzy
-msgid "braces don't match"
+msgid "braces do not match"
 msgstr "Krullparenteser matchar inte"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, fuzzy, c-format
 msgid "cannot find Voice `%s'"
 msgstr "kan inte hitta fil: \"%s\""
 
-#: main.cc:117
+#: main.cc:116
 #, fuzzy, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -989,7 +1020,7 @@ msgstr ""
 "och du får ändra och/eller distribuera kopior av den under vissa\n"
 "villkor. Kör \"%s --warranty\" för mer information.\n"
 
-#: main.cc:123
+#: main.cc:122
 #, fuzzy
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
@@ -1001,7 +1032,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1019,136 +1050,134 @@ msgstr ""
 "detta program. Om inte, skriv till Free Software Foundation, Inc.,\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
+#: main.cc:155
 #, fuzzy
-msgid "SYM=VAL"
+msgid "SYM[=VAL]"
 msgstr "NYCKEL=VÄRDE"
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr "UTTR"
 
-#: main.cc:160
+#: main.cc:159
 #, fuzzy
 msgid "evaluate scheme code"
 msgstr "Kan inte evaluera Scheme i säkert läge"
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 #, fuzzy
 msgid "generate DVI (tex backend only)"
 msgstr "skapa PDF-utdata"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 #, fuzzy
 msgid "generate PDF (default)"
 msgstr "skapa PDF-utdata"
 
-#: main.cc:167
+#: main.cc:165
 #, fuzzy
 msgid "generate PNG"
 msgstr "skapa PS.GZ"
 
-#: main.cc:168
+#: main.cc:166
 #, fuzzy
 msgid "generate PostScript"
 msgstr "skapa PostScript-utdata"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-# förklaring av flaggan -h
-#: main.cc:170
-#, fuzzy
-msgid "print this help"
-msgstr "denna hjälp"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr "FÄLT"
 
-#: main.cc:171
+#: main.cc:169
 #, fuzzy
-msgid "dump a header field to file BASENAME.FIELD"
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr "skriv rubrikfält till BASNAMN.FÄLT"
 
-#: main.cc:172
-msgid "DIR"
-msgstr "KATALOG"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "lägg till KATALOG till sökvägen"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "använd FIL som init-fil"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "skapa PostScript-utdata"
 
-#: main.cc:179
+#: main.cc:178
 #, fuzzy
 msgid "write output to FILE (suffix will be added)"
 msgstr "skriv utdata till FIL"
 
-#: main.cc:180
+#: main.cc:179
 #, fuzzy
 msgid "generate a preview of the first system"
 msgstr "skapa en bild av det första systemet"
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "visa versionsnummer"
 
-#: main.cc:223
+#: main.cc:224
 #, fuzzy, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1156,81 +1185,81 @@ msgid ""
 msgstr "Copyright © %s av"
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Användning: %s [FLAGGA]... FIL..."
 
-#: main.cc:252
+#: main.cc:253
 #, fuzzy, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Typsätt musik och/eller spela MIDI från FIL"
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Flaggor:"
 
-#: main.cc:262
+#: main.cc:263
 #, fuzzy, c-format
 msgid "Report bugs via %s"
 msgstr ""
 "Rapportera programfel till %s\n"
 "Rapportera fel i översättningen till <sv@li.org>"
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:322
+#: main.cc:323
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "inställningen finns inte: \"%s\""
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "omgivning finns inte: %s"
 
-#: main.cc:341
+#: main.cc:342
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "kan inte ändra \"%s\" till \"%s\""
 
-#: main.cc:349
+#: main.cc:350
 #, fuzzy, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "kan inte skapa katalog: \"%s\""
 
-#: main.cc:356
+#: main.cc:357
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "kan inte ändra \"%s\" till \"%s\""
 
-#: main.cc:362
+#: main.cc:363
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "kan inte ändra \"%s\" till \"%s\""
 
-#: main.cc:368
+#: main.cc:369
 #, fuzzy, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "kan inte skapa katalog: \"%s\""
 
 #: main.cc:415
@@ -1238,7 +1267,7 @@ msgstr "kan inte skapa katalog: \"%s\""
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1252,40 +1281,40 @@ msgstr ""
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr "ligature med mindre än 2 huvuden -> skippar"
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 #, fuzzy
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr "kan inte bestämma tonhöjd för ligaturprimitiv -> skippar"
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 #, fuzzy
 msgid "single note ligature - skipping"
 msgstr "primintervall inom ligatur -> skippar"
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr "primintervall inom ligatur -> skippar"
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 #, fuzzy
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr "mensural ligature: längd ingen av L, B, S -> skippar"
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1293,7 +1322,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr "föll igenom case oväntat"
 
@@ -1312,116 +1341,119 @@ msgstr "Mensural_ligature: (join_left == 0)"
 msgid "no such MIDI instrument: `%s'"
 msgstr "instrumentet finns inte: \"%s\""
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "tokig ton"
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
 #: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "kan inte öppna fil: \"%s\""
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "kan inte öppna fil: \"%s\""
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:208
+#: music.cc:207
 #, fuzzy, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "Transponering med %s gör ändring större än två"
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "För många krockande notkolumner. Ignorerar dem."
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, fuzzy, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr "nothuvud \"%s\" ej funnet"
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "kan inte öppna fil: \"%s\""
 
 #: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "kan inte hitta typsnitt: \"%s\""
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 #, fuzzy
 msgid "Drawing systems..."
 msgstr "Skapar stämmor..."
 
-#: pango-font.cc:215
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "inte en PostScript-fil: \"%s\""
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1457,15 +1489,15 @@ msgstr "oavslutad procentrepris"
 msgid "Track..."
 msgstr "Spår... "
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI-utdata till \"%s\"..."
@@ -1474,23 +1506,23 @@ msgstr "MIDI-utdata till \"%s\"..."
 msgid "unterminated phrasing slur"
 msgstr "oavslutad fraseringsbåge"
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "kan inte hitta start på pianopedal: \"%s\""
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, fuzzy, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "kan inte hitta start på pianopedal: \"%s\""
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, fuzzy, c-format
 msgid "no such internal option: %s"
 msgstr "Okänd internt alternativ!"
@@ -1500,110 +1532,109 @@ msgstr "Ok
 msgid "not a grob name, `%s'"
 msgstr "Inte ett grob-namn, \"%s\"."
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "kan inte skapa katalog: \"%s\""
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "omgivning finns inte: %s"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "omgivning finns inte: %s"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
-#, fuzzy, c-format
-msgid "Relocation file %s\n"
-msgstr "kan inte öppna fil: \"%s\""
-
-#: relocate.cc:358
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "can't open file %s"
+msgid "Relocation file: %s"
 msgstr "kan inte öppna fil: \"%s\""
 
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "för många krockande pauser"
 
-#: rest.cc:143
+#: rest.cc:144
 #, fuzzy, c-format
 msgid "rest `%s' not found"
 msgstr "paus \"%s\" hittades inte, "
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "kan inte hitta \"%s\""
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 #, fuzzy
 msgid "Music font has not been installed properly."
 msgstr "Typsnitten är inte korrekt installerade. Avbryter"
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(sökväg: \"%s\")"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "Behöver musik i partitur"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 #, fuzzy
 msgid "errors found, ignoring music expression"
 msgstr "Fel funna/*, behandlar inte partitur*/"
@@ -1611,7 +1642,7 @@ msgstr "Fel funna/*, behandlar inte partitur*/"
 #. FIXME:
 #: script-engraver.cc:102
 #, fuzzy
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr "Kan inte tolka artikulering \"%s\""
 
 #: script-engraver.cc:103
@@ -1624,17 +1655,18 @@ msgstr "Scheme-alternativ:"
 msgid "No spring between column %d and next one"
 msgstr "Ingen fjäder mellan kolumn %d och nästa"
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "oavslutad båge"
 
-#: slur-engraver.cc:165
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "kan inte hitta start på båge"
 
 #: source-file.cc:74
@@ -1646,58 +1678,58 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr "tremololängd är för lång"
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, fuzzy, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "Lägger till nothuvud till inkompatibel båge (typ = %d)"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 #, fuzzy
 msgid "weird stem size, check for narrow beams"
 msgstr "Konstig skaftstorlek; kolla efter smala balkar"
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr "flaggan \"%s\" hittades ej"
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr "flaggstrecket \"%s\" hittades inte"
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr "Elementantal %d."
 
-#: system.cc:270
+#: system.cc:276
 #, fuzzy, c-format
 msgid "Grob count %d"
 msgstr "Elementantal %d "
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr "kan inte hitta start på textbryggare"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr "har redan en textbryggare"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr "oavslutad textbryggare"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "ensam båge"
 
@@ -1706,14 +1738,14 @@ msgstr "ensam b
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, fuzzy, c-format
 msgid "strange time signature found: %d/%d"
 msgstr "Hittade underlig tidssignatur %d/%d"
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr "tidssignatursymbol \"%s\" hittades inte: återgår till numrerad stil"
@@ -1723,43 +1755,39 @@ msgstr "tidssignatursymbol \"%s\" hittades inte: 
 msgid "unknown translator: `%s'"
 msgstr "okänd översättare: \"%s\""
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "kan inte hitta: \"%s\""
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "kan inte hitta start på textbryggare"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "har redan en textbryggare"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, fuzzy, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr "Vaticana_ligature_engraver: sätter `spacing-increment = %f': ptr=%ul"
@@ -1779,273 +1807,285 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr "Vaticana_ligature: (delta_pitch == 0)"
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "kan inte hitta start på textbryggare"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 #, fuzzy
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr "Har redan en reprisbryggare. Stoppar den tidigare."
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "har redan en textbryggare"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+#, fuzzy
+msgid "giving up"
+msgstr "Ger upp"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 #, fuzzy
 msgid "second argument must be pitch list"
 msgstr "Andra argumentet måste vara en symbol"
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 #, fuzzy
 msgid "have to be in Lyric mode for lyrics"
 msgstr "Måste vara i textläge (Lyric mode) för sångtext"
 
-#: parser.yy:1612
+#: parser.yy:1604
 #, fuzzy
 msgid "expecting string as script definition"
 msgstr "Väntade sträng som skriptdefinition"
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "inte en längd: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 #, fuzzy
 msgid "have to be in Note mode for notes"
 msgstr "Måste vara i notläge (Note mode) för noter"
 
-#: parser.yy:2004
+#: parser.yy:1987
 #, fuzzy
 msgid "have to be in Chord mode for chords"
 msgstr "Måste vara i ackordläge (Chord mode) för ackord"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, fuzzy, c-format
 msgid "Renaming input to: `%s'"
 msgstr "Öppnar rör \"%s\"..."
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "filslut hittat inuti en kommentar"
 
-#: lexer.ll:290
+#: lexer.ll:288
 #, fuzzy
 msgid "\\maininput not allowed outside init files"
 msgstr "\\maininput förbjudet utanför init-filer"
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "felaktig eller odefinierad identifierare: \"%s\""
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr "Krullparentes funnen i slutet på sångtext. Glömde du ett mellanslag?"
 
-#: lexer.ll:561
+#: lexer.ll:559
 #, fuzzy
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr "Krullparentes funnen i slutet på sångtext. Glömde du ett mellanslag?"
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ogiltigt tecken: \"%c\""
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "okänd \"escaped\" sträng: \"\\%s\""
 
-#: lexer.ll:882
+#: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "Felaktig lilypond-version: %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:883
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:881 lexer.ll:882
+#, fuzzy
+msgid "consider updating the input with the convert-ly script"
 msgstr "Fundera på att uppdatera indata med skriptet \"convert-ly\""
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, fuzzy, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, fuzzy, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Startar \"%s\""
 
 #: backend-library.scm:24
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "`~a' failed (~a)"
 msgstr "\"%s\" misslyckades (%d)"
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Converting to `~a'..."
 msgstr "Skriver \"%s\"..."
 
-#: backend-library.scm:110
-#, fuzzy, lisp-format
+#: backend-library.scm:108
+#, fuzzy, scheme-format
 msgid "Converting to ~a..."
 msgstr "Skriver \"%s\"..."
 
-#: backend-library.scm:156
-#, fuzzy, lisp-format
+#: backend-library.scm:145
+#, fuzzy, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "skriver rubrikfält \"%s\" till \"%s\"..."
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "inte en längd: %d"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:737
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, fuzzy, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "kan inte hitta omgivningen \"%s\""
 
-#: define-music-types.scm:757
-#, fuzzy, lisp-format
+#: define-music-types.scm:774
+#, fuzzy, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "okänd klusterstil: \"%s\""
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
+#, fuzzy, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "kan inte hitta teckennummer: %d"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "okänd klusterstil: \"%s\""
 
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "Behandlar..."
 
 #: documentation-lib.scm:150
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Writing ~S..."
 msgstr "Skriver \"%s\"..."
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, fuzzy, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "kan inte hitta teckennummer: %d"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "Skriver \"%s\"..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:379
-#, fuzzy, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "Kan inte tolka artikulering \"%s\""
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2054,57 +2094,57 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "filnamnet får inte innehålla mellanslag: \"%s\""
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 #, fuzzy
 msgid "Calculating page breaks..."
 msgstr "Beräknar radbrytningar..."
 
-#: lily-library.scm:510
-#, fuzzy, lisp-format
+#: lily-library.scm:593
+#, fuzzy, scheme-format
 msgid "unknown unit: ~S"
 msgstr "okänd översättare: \"%s\""
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "kan inte hitta: \"%s\""
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
 # här är det fråga om skrivning till en fil
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "beroenden skrivna till \"%s\"..."
 
@@ -2112,49 +2152,49 @@ msgstr "beroenden skrivna till \"%s\"..."
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
+#: music-functions.scm:213
 #, fuzzy
-msgid "More alternatives than repeats. Junking excess alternatives"
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr "Fler alternativ än repriser. Slänger överblivna alternativ."
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, fuzzy, lisp-format
+#: music-functions.scm:538
+#, fuzzy, scheme-format
 msgid "music expected: ~S"
 msgstr "väntade tomrum"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "kan inte hitta typsnitt: \"%s\""
 
-#: music-functions.scm:953
-#, fuzzy, lisp-format
+#: music-functions.scm:942
+#, fuzzy, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "okänd typsättning av höjning/sänkning: %s. Ignorered"
 
@@ -2163,42 +2203,42 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
+#, fuzzy, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "kan inte hitta start på balk"
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr ""
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, lisp-format
+#: paper.scm:129
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "okänd klusterstil: \"%s\""
 
@@ -2206,16 +2246,53 @@ msgstr "ok
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, fuzzy, lisp-format
+#: ps-to-png.scm:88
+#, fuzzy, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "kommandot avslutade med värde %d"
 
 #: to-xml.scm:190
-#, fuzzy
-msgid "assertion failed"
+#, fuzzy, scheme-format
+msgid "assertion failed: ~S"
 msgstr "LaTeX misslyckades."
 
+#, fuzzy
+#~ msgid "show warranty"
+#~ msgstr "visa garanti och copyright"
+
+#, fuzzy
+#~ msgid "Convert MIDI to LilyPond source."
+#~ msgstr "Konvertera MIDI till LilyPond"
+
+#, fuzzy
+#~ msgid "example"
+#~ msgstr "Exempel:"
+
+#, fuzzy
+#~ msgid "loading default font"
+#~ msgstr "Läser in standardtypsnitt"
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "kan inte hitta standardtypsnitt: \"%s\""
+
+#~ msgid "crescendo too small"
+#~ msgstr "crescendo för litet"
+
+# förklaring av flaggan -h
+#, fuzzy
+#~ msgid "print this help"
+#~ msgstr "denna hjälp"
+
+#~ msgid "silly pitch"
+#~ msgstr "tokig ton"
+
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "kan inte öppna fil: \"%s\""
+
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "Felaktig lilypond-version: %s (%s, %s)"
+
 #~ msgid "no one to print a tremolos"
 #~ msgstr "det finns ingen som kan skriva tremolon"
 
@@ -2238,7 +2315,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "no one to print a repeat brace"
 #~ msgstr "det finns ingen som kan skriva ett repristecken"
 
-#~ msgid "can't find `%s' context"
+#~ msgid "cannot find `%s' context"
 #~ msgstr "kan inte hitta omgivningen \"%s\""
 
 #~ msgid "Optimal demerits: %f"
@@ -2276,7 +2353,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr ""
 #~ "%s: TFM-fil har %u parametrar, vilket är mer än de %u jag kan hantera"
 
-#~ msgid "can't find ascii character: %d"
+#~ msgid "cannot find ascii character: %d"
 #~ msgstr "kan inte hitta ASCII-tecken: %d"
 
 #~ msgid "no one to print a tuplet start bracket"
@@ -2295,16 +2372,12 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "Fler alternativ än repriser. Slänger överblivna alternativ."
 
 #, fuzzy
-#~ msgid "can't find signature for music function"
+#~ msgid "cannot find signature for music function"
 #~ msgstr "kan inte hitta omgivningen \"%s\""
 
 #~ msgid "lilylib module"
 #~ msgstr "lilylib-modul"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "Användning: %s [FLAGGA]... FIL"
-
 #~ msgid "Opening pipe `%s'"
 #~ msgstr "Öppnar rör \"%s\"..."
 
@@ -2339,13 +2412,6 @@ msgstr "LaTeX misslyckades."
 #~ msgid "command exited with value %d"
 #~ msgstr "kommandot avslutade med värde %d"
 
-#~ msgid "Example:"
-#~ msgstr "Exempel:"
-
-#, fuzzy
-#~ msgid "Convert mup to LilyPond source."
-#~ msgstr "Konvertera mup till LilyPond"
-
 #~ msgid "debug"
 #~ msgstr "felsökningsutdata"
 
@@ -2372,7 +2438,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "Skriver \"%s\"..."
 
 #, fuzzy
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "kan inte öppna fil: \"%s\""
 
 #, fuzzy
@@ -2409,7 +2475,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "kan inte skapa katalog: \"%s\""
 
 #, fuzzy
-#~ msgid "can't handle a percent repeat of length: %s"
+#~ msgid "cannot handle a percent repeat of length: %s"
 #~ msgstr "Vet inte hur en procentrepris av denna längd ska hanteras."
 
 #~ msgid "lilypond -e EXPR means:"
@@ -2479,7 +2545,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "icke-fatalt fel: "
 
 #, fuzzy
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "kan inte hitta typsnitt: \"%s\""
 
 #, fuzzy
@@ -2522,7 +2588,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "Programming error: "
 #~ msgstr "programmeringsfel: "
 
-#~ msgid "Can't switch translators, I'm there already"
+#~ msgid "Cannot switch translators, I'm there already"
 #~ msgstr "Kan inte byta översättare, jag är redan där"
 
 #, fuzzy
@@ -2539,7 +2605,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "Huh?  Got %d, expected %d characters"
 #~ msgstr "Öh? Fick %d, väntade %d tecken"
 
-#~ msgid "Don't you want polyphonic voices instead?"
+#~ msgid "Donnot you want polyphonic voices instead?"
 #~ msgstr "Vill du ha polyfoniska stämmor istället?"
 
 #~ msgid "No volta spanner to end"
@@ -2558,11 +2624,11 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "FIXA: tonartsbytessammanslagning"
 
 #, fuzzy
-#~ msgid "kpathsea can't find %s file: `%s'"
+#~ msgid "kpathsea cannot find %s file: `%s'"
 #~ msgstr "Kpathsea kan inte hitta TFML-fil \"%s\""
 
 #, fuzzy
-#~ msgid "kpathsea can't find file: `%s'"
+#~ msgid "kpathsea cannot find file: `%s'"
 #~ msgstr "Kpathsea kan inte hitta TFML-fil \"%s\""
 
 #, fuzzy
@@ -2578,7 +2644,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "skapa PNG-sidbilder"
 
 #, fuzzy
-#~ msgid "don't generate full pages"
+#~ msgid "do not generate full pages"
 #~ msgstr "skapa inte bilder"
 
 #, fuzzy
@@ -2601,10 +2667,6 @@ msgstr "LaTeX misslyckades."
 #~ msgid "kpathsea can not find TFM file: `%s'"
 #~ msgstr "Kpathsea kan inte hitta TFML-fil \"%s\""
 
-#, fuzzy
-#~ msgid "Cannot switch translators, I'm there already"
-#~ msgstr "Kan inte byta översättare, jag är redan där"
-
 #, fuzzy
 #~ msgid "Converting to `~a.ps'..."
 #~ msgstr "Skriver \"%s\"..."
@@ -2626,7 +2688,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "keep all output, output to directory %s.dir"
 #~ msgstr "behåll all utdata, utdata till katalogen %s.dir"
 
-#~ msgid "don't run LilyPond"
+#~ msgid "do not run LilyPond"
 #~ msgstr "kör inte LilyPond"
 
 #~ msgid "produce MIDI output only"
@@ -2699,16 +2761,12 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "%s skrivet till \"%s\"..."
 
 #, fuzzy
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "kan inte hitta fil: \"%s\""
 
 #~ msgid " 1998--2005"
 #~ msgstr " 1998-2003"
 
-#~ msgid "Process LilyPond snippets in hybrid html, LaTeX or texinfo document"
-#~ msgstr ""
-#~ "Bearbeta LilyPond-stycken i ett hybriddokument i html, LaTex eller texinfo"
-
 #~ msgid "DIM"
 #~ msgstr "DIM"
 
@@ -2744,7 +2802,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "prepend PREF before each -M dependency"
 #~ msgstr "lägg till PREF före varje beroende angett med -M"
 
-#~ msgid "don't run lilypond"
+#~ msgid "do not run lilypond"
 #~ msgstr "kör inte lilypond"
 
 #~ msgid "strip all lilypond blocks from output"
@@ -2898,7 +2956,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "from musical definition: %s"
 #~ msgstr "från musikdefinition: %s"
 
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr "kan inte hitta start på fraseringsbåge"
 
 #~ msgid "unterminated pedal bracket"
@@ -2999,7 +3057,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "EOF i en sträng"
 
 # det handlar om mmap här
-#~ msgid "can't map file"
+#~ msgid "cannot map file"
 #~ msgstr "kan inte göra \"mmap\" på filen"
 
 #~ msgid "<stdin>"
@@ -3074,7 +3132,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "Textbryggare för liten"
 
 #~ msgid ""
-#~ "Can't find property type-check for `%s'.  Perhaps you made a typing "
+#~ "Cannot find property type-check for `%s'.  Perhaps you made a typing "
 #~ "error? Doing assignment anyway."
 #~ msgstr ""
 #~ "Kan inte hitta egenskapstypkontroll för \"%s\". Kanske har du gjort ett "
@@ -3086,7 +3144,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "Expecting %d arguments"
 #~ msgstr "Väntade %d argument"
 
-#~ msgid "Can't specify direction for this request"
+#~ msgid "Cannot specify direction for this request"
 #~ msgstr "Kan inte ange riktning för denna förfrågan"
 
 #~ msgid "Oldest supported input version: %s"
@@ -3136,7 +3194,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "enable debugging output"
 #~ msgstr "slå på felsökningsutdata"
 
-#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgid "do not output tuplets, double dots or rests, smallest is 32"
 #~ msgstr "mata inte ut tupler, dubbelpunkteringar eller pauser, minsta är 32"
 
 #~ msgid "set FILE as default output"
@@ -3145,13 +3203,13 @@ msgstr "LaTeX misslyckades."
 #~ msgid "be quiet"
 #~ msgstr "var tyst"
 
-#~ msgid "don't output rests or skips"
+#~ msgid "do not output rests or skips"
 #~ msgstr "mata inte ut pauser eller hopp"
 
 #~ msgid "set smallest duration"
 #~ msgstr "ställ in minsta längd"
 
-#~ msgid "don't timestamp the output"
+#~ msgid "do not timestamp the output"
 #~ msgstr "tidsstämpla inte utdata"
 
 #~ msgid "assume no double dotted notes"
@@ -3193,7 +3251,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "invalid number of tracks"
 #~ msgstr "ogiltigt antal spår"
 
-#~ msgid "can't handle non-metrical time"
+#~ msgid "cannot handle non-metrical time"
 #~ msgstr "kan inte hantera icke-metrisk tid"
 
 #~ msgid "Junking note-end event: channel = %d, pitch = %d"
diff --git a/po/tr.po b/po/tr.po
index a6321e4428..127059a468 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 2.3.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
 "PO-Revision-Date: 2005-03-14 04:59+0200\n"
 "Last-Translator: Olcay Yıldırım <olcayyildirim2003@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -73,155 +73,162 @@ msgid "Running %s..."
 msgstr "%s çalıştırılıyor..."
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "uyarı: %s"
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "Kullanım: %s (SEÇENEKLER)... DOSYA"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
-#, fuzzy
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr "çıktıyı DOSYAya yaz"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr ""
+"Yazılım hatalarını %s adresine,\n"
+"çeviri hatalarını <gnu-tr@belgeler.org> adresine bildirin."
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+#, fuzzy
+msgid "Examples:"
+msgstr "Örnek:"
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, c-format, python-format
 msgid "warning: %s"
 msgstr "uyarı: %s"
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, c-format, python-format
 msgid "error: %s"
 msgstr "hata: %s"
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr "GNU Genel Kamu Lisansı şartları uyarınca dağıtılır."
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr "HİÇBİR GARANTİ  ile gelmez."
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "`%s' işleniyor..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "dosya açılamıyor: `%s'"
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "%s için biçem saptanamıyor"
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "Kullanım: %s (SEÇENEKLER)... DOSYA"
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr "çıktıyı DOSYAya yaz"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "DOSYA"
 
-#: etf2ly.py:1204 midi2ly.py:899
-#, fuzzy
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr "garantiyi ve telif hakkını göster"
 
-#: lilypond-book.py:70
+#  # FIXME
+#  # do -P or -p by default?
+#  #help_summary = _ ("Run LilyPond using LaTeX for titling")
+#: lilypond-book.py:71
 #, fuzzy
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
 msgstr ""
-"LilyPond'un küçük  parçalarını karma HTML, LaTeX ya da texinfo belgelerinde\n"
-"çalıştırır. \n"
-" Örnek kullanım:\n"
-"\n"
-"    lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" KÄ°TAP\n"
-"    lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\"KÄ°TAP\n"
-"    lilypond-book --process='lilypond -I include' KÄ°TAP\n"
-"\n"
+"LilyPond'un küçük parçalarını karma HTML, LaTeX ya da texinfo belgesinde işle"
 
-#: lilypond-book.py:86
+#: lilypond-book.py:78
+msgid "BOOK"
+msgstr ""
+
+#: lilypond-book.py:87
 #, python-format
 msgid "Exiting (%d)..."
 msgstr "Mevcut (%d)..."
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Telif hakkı (c) %s tarafından"
@@ -236,13 +243,18 @@ msgstr "küçük parçaları [convert-ly -n -] SÜZGEÇi aracılığıyla borula
 
 #: lilypond-book.py:135
 #, fuzzy
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr "EXT (texi [öntanımlı], texi-html, latex, html) çıktı biçemini kullan"
 
 #: lilypond-book.py:138
 msgid "add DIR to include path"
 msgstr "içerim yollarına DIR'ı (DİZİN) ekle"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "DIR (DÄ°ZÄ°N)"
+
 #: lilypond-book.py:143
 msgid "write output to DIR"
 msgstr "çıktıyı DIR'a (DİZİN) yaz"
@@ -255,145 +267,145 @@ msgstr "KOMUT"
 msgid "process ly_files using COMMAND FILE..."
 msgstr "KOMUT DOSYASInı kullanarak ly_files'ı işle..."
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "daha fazla bilgi ver"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "garantiyi ve telif hakkını göster"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr "dosya bulunamadı: %s"
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, fuzzy, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr "artık kullanılmayan ly-seçeneği kullanıldı: %s"
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, fuzzy, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr "uyumluluk kipi çevirisi: %s"
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr "artık kullanılmayan ly-seçeneği kullanıldı: %s"
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr "uyumluluk kipi çevirisi: %s"
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr "bilinmeyen ly seçeneği yok sayılıyor: %s"
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, python-format
 msgid "Opening filter `%s'"
 msgstr "`%s' süzgeci açılıyor"
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr "`%s' başarısız (%d)"
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr "Hata günlüğü aşağıdaki gibidir:"
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 msgid "Writing snippets..."
 msgstr "Küçük parçalar yazılıyor..."
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 msgid "Processing..."
 msgstr "İşleniyor..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr "Bütün küçük parçalar güncellenmiştir..."
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "%s için biçem saptanamıyor"
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, fuzzy, python-format
 msgid "%s is up to date."
 msgstr "Bütün küçük parçalar güncellenmiştir..."
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "`%s' yazılıyor..."
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr "Çıktı girdi dosyasının üzerine yazılacak; --output'u kullan."
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, python-format
 msgid "Reading %s..."
 msgstr "%s okunuyor..."
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 msgid "Dissecting..."
 msgstr "Açımlanıyor..."
 
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, python-format
 msgid "Compiling %s..."
 msgstr "%s derleniyor..."
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, python-format
 msgid "Processing include: %s"
 msgstr "İçerim işleniyor: %s"
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, fuzzy, python-format
 msgid "Removing `%s'"
 msgstr "`%s' çağrılıyor"
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, fuzzy, python-format
 msgid "Writing fonts to %s..."
 msgstr "`%s' yazılıyor..."
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "uyarı:"
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "hata: "
 
@@ -406,12 +418,10 @@ msgstr "Mevcut ..."
 msgid "%s output to `%s'..."
 msgstr "`%s' çıktısı`%s'ye..."
 
-#  temp_dir = os.path.join (original_dir,  '%s.dir' % program_name)
-#  original_dir = os.getcwd ()
-#  keep_temp_dir_p = 0
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
-msgstr "MIDI'yi LilyPond kaynağına dönüştür."
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
+msgstr "mup'ı Lilypond kaynağına dönüştür."
 
 #: midi2ly.py:875
 msgid "print absolute pitches"
@@ -456,34 +466,60 @@ msgstr "her metne şarkı sözü muamelesi yap"
 
 #: midi2ly.py:905
 #, fuzzy
-msgid "example"
+msgid "Examples"
 msgstr "Örnek:"
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "komut satırında hiçbir dosya belirtilmedi."
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Bu program serbest yazılımdır. GNU Genel Kamu Lisansı tarafından\n"
+"korunmakta olan bu yazılımı belli şartlar altında değiştirebilir\n"
+"ve/veya kopyalarını dağıtabilirsiniz.  Daha fazla\n"
+"bilgi için 'lilypond --warranty' komutunu çalıştırın.\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "çıktıyı DOSYAya yaz"
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "`%s' seçeneği bir argüman gerektirir"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: getopt-long.cc:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "`%s' seçeneği argüman kabul etmez"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "tanınmayan seçenek: `%s'"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "`%s' seçeneğine `%s' geçersiz argümanı"
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr "programlama hatası: %s"
@@ -493,86 +529,75 @@ msgstr "programlama hatası: %s"
 msgid "continuing, cross fingers"
 msgstr "Devam ediliyor; parmaklar çaprazlanıyor"
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, fuzzy, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr "Rastlantı dizme listesi context-name (bağlam adı) ile başlamalıdır: %s"
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr "bilinmeyen rastlantı yok sayılıyor: %s"
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr "rastlantısal `%s' bulunamadı"
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "yazı tipi bulunamıyor: `%s'"
 
-#: all-font-metrics.cc:165
-#, fuzzy
-msgid "loading default font"
-msgstr "Öntanımlı yazı tipi yükleniyor "
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "öntanımlı yazı tipi bulunamıyor: `%s'"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(arama yolu: `%s')"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-#, fuzzy
-msgid "giving up"
-msgstr "Vazgeçiliyor"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr "\\applycontext (uygulamabağlamı) argümanı bir işlev değil"
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "`%s' `%s'ye dönüştürülemiyor "
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -586,19 +611,20 @@ msgstr "zaten bir ışın var"
 msgid "unterminated beam"
 msgstr "sonlandırılmamış ışın"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr "gövdenin Rhythmic yapısı olmalı"
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+#, fuzzy
+msgid "stem does not fit in beam"
 msgstr "gövde ışınla uyumlu değil"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr "ışın burada başlatıldı"
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 #, fuzzy
 msgid "no feasible beam position"
 msgstr "Hiçbir uygulanabilir satır bölünmesi bulunamadı"
@@ -608,26 +634,26 @@ msgstr "Hiçbir uygulanabilir satır bölünmesi bulunamadı"
 msgid "removing beam with no stems"
 msgstr "ikiden az gövdesi olan ışın kaldırılıyor"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 "hiçbir geçerli başlangıç yapılandırması bulunamadı: uygun ışın eğimi "
 "bulunamayabilir"
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "%s'den `%sy'e kadar hiçbir boşluk girişi yok"
 
 #: change-iterator.cc:23
 #, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "`%s' `%s'ye dönüştürülemiyor "
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "`%s'nin bağlamı bulunamıyor"
 
 #. We could change the current translator's id, but that would make
@@ -659,7 +685,7 @@ msgstr "sonlandırılmamış akort tremolosu"
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr "`%s' anahtarı bulunamadı"
@@ -673,7 +699,7 @@ msgstr "bilinmeyen küme tarzı `%s'"
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, fuzzy, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
@@ -682,26 +708,26 @@ msgstr ""
 
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, fuzzy, c-format
 msgid "program has no such type: `%s'"
 msgstr "Programın böyle bir türü yok: `%s'"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "`%2$s' adlı`%1$s' bulunamıyor ya da oluşturulamıyor"
 
 #: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "`%2$s' adlı`%1$s' bulunamıyor ya da oluşturulamıyor"
 
 #: context.cc:276
@@ -711,7 +737,7 @@ msgstr ""
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "bulunamıyor ya da oluşturulamıyor: `%s'"
 
 #: custos.cc:77
@@ -719,17 +745,22 @@ msgstr "bulunamıyor ya da oluşturulamıyor: `%s'"
 msgid "custos `%s' not found"
 msgstr "`%s'nin custosu bulunamadı"
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, fuzzy, c-format
 msgid "Unknown event class %s"
 msgstr "Bilinmeyen arabirim `%s'"
 
+#: dots.cc:38
+#, fuzzy, c-format
+msgid "dot `%s' not found"
+msgstr "`%s' durağı bulunamadı"
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "(de)kreşendonun başlangıcı bulunamıyor"
 
 #: dynamic-engraver.cc:195
@@ -749,11 +780,7 @@ msgstr "Cresc buradan başlatıldı"
 msgid "unterminated (de)crescendo"
 msgstr "sonlandırılmamış (de)kreşendo"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "sonlandırılmamış genişletici"
 
@@ -776,15 +803,15 @@ msgstr "dosya bulunamadı: %s"
 msgid "adding font directory: %s"
 msgstr ""
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "Sonlandırılmamaış glissando."
@@ -816,46 +843,38 @@ msgstr "örtük \\%s eklendi"
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "bağın başlangıcı bulunamıyor"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, c-format
 msgid "Unknown interface `%s'"
 msgstr "Bilinmeyen arabirim `%s'"
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr "dekreşendo çok küçük"
 
-#: hairpin.cc:180
-msgid "crescendo too small"
-msgstr "kreşendo çok küçük"
-
-#: horizontal-bracket-engraver.cc:58
+#: horizontal-bracket-engraver.cc:59
 #, fuzzy
-msgid "don't have that many brackets"
+msgid "do not have that many brackets"
 msgstr "O kadar çok köşeli ayraç yok"
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 #, fuzzy
 msgid "conflicting note group events"
 msgstr "Uyuşmayan nota grubu olayları."
@@ -872,93 +891,98 @@ msgstr "sonlandırılmamış kısa çizgi; kaldırılıyor"
 msgid "include files are not allowed in safe mode"
 msgstr "güvenli kipte dosyaların içerilmesine izin verilmiyor"
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "dosya bulunamıyor: `%s'"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(arama yolu: `%s')"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "konum bilinmiyor"
 
-#: ligature-engraver.cc:95
-msgid "can't find start of ligature"
+#: ligature-engraver.cc:93
+msgid "cannot find start of ligature"
 msgstr "bağın başlangıcı bulunamıyor"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr "hiçbir doğru bağ yok"
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 msgid "already have a ligature"
 msgstr "zaten bir bağ var"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr "arta kalan bağ yok"
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 msgid "unterminated ligature"
 msgstr "sonlandırılmamış bağ"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr "gerisini yok sayıyor: bağ gerisini içermeyebilir"
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr "bağ buradan başlatıldı"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(yolu yükle: `%s')"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, fuzzy, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr "`%s' (%s) için nitelik tür-denetimi bulunamıyor."
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 #, fuzzy
 msgid "perhaps a typing error?"
 msgstr "Galiba bir daktilo hatası yaptınız?"
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 #, fuzzy
 msgid "doing assignment anyway"
 msgstr "Görev yine de yapılıyor."
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, fuzzy, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 "`%s'  için yapılan tür denetimi başarısız oldu; `%s'nin değeri `%s' türünden "
 "olmalı"
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "Tanıtıcı adı bir anahtar kelime: `%s' "
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "EOF'ta hata: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, fuzzy, c-format
 msgid "deprecated function called: %s"
 msgstr "artık kullanılmayan ly-seçeneği kullanıldı: %s"
 
-#: lily-parser-scheme.cc:89
-#, c-format
-msgid "Changing working directory to `%s'"
-msgstr ""
+#: lily-parser-scheme.cc:88
+#, fuzzy, c-format
+msgid "Changing working directory to: `%s'"
+msgstr "dosya bulunamadı: %s"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "init dosyası bulunamıyor: `%s'"
 
 #: lily-parser-scheme.cc:125
@@ -966,21 +990,21 @@ msgstr "init dosyası bulunamıyor: `%s'"
 msgid "Processing `%s'"
 msgstr "`%s' işleniyor..."
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Ayrıştırılıyor..."
 
-#: lily-parser.cc:126
+#: lily-parser.cc:127
 #, fuzzy
-msgid "braces don't match"
+msgid "braces do not match"
 msgstr "Ayraçlar eşleşmiyor"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr "`%s' Sesi bulunamıyor"
 
-#: main.cc:117
+#: main.cc:116
 #, fuzzy, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -993,7 +1017,8 @@ msgstr ""
 "ve/veya kopyalarını dağıtabilirsiniz.  Daha fazla\n"
 "bilgi için 'lilypond --warranty' komutunu çalıştırın.\n"
 
-#: main.cc:123
+#: main.cc:122
+#, fuzzy
 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"
@@ -1004,7 +1029,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1024,130 +1049,130 @@ msgstr ""
 "Free Software Foundation, Inc., 59 Temple Place - 330Suite \n"
 "Boston, MA 02111 - 1307 , USA adresine yazın. \n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
+#: main.cc:155
 #, fuzzy
-msgid "SYM=VAL"
+msgid "SYM[=VAL]"
 msgstr "KEY=VAL"
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr "EXPR"
 
-#: main.cc:160
+#: main.cc:159
 msgid "evaluate scheme code"
 msgstr ""
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 #, fuzzy
 msgid "generate DVI (tex backend only)"
 msgstr "PDF üretir (öntanımlı)"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 msgid "generate PDF (default)"
 msgstr "PDF üretir (öntanımlı)"
 
-#: main.cc:167
+#: main.cc:165
 msgid "generate PNG"
 msgstr "PNG üretir"
 
-#: main.cc:168
+#: main.cc:166
 msgid "generate PostScript"
 msgstr "PostScript üretir"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:170
-msgid "print this help"
-msgstr "bu yardımı yazdır"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr "ALAN"
 
-#: main.cc:171
+#: main.cc:169
 #, fuzzy
-msgid "dump a header field to file BASENAME.FIELD"
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr "başlık alanını TEMELAD.ALANa yaz"
 
-#: main.cc:172
-msgid "DIR"
-msgstr "DIR (DÄ°ZÄ°N)"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "arama yoluna DÄ°ZÄ°N'i ekle"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "DOSYAyı init dosyası olarak kullanır"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "PostScript çıktısı üretme"
 
-#: main.cc:179
+#: main.cc:178
 #, fuzzy
 msgid "write output to FILE (suffix will be added)"
 msgstr "çıktıyı DOSYAya yaz"
 
-#: main.cc:180
+#: main.cc:179
 #, fuzzy
 msgid "generate a preview of the first system"
 msgstr "ilk sistemin bir resmini yap"
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "sürüm numarasını yazdır"
 
-#: main.cc:223
+#: main.cc:224
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1158,81 +1183,81 @@ msgstr ""
 
 #  No version number or newline here.  It confuses help2man.
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Kullanım: %s [SEÇENEKLER]... DOSYA..."
 
-#: main.cc:252
+#: main.cc:253
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Müziği diz ve/ya da DOSYAdan MIDIyi üret."
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr "LilyPond güzel müzik notasyonları üretir."
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr "Daha fazla bilgi için, %s'e bakın"
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Seçenekler:"
 
-#: main.cc:262
+#: main.cc:263
 #, fuzzy, c-format
 msgid "Report bugs via %s"
 msgstr ""
 "Yazılım hatalarını %s adresine,\n"
 "çeviri hatalarını <gnu-tr@belgeler.org> adresine bildirin."
 
-#: main.cc:308
+#: main.cc:309
 #, fuzzy, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr "Piano pedalları için 3 dizgeye ihtiyaç duyar. Hiç pedal yapılmadı."
 
-#: main.cc:322
+#: main.cc:323
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "böyle bir ayar yok: `%s'"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "böyle bir bağlam yok: %s"
 
-#: main.cc:341
+#: main.cc:342
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "`%s' `%s'ye dönüştürülemiyor "
 
-#: main.cc:349
+#: main.cc:350
 #, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr ""
 
-#: main.cc:356
+#: main.cc:357
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "`%s' `%s'ye dönüştürülemiyor "
 
-#: main.cc:362
+#: main.cc:363
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "`%s' `%s'ye dönüştürülemiyor "
 
-#: main.cc:368
+#: main.cc:369
 #, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr ""
 
 #: main.cc:415
@@ -1240,7 +1265,7 @@ msgstr ""
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1254,40 +1279,40 @@ msgstr ""
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr "2 taneden az kafalı bağ -> atlanıyor"
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 #, fuzzy
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr "ilkel bağın perdesi saptanamıyor -> atlanıyor"
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 #, fuzzy
 msgid "single note ligature - skipping"
 msgstr "bağ içinde ana duruş -> atlanıyor"
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr "bağ içinde ana duruş -> atlanıyor"
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 #, fuzzy
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr "mensural bağ: süre L, B, S' den hiçbiri değil -> atlanıyor"
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1295,7 +1320,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr "beklenmedik durum başarısızlığı"
 
@@ -1314,116 +1339,119 @@ msgstr "Mensural_bağ: [katılma_sol == 0]"
 msgid "no such MIDI instrument: `%s'"
 msgstr "böyle bir MIDI aracı yok: `%s'"
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "saçma perde"
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, fuzzy, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr "Deneysel: geçici olarak bir kanala ince akort yapılıyor (%d cents)."
 
 #: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "dosya açılamıyor: `%s'"
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "dosya yazılamıyor. `%s'"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, fuzzy, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr "oktav denetimi başarısız; beklenen %s, elde edilen: %s"
 
-#: music.cc:208
+#: music.cc:207
 #, fuzzy, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "%s ile transpozisyon ikiden büyük değişikliğe yol açar"
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "Çatışan notasütunları çok fazla. Yok sayılıyor."
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, fuzzy, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr "'%s'nin nota kafası bulunamadı"
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "dosya açılamıyor: `%s'"
 
 #: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "yazı tipi bulunamıyor: `%s'"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 msgid "Drawing systems..."
 msgstr ""
 
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
 #  no ps header?
-#: pango-font.cc:215
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "bir PostScript dosyası değil: `%s'"
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1458,15 +1486,15 @@ msgstr "sonlandırılmamaış yüzde tekrarı"
 msgid "Track..."
 msgstr "Ä°z... "
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI çıktısı `%s'ye..."
@@ -1475,23 +1503,23 @@ msgstr "MIDI çıktısı `%s'ye..."
 msgid "unterminated phrasing slur"
 msgstr "sonlandırılmamış, melodiyi ayrıştırarak çalan ses kaydırma imi"
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, fuzzy, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr "Piano pedalları için 3 dizgeye ihtiyaç duyar. Hiç pedal yapılmadı."
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "piano pedalının başlangıcı bulunamıyor: `%s'"
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "piyano pedalı köşeli ayracının başlangıcı bulunamıyor: '%s'"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, fuzzy, c-format
 msgid "no such internal option: %s"
 msgstr "Bilinmeyen iç seçenek: %s"
@@ -1501,117 +1529,116 @@ msgstr "Bilinmeyen iç seçenek: %s"
 msgid "not a grob name, `%s'"
 msgstr "Bir grob adı değil, '%s'."
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr "Oktav denetimi başarısız, alındı: "
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "`%s' yazılıyor..."
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "böyle bir bağlam yok: %s"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "böyle bir bağlam yok: %s"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "Relocation file %s\n"
+msgid "Relocation file: %s"
 msgstr "dosya açılamıyor: `%s'"
 
-#: relocate.cc:358
-#, fuzzy, c-format
-msgid "can't open file %s"
-msgstr "dosya açılamıyor: `%s'"
-
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "çatışan duraklar çok fazla"
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr "`%s' durağı bulunamadı"
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "`%s' bulunamıyor"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 #, fuzzy
 msgid "Music font has not been installed properly."
 msgstr "Müzik yazıtipi uygun biçimde yüklenmedi.  Durduruluyor"
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(arama yolu: `%s')"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "Notada zaten müzik var"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 msgid "errors found, ignoring music expression"
 msgstr ""
 
 #. FIXME:
 #: script-engraver.cc:102
 #, fuzzy
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr "Sesletimin nasıl yorumlanacağı bilinmiyor: "
 
 #: script-engraver.cc:103
@@ -1624,17 +1651,18 @@ msgstr "Program kodlaması: "
 msgid "No spring between column %d and next one"
 msgstr "%d sütunu ve sonraki sütun arasında kaynak yok."
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "sonlandırılmamış ses kaydırma imi"
 
-#: slur-engraver.cc:165
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "bulunamıyor: `%s'"
 
 #: source-file.cc:74
@@ -1646,58 +1674,58 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr "tremolo süresi fazla uzun"
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, fuzzy, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "uyuşmayan [tür= %d] köküne nota kafası ekleniyor"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 #, fuzzy
 msgid "weird stem size, check for narrow beams"
 msgstr "Garip kök boyutu; dar ışınları denetler"
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr "`%s' bayrağı bulunamadı"
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr "'%s'nin bayrak vuruşu bulunamadı "
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr "Öğe sayısı %d."
 
-#: system.cc:270
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr "Grob sayısı %d"
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr "metin anahtarının başlangıcı bulunamıyor"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr "zaten bir metin anahtarı var"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr "sonlandırılmamış metin anahtarı"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "yalnız bağ"
 
@@ -1708,7 +1736,7 @@ msgstr "yalnız bağ"
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, fuzzy, c-format
 msgid "strange time signature found: %d/%d"
 msgstr "garip zaman imzası bulundu %d/%d."
@@ -1717,7 +1745,7 @@ msgstr "garip zaman imzası bulundu %d/%d."
 #  (Here really with a warning!)
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
@@ -1728,36 +1756,32 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr "bilinmeyen çevirmen: `%s'"
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "bulunamıyor: `%s'"
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "metin anahtarının başlangıcı bulunamıyor"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "zaten bir metin anahtarı var"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
@@ -1766,7 +1790,7 @@ msgstr ""
 "seçilen bağ biçiminin kısıtlamalarına göre bu kafanın [es] '%s' öneki yok "
 "sayıldı"
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, fuzzy, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr "Vaticana_bağ_nakkaş: ayar boşlukbırakma-artırma = %f': ptr=%ul"
@@ -1784,271 +1808,283 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr "Vaticana_bağ: sıfır bağlantı [delta_perde == 0]"
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "metin anahtarının başlangıcı bulunamıyor"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 #, fuzzy
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr "Zaten bir volta anahtarı var. Vakitsiz durduruluyor."
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "zaten bir metin anahtarı var"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+#, fuzzy
+msgid "giving up"
+msgstr "Vazgeçiliyor"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 #, fuzzy
 msgid "second argument must be pitch list"
 msgstr "İkinci argüman perde listesi olmalı."
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 #, fuzzy
 msgid "have to be in Lyric mode for lyrics"
 msgstr "Güfteler için Lyric kipinde olunmalı"
 
-#: parser.yy:1612
+#: parser.yy:1604
 #, fuzzy
 msgid "expecting string as script definition"
 msgstr "Betik tanımı olarak dizge bekleniyor"
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "bir süre değil: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 #, fuzzy
 msgid "have to be in Note mode for notes"
 msgstr "Notalar için Nota kipinde olmalıdır"
 
-#: parser.yy:2004
+#: parser.yy:1987
 #, fuzzy
 msgid "have to be in Chord mode for chords"
 msgstr "Akortlar için Akort kipinde olmalıdır"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, fuzzy, c-format
 msgid "Renaming input to: `%s'"
 msgstr "`%s' veri yolu açılıyor"
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "EOF bir açıklamanın içinde bulundu"
 
-#: lexer.ll:290
+#: lexer.ll:288
 msgid "\\maininput not allowed outside init files"
 msgstr "\\anagirdi init dosyları dışında kabul edilmez"
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "yanlış ya da tanımlanmamış tanıtıcı: `%s' "
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr "Şarkı sözü sonunda ayraç bulundu. Bir boşluk mu unuttunuz?"
 
-#: lexer.ll:561
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr "Biçimlemenin sonunda ayraç bulundu. Bir boşluk bırakmayı mı unuttunuz?"
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "geçersiz karakter: `%c'"
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "bilinmeyen kaçmış dizge: '\\%s'"
 
-#: lexer.ll:882
+#: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "Hatalı lilypond sürümü: %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:883
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:881 lexer.ll:882
+#, fuzzy
+msgid "consider updating the input with the convert-ly script"
 msgstr "Girdiyi convert-ly betiği ile güncellemeyi dikkate alınız"
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, scheme-format
 msgid "Invoking `~a'..."
 msgstr "`~a' çağrılıyor..."
 
 #: backend-library.scm:24
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "`~a' failed (~a)"
 msgstr "`%s' başarısız (%d)"
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, lisp-format
+#, scheme-format
 msgid "Converting to `~a'..."
 msgstr "`~a'ya değiştiriliyor..."
 
-#: backend-library.scm:110
-#, fuzzy, lisp-format
+#: backend-library.scm:108
+#, fuzzy, scheme-format
 msgid "Converting to ~a..."
 msgstr "`~a'ya değiştiriliyor..."
 
-#: backend-library.scm:156
-#, lisp-format
+#: backend-library.scm:145
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "bir süre değil: %d"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:737
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, fuzzy, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "Müzik bulunamıyor"
 
-#: define-music-types.scm:757
-#, fuzzy, lisp-format
+#: define-music-types.scm:774
+#, fuzzy, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "bilinmeyen küme tarzı `%s'"
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
+#, fuzzy, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "öntanımlı yazı tipi bulunamıyor: `%s'"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "Bilinmeyen arabirim `%s'"
 
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "İşleniyor..."
 
 #: documentation-lib.scm:150
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Writing ~S..."
 msgstr "`%s' yazılıyor..."
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, fuzzy, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "öntanımlı yazı tipi bulunamıyor: `%s'"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "`%s' yazılıyor..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
-msgstr ""
+#: framework-ps.scm:349
+#, fuzzy, scheme-format
+msgid "do not know how to embed ~S=~S"
+msgstr "Sesletimin nasıl yorumlanacağı bilinmiyor: "
 
-#: framework-ps.scm:379
-#, fuzzy, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "Sesletimin nasıl yorumlanacağı bilinmiyor: "
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2057,56 +2093,56 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "dosyaadı boşluk içermemeli: `%s'"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 #, fuzzy
 msgid "Calculating page breaks..."
 msgstr "Satır bölünmeleri sayılıyor..."
 
-#: lily-library.scm:510
-#, fuzzy, lisp-format
+#: lily-library.scm:593
+#, fuzzy, scheme-format
 msgid "unknown unit: ~S"
 msgstr "bilinmeyen çevirmen: `%s'"
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "bulunamıyor: `%s'"
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "bağımlılıklar `%s'ye çıktılanıyor..."
 
@@ -2114,49 +2150,49 @@ msgstr "bağımlılıklar `%s'ye çıktılanıyor..."
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
+#: music-functions.scm:213
 #, fuzzy
-msgid "More alternatives than repeats. Junking excess alternatives"
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr "Tekrarlardan çok seçenek. Kullanılmayan fazla seşenekler. "
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, lisp-format
+#: music-functions.scm:538
+#, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "Müzik bulunamıyor"
 
-#: music-functions.scm:953
-#, fuzzy, lisp-format
+#: music-functions.scm:942
+#, fuzzy, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "bilinmeyen rastlantı yok sayılıyor: %s"
 
@@ -2165,44 +2201,44 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #  How to shut up this warning, when Voice_devnull_engraver has
 #  eaten start event?
 #: output-tex.scm:98
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
+#, fuzzy, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "ses kaydırma iminin başlangıcı bulunamıyor"
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr ""
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, lisp-format
+#: paper.scm:129
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "bilinmeyen küme tarzı `%s'"
 
@@ -2210,16 +2246,74 @@ msgstr "bilinmeyen küme tarzı `%s'"
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, fuzzy, lisp-format
+#: ps-to-png.scm:88
+#, fuzzy, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "komut %d değeriyle sonlandı"
 
 #: to-xml.scm:190
-#, fuzzy
-msgid "assertion failed"
+#, fuzzy, scheme-format
+msgid "assertion failed: ~S"
 msgstr "LaTeX başarısız oldu."
 
+#~ msgid "silly pitch"
+#~ msgstr "saçma perde"
+
+#, fuzzy
+#~ msgid "show warranty"
+#~ msgstr "garantiyi ve telif hakkını göster"
+
+#, fuzzy
+#~ msgid ""
+#~ "Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
+#~ "\n"
+#~ "Example usage:\n"
+#~ "\n"
+#~ " lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
+#~ " lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
+#~ " lilypond-book --process='lilypond -I include' BOOK\n"
+#~ msgstr ""
+#~ "LilyPond'un küçük  parçalarını karma HTML, LaTeX ya da texinfo "
+#~ "belgelerinde\n"
+#~ "çalıştırır. \n"
+#~ " Örnek kullanım:\n"
+#~ "\n"
+#~ "    lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" KÄ°TAP\n"
+#~ "    lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -"
+#~ "\"KÄ°TAP\n"
+#~ "    lilypond-book --process='lilypond -I include' KÄ°TAP\n"
+#~ "\n"
+
+#  temp_dir = os.path.join (original_dir,  '%s.dir' % program_name)
+#  original_dir = os.getcwd ()
+#  keep_temp_dir_p = 0
+#~ msgid "Convert MIDI to LilyPond source."
+#~ msgstr "MIDI'yi LilyPond kaynağına dönüştür."
+
+#, fuzzy
+#~ msgid "example"
+#~ msgstr "Örnek:"
+
+#, fuzzy
+#~ msgid "loading default font"
+#~ msgstr "Öntanımlı yazı tipi yükleniyor "
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "öntanımlı yazı tipi bulunamıyor: `%s'"
+
+#~ msgid "crescendo too small"
+#~ msgstr "kreşendo çok küçük"
+
+#~ msgid "print this help"
+#~ msgstr "bu yardımı yazdır"
+
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "dosya açılamıyor: `%s'"
+
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "Hatalı lilypond sürümü: %s (%s, %s)"
+
 #~ msgid "no one to print a tremolos"
 #~ msgstr "bir tremolo yazdıracak kimse yok"
 
@@ -2236,7 +2330,7 @@ msgstr "LaTeX başarısız oldu."
 #~ msgid "no one to print a repeat brace"
 #~ msgstr "bir tekrar ayracını yazdıracak kimse yok"
 
-#~ msgid "can't find `%s' context"
+#~ msgid "cannot find `%s' context"
 #~ msgstr "`%s'nin bağlamı bulunamıyor"
 
 #~ msgid "Optimal demerits: %f"
@@ -2277,7 +2371,7 @@ msgstr "LaTeX başarısız oldu."
 #~ "%s: TFM dosyası %u değiştirgeye sahip ve bu başa çıkabileceğim %u'dan "
 #~ "fazla."
 
-#~ msgid "can't find ascii character: %d"
+#~ msgid "cannot find ascii character: %d"
 #~ msgstr "ascii karakteri bulunamıyor: %d"
 
 #~ msgid "no one to print a tuplet start bracket"
@@ -2296,15 +2390,12 @@ msgstr "LaTeX başarısız oldu."
 #~ msgstr "Tekrarlardan çok seçenek. Kullanılmayan fazla seşenekler. "
 
 #, fuzzy
-#~ msgid "can't find signature for music function"
+#~ msgid "cannot find signature for music function"
 #~ msgstr "`%s'nin bağlamı bulunamıyor"
 
 #~ msgid "lilylib module"
 #~ msgstr "lilylib birimi"
 
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "Kullanım: %s (SEÇENEKLER)... DOSYA"
-
 #~ msgid "Binary %s has version %s, looking for version %s"
 #~ msgstr " %s ikilisi,  %s sürümünde, %s sürümü aranıyor"
 
@@ -2342,12 +2433,6 @@ msgstr "LaTeX başarısız oldu."
 #~ msgid "command exited with value %d"
 #~ msgstr "komut %d değeriyle sonlandı"
 
-#~ msgid "Example:"
-#~ msgstr "Örnek:"
-
-#~ msgid "Convert mup to LilyPond source."
-#~ msgstr "mup'ı Lilypond kaynağına dönüştür."
-
 #~ msgid "debug"
 #~ msgstr "hata ayıklama"
 
@@ -2376,7 +2461,7 @@ msgstr "LaTeX başarısız oldu."
 #~ msgstr "`%s' yazıldı"
 
 #, fuzzy
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "dosya açılamıyor: `%s'"
 
 #, fuzzy
@@ -2413,7 +2498,7 @@ msgstr "LaTeX başarısız oldu."
 #~ msgstr "emniyetli kipte çalıştır"
 
 #, fuzzy
-#~ msgid "can't handle a percent repeat of length: %s"
+#~ msgid "cannot handle a percent repeat of length: %s"
 #~ msgstr "Bu uzunluktaki bir yüzde tekrarıyla nasıl baş edeceğini bilmiyor."
 
 #~ msgid "rest direction not set.  Cannot resolve collision."
@@ -2442,7 +2527,7 @@ msgstr "LaTeX başarısız oldu."
 #~ msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
 #~ msgstr "Kullanım: lilypond-bin -e \"(ly:set-option SEMBOL DEĞER)\""
 
-#  this shouldn't happen, but let's continue anyway.
+#  this shouldnnot happen, but let's continue anyway.
 #~ msgid "Separation_item:  I've been drinking too much"
 #~ msgstr "Ayırma_öğe: Çok fazla içmişim"
 
@@ -2494,7 +2579,7 @@ msgstr "LaTeX başarısız oldu."
 #~ msgstr "hiçbir onulmaz hata yok: "
 
 #, fuzzy
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "yazı tipi bulunamıyor: `%s'"
 
 #, fuzzy
@@ -2528,7 +2613,7 @@ msgstr "LaTeX başarısız oldu."
 #~ msgid "Programming error: "
 #~ msgstr "programlama hatası: %s"
 
-#~ msgid "Can't switch translators, I'm there already"
+#~ msgid "Cannot switch translators, I'm there already"
 #~ msgstr "Çevirmenler değiştirilemiyor, zaten oradayım"
 
 #~ msgid "Accidental rule must be pair or context-name; Found %s"
@@ -2549,7 +2634,7 @@ msgstr "LaTeX başarısız oldu."
 #~ msgid "Huh?  Got %d, expected %d characters"
 #~ msgstr "Ha? %2$d karakter beklenirken, %1$d alındı"
 
-#~ msgid "Don't you want polyphonic voices instead?"
+#~ msgid "Donnot you want polyphonic voices instead?"
 #~ msgstr "Bunun yerine polifonik sesler istemez misiniz?"
 
 #~ msgid "No volta spanner to end"
@@ -2588,7 +2673,7 @@ msgstr "LaTeX başarısız oldu."
 #~ msgid "keep all output, output to directory %s.dir"
 #~ msgstr "bütün çıktıyı sakla, çıktıyı %s dizinine yönlendir"
 
-#~ msgid "don't run LilyPond"
+#~ msgid "do not run LilyPond"
 #~ msgstr "LilyPond'u çalıştırma"
 
 #~ msgid "produce MIDI output only"
@@ -2666,7 +2751,7 @@ msgstr "LaTeX başarısız oldu."
 #~ msgid "%s output to %s..."
 #~ msgstr "%s çıktısı %s'ye..."
 
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "dosya bulunamıyor: `%s.%s'"
 
 #~ msgid "NaN"
@@ -2736,14 +2821,6 @@ msgstr "LaTeX başarısız oldu."
 #~ "LaTeX'in çalıştırılması başarısız. İzlemek için\n"
 #~ "--verbose seçeneği ile yeniden çalıştırın."
 
-#  # FIXME
-#  # do -P or -p by default?
-#  #help_summary = _ ("Run LilyPond using LaTeX for titling")
-#~ msgid "Process LilyPond snippets in hybrid HTML, LaTeX or texinfo document"
-#~ msgstr ""
-#~ "LilyPond'un küçük parçalarını karma HTML, LaTeX ya da texinfo belgesinde "
-#~ "işle"
-
 #~ msgid "DIM"
 #~ msgstr "DIM"
 
@@ -2784,10 +2861,10 @@ msgstr "LaTeX başarısız oldu."
 #~ msgid "prepend PREF before each -M dependency"
 #~ msgstr "her bir -M bağımlılığının başına PREF ekle"
 
-#~ msgid "don't run lilypond"
+#~ msgid "do not run lilypond"
 #~ msgstr "lilypond'u çalıştırma"
 
-#~ msgid "don't generate pictures"
+#~ msgid "do not generate pictures"
 #~ msgstr "resim üretme"
 
 #~ msgid "strip all lilypond blocks from output"
@@ -2815,7 +2892,7 @@ msgstr "LaTeX başarısız oldu."
 #~ msgid "prepend DIR to dependencies"
 #~ msgstr "bağımlılıkların başına DİZİN ekle"
 
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr ""
 #~ "melodiyi ayrıştırarak çalan ses kaydırma iminin başlangıcı bulunamıyor"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 83d25f2b7d..b1138edd0b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
 "PO-Revision-Date: 2005-06-29 05:00+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -71,150 +71,159 @@ msgid "Running %s..."
 msgstr "正在執行 %s..."
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "警告: %s"
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "用法: %s [選項]... 檔案"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
-#, fuzzy
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr "將輸出資料寫入 <檔案>"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr "請向 %s 匯報錯誤。"
+
 #: convert-ly.py:41
 #, fuzzy
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 "更新 LilyPond 輸入檔的版本。在預設模式中，它會讀取原來檔案中的 \\version\n"
 "指令來決定其版本，並將之更新至最新的版本。"
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+#, fuzzy
+msgid "Examples:"
+msgstr "例子:"
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, c-format, python-format
 msgid "warning: %s"
 msgstr "警告: %s"
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, c-format, python-format
 msgid "error: %s"
 msgstr "錯誤: %s"
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr "根據 GNU 公共授權條款發佈。"
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr "本程式沒有任何使用保證。"
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr "進行轉換："
 
 #: convert-ly.py:166
 #, fuzzy
-msgid "error while converting"
+msgid "Error while converting"
 msgstr "%s: 轉換時發生錯誤"
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
-msgstr "終止"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
+msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, python-format
 msgid "Processing `%s'... "
 msgstr "正在處理 ‘%s’..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "無法開啟檔案: ‘%s’"
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "%s: 無法決定 ‘%s’ 的版本"
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "用法: %s [選項]... 檔案"
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr "將輸出資料寫入 <檔案>"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "檔案"
 
-#: etf2ly.py:1204 midi2ly.py:899
-#, fuzzy
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr "顯示保證條款及版權資訊"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr ""
+
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, python-format
 msgid "Exiting (%d)..."
 msgstr "正在結束 (%d)..."
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, fuzzy, python-format
 msgid "Copyright (c) %s by"
 msgstr "版權所有 (c) %s"
@@ -229,7 +238,8 @@ msgstr ""
 
 #: lilypond-book.py:135
 #, fuzzy
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr ""
 "使用指定輸出 <格式> (texi [預設值]、texi-html、\n"
 "latex 或 html)"
@@ -238,6 +248,10 @@ msgstr ""
 msgid "add DIR to include path"
 msgstr "將 <目錄> 加入搜尋目錄中"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "目錄"
+
 #: lilypond-book.py:143
 msgid "write output to DIR"
 msgstr "將輸出結果寫入至 <目錄> 中"
@@ -250,145 +264,145 @@ msgstr "指令"
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "顯示詳細訊息"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "顯示保證條款及版權資訊"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, python-format
 msgid "file not found: %s"
 msgstr "找不到檔案: %s"
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr "使用了過時的 ly-option: %s=%s"
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr "使用了過時的 ly-option: %s"
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr "不理會不明的 ly 選項：%s"
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, python-format
 msgid "Opening filter `%s'"
 msgstr ""
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr "‘%s’ 發生錯誤 (%d)"
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr "以下是錯誤紀錄的內容："
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 msgid "Writing snippets..."
 msgstr ""
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 msgid "Processing..."
 msgstr "處理中..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "無法決定 %s 的格式"
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, python-format
 msgid "%s is up to date."
 msgstr ""
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "正在寫入 ‘%s’..."
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr "這樣輸出檔會覆寫輸入檔；請使用 --output 選項。"
 
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, python-format
 msgid "Reading %s..."
 msgstr "正在讀取 %s..."
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 msgid "Dissecting..."
 msgstr ""
 
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, python-format
 msgid "Compiling %s..."
 msgstr "正在編譯 %s ..."
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, python-format
 msgid "Processing include: %s"
 msgstr ""
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, python-format
 msgid "Removing `%s'"
 msgstr "正在移除 ‘%s’"
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, python-format
 msgid "Writing fonts to %s..."
 msgstr "正在將字型寫入 %s..."
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr "DVIPS 用法："
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "警告："
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "錯誤："
 
@@ -401,9 +415,10 @@ msgstr "結束 ... "
 msgid "%s output to `%s'..."
 msgstr "%s 輸出至 ‘%s’..."
 
-#: midi2ly.py:871
-msgid "Convert MIDI to LilyPond source."
-msgstr "將 MIDI 轉換為 LilyPond 來源檔。"
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
+msgstr "將 mup 格式轉換至 LilyPond 格式。"
 
 #: midi2ly.py:875
 msgid "print absolute pitches"
@@ -447,34 +462,56 @@ msgstr "將所有文字當作歌詞處理"
 
 #: midi2ly.py:905
 #, fuzzy
-msgid "example"
-msgstr "例子"
+msgid "Examples"
+msgstr "例子:"
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "指令參數中未指定任何檔案。"
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "將輸出資料寫入 <檔案>"
+
+#: getopt-long.cc:140
 #, 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:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "選項 ‘%s’ 不可配合參數使用"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "無法識別的選項: ‘%s’"
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "選項 ‘%s’ 的參數 ‘%s’ 無效"
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, c-format
 msgid "programming error: %s"
 msgstr "程式錯誤：%s"
@@ -483,84 +520,75 @@ msgstr "程式錯誤：%s"
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr "忽略不明的升降符號：%s"
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr "找不到升降符號 ‘%s’"
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "找不到字型：‘%s’"
 
-#: all-font-metrics.cc:165
-msgid "loading default font"
-msgstr "正在載入預設字型"
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "找不到預設字型：‘%s’"
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(搜尋路徑：‘%s’)"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-msgid "giving up"
-msgstr "放棄"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr ""
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -574,19 +602,19 @@ msgstr "已經有了連桁 (beam)"
 msgid "unterminated beam"
 msgstr "連桁沒有終點"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr ""
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+msgid "stem does not fit in beam"
 msgstr ""
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr ""
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 #, fuzzy
 msgid "no feasible beam position"
 msgstr "無法找出適當斷行位置"
@@ -596,23 +624,23 @@ msgstr "無法找出適當斷行位置"
 msgid "removing beam with no stems"
 msgstr "移除少於兩條符桿的連桁"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr ""
 
 #: change-iterator.cc:23
 #, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "無法將 ‘%s’ 更改為 ‘%s’"
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr ""
 
 #. We could change the current translator's id, but that would make
@@ -643,7 +671,7 @@ msgstr "顫音和弦沒有終結"
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr "顫音和弦需要 2 個元素，但實際上找到 %d 個"
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr "找不到譜號 ‘%s’"
@@ -657,34 +685,33 @@ msgstr ""
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
 
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
-#, fuzzy
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "找不到符合指定條件的斷行位置"
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, c-format
 msgid "program has no such type: `%s'"
 msgstr ""
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr ""
 
 #: context.cc:213
 #, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr ""
 
 #: context.cc:276
@@ -694,7 +721,7 @@ msgstr ""
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr ""
 
 #: custos.cc:77
@@ -702,17 +729,22 @@ msgstr ""
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, c-format
 msgid "Unknown event class %s"
 msgstr ""
 
+#: dots.cc:38
+#, fuzzy, c-format
+msgid "dot `%s' not found"
+msgstr "找不到休止符 ‘%s’"
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "漸強/漸弱符號沒有起點"
 
 #: dynamic-engraver.cc:195
@@ -731,11 +763,7 @@ msgstr "漸強符號在這裡開始"
 msgid "unterminated (de)crescendo"
 msgstr "漸強/漸弱符號沒有終點"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr ""
 
@@ -758,15 +786,15 @@ msgstr "加入字型目錄：%s"
 msgid "adding font directory: %s"
 msgstr "加入字型目錄：%s"
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 msgid "unterminated glissando"
 msgstr "滑奏沒有終結"
 
@@ -796,45 +824,37 @@ msgstr ""
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "找不到樂句線的起點"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, c-format
 msgid "Unknown interface `%s'"
 msgstr ""
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr "漸弱符號太小"
 
-#: hairpin.cc:180
-msgid "crescendo too small"
-msgstr "漸強符號太小"
-
-#: horizontal-bracket-engraver.cc:58
-msgid "don't have that many brackets"
+#: horizontal-bracket-engraver.cc:59
+msgid "do not have that many brackets"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 msgid "conflicting note group events"
 msgstr ""
 
@@ -850,89 +870,94 @@ msgstr ""
 msgid "include files are not allowed in safe mode"
 msgstr "安全模式中不允許再包含另一個檔案的內容"
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "找不到檔案: ‘%s’"
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(搜尋路徑：‘%s’)"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "位置不明"
 
-#: ligature-engraver.cc:95
-msgid "can't find start of ligature"
+#: ligature-engraver.cc:93
+msgid "cannot find start of ligature"
 msgstr "找不到樂句線的起點"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr "沒有右邊邊界"
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 msgid "already have a ligature"
 msgstr "已經有樂句線"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr "沒有左邊邊界"
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 msgid "unterminated ligature"
 msgstr "樂句線沒有終點"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr "忽略休止符；樂句中不可含有休止符"
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr "樂句在這裡開始"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(載入路徑：‘%s’)"
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 msgid "perhaps a typing error?"
 msgstr "是否打錯字？"
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr ""
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "檔案結束的位置發生錯誤: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, c-format
 msgid "deprecated function called: %s"
 msgstr "調用已過時的函式: %s"
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:88
 #, fuzzy, c-format
-msgid "Changing working directory to `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr "無法將工作目錄切換至: %s: %s"
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr ""
 
 #: lily-parser-scheme.cc:125
@@ -940,20 +965,21 @@ msgstr ""
 msgid "Processing `%s'"
 msgstr "正在處理 ‘%s’"
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "分析中..."
 
-#: lily-parser.cc:126
-msgid "braces don't match"
-msgstr ""
+#: lily-parser.cc:127
+#, fuzzy
+msgid "braces do not match"
+msgstr "不符合: ‘%s’"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr ""
 
-#: main.cc:117
+#: main.cc:116
 #, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -962,7 +988,8 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: main.cc:123
+#: main.cc:122
+#, fuzzy
 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"
@@ -973,7 +1000,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -987,127 +1014,127 @@ msgstr ""
 "您應已收到附隨於本程式的 GNU 通用公共授權的副本；如無，請寫信至自由\n"
 "軟體基金會：59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA\n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr "背景模組"
 
-#: main.cc:154
+#: main.cc:153
 #, fuzzy
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 "使用指定的背景模組 (gnome, ps [預設],\n"
 "                                       scm, svg, tex, texstr)"
 
-#: main.cc:156
-msgid "SYM=VAL"
+#: main.cc:155
+msgid "SYM[=VAL]"
 msgstr ""
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr "表示式"
 
-#: main.cc:160
+#: main.cc:159
 msgid "evaluate scheme code"
 msgstr ""
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr "格式"
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr "輸出為指定 <格式>。也可以使用下列選項:"
 
-#: main.cc:164
+#: main.cc:163
 msgid "generate DVI (tex backend only)"
 msgstr "產生 DVI (只適用於 tex 背景模組)"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 msgid "generate PDF (default)"
 msgstr "產生 PDF (預設)"
 
-#: main.cc:167
+#: main.cc:165
 msgid "generate PNG"
 msgstr "產生 PNG"
 
-#: main.cc:168
+#: main.cc:166
 msgid "generate PostScript"
 msgstr "產生 PostScript"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr "產生 TeX (只適用於 tex 背景模組)"
 
-#: main.cc:170
-msgid "print this help"
-msgstr "印出這段說明訊息"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr "欄位"
 
-#: main.cc:171
-msgid "dump a header field to file BASENAME.FIELD"
+#: main.cc:169
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:172
-msgid "DIR"
-msgstr "目錄"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "將 <目錄> 加入搜尋目錄中"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 msgid "do not generate printed output"
 msgstr ""
 
-#: main.cc:179
+#: main.cc:178
 msgid "write output to FILE (suffix will be added)"
 msgstr "將輸出內容寫入 <檔案> (會自動加上延伸檔名)"
 
-#: main.cc:180
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr ""
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "顯示版本"
 
-#: main.cc:223
+#: main.cc:224
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1117,79 +1144,79 @@ msgstr ""
 "%s  等等。"
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "用法: %s [選項]... 檔案..."
 
-#: main.cc:252
+#: main.cc:253
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "排列樂譜，並且/或者由檔案產生 MIDI。"
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr "LilyPond 是用來排列樂譜的軟體。"
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr "如果想獲取更多資訊，請瀏覽 %s"
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "選項:"
 
-#: main.cc:262
+#: main.cc:263
 #, fuzzy, c-format
 msgid "Report bugs via %s"
 msgstr "請向 %s 匯報錯誤。"
 
-#: main.cc:308
+#: main.cc:309
 #, fuzzy, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr "鋼琴踏板記號後要跟隨 3 個字串，但只找到 %d 個"
 
-#: main.cc:322
+#: main.cc:323
 #, c-format
 msgid "no such user: %s"
 msgstr "%s 用戶不存在"
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr "無法從用戶名稱獲得 UID: %s: %s"
 
-#: main.cc:339
+#: main.cc:340
 #, c-format
 msgid "no such group: %s"
 msgstr "%s 群組不存在"
 
-#: main.cc:341
+#: main.cc:342
 #, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "無法從群組名稱獲得 GID: %s: %s"
 
-#: main.cc:349
+#: main.cc:350
 #, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr ""
 
-#: main.cc:356
+#: main.cc:357
 #, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "無法將 GID 更改為 %d: %s"
 
-#: main.cc:362
+#: main.cc:363
 #, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "無法將 UID 更改為 %d: %s"
 
-#: main.cc:368
+#: main.cc:369
 #, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "無法將工作目錄切換至: %s: %s"
 
 #: main.cc:415
@@ -1197,7 +1224,7 @@ msgstr "無法將工作目錄切換至: %s: %s"
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1211,37 +1238,37 @@ msgstr "rehearsalMark 必須是整數"
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr "圓滑線包含的音符符頭少於 2 個，因此忽略之"
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr "忽略單音符的圓滑線"
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1249,7 +1276,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr ""
 
@@ -1266,114 +1293,117 @@ msgstr "Mensural_ligature: (join_right == 0)"
 msgid "no such MIDI instrument: `%s'"
 msgstr "MIDI 樂器不存在: ‘%s’"
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr ""
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
 #: midi-stream.cc:28
 #, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "無法開啟檔案來寫入內容: %s: %s"
 
 #: midi-stream.cc:44
 #, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "無法寫入檔案: ‘%s’"
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:208
+#: music.cc:207
 #, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr ""
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 msgid "ignoring too many clashing note columns"
 msgstr ""
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr "一條符桿上不可以同時有符頭和休止符"
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, fuzzy, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr "找不到符頭 ‘%s’"
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "無法分配 %d 位元組"
 
 #: open-type-font.cc:37
 #, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "無法載入字型表: %s"
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr "不支援字型格式: %s"
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
-#, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+#: open-type-font.cc:173 open-type-font.cc:297
+#, fuzzy, c-format
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr "FT_Get_Glyph_Name() 回傳錯誤代碼: %d"
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 msgid "Drawing systems..."
 msgstr ""
 
-#: pango-font.cc:215
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "字型 ‘%s’ 沒有 PostScript 字型名稱"
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1407,15 +1437,15 @@ msgstr ""
 msgid "Track..."
 msgstr ""
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "將 MIDI 輸出至 ‘%s’..."
@@ -1424,23 +1454,23 @@ msgstr "將 MIDI 輸出至 ‘%s’..."
 msgid "unterminated phrasing slur"
 msgstr "樂句線沒有終點"
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, fuzzy, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr "鋼琴踏板記號後要跟隨 3 個字串，但只找到 %d 個"
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "找不到鋼琴踏板記號的開始位置: ‘%s’"
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "找不到鋼琴踏板記號的開始位置: ‘%s’"
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, c-format
 msgid "no such internal option: %s"
 msgstr ""
@@ -1450,114 +1480,113 @@ msgstr ""
 msgid "not a grob name, `%s'"
 msgstr ""
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "正在將字型寫入 %s"
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "%s 用戶不存在"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "%s 用戶不存在"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "Relocation file %s\n"
+msgid "Relocation file: %s"
 msgstr "無法開啟檔案: ‘%s’"
 
-#: relocate.cc:358
-#, fuzzy, c-format
-msgid "can't open file %s"
-msgstr "無法開啟檔案: ‘%s’"
-
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr ""
 
-#: rest.cc:143
+#: rest.cc:144
 #, c-format
 msgid "rest `%s' not found"
 msgstr "找不到休止符 ‘%s’"
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, c-format
 msgid "cannot find `%s'"
 msgstr "找不到 ‘%s’"
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr "樂譜字型沒有正確地安裝。"
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, c-format
 msgid "Search path `%s'"
 msgstr "搜尋路徑 ‘%s’"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr "終止"
+
+#: score.cc:225
 msgid "already have music in score"
 msgstr ""
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 msgid "errors found, ignoring music expression"
 msgstr ""
 
 #. FIXME:
 #: script-engraver.cc:102
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr ""
 
 #: script-engraver.cc:103
@@ -1569,16 +1598,17 @@ msgstr ""
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "圓滑線沒有終點"
 
-#: slur-engraver.cc:165
-msgid "can't end slur"
+#: slur-engraver.cc:166
+msgid "cannot end slur"
 msgstr "無法結束圓滑線"
 
 #: source-file.cc:74
@@ -1590,57 +1620,57 @@ msgstr "本來應該讀入 %d 個字元，但實際上是 %d 個"
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "將符頭加入不兼容的符桿 (type = %d)"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 msgid "weird stem size, check for narrow beams"
 msgstr ""
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:270
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr ""
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "單邊連結線"
 
@@ -1649,14 +1679,14 @@ msgstr "單邊連結線"
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr "出現不正常的拍號: %d/%d"
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr "找不到拍號 ‘%s’，還原為數字形式"
@@ -1666,41 +1696,37 @@ msgstr "找不到拍號 ‘%s’，還原為數字形式"
 msgid "unknown translator: `%s'"
 msgstr ""
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "找不到: ‘%s’"
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
-msgid "can't find start of trill spanner"
+#: trill-spanner-engraver.cc:68
+msgid "cannot find start of trill spanner"
 msgstr "找不到震音的起點"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 msgid "already have a trill spanner"
 msgstr "震音已經有起點"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr "Vaticana_ligature_engraver: 設定 `spacing-increment = %f': ptr =%ul"
@@ -1718,264 +1744,275 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
-msgid "can't end volta spanner"
+#: volta-engraver.cc:144
+msgid "cannot end volta spanner"
 msgstr ""
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 msgid "also already have an ended spanner"
 msgstr ""
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+msgid "giving up"
+msgstr "放棄"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr "\\paper 不可以在 \\score 中使用，請改用 \\layout"
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1612
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "不是音符長度: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 msgid "have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:2004
+#: parser.yy:1987
 msgid "have to be in Chord mode for chords"
 msgstr ""
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr ""
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr "\\version 後應該是加上引號的字串"
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr "\\sourcefilename 後應該是加上引號的字串"
 
-#: lexer.ll:262
+#: lexer.ll:260
 #, fuzzy
 msgid "integer expected after \\sourcefileline"
 msgstr "\\sourcefilename 後應該是加上引號的字串"
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "檔案突然在註釋內結束"
 
-#: lexer.ll:290
+#: lexer.ll:288
 msgid "\\maininput not allowed outside init files"
 msgstr ""
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "錯誤或仍未定義的識別字: ‘%s’"
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr "缺少了右引號"
 
-#: lexer.ll:468
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:561
+#: lexer.ll:559
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "字元無效: ‘%c’"
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:882
+#: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "lilypond 版本不正確: %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:883
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:881 lexer.ll:882
+#, fuzzy
+msgid "consider updating the input with the convert-ly script"
 msgstr "請考慮使用 convert-ly 命令稿來轉換輸入的內容"
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, scheme-format
 msgid "Invoking `~a'..."
 msgstr ""
 
 #: backend-library.scm:24
-#, lisp-format
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr "‘~a’ 發生錯誤 (~a)"
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, lisp-format
+#, scheme-format
 msgid "Converting to `~a'..."
 msgstr "轉換為 ‘~a’..."
 
-#: backend-library.scm:110
-#, lisp-format
+#: backend-library.scm:108
+#, scheme-format
 msgid "Converting to ~a..."
 msgstr "轉換為 ~a..."
 
-#: backend-library.scm:156
-#, lisp-format
+#: backend-library.scm:145
+#, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr "符號 ~S 被重複定義"
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, lisp-format
+#: define-markup-commands.scm:1297
+#, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "音符長度無效: ~a"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:737
-#, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, scheme-format
+msgid "cannot find music object: ~S"
 msgstr ""
 
-#: define-music-types.scm:757
-#, lisp-format
+#: define-music-types.scm:774
+#, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr ""
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, lisp-format
-msgid "can't find interface for property: ~S"
+#, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr ""
 
 #: document-backend.scm:145
-#, lisp-format
+#, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr ""
 
 #: documentation-lib.scm:45
-#, lisp-format
+#, scheme-format
 msgid "Processing ~S..."
 msgstr "正在處理 ~S..."
 
 #: documentation-lib.scm:150
-#, lisp-format
+#, scheme-format
 msgid "Writing ~S..."
 msgstr "正在寫入 ~S..."
 
 #: documentation-lib.scm:172
-#, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr ""
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, scheme-format
 msgid "Writing ~a..."
 msgstr "正在寫入 ~a..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:379
-#, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr "無法將 <標準輸出> 轉換為 ~S"
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr "無法使用 postscript 背景模組來產生 ~S"
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -1984,55 +2021,55 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, lisp-format
+#, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "TeX 檔案名稱不可以有空格: ‘~a’"
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 msgid "Calculating page breaks..."
 msgstr "正在計算頁面分割位置..."
 
-#: lily-library.scm:510
-#, lisp-format
+#: lily-library.scm:593
+#, scheme-format
 msgid "unknown unit: ~S"
 msgstr ""
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "找不到: ‘%s’"
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr "參數 ~a 類型不正確。應該是 ~a，但實際是 ~s。"
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "轉換為 ~a..."
 
@@ -2040,48 +2077,48 @@ msgstr "轉換為 ~a..."
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr "參數數目不正確。應該是 ~A，但實際是 ~A: ~S。"
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr "位置 ~A 出現無效的參數。應該是 ~A，但實際是 ~S。"
 
-#: music-functions.scm:210
-msgid "More alternatives than repeats. Junking excess alternatives"
+#: music-functions.scm:213
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
-#: music-functions.scm:229
-#, fuzzy, lisp-format
+#: music-functions.scm:232
+#, fuzzy, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr "顫音和弦需要 2 個元素，但實際上找到 %d 個"
 
-#: music-functions.scm:535
-#, lisp-format
+#: music-functions.scm:538
+#, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, lisp-format
-msgid "can't find quoted music `~S'"
-msgstr ""
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
+msgstr "找不到字型：‘%s’"
 
-#: music-functions.scm:953
-#, lisp-format
+#: music-functions.scm:942
+#, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 
@@ -2091,42 +2128,42 @@ msgid "utf-8-string encountered in PS backend"
 msgstr "PS 背景模組遇到 UTF-8 字串"
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr "未定義: ~S"
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, lisp-format
-msgid "can't find ~a in ~a"
+#, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr ""
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr ""
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, lisp-format
+#: paper.scm:129
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr "\\paper { ... } 內必須使用 #(set-paper-size .. )"
 
 #: parser-clef.scm:126
-#, lisp-format
+#, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "出現不明譜號 ‘~a’"
 
@@ -2134,29 +2171,61 @@ msgstr "出現不明譜號 ‘~a’"
 msgid "see scm/clef.scm for supported clefs"
 msgstr "請在 scm/clef.scm 內參考目前支援的譜號"
 
-#: ps-to-png.scm:97
-#, fuzzy, lisp-format
+#: ps-to-png.scm:88
+#, fuzzy, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "%s 結束，回傳值為: %d"
 
 #: to-xml.scm:190
-msgid "assertion failed"
+#, scheme-format
+msgid "assertion failed: ~S"
 msgstr ""
 
+#, fuzzy
+#~ msgid "show warranty"
+#~ msgstr "顯示保證條款及版權資訊"
+
+#~ msgid "Convert MIDI to LilyPond source."
+#~ msgstr "將 MIDI 轉換為 LilyPond 來源檔。"
+
+#, fuzzy
+#~ msgid "example"
+#~ msgstr "例子"
+
+#~ msgid "loading default font"
+#~ msgstr "正在載入預設字型"
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "找不到預設字型：‘%s’"
+
+#, fuzzy
+#~ msgid "couldnnot find line breaking that satisfies constraints"
+#~ msgstr "找不到符合指定條件的斷行位置"
+
+#~ msgid "crescendo too small"
+#~ msgstr "漸強符號太小"
+
+#~ msgid "print this help"
+#~ msgstr "印出這段說明訊息"
+
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "無法開啟檔案: ‘%s’"
+
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "lilypond 版本不正確: %s (%s, %s)"
+
 #~ msgid "distance undefined, assuming 0.1"
 #~ msgstr "未定義距離，假設為 0.1"
 
 #~ msgid "no feasible line breaking found"
 #~ msgstr "無法找出適當斷行位置"
 
-#~ msgid "can't find line breaking that satisfies constraints"
-#~ msgstr "找不到符合指定條件的斷行位置"
-
 #~ msgid ""
 #~ "%s: TFM file has %u parameters, which is more than the %u I can handle"
 #~ msgstr "%s: TFM 檔案有 %u 個參數，多於目前能夠處理的 %u 個"
 
-#~ msgid "can't find ascii character: %d"
+#~ msgid "cannot find ascii character: %d"
 #~ msgstr "找不到 ascii 字元: %d"
 
 #~ msgid "unterminated trill spanner"
@@ -2168,9 +2237,6 @@ msgstr ""
 #~ msgid "lilylib module"
 #~ msgstr "lilylib 模組"
 
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "用法: %s [選項]... 檔案"
-
 #~ msgid "Opening pipe `%s'"
 #~ msgstr "開啟管線 ‘%s’"
 
@@ -2221,12 +2287,6 @@ msgstr ""
 #~ msgid "command exited with value %d"
 #~ msgstr "指令結束，回傳值為 %d"
 
-#~ msgid "Example:"
-#~ msgstr "例子:"
-
-#~ msgid "Convert mup to LilyPond source."
-#~ msgstr "將 mup 格式轉換至 LilyPond 格式。"
-
 #~ msgid "debug"
 #~ msgstr "偵錯"
 
@@ -2251,7 +2311,7 @@ msgstr ""
 #~ msgid "Wrote `%s'"
 #~ msgstr "寫入‘%s’"
 
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "無法 dlopen: %s: %s"
 
 #~ msgid "error opening kpathsea library"
@@ -2266,9 +2326,6 @@ msgstr ""
 #~ msgid "checksum mismatch for font file: `%s'"
 #~ msgstr "字型檔的檢查碼出現錯誤: ‘%s’"
 
-#~ msgid "does not match: `%s'"
-#~ msgstr "不符合: ‘%s’"
-
 #~ msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
 #~ msgstr "重新產生所有 .afm 檔，並移除所有 .pk 和 .tfm 檔。"
 
@@ -2322,5 +2379,5 @@ msgstr ""
 #~ msgid "syntax error"
 #~ msgstr "語法錯誤"
 
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "找不到 CFF/PFA/PFB 字型 ~S=~S"
diff --git a/python/lilylib.py b/python/lilylib.py
index 877b98e360..686993e5d8 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -200,7 +200,7 @@ class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
 			       metavar)
 
     def format_usage(self, usage):
-        return _("Usage: %s\n") % usage
+        return _("Usage: %s") % usage + '\n'
 
     def format_description(self, description):
 	return description
diff --git a/python/midi.c b/python/midi.c
index dc7d38196b..facf06446a 100644
--- a/python/midi.c
+++ b/python/midi.c
@@ -372,7 +372,7 @@ midi_parse (unsigned char **midi,unsigned  char *midi_end)
 
 
   if (division < 0)
-    /* return midi_error ("can't handle non-metrical time"); */
+    /* return midi_error (cannot handle non-metrical time"); */
     ;
   *midi += header_len - 6;
 
diff --git a/scm/GNUmakefile b/scm/GNUmakefile
index fb01bcfbd5..f2555bb481 100644
--- a/scm/GNUmakefile
+++ b/scm/GNUmakefile
@@ -5,7 +5,7 @@ depth = ..
 INSTALLATION_DIR=$(local_lilypond_datadir)/scm/
 INSTALLATION_FILES=$(SCM_FILES)
 
-XGETTEXT_FLAGS = --language=Lisp
+XGETTEXT_FLAGS = --language=Scheme
 STEPMAKE_TEMPLATES=install scm po
 
 include $(depth)/make/stepmake.make
diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm
index cf8ea886f2..275367bb39 100644
--- a/scm/chord-entry.scm
+++ b/scm/chord-entry.scm
@@ -218,6 +218,7 @@ DURATION, and INVERSION."
   (map (lambda (n)
 	 (define (nca x)
 	   (if (= x 7) FLAT 0))
+	 
 	 (if (>= n 8)
 	     (ly:make-pitch 1 (- n 8) (nca n))
 	     (ly:make-pitch 0 (- n 1) (nca n))))
diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index fe4ba7ab12..33f82c9501 100644
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -21,7 +21,8 @@
 	0.3
 	0.6)
     (make-musicglyph-markup
-     (string-append "accidentals." (number->string alteration))))))
+     (format "accidentals.~a"
+	     (inexact->exact (* 4 alteration)))))))
   
 (define (accidental->markup alteration)
   "Return accidental markup for ALTERATION."
@@ -50,36 +51,39 @@
      (vector-ref #("C" "D" "E" "F" "G" "A" "B") (ly:pitch-notename pitch)))
      (accidental->markup (ly:pitch-alteration pitch)))))
 
+(define (pitch-alteration-semitones pitch)
+  (inexact->exact (round (* (ly:pitch-alteration pitch) 2))))
+
 (define-safe-public ((chord-name->german-markup B-instead-of-Bb) pitch)
   "Return pitch markup for PITCH, using german note names.
    If B-instead-of-Bb is set to #t real german names are returned.
    Otherwise semi-german names (with Bb and below keeping the british names)
 "
   (let* ((name (ly:pitch-notename pitch))
-         (alt (ly:pitch-alteration pitch))
-	 (n-a (if (member (cons name alt) `((6 . ,FLAT) (6 . ,DOUBLE-FLAT)))
-		 (cons 7 (+ (if B-instead-of-Bb SEMI-TONE 0) alt))
-		 (cons name alt))))
+         (alt-semitones  (pitch-alteration-semitones pitch))
+	 (n-a (if (member (cons name alt-semitones) `((6 . -1) (6 . -2)))
+		  (cons 7 (+ (if B-instead-of-Bb 1 0) alt-semitones))
+		  (cons name alt-semitones))))
     (make-line-markup
      (list
       (make-simple-markup
        (vector-ref #("C" "D" "E" "F" "G" "A" "H" "B") (car n-a)))
       (make-normal-size-super-markup
-       (accidental->markup (cdr n-a)))))))
+       (accidental->markup (/ (cdr n-a) 2)))))))
 
 (define-safe-public (note-name->german-markup pitch)
   (let* ((name (ly:pitch-notename pitch))
-	 (alt (ly:pitch-alteration pitch))
-	 (n-a (if (member (cons name alt) `((6 . ,FLAT) (6 . ,DOUBLE-FLAT)))
-		  (cons 7 (+ SEMI-TONE alt))
-		  (cons name alt))))
+	 (alt-semitones (pitch-alteration-semitones pitch))
+	 (n-a (if (member (cons name alt-semitones) `((6 . -1) (6 . -2)))
+		  (cons 7 (+ 1 alt-semitones))
+		  (cons name alt-semitones))))
     (make-line-markup
      (list
       (string-append
        (list-ref '("c" "d" "e" "f" "g" "a" "h" "b") (car n-a))
        (if (or (equal? (car n-a) 2) (equal? (car n-a) 5))
-	   (list-ref '( "ses" "s" "" "is" "isis") (+ 2 (/ (cdr n-a) 2)))
-	   (list-ref '("eses" "es" "" "is" "isis") (+ 2 (/ (cdr n-a) 2)))))))))
+	   (list-ref '( "ses" "s" "" "is" "isis") (+ 2 (cdr n-a)))
+	   (list-ref '("eses" "es" "" "is" "isis") (+ 2 (cdr n-a)))))))))
 
 (define-public ((chord-name->italian-markup re-with-eacute) pitch)
   "Return pitch markup for PITCH, using italian/french note names.
diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index fe32b4ecd9..43a738d6ae 100644
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -260,6 +260,10 @@ the @code{instr} property labels following lines.")
      (instrumentEqualizer ,procedure? "
 Function taking a string (instrument name), and returning a (@var{min} . @var{max}) pair of numbers for the loudness range of the instrument.
 ")
+
+     ;; the definition is reversed wrt  traditional transposition
+     ;; this because \transpose { \transposition .. } won't work
+     ;; otherwise.
      (instrumentTransposition ,ly:pitch? "Defines the transposition of
 the instrument. Its value is the pitch that sounds like middle C. This
 is used to transpose the MIDI output, and @code{\\quote}s.")
diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index bf2c5b6c99..fe584ad40d 100644
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -56,11 +56,21 @@
  "Keep track of durations in a run of grace notes."
  '(columns common-shortest-duration))
 
+(ly:add-interface
+ 'key-cancellation-interface
+ "A key cancellation"
+ '())
+
 (ly:add-interface
  'ligature-interface
  "A ligature"
  '())
 
+(ly:add-interface
+ 'key-cancellation-interface
+ "A key cancellation"
+ '())
+
 (ly:add-interface
  'ligature-bracket-interface
  "A bracket indicating a ligature in the original edition"
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index cf615aae7c..af306ed01d 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -202,6 +202,7 @@
 	(font-size . -2)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
+	(outside-staff-priority . 100)
 	(X-offset . ,(ly:make-simple-closure
 		      `(,+
 			,(ly:make-simple-closure
@@ -985,6 +986,7 @@
 	(direction . ,UP)
 	(padding . 0.8)
 	(side-axis . ,Y)
+	(outside-staff-priority . 1000)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				side-position-interface
@@ -1281,7 +1283,7 @@
 	(break-visibility . ,end-of-line-invisible)
 	(break-align-symbol . staff-bar)
 	(padding . 0.8)
-	(outside-staff-priority . 1000)
+	(outside-staff-priority . 1500)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				side-position-interface
diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index bec7bc5efc..e7e2bb88cf 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -751,7 +751,7 @@ and values. E.g:
       (ly:error (_ "symbol expected: ~S") name))
   (let ((props (hashq-ref music-name-to-property-table name '())))
     (if (not (pair? props))
-	(ly:error (_ "can't find music object: ~S") name))
+	(ly:error (_ "cannot find music object: ~S") name))
     (let ((m (ly:make-music props)))
       (define (set-props mus-props)
 	(if (and (not (null? mus-props))
diff --git a/scm/document-backend.scm b/scm/document-backend.scm
index 6b22d7f300..08cc17cd33 100644
--- a/scm/document-backend.scm
+++ b/scm/document-backend.scm
@@ -132,7 +132,7 @@ node."
 (define (check-dangling-properties prop)
   (if (not (object-property prop 'iface-marked))
       (ly:error (string-append "define-grob-properties.scm: "
-		(_ "can't find interface for property: ~S")) prop)))
+		(_ "cannot find interface for property: ~S")) prop)))
 
 (map check-dangling-properties all-backend-properties)
 
diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm
index ce91651e77..5a0afbbf34 100644
--- a/scm/documentation-lib.scm
+++ b/scm/documentation-lib.scm
@@ -169,7 +169,7 @@ with init values from ALIST (1st optional argument)
 	 (handle (assoc sym alist)))
 
     (if (eq? desc #f)
-	(ly:error (_ "can't find description for property ~S (~S)") sym where))
+	(ly:error (_ "cannot find description for property ~S (~S)") sym where))
     
     (cons
      (string-append "@code{" name "} "
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index e17c3d4780..23d0f10dfc 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -256,7 +256,7 @@
       (format
        (if (string? name)
 	   "(~a) (r) file .loadfont\n"
-	   "% can't find font file: ~a\n")
+	   "% cannot find font file: ~a\n")
        name))
 
     (let* ((font (car font-name-filename))
@@ -276,7 +276,7 @@
 	    ((string? bare-file-name)
 	     (ps-load-file file-name))
 	    (else
-	     (ly:warning (_ "can't embed ~S=~S") name file-name)
+	     (ly:warning (_ "cannot embed ~S=~S") name file-name)
 	     "")))
 
 	  )))
@@ -329,7 +329,7 @@
       (if (not embed)
 	  (begin
 	    (set! embed "% failed \n")
-	    (ly:warning (_ "can't extract file matching ~a from ~a") name filename)))
+	    (ly:warning (_ "cannot extract file matching ~a from ~a") name filename)))
       embed))
 
     (define (font-file-as-ps-string name file-name)
@@ -346,7 +346,7 @@
        ((and file-name (string-match "\\.otf" downcase-file-name))
 	(ps-embed-cff (ly:otf->cff file-name) name 0))
        (else
-	(ly:warning (_ "don't know how to embed ~S=~S") name file-name)
+	(ly:warning (_ "do not know how to embed ~S=~S") name file-name)
 	""))))
 
     (define (mac-font? bare-file-name)
@@ -377,7 +377,7 @@
 
 	(bare-file-name (font-file-as-ps-string name bare-file-name))
 	(else
-	 (ly:warning (_ "don't know how to embed font ~s ~s ~s")
+	 (ly:warning (_ "do not know how to embed font ~s ~s ~s")
 		     name file-name font))))))
 	
 
@@ -726,7 +726,7 @@
 	 )
 
     (if (equal? (basename name ".ps") "-")
-	(ly:warning (_ "can't convert <stdout> to ~S" "PDF"))
+	(ly:warning (_ "cannot convert <stdout> to ~S" "PDF"))
 	(postscript->pdf w h name))))
 
 (define-public (convert-to-png book name)
@@ -745,10 +745,10 @@
 		     name)))
 
 (define-public (convert-to-dvi book name)
-  (ly:warning (_ "can't generate ~S using the postscript back-end") "DVI"))
+  (ly:warning (_ "cannot generate ~S using the postscript back-end") "DVI"))
 
 (define-public (convert-to-tex book name)
-  (ly:warning (_ "can't generate ~S using the postscript back-end") "TeX"))
+  (ly:warning (_ "cannot generate ~S using the postscript back-end") "TeX"))
 
 (define-public (convert-to-ps book name)
   #t)
diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 0d09beae53..1e8fe97e47 100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -19,16 +19,27 @@
 (define-public DOWN -1)
 (define-public CENTER 0)
 
-(define-safe-public DOUBLE-FLAT -4)
-(define-safe-public THREE-Q-FLAT -3)
-(define-safe-public FLAT -2)
-(define-safe-public SEMI-FLAT -1)
+(define-safe-public DOUBLE-FLAT-QTS -4)
+(define-safe-public THREE-Q-FLAT-QTS -3)
+(define-safe-public FLAT-QTS -2)
+(define-safe-public SEMI-FLAT-QTS -1)
+(define-safe-public NATURAL-QTS 0)
+(define-safe-public SEMI-SHARP-QTS 1)
+(define-safe-public SHARP-QTS 2)
+(define-safe-public THREE-Q-SHARP-QTS 3)
+(define-safe-public DOUBLE-SHARP-QTS 4)
+(define-safe-public SEMI-TONE-QTS 2)
+
+(define-safe-public DOUBLE-FLAT  -1)
+(define-safe-public THREE-Q-FLAT -3/4)
+(define-safe-public FLAT -1/2)
+(define-safe-public SEMI-FLAT -1/4)
 (define-safe-public NATURAL 0)
-(define-safe-public SEMI-SHARP 1)
-(define-safe-public SHARP 2)
-(define-safe-public THREE-Q-SHARP 3)
-(define-safe-public DOUBLE-SHARP 4)
-(define-safe-public SEMI-TONE 2)
+(define-safe-public SEMI-SHARP 1/4)
+(define-safe-public SHARP 1/2)
+(define-safe-public THREE-Q-SHARP 3/4)
+(define-safe-public DOUBLE-SHARP 1)
+(define-safe-public SEMI-TONE 1/2)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; moments
@@ -50,6 +61,9 @@
 (define-public default-script-alist '())
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; parser <-> output hooks.
+
 ;; parser stuff.
 (define-public (print-music-as-book parser music)
   (let* ((head (ly:parser-lookup parser '$defaultheader))
@@ -74,7 +88,6 @@
    parser 'toplevel-scores
    (cons score (ly:parser-lookup parser 'toplevel-scores))))
 
-
 (define-public (scorify-music music parser)
   
   (for-each (lambda (func)
@@ -110,8 +123,6 @@
 (define-public (print-score-with-defaults parser score)
   (let*
       ((paper (ly:parser-lookup parser '$defaultpaper))
-       (layout (ly:parser-lookup parser '$defaultlayout))
-       (header (ly:parser-lookup parser '$defaultheader))
        (count (ly:parser-lookup parser 'output-count))
        (base (ly:parser-output-name parser)))
 
@@ -122,8 +133,35 @@
 	(set! base (format #f "~a-~a" base count)))
 
     (ly:parser-define! parser 'output-count (1+ count))
-    (ly:score-process score header paper layout base)
-    ))
+
+    (if (not (ly:score-error? score))
+	(let*
+	    ((header (ly:score-header score))
+	     (output-defs (ly:score-output-defs score))
+	     (layout-defs (filter  (lambda (d) (eq? #t (ly:output-def-lookup d 'is-layout)))
+				  output-defs))
+	     (midi-defs (filter (lambda (d)  (eq? #t (ly:output-def-lookup d 'is-midi)))
+				output-defs))
+	     (music (ly:score-music score))
+	     (layout-def (if (null? layout-defs)
+			     (ly:parser-lookup parser '$defaultlayout)
+			     (car layout-defs))))
+
+	  (if (not (module? header))
+	      (set! header (ly:parser-lookup parser '$defaultheader)))
+	     
+	  (ly:render-music-as-systems
+	   music layout-def paper header base)
+
+	  (if (pair? midi-defs)
+	      (ly:performance-write (ly:format-output (ly:run-translator music (car midi-defs)))
+				    (format #f "~a.midi" base)
+				    ))
+	      
+    ))))
+
+
+
 
 
 ;;;;;;;;;;;;;;;;
diff --git a/scm/lily.scm b/scm/lily.scm
index e71d400859..98c84fa34d 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -141,7 +141,7 @@ on errors, and print a stack trace.")
     (if (ly:get-option 'verbose)
 	(ly:progress "[~A" file-name))
     (if (not file-name)
-	(ly:error (_ "Can't find ~A") x))
+	(ly:error (_ "cannot find: ~A") x))
     (primitive-load file-name)
     (if (ly:get-option 'verbose)
 	(ly:progress "]"))))
@@ -254,7 +254,7 @@ The syntax is the same as `define*-public'."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; init pitch system
 
-(ly:set-default-scale (ly:make-scale #(0 2 4 5 7 9 11)))
+(ly:set-default-scale (ly:make-scale #(0 1 2 5/2 7/2 9/2 11/2)))
 
 
 
diff --git a/scm/midi.scm b/scm/midi.scm
index dee999868e..cef0fae28b 100644
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -276,17 +276,18 @@ returns the program of the instrument
 
 (define-public (alterations-in-key pitch-list)
   "Count number of sharps minus number of flats"
-  (/ (apply + (map cdr pitch-list)) 2))
+  
+  (* (apply + (map cdr pitch-list)) 2))
 
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 
-(define-public (paper-book-write-midis paper-book basename)
+(define-public (write-performances-midis performances basename)
   (let
       loop
-    ((perfs (ly:paper-book-performances paper-book))
+    ((perfs performances)
      (count 0))
 
 
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 7b0d5d0658..189f960ff6 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -210,7 +210,7 @@ Returns `obj'.
   "create a repeat music expression, with all properties initialized properly"
   (let ((talts (if (< times (length alts))
 		   (begin
-		     (ly:warning (_ "More alternatives than repeats. Junking excess alternatives"))
+		     (ly:warning (_ "More alternatives than repeats.  Junking excess alternatives"))
 		     (take alts times))
 		   alts))
 	(r (make-repeated-music name)))
@@ -745,7 +745,7 @@ Syntax:
 	      (set! (ly:music-property music 'quoted-events) quoted-vector)
 	      (set! (ly:music-property music 'iterator-ctor)
 		    ly:quote-iterator::constructor))
-	    (ly:warning (_ "can't find quoted music `~S'" quoted-name))))
+	    (ly:warning (_ "cannot find quoted music: `~S'" quoted-name))))
     music))
 
 
diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index 27dfe4e74a..b0bf088b36 100644
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -129,7 +129,7 @@
 	  (set! size
 		(string->number (match:substring match 3))))
 
-	(ly:warning (_ "can't decypher Pango description: ~a") str))
+	(ly:warning (_ "cannot decypher Pango description: ~a") str))
 
     (set! style
 	  (if (string? style)
diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 3a3e023ebe..d9a97b9093 100644
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -95,7 +95,7 @@
 		       "\\char" (number->string subidx))
 
 	(begin
-	  (ly:warning (_ "can't find ~a in ~a" name font))
+	  (ly:warning (_ "cannot find ~a in ~a" name font))
 	  ""))))
 
 (define (dashed-line thick on off dx dy phase)
@@ -157,8 +157,6 @@
 (define (no-origin) "")
 
 
-
-
 (define-public (line-location  file line col)
   "Print an input location, without column number ."
   (string-append (number->string line) " " file))
@@ -182,4 +180,4 @@
 	    (string-append "\\special{src:"
 			   (line-column-location location) "}")
 	    ""))
-      ""))
+      ""))
\ No newline at end of file
diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm
index 370bfea2a8..ac89b1e279 100644
--- a/scm/safe-lily.scm
+++ b/scm/safe-lily.scm
@@ -97,7 +97,7 @@
    ly:output-description
    ly:paper-book?
    ly:prob-property
-   ly:layout-def?
+   ly:output-def?
    ly:paper-get-font
    ly:paper-get-number
    ly:paper-system?
diff --git a/scm/to-xml.scm b/scm/to-xml.scm
index 5f2828a370..b1b2ed79a6 100644
--- a/scm/to-xml.scm
+++ b/scm/to-xml.scm
@@ -187,7 +187,7 @@ is then separated.
 (define (assert x)
   (if x
       #t
-      (ly:error (_ "assertion failed"))))
+      (ly:error (_ "assertion failed: ~S") x)))
 
 (define (re-sub re to string)
   (regexp-substitute/global #f re string 'pre to 'post))
diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index e28577fb1c..9c697367b4 100644
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -328,7 +328,7 @@ def gulp_file(f):
         n = i.tell ()
         i.seek (0,0)
     except:
-        sys.stderr.write ("can't open file: `%s'\n" % f)
+        sys.stderr.write ("cannot open file: `%s'\n" % f)
         return ''
     s = i.read (n)
     if len (s) <= 0:
@@ -1338,7 +1338,7 @@ def identify():
     sys.stderr.write ("%s from LilyPond %s\n" % (program_name, version))
 
 authors = """
-Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>, Laura Conrad
+Written by Han-Wen Nienhuys <hanwen@xs4all.nl>, Laura Conrad
 <lconrad@laymusic.org>, Roy Rankin <Roy.Rankin@@alcatel.com.au>.
 """
 
@@ -1346,28 +1346,29 @@ def print_version ():
     print r"""abc2ly (GNU lilypond) %s""" % version
 
 def get_option_parser ():
-    p = ly.get_option_parser (usage='abc2ly [OPTIONS] FILE',
+    p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'abc2ly',
                  version="abc2ly (LilyPond) @TOPLEVEL_VERSION@",
-                 description=_('''This program converts ABC music files (see
-http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input.'''))
-
-    p.add_option ('-o', '--output', metavar='FILE',help=_("set output filename to FILE"),
-           action='store')
-    p.add_option ('-s', '--strict', help=_("be strict about succes"),
-           action='store_true')
-    p.add_option ('-b', '--beams', help=_("preserve ABC's notion of beams"))
-    p.add_option_group  ('bugs',
-              description='''Report bugs via http://post.gmane.org/post.php'''
-              '''?group=gmane.comp.gnu.lilypond.bugs\n''')
-    
+                 description=_ ('''abc2ly converts ABC music files (see
+%s) to LilyPond input.''') % 'http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt')
+
+    p.add_option ('-o', '--output', metavar='FILE',
+                  help=_ ("write output to FILE"),
+                  action='store')
+    p.add_option ('-s', '--strict', help=_ ("be strict about succes"),
+                  action='store_true')
+    p.add_option ('-b', '--beams', help=_ ("preserve ABC's notion of beams"))
+    p.add_option_group ('bugs',
+                        description=(_ ('Report bugs via')
+                                     + ''' http://post.gmane.org/post.php'''
+                                     '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
     return p
 
 
-option_parser = get_option_parser()
-(global_options, files) = option_parser.parse_args()
+option_parser = get_option_parser ()
+(global_options, files) = option_parser.parse_args ()
 
 
-identify()
+identify ()
 
 header['tagline'] = 'Lily was here %s -- automatically converted from ABC' % version
 for f in files:
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 549e82b69c..474144c3ce 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -4,7 +4,7 @@
 #
 # source file of the GNU LilyPond music typesetter
 #
-# (c) 1998--2006  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# (c) 1998--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # converting rules are found in python/convertrules.py
@@ -37,18 +37,17 @@ lilypond_version_re_str = '\\\\version *\"([0-9.]+)"'
 lilypond_version_re = re.compile (lilypond_version_re_str)
 
 
-help_summary = _ (
-'''Update LilyPond input to newer version.  By default, update from the
-version taken from the \\version command, to the current LilyPond version.
-
-Examples:
-
+help_summary = (
+_ ('''Update LilyPond input to newer version.  By default, update from the
+version taken from the \\version command, to the current LilyPond version.''')
++ _ ("Examples:")
++ '''
   convert-ly -e old.ly
   convert-ly --from=2.3.28 --to 2.5.21 foobar.ly
 ''')
 
 copyright = ('Jan Nieuwenhuizen <janneke@gnu.org>',
-         'Han-Wen Nienhuys <hanwen@cs.uu.nl>')
+             'Han-Wen Nienhuys <hanwen@xs4all.nl>')
 
 program_name = os.path.basename (sys.argv[0])
 program_version = '@TOPLEVEL_VERSION@'
@@ -73,13 +72,12 @@ Copyright (c) %s by
 %s
 %s
 '''  ( '2001--2006',
-       _('Distributed under terms of the GNU General Public License.'),
-       _('It comes with NO WARRANTY.')))
-
+       _ ("Distributed under terms of the GNU General Public License."),
+       _ ('It comes with NO WARRANTY.')))
 
 
 def get_option_parser ():
-    p = ly.get_option_parser (usage='convert-ly [OPTIONS] FILE',
+    p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'convert-ly',
                   version="@TOPLEVEL_VERSION@",
                   description=help_summary)
 
@@ -87,32 +85,33 @@ def get_option_parser ():
               action="store",
               metavar=_ ("VERSION"),
               dest="from_version",
-              help=_('start from VERSION [default: \\version found in file]'),
+              help=_ ("start from VERSION [default: \\version found in file]"),
               default='')
     
-    p.add_option ('-e', '--edit', help=_('edit in place'),
+    p.add_option ('-e', '--edit', help=_ ("edit in place"),
               action='store_true')
     p.add_option ('-n', '--no-version',
-              help=_ ('do not add \\version command if missing'),
+              help=_ ("do not add \\version command if missing"),
               action='store_true',
               dest='skip_version_add',
               default=False)
     
     p.add_option ("-s", '--show-rules',
-              help=_('print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]'),
+              help=_ ("show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"),
               dest='show_rules',
               action='store_true', default=False)
     
     p.add_option ('-t', '--to',
-              help=_('convert to VERSION [default: @TOPLEVEL_VERSION@]'),
-              metavar=_('VERSION'),
+              help=_ ("convert to VERSION [default: @TOPLEVEL_VERSION@]"),
+              metavar=_ ('VERSION'),
               action='store',
               dest="to_version",
               default='')
 
-    p.add_option_group  ('bugs',
-                 description='''Report bugs via http://post.gmane.org/post.php'''
-                 '''?group=gmane.comp.gnu.lilypond.bugs\n''')
+    p.add_option_group ('bugs',
+                        description=(_ ("Report bugs via")
+                                     + ''' http://post.gmane.org/post.php'''
+                                     '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
     
     return p
 
@@ -275,14 +274,14 @@ def main ():
         if f == '-':
             f = ''
         elif not os.path.isfile (f):
-            error (_ ("can't open file: `%s'") % f)
+            error (_ ("cannot open file: `%s'") % f)
             if len (files) == 1:
                 sys.exit (1)
             continue
         try:
             do_one_file (f)
         except UnknownVersion:
-            error (_ ("can't determine version for `%s'. Skipping") % f)
+            error (_ ("cannot determine version for `%s'.  Skipping") % f)
 
     sys.stderr.write ('\n')
 
diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py
index 0e85317a2e..126288f676 100644
--- a/scripts/etf2ly.py
+++ b/scripts/etf2ly.py
@@ -844,7 +844,7 @@ Return: (value, rest-of-STR)
             
         return (string.atoi (dec), str)
     else:
-        sys.stderr.write ("can't convert `%s'\n" % str)
+        sys.stderr.write ("cannot convert `%s'\n" % str)
         return (None, str)
 
 
@@ -1193,21 +1193,21 @@ Copyright (c) %s by
 
 
 def get_option_parser ():
-    p = ly.get_option_parser (usage='etf2ly [OPTIONS]... ETF-FILE',
+    p = ly.get_option_parser (usage=_ ("%s [OPTION]... ETF-FILE") % 'etf2ly',
                  version="etf2ly (LilyPond) @TOPLEVEL_VERSION@",
-                 description=_("""Enigma Transport Format is a format used by Coda Music Technology's
-Finale product. This program will convert a subset of ETF to a
-ready-to-use lilypond file."""))
-    p.add_option ('-o', '--output', help=_("write output to FILE"),
+                 description=_ ("""Enigma Transport Format is a format used by Coda Music Technology's
+Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond file."""))
+    p.add_option ('-o', '--output', help=_ ("write output to FILE"),
            metavar=_("FILE"),
            action='store')
-    p.add_option ('-w', '--warranty', help=_ ("show warranty"),
+    p.add_option ('-w', '--warranty', help=_ ("show warranty and copyright"),
            action='store_true',
            ),
 
-    p.add_option_group  ('bugs',
-              description='''Report bugs via http://post.gmane.org/post.php'''
-              '''?group=gmane.comp.gnu.lilypond.bugs\n''')
+    p.add_option_group ('bugs',
+                        description=(_ ('Report bugs via')
+                                     + ''' http://post.gmane.org/post.php'''
+                                     '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
     return p
 
 def do_options ():
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 90174efeaa..472101b8b5 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -67,18 +67,18 @@ program_name = os.path.basename (sys.argv[0])
 original_dir = os.getcwd ()
 backend = 'ps'
 
-help_summary = _ (
-'''Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document.
-
-Example usage:
-
- lilypond-book --filter="tr '[a-z]' '[A-Z]'" BOOK
- lilypond-book --filter="convert-ly --no-version --from=2.0.0 -" BOOK
- lilypond-book --process='lilypond -I include' BOOK
-''')
+help_summary = (
+_ ("Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document.")
++ '\n\n'
++ _ ("Examples:")
++ '''
+ lilypond-book --filter="tr '[a-z]' '[A-Z]'" %(BOOK)s
+ lilypond-book --filter="convert-ly --no-version --from=2.0.0 -" %(BOOK)s
+ lilypond-book --process='lilypond -I include' %(BOOK)s
+''' % {'BOOK': _ ("BOOK")})
 
 authors = ('Jan Nieuwenhuizen <janneke@gnu.org>',
-      'Han-Wen Nienhuys <hanwen@cs.uu.nl>')
+      'Han-Wen Nienhuys <hanwen@xs4all.nl>')
 
     
 ################################################################
@@ -116,14 +116,13 @@ def warranty ():
 
 %s
 %s
-''' % ( _('Copyright (c) %s by') % '2001--2006',
+''' % ( _ ('Copyright (c) %s by') % '2001--2006',
     ' '.join (authors),
-   _('Distributed under terms of the GNU General Public License.'),
-   _('It comes with NO WARRANTY.')))
-
+   _ ("Distributed under terms of the GNU General Public License."),
+   _ ("It comes with NO WARRANTY.")))
 
 def get_option_parser ():
-    p = ly.get_option_parser (usage='lilypond-book [OPTIONS] FILE',
+    p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'lilypond-book',
                               version="@TOPLEVEL_VERSION@",
                               description=help_summary)
 
@@ -133,47 +132,42 @@ def get_option_parser ():
                   help=_ ("pipe snippets through FILTER [convert-ly -n -]"),
                   default=None)
     p.add_option ('-f', '--format',
-                  help=_('''use output format FORMAT (texi [default], texi-html, latex, html, docbook)'''),
+                  help=_ ("use output format FORMAT (texi [default], texi-html, latex, html, docbook)"),
                   action='store')
     
-    p.add_option ("-I", '--include', help=_('add DIR to include path'),
-                  metavar="DIR",
+    p.add_option ("-I", '--include', help=_ ("add DIR to include path"),
+                  metavar=_ ("DIR"),
                   action='append', dest='include_path',
                   default=[os.path.abspath (os.getcwd ())])
     
-    p.add_option ("-o", '--output', help=_('write output to DIR'),
-                  metavar="DIR",
+    p.add_option ("-o", '--output', help=_ ("write output to DIR"),
+                  metavar=_ ("DIR"),
                   action='store', dest='output_name',
                   default='')
-    p.add_option ('-P', '--process', metavar=_("COMMAND"),
+    p.add_option ('-P', '--process', metavar=_ ("COMMAND"),
                   help = _ ("process ly_files using COMMAND FILE..."),
                   action='store', 
                   dest='process_cmd', default='lilypond -b eps')
-
     p.add_option ('--pdf',
                   action="store_true",
                   dest="create_pdf",
-                  help="Create PDF files for use with PDFTeX",
+                  help=_ ("Create PDF files for use with PDFTeX"),
                   default=False)
-    
     p.add_option ('', '--psfonts', action="store_true", dest="psfonts",
                   help=_ ('''extract all PostScript fonts into INPUT.psfonts for LaTeX
 must use this with dvips -h INPUT.psfonts'''),
                   default=None)
-    p.add_option ('-V', '--verbose', help=_("be verbose"),
+    p.add_option ('-V', '--verbose', help=_ ("be verbose"),
                   action="store_true",
                   default=False,
                   dest="verbose")
-    
     p.add_option ('-w', '--warranty',
-                  help=_("show warranty and copyright"),
+                  help=_ ("show warranty and copyright"),
                   action='store_true')
-
-    
-    p.add_option_group  ('bugs',
-                         description='''Report bugs via http://post.gmane.org/post.php'''
-                         '''?group=gmane.comp.gnu.lilypond.bugs\n''')
-    
+    p.add_option_group ('bugs',
+                        description=(_ ("Report bugs via")
+                                     + ''' http://post.gmane.org/post.php'''
+                                     '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
     return p
 
 lilypond_binary = os.path.join ('@bindir@', 'lilypond')
@@ -1479,7 +1473,7 @@ LATEX_INSPECTION_DOCUMENT = r'''
 def get_latex_textwidth (source):
     m = re.search (r'''(?P<preamble>\\begin\s*{document})''', source)
     if m == None:
-        warning (_ ("Can't find \\begin{document} in LaTeX document"))
+        warning (_ ("cannot find \\begin{document} in LaTeX document"))
         
         ## what's a sensible default?
         return 550.0
@@ -1608,7 +1602,7 @@ def guess_format (input_filename):
         # FIXME
         format = ext2format[e]
     else:
-        error (_ ("can't determine format for: %s" \
+        error (_ ("cannot determine format for: %s" \
               % input_filename))
         exit (1)
     return format
diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 4a0d956211..f1db678cfb 100644
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -4,7 +4,7 @@
 # 
 # source file of the GNU LilyPond music typesetter
 #
-# (c) 1998--2006  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# (c) 1998--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
@@ -866,23 +866,23 @@ def convert_midi (in_file, out_file):
 
 
 def get_option_parser ():
-    p = ly.get_option_parser (usage='midi2ly [OPTIONS] FILE',
+    p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'midi2ly',
                  version="midi2ly (LilyPond) @TOPLEVEL_VERSION@",
-                 description=_('''Convert MIDI to LilyPond source.'''))
+                 description=_ ("Convert %s to LilyPond input.") % 'MIDI')
 
     p.add_option ('-a', '--absolute-pitches',
            action='store_true',
            help=_ ("print absolute pitches"))
     p.add_option ('-d', '--duration-quant',
            metavar= _("DUR"),
-           help=_("quantise note durations on DUR"))
+           help=_ ("quantise note durations on DUR"))
     p.add_option ('-e', '--explicit-durations',
            action='store_true',
            help=_ ("print explicit durations"))
     p.add_option('-k', '--key', help=_ ("set key: ALT=+sharps|-flats; MINOR=1"),
           metavar=_ ("ALT[:MINOR]"),
           default='0'),
-    p.add_option ('-o', '--output', help=_("write output to FILE"),
+    p.add_option ('-o', '--output', help=_ ("write output to FILE"),
            metavar=_("FILE"),
            action='store')
     p.add_option ('-s', '--start-quant',help= _ ("quantise note starts on DUR"),
@@ -893,25 +893,24 @@ def get_option_parser ():
            dest="allowed_tuplets",
            help=_ ("allow tuplet durations DUR*NUM/DEN"),
            default=[])
-    p.add_option ('-V', '--verbose', help=_("be verbose"),
+    p.add_option ('-V', '--verbose', help=_ ("be verbose"),
            action='store_true'
            ),
-    p.add_option ('-w', '--warranty', help=_("show warranty"),
+    p.add_option ('-w', '--warranty', help=_ ("show warranty and copyright"),
            action='store_true',
            ),
-    p.add_option ('-x', '--text-lyrics', help=_("treat every text as a lyric"),
+    p.add_option ('-x', '--text-lyrics', help=_ ("treat every text as a lyric"),
            action='store_true')
 
-    p.add_option_group (_ ("example"),
+    p.add_option_group (_ ("Examples"),
               description = r'''
   midi2ly --key=-2:1 --duration-quant=32 \
     --allow-tuplet=4*2/3 --allow-tuplet=2*4/3 foo.midi
 ''')
-    
-    p.add_option_group  ('bugs',
-              description='''Report bugs via http://post.gmane.org/post.php'''
-              '''?group=gmane.comp.gnu.lilypond.bugs\n''')
-    
+    p.add_option_group ('bugs',
+                        description=(_ ('Report bugs via')
+                                     + ''' http://post.gmane.org/post.php'''
+                                     '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
     return p
 
 
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 4240b3aaae..6c2691c30c 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -212,7 +212,7 @@ def musicxml_note_to_lily_main_event (n):
         
     
     if not event:
-        n.message ("could not find suitable event")
+        n.message ("cannot find suitable event")
 
     event.duration = musicxml_duration_to_lily (n)
     return event
@@ -470,44 +470,41 @@ def get_all_voices (parts):
 
 
 def option_parser ():
-    p = ly.get_option_parser(usage='musicxml2ly FILE.xml',
-                 version = """%prog (LilyPond) @TOPLEVEL_VERSION@
-
-This program is free software.  It is covered by the GNU General Public
+    p = ly.get_option_parser(usage=_ ("musicxml2ly FILE.xml"),
+                             version=('''%prog (LilyPond) @TOPLEVEL_VERSION@\n\n'''
+                                      +
+_ ("""This program is free software.  It is covered by the GNU General Public
 License and you are welcome to change it and/or distribute copies of it
-under certain conditions.  Invoke as `lilypond --warranty' for more
-information.
-
+under certain conditions.  Invoke as `%s --warranty' for more
+information.""") % 'lilypond'
++ """
 Copyright (c) 2005--2006 by
     Han-Wen Nienhuys <hanwen@xs4all.nl> and
     Jan Nieuwenhuizen <janneke@gnu.org>
-""",
-
-                 description  =
-                 """Convert MusicXML file to LilyPond input.
-"""
-                 )
+"""),
+                             description=_ ("Convert %s to LilyPond input.") % 'MusicXML' + "\n")
     p.add_option ('-v', '--verbose',
-                  action = "store_true",
-                  dest = 'verbose',
-                  help = 'be verbose')
+                  action="store_true",
+                  dest='verbose',
+                  help=_ ("be verbose"))
 
     p.add_option ('', '--lxml',
                   action="store_true",
                   default=False,
                   dest="use_lxml",
-                  help="Use lxml.etree; uses less memory and cpu time.")
+                  help=_ ("Use lxml.etree; uses less memory and cpu time."))
     
     p.add_option ('-o', '--output',
-                  metavar = 'FILE',
+                  metavar=_ ("FILE"),
                   action="store",
                   default=None,
                   type='string',
                   dest='output_name',
-                  help='set output file')
-
-    p.add_option_group  ('', description = '''Report bugs via http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs
-''')
+                  help=_ ("set output filename to FILE"))
+    p.add_option_group ('bugs',
+                        description=(_ ("Report bugs via")
+                                     + ''' http://post.gmane.org/post.php'''
+                                     '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
     return p
 
 def music_xml_voice_name_to_lily_name (part, name):
diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
deleted file mode 100644
index 08a997c7ec..0000000000
--- a/stepmake/bin/add-html-footer.py
+++ /dev/null
@@ -1,354 +0,0 @@
-#!@PYTHON@
-
-"""
-Print a nice footer.  add the top of the ChangeLog file (up to the ********)
-"""
-import re
-import sys
-import os
-import time
-import string 
-import getopt
-
-index_url=''
-top_url=''
-changelog_file=''
-content_negotiation = False
-package_name = ''
-package_version = ''
-
-mail_address = '(address unknown)'
-try:
-    mail_address= os.environ['MAILADDRESS']
-except KeyError:
-    pass
-
-mail_address_url= 'mailto:' + mail_address
-if re.search ("http://", mail_address):
-    mail_address_url = mail_address
-    
-webmaster= mail_address
-try:
-    webmaster= os.environ['WEBMASTER']
-except KeyError:
-    pass
-
-header_file = ''
-footer_file = ''
-default_header = r"""
-"""
-
-
-#wiki_base = 'http://afavant.elte.hu/lywiki/'
-wiki_base = None 
-
-
-default_footer = r"""<hr>Please take me <a href=@INDEX@>back to the index</a>
-of @PACKAGE_NAME@
-"""
-
-built = r'''
-<div style="background-color: #e8ffe8; padding: 2; border: #c0ffc0 1px solid;">
-%(wiki_string)s
-<p>
-<font size="-1">
-This page is for %(package_name)s-%(package_version)s (%(branch_str)s). <br>
-</font>
-<address><font size="-1">
-Report errors to <a href="%(mail_address_url)s">%(mail_address)s</a>.</font></address>
-</p>
-</div>
-'''
-
-
-
-
-def help ():
-    sys.stdout.write (r"""Usage: add-html-footer [OPTIONS]... HTML-FILE
-Add header, footer and top of ChangLog file (up to the ********) to HTML-FILE
-
-Options:
- --changelog=FILE          use FILE as ChangeLog [ChangeLog]
- --content-negotiation     strip .html and .png from urls
- --footer=FILE             use FILE as footer
- --header=FILE             use FILE as header
- -h, --help                print this help
- --index=URL               set homepage to URL
- --name=NAME               set package_name to NAME
- --version=VERSION         set package version to VERSION
-
-""")
-    sys.exit (0)
-
-(options, files) = getopt.getopt(sys.argv[1:], 'h', [
-    'changelog=', 'footer=', 'header=', 'help', 'index=',
-    'name=', 'content-negotiation', 'version=']) 
-
-for opt in options:
-    o = opt[0]
-    a = opt[1]
-    if o == '--changelog':
-        changelog_file = a
-    elif o == '--content-negotiation':
-        content_negotiation = True
-    elif o == '--footer':
-        footer_file = a
-    elif o == '--header':
-        header_file = a
-    elif o == '-h' or o == '--help':
-        help ()
-    # urg, this is top!
-    elif o == '--index':
-        index_url = a
-    elif o == '--name':
-        package_name = a
-    elif o == '--version':
-        package_version = a
-    else:
-        raise 'unknown opt ', o
-
-
-def compose (default, file):
-    s = default
-    if file:
-        s = open (file).read ()
-    return s
-
-localtime = time.strftime ('%c %Z', time.localtime (time.time ()))
-
-if os.path.basename (index_url) != "index.html":
-    index_url = os.path.join (index_url , "index.html")
-top_url = os.path.dirname (index_url) + "/"
-
-header = compose (default_header, header_file)
-
-# compose (default_footer, footer_file)
-footer =  built
-header_tag = '<!-- header_tag -->'
-footer_tag = '<!-- footer_tag -->'
-
-# Python < 1.5.2 compatibility
-#
-# On most platforms, this is equivalent to
-#`normpath(join(os.getcwd()), PATH)'.  *Added in Python version 1.5.2*
-if os.path.__dict__.has_key ('abspath'):
-    abspath = os.path.abspath
-else:
-    def abspath (path):
-        return os.path.normpath (os.path.join (os.getcwd (), path))
-
-
-def remove_self_ref (s):        
-    self_url = abspath (os.getcwd () + '/' + f)
-    #sys.stderr.write ('url0: %s\n' % self_url)
-
-    # self_url = re.sub ('.*?' + string.lower (package_name) + '[^/]*/',
-    #                 '', self_url)
-    # URG - this only works when source tree is unpacked in `src/' dir
-    # For some reason, .*? still eats away
-    #     /home/fred/usr/src/lilypond-1.5.14/Documentation/user/out-www/lilypond/
-    # instead of just
-    #
-    #     /home/fred/usr/src/lilypond-1.5.14/
-    #
-    #     Tutorial.html
-    self_url = re.sub ('.*?src/' + string.lower (package_name) + '[^/]*/',
-            '', self_url)
-
-    #sys.stderr.write ('url1: %s\n' % self_url)
-    
-    #urg, ugly lily-specific toplevel index hack
-    self_url = re.sub ('.*topdocs/out-www/index.html', 'index.html', self_url)
-    #sys.stderr.write ('url2: %s\n' % self_url)
-
-    # ugh, python2.[12] re is broken.
-    ## pat = re.compile ('.*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)', re.DOTALL)
-    pat = re.compile ('[.\n]*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)')
-    m = pat.search (s)
-    while m:
-        #sys.stderr.write ('self: %s\n' % m.group (2))
-        s = s[:m.start (1)] + m.group (2) + s[m.end (3):]
-        m = pat.search (s)
-    return s
-
-def do_file (f):
-    if os.path.islink (f):
-        return
-    
-    s = open (f).read()
-    s = re.sub ('%', '%%', s)
-
-
-    if re.search (header_tag, s) == None:
-        body = '<BODY BGCOLOR=WHITE TEXT=BLACK>'
-        s = re.sub ('(?i)<body>', body, s)
-        if re.search ('(?i)<BODY', s):
-            s = re.sub ('(?i)<body[^>]*>', body + header, s, 1)
-        elif re.search ('(?i)<html', s):                
-            s = re.sub ('(?i)<html>', '<HTML>' + header, s, 1)
-        else:
-            s = header + s
-
-        s = header_tag + '\n' + s
-
-        if re.search ('(?i)<!DOCTYPE', s) == None:
-            doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">\n'
-            s = doctype + s
-
-    if re.search (footer_tag, s) == None:
-        if re.search ('(?i)</body', s):
-            s = re.sub ('(?i)</body>', footer_tag + footer + '\n' + '</BODY>', s, 1)
-        elif re.search ('(?i)</html', s):                
-            s = re.sub ('(?i)</html>', footer_tag + footer + '\n' + '</HTML>', s, 1)
-        else:
-            s = s + footer_tag + footer + '\n'
-
-        s = i18n (f, s)
-
-    #URUGRGOUSNGUOUNRIU
-    index = index_url
-    top = top_url
-    if os.path.basename (f) == "index.html":
-        cwd = os.getcwd ()
-        if os.path.basename (cwd) == "topdocs":
-            index = "index.html"
-            top = ""
-
-        # don't cause ///////index.html entries in log files.
-        #        index = "./index.html"
-        #        top = "./"
-            
-    versiontup = string.split(package_version, '.')
-    branch_str = 'stable-branch'
-    if string.atoi ( versiontup[1]) %  2:
-        branch_str = 'development-branch'
-
-    wiki_page = ('v%s.%s-' % (versiontup[0], versiontup[1]) +  f)
-    wiki_page = re.sub ('out-www/', '', wiki_page)
-    wiki_page = re.sub ('/', '-', wiki_page) 
-    wiki_page = re.sub (r'\.-', '', wiki_page) 
-    wiki_page = re.sub ('.html', '', wiki_page)
-
-    wiki_string = ''
-
-    if wiki_base:
-        wiki_string = (r'''<a href="%(wiki_base)s%(wiki_page)s">Read </a> comments on this page, or
-        <a href="%(wiki_base)s%(wiki_page)s?action=edit">add</a> one.''' % 
-               { 'wiki_base': wiki_base,
-                'wiki_page': wiki_page})
-        
-    subst = globals ()
-    subst.update (locals())
-    s = s % subst
-
-    # urg
-    # maybe find first node?
-    fallback_web_title = '-- --'
-
-    # ugh, python2.[12] re is broken.
-    #m = re.match ('.*?<title>\(.*?\)</title>', s, re.DOTALL)
-    m = re.match ('[.\n]*?<title>([.\n]*?)</title>', s)
-    if m:
-        fallback_web_title = m.group (1)
-    s = re.sub ('@WEB-TITLE@', fallback_web_title, s)
-    
-    s = remove_self_ref (s)
-
-    # remove info's annoying's indication of referencing external document
-    s = re.sub (' \((lilypond|lilypond-internals|music-glossary)\)</a>',
-          '</a>', s)
-
-    if not os.path.islink (f):
-        open (f, 'w').write (s)
-
-
-
-localedir = 'out/locale'
-try:
-    import gettext
-    gettext.bindtextdomain ('newweb', localedir)
-    gettext.textdomain ('newweb')
-    _ = gettext.gettext
-except:
-    def _ (s):
-        return s
-underscore = _
-
-C = 'site'
-LANGUAGES = (
-    (C, 'English'),
-    ('nl', 'Nederlands'),
-    ('fr', 'French')
-    )
-
-language_available = _ ("Other languages: %s.") % "%(language_menu)s"
-browser_language = _ ("Using <A HREF='%s'>automatic language selection</A>.") \
-           % "%(root_url)sabout/browser-language"
-
-LANGUAGES_TEMPLATE = '''\
-<P>
- %(language_available)s
- <BR>
- %(browser_language)s
-</P>
-''' % vars ()
-
-def file_lang (file, lang):
-    (base, ext) = os.path.splitext (file)
-    base = os.path.splitext (base)[0]
-    if lang and lang != C:
-        return base + '.' + lang + ext
-    return base + ext
-
-
-def i18n (file_name, page):
-    # ugh
-    root_url = "/web/"
-
-    base_name = os.path.basename (file_name)
-
-    lang = C
-    m = re.match ('.*[.]([^/.]*).html', file_name)
-    if m:
-        lang = m.group (1)
-
-    # Find available translations of this page.
-    available = filter (lambda x: lang != x[0] \
-              and os.path.exists (file_lang (file_name, x[0])),
-              LANGUAGES)
-
-    # Strip .html, .png suffix for auto language selection (content
-    # negotiation).  The menu must keep the full extension, so do
-    # this before adding the menu.
-    if content_negotiation:
-        page = re.sub ('''(href|src)=[\'"]([^/][.]*[^.:\'"]*)(.html|.png)(#[^"\']*|)[\'"]''',
-                       '\\1="\\2\\4"', page)
-
-    # Add menu after stripping: must not have autoselection for language menu.
-    language_menu = ''
-    for (prefix, name) in available:
-        lang_file = file_lang (base_name, prefix)
-        if language_menu != '':
-            language_menu += ', '
-        language_menu += '<a href="%(lang_file)s">%(name)s</a>' % vars ()
-
-    languages = ''
-    if language_menu:
-        languages = LANGUAGES_TEMPLATE % vars ()
-
-    # Put language menu before '</body>' and '</html>' tags
-    if re.search ('(?i)</body', page):
-        page = re.sub ('(?i)</body>', languages + '</BODY>', page, 1)
-    elif re.search ('(?i)</html', page):                
-        page = re.sub ('(?i)</html>', languages + '</HTML>', page, 1)
-    else:
-        page = page + languages
-
-    if content_negotiation and language_menu:
-        os.symlink (file_name, os.path.splitext (os.path.basename (file_name))[0] + '.en.html')
-        
-    return page
-
-for f in files:
-    do_file (f)
-