Uniformize, internalize.

(2.5.2): Remove fatal encoding rule.
(2.5.13): Handle latin1 encoding gracefully.

1 files changed, 1092 insertions, 1372 deletions

diff --git a/po/es.po b/po/es.po
index dd7925f026..e6b266d1a3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.4.13\n"
-"POT-Creation-Date: 2003-07-18 14:45+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-25 13:09+0100\n"
 "PO-Revision-Date: 2002-06-28 15:46CET\n"
 "Last-Translator: Quique <quique@sindominio.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -13,934 +14,553 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. this is where special info is often stored
-#. ###############################################################
-#. lilylib.py -- options and stuff
-#.
-#. source file of the GNU LilyPond music typesetter
-#.
-#. (c) 1998--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-#. Jan Nieuwenhuizen <janneke@gnu.org>
-#. ##  subst:\(^\|[^._a-z]\)\(abspath\|identify\|warranty\|progress\|warning\|error\|exit\|getopt_args\|option_help_str\|options_help_str\|help\|setup_temp\|read_pipe\|system\|cleanup_temp\|strip_extension\|cp_to_dir\|mkdir_p\|init\) *(
-#. ##  replace:\1ly.\2 (
-#. ## subst: \(help_summary\|keep_temp_dir_p\|option_definitions\|original_dir\|program_name\|pseudo_filter_p\|temp_dir\|verbose_p\)
-#. ###############################################################
-#. Users of python modules should include this snippet
-#. and customize variables below.
-#. We'll suffer this path init stuff as long as we don't install our
-#. python packages in <prefix>/lib/pythonx.y (and don't kludge around
-#. it as we do with teTeX on Red Hat Linux: set some environment var
-#. (PYTHONPATH) in profile)
-#. If set, LILYPONDPREFIX must take prevalence
-#. if datadir is not set, we're doing a build and LILYPONDPREFIX
-#. Customize these
-#. lilylib globals
-#: lilylib.py:60
+#: lilylib.py:62
 msgid "lilylib module"
 msgstr ""
 
-#: lilylib.py:63 lilypond-book.py:131 lilypond.py:128 midi2ly.py:100
-#: mup2ly.py:75 main.cc:111
+#: lilylib.py:65 lilypond-book.py:88 lilypond-latex.py:109 midi2ly.py:100
+#: mup2ly.py:75 ps2png.py:40 main.cc:130
 msgid "print this help"
 msgstr "esta ayuda"
 
-#. ###############################################################
-#. Handle bug in Python 1.6-2.1
-#.
-#. there are recursion limits for some patterns in Python 1.6 til 2.1.
-#. fix this by importing pre instead. Fix by Mats.
-#. Attempt to fix problems with limited stack size set by Python!
-#. Sets unlimited stack size. Note that the resource module only
-#. is available on UNIX.
-#: lilylib.py:114 midi2ly.py:136 mup2ly.py:130 main.cc:188 main.cc:200
-#, c-format, python-format
+#: lilylib.py:112 midi2ly.py:136 mup2ly.py:130
+#, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s "
 
-#: lilylib.py:114
-msgid " 1998--2005"
-msgstr ""
-
-#: lilylib.py:118
+#: lilylib.py:116 midi2ly.py:141 mup2ly.py:135
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: lilylib.py:120
+#: lilylib.py:118 midi2ly.py:142 mup2ly.py:136
 msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: lilylib.py:127 midi2ly.py:150 mup2ly.py:144 input.cc:88
-msgid "warning: "
+#: lilylib.py:125 warn.cc:24
+#, fuzzy, c-format, python-format
+msgid "warning: %s"
 msgstr "advertencia: "
 
-#. lots of midi files use plain text for lyric events
-#. FIXME: read from stdin when files[0] = '-'
-#: lilylib.py:130 midi2ly.py:165 midi2ly.py:1018 midi2ly.py:1083 mup2ly.py:147
-#: mup2ly.py:161 input.cc:93
-msgid "error: "
+#: lilylib.py:128 warn.cc:30
+#, fuzzy, c-format, python-format
+msgid "error: %s"
 msgstr "error: "
 
-#: lilylib.py:134
+#: lilylib.py:132
 #, fuzzy, python-format
 msgid "Exiting (%d)..."
 msgstr "Saliendo..."
 
-#: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
+#: lilylib.py:200 midi2ly.py:223 mup2ly.py:219
 #, python-format
 msgid "Usage: %s [OPTIONS]... FILE"
 msgstr "Sintaxis: %s [OPTIONS]... FICHERO"
 
-#: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
+#: lilylib.py:204 convert-ly.py:57 midi2ly.py:227 mup2ly.py:223 main.cc:200
+#, c-format
 msgid "Options:"
 msgstr "Opciones: "
 
-#: lilylib.py:202 midi2ly.py:232 mup2ly.py:228 main.cc:172
+#: lilylib.py:208 convert-ly.py:68 midi2ly.py:231 mup2ly.py:227 main.cc:204
 #, c-format, python-format
 msgid "Report bugs to %s."
 msgstr "Informar de gazapos a %s."
 
 #: lilylib.py:228
+#, python-format
+msgid "Binary %s has version %s, looking for version %s"
+msgstr ""
+
+#: lilylib.py:262
 #, fuzzy, python-format
 msgid "Opening pipe `%s'"
 msgstr "Limpiando `%s'..."
 
-#. successful pipe close returns 'None'
-#: lilylib.py:240
+#: lilylib.py:277 lilypond-book.py:1111
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilylib.py:242 lilylib.py:289 lilypond-book.py:231 lilypond.py:512
+#: lilylib.py:282 lilylib.py:341 lilypond-book.py:1112 lilypond-latex.py:466
 msgid "The error log is as follows:"
 msgstr ""
 
-#: lilylib.py:262 midi2ly.py:260 mup2ly.py:256
+#: lilylib.py:313 midi2ly.py:259 mup2ly.py:255
 #, python-format
 msgid "Invoking `%s'"
 msgstr "Invocando `%s'"
 
-#: lilylib.py:264
+#: lilylib.py:315
 #, python-format
 msgid "Running %s..."
 msgstr "Ejecutando %s..."
 
-#: lilylib.py:282
+#: lilylib.py:334
 #, python-format
 msgid "`%s' failed (%s)"
 msgstr ""
 
-#: lilylib.py:285 midi2ly.py:266 mup2ly.py:264
+#: lilylib.py:337 midi2ly.py:265 mup2ly.py:263
 msgid "(ignored)"
 msgstr "(ignorado)"
 
-#: lilylib.py:299 midi2ly.py:276 mup2ly.py:274
+#: lilylib.py:355 midi2ly.py:275 mup2ly.py:273
 #, python-format
 msgid "Cleaning %s..."
 msgstr "Limpiando %s..."
 
-#. Duh.  Python style portable: cp *.EXT OUTDIR
-#. system ('cp *.%s %s' % (ext, outdir), 1)
-#. Python < 1.5.2 compatibility
-#.
-#. On most platforms, this is equivalent to
-#. `normpath(join(os.getcwd()), PATH)'.  *Added in Python version 1.5.2*
-#. tex needs lots of memory, more than it gets by default on Debian
-#. TODO: * prevent multiple addition.
-#. * clean TEXINPUTS, MFINPUTS, TFMFONTS,
-#. as these take prevalence over $TEXMF
-#. and thus may break tex run?
-#. $TEXMF is special, previous value is already taken care of
-#. # -sOutputFile does not work with bbox?
-#. # todo:
-#. # have better algorithm for deciding when to crop page,
-#. # and when to show full page
-#: lilylib.py:458
+#: lilylib.py:529
 msgid "Removing output file"
 msgstr ""
 
-#. !@PYTHON@
-#. once upon a rainy monday afternoon.
-#.
-#. ...
-#.
-#. (not finished.)
-#. ABC standard v1.6:  http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt
-#.
-#. Enhancements  (Roy R. Rankin)
-#.
-#. Header section moved to top of lilypond file
-#. handle treble, treble-8, alto, and bass clef
-#. Handle voices (V: headers) with clef and part names, multiple voices
-#. Handle w: lyrics with multiple verses
-#. Handle key mode names for minor, major, phrygian, ionian, locrian, aeolian,
-#. mixolydian, lydian, dorian
-#. Handle part names from V: header
-#. Tuplets handling fixed up
-#. Lines starting with |: not discarded as header lines
-#. Multiple T: and C: header entries handled
-#. Accidental maintained until next bar check
-#. Silent rests supported
-#. articulations fermata, upbow, downbow, ltoe, accent, tenuto supported
-#. Chord strings([-^]"string") can contain a '#'
-#. Header fields enclosed by [] in notes string processed
-#. W: words output after tune as abc2ps does it (they failed before)
-#. Enhancements (Laura Conrad)
-#.
-#. Barring now preserved between ABC and lilypond
-#. the default placement for text in abc is above the staff.
-#. %%LY now supported.
-#. \breve and \longa supported.
-#. M:none doesn't crash lily.
-#. Limitations
-#.
-#. Multiple tunes in single file not supported
-#. Blank T: header lines should write score and open a new score
-#. Not all header fields supported
-#. ABC line breaks are ignored
-#. Block comments generate error and are ignored
-#. Postscript commands are ignored
-#. lyrics not resynchronized by line breaks (lyrics must fully match notes)
-#. %%LY slyrics can't be directly before a w: line.
-#. ???
-#. TODO:
-#.
-#. Convert to new chord styles.
-#.
-#. UNDEF -> None
-#.
-#. uGUHGUHGHGUGH
-#. UGH
-#. treble8 is used by abctab2ps; -8va is used by barfly,
-#. and by my patch to abc2ps. If there's ever a standard
-#. about this we'll support that.
-#. find keywork
-#. assume that Q takes the form "Q:1/4=120"
-#. There are other possibilities, but they are deprecated
-#. outf.write ("\t\t\\consists Staff_margin_engraver\n")
-#. pitch manipulation. Tuples are (name, alteration).
-#. 0 is (central) C. Alteration -1 is a flat, Alteration +1 is a sharp
-#. pitch in semitones.
-#. abc to lilypond key mode names
-#. semitone shifts for key mode names
-#. latex does not like naked #'s
-#. latex does not like naked "'s
-#. break lyrics to words and put "'s around words containing numbers and '"'s
-#. escape "
-#. _ causes probs inside ""
-#. _ to ' _ '
-#. split words with -
-#. unless \-
-#. ~ to space('_')
-#. * to to space
-#. latex does not like naked #'s
-#. put numbers and " and ( into quoted string
-#. insure space between lines
-#. title
-#. strip trailing blanks
-#. Meter
-#. KEY
-#. seperate clef info
-#. there may or may not be a space
-#. between the key letter and the mode
-#. ugh.
-#. ugh.
-#. Notes
-#. Origin
-#. Reference Number
-#. Area
-#. History
-#. Book
-#. Composer
-#. Default note length
-#. Voice
-#. Words
-#. vocals
-#. tempo
-#. we use in this order specified accidental, active accidental for bar,
-#. active accidental for key
-#. (num /  den)  / defaultlen < 1/base
-#. return (str, num,den,dots)
-#. ignore slide
-#. ignore roll
-#. s7m2 input doesnt care about spaces
-#.
-#. remember accidental for rest of bar
-#.
-#. get accidental set in this bar or UNDEF if not set
-#. WAT IS ABC EEN ONTZETTENDE PROGRAMMEERPOEP  !
-#. failed; not a note!
-#. escape '#'s
-#.
-#. |] thin-thick double bar line
-#. || thin-thin double bar line
-#. [| thick-thin double bar line
-#. :| left repeat
-#. |: right repeat
-#. :: left-right repeat
-#. |1 volta 1
-#. |2 volta 2
-#. first try the longer one
-#. bracket escape
-#. the nobarlines option is necessary for an abc to lilypond translator for
-#. exactly the same reason abc2midi needs it: abc requires the user to enter
-#. the note that will be printed, and MIDI and lilypond expect entry of the
-#. pitch that will be played.
-#.
-#. In standard 19th century musical notation, the algorithm for translating
-#. between printed note and pitch involves using the barlines to determine
-#. the scope of the accidentals.
-#.
-#. Since ABC is frequently used for music in styles that do not use this
-#. convention, such as most music written before 1700, or ethnic music in
-#. non-western scales, it is necessary to be able to tell a translator that
-#. the barlines should not affect its interpretation of the pitch.
-#. write other kinds of appending  if we ever need them.
-#. add comments to current voice
-#. Try nibbling characters off until the line doesn't change.
-#. dump_global (outf)
-#. !@PYTHON@
-#.
-#. convert-ly.py -- Update old LilyPond input files (fix name?)
-#.
-#. source file of the GNU LilyPond music typesetter
-#.
-#. (c) 1998--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-#. Jan Nieuwenhuizen <janneke@gnu.org>
-#. TODO
-#. use -f and -t for -s output
-#. NEWS
-#. 0.2
-#. - rewrite in python
-#. Did we ever have \mudela-version?  I doubt it.
-#. lilypond_version_re_str = '\\\\version *\"(.*)\"'
-#. ###########################
-#. need new a namespace
-#. raise FatalConversionError()
-#. need new a namespace
-#. harmful to current .lys
-#. str = re.sub ('\\\\key([^;]+);', '\\\\accidentals \\1;', str)
-#. raise FatalConversionError()
-#. raise FatalConversionError()
-#. raise FatalConversionError()
-#. TODO: lots of other syntax change should be done here as well
-#. Ugh, but meaning of \stemup changed too
-#. maybe we should do \stemup -> \stemUp\slurUp\tieUp ?
-#. I don't know exactly when these happened...
-#. ugh, we loose context setting here...
-#. (lacks capitalisation slur -> Slur)
-#. # dynamic..
-#. TODO: add lots of these
-#. ugh
-#. old fix
-#. Make sure groups of more than one ; have space before
-#. them, so that non of them gets removed by next rule
-#. Only remove ; that are not after spaces, # or ;
-#. Otherwise  we interfere with Scheme comments,
-#. which is badbadbad.
-#. 40 ?
-#. ###############################
-#. END OF CONVERSIONS
-#. ###############################
-#. !@PYTHON@
-#. info mostly taken from looking at files. See also
-#. http://lilypond.org/wiki/?EnigmaTransportFormat
-#. This supports
-#.
-#. * notes
-#. * rests
-#. * ties
-#. * slurs
-#. * lyrics
-#. * articulation
-#. * grace notes
-#. * tuplets
-#.
-#. todo:
-#. * slur/stem directions
-#. * voices (2nd half of frame?)
-#. * more intelligent lyrics
-#. * beams (better use autobeam?)
-#. * more robust: try entertainer.etf (freenote)
-#. * dynamics
-#. * empty measures (eg. twopt03.etf from freenote)
-#.
-#. uGUHGUHGHGUGH
-#. notename 0 == central C
-#. represent pitches as (notename, alteration), relative to C-major scale
-#. a fifth up
-#. should cache this.
-#. flag1 isn't all that interesting.
-#. 3: '>',
-#. 18: '\arpeggio' ,
-#. do grace notes.
-#. ugh.
-#. we don't attempt voltas since they fail easily.
-#. and g.repeat_bar == '|:' or g.repeat_bar == ':|:' or g.bracket:
-#. 4 layers.
-#. let's not do this: this really confuses when eE happens to be before  a ^text.
-#. if last_tag and last_indices:
-#. etf_file_dict[last_tag][last_indices].append (l)
-#. # do it
-#. staff-spec
-#. should use \addlyrics ?
-#. !@PYTHON@
-#. vim: set noexpandtab:
-#. This is was the idea for handling of comments:
-#. Multiline comments, @ignore .. @end ignore is scanned for
-#. in read_doc_file, and the chunks are marked as 'ignore', so
-#. lilypond-book will not touch them any more. The content of the
-#. chunks are written to the output file. Also 'include' and 'input'
-#. regex has to check if they are commented out.
-#.
-#. Then it is scanned for 'lilypond', 'lilypond-file' and 'lilypond-block'.
-#. These three regex's has to check if they are on a commented line,
-#. % for latex, @c for texinfo.
-#.
-#. Then lines that are commented out with % (latex) and @c (Texinfo)
-#. are put into chunks marked 'ignore'. This cannot be done before
-#. searching for the lilypond-blocks because % is also the comment character
-#. for lilypond.
-#.
-#. The the rest of the rexeces are searched for. They don't have to test
-#. if they are on a commented out line.
-#. ###############################################################
-#. Users of python modules should include this snippet
-#. and customize variables below.
-#. We'll suffer this path init stuff as long as we don't install our
-#. python packages in <prefix>/lib/pythonx.y (and don't kludge around
-#. it as we do with teTeX on Red Hat Linux: set some environment var
-#. (PYTHONPATH) in profile)
-#. If set, LILYPONDPREFIX must take prevalence
-#. if datadir is not set, we're doing a build and LILYPONDPREFIX
-#. Customize these
-#. if __name__ == '__main__':
-#. lilylib globals
-#. temp_dir = os.path.join (original_dir,  '%s.dir' % program_name)
-#. urg
-#. # FIXME
-#. # do -P or -p by default?
-#. #help_summary = _ ("Run LilyPond using LaTeX for titling")
-#: lilypond-book.py:120
-msgid "Process LilyPond snippets in hybrid html, LaTeX or texinfo document"
+#: convert-ly.py:32
+#, python-format
+msgid "%s has been replaced by %s"
 msgstr ""
 
-#. another bug in option parser: --output=foe is taken as an abbreviation
-#. for --output-format
-#: lilypond-book.py:125 main.cc:110
-msgid "EXT"
-msgstr "EXT"
+#: convert-ly.py:33
+#, python-format
+msgid "Not smart enough to convert %s"
+msgstr ""
 
-#: lilypond-book.py:125
-#, fuzzy
-msgid "use output format EXT (texi [default], texi-html, latex, html)"
-msgstr "utilizar el formato de salida EXT (scm, ps, tex o as) "
+#: convert-ly.py:34
+msgid "Please refer to the manual for details, and update manually."
+msgstr ""
 
-#: lilypond-book.py:126 lilypond-book.py:127 lilypond-book.py:129
-#: lilypond-book.py:130
-#, fuzzy
-msgid "DIM"
-msgstr "DIR"
+#: convert-ly.py:50
+#, fuzzy, python-format
+msgid "Usage: %s [OPTION]... [FILE]..."
+msgstr "Sintaxis: %s [OPCIÓN]... FICHERO..."
 
-#: lilypond-book.py:126
-msgid "default fontsize for music.  DIM is assumed to be in points"
+#: convert-ly.py:53
+msgid ""
+"Update LilyPond input to newer version.  By default, update from the\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: lilypond-book.py:127
-msgid "deprecated, use --default-music-fontsize"
+#: convert-ly.py:59
+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 ""
+
+#: convert-ly.py:75 main.cc:89
+#, fuzzy, c-format, 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.\n"
 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"
 
-#: lilypond-book.py:128
-msgid "OPT"
+#: convert-ly.py:2402
+msgid "LilyPond source must be UTF-8"
 msgstr ""
 
-#: lilypond-book.py:128
-msgid "pass OPT quoted to the lilypond command line"
+#: convert-ly.py:2405
+msgid "Try the texstrings backend"
 msgstr ""
 
-#: lilypond-book.py:129
-msgid "force fontsize for all inline lilypond. DIM is assumed be to in points"
+#: convert-ly.py:2408
+#, python-format
+msgid "Do something like: %s"
 msgstr ""
 
-#: lilypond-book.py:130
-msgid "deprecated, use --force-music-fontsize"
+#: convert-ly.py:2411
+msgid "Or save as UTF-8 in your editor"
 msgstr ""
 
-#: lilypond-book.py:132 lilypond.py:130 main.cc:113 main.cc:118
-msgid "DIR"
-msgstr "DIR"
-
-#: lilypond-book.py:132
-msgid "include path"
+#: convert-ly.py:2455
+msgid "Applying conversion: "
 msgstr ""
 
-#: lilypond-book.py:133
-#, fuzzy
-msgid "write dependencies"
-msgstr "añadir el prefijo DIR a las dependencias"
-
-#: lilypond-book.py:134
-msgid "PREF"
+#: convert-ly.py:2467
+#, python-format
+msgid "%s: error while converting"
 msgstr ""
 
-#: lilypond-book.py:134
-#, fuzzy
-msgid "prepend PREF before each -M dependency"
-msgstr "añadir el prefijo DIR a las dependencias"
+#: convert-ly.py:2470 score-engraver.cc:110
+msgid "Aborting"
+msgstr ""
 
-#: lilypond-book.py:135
-#, fuzzy
-msgid "don't run lilypond"
-msgstr "no ejecutar LilyPond"
+#: convert-ly.py:2491
+#, fuzzy, python-format
+msgid "Processing `%s'... "
+msgstr "Procesando `%s'..."
 
-#: lilypond-book.py:136
-msgid "don't generate pictures"
+#: convert-ly.py:2593
+#, python-format
+msgid "%s: cannot determine version for `%s'"
 msgstr ""
 
-#: lilypond-book.py:137
-msgid "strip all lilypond blocks from output"
+#: convert-ly.py:2602
+#, fuzzy, python-format
+msgid "%s: skipping: `%s' "
+msgstr "no existe tal parámetro: %s"
+
+#: lilypond-book.py:70
+msgid ""
+"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\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-book.py:138 lilypond-book.py:139 lilypond.py:135 lilypond.py:136
-#: midi2ly.py:102 main.cc:114 main.cc:117
-msgid "FILE"
+#: lilypond-book.py:82 main.cc:124
+msgid "EXT"
+msgstr "EXT"
+
+#: lilypond-book.py:83
+#, fuzzy
+msgid ""
+"use output format EXT (texi [default], texi-html,\n"
+"\t\tlatex, html)"
+msgstr "utilizar el formato de salida EXT (scm, ps, tex o as) "
+
+#: lilypond-book.py:85
+#, fuzzy
+msgid "FILTER"
 msgstr "FICHERO"
 
-#: lilypond-book.py:138
-msgid "filename main output file"
+#: lilypond-book.py:86
+msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr ""
 
-#: lilypond-book.py:139
-msgid "where to place generated files"
-msgstr ""
+#: lilypond-book.py:89 lilypond-book.py:91 lilypond-latex.py:114 main.cc:132
+msgid "DIR"
+msgstr "DIR"
 
-#: lilypond-book.py:140 lilypond.py:137
-msgid "RES"
+#: lilypond-book.py:90
+#, fuzzy
+msgid "add DIR to include path"
+msgstr "añadir DIR a la ruta de búsqueda"
+
+#: lilypond-book.py:92
+#, fuzzy
+msgid "write output to DIR"
+msgstr "escribir la salida en el FICHERO"
+
+#: lilypond-book.py:93
+msgid "COMMAND"
 msgstr ""
 
-#: lilypond-book.py:141 lilypond.py:138
-msgid "set the resolution of the preview to RES"
+#: lilypond-book.py:94
+msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:142 lilypond.py:148 midi2ly.py:105 mup2ly.py:78 main.cc:126
+#: lilypond-book.py:96 lilypond-latex.py:133 midi2ly.py:105 mup2ly.py:78
+#: ps2png.py:41 main.cc:145
 msgid "be verbose"
 msgstr "ser prolijo"
 
-
-#: lilypond-book.py:143
+#: lilypond-book.py:98
 #, fuzzy
 msgid "print version information"
 msgstr "mostrar número de versión"
 
-#: lilypond-book.py:144 lilypond.py:150 midi2ly.py:107 mup2ly.py:80 main.cc:127
+#: lilypond-book.py:100 lilypond-latex.py:135 midi2ly.py:107 mup2ly.py:80
+#: main.cc:146
 msgid "show warranty and copyright"
 msgstr "mostrar los avisos de garantía y de copyright"
 
-#. format specific strings, ie. regex-es for input, and % strings for output
-#. global variables
-#. lilypond_binary = 'valgrind --suppressions=/home/hanwen/usr/src/guile-1.6.supp  --num-callers=10 /home/hanwen/usr/src/lilypond/lily/out/lilypond'
-#. only use installed binary  when we're installed too.
-#. only use installed binary  when we're installed too.
-#. ###############################################################
-#. Dimension handling for LaTeX.
-#.
-#. Ugh.  (La)TeX writes progress and error messages on stdout
-#. Redirect to stderr
-#: lilypond-book.py:230
-msgid "LaTeX failed."
-msgstr ""
-
-#. URG see lilypond
-#. Convert numeric values, with or without specific dimension, to floats.
-#. Keep other strings
-#. ###############################################################
-#. How to output various structures.
-#. # maybe <hr> ?
-#. Verbatim text is always finished with \n.  FIXME: For HTML,
-#. this newline should be removed.
-#. Verbatim text is always finished with \n.  FIXME: For HTML,
-#. this newline should be removed.
-#. # Ugh we need to differentiate on origin:
-#. # lilypond-block origin wants an extra <p>, but
-#. # inline music doesn't.
-#. # possibly other center options?
-#. verbatim text is always finished with \n
-#. verbatim text is always finished with \n
-#. verbatim text is always finished with \n
-#. verbatim text is always finished with \n
-#. do some tweaking: @ is needed in some ps stuff.
-#.
-#. ugh, the <p> below breaks inline images...
-#. clumsy workaround for python 2.2 pre bug.
-#. ###############################################################
-#. Recognize special sequences in the input
-#. Warning: This uses extended regular expressions.  Tread with care.
-#.
-#. legenda
-#.
-#. (?P<name>regex) -- assign result of REGEX to NAME
-#. *? -- match non-greedily.
-#. (?m) -- multiline regex: make ^ and $ match at each line
-#. (?s) -- make the dot match all characters including newline
-#. why do we have distinction between @mbinclude and @include?
-#. # we'd like to catch and reraise a more
-#. # detailed error, but alas, the exceptions
-#. # changed across the 1.5/2.1 boundary.
-#. ughUGH not original options
-#. First we want to scan the \documentclass line
-#. it should be the first non-comment line.
-#. The only thing we really need to know about the \documentclass line
-#. is if there are one or two columns to begin with.
-#. Then we add everything before \begin{document} to
-#. paperguru.m_document_preamble so that we can later write this header
-#. to a temporary file in find_latex_dims() to find textwidth.
-#. this is not bulletproof..., it checks the first 10 chunks
-#. newchunks.extend (func (m))
-#. python 1.5 compatible:
-#. we have to check for verbatim before doing include,
-#. because we don't want to include files that are mentioned
-#. inside a verbatim environment
-#. ugh fix input
-#. # Hmm, we should hash only lilypond source, and skip the
-#. # %options are ...
-#. # comment line
-#. # todo: include path, but strip
-#. # first part of the path.
-#. format == 'html'
-#. ugh rename
-#. Count sections/chapters.
-#. # TODO: do something like
-#. # this for texinfo/latex as well ?
-#. ugh
-#. fixme: be sys-independent.
-#.
-#. Ugh, fixing up dependencies for .tex generation
-#.
-#. Ugh.  (La)TeX writes progress and error messages on stdout
-#. Redirect to stderr
-#. # There used to be code to write .tex dependencies, but
-#. # that is silly: lilypond-book has its own dependency scheme
-#. # to ensure that all lily-XXX.tex files are there
-#. # TODO: put file name in front of texidoc.
-#. #
-#. # what's this? Docme --hwn
-#. #
-#. #docme: why global?
-#. Do It.
-#. should chmod -w
-#: lilypond-book.py:1557 lilypond.py:673 midi2ly.py:1018
+#: lilypond-book.py:699
 #, python-format
-msgid "getopt says: `%s'"
-msgstr "getopt() dice: `%s'"
+msgid "deprecated ly-option used: %s=%s"
+msgstr ""
+
+#: lilypond-book.py:702
+#, python-format
+msgid "compatibility mode translation: %s=%s"
+msgstr ""
+
+#: lilypond-book.py:706
+#, python-format
+msgid "deprecated ly-option used: %s"
+msgstr ""
+
+#: lilypond-book.py:709
+#, python-format
+msgid "compatibility mode translation: %s"
+msgstr ""
+
+#: lilypond-book.py:728
+#, python-format
+msgid "ignoring unknown ly option: %s"
+msgstr ""
 
-#. HACK
-#. status = os.system ('lilypond -w')
-#: lilypond-book.py:1630 lilypond.py:777
+#: lilypond-book.py:761
+#, python-format
+msgid "file not found: %s"
+msgstr ""
+
+#: lilypond-book.py:1094
+#, fuzzy, python-format
+msgid "Opening filter `%s'"
+msgstr "Limpiando `%s'..."
+
+#: lilypond-book.py:1236
 #, fuzzy
-msgid "no files specified on command line"
-msgstr "no se ha especificado ningún fichero en la línea de órdenes."
+msgid "Writing snippets..."
+msgstr "Escribiendo `%s'..."
+
+#: lilypond-book.py:1241
+#, fuzzy
+msgid "Processing...\n"
+msgstr "Procesando..."
+
+#: lilypond-book.py:1244
+#, fuzzy
+msgid "All snippets are up to date..."
+msgstr "calma, %s está al día"
+
+#: lilypond-book.py:1254
+#, fuzzy, python-format
+msgid "cannot determine format for: %s"
+msgstr "no puedo encontrar la fuente por defecto: `%s'"
+
+#: lilypond-book.py:1299
+msgid "Output would overwrite input file; use --output."
+msgstr ""
+
+#: lilypond-book.py:1306
+#, fuzzy, python-format
+msgid "Reading %s..."
+msgstr "Limpiando %s..."
+
+#: lilypond-book.py:1322
+#, fuzzy
+msgid "Dissecting..."
+msgstr "Listando `%s'..."
+
+#: lilypond-book.py:1353
+#, fuzzy, python-format
+msgid "Compiling %s..."
+msgstr "Limpiando %s..."
+
+#: lilypond-book.py:1361
+#, fuzzy, python-format
+msgid "Processing include: %s"
+msgstr "Procesando `%s'..."
+
+#: lilypond-book.py:1371
+#, fuzzy, python-format
+msgid "Removing `%s'"
+msgstr "Invocando `%s'"
+
+#: lilypond-book.py:1386 lilypond-latex.py:576 midi2ly.py:1017 ps2png.py:51
+#, python-format
+msgid "getopt says: `%s'"
+msgstr "getopt() dice: `%s'"
 
-#.
-#. Petr, ik zou willen dat ik iets zinvoller deed,
-#. maar wat ik kan ik doen, het verandert toch niets?
-#. --hwn 20/aug/99
-#. !@PYTHON@
-#.
-#. lilypond.py -- Run LilyPond, add titles to bare score, generate printable
-#. document
-#. Invokes: lilypond, latex (or pdflatex), dvips, ps2pdf, gs
-#.
-#. source file of the GNU LilyPond music typesetter
-#.
-#. (c) 1998--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-#. Jan Nieuwenhuizen <janneke@gnu.org>
-#. This is the third incarnation of lilypond.
-#.
-#. Earlier incarnations of lilypond were written by
-#. Jeffrey B. Reed<daboys@austin.rr.com> (Python version)
-#. Jan Arne Fagertun <Jan.A.Fagertun@@energy.sintef.no> (Bourne shell script)
-#.
-#. Note: gettext work best if we use ' for docstrings and "
-#. for gettextable strings.
-#. --> DO NOT USE ''' for docstrings.
-#. ###############################################################
-#. Users of python modules should include this snippet
-#. and customize variables below.
-#. We'll suffer this path init stuff as long as we don't install our
-#. python packages in <prefix>/lib/pythonx.y (and don't kludge around
-#. it as we do with teTeX on Red Hat Linux: set some environment var
-#. (PYTHONPATH) in profile)
-#. If set, LILYPONDPREFIX must take prevalence
-#. if datadir is not set, we're doing a build and LILYPONDPREFIX
-#. Customize these
-#. if __name__ == '__main__':
-#. lilylib globals
 #. # FIXME
 #. # do -P or -p by default?
 #. #help_summary = _ ("Run LilyPond using LaTeX for titling")
-#: lilypond.py:121
-msgid "Run LilyPond, add titles, generate printable document."
+#: lilypond-latex.py:104
+msgid "Run LilyPond, generate printable document."
 msgstr ""
 
-#: lilypond.py:127 main.cc:115
-msgid "write Makefile dependencies for every input file"
-msgstr "crear las dependencias para Makefile de cada fichero de entrada"
+#: lilypond-latex.py:110
+msgid "use LaTeX for formatting"
+msgstr ""
 
-#: lilypond.py:129
+#: lilypond-latex.py:111
 msgid "print even more output"
 msgstr ""
 
-#: lilypond.py:130
+#: lilypond-latex.py:112 lilypond-latex.py:123 midi2ly.py:102 main.cc:133
+#: main.cc:135
+msgid "FILE"
+msgstr "FICHERO"
+
+#: lilypond-latex.py:112
+msgid "find pfa fonts used in FILE"
+msgstr "buscar las fuentes pfa utilizadas en FICHERO"
+
+#: lilypond-latex.py:114
 msgid "add DIR to LilyPond's search path"
 msgstr "añadir DIR a la ruta de búsqueda de LilyPond"
 
-#: lilypond.py:132
+#: lilypond-latex.py:116
 #, fuzzy, python-format
 msgid "keep all output, output to directory %s.dir"
 msgstr "conservar todas las salidas, y nombrar el directorio %s.dir"
 
-#: lilypond.py:133
+#. junkme?
+#: lilypond-latex.py:119
 msgid "don't run LilyPond"
 msgstr "no ejecutar LilyPond"
 
-#: lilypond.py:134 main.cc:116
+#. junkme?
+#: lilypond-latex.py:121 main.cc:134
 msgid "produce MIDI output only"
 msgstr "producir solamente una salida MIDI"
 
-#: lilypond.py:135 midi2ly.py:102
-msgid "write output to FILE"
+#: lilypond-latex.py:123 main.cc:135
+#, fuzzy
+msgid "write output to FILE (suffix will be added)"
 msgstr "escribir la salida en el FICHERO"
 
-#: lilypond.py:136
-msgid "find pfa fonts used in FILE"
-msgstr "buscar las fuentes pfa utilizadas en FICHERO"
-
-#: lilypond.py:139
-msgid "generate PostScript output"
-msgstr "generar una salida PostScript"
+#: lilypond-latex.py:124 ps2png.py:42
+msgid "RES"
+msgstr ""
 
-#: lilypond.py:140
-msgid "generate PNG page images"
+#: lilypond-latex.py:125 ps2png.py:43
+msgid "set the resolution of the preview to RES"
 msgstr ""
 
-#: lilypond.py:141
+#: lilypond-latex.py:126
 #, fuzzy
-msgid "generate PS.GZ"
+msgid "generate PDF output"
 msgstr "generar una salida PostScript"
 
-#: lilypond.py:142
-#, fuzzy
-msgid "generate PDF output"
+#: lilypond-latex.py:127
+msgid "generate PostScript output"
 msgstr "generar una salida PostScript"
 
-#: lilypond.py:143
-msgid "use pdflatex to generate a PDF output"
+#: lilypond-latex.py:128
+msgid "generate PNG page images"
 msgstr ""
 
-#. FIXME: preview, picture; to indicate creation of a PNG?
-#: lilypond.py:145
+#: lilypond-latex.py:129
 msgid "make a picture of the first system"
 msgstr ""
 
-#: lilypond.py:146
-msgid "make HTML file with links to all output"
+#: lilypond-latex.py:130
+#, fuzzy
+msgid "generate PS.GZ"
+msgstr "generar una salida PostScript"
+
+#: lilypond-latex.py:131
+msgid "run in safe-mode"
 msgstr ""
 
-#: lilypond.py:147
+#: lilypond-latex.py:132
 msgid "KEY=VAL"
 msgstr "CLAVE=VALOR"
 
-#: lilypond.py:147
+#: lilypond-latex.py:132
 msgid "change global setting KEY to VAL"
 msgstr "cambiar el parámetro global CLAVE a VALOR"
 
-#: lilypond.py:149 midi2ly.py:106 mup2ly.py:79 main.cc:125
+#: lilypond-latex.py:134 midi2ly.py:106 mup2ly.py:79 main.cc:144
 msgid "print version number"
 msgstr "mostrar número de versión"
 
-#. other globals
-#. Pdftex support
-#. # yuk.
-#. lilypond_binary = 'valgrind --suppressions=%(home)s/usr/src/guile-1.6.supp --num-callers=10 %(home)s/usr/src/lilypond/lily/out/lilypond '% { 'home' : '/home/hanwen' }
-#. only use installed binary  when we're installed too.
-#. init to empty; values here take precedence over values in the file
-#. # TODO: change name.
-#. for geometry v3
-#. Output formats that lilypond should create
-#. what a name.
-#. ly.warning (_ ("invalid value: %s") % `val`)
-#. ly.warning (_ ("invalid value: %s") % `val`)
-#: lilypond.py:232
+#: lilypond-latex.py:203
 #, fuzzy, python-format
 msgid "no such setting: `%s'"
 msgstr "no existe tal parámetro: %s"
 
-#. 2 == user interrupt.
-#: lilypond.py:274
+#: lilypond-latex.py:247
 #, python-format
 msgid "LilyPond crashed (signal %d)."
 msgstr ""
 
-#: lilypond.py:275
+#: lilypond-latex.py:248
 msgid "Please submit a bug report to bug-lilypond@gnu.org"
 msgstr ""
 
-#: lilypond.py:281
+#: lilypond-latex.py:255
 #, python-format
 msgid "LilyPond failed on input file %s (exit status %d)"
 msgstr ""
 
-#: lilypond.py:284
+#: lilypond-latex.py:259
 #, python-format
 msgid "LilyPond failed on an input file (exit status %d)"
 msgstr ""
 
-#: lilypond.py:285
+#: lilypond-latex.py:260
 #, fuzzy
 msgid "Continuing..."
 msgstr "Ejecutando %s..."
 
-#. urg
-#: lilypond.py:296
+#: lilypond-latex.py:270
 #, python-format
 msgid "Analyzing %s..."
 msgstr "Analizando %s..."
 
-#. search only the first 10k
-#: lilypond.py:354
+#: lilypond-latex.py:324
 #, fuzzy, python-format
 msgid "no LilyPond output found for `%s'"
 msgstr "no se ha encontrado ninguna salida de lilypond para %s"
 
-#. The final \n seems important here. It ensures that the footers and taglines end up on the right page.
-#. TODO: should set textheight (enlarge) depending on papersize.
-#: lilypond.py:397
-#, fuzzy, python-format
-msgid "invalid value: `%s'"
-msgstr "valor no válido: %s"
-
-#. set sane geometry width (a4-width) for linewidth = -1.
-#. who the hell is 597 ?
-#. Ugh.  (La)TeX writes progress and error messages on stdout
-#. Redirect to stderr
-#: lilypond.py:511
+#: lilypond-latex.py:465
 msgid "LaTeX failed on the output file."
 msgstr ""
 
-#. make a preview by rendering only the 1st line
-#. of each score
-#: lilypond.py:568
+#: lilypond-latex.py:513
 msgid ""
 "Trying create PDF, but no PFA fonts found.\n"
 "Using bitmap fonts instead. This will look bad."
 msgstr ""
 
-#. ugh. Different targets?
-#. Added as functionality to lilypond, because lilypond may well need to do this
-#. in future too.
 #. no ps header?
-#: lilypond.py:615
+#: lilypond-latex.py:556
 #, python-format
 msgid "not a PostScript file: `%s'"
 msgstr "no es un fichero PostScript: `%s'"
 
-#. todo
-#: lilypond.py:660
-#, fuzzy, python-format
-msgid "Writing HTML menu `%s'"
-msgstr "Escribiendo `%s'..."
-
-#. signal programming error
-#. Don't convert input files to abspath, rather prepend '.' to include
-#. path.
-#. As a neat trick, add directory part of first input file
-#. to include path.  That way you can do without the clumsy -I in:
-#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly
-#: lilypond.py:769
+#: lilypond-latex.py:666
 msgid "pseudo filter"
 msgstr ""
 
-#: lilypond.py:772
+#: lilypond-latex.py:669
 msgid "pseudo filter only for single input file"
 msgstr ""
 
-#. Ugh, maybe make a setup () function
-#. hmmm. Wish I'd 've written comments when I wrote this.
-#. now it looks complicated.
-#: lilypond.py:806
+#: lilypond-latex.py:674
+#, fuzzy
+msgid "no files specified on command line"
+msgstr "no se ha especificado ningún fichero en la línea de órdenes."
+
+#: lilypond-latex.py:706
 #, python-format
 msgid "filename should not contain spaces: `%s'"
 msgstr "el nombre del fichero no debería contener espacios: `%s'"
 
-#. to be sure, add tmpdir *in front* of inclusion path.
-#. os.environ['TEXINPUTS'] =  tmpdir + ':' + os.environ['TEXINPUTS']
-#. We catch all exceptions, because we need to do stuff at exit:
-#. * copy any successfully generated stuff from tempdir and
-#. notify user of that
-#. * cleanout tempdir
-#. ## ARGH. This also catches python programming errors.
-#. ## this should only catch lilypond nonzero exit  status
-#. ## --hwn
-#. TODO: friendly message about LilyPond setup/failing?
-#.
-#: lilypond.py:845
+#: lilypond-latex.py:744
 msgid "Running LilyPond failed. Rerun with --verbose for a trace."
 msgstr ""
 
-#. Our LilyPond pseudo filter always outputs to 'lelie'
-#. have subsequent stages and use 'lelie' output.
-#. unless: add --tex, or --latex?
-#. TODO: friendly message about TeX/LaTeX setup,
-#. trying to run tex/latex by hand
-#: lilypond.py:886
+#: lilypond-latex.py:786
 msgid "Failed to make PS file. Rerun with --verbose for a trace."
 msgstr ""
 
-#. unless: add --tex, or --latex?
-#. TODO: friendly message about TeX/LaTeX setup,
-#. trying to run tex/latex by hand
-#: lilypond.py:916
-msgid "Running LaTeX falied. Rerun with --verbose for a trace."
-msgstr ""
-
-#. add DEP to targets?
-#: lilypond.py:926 input-file-results.cc:68
-#, c-format, python-format
-msgid "dependencies output to `%s'..."
-msgstr "dependencias producidas en `%s'..."
-
-#: lilypond.py:937
+#: lilypond-latex.py:815
 #, fuzzy, python-format
 msgid "%s output to <stdout>..."
 msgstr "%s producidos en `%s'..."
 
-#: lilypond.py:942 lilypond.py:968 includable-lexer.cc:57
-#: input-file-results.cc:191 input-file-results.cc:197 lily-guile.cc:86
+#: lilypond-latex.py:820 includable-lexer.cc:57 kpath.cc:129 lily-guile.cc:90
+#: lily-parser-scheme.cc:92
 #, c-format, python-format
 msgid "can't find file: `%s'"
 msgstr "no puedo encontrar el fichero: `%s'"
 
-#. Hmm, if this were a function, we could call it the except: clauses
-#: lilypond.py:965
+#: lilypond-latex.py:843
 #, fuzzy, python-format
 msgid "%s output to %s..."
 msgstr "%s producidos en `%s'..."
 
-#. !@PYTHON@
-#.
-#. midi2ly.py -- LilyPond midi import script
-#.
-#. source file of the GNU LilyPond music typesetter
-#.
-#. (c) 1998--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-#. Jan Nieuwenhuizen <janneke@gnu.org>
-#. ###############################################################
-#. Users of python modules should include this snippet.
-#.
-#. This soon to be removed for: import lilypond.lilylib as ly
-#. ###############################################################
-#. ###############################################################
-#. ############### CONSTANTS
-#. ###############################################################
+#: lilypond-latex.py:846
+#, fuzzy, python-format
+msgid "can't find file: `%s.%s'"
+msgstr "no puedo encontrar el fichero: `%s'"
+
 #. temp_dir = os.path.join (original_dir,  '%s.dir' % program_name)
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
@@ -973,6 +593,10 @@ msgstr "ACC[:MENOR]"
 msgid "set key: ALT=+sharps|-flats; MINOR=1"
 msgstr ""
 
+#: midi2ly.py:102 mup2ly.py:76
+msgid "write output to FILE"
+msgstr "escribir la salida en el FICHERO"
+
 #: midi2ly.py:103
 msgid "quantise note starts on DUR"
 msgstr ""
@@ -989,102 +613,37 @@ msgstr ""
 msgid "treat every text as a lyric"
 msgstr ""
 
-#: midi2ly.py:136 mup2ly.py:130
-msgid " 2001--2003"
-msgstr ""
+#: midi2ly.py:149 mup2ly.py:143 input.cc:105
+msgid "warning: "
+msgstr "advertencia: "
 
-#: midi2ly.py:141 mup2ly.py:135
-msgid ""
-"\n"
-"Distributed under terms of the GNU General Public License. It comes with\n"
-"NO WARRANTY."
-msgstr ""
+#: midi2ly.py:164 midi2ly.py:1017 midi2ly.py:1082 mup2ly.py:146 mup2ly.py:160
+#: input.cc:110
+msgid "error: "
+msgstr "error: "
 
-#: midi2ly.py:166 mup2ly.py:162
+#: midi2ly.py:165 mup2ly.py:161
 msgid "Exiting ... "
 msgstr "Saliendo..."
 
-#: midi2ly.py:264 mup2ly.py:261
+#: midi2ly.py:263 mup2ly.py:260
 #, python-format
 msgid "command exited with value %d"
 msgstr "fin de la orden con valor %d"
 
-#. ###############################################################
-#. END Library
-#. ###############################################################
-#. hmm
-#. major scale: do-do
-#. minor scale: la-la  (= + 5) '''
-#. By tradition, all scales now consist of a sequence
-#. of 7 notes each with a distinct name, from amongst
-#. a b c d e f g.  But, minor scales have a wide
-#. second interval at the top - the 'leading note' is
-#. sharped. (Why? it just works that way! Anything
-#. else doesn't sound as good and isn't as flexible at
-#. saying things. In medieval times, scales only had 6
-#. notes to avoid this problem - the hexachords.)
-#. So, the d minor scale is d e f g a b-flat c-sharp d
-#. - using d-flat for the leading note would skip the
-#. name c and duplicate the name d.  Why isn't c-sharp
-#. put in the key signature? Tradition. (It's also
-#. supposedly based on the Pythagorean theory of the
-#. cycle of fifths, but that really only applies to
-#. major scales...)  Anyway, g minor is g a b-flat c d
-#. e-flat f-sharp g, and all the other flat minor keys
-#. end up with a natural leading note. And there you
-#. have it.
-#. John Sankey <bf250@freenet.carleton.ca>
-#.
-#. Let's also do a-minor: a b c d e f gis a
-#.
-#. --jcn
-#. as -> gis
-#. des -> cis
-#. ges -> fis
-#. g -> fisis
-#. d -> cisis
-#. a -> gisis
-#. b -> ces
-#. e -> fes
-#. f -> eis
-#. c -> bis
-#. # FIXME: compile fix --jcn
-#. TODO: move space
-#. fis cis gis dis ais eis bis
-#. bes es as des ges ces fes
-#. urg, we should be sure that we're in a lyrics staff
-#. all include ALL_NOTES_OFF
-#. ugh, must set key while parsing
-#. because Note init uses key
-#. Better do Note.calc () at dump time?
-#. last_lyric.clocks = t - last_time
-#. hmm
-#. urg, this will barf at meter changes
-#. urg LilyPond doesn't start at c4, but
-#. remembers from previous tracks!
-#. reference_note = Note (clocks_per_4, 4*12, 0)
-#. must be in \notes mode for parsing \skip
-#: midi2ly.py:1002
+#: midi2ly.py:1001
 #, python-format
 msgid "%s output to `%s'..."
 msgstr "%s producidos en `%s'..."
 
-#: midi2ly.py:1033
+#: midi2ly.py:1032
 msgid "Example:"
 msgstr ""
 
-#: midi2ly.py:1083
+#: midi2ly.py:1082
 msgid "no files specified on command line."
 msgstr "no se ha especificado ningún fichero en la línea de órdenes."
 
-#. !@PYTHON@
-#. mup2ly.py -- mup input converter
-#.
-#. source file of the GNU LilyPond music typesetter
-#.
-#. (c) 2001
-#. if set, LILYPONDPREFIX must take prevalence
-#. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
 #, fuzzy
 msgid "Convert mup to LilyPond source."
@@ -1102,74 +661,11 @@ msgstr "define la macro NOMBRE [EXPRESIÓN de expansión opcional]"
 msgid "only pre-process"
 msgstr "solamente preprocesar"
 
-#. Duh.  Python style portable: cp *.EXT OUTDIR
-#. system ('cp *.%s %s' % (ext, outdir), 1)
-#. 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 set, LILYPONDPREFIX must take prevalence
-#. if datadir is not set, we're doing a build and LILYPONDPREFIX
-#. ###############################################################
-#. END Library
-#.
-#. PMX cut and paste
-#.
-#. if not self.entries:
-#. #return '\n'
-#. #ugh ugh
-#. return '\n%s = {}\n\n' % self.idstring ()
-#. ugh
-#. def set_clef (self, letter):
-#. clstr = clef_table[letter]
-#. self.voices[0].add_nonchord (Clef (clstr))
-#. urg
-#. maybe use import copy?
-#. for i in self.pitches:
-#. ch.pitches.append (i)
-#. for i in self.scripts:
-#. ch.scripts.append (i)
-#. http://www.arkkra.com/doc/uguide/contexts.html
-#. #self.current_staffs = []
-#. duh
-#. FIXME: 1?
-#. FIXME: does key play any role in this?
-#. ch = self.current_voices[0].last_chord ()
-#. ch.basic_duration = self.current_voices[0].last_chord ().basic_duration
-#. ugh
-#. ch = self.current_voices[0].last_chord ()
-#. `;' is not a separator, chords end with ';'
-#. mup resets default duration and pitch each bar
-#. ugh: these (and lots more) should also be parsed in
-#. context staff.  we should have a class Staff_properties
-#. and parse/set all those.
-#. shortcut: set to official mup maximum (duh)
-#. self.set_staffs (40)
-#: mup2ly.py:1076
+#: mup2ly.py:1075
 #, python-format
 msgid "no such context: %s"
 msgstr "no hay tal contexto: %s"
 
-#. hmm
-#. dig this: mup allows ifdefs inside macro bodies
-#. don't do nested multi-line defines
-#. duh: mup is strictly line-based, except for `define',
-#. which is `@' terminated and may span several lines
-#. don't define new macros in unactive areas
-#. To support nested multi-line define's
-#. process_function and macro_name, macro_body
-#. should become lists (stacks)
-#. The mup manual is undetermined on this
-#. and I haven't seen examples doing it.
-#.
-#. don't do nested multi-line define's
-#. writes to stdout for help2man
-#. don't call
-#. identify ()
-#. sys.stdout.flush ()
-#. handy emacs testing
-#. if not files:
-#. files = ['template.mup']
 #: mup2ly.py:1300
 #, python-format
 msgid "Processing `%s'..."
@@ -1180,173 +676,173 @@ msgstr "Procesando `%s'..."
 msgid "Writing `%s'..."
 msgstr "Escribiendo `%s'..."
 
-#: getopt-long.cc:146
+#. ugr.
+#: ps2png.py:35
+msgid "Convert PostScript to PNG image."
+msgstr ""
+
+#. # FIXME: silly message containing %d
+#: ps2png.py:72
+#, fuzzy, python-format
+msgid "Wrote `%s'"
+msgstr "Escribiendo `%s'..."
+
+#: getopt-long.cc:144
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "la opción `%s' requiere un argumento"
 
-#: getopt-long.cc:150
+#: getopt-long.cc:148
 #, c-format
 msgid "option `%s' doesn't allow an argument"
 msgstr "la opción `%s' no permite argumentos"
 
-#: getopt-long.cc:154
+#: getopt-long.cc:152
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "opción no reconocida: `%s'"
 
-#: getopt-long.cc:161
+#: getopt-long.cc:159
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "argúmento no válido `%s' para la opción `%s'"
 
-#: warn.cc:25
+#: warn.cc:43
 #, fuzzy, c-format
-msgid "warning: %s\n"
-msgstr "advertencia: "
-
-#: warn.cc:31
-#, fuzzy, c-format
-msgid "error: %s\n"
-msgstr "error: "
+msgid "programming error: %s"
+msgstr "error de programación: "
 
 #: warn.cc:44
-#, fuzzy, c-format
-msgid "programming error: %s (Continuing; cross thumbs)\n"
-msgstr " (Continuando; cruza los dedos)"
-
-#: accidental.cc:202 key-signature-interface.cc:137
-#, c-format
-msgid "accidental `%s' not found"
+msgid "Continuing; crossing fingers"
 msgstr ""
 
-#: accidental-engraver.cc:171 new-accidental-engraver.cc:238
+#: accidental-engraver.cc:239
 #, c-format
 msgid "Accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:196 new-accidental-engraver.cc:263
+#: accidental-engraver.cc:267
 #, c-format
-msgid "unknown accidental typesetting: %s. Ignored"
+msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:212 new-accidental-engraver.cc:279
+#: accidental-engraver.cc:284
 #, c-format
-msgid "Symbol is not a parent context: %s. Ignored"
+msgid "Accidental rule must be pair or context-name; Found %s"
 msgstr ""
 
-#: accidental-engraver.cc:215 new-accidental-engraver.cc:282
+#: accidental.cc:223 key-signature-interface.cc:133
 #, c-format
-msgid "Accidental typesetting must be pair or context-name: %s"
+msgid "accidental `%s' not found"
 msgstr ""
 
-#: afm.cc:66
-#, c-format
-msgid "can't find character number: %d"
-msgstr "no puedo encontrar el carácter número: %d"
-
-#: afm.cc:81
-#, c-format
-msgid "can't find character called: `%s'"
-msgstr "no puedo encontrar el carácter llamado: `%s'"
-
-#: afm.cc:142
+#: afm.cc:144
 #, c-format
 msgid "Error parsing AFM file: `%s'"
 msgstr "Error de análisis sintáctico del fichero AFM: `%s'"
 
-#: all-font-metrics.cc:95
+#. FIXME: broken sentence
+#: all-font-metrics.cc:158
 #, c-format
 msgid "checksum mismatch for font file: `%s'"
 msgstr "suma de control no acorde para el fichero de fuentes: `%s'"
 
-#: all-font-metrics.cc:97
+#: all-font-metrics.cc:160
 #, c-format
 msgid "does not match: `%s'"
 msgstr "no concuerda: `%s'"
 
-#: all-font-metrics.cc:102
-msgid ""
-" Rebuild all .afm files, and remove all .pk and .tfm files.  Rerun with -V "
-"to show font paths."
+#: all-font-metrics.cc:166
+#, fuzzy
+msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
 msgstr ""
 "Reconstruir todos los ficheros .afm, y borrar todos los ficheros .pk y .tfm. "
 "Re-ejecutar con la opción -V para mostrar las rutas de las fuentes."
 
-#: all-font-metrics.cc:103
-msgid ""
-"A script for removing font-files is delivered with the source-code,\n"
-"in buildscripts/clean-fonts.sh"
+#: all-font-metrics.cc:168
+msgid "Rerun with -V to show font paths."
+msgstr ""
+
+#: all-font-metrics.cc:170
+msgid "A script for removing font-files is delivered with the source-code:"
 msgstr ""
 
-#: all-font-metrics.cc:169
+#: all-font-metrics.cc:279
 #, c-format
 msgid "can't find font: `%s'"
 msgstr "no encuentro la fuente: `%s'"
 
-#: all-font-metrics.cc:170
+#: all-font-metrics.cc:280
 msgid "Loading default font"
 msgstr "Cargando la fuente por defecto"
 
-#: all-font-metrics.cc:185
+#: all-font-metrics.cc:295
 #, c-format
 msgid "can't find default font: `%s'"
 msgstr "no puedo encontrar la fuente por defecto: `%s'"
 
-#: all-font-metrics.cc:186 includable-lexer.cc:59 input-file-results.cc:192
+#: all-font-metrics.cc:296 includable-lexer.cc:59 lily-parser-scheme.cc:85
 #, c-format
 msgid "(search path: `%s')"
 msgstr "(ruta de búsqueda: `%s')"
 
-#: all-font-metrics.cc:187
+#: all-font-metrics.cc:297
 msgid "Giving up"
 msgstr "Abandonando"
 
-#: auto-change-iterator.cc:43 change-iterator.cc:60
-#: part-combine-music-iterator.cc:120
+#: apply-context-iterator.cc:35
+msgid "\\applycontext argument is not a procedure"
+msgstr ""
+
+#: auto-change-iterator.cc:66 change-iterator.cc:61
 msgid "Can't switch translators, I'm there already"
 msgstr "No puedo pasar de un traductor al otro, ya estoy allí"
 
-#: bar-check-iterator.cc:51
+#: axis-group-engraver.cc:112
+msgid ""
+"Axis_group_engraver: vertical group already has a parent.\n"
+"Do you have two Axis_group_engravers?\n"
+"Killing this vertical group."
+msgstr ""
+
+#: bar-check-iterator.cc:68
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr ""
 
-#: beam.cc:146
-msgid "beam has less than two visible stems"
+#: beam-engraver.cc:138
+msgid "already have a beam"
 msgstr ""
 
-#: beam.cc:151
-msgid "Beam has less than two stems. Removing beam."
+#: beam-engraver.cc:209
+msgid "unterminated beam"
 msgstr ""
 
-#: beam.cc:976
-msgid ""
-"Not sure that we can find a nice beam slope (no viable initial configuration "
-"found)."
+#: beam-engraver.cc:242 chord-tremolo-engraver.cc:168
+msgid "stem must have Rhythmic structure"
 msgstr ""
 
-#: beam-engraver.cc:176
-msgid "already have a beam"
+#: beam-engraver.cc:256
+msgid "stem doesn't fit in beam"
 msgstr ""
 
-#: beam-engraver.cc:259
-msgid "unterminated beam"
+#: beam-engraver.cc:257
+msgid "beam was started here"
 msgstr ""
 
-#: beam-engraver.cc:292 chord-tremolo-engraver.cc:197
-msgid "stem must have Rhythmic structure"
+#: beam.cc:150
+msgid "beam has less than two visible stems"
 msgstr ""
 
-#: beam-engraver.cc:306
-msgid "stem doesn't fit in beam"
+#: beam.cc:155
+msgid "removing beam with less than two stems"
 msgstr ""
 
-#: beam-engraver.cc:307
-msgid "beam was started here"
+#: beam.cc:1011
+msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:173
+#: break-align-interface.cc:212
 #, fuzzy, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "No se añade el traductor: `%s'"
@@ -1360,123 +856,153 @@ msgstr "no puedo cambiar de `%s' a `%s'"
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
 #.
-#. last->translator_id_string_  = get_change ()->change_to_id_string_;
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
 #.
-#: change-iterator.cc:79
+#: change-iterator.cc:93
 msgid "I'm one myself"
 msgstr "Yo mismo soy uno"
 
-#: change-iterator.cc:82
+#: change-iterator.cc:96
 msgid "none of these in my family"
 msgstr "ninguno de éstos en mi familia"
 
-#: chord-tremolo-engraver.cc:98
+#: chord-tremolo-engraver.cc:97
 #, c-format
 msgid "Chord tremolo with %d elements. Must have two elements."
 msgstr ""
 
-#: chord-tremolo-engraver.cc:157
+#: chord-tremolo-engraver.cc:134
 msgid "unterminated chord tremolo"
 msgstr "acorde de trémolo sin terminar"
 
-#: chord-tremolo-iterator.cc:69
+#: chord-tremolo-iterator.cc:66
 msgid "no one to print a tremolos"
 msgstr "ninguno para la impresión de trémolos"
 
-#: clef.cc:64
+#: clef.cc:57
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
 
-#: cluster.cc:131
+#: cluster.cc:122
 #, fuzzy, c-format
 msgid "unknown cluster style `%s'"
 msgstr "traductor desconocido: `%s'"
 
 #: coherent-ligature-engraver.cc:84
 #, c-format
-msgid "gotcha: ptr=%ul"
+msgid "gotcha: ptr =%ul"
 msgstr ""
 
 #: coherent-ligature-engraver.cc:96
 #, c-format
-msgid "distance=%f"
+msgid "distance =%f"
 msgstr ""
 
 #: coherent-ligature-engraver.cc:139
 #, c-format
-msgid "Coherent_ligature_engraver: setting `spacing-increment = 0.01': ptr=%ul"
+msgid ""
+"Coherent_ligature_engraver: setting `spacing-increment = 0.01': ptr =%ul"
 msgstr ""
 
-#: custos.cc:92
+#: context-def.cc:111
+#, fuzzy, c-format
+msgid "Program has no such type: `%s'"
+msgstr "El programa no tiene este tipo"
+
+#: context-def.cc:286
+#, c-format
+msgid "can't find: `%s'"
+msgstr "no se puede encontrar: `%s'"
+
+#: context.cc:151
+#, fuzzy, c-format
+msgid "Cannot find or create new `%s'"
+msgstr "no se puede encontrar o crear: `%s'"
+
+#: context.cc:217
+#, fuzzy, c-format
+msgid "Cannot find or create `%s' called `%s'"
+msgstr "no se puede encontrar o crear `%s' llamado `%s'"
+
+#: context.cc:315
+#, c-format
+msgid "can't find or create: `%s'"
+msgstr "no se puede encontrar o crear: `%s'"
+
+#: custos.cc:84
 #, c-format
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dimensions.cc:13
-msgid "NaN"
-msgstr "NaN"
-
-#: dynamic-engraver.cc:204 span-dynamic-performer.cc:82
+#: dynamic-engraver.cc:179 span-dynamic-performer.cc:84
 msgid "can't find start of (de)crescendo"
 msgstr "no puedo encontrar el principio del (de)crescendo"
 
-#: dynamic-engraver.cc:216
-msgid "already have a crescendo"
-msgstr "ya tengo un crescendo"
-
-#: dynamic-engraver.cc:217
+#: dynamic-engraver.cc:189
 msgid "already have a decrescendo"
 msgstr "ya tengo un decrescendo"
 
-#: dynamic-engraver.cc:220
+#: dynamic-engraver.cc:191
+msgid "already have a crescendo"
+msgstr "ya tengo un crescendo"
+
+#: dynamic-engraver.cc:194
 msgid "Cresc started here"
 msgstr ""
 
-#: dynamic-engraver.cc:323
+#: dynamic-engraver.cc:315
 msgid "unterminated (de)crescendo"
 msgstr "(de)crescendo sin terminar"
 
-#: event.cc:49
-#, c-format
-msgid "Transposition by %s makes alteration larger than two"
-msgstr ""
-
-#: event-chord-iterator.cc:76 output-property-music-iterator.cc:27
+#: event-chord-iterator.cc:56 output-property-music-iterator.cc:29
 #, fuzzy, c-format
 msgid "Junking event: `%s'"
 msgstr "Invocando `%s'"
 
-#: extender-engraver.cc:94
+#: extender-engraver.cc:140 extender-engraver.cc:149
 msgid "unterminated extender"
 msgstr "prolongación sin terminar"
 
-#: extender-engraver.cc:106
-#, fuzzy
-msgid "Nothing to connect extender to on the left.  Ignoring extender event."
-msgstr ""
-"Nada a la izquierda a lo que conectar la prologación. Ignorando la petición "
-"de prolongación."
-
-#: folded-repeat-iterator.cc:88
+#: folded-repeat-iterator.cc:65
 msgid "no one to print a repeat brace"
 msgstr "ninguno para la impresión de llaves repetidas"
 
-#: font-interface.cc:239
-msgid "couldn't find any font satisfying "
-msgstr "no he podido encontrar ninguna fuente satisfactoria "
+#: font-config.cc:34
+#, c-format
+msgid "Failed to add lilypond directory %s"
+msgstr ""
 
-#: glissando-engraver.cc:100
+#: glissando-engraver.cc:99
 #, fuzzy
 msgid "Unterminated glissando."
 msgstr "prolongación sin terminar"
 
-#: gourlay-breaking.cc:188
+#: global-context-scheme.cc:52 global-context-scheme.cc:80
+msgid "Need music in a score"
+msgstr ""
+
+#: global-context-scheme.cc:70
+#, fuzzy
+msgid "Interpreting music... "
+msgstr "Interpretación de la música..."
+
+#: global-context-scheme.cc:91
+#, c-format
+msgid "elapsed time: %.2f seconds"
+msgstr ""
+
+#: global-context.cc:162
+#, c-format
+msgid "can't find `%s' context"
+msgstr "no se puede encontrar el contexto de `%s'"
+
+#: gourlay-breaking.cc:200
 #, c-format
 msgid "Optimal demerits: %f"
 msgstr ""
 
-#: gourlay-breaking.cc:193
+#: gourlay-breaking.cc:205
 msgid "No feasible line breaking found"
 msgstr "No se ha encontrado ninguna ruptura de línea factible"
 
@@ -1490,618 +1016,682 @@ msgstr "(ignorado)"
 msgid "implied \\%s added"
 msgstr ""
 
-#.
-#. Todo: do something sensible. The grob-pq-engraver is not water
-#. tight, and stuff like tupletSpannerDuration confuses it.
-#.
-#: grob-pq-engraver.cc:130
+#: grob-interface.cc:48
+#, fuzzy, c-format
+msgid "Unknown interface `%s'"
+msgstr "traductor desconocido: `%s'"
+
+#: grob-interface.cc:59
 #, c-format
-msgid ""
-"Skipped something?\n"
-"Grob %s ended before I expected it to end."
+msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: hairpin.cc:98
+#: hairpin.cc:106
 msgid "decrescendo too small"
 msgstr "decrescendo demasiado pequeño"
 
-#: hairpin.cc:99
+#: hairpin.cc:107
 msgid "crescendo too small"
 msgstr "crescendo demasiado pequeño"
 
-#: horizontal-bracket-engraver.cc:64
+#: horizontal-bracket-engraver.cc:57
 msgid "Don't have that many brackets."
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:73
+#: horizontal-bracket-engraver.cc:66
 msgid "Conflicting note group events."
 msgstr ""
 
-#: hyphen-engraver.cc:87
-msgid "unterminated hyphen"
-msgstr ""
+#: hyphen-engraver.cc:96
+#, fuzzy
+msgid "removing unterminated hyphen"
+msgstr "prolongación sin terminar"
 
-#: hyphen-engraver.cc:99
+#: hyphen-engraver.cc:109
 #, fuzzy
-msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen event."
+msgid "unterminated hyphen; removing"
+msgstr "acorde de trémolo sin terminar"
+
+#: includable-lexer.cc:50
+msgid "include files are not allowed in safe mode"
 msgstr ""
-"Nada a la izquierda a lo que conectar la prologación. Ignorando la petición "
-"de prolongación."
 
-#: input.cc:99
+#: input.cc:116
 msgid "non fatal error: "
 msgstr "error no fatal: "
 
-#: input.cc:107 source-file.cc:146 source-file.cc:239
+#: input.cc:124 source-file.cc:136 source-file.cc:229
 msgid "position unknown"
 msgstr "posición desconocida"
 
-#: input-file-results.cc:72 source-file.cc:54 streams.cc:38
-#, c-format
-msgid "can't open file: `%s'"
-msgstr "no se puede abrir el fichero: `%s'"
-
-#: input-file-results.cc:132
-msgid "Score contains errors; will not process it"
-msgstr "La partitura contiene errores; no será procesada."
-
-#: input-file-results.cc:172
-#, c-format
-msgid "Now processing: `%s'"
-msgstr "Ahora en proceso: `%s'"
-
-#: key-performer.cc:96
+#: key-performer.cc:88
 msgid "FIXME: key change merge"
 msgstr ""
 
-#: kpath.cc:76
+#: kpath.cc:56
 #, fuzzy, c-format
-msgid "Kpathsea couldn't find TFM file `%s'"
+msgid "kpathsea can not find AFM file `%s'"
 msgstr "no puedo encontrar el fichero: `%s'"
 
-#: ligature-engraver.cc:159
+#: kpath.cc:80
+#, fuzzy, c-format
+msgid "kpathsea can not find TFM file: `%s'"
+msgstr "no puedo encontrar el fichero: `%s'"
+
+#: kpath.cc:124
+#, fuzzy, c-format
+msgid "kpathsea can not find file: `%s'"
+msgstr "no puedo encontrar el fichero: `%s'"
+
+#: ligature-engraver.cc:153
 #, fuzzy
 msgid "can't find start of ligature"
 msgstr "no puedo encontrar el principio del (de)crescendo"
 
-#: ligature-engraver.cc:165
+#: ligature-engraver.cc:159
 msgid "no right bound"
 msgstr ""
 
-#: ligature-engraver.cc:191
+#: ligature-engraver.cc:185
 #, fuzzy
 msgid "already have a ligature"
 msgstr "ya tengo un crescendo"
 
-#: ligature-engraver.cc:207
+#: ligature-engraver.cc:201
 msgid "no left bound"
 msgstr ""
 
-#: ligature-engraver.cc:258
+#: ligature-engraver.cc:257
 #, fuzzy
 msgid "unterminated ligature"
 msgstr "prolongación sin terminar"
 
-#: ligature-engraver.cc:282
-msgid "ligature may not contain rest; ignoring rest"
+#: ligature-engraver.cc:281
+msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:283
+#: ligature-engraver.cc:282
 msgid "ligature was started here"
 msgstr ""
 
-#: lily-guile.cc:88
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(ruta de carga: `%s')"
 
-#: lily-guile.cc:576
+#: lily-guile.cc:478
 #, c-format
 msgid "Can't find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:579
+#: lily-guile.cc:481
 msgid "Perhaps you made a typing error?"
 msgstr ""
 
-#: lily-guile.cc:585
+#: lily-guile.cc:487
 msgid "Doing assignment anyway."
 msgstr ""
 
-#: lily-guile.cc:599
+#: lily-guile.cc:501
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lookup.cc:173
-msgid "round filled box horizontal extent smaller than blot; decreasing blot"
-msgstr ""
+#: lily-lexer.cc:211
+#, c-format
+msgid "Identifier name is a keyword: `%s'"
+msgstr "El nombre del identificativo es una palabra clave: `%s'"
+
+#: lily-lexer.cc:228
+#, c-format
+msgid "error at EOF: %s"
+msgstr "error al final del fichero (EOF): %s"
+
+#: lily-parser-scheme.cc:84
+#, fuzzy, c-format
+msgid "can't find init file: `%s'"
+msgstr "no puedo encontrar el fichero: `%s'"
+
+#: lily-parser-scheme.cc:101
+#, fuzzy, c-format
+msgid "Processing `%s'"
+msgstr "Procesando `%s'..."
 
-#: lookup.cc:178
-msgid "round filled box vertical extent smaller than blot; decreasing blot"
+#: lily-parser.cc:102
+msgid "Parsing..."
+msgstr "Analizando..."
+
+#: lily-parser.cc:120
+msgid "Braces don't match"
 msgstr ""
 
-#: lyric-phrasing-engraver.cc:311
-msgid "lyrics found without any matching notehead"
+#: main.cc:95
+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"
+"as published by the Free Software Foundation.\n"
+"\n"
+"    This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"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"
+"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 ""
 
-#: lyric-phrasing-engraver.cc:317
-msgid "Huh? Melismatic note found to have associated lyrics."
+#: main.cc:124
+msgid "select backend to use"
 msgstr ""
 
-#: main.cc:106
+#: main.cc:125
 msgid "EXPR"
 msgstr "EXPR"
 
-#: main.cc:107
-msgid "set options, use -e '(ly-option-usage)' for help"
+#: main.cc:126
+msgid "set option, use -e '(ly:option-usage)' for help"
 msgstr ""
 
-#: main.cc:110
-msgid "use output format EXT"
+#. Bug in option parser: --output =foe is taken as an abbreviation
+#. for --output-format.
+#: main.cc:129
+#, fuzzy
+msgid "EXTs"
+msgstr "EXT"
+
+#: main.cc:129
+msgid "list of formats to dump"
 msgstr ""
 
-#: main.cc:112
+#: main.cc:131
 msgid "FIELD"
 msgstr "CAMPO"
 
-#: main.cc:112
+#: main.cc:131
 msgid "write header field to BASENAME.FIELD"
 msgstr "escribir campo de cabecera a BASENAME.FIELD"
 
-#: main.cc:113
+#: main.cc:132
 msgid "add DIR to search path"
 msgstr "añadir DIR a la ruta de búsqueda"
 
-#: main.cc:114
+#: main.cc:133
 msgid "use FILE as init file"
 msgstr "usar FICHERO como fichero de inicialización"
 
-#: main.cc:118
-msgid "prepend DIR to dependencies"
-msgstr "añadir el prefijo DIR a las dependencias"
+#: main.cc:136
+msgid "generate a preview"
+msgstr ""
 
-#.
-#. should audit again.
-#.
-#: main.cc:123
-msgid "inhibit file output naming and exporting"
-msgstr "inhibir la denominación del fichero de salida y la exportación"
+#: main.cc:137
+msgid "don't generate full pages"
+msgstr ""
 
-#. No version number or newline here. It confuses help2man.
-#: main.cc:155
-#, c-format
-msgid "Usage: %s [OPTIONS]... FILE..."
-msgstr "Sintaxis: %s [OPCIÓN]... FICHERO..."
+#: main.cc:138
+#, fuzzy
+msgid "generate PNG"
+msgstr "generar una salida PostScript"
+
+#: main.cc:139
+#, fuzzy
+msgid "generate PostScript"
+msgstr "generar una salida PostScript"
+
+#: main.cc:140
+#, fuzzy
+msgid "generate DVI"
+msgstr "generar una salida PostScript"
 
-#: main.cc:157
-msgid "Typeset music and or play MIDI from FILE."
+#: main.cc:141
+#, fuzzy
+msgid "generate PDF (default)"
+msgstr "generar una salida PostScript"
+
+#: main.cc:142
+#, fuzzy
+msgid "generate TeX"
+msgstr "generar una salida PostScript"
+
+#: main.cc:143
+msgid "run in safe mode"
 msgstr ""
 
-#: main.cc:160
+#: main.cc:166
+#, fuzzy, c-format
 msgid ""
-"LilyPond is a music typesetter.  It produces beautiful sheet music\n"
-"using a high level description file as input.  LilyPond is part of \n"
-"the GNU Project.\n"
+"Copyright (c) %s by\n"
+"%s  and others."
+msgstr "Copyright (c) %s "
+
+#. No version number or newline here.  It confuses help2man.
+#: main.cc:192
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... FILE..."
+msgstr "Sintaxis: %s [OPCIÓN]... FICHERO..."
+
+#: main.cc:194
+#, c-format
+msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
-#: main.cc:182
+#: main.cc:196
 #, c-format
-msgid ""
-"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"
+msgid "LilyPond produces beautiful music notation."
 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"
 
 #: main.cc:198
-msgid "GNU LilyPond -- The music typesetter"
+#, c-format
+msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:206
-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"
-"as published by the Free Software Foundation.\n"
-"\n"
-"    This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"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"
-"GNU General Public License along with this program; if not, write to\n"
-"the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
-"02111-1307,\n"
-"USA.\n"
+#: mensural-ligature-engraver.cc:76
+msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
-#: mensural-ligature.cc:153
-#, c-format
-msgid "Mensural_ligature:thickness undefined on flexa %d; assuming 1.4"
+#: mensural-ligature-engraver.cc:102
+msgid "can not determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature.cc:169
-#, c-format
-msgid "Mensural_ligature:delta-pitch undefined on flexa %d; assuming 0"
+#: mensural-ligature-engraver.cc:116
+msgid "single note ligature - skipping"
 msgstr ""
 
-#: mensural-ligature.cc:182
-#, c-format
-msgid "Mensural_ligature:flexa-width undefined on flexa %d; assuming 2.0"
+#: mensural-ligature-engraver.cc:128
+msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature.cc:215
-msgid "Mensural_ligature:unexpected case fall-through"
+#: mensural-ligature-engraver.cc:140
+msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature.cc:225
-msgid "Mensural_ligature: (join_left == 0)"
+#: mensural-ligature-engraver.cc:188
+msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:248 mensural-ligature-engraver.cc:397
-msgid "unexpected case fall-through"
+#: mensural-ligature-engraver.cc:199
+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:259
-msgid "ligature with less than 2 heads -> skipping"
+#: mensural-ligature-engraver.cc:226
+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 ""
 
-#: mensural-ligature-engraver.cc:279
-msgid "can not determine pitch of ligature primitive -> skipping"
+#: mensural-ligature-engraver.cc:345
+msgid "unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:302
-msgid "prime interval within ligature -> skipping"
+#: mensural-ligature.cc:132
+msgid "Mensural_ligature: unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:312
-msgid "mensural ligature: duration none of L, B, S -> skipping"
+#: mensural-ligature.cc:184
+msgid "Mensural_ligature: (join_right == 0)"
 msgstr ""
 
-#: midi-item.cc:148
-#, c-format
-msgid "no such instrument: `%s'"
+#: midi-item.cc:151
+#, fuzzy, c-format
+msgid "no such MIDI instrument: `%s'"
 msgstr "no hay este instrumento: `%s'"
 
-#: midi-item.cc:238
-msgid "silly duration"
-msgstr "duración ridícula"
-
-#: midi-item.cc:251
+#: midi-item.cc:255
 msgid "silly pitch"
 msgstr ""
 
-#: music-output-def.cc:111
+#: midi-item.cc:271
 #, c-format
-msgid "can't find `%s' context"
-msgstr "no se puede encontrar el contexto de `%s'"
+msgid "Experimental: temporarily fine tuning (of %d cents) a channel."
+msgstr ""
 
-#: my-lily-lexer.cc:169
-#, c-format
-msgid "Identifier name is a keyword: `%s'"
-msgstr "El nombre del identificativo es una palabra clave: `%s'"
+#: midi-stream.cc:39
+#, fuzzy, c-format
+msgid "could not write file: `%s'"
+msgstr "no se puede abrir el fichero: `%s'"
 
-#: my-lily-lexer.cc:191
+#: music.cc:176
 #, c-format
-msgid "error at EOF: %s"
-msgstr "error al final del fichero (EOF): %s"
-
-#: my-lily-parser.cc:44
-msgid "Parsing..."
-msgstr "Analizando..."
+msgid "octave check failed; expected %s, found: %s"
+msgstr ""
 
-#: my-lily-parser.cc:54
-msgid "Braces don't match"
+#: music.cc:239
+#, c-format
+msgid "Transposition by %s makes alteration larger than double"
 msgstr ""
 
 #.
 #. music for the softenon children?
 #.
-#: new-fingering-engraver.cc:143
+#: new-fingering-engraver.cc:153
 msgid "music for the martians."
 msgstr ""
 
-#: new-tie-engraver.cc:166 tie-engraver.cc:217
-msgid "lonely tie"
+#: new-fingering-engraver.cc:233
+msgid "Fingerings are also not down?! Putting them down anyway."
 msgstr ""
 
-#: note-collision.cc:340
+#: new-lyric-combine-music-iterator.cc:243
+#, fuzzy, c-format
+msgid "cannot find Voice `%s'"
+msgstr "no puedo encontrar el fichero: `%s'"
+
+#: note-collision.cc:413
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "Demasiadas columnas de notas que chocan entre sí. Se las ignora."
 
-#: note-head.cc:127
+#: note-head.cc:68
 #, c-format
 msgid "note head `%s' not found"
 msgstr ""
 
-#: paper-def.cc:96
+#: open-type-font.cc:29
+#, c-format
+msgid "Cannot allocate %d bytes"
+msgstr ""
+
+#: open-type-font.cc:33
+#, c-format
+msgid "Could not load %s font table"
+msgstr ""
+
+#: open-type-font.cc:85
+#, c-format
+msgid "Unsupported font format: %s"
+msgstr ""
+
+#: open-type-font.cc:89
+#, c-format
+msgid "Unknown error: %d reading font file: %s"
+msgstr ""
+
+#: open-type-font.cc:144
 #, c-format
-msgid "paper output to `%s'..."
+msgid "FT_Get_Glyph_Name() returned error: %d"
+msgstr ""
+
+#: pango-font.cc:147
+msgid "FreeType face has no PostScript font name."
 msgstr ""
 
-#: paper-score.cc:78
+#: paper-outputter-scheme.cc:27
+#, fuzzy, c-format
+msgid "Layout output to `%s'..."
+msgstr "%s producidos en `%s'..."
+
+#: paper-score.cc:66
 #, fuzzy, c-format
 msgid "Element count %d (spanners %d) "
 msgstr "Elementos contados %d"
 
-#: paper-score.cc:83
+#: paper-score.cc:70
 #, fuzzy
 msgid "Preprocessing graphical objects..."
 msgstr "Preprocesando elementos..."
 
-#: paper-score.cc:116
-msgid "Outputting Score, defined at: "
-msgstr ""
-
-#: parse-scm.cc:79
-msgid "GUILE signaled an error for the expression begining here"
+#: parse-scm.cc:81
+msgid "GUILE signaled an error for the expression beginning here"
 msgstr ""
 
-#.
-#. We could change the current translator's id, but that would make
-#. errors hard to catch
-#.
-#. last->translator_id_string_  = get_change ()->change_to_id_string_;
-#.
-#: part-combine-music-iterator.cc:139
-#, c-format
-msgid "I'm one myself: `%s'"
-msgstr "Yo mismo soy uno: `%s'"
-
-#: part-combine-music-iterator.cc:142
-#, c-format
-msgid "none of these in my family: `%s'"
-msgstr ""
+#: pdf.cc:259
+#, fuzzy, c-format
+msgid "Can't open file %s"
+msgstr "no se puede abrir el fichero: `%s'"
 
-#: percent-repeat-engraver.cc:109
+#: percent-repeat-engraver.cc:100
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr ""
 
-#: percent-repeat-engraver.cc:163
+#: percent-repeat-engraver.cc:160
 #, fuzzy
 msgid "unterminated percent repeat"
 msgstr "prolongación sin terminar"
 
-#: percent-repeat-iterator.cc:65
+#: percent-repeat-iterator.cc:54
 msgid "no one to print a percent"
 msgstr ""
 
-#: performance.cc:51
-msgid "Track ... "
+#: performance.cc:49
+#, fuzzy
+msgid "Track..."
 msgstr "Pista ... "
 
-#: performance.cc:83
+#: performance.cc:92
 msgid "Creator: "
 msgstr "Creador: "
 
-#: performance.cc:103
+#: performance.cc:112
 #, fuzzy
 msgid "at "
 msgstr ", en "
 
-#: performance.cc:114
-#, c-format
-msgid "from musical definition: %s"
-msgstr "a partir de la definición musical: %s"
-
-#: performance.cc:169
+#: performance.cc:166
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "Salida MIDI a `%s'..."
 
-#: phrasing-slur-engraver.cc:123
+#: phrasing-slur-engraver.cc:116
 msgid "unterminated phrasing slur"
 msgstr ""
 
-#: phrasing-slur-engraver.cc:141
-msgid "can't find start of phrasing slur"
+#: piano-pedal-engraver.cc:232
+msgid "Need 3 strings for piano pedals. No pedal made. "
 msgstr ""
 
-#: piano-pedal-engraver.cc:235 piano-pedal-engraver.cc:250
-#: piano-pedal-engraver.cc:305 piano-pedal-performer.cc:82
+#: piano-pedal-engraver.cc:247 piano-pedal-engraver.cc:262
+#: piano-pedal-performer.cc:80
 #, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr ""
 
-#: piano-pedal-engraver.cc:410
-#, fuzzy
-msgid "unterminated pedal bracket"
-msgstr "prolongación sin terminar"
+#: piano-pedal-engraver.cc:313
+#, fuzzy, c-format
+msgid "can't find start of piano pedal bracket: `%s'"
+msgstr "no puedo encontrar el principio del (de)crescendo"
 
-#: property-iterator.cc:97
+#: property-iterator.cc:95
 #, c-format
 msgid "Not a grob name, `%s'."
 msgstr ""
 
-#: rest.cc:139
-#, c-format
-msgid "rest `%s' not found, "
+#: quote-iterator.cc:251
+#, fuzzy, c-format
+msgid "In quotation: junking event %s"
+msgstr "Invocando `%s'"
+
+#: relative-octave-check.cc:40
+msgid "Failed octave check, got: "
+msgstr ""
+
+#: rest-collision.cc:152
+msgid "rest direction not set.  Cannot resolve collision."
 msgstr ""
 
-#: rest-collision.cc:199
+#: rest-collision.cc:164 rest-collision.cc:207
 msgid "too many colliding rests"
 msgstr ""
 
-#: scm-option.cc:45
+#: rest.cc:141
+#, c-format
+msgid "rest `%s' not found"
+msgstr ""
+
+#: scm-option.cc:59
+#, c-format
 msgid "lilypond -e EXPR means:"
 msgstr ""
 
-#: scm-option.cc:47
+#: scm-option.cc:61
+#, c-format
 msgid "  Evalute the Scheme EXPR before parsing any .ly files."
 msgstr ""
 
-#: scm-option.cc:49
+#: scm-option.cc:63
+#, c-format
 msgid ""
 "  Multiple -e options may be given, they will be evaluated sequentially."
 msgstr ""
 
-#: scm-option.cc:51
+#: scm-option.cc:65
+#, c-format
 msgid ""
-"  The function ly-set-option allows for access to some internal variables."
+"  The function ly:set-option allows for access to some internal variables."
 msgstr ""
 
-#: scm-option.cc:53
-msgid "Usage: lilypond -e \"(ly-set-option SYMBOL VAL)\""
+#: scm-option.cc:67
+#, c-format
+msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
 msgstr ""
 
-#: scm-option.cc:55
-msgid "Where SYMBOL VAL pair is any of:"
+#: scm-option.cc:69
+#, c-format
+msgid "Use help as  SYMBOL to get online help."
 msgstr ""
 
-#: scm-option.cc:128
-msgid "Unknown internal option!"
-msgstr ""
+#: scm-option.cc:137 scm-option.cc:175
+#, fuzzy, c-format
+msgid "No such internal option: %s"
+msgstr "no hay este instrumento: `%s'"
 
-#: score.cc:85
-msgid "Interpreting music..."
-msgstr "Interpretación de la música..."
+#: score-engraver.cc:106 score-engraver.cc:115 score-engraver.cc:117
+#, fuzzy, c-format
+msgid "cannot find `%s'"
+msgstr "no se puede encontrar: `%s'"
 
-#: score.cc:97
-msgid "Need music in a score"
+#: score-engraver.cc:108
+msgid "Music font has not been installed properly.\n"
 msgstr ""
 
-#. should we? hampers debugging.
-#: score.cc:111
-msgid "Errors found/*, not processing score*/"
-msgstr ""
-"Erreurs trouvées/*, pas de traitement de la feuille de musique*/ Se han "
-"encontrado errores/*, no se procesa la partitura*/"
+#: score-engraver.cc:109
+#, fuzzy, c-format
+msgid "Search path `%s'\n"
+msgstr "(ruta de búsqueda: `%s')"
 
-#: score.cc:118
+#: score-engraver.cc:119
 #, c-format
-msgid "elapsed time: %.2f seconds"
+msgid "Install the ec-fonts-mftraced package from: %s."
 msgstr ""
 
-#: score-engraver.cc:99
-#, fuzzy, c-format
-msgid "can't find `%s'"
-msgstr "no se puede encontrar: `%s'"
+#: score-engraver.cc:122
+msgid "Aborting."
+msgstr ""
+
+#: score.cc:224
+#, fuzzy
+msgid "Already have music in score"
+msgstr "ya tengo un crescendo"
 
-#: score-engraver.cc:100
-msgid "Fonts have not been installed properly.  Aborting"
+#: score.cc:225
+msgid "This is the previous music"
 msgstr ""
 
-#: score-engraver.cc:205
-#, c-format
-msgid "unbound spanner `%s'"
+#: score.cc:230
+msgid "Error found in this music expression. Ignoring it"
 msgstr ""
 
-#: script-engraver.cc:90
-#, c-format
-msgid "Don't know how to interpret articulation `%s'"
+#. FIXME:
+#: script-engraver.cc:101
+#, fuzzy
+msgid "Do not know how to interpret articulation: "
 msgstr "No se sabe como interpretar la articulación `%s'"
 
+#: script-engraver.cc:102
+msgid "Scheme encoding: "
+msgstr ""
+
 #. this shouldn't happen, but let's continue anyway.
-#: separation-item.cc:53 separation-item.cc:101
+#: separation-item.cc:54 separation-item.cc:98
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Separation_item: He bebido demasiado"
 
-#: simple-spacer.cc:248
+#: simple-spacer.cc:506
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:141
+#: slur-engraver.cc:113
 msgid "unterminated slur"
 msgstr ""
 
-#. How to shut up this warning, when Voice_devnull_engraver has
-#. eaten start event?
-#: slur-engraver.cc:159
-msgid "can't find start of slur"
+#: slur-engraver.cc:123
+msgid "No slur to end"
 msgstr ""
 
-#: source-file.cc:67
+#: source-file.cc:47
+#, c-format
+msgid "can't open file: `%s'"
+msgstr "no se puede abrir el fichero: `%s'"
+
+#: source-file.cc:60
 #, c-format
 msgid "Huh?  Got %d, expected %d characters"
 msgstr "¿Eh? Se han obtenido %d caracteres, cuando se esperaban %d"
 
-#: spacing-spanner.cc:379
+#: spacing-spanner.cc:386
 #, c-format
-msgid "Global shortest duration is %s\n"
+msgid "Global shortest duration is %s"
+msgstr ""
+
+#: stem-engraver.cc:88
+msgid "tremolo duration is too long"
 msgstr ""
 
-#: spring-smob.cc:32
+#. FIXME:
+#: stem-engraver.cc:125
 #, c-format
-msgid "#<spring smob d= %f>"
+msgid "Adding note head to incompatible stem (type = %d)"
 msgstr ""
 
-#: staff-symbol.cc:61
-msgid "staff symbol: indentation yields beyond end of line"
+#: stem-engraver.cc:127
+msgid "Don't you want polyphonic voices instead?"
 msgstr ""
 
-#: stem.cc:118
+#: stem.cc:125
 msgid "Weird stem size; check for narrow beams"
 msgstr ""
 
-#: stem.cc:611
+#: stem.cc:579
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:624
+#: stem.cc:590
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: stem-engraver.cc:96
-msgid "tremolo duration is too long"
-msgstr ""
-
-#: stem-engraver.cc:124
-#, c-format
-msgid "Adding note head to incompatible stem (type = %d)"
-msgstr ""
-
-#: stem-engraver.cc:125
-msgid "Don't you want polyphonic voices instead?"
-msgstr ""
-
-#: streams.cc:34
-#, c-format
-msgid "can't create directory: `%s'"
-msgstr "no se puede crear el directorio: `%s'"
-
-#: streams.cc:48
-msgid "Error syncing file (disk full?)"
-msgstr ""
-
-#: system.cc:125
+#: system.cc:148
 #, c-format
 msgid "Element count %d."
 msgstr "Elementos contados %d."
 
-#: system.cc:372
+#: system.cc:301
 #, fuzzy, c-format
-msgid "Grob count %d "
+msgid "Grob count %d"
 msgstr "Elementos contados %d"
 
-#: system.cc:386
+#: system.cc:319
 #, fuzzy
 msgid "Calculating line breaks..."
 msgstr "Calculando las posiciones de las columnas"
 
-#: text-spanner-engraver.cc:81
+#: text-spanner-engraver.cc:62
 msgid "can't find start of text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:95
+#: text-spanner-engraver.cc:76
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:164
+#: text-spanner-engraver.cc:138
 msgid "unterminated text spanner"
 msgstr ""
 
-#: tfm.cc:83
-#, c-format
-msgid "can't find ascii character: %d"
-msgstr ""
-
 #. Not using ngettext's plural feature here, as this message is
 #. more of a programming error.
 #: tfm-reader.cc:108
@@ -2114,19 +1704,17 @@ msgstr ""
 msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
 msgstr ""
 
-#: tie-performer.cc:159
-msgid "No ties were created!"
+#: tfm.cc:70
+#, c-format
+msgid "can't find ascii character: %d"
 msgstr ""
 
-#: time-scaled-music-iterator.cc:25
-msgid "no one to print a tuplet start bracket"
+#: tie-engraver.cc:199
+msgid "lonely tie"
 msgstr ""
 
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#: time-signature.cc:87
-#, c-format
-msgid "time signature symbol `%s' not found; reverting to numbered style"
+#: time-scaled-music-iterator.cc:23
+msgid "no one to print a tuplet start bracket"
 msgstr ""
 
 #.
@@ -2134,196 +1722,343 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:57
+#: time-signature-engraver.cc:55
 #, c-format
 msgid "Found strange time signature %d/%d."
 msgstr ""
 
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#: time-signature.cc:85
+#, c-format
+msgid "time signature symbol `%s' not found; reverting to numbered style"
+msgstr ""
+
 #: translator-ctors.cc:53
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr "traductor desconocido: `%s'"
 
-#: translator-def.cc:105
-msgid "Program has no such type"
-msgstr "El programa no tiene este tipo"
-
-#: translator-def.cc:111
-#, c-format
-msgid "Already contains: `%s'"
-msgstr "Ya contiene: `%s'"
-
-#: translator-def.cc:112
-#, c-format
-msgid "Not adding translator: `%s'"
-msgstr "No se añade el traductor: `%s'"
-
-#: translator-def.cc:229
-#, c-format
-msgid "can't find: `%s'"
-msgstr "no se puede encontrar: `%s'"
-
-#: translator-group.cc:158
-#, c-format
-msgid "can't find or create `%s' called `%s'"
-msgstr "no se puede encontrar o crear `%s' llamado `%s'"
+#: trill-spanner-engraver.cc:70
+#, fuzzy
+msgid "can't find start of trill spanner"
+msgstr "no puedo encontrar el principio del (de)crescendo"
 
-#: translator-group.cc:230
-#, c-format
-msgid "can't find or create: `%s'"
-msgstr "no se puede encontrar o crear: `%s'"
+#: trill-spanner-engraver.cc:84
+#, fuzzy
+msgid "already have a trill spanner"
+msgstr "ya tengo un crescendo"
 
-#: vaticana-ligature.cc:49
-msgid "ascending vaticana style flexa"
-msgstr ""
+#: trill-spanner-engraver.cc:144
+#, fuzzy
+msgid "unterminated trill spanner"
+msgstr "prolongación sin terminar"
 
-#: vaticana-ligature.cc:219
-msgid "Vaticana_ligature:thickness undefined; assuming 1.4"
+#: tuplet-bracket.cc:451
+msgid "Killing tuplet bracket across linebreak."
 msgstr ""
 
-#: vaticana-ligature.cc:233
-msgid "Vaticana_ligature:x-offset undefined; assuming 0.0"
+#: vaticana-ligature-engraver.cc:341
+#, c-format
+msgid ""
+"ignored prefix (es) `%s' of this head according to restrictions of the "
+"selected ligature style"
 msgstr ""
 
-#: vaticana-ligature.cc:258
-msgid "Vaticana_ligature: (delta_pitch == 0)"
+#: vaticana-ligature-engraver.cc:571
+#, c-format
+msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
 
-#: vaticana-ligature.cc:271
-msgid "Vaticana_ligature:delta-pitch -> ignoring join"
+#: vaticana-ligature.cc:93
+msgid "ascending vaticana style flexa"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:477
-#, c-format
-msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr=%ul"
+#: vaticana-ligature.cc:182
+msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
-#: volta-engraver.cc:112
+#: volta-engraver.cc:140
 msgid "No volta spanner to end"
 msgstr ""
 
-#: volta-engraver.cc:123
+#: volta-engraver.cc:151
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr ""
 
-#: volta-engraver.cc:127
+#: volta-engraver.cc:155
 msgid "Also have a stopped spanner.  Giving up."
 msgstr ""
 
-#: parser.yy:480
+#: parser.yy:82
+msgid "Tag must be symbol or list of symbols."
+msgstr ""
+
+#: parser.yy:567
 #, fuzzy
 msgid "Identifier should have alphabetic characters only"
 msgstr "El identificativo debería contener solamente caracteres alfabéticos"
 
-#: parser.yy:779
-msgid "More alternatives than repeats.  Junking excess alternatives."
+#: parser.yy:721
+msgid "\\paper cannot be in \\score. Use \\layout instead"
 msgstr ""
 
-#: parser.yy:861 parser.yy:868
-msgid "pplycontext takes function argument"
+#: parser.yy:745
+msgid "Need \\paper for paper block."
 msgstr ""
 
-#: parser.yy:877
-msgid "Second argument must be a symbol"
-msgstr "El segundo argumento debe ser un símbolo"
-
-#: parser.yy:882
-msgid "First argument must be a procedure taking one argument"
+#: parser.yy:890
+msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 
-#: parser.yy:1009
-msgid "pply takes function argument"
+#: parser.yy:1082
+msgid "Music head function should return Music object."
 msgstr ""
 
-#: parser.yy:1501
-msgid "Expecting string as script definition"
+#: parser.yy:1354
+msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1598
-msgid "Expecting musical-pitch value"
-msgstr ""
+#: parser.yy:1714
+#, fuzzy
+msgid "Second argument must be pitch list."
+msgstr "El segundo argumento debe ser un símbolo"
 
-#: parser.yy:1609
-msgid "Must have duration object"
+#: parser.yy:1753 parser.yy:1758 parser.yy:2238
+msgid "Have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1618 parser.yy:1626
-msgid "Have to be in Lyric mode for lyrics"
+#: parser.yy:1851
+msgid "Expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1798 parser.yy:1853
+#: parser.yy:2014 parser.yy:2064
 #, c-format
 msgid "not a duration: %d"
 msgstr "no es una duración: %d"
 
-#: parser.yy:1949
+#: parser.yy:2157
 msgid "Have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:2032
+#: parser.yy:2251
 msgid "Have to be in Chord mode for chords"
 msgstr ""
 
-#: parser.yy:2171
+#: parser.yy:2403
 msgid "need integer number arg"
 msgstr ""
 
-#: parser.yy:2316
+#: parser.yy:2586
 msgid "Suspect duration found following this beam"
 msgstr ""
 
-#: lexer.ll:186
+#: lexer.ll:193
+#, fuzzy, c-format
+msgid "Renaming input to: `%s'"
+msgstr "Limpiando `%s'..."
+
+#: lexer.ll:201
+msgid "No quoted string found after \\version"
+msgstr ""
+
+#: lexer.ll:205
+msgid "No quoted string found after \\renameinput"
+msgstr ""
+
+#: lexer.ll:218
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:200
-msgid "\\maininput disallowed outside init files"
+#: lexer.ll:233
+msgid "\\maininput not allowed outside init files"
 msgstr ""
 
-#: lexer.ll:224
+#: lexer.ll:257
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "identificativo equivocado o no definido: `%s'"
 
 #. backup rule
-#: lexer.ll:233
+#: lexer.ll:266
 msgid "Missing end quote"
 msgstr ""
 
-#. backup rule
-#: lexer.ll:255 lexer.ll:259
-msgid "white expected"
-msgstr ""
-
-#: lexer.ll:268
-msgid "Can't evaluate Scheme in safe mode"
+#: lexer.ll:428
+msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:397 lexer.ll:487
-msgid "Brace found at end of lyric.  Did you forget a space?"
+#: lexer.ll:527
+msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:574
+#: lexer.ll:616
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "carácter no válido: `%c'"
 
-#: lexer.ll:651
+#: lexer.ll:702 lexer.ll:703
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:742
+#: lexer.ll:800 lexer.ll:801
 #, fuzzy, c-format
 msgid "Incorrect lilypond version: %s (%s, %s)"
 msgstr "versión de lilypond incorrecta: %s (%s, %s)"
 
-#: lexer.ll:743
+#: lexer.ll:801 lexer.ll:802
 #, fuzzy
 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:20
+#, fuzzy, lisp-format
+msgid "Invoking `~a'...n"
+msgstr "Invocando `%s'"
+
+#: backend-library.scm:26
+#, lisp-format
+msgid "Error invoking `~a'. Return value ~a"
+msgstr ""
+
+#: backend-library.scm:47
+#, fuzzy, lisp-format
+msgid "Converting to `~a'..."
+msgstr "Escribiendo `%s'..."
+
+#: clef.scm:124
+#, fuzzy, lisp-format
+msgid "Unknown clef type `~a'"
+msgstr "traductor desconocido: `%s'"
+
+#: clef.scm:125
+msgid "See scm/lily.scm for supported clefs"
+msgstr ""
+
+#: framework-tex.scm:130
+#, fuzzy, lisp-format
+msgid "Writing header field `~a' to `~a'..."
+msgstr "escribiendo el campo de cabecera `%s' a `%s'"
+
+#: framework-tex.scm:366
+#, fuzzy, lisp-format
+msgid "Converting to `~a.ps'..."
+msgstr "Escribiendo `%s'..."
+
+#: framework-tex.scm:386
+#, lisp-format
+msgid "Converting to `~a.dvi'..."
+msgstr ""
+
+#: lily.scm:94
+#, lisp-format
+msgid "wrong type for argument ~a. Expecting ~a, found ~s"
+msgstr ""
+
+#: lily.scm:312
+msgid "error: failed files: "
+msgstr ""
+
+#, fuzzy
+#~ msgid "DIM"
+#~ msgstr "DIR"
+
+#, fuzzy
+#~ msgid "write dependencies"
+#~ msgstr "añadir el prefijo DIR a las dependencias"
+
+#, fuzzy
+#~ msgid "prepend PREF before each -M dependency"
+#~ msgstr "añadir el prefijo DIR a las dependencias"
+
+#, fuzzy
+#~ msgid "don't run lilypond"
+#~ msgstr "no ejecutar LilyPond"
+
+#~ msgid "write Makefile dependencies for every input file"
+#~ msgstr "crear las dependencias para Makefile de cada fichero de entrada"
+
+#, fuzzy
+#~ msgid "invalid value: `%s'"
+#~ msgstr "valor no válido: %s"
+
+#, fuzzy
+#~ msgid "Writing HTML menu `%s'"
+#~ msgstr "Escribiendo `%s'..."
+
+#~ msgid "dependencies output to `%s'..."
+#~ msgstr "dependencias producidas en `%s'..."
+
+#, fuzzy
+#~ msgid "programming error: %s (Continuing; cross thumbs)\n"
+#~ msgstr " (Continuando; cruza los dedos)"
+
+#~ msgid "can't find character number: %d"
+#~ msgstr "no puedo encontrar el carácter número: %d"
+
+#~ msgid "can't find character called: `%s'"
+#~ msgstr "no puedo encontrar el carácter llamado: `%s'"
+
+#~ msgid "NaN"
+#~ msgstr "NaN"
+
+#, fuzzy
+#~ msgid ""
+#~ "Nothing to connect extender to on the left.  Ignoring extender event."
+#~ msgstr ""
+#~ "Nada a la izquierda a lo que conectar la prologación. Ignorando la "
+#~ "petición de prolongación."
+
+#~ msgid "couldn't find any font satisfying "
+#~ msgstr "no he podido encontrar ninguna fuente satisfactoria "
+
+#, fuzzy
+#~ msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen event."
+#~ msgstr ""
+#~ "Nada a la izquierda a lo que conectar la prologación. Ignorando la "
+#~ "petición de prolongación."
+
+#~ msgid "Score contains errors; will not process it"
+#~ msgstr "La partitura contiene errores; no será procesada."
+
+#~ msgid "Now processing: `%s'"
+#~ msgstr "Ahora en proceso: `%s'"
+
+#~ msgid "prepend DIR to dependencies"
+#~ msgstr "añadir el prefijo DIR a las dependencias"
+
+#~ msgid "inhibit file output naming and exporting"
+#~ msgstr "inhibir la denominación del fichero de salida y la exportación"
+
+#~ msgid "silly duration"
+#~ msgstr "duración ridícula"
+
+#~ msgid "I'm one myself: `%s'"
+#~ msgstr "Yo mismo soy uno: `%s'"
+
+#~ msgid "from musical definition: %s"
+#~ msgstr "a partir de la definición musical: %s"
+
+#, fuzzy
+#~ msgid "unterminated pedal bracket"
+#~ msgstr "prolongación sin terminar"
+
+#~ msgid "Errors found/*, not processing score*/"
+#~ msgstr ""
+#~ "Erreurs trouvées/*, pas de traitement de la feuille de musique*/ Se han "
+#~ "encontrado errores/*, no se procesa la partitura*/"
+
+#~ msgid "can't create directory: `%s'"
+#~ msgstr "no se puede crear el directorio: `%s'"
+
+#~ msgid "Already contains: `%s'"
+#~ msgstr "Ya contiene: `%s'"
+
+#~ msgid "Not adding translator: `%s'"
+#~ msgstr "No se añade el traductor: `%s'"
+
 #~ msgid "Fetch and rebuild from latest source package"
 #~ msgstr "Obtener y reconstruir a partir del último paquete fuente"
 
@@ -2360,15 +2095,9 @@ msgstr ""
 #~ msgid "fetch and build URL [%s]"
 #~ msgstr "obtener y construir el URL [%s]"
 
-#~ msgid "Listing `%s'..."
-#~ msgstr "Listando `%s'..."
-
 #~ msgid "latest is: %s"
 #~ msgstr "el último es: %s"
 
-#~ msgid "relax, %s is up to date"
-#~ msgstr "calma, %s está al día"
-
 #~ msgid "Fetching `%s'..."
 #~ msgstr "Obteniendo `%s'..."
 
@@ -2408,21 +2137,12 @@ msgstr ""
 #~ msgid "<stdin>"
 #~ msgstr "<stdin>"
 
-#~ msgid "programming error: "
-#~ msgstr "error de programación: "
-
 #~ msgid "unknown spacing pair `%s', `%s'"
 #~ msgstr "par de espacimiento desconocido `%s', `%s'"
 
-#~ msgid "writing header field `%s' to `%s'..."
-#~ msgstr "escribiendo el campo de cabecera `%s' a `%s'"
-
 #~ msgid "track %d:"
 #~ msgstr "pista %d:"
 
-#~ msgid "Processing..."
-#~ msgstr "Procesando..."
-
 #~ msgid "Creating voices..."
 #~ msgstr "Creando voces..."