From 429ffff9f8f480eb0e1ad1e19f55dfa699aff612 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 21 Jul 2002 02:30:19 +0000 Subject: [PATCH] * lily/beam.cc (set_stem_lengths): extend stems for gapped tremolo beams. (connect_beams): chop off beaming outside the beam. Fixes problem with tremolo beams. * lily/score-engraver.cc (initialize): error if feta20.afm --- ChangeLog | 9 + Documentation/user/refman.itely | 107 +-- input/mutopia/F.Schubert/standchen.ly | 8 +- input/regression/easy-notation.ly | 4 +- input/test/cue-notes.ly | 77 +- lily/beam-quanting.cc | 54 +- lily/beam.cc | 49 +- lily/include/beam.hh | 2 +- lily/score-engraver.cc | 7 + lily/stem-tremolo.cc | 10 +- lily/stem.cc | 97 +-- ly/engraver-init.ly | 2 + ly/grace-init.ly | 2 +- po/da.po | 452 +++++----- po/de.po | 460 +++++----- po/es.po | 1147 ++++++++++++++----------- po/fr.po | 452 +++++----- po/it.po | 458 +++++----- po/ja.po | 456 +++++----- po/lilypond.pot | 436 +++++----- po/nl.po | 452 +++++----- po/ru.po | 454 +++++----- po/sv.po | 452 +++++----- ps/music-drawing-routines.ps | 2 - 24 files changed, 3056 insertions(+), 2593 deletions(-) diff --git a/ChangeLog b/ChangeLog index a179ab4132..60b417c03c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-07-21 Jan Nieuwenhuizen + + * lily/beam.cc (set_stem_lengths): extend stems for gapped tremolo + beams. + (connect_beams): chop off beaming outside the beam. Fixes problem + with tremolo beams. + + * lily/score-engraver.cc (initialize): error if feta20.afm + 2002-07-19 Han-Wen * scm/engraver-documentation-lib.scm diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 91d0b0e3ea..93ddd5c369 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -436,8 +436,7 @@ A entirely different type of note head is the "easyplay" note head: a note head that includes a note name. It is used in some publications by Hal-Leonard Inc. music publishers. -@lilypond[singleline,verbatim] -\include "paper23.ly" +@lilypond[singleline,verbatim,26pt] \score { \notes { c'2 e'4 f' | g'1 } \paper { \translator { \EasyNotation } } @@ -445,7 +444,7 @@ Hal-Leonard Inc. music publishers. @end lilypond Note that @code{EasyNotation} overrides a @internalsref{Score} context. You -probably will want to print it with magnification to make it more +probably will want to print it with magnification or a large font size to make it more readable. @@ -3827,16 +3826,36 @@ the syntax and semantics are up for rewrite. @node Font selection @subsection Font selection -Most graphics in LilyPond are composed of characters of fonts. You can -alter the characteristics of the font by setting certain grob -properties. The mechanism that is used for this resembles La@TeX{}'s New -Font Selection Scheme. Within this scheme, a font is entirely -characterized by its font name. - -For each grob that uses fonts (in other words, each grob that supports -@code{font-interface}) a font-name must be selected before it can be -printed. The font name is selected by looking at a number of grob -properties: +The most common thing to change about the appearance of fonts is +their size. The font size of a @internalsref{Voice}, +@internalsref{Staff} or @internalsref{Thread} context, can be easily +changed by setting the @code{fontSize} property for that context: +@lilypond[fragment,relative=1] + c4 c4 \property Voice.fontSize = #-1 + f4 g4 +@end lilypond + This command will not change the size of variable symbols, such as +beams or slurs. You can use this command to get smaller symbol for +cue notes, but that involves some more subtleties. An elaborate +example of those is in @file{input/test/cue-notes.ly}. + +@cindex cue notes +@cindex font size +@cindex size + +The font used for printing a grob can be selected by setting +@code{font-name}, e.g. +@example + \property Staff.TimeSignature + \set #'font-name = #"cmr17" +@end example +You may use any font which is available to @TeX{}, such as foreign +fonts or fonts that do not belong to the Computer Modern font family. +Font selection for the standard fonts, @TeX{}'s Computer Modern fonts, +can also be adjusted with a more fine-grained mechanism. By setting +the grob properties described below, you can select a different font. +All three mechanisms work for every grob that supports +@code{font-interface}. @table @code @item font-family @@ -3844,8 +3863,8 @@ properties: @code{roman} (Computer Modern), @code{braces} (for piano staff braces), @code{music} (the standard music font), @code{ancient} (the ancient notation font) @code{dynamic} (font for dynamic signs) and -@code{typewriter} - +@code{typewriter}. + @item font-shape A symbol indicating the shape of the font, there are typically several font shapes available for each font family. Choices are @code{italic}, @@ -3867,38 +3886,29 @@ A number indicating the design size of the font. This is a feature of the Computer Modern Font: each point size has a slightly different design. Smaller design sizes are relatively wider, which enhances readability. - -@item font-name - The name of the font, as a string, e.g. @code{"cmr12"}. This overrides -all other font-qualifiers. -You may use this to use special fonts, which are not a part of the -style sheet, or which have special encodings. - @end table - -The font is selected by taking the first font that satisfies all -qualifiers specified. You can override any of these fields through -@code{\override} and @code{\revert}. The special value @code{*} matches -any value for that qualifier. The value @code{*} is needed to -override default settings which are always present. - +For any of these properties, the value @code{*} (i.e. the @em{symbol}, +@code{*}, entered as @code{#'*}), acts as a wildcard. This can be used +to override default setting, which are always present. For example: @example - \property Lyrics.LyricText \override #'font-series = #'bold - \property Lyrics.LyricText \override #'font-shape = #'* + \property Lyrics . LyricText \override #'font-series = #'bold + \property Lyrics . LyricText \override #'font-family = #'typewriter + \property Lyrics . LyricText \override #'font-shape = #'* @end example @cindex @code{font-style} -There are also pre-cooked font selection qualifiers. These are selected -through the grob property @code{font-style}. For example, the style -@code{finger} selects family @code{number} and relative size @code{-3}. -Styles available include @code{volta}, @code{finger}, @code{tuplet}, -@code{timesig}, @code{mmrest}, @code{script}, @code{large}, @code{Large} -and @code{dynamic}. +There are also pre-cooked font selection qualifiers. These are +selected through the grob property @code{font-style}. For example, +the style @code{finger} selects family @code{number} and relative size +@code{-3}. Styles available include @code{volta}, @code{finger}, +@code{tuplet}, @code{timesig}, @code{mmrest}, @code{script}, +@code{large}, @code{Large} and @code{dynamic}. The style sheets and +tables for selecting fonts are located in @file{scm/font.scm}. Refer +to this file for more information. -The style sheets and tables for selecting fonts are located in -@file{scm/font.scm}. Refer to this file for more information. +@cindex magnification The size of the font may be scaled with the grob property @code{font-magnification}. For example, @code{2.0} blows up all @@ -4171,17 +4181,18 @@ kneed stems. @cindex staff size, setting @cindex @code{paper} file -The Feta font provides musical symbols at six different sizes. These -fonts are 11 point, 13 point, 16 point, 20 point, 23 point, and 26 -point. The point size of a font is the height of the five lines in a -staff when displayed in the font. +The Feta font provides musical symbols at seven different sizes. +These fonts are 11 point, 13 point, 16 point, 19 pt, 20 point, 23 +point, and 26 point. The point size of a font is the height of the +five lines in a staff when displayed in the font. Definitions for these sizes are the files @file{paperSZ.ly}, where -@code{SZ} is one of 11, 13, 16, 20, 23 and 26. If you include any of -these files, the identifiers @code{paperEleven}, @code{paperThirteen}, -@code{paperSixteen}, @code{paperTwenty}, @code{paperTwentythree}, and -@code{paperTwentysix} are defined respectively. The default -@code{\paper} block is also set. These files should be imported at toplevel, i.e. +@code{SZ} is one of 11, 13, 16, 19, 20, 23 and 26. If you include any +of these files, the identifiers @code{paperEleven}, +@code{paperThirteen}, @code{paperSixteen}, @code{paperNineteen}, +@code{paperTwenty}, @code{paperTwentythree}, and @code{paperTwentysix} +are defined respectively. The default @code{\paper} block is also +set. These files should be imported at toplevel, i.e. @example \include "paper26.ly" \score @{ ... @} diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 22b0b11fa9..639d37b5bd 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -1,5 +1,5 @@ -% #(set! point-and-click line-column-location) +#(set! point-and-click line-column-location) instrument = "Piano" @@ -166,7 +166,7 @@ trebleVerseOne = \notes\relative c{ <{ es'( ) d4.() f8}{ c' | bes4. as8 } > % manual beam override bug % \times 2/3 { < [f( as> <)d f] > } | - \times 2/3 < { [ f( es )d ] } { as g f } > | + \times 2/3 < { [ f( es )d ] } { as' g f } > | %16 | r8 | @@ -207,7 +207,9 @@ trebleThrough = \notes \relative c'{ %61 R2. | [ <\! b16\> b'16> ] | - < { c4( )b } { c'4( )b } > \!r | + + %% score has double slur on chord. + < { c4( )b } { c'4 b } > \!r | [ d,-> > c16] | %65 diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index e3ace7caba..453542fc64 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -10,5 +10,7 @@ You also get ledger lines, of course." \score { \notes { c'2 e'4 f' | g'1 b8 } - \paper { \translator { \EasyNotation } } + \paper { \translator { \EasyNotation } + linewidth = -1. + } } diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 09f7439279..d5d03f600a 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,50 +1,41 @@ -\version "1.5.68" +\header { + texidoc = "Cue notes should be set in smaller type. Cue clefs are +usually not restored explicitly." +} -% add cue notes context -\paper { - CueVoiceContext = \translator { - \VoiceContext - \name CueVoice - NoteHead \override #'font-relative-size = #-1 - Stem \override #'font-relative-size = #-1 - Beam \override #'font-relative-size = #-1 - TextScript \override #'font-relative-size = #-1 - Slur \override #'font-relative-size = #-1 - Accidentals \override #'font-relative-size = #-1 +\score { + \notes + { + \property Staff.instrument = #"Horn in F" + \property Score.skipBars = ##t + R1*21 + < + { + \property Staff.MultiMeasureRest \override #'staff-position = #-6 + R1 + \property Voice.MultiMeasureRest \revert #'staff-position } - \translator{ \CueVoiceContext } - StaffContext = \translator{\StaffContext - \accepts "CueVoice" - } -} + \context Voice = cue { s2 + \clef tenor -\paper { - StaffContext = \translator{ - \StaffContext - \remove "Time_signature_engraver" - } - \translator { \StaffContext } - \translator{ - \VoiceContext - \remove "Auto_beam_engraver" - } - \translator { - \ScoreContext - barScriptPadding = #2.0 - markScriptPadding = #4.0 - barNumberScriptPadding = #15 - } -} - -\score{ - \notes \relative c' \context Voice - { - c4 c4 g'2 - \context CueVoice { r2 [f16 f f f] [a f f f] } - c4 c4 g'2 - } -} + %% this should probably be put into an identifier. + \property Staff.fontSize = #-1 + \property Voice.Stem \override #'length = #5.5 + \property Voice.Beam \override #'thickness = #0.384 + \property Voice.Beam \override #'space-function = + #(lambda (beam mult) (* 0.8 (Beam::space_function beam mult))) + r8^"Bsn." c'8 [f'8 f'8] + \property Staff.fontSize\unset + \property Staff . Clef = \turnOff + \clef treble + } > + c'8^"Horn" cis' + \property Staff.Clef \unset + eis'4 fis'4 + } + \paper { linewidth = -1 } +} \ No newline at end of file diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index e224ea6273..efe670738a 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -189,31 +189,31 @@ Beam::quanting (SCM smob) */ for (int i = qscores.size (); i--;) - if (qscores[i].demerits < 100) - { - qscores[i].demerits - += score_slopes_dy (me, qscores[i].yl, qscores[i].yr, - dy_mus, yr- yl, xstaff); - } + { + qscores[i].demerits + += score_slopes_dy (me, qscores[i].yl, qscores[i].yr, + dy_mus, yr- yl, xstaff); + } Real rad = Staff_symbol_referencer::staff_radius (me); int beam_count = get_beam_count (me); - Real beam_space = beam_count < 4 + Real beam_translation = beam_count < 4 ? (2*ss + slt - thickness) / 2.0 : (3*ss + slt - thickness) / 3.0; + Real reasonable_score = (knee_b) ? 200000 : 100; for (int i = qscores.size (); i--;) - if (qscores[i].demerits < 100) + if (qscores[i].demerits < reasonable_score) { qscores[i].demerits += score_forbidden_quants (me, qscores[i].yl, qscores[i].yr, - rad, slt, thickness, beam_space, + rad, slt, thickness, beam_translation, beam_count, ldir, rdir); } for (int i = qscores.size (); i--;) - if (qscores[i].demerits < 100) + if (qscores[i].demerits < reasonable_score) { qscores[i].demerits += score_stem_lengths (stems, stem_infos, @@ -251,9 +251,10 @@ Beam::score_stem_lengths (Link_arraystems, Grob*me, Real yl, Real yr) { - Real demerit_score = 0.0 ; Real pen = STEM_LENGTH_LIMIT_PENALTY; - + + Drul_array score (0, 0); + Drul_array count (0, 0); for (int i=0; i < stems.size (); i++) { Grob* s = stems[i]; @@ -268,16 +269,21 @@ Beam::score_stem_lengths (Link_arraystems, Stem_info info = stem_infos[i]; Direction d = info.dir_; - demerit_score += pen + score[d] += pen * (0 >? (info.dir_ * (info.shortest_y_ - current_y))); - demerit_score += STEM_LENGTH_DEMERIT_FACTOR + score[d] += STEM_LENGTH_DEMERIT_FACTOR * shrink_extra_weight (d * current_y - info.dir_ * info.ideal_y_); - } - demerit_score *= 2.0 / stems.size (); + count[d] ++; + } + + if(count[LEFT]) + score[LEFT] /= count[LEFT]; + if(count[RIGHT]) + score[RIGHT] /= count[RIGHT]; - return demerit_score; + return score[LEFT]+score[RIGHT]; } Real @@ -321,7 +327,7 @@ Beam::score_forbidden_quants (Grob*me, Real yl, Real yr, Real rad, Real slt, - Real thickness, Real beam_space, + Real thickness, Real beam_translation, int beam_count, Direction ldir, Direction rdir) { @@ -343,10 +349,10 @@ Beam::score_forbidden_quants (Grob*me, Real hang = 1.0 - (thickness - slt) / 2; - if (fabs (yl - ldir * beam_space) < rad + if (fabs (yl - ldir * beam_translation) < rad && fabs (my_modf (yl) - inter) < 1e-3) dem += SECONDARY_BEAM_DEMERIT; - if (fabs (yr - rdir * beam_space) < rad + if (fabs (yr - rdir * beam_translation) < rad && fabs (my_modf (yr) - inter) < 1e-3) dem += SECONDARY_BEAM_DEMERIT; @@ -363,7 +369,7 @@ Beam::score_forbidden_quants (Grob*me, // hmm, without Interval/Drul_array, you get ~ 4x same code... - if (fabs (yl - ldir * beam_space) < rad + inter) + if (fabs (yl - ldir * beam_translation) < rad + inter) { if (ldir == UP && dy <= eps && fabs (my_modf (yl) - sit) < eps) @@ -374,7 +380,7 @@ Beam::score_forbidden_quants (Grob*me, dem += SECONDARY_BEAM_DEMERIT; } - if (fabs (yr - rdir * beam_space) < rad + inter) + if (fabs (yr - rdir * beam_translation) < rad + inter) { if (rdir == UP && dy >= eps && fabs (my_modf (yr) - sit) < eps) @@ -387,7 +393,7 @@ Beam::score_forbidden_quants (Grob*me, if (beam_count >= 3) { - if (fabs (yl - 2 * ldir * beam_space) < rad + inter) + if (fabs (yl - 2 * ldir * beam_translation) < rad + inter) { if (ldir == UP && dy <= eps && fabs (my_modf (yl) - straddle) < eps) @@ -398,7 +404,7 @@ Beam::score_forbidden_quants (Grob*me, dem += SECONDARY_BEAM_DEMERIT; } - if (fabs (yr - 2 * rdir * beam_space) < rad + inter) + if (fabs (yr - 2 * rdir * beam_translation) < rad + inter) { if (rdir == UP && dy >= eps && fabs (my_modf (yr) - straddle) < eps) diff --git a/lily/beam.cc b/lily/beam.cc index f6768176db..23f38c4079 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -24,7 +24,7 @@ Notes: - Stems run to the Y-center of the beam. - - beam_space is the offset between Y centers of the beam. + - beam_translation is the offset between Y centers of the beam. */ @@ -69,8 +69,12 @@ Beam::add_stem (Grob *me, Grob *s) add_bound_item (dynamic_cast (me), dynamic_cast (s)); } + +/* + this returns the translation between 2 adjoining beams. + */ Real -Beam::get_beam_space (Grob *me) +Beam::get_beam_translation (Grob *me) { SCM func = me->get_grob_property ("space-function"); SCM s = gh_call2 (func, me->self_scm (), gh_int2scm (get_beam_count (me))); @@ -104,11 +108,11 @@ Beam::space_function (SCM smob, SCM beam_count) Real thickness = gh_scm2double (me->get_grob_property ("thickness")) * staff_space; - Real beam_space = gh_scm2int (beam_count) < 4 + Real beam_translation = gh_scm2int (beam_count) < 4 ? (2*staff_space + line - thickness) / 2.0 : (3*staff_space + line - thickness) / 3.0; - return gh_double2scm (beam_space); + return gh_double2scm (beam_translation); } @@ -213,6 +217,7 @@ Beam::connect_beams (Grob *me) } else { + gh_set_car_x ( this_beaming, SCM_EOL); SCM s = gh_cdr (this_beaming); for (; gh_pair_p (s); s = gh_cdr (s)) { @@ -221,8 +226,13 @@ Beam::connect_beams (Grob *me) last_int.add_point (np); } } + + if (i == stems.size () -1) + { + gh_set_cdr_x ( this_beaming, SCM_EOL); + } } -} + } MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1); SCM @@ -260,7 +270,7 @@ Beam::brew_molecule (SCM grob) Real dydx = dy && dx ? dy/dx : 0; Real thick = gh_scm2double (me->get_grob_property ("thickness")); - Real bdy = get_beam_space (me); + Real bdy = get_beam_translation (me); SCM last_beaming = SCM_EOL;; Real last_xposn = -1; @@ -996,7 +1006,7 @@ Beam::calc_stem_y (Grob *me, Grob* s, Grob ** common, Real xl, Real xr, Interval pos, bool french) { - Real beam_space = get_beam_space (me); + Real beam_translation = get_beam_translation (me); Real r = s->relative_coordinate (common[X_AXIS], X_AXIS) - xl; @@ -1015,13 +1025,13 @@ Beam::calc_stem_y (Grob *me, Grob* s, Grob ** common, { Slice bm = where_are_the_whole_beams (beaming); if (!bm.empty_b()) - stem_y += beam_space * bm[-my_dir]; + stem_y += beam_translation * bm[-my_dir]; } else { Slice bm = Stem::beam_multiplicity(s); if (!bm.empty_b()) - stem_y +=bm[my_dir] * beam_space; + stem_y +=bm[my_dir] * beam_translation; } Real id = me->relative_coordinate (common[Y_AXIS], Y_AXIS) @@ -1052,13 +1062,23 @@ Beam::set_stem_lengths (Grob *me) bool french = to_boolean (me->get_grob_property ("french-beaming")); - + + bool gap = false; + Real thick =0.0; + if (gh_number_p (me->get_grob_property ("gap")) + &&gh_scm2double (me->get_grob_property ("gap"))) + { + gap = true; + thick = gh_scm2double (me->get_grob_property ("thickness")) + * Staff_symbol_referencer::staff_space(me); + } + // ugh -> use commonx Grob * fvs = first_visible_stem (me); Grob *lvs = last_visible_stem (me); Real xl = fvs ? fvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; - Real xr = fvs ? lvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; + Real xr = lvs ? lvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; for (int i=0; i < stems.size (); i++) { @@ -1070,6 +1090,13 @@ Beam::set_stem_lengths (Grob *me) xl, xr, pos, french && i > 0&& (i < stems.size () -1)); + /* + Make the stems go up to the end of the beam. This doesn't matter + for normal beams, but for tremolo beams it looks silly otherwise. + */ + if (gap) + stem_y += thick * 0.5 * Directional_element_interface::get(s); + Stem::set_stemend (s, 2* stem_y / staff_space); } } diff --git a/lily/include/beam.hh b/lily/include/beam.hh index bc3fc1ea50..528348538a 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -25,7 +25,7 @@ public: static void set_beaming (Grob*,Beaming_info_list *); static void set_stemlens (Grob*); static int get_beam_count (Grob*me); - static Real get_beam_space (Grob*me); + static Real get_beam_translation (Grob*me); static void connect_beams (Grob*me); DECLARE_SCHEME_CALLBACK (space_function, (SCM, SCM)); DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM)); diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index d4d5e0aab7..c2c377fa1f 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -6,6 +6,8 @@ (c) 1997--2002 Han-Wen Nienhuys */ +#include "all-font-metrics.hh" +#include "afm.hh" #include "warn.hh" #include "main.hh" #include "system.hh" @@ -95,6 +97,11 @@ Score_engraver::finish () void Score_engraver::initialize () { + Font_metric *fm = + all_fonts_global_p->find_afm("feta20"); + if (!fm) + error (_("Could not find feta20.afm. Fonts have not been installed properly; Aborting")); + unsmob_translator_def (definition_)->apply_property_operations (this); assert (dynamic_cast (output_def_l_)); diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 24f15420f0..7151943e7a 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -107,13 +107,13 @@ Stem_tremolo::brew_molecule (SCM smob) --hwn. */ - Real beam_space = beam ? Beam::get_beam_space (beam) : 0.81; + Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81; Molecule mol; for (int i = 0; i < tremolo_flags; i++) { Molecule b (a); - b.translate_axis (beam_space * i, Y_AXIS); + b.translate_axis (beam_translation * i, Y_AXIS); mol.add_molecule (b); } Direction stemdir = Stem::get_direction (stem); @@ -137,7 +137,7 @@ Stem_tremolo::brew_molecule (SCM smob) Real end_y = Stem::stem_end_position (stem) *ss/2 - stemdir * (beams_i * beamthickness - + ((beams_i -1) >? 0) * beam_space); + + ((beams_i -1) >? 0) * beam_translation); /* the 0.33 ss is to compensate for the size of the note head @@ -145,7 +145,7 @@ Stem_tremolo::brew_molecule (SCM smob) Real chord_start_y = Stem::chord_start_y (stem) + 0.33 * ss * stemdir; - Real padding = beam_space; + Real padding = beam_translation; /* if there is not enough space, center on remaining space, @@ -157,7 +157,7 @@ Stem_tremolo::brew_molecule (SCM smob) } else { - mol.translate_axis (end_y - stemdir * beam_space + mol.translate_axis (end_y - stemdir * beam_translation -mol_ext [stemdir] , Y_AXIS); } diff --git a/lily/stem.cc b/lily/stem.cc index 4803c3ba06..ffd07ffcfd 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -760,6 +760,19 @@ Stem::beam_l (Grob*me) return unsmob_grob (b); } +/* + return I-th element, or last elt L + + PRE: length (L) > 0 + */ +SCM +robust_list_ref(int i, SCM l) +{ + while (i-- && gh_pair_p (gh_cdr(l))) + l = gh_cdr (l); + + return gh_car(l); +} // ugh still very long. Stem_info @@ -804,55 +817,37 @@ Stem::calc_stem_info (Grob*me) Real half_space = staff_space / 2; Grob * beam = beam_l (me); - int beam_count = Beam::get_beam_count (beam); - Real beam_space_f = Beam::get_beam_space (beam); - + int beam_count = beam_multiplicity(me).length()+1; + Real beam_translation_f = Beam::get_beam_translation (beam); Real thick = gh_scm2double (beam->get_grob_property ("thickness")); - Real ideal_y = chord_start_y (me); /* from here on, calculate as if dir == UP */ ideal_y *= mydir; SCM grace_prop = me->get_grob_property ("grace"); + bool grace_b = to_boolean (grace_prop); - - Array a; - SCM s; - - s = me->get_grob_property ("beamed-minimum-lengths"); - a.clear (); - for (SCM q = s; q != SCM_EOL; q = ly_cdr (q)) - a.push (gh_scm2double (ly_car (q))); - - - Real minimum_length = a[beam_count get_grob_property ("beamed-lengths"); - - a.clear (); - for (SCM q = s; q != SCM_EOL; q = ly_cdr (q)) - a.push (gh_scm2double (ly_car (q))); + SCM bml = robust_list_ref ( beam_count , + me->get_grob_property ("beamed-minimum-lengths")); - Real stem_length = a[beam_count get_grob_property ("beamed-lengths")); + Real stem_length = gh_scm2double(bl) * staff_space; - Grob *fvs = Beam::first_visible_stem (beam); + ideal_y += thick + (beam_count - 1) * beam_translation_f; - /* - Let's hope people don't use kneed tremolo beams. - */ - Direction first_dir = fvs ? Directional_element_interface::get(fvs) : mydir; - - // FIXME, hairy. see beam::calc_stem_y, for knees it's not trival - // to calculate where secondary, ternary beams will go. - if (beam_count && first_dir == mydir) - ideal_y += thick + (beam_count - 1) * beam_space_f; + + Real shortest_y = ideal_y + minimum_length + + (beam_count > 0) ? thick : 0 + + beam_translation_f * (beam_count - 1); + ideal_y += stem_length; - Real shortest_y = ideal_y -stem_length + minimum_length; - /* lowest beam of (UP) beam must never be lower than second staffline @@ -870,39 +865,29 @@ Stem::calc_stem_info (Grob*me) staffline lowest beam of (UP) beam must never be lower than second staffline */ +#if 0 shortest_y = shortest_y >? 0 >? (- 2 * half_space - thick + (beam_count > 0) * thick - + beam_space_f * (beam_count - 1)); + + beam_translation_f * (beam_count - 1)); + +#else + ideal_y = + ideal_y >? 0 + >? (- 2 * half_space - thick + + (beam_count > 0) * thick + + beam_translation_f * (beam_count - 1)); +#endif + } - ideal_y = ideal_y >? shortest_y; - - s = beam->get_grob_property ("shorten"); + // ideal_y = ideal_y >? shortest_y; + SCM s = beam->get_grob_property ("shorten"); if (gh_number_p (s)) ideal_y -= gh_scm2double (s); -#if 0 - Grob *common = me->common_refpoint (beam, Y_AXIS); - - /* - UGH -> THIS CAUSES ASYMETRY: the same beam can start/end on - different staffs. - - TODO: the beam calculation should probably also use - relative_coordinate() for the Y positions of all beams. - - - */ - Real interstaff_f = mydir * - (me->relative_coordinate (common, Y_AXIS) - - beam->relative_coordinate (common, Y_AXIS)); - - ideal_y += interstaff_f; - shortest_y += interstaff_f; -#endif ideal_y *= mydir; shortest_y *= mydir; diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index d46715e8b5..0436a5e60f 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -184,6 +184,8 @@ ThreadContext = \translator{ } + + GrandStaffContext=\translator{ \type "Engraver_group_engraver" \name GrandStaff diff --git a/ly/grace-init.ly b/ly/grace-init.ly index 3465026455..96f3d4073e 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,7 +1,7 @@ startGraceMusic = { \property Voice.Stem \override #'direction = #1 - \property Voice.Stem \override #'length = #6 + \property Voice.Stem \override #'length = #5.5 \property Voice.Stem \override #'lengths = #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0)) \property Voice.Stem \override #'beamed-lengths = diff --git a/po/da.po b/po/da.po index 66f1c701fd..faf441e80b 100644 --- a/po/da.po +++ b/po/da.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.4.6\n" -"POT-Creation-Date: 2002-06-13 17:14+0200\n" +"POT-Creation-Date: 2002-07-21 01:00+0200\n" "PO-Revision-Date: 2001-09-22 21:00+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -13,196 +13,205 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: lilypond-book.py:1171 ly2dvi.py:439 ly2dvi.py:465 +#: lilypond-book.py:1011 ly2dvi.py:442 ly2dvi.py:468 #, c-format msgid "Running %s..." msgstr "Kør %s..." -#: ly2dvi.py:126 midi2ly.py:148 update-lily.py:137 input.cc:87 +#: ly2dvi.py:126 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " msgstr "advarsel: " -#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:782 ly2dvi.py:800 midi2ly.py:163 -#: midi2ly.py:1012 midi2ly.py:1081 update-lily.py:152 update-lily.py:458 -#: input.cc:92 +#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:813 ly2dvi.py:831 midi2ly.py:163 +#: midi2ly.py:1012 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160 +#: update-lily.py:152 update-lily.py:458 input.cc:92 msgid "error: " msgstr "fejl: " -#: ly2dvi.py:144 midi2ly.py:164 update-lily.py:153 +#: ly2dvi.py:144 midi2ly.py:164 mup2ly.py:161 update-lily.py:153 msgid "Exiting ... " msgstr "Afslutter... " -#: ly2dvi.py:202 midi2ly.py:222 update-lily.py:211 +#: ly2dvi.py:202 midi2ly.py:222 mup2ly.py:219 update-lily.py:211 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Brug: %s [FLAG]... FIL" -#: ly2dvi.py:206 midi2ly.py:226 update-lily.py:215 main.cc:152 +#: ly2dvi.py:206 midi2ly.py:226 mup2ly.py:223 update-lily.py:215 main.cc:158 msgid "Options:" msgstr "Flag:" -#: ly2dvi.py:210 midi2ly.py:230 update-lily.py:219 main.cc:169 +#: ly2dvi.py:210 midi2ly.py:230 mup2ly.py:227 update-lily.py:219 main.cc:175 #, c-format msgid "Report bugs to %s" msgstr "" "Rapportér programfejl til %s\n" "Rapportér fejl i oversættelsen til " -#: ly2dvi.py:238 midi2ly.py:258 update-lily.py:247 +#: ly2dvi.py:238 midi2ly.py:258 mup2ly.py:255 update-lily.py:247 #, c-format msgid "Invoking `%s'" msgstr "Starter \"%s\"" -#: ly2dvi.py:243 midi2ly.py:262 update-lily.py:251 +#: ly2dvi.py:243 midi2ly.py:262 mup2ly.py:260 update-lily.py:251 #, c-format msgid "command exited with value %d" msgstr "kommandoen afsluttede med værdi %d" -#: ly2dvi.py:245 midi2ly.py:264 update-lily.py:253 +#: ly2dvi.py:246 midi2ly.py:264 mup2ly.py:263 update-lily.py:253 msgid "(ignored)" msgstr "(ignoreret)" # hær er det spørg om rensning af en temporærkatalog -#: ly2dvi.py:255 midi2ly.py:274 update-lily.py:263 +#: ly2dvi.py:256 midi2ly.py:274 mup2ly.py:273 update-lily.py:263 #, c-format msgid "Cleaning %s..." msgstr "Renser %s..." -#: ly2dvi.py:325 +#: ly2dvi.py:326 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "Generér .dvi med LaTeX for LilyPond" -#: ly2dvi.py:328 main.cc:116 +#: ly2dvi.py:329 main.cc:117 msgid "write Makefile dependencies for every input file" msgstr "skriv Makefile-afhængigheder for hver inddatafil" # forklaring af flag -h -#: ly2dvi.py:329 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:112 +#: ly2dvi.py:330 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:113 msgid "this help" msgstr "denne hjælp" -#: ly2dvi.py:330 main.cc:114 main.cc:119 +#: ly2dvi.py:331 main.cc:115 main.cc:120 msgid "DIR" msgstr "KATALOG" -#: ly2dvi.py:330 +#: ly2dvi.py:331 msgid "add DIR to LilyPond's search path" msgstr "tilføj KATALOG til LilyPonds søgesti" # %s er programmets navn -#: ly2dvi.py:331 +#: ly2dvi.py:332 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "behold al uddata, og navngiv kataloget %s.dir" -#: ly2dvi.py:332 +#: ly2dvi.py:333 msgid "don't run LilyPond" msgstr "kør ikke LilyPond" -#: ly2dvi.py:333 main.cc:117 +#: ly2dvi.py:334 main.cc:118 msgid "produce MIDI output only" msgstr "lav kun MIDI-uddata" -#: ly2dvi.py:334 ly2dvi.py:335 midi2ly.py:100 main.cc:115 main.cc:118 +#: ly2dvi.py:335 ly2dvi.py:336 midi2ly.py:100 main.cc:116 main.cc:119 msgid "FILE" msgstr "FIL" -#: ly2dvi.py:334 midi2ly.py:100 +#: ly2dvi.py:335 midi2ly.py:100 msgid "write ouput to FILE" msgstr "skriv uddata til FIL" -#: ly2dvi.py:335 +#: ly2dvi.py:336 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:337 +#: ly2dvi.py:338 msgid "Make a picture of the first system." msgstr "" -#: ly2dvi.py:338 +#: ly2dvi.py:339 msgid "Set the resolution of the preview to RES." msgstr "" -#: ly2dvi.py:339 +#: ly2dvi.py:340 msgid "generate PostScript output" msgstr "lav PostScript-uddata" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "KEY=VAL" msgstr "NØGLE=VÆRDI" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "change global setting KEY to VAL" msgstr "ændr global indstilling NØGLE til VÆRDI" # Førklaring til --verbose (borde være længre) -#: ly2dvi.py:341 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:122 +#: ly2dvi.py:342 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:128 msgid "verbose" msgstr "udførlig uddata" -#: ly2dvi.py:342 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:121 +#: ly2dvi.py:343 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:127 msgid "print version number" msgstr "vis versionsnummer" -#: ly2dvi.py:343 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:123 +#: ly2dvi.py:344 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:129 msgid "show warranty and copyright" msgstr "vis garanti og copyright" -#: ly2dvi.py:429 +#: ly2dvi.py:432 #, c-format msgid "no such setting: %s" msgstr "indstillingen findes ikke: %s" -#: ly2dvi.py:480 +#: ly2dvi.py:497 #, c-format msgid "Analyzing %s..." msgstr "Analyserer %s..." -#: ly2dvi.py:536 +#: ly2dvi.py:553 #, c-format msgid "no lilypond output found for %s" msgstr "ingen lilyponduddata fundet for %s" -#: ly2dvi.py:576 +#: ly2dvi.py:593 #, c-format msgid "invalid value: %s" msgstr "ugyldigt værdi: %s" -#: ly2dvi.py:782 +#: ly2dvi.py:698 +msgid "LaTeX failed on the output file." +msgstr "" + +#: ly2dvi.py:700 +#, c-format +msgid " % logstr))" +msgstr "" + +#: ly2dvi.py:813 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "kan ikke åbne fil: \"%s\"" -#: ly2dvi.py:800 midi2ly.py:1012 update-lily.py:458 +#: ly2dvi.py:831 midi2ly.py:1012 update-lily.py:458 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:887 +#: ly2dvi.py:918 #, fuzzy, c-format msgid "filename should not contain spaces: `%s'" msgstr "Indholder allerede: \"%s\"" # hær er det spørg om skrivning til en fil -#: ly2dvi.py:957 scores.cc:46 +#: ly2dvi.py:988 scores.cc:46 #, c-format msgid "dependencies output to `%s'..." msgstr "afhængigheder udskrevet til \"%s\"..." # hær er det spørg om skrivning til en fil (første parametern er t.ex # DVI, LATEX, MIDI, TEX) -#: ly2dvi.py:968 midi2ly.py:996 +#: ly2dvi.py:999 midi2ly.py:996 #, c-format msgid "%s output to `%s'..." msgstr "%s udskrevet til \"%s\"..." -#: ly2dvi.py:970 includable-lexer.cc:49 lily-guile.cc:135 scores.cc:137 +#: ly2dvi.py:1001 includable-lexer.cc:49 lily-guile.cc:160 scores.cc:137 #: scores.cc:143 #, c-format msgid "can't find file: `%s'" msgstr "kan ikke finde fil: \"%s\"" -#: ly2dvi.py:978 midi2ly.py:1081 +#: ly2dvi.py:1009 midi2ly.py:1081 msgid "no files specified on command line." msgstr "ingen filer angivne på kommandolinjen." @@ -269,7 +278,7 @@ msgstr "fejls msgid "define macro NAME [optional expansion EXP]" msgstr "definér makro NAVN [valfri makroudvidelse EXP]" -#: mup2ly.py:75 main.cc:118 +#: mup2ly.py:75 main.cc:119 msgid "write output to FILE" msgstr "skriv uddata til FIL" @@ -277,17 +286,17 @@ msgstr "skriv uddata til FIL" msgid "only pre-process" msgstr "kun forbehandling" -#: mup2ly.py:827 +#: mup2ly.py:1073 #, c-format msgid "no such context: %s" msgstr "omgivelse findes ikke: %s" -#: mup2ly.py:1051 +#: mup2ly.py:1297 #, c-format msgid "Processing `%s'..." msgstr "Behandler \"%s\"..." -#: mup2ly.py:1070 +#: mup2ly.py:1316 #, c-format msgid "Writing `%s'..." msgstr "Skriver \"%s\"..." @@ -369,22 +378,22 @@ msgstr "Henter \"%s\"..." msgid "Building `%s'..." msgstr "Bygger \"%s\"..." -#: getopt-long.cc:145 +#: getopt-long.cc:146 #, c-format msgid "option `%s' requires an argument" msgstr "flag \"%s\" kræver et argument" -#: getopt-long.cc:149 +#: getopt-long.cc:150 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "flag.gan \"%s\" tillader intet argument" -#: getopt-long.cc:153 +#: getopt-long.cc:154 #, c-format msgid "unrecognized option: `%s'" msgstr "ukendt flag: \"%s\"" -#: getopt-long.cc:160 +#: getopt-long.cc:161 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "ugyldigt argument \"%s\" til flag \"%s\"" @@ -393,7 +402,7 @@ msgstr "ugyldigt argument \"%s\" til flag \"%s\"" msgid "non fatal error: " msgstr "ikke-fatal fejl: " -#: input.cc:106 source-file.cc:63 source-file.cc:156 +#: input.cc:106 source-file.cc:68 source-file.cc:161 msgid "position unknown" msgstr "ukendt position" @@ -403,7 +412,7 @@ msgid "can't map file" msgstr "kan ikke lave \"mmap\" på filen" #: mapped-file-storage.cc:87 simple-file-storage.cc:44 scores.cc:50 -#: streams.cc:37 +#: streams.cc:38 #, c-format msgid "can't open file: `%s'" msgstr "kan ikke åbne fil: \"%s\"" @@ -413,37 +422,37 @@ msgstr "kan ikke msgid "Huh? Got %d, expected %d characters" msgstr "Øh? Fik %d, forventede %d tegn" -#: warn.cc:10 warn.cc:17 -#, fuzzy, c-format -msgid "error: %s\n" -msgstr "fejl: " - -#: warn.cc:23 +#: warn.cc:24 #, fuzzy, c-format msgid "warning: %s\n" msgstr "advarsel: " -#: warn.cc:35 +#: warn.cc:30 +#, fuzzy, c-format +msgid "error: %s\n" +msgstr "fejl: " + +#: warn.cc:43 #, fuzzy, c-format msgid "programming error: %s (Continuing; cross thumbs)\n" msgstr " (Fortsætter, kryds fingrene)" -#: accidental-engraver.cc:174 +#: accidental-engraver.cc:181 new-accidental-engraver.cc:234 #, c-format msgid "Accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:199 +#: accidental-engraver.cc:206 new-accidental-engraver.cc:259 #, fuzzy, c-format msgid "unknown accidental typesetting: %s. Ignored" msgstr "ukendt \"escaped\" streng: \"\\%s\"" -#: accidental-engraver.cc:215 +#: accidental-engraver.cc:222 new-accidental-engraver.cc:275 #, c-format msgid "Symbol is not a parent context: %s. Ignored" msgstr "" -#: accidental-engraver.cc:218 +#: accidental-engraver.cc:225 new-accidental-engraver.cc:278 #, c-format msgid "Accidental typesetting must be pair or context-name: %s" msgstr "" @@ -504,7 +513,7 @@ msgstr "(s msgid "Giving up" msgstr "Giver op" -#: auto-change-iterator.cc:43 change-iterator.cc:59 +#: auto-change-iterator.cc:43 change-iterator.cc:60 #: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "Kan ikke skifte oversætter, jeg er her allerede" @@ -514,23 +523,7 @@ msgstr "Kan ikke skifte overs msgid "barcheck failed at: %s" msgstr "taktkontrol mislykkedes ved: %s" -#: beam.cc:153 -#, fuzzy -msgid "beam has less than two visible stems" -msgstr "bjælke har mindre end to nodehalse" - -#: beam.cc:158 -#, fuzzy -msgid "Beam has less than two stems. Removing beam." -msgstr "bjælke har mindre end to nodehalse" - -#: beam.cc:892 -msgid "" -"Not sure that we can find a nice beam slope (no viable initial configuration " -"found)." -msgstr "" - -#: beam-engraver.cc:166 +#: beam-engraver.cc:167 msgid "already have a beam" msgstr "har allerede en bjælke" @@ -538,7 +531,7 @@ msgstr "har allerede en bj msgid "unterminated beam" msgstr "uafsluttet bjælke" -#: beam-engraver.cc:267 chord-tremolo-engraver.cc:185 +#: beam-engraver.cc:267 chord-tremolo-engraver.cc:175 msgid "stem must have Rhythmic structure" msgstr "nodehals skal have en rytmisk struktur" @@ -550,12 +543,28 @@ msgstr "nodehalsen passer ikke i bj msgid "beam was started here" msgstr "bjælken startede her" +#: beam.cc:138 +#, fuzzy +msgid "beam has less than two visible stems" +msgstr "bjælke har mindre end to nodehalse" + +#: beam.cc:143 +#, fuzzy +msgid "Beam has less than two stems. Removing beam." +msgstr "bjælke har mindre end to nodehalse" + +#: beam.cc:797 +msgid "" +"Not sure that we can find a nice beam slope (no viable initial configuration " +"found)." +msgstr "" + #: break-align-interface.cc:166 #, fuzzy, c-format msgid "No spacing entry from %s to `%s'" msgstr "Tilføjer ikke oversætter: \"%s\"" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "kan ikke ændre \"%s\" til \"%s\"" @@ -566,14 +575,22 @@ msgstr "kan ikke #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:78 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "Jeg er selv én" -#: change-iterator.cc:81 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "ingen af disse i min familie" +#: chord-tremolo-engraver.cc:137 percent-repeat-engraver.cc:182 +msgid "unterminated chord tremolo" +msgstr "ikke-afsluttet akkordtremolo" + +#: chord-tremolo-iterator.cc:50 +msgid "no one to print a tremolos" +msgstr "der er ingen som kan skrive en tremolo" + #: chord.cc:313 #, c-format msgid "invalid subtraction: not part of chord: %s" @@ -585,36 +602,28 @@ msgstr "ugyldig subtraktion: ikke del af akkord: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "ugyldig tone for inversion: ikke del af en akkord: %s" -#: chord-tremolo-engraver.cc:142 percent-repeat-engraver.cc:182 -msgid "unterminated chord tremolo" -msgstr "ikke-afsluttet akkordtremolo" - -#: chord-tremolo-iterator.cc:49 -msgid "no one to print a tremolos" -msgstr "der er ingen som kan skrive en tremolo" - #: dimensions.cc:13 msgid "NaN" msgstr "-" -#: dynamic-engraver.cc:189 span-dynamic-performer.cc:82 +#: dynamic-engraver.cc:187 span-dynamic-performer.cc:82 msgid "can't find start of (de)crescendo" msgstr "kan ikke finde starten på crescendo/diminuendo" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:211 msgid "already have a crescendo" msgstr "har allerede et crescendo" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:212 msgid "already have a decrescendo" msgstr "har allerede et diminuendo" -#: dynamic-engraver.cc:217 +#: dynamic-engraver.cc:215 #, fuzzy msgid "Cresc started here" msgstr "bjælken startede her" -#: dynamic-engraver.cc:309 +#: dynamic-engraver.cc:307 msgid "unterminated (de)crescendo" msgstr "uafsluttet crescendo/diminuendo" @@ -632,11 +641,11 @@ msgstr "" msgid "no one to print a repeat brace" msgstr "det er ingen som kan skrive et gentagelsestegn" -#: font-interface.cc:241 +#: font-interface.cc:238 msgid "couldn't find any font satisfying " msgstr "kunne ikke finde nogen skrifttype som opfylder " -#: gourlay-breaking.cc:170 +#: gourlay-breaking.cc:171 msgid "No feasible line breaking found" msgstr "Ingen mulig linjebrydning fandtes" @@ -707,12 +716,12 @@ msgstr "" msgid "ligature was started here" msgstr "bjælken startede her" -#: lily-guile.cc:137 +#: lily-guile.cc:162 #, c-format msgid "(load path: `%s')" msgstr "(indlæsningssøgesti: \"%s\"" -#: lily-guile.cc:664 +#: lily-guile.cc:697 #, fuzzy, c-format msgid "" "Can't find property type-check for `%s' (%s). Perhaps you made a typing " @@ -721,7 +730,7 @@ msgstr "" "Kan ikke finde egenskabstypekontrol for \"%s\". Måske har du lavet en " "tastefejl? Laver tildeling alligevel." -#: lily-guile.cc:682 +#: lily-guile.cc:715 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" @@ -735,71 +744,74 @@ msgstr "" msgid "round filled box vertical extent smaller than blot; decreasing blot" msgstr "" -#: lyric-phrasing-engraver.cc:279 +#: lyric-phrasing-engraver.cc:301 msgid "lyrics found without any matching notehead" msgstr "tekst fundet uden noget matchende nodehoved" -#: lyric-phrasing-engraver.cc:284 +#: lyric-phrasing-engraver.cc:307 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "Øh? Melismatisk node har tilhørende tekst." #. print example usage: lilypond -e "" ? -#: main.cc:108 +#: main.cc:109 msgid "EXPR" msgstr "UDTR" -#: main.cc:108 +#: main.cc:109 msgid "Scheme options: try -e \"(set-lily-option 'help 0)\" for more help." msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:111 +#: main.cc:112 msgid "EXT" msgstr "FMT" -#: main.cc:111 +#: main.cc:112 #, fuzzy msgid "use output format EXT (tex [default], pdftex, ps, scm or as)" msgstr "brug uddataformat FMT (scm, ps, tex eller as)" -#: main.cc:113 +#: main.cc:114 msgid "FIELD" msgstr "FELT" -#: main.cc:113 +#: main.cc:114 msgid "write header field to BASENAME.FIELD" msgstr "skriv rubrikfælt til BASNAVN.FELT" -#: main.cc:114 +#: main.cc:115 msgid "add DIR to search path" msgstr "tilføj KATALOG til søgestien" -#: main.cc:115 +#: main.cc:116 msgid "use FILE as init file" msgstr "brug FIL som init-fil" -#: main.cc:119 +#: main.cc:120 msgid "prepend DIR to dependencies" msgstr "tilføj KATALOG efter afhængigheder" -#: main.cc:120 +#. +#. should audit again. +#. +#: main.cc:125 msgid "inhibit file output naming and exporting" msgstr "hindr navngivning af filuddata og eksportering" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:140 +#: main.cc:146 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Brug: %s [FLAG]... FIL..." -#: main.cc:142 +#: main.cc:148 msgid "Typeset music and or play MIDI from FILE" msgstr "Typesæt musik og/eller afspil MIDI fra FIL" -#: main.cc:146 +#: main.cc:152 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" @@ -809,11 +821,11 @@ msgstr "" "højniveaubeskrivning af musikken i en fil. LilyPond er en del af\n" "GNU-projektet.\n" -#: main.cc:156 +#: main.cc:162 msgid "This binary was compiled with the following options:" msgstr "Dette program blev oversat med følgende flag:" -#: main.cc:177 +#: main.cc:183 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -824,16 +836,16 @@ msgstr "" "og du må ændre og/eller distribuere kopier af det under visse\n" "betingelser. Kør \"%s --warranty\" for mere information.\n" -#: main.cc:184 main.cc:196 +#: main.cc:190 main.cc:202 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright © %s af" -#: main.cc:194 +#: main.cc:200 msgid "GNU LilyPond -- The music typesetter" msgstr "GNU Lilypond -- Musiktypesætteren" -#: main.cc:202 +#: main.cc:208 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" @@ -862,6 +874,26 @@ msgstr "" "dette program. Hvis ikke, skriv til Free Software Foundation, Inc., 59\n" "Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n" +#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 +msgid "unexpected case fall-through" +msgstr "" + +#: mensural-ligature-engraver.cc:332 +msgid "ligature with less than 2 heads -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:347 +msgid "can not determine pitch of ligature primitive -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:370 +msgid "prime interval within ligature -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:380 +msgid "mensural ligature: duration none of L, B, S -> skipping" +msgstr "" + #: mensural-ligature.cc:152 #, c-format msgid "Mensural_ligature: thickness undefined on flexa %d; assuming 1.4" @@ -885,26 +917,6 @@ msgstr "" msgid "Menusral_ligature: (join_left == 0)" msgstr "" -#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 -msgid "unexpected case fall-through" -msgstr "" - -#: mensural-ligature-engraver.cc:332 -msgid "ligature with less than 2 heads -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:347 -msgid "can not determine pitch of ligature primitive -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:370 -msgid "prime interval within ligature -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:380 -msgid "mensural ligature: duration none of L, B, S -> skipping" -msgstr "" - #: midi-item.cc:144 #, c-format msgid "no such instrument: `%s'" @@ -918,22 +930,22 @@ msgstr "t msgid "silly pitch" msgstr "tåbelig tone" -#: music.cc:152 -#, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponering med %s gør accicental større end to" - #: music-output-def.cc:113 #, c-format msgid "can't find `%s' context" msgstr "kan ikke finde omgivelsen \"%s\"" -#: my-lily-lexer.cc:141 +#: music.cc:159 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponering med %s gør accicental større end to" + +#: my-lily-lexer.cc:142 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Identificerernavn er et nøgleord: \"%s\"" -#: my-lily-lexer.cc:161 +#: my-lily-lexer.cc:162 #, c-format msgid "error at EOF: %s" msgstr "fejl ved filslutning: %s" @@ -946,7 +958,7 @@ msgstr "Tolker..." msgid "Braces don't match" msgstr "Krølleparenteser passer ikke" -#: note-collision.cc:332 +#: note-collision.cc:340 msgid "Too many clashing notecolumns. Ignoring them." msgstr "For mange sammenhængende nodekolonner. Ignorerer dem." @@ -968,7 +980,7 @@ msgstr "papirsuddata til \"%s\"..." msgid ", at " msgstr ", ved " -#: paper-score.cc:76 system.cc:346 +#: paper-score.cc:76 #, c-format msgid "Element count %d " msgstr "Elementantal %d " @@ -1042,7 +1054,7 @@ msgstr "kan ikke finde start p msgid "can't find start of piano pedal: `%s'" msgstr "kan ikke finde start på pianopedal: \"%s\"" -#: piano-pedal-engraver.cc:402 +#: piano-pedal-engraver.cc:404 #, fuzzy msgid "unterminated pedal bracket" msgstr "uafsluttet bjælke" @@ -1088,37 +1100,47 @@ msgstr "" msgid "too many colliding rests" msgstr "for mange kolliderende pauser" -#: scm-option.cc:75 +#: scm-option.cc:77 msgid "lilypond -e EXPR means" msgstr "" -#: scm-option.cc:121 +#: scm-option.cc:123 msgid "Unknown internal option!" msgstr "" -#: score.cc:91 +#: score-engraver.cc:103 +msgid "" +"Could not find feta20.afm. Fonts have not been installed properly; Aborting" +msgstr "" + +#: score-engraver.cc:207 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ubunden bro \"%s\"" + +#: score.cc:93 +#, c-format +msgid "stack size cur %d, max %d\n" +msgstr "" + +#: score.cc:110 msgid "Interpreting music..." msgstr "Tolker musik..." -#: score.cc:105 +#: score.cc:123 msgid "Need music in a score" msgstr "Behøver musik i partitur" #. should we? hampers debugging. -#: score.cc:118 +#: score.cc:136 msgid "Errors found/*, not processing score*/" msgstr "Fejl fundne/*, behandler ikke partitur*/" -#: score.cc:125 +#: score.cc:143 #, c-format msgid "elapsed time: %.2f seconds" msgstr "tidsforbrug: %.2f sekunder" -#: score-engraver.cc:181 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ubunden bro \"%s\"" - #: scores.cc:107 msgid "Score contains errors; will not process it" msgstr "Partitur indholder fejl; vil ikke behandle det" @@ -1143,15 +1165,6 @@ msgstr "Separation_item: Jeg har drukket for meget" msgid "No spring between column %d and next one" msgstr "" -#: slur.cc:53 -#, fuzzy -msgid "Putting slur over rest." -msgstr "Sætter bue over pause. Ignorerer." - -#: slur.cc:417 -msgid "Slur over rest?" -msgstr "Bue over pause?" - #: slur-engraver.cc:124 msgid "unterminated slur" msgstr "uafsluttet bue" @@ -1162,46 +1175,61 @@ msgstr "uafsluttet bue" msgid "can't find start of slur" msgstr "kan ikke finde start på bue" +#: slur.cc:53 +#, fuzzy +msgid "Putting slur over rest." +msgstr "Sætter bue over pause. Ignorerer." + +#: slur.cc:417 +msgid "Slur over rest?" +msgstr "Bue over pause?" + +#: spacing-spanner.cc:382 +#, c-format +msgid "Global shortest duration is %s\n" +msgstr "" + #: spring-smob.cc:32 #, c-format msgid "#" msgstr "" -#: staff-symbol.cc:60 +#: staff-symbol.cc:62 msgid "staff symbol: indentation yields beyond end of line" msgstr "" -#: stem.cc:121 -msgid "Weird stem size; check for narrow beams" -msgstr "Mærkelig nodehalsstørrelse; tjek for smalle bjælker" - #: stem-engraver.cc:117 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Tilføjer nodehoved til inkompatibel bue (type = %d)" -#: streams.cc:33 +#: stem.cc:118 +msgid "Weird stem size; check for narrow beams" +msgstr "Mærkelig nodehalsstørrelse; tjek for smalle bjælker" + +#: streams.cc:34 #, c-format msgid "can't create directory: `%s'" msgstr "kan ikke oprette katalog: \"%s\"" -#: streams.cc:47 +#: streams.cc:48 msgid "Error syncing file (disk full?)" msgstr "Fejl ved synkning af fil (disken fuld?)" -#: system.cc:93 +#: system.cc:109 #, c-format msgid "Element count %d." msgstr "Elementantal %d." -#: system.cc:360 +#: system.cc:362 +#, fuzzy, c-format +msgid "Grob count %d " +msgstr "Elementantal %d " + +#: system.cc:376 msgid "Calculating column positions..." msgstr "Beregner kolonnepositioner..." -#: text-spanner.cc:130 -msgid "Text_spanner too small" -msgstr "Tekst_bro for lille" - #: text-spanner-engraver.cc:92 msgid "can't find start of text spanner" msgstr "kan ikke finde start på tekstbro" @@ -1214,10 +1242,9 @@ msgstr "har allerede en tekstbro" msgid "unterminated text spanner" msgstr "uafsluttet tekstbro" -#: tfm.cc:83 -#, c-format -msgid "can't find ascii character: %d" -msgstr "kan ikke finde ASCII-tegn: %d" +#: text-spanner.cc:130 +msgid "Text_spanner too small" +msgstr "Tekst_bro for lille" #: tfm-reader.cc:106 #, c-format @@ -1230,6 +1257,11 @@ msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" "%s: TFM-fil har %u parametre, hvilket er mere end de %u jeg kan håndtere" +#: tfm.cc:83 +#, c-format +msgid "can't find ascii character: %d" +msgstr "kan ikke finde ASCII-tegn: %d" + #: tie-engraver.cc:216 msgid "lonely tie" msgstr "ensom bue" @@ -1276,77 +1308,77 @@ msgstr "kan ikke finde eller oprette \"%s\" kaldet \"%s\"" msgid "can't find or create: `%s'" msgstr "kan ikke finde eller oprette: \"%s\"" -#: volta-engraver.cc:109 +#: volta-engraver.cc:111 msgid "No volta spanner to end" msgstr "Ingen reprisebro til slut" -#: volta-engraver.cc:119 +#: volta-engraver.cc:121 msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "Har allerede en reprisebro. Stopper denne for tidligt." -#: volta-engraver.cc:123 +#: volta-engraver.cc:125 msgid "Also have a stopped spanner. Giving up." msgstr "Har også en stoppet bro. Giver op." -#: parser.yy:128 +#: parser.yy:129 #, c-format msgid "Expecting %d arguments" msgstr "Forventer %d argumenter" -#: parser.yy:436 +#: parser.yy:437 msgid "Identifier should have alphabetic characters only" msgstr "Identificerer må kun indeholde alfabetiske tegn" -#: parser.yy:724 +#: parser.yy:732 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "Flere alternativer end repriser. Stryger tiloversblevne alternativer." -#: parser.yy:780 +#: parser.yy:801 msgid "Second argument must be a symbol" msgstr "Andet argument skal være et symbol" -#: parser.yy:785 +#: parser.yy:806 msgid "First argument must be a procedure taking 1 argument" msgstr "Første argument skal være en procedure som tager 1 argument" -#: parser.yy:1355 +#: parser.yy:1390 msgid "Expecting string as script definition" msgstr "Forventer streng som skriptdefinition" -#: parser.yy:1365 +#: parser.yy:1400 msgid "Can't specify direction for this request" msgstr "Kan ikke angive retning for denne forespørgsel" -#: parser.yy:1491 +#: parser.yy:1526 msgid "Expecting musical-pitch value" msgstr "Forventer nodeværdi" -#: parser.yy:1502 +#: parser.yy:1537 msgid "Must have duration object" msgstr "Skal have tidslængdeobjekt" -#: parser.yy:1511 parser.yy:1519 +#: parser.yy:1546 parser.yy:1554 msgid "Have to be in Lyric mode for lyrics" msgstr "Skal være i teksttilstand (Lyric mode) for tekst" -#: parser.yy:1679 parser.yy:1732 +#: parser.yy:1722 parser.yy:1775 #, c-format msgid "not a duration: %d" msgstr "ikke en tidslængde: %d" -#: parser.yy:1819 +#: parser.yy:1862 msgid "Have to be in Note mode for notes" msgstr "Skal være i nodetilstand (Note mode) for noder" -#: parser.yy:1917 +#: parser.yy:1961 msgid "Have to be in Chord mode for chords" msgstr "Skal være i akkordtilstand (Chord mode) for akkord" -#: parser.yy:2097 +#: parser.yy:2141 msgid "need integer number arg" msgstr "behøver heltalsargument" -#: parser.yy:2169 +#: parser.yy:2213 msgid "Suspect duration found following this beam" msgstr "" diff --git a/po/de.po b/po/de.po index 73d702b771..c38691641a 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Lilypond 1.2.8\n" -"POT-Creation-Date: 2002-06-13 17:14+0200\n" +"POT-Creation-Date: 2002-07-21 01:00+0200\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -13,193 +13,202 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: ENCODING\n" -#: lilypond-book.py:1171 ly2dvi.py:439 ly2dvi.py:465 +#: lilypond-book.py:1011 ly2dvi.py:442 ly2dvi.py:468 #, fuzzy, c-format msgid "Running %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:126 midi2ly.py:148 update-lily.py:137 input.cc:87 +#: ly2dvi.py:126 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " msgstr "Warnung: " -#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:782 ly2dvi.py:800 midi2ly.py:163 -#: midi2ly.py:1012 midi2ly.py:1081 update-lily.py:152 update-lily.py:458 -#: input.cc:92 +#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:813 ly2dvi.py:831 midi2ly.py:163 +#: midi2ly.py:1012 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160 +#: update-lily.py:152 update-lily.py:458 input.cc:92 msgid "error: " msgstr "Fehler: " -#: ly2dvi.py:144 midi2ly.py:164 update-lily.py:153 +#: ly2dvi.py:144 midi2ly.py:164 mup2ly.py:161 update-lily.py:153 #, fuzzy msgid "Exiting ... " msgstr "Linie ... " -#: ly2dvi.py:202 midi2ly.py:222 update-lily.py:211 +#: ly2dvi.py:202 midi2ly.py:222 mup2ly.py:219 update-lily.py:211 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]" -#: ly2dvi.py:206 midi2ly.py:226 update-lily.py:215 main.cc:152 +#: ly2dvi.py:206 midi2ly.py:226 mup2ly.py:223 update-lily.py:215 main.cc:158 msgid "Options:" msgstr "Optionen:" -#: ly2dvi.py:210 midi2ly.py:230 update-lily.py:219 main.cc:169 +#: ly2dvi.py:210 midi2ly.py:230 mup2ly.py:227 update-lily.py:219 main.cc:175 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Melde Fehler an" -#: ly2dvi.py:238 midi2ly.py:258 update-lily.py:247 +#: ly2dvi.py:238 midi2ly.py:258 mup2ly.py:255 update-lily.py:247 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:243 midi2ly.py:262 update-lily.py:251 +#: ly2dvi.py:243 midi2ly.py:262 mup2ly.py:260 update-lily.py:251 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:245 midi2ly.py:264 update-lily.py:253 +#: ly2dvi.py:246 midi2ly.py:264 mup2ly.py:263 update-lily.py:253 msgid "(ignored)" msgstr "" -#: ly2dvi.py:255 midi2ly.py:274 update-lily.py:263 +#: ly2dvi.py:256 midi2ly.py:274 mup2ly.py:273 update-lily.py:263 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:325 +#: ly2dvi.py:326 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: ly2dvi.py:328 main.cc:116 +#: ly2dvi.py:329 main.cc:117 msgid "write Makefile dependencies for every input file" msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" -#: ly2dvi.py:329 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:112 +#: ly2dvi.py:330 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:113 msgid "this help" msgstr "Diese Hilfe" -#: ly2dvi.py:330 main.cc:114 main.cc:119 +#: ly2dvi.py:331 main.cc:115 main.cc:120 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:330 +#: ly2dvi.py:331 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "Hänge DIR an den Suchpfad an" -#: ly2dvi.py:331 +#: ly2dvi.py:332 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:332 +#: ly2dvi.py:333 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:333 main.cc:117 +#: ly2dvi.py:334 main.cc:118 #, fuzzy msgid "produce MIDI output only" msgstr "Nur Midiausgabe" -#: ly2dvi.py:334 ly2dvi.py:335 midi2ly.py:100 main.cc:115 main.cc:118 +#: ly2dvi.py:335 ly2dvi.py:336 midi2ly.py:100 main.cc:116 main.cc:119 msgid "FILE" msgstr "DATEI" -#: ly2dvi.py:334 midi2ly.py:100 +#: ly2dvi.py:335 midi2ly.py:100 #, fuzzy msgid "write ouput to FILE" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" -#: ly2dvi.py:335 +#: ly2dvi.py:336 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:337 +#: ly2dvi.py:338 msgid "Make a picture of the first system." msgstr "" -#: ly2dvi.py:338 +#: ly2dvi.py:339 msgid "Set the resolution of the preview to RES." msgstr "" -#: ly2dvi.py:339 +#: ly2dvi.py:340 #, fuzzy msgid "generate PostScript output" msgstr "Degenerierte Zwangsbedingungen" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:341 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:122 +#: ly2dvi.py:342 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:128 #, fuzzy msgid "verbose" msgstr "Sei geschwätzig" -#: ly2dvi.py:342 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:121 +#: ly2dvi.py:343 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:127 msgid "print version number" msgstr "Zeige die Versionsnummer" -#: ly2dvi.py:343 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:123 +#: ly2dvi.py:344 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:129 msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" -#: ly2dvi.py:429 +#: ly2dvi.py:432 #, fuzzy, c-format msgid "no such setting: %s" msgstr "Kein solches instrument: `%s'" -#: ly2dvi.py:480 +#: ly2dvi.py:497 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:536 +#: ly2dvi.py:553 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:576 +#: ly2dvi.py:593 #, fuzzy, c-format msgid "invalid value: %s" msgstr "Ungültiger Buchstabe `%c'" -#: ly2dvi.py:782 +#: ly2dvi.py:698 +msgid "LaTeX failed on the output file." +msgstr "" + +#: ly2dvi.py:700 +#, c-format +msgid " % logstr))" +msgstr "" + +#: ly2dvi.py:813 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "Kann die Datei %s nicht öffnen" -#: ly2dvi.py:800 midi2ly.py:1012 update-lily.py:458 +#: ly2dvi.py:831 midi2ly.py:1012 update-lily.py:458 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:887 +#: ly2dvi.py:918 #, fuzzy, c-format msgid "filename should not contain spaces: `%s'" msgstr "Enthält schon ein `%s'" -#: ly2dvi.py:957 scores.cc:46 +#: ly2dvi.py:988 scores.cc:46 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "Ausgabe auf Papier auf %s..." -#: ly2dvi.py:968 midi2ly.py:996 +#: ly2dvi.py:999 midi2ly.py:996 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "MIDI-Ausgabe nach %s..." -#: ly2dvi.py:970 includable-lexer.cc:49 lily-guile.cc:135 scores.cc:137 +#: ly2dvi.py:1001 includable-lexer.cc:49 lily-guile.cc:160 scores.cc:137 #: scores.cc:143 #, c-format msgid "can't find file: `%s'" msgstr "Kann Datei `%s' nicht finden" -#: ly2dvi.py:978 midi2ly.py:1081 +#: ly2dvi.py:1009 midi2ly.py:1081 msgid "no files specified on command line." msgstr "" @@ -265,7 +274,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: mup2ly.py:75 main.cc:118 +#: mup2ly.py:75 main.cc:119 #, fuzzy msgid "write output to FILE" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" @@ -274,17 +283,17 @@ msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" msgid "only pre-process" msgstr "" -#: mup2ly.py:827 +#: mup2ly.py:1073 #, fuzzy, c-format msgid "no such context: %s" msgstr "Kein solches instrument: `%s'" -#: mup2ly.py:1051 +#: mup2ly.py:1297 #, fuzzy, c-format msgid "Processing `%s'..." msgstr "Verarbeite..." -#: mup2ly.py:1070 +#: mup2ly.py:1316 #, fuzzy, c-format msgid "Writing `%s'..." msgstr "Linie ... " @@ -367,22 +376,22 @@ msgstr "Uralt-Bitte: `%s'" msgid "Building `%s'..." msgstr "Uralt-Bitte: `%s'" -#: getopt-long.cc:145 +#: getopt-long.cc:146 #, c-format msgid "option `%s' requires an argument" msgstr "Option `%s' erwartet ein Argument" -#: getopt-long.cc:149 +#: getopt-long.cc:150 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "Option `%s' erlaubt kein Argument" -#: getopt-long.cc:153 +#: getopt-long.cc:154 #, c-format msgid "unrecognized option: `%s'" msgstr "Unbekannte Option: `%s'" -#: getopt-long.cc:160 +#: getopt-long.cc:161 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "Argument `%s' für Optione '%s' ist nicht erlaubt" @@ -392,7 +401,7 @@ msgstr "Argument `%s' f msgid "non fatal error: " msgstr "Undramatische Fehler: " -#: input.cc:106 source-file.cc:63 source-file.cc:156 +#: input.cc:106 source-file.cc:68 source-file.cc:161 msgid "position unknown" msgstr "Position unbekannt" @@ -401,7 +410,7 @@ msgid "can't map file" msgstr "Kann die Datei nicht mappen" #: mapped-file-storage.cc:87 simple-file-storage.cc:44 scores.cc:50 -#: streams.cc:37 +#: streams.cc:38 #, c-format msgid "can't open file: `%s'" msgstr "Kann die Datei %s nicht öffnen" @@ -411,37 +420,37 @@ msgstr "Kann die Datei %s nicht msgid "Huh? Got %d, expected %d characters" msgstr "Was? Ich habe %d erhalten, erwartete aber %d Zeichen" -#: warn.cc:10 warn.cc:17 -#, fuzzy, c-format -msgid "error: %s\n" -msgstr "Fehler: " - -#: warn.cc:23 +#: warn.cc:24 #, fuzzy, c-format msgid "warning: %s\n" msgstr "Warnung: " -#: warn.cc:35 +#: warn.cc:30 +#, fuzzy, c-format +msgid "error: %s\n" +msgstr "Fehler: " + +#: warn.cc:43 #, fuzzy, c-format msgid "programming error: %s (Continuing; cross thumbs)\n" msgstr " (Ich mache weiter: Drück´ mir die Daumen!)" -#: accidental-engraver.cc:174 +#: accidental-engraver.cc:181 new-accidental-engraver.cc:234 #, c-format msgid "Accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:199 +#: accidental-engraver.cc:206 new-accidental-engraver.cc:259 #, fuzzy, c-format msgid "unknown accidental typesetting: %s. Ignored" msgstr "Unbekannte Sonder-Zeichenkette" -#: accidental-engraver.cc:215 +#: accidental-engraver.cc:222 new-accidental-engraver.cc:275 #, c-format msgid "Symbol is not a parent context: %s. Ignored" msgstr "" -#: accidental-engraver.cc:218 +#: accidental-engraver.cc:225 new-accidental-engraver.cc:278 #, c-format msgid "Accidental typesetting must be pair or context-name: %s" msgstr "" @@ -501,7 +510,7 @@ msgstr "(Suchpfad: `%s')" msgid "Giving up" msgstr "" -#: auto-change-iterator.cc:43 change-iterator.cc:59 +#: auto-change-iterator.cc:43 change-iterator.cc:60 #: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" @@ -511,23 +520,7 @@ msgstr "" msgid "barcheck failed at: %s" msgstr "Überprüfung der Takte is fehlgeschlagen bei: %s" -#: beam.cc:153 -#, fuzzy -msgid "beam has less than two visible stems" -msgstr "Balken mit weniger als zwei Hälsen" - -#: beam.cc:158 -#, fuzzy -msgid "Beam has less than two stems. Removing beam." -msgstr "Balken mit weniger als zwei Hälsen" - -#: beam.cc:892 -msgid "" -"Not sure that we can find a nice beam slope (no viable initial configuration " -"found)." -msgstr "" - -#: beam-engraver.cc:166 +#: beam-engraver.cc:167 #, fuzzy msgid "already have a beam" msgstr "Habe schon einen Balken" @@ -537,7 +530,7 @@ msgstr "Habe schon einen Balken" msgid "unterminated beam" msgstr "Unbeendeter Bindestrich" -#: beam-engraver.cc:267 chord-tremolo-engraver.cc:185 +#: beam-engraver.cc:267 chord-tremolo-engraver.cc:175 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "Ein Notenhals muss rhythmische Struktur haben." @@ -550,12 +543,28 @@ msgstr "Notenhals passt nicht in den Balken" msgid "beam was started here" msgstr "Der Balken bagann hier" +#: beam.cc:138 +#, fuzzy +msgid "beam has less than two visible stems" +msgstr "Balken mit weniger als zwei Hälsen" + +#: beam.cc:143 +#, fuzzy +msgid "Beam has less than two stems. Removing beam." +msgstr "Balken mit weniger als zwei Hälsen" + +#: beam.cc:797 +msgid "" +"Not sure that we can find a nice beam slope (no viable initial configuration " +"found)." +msgstr "" + #: break-align-interface.cc:166 #, fuzzy, c-format msgid "No spacing entry from %s to `%s'" msgstr "unbekannter Übersetzer `%s'" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "Kann `%s' nicht zu `%s' ändern" @@ -566,14 +575,24 @@ msgstr "Kann `%s' nicht zu `%s' #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:78 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "" -#: change-iterator.cc:81 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "" +#: chord-tremolo-engraver.cc:137 percent-repeat-engraver.cc:182 +#, fuzzy +msgid "unterminated chord tremolo" +msgstr "Unbeendeter Bindestrich" + +#: chord-tremolo-iterator.cc:50 +#, fuzzy +msgid "no one to print a tremolos" +msgstr "Keiner darf eine Wiederholungsklammer drucken" + #: chord.cc:313 #, c-format msgid "invalid subtraction: not part of chord: %s" @@ -584,41 +603,31 @@ msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" -#: chord-tremolo-engraver.cc:142 percent-repeat-engraver.cc:182 -#, fuzzy -msgid "unterminated chord tremolo" -msgstr "Unbeendeter Bindestrich" - -#: chord-tremolo-iterator.cc:49 -#, fuzzy -msgid "no one to print a tremolos" -msgstr "Keiner darf eine Wiederholungsklammer drucken" - #: dimensions.cc:13 msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:189 span-dynamic-performer.cc:82 +#: dynamic-engraver.cc:187 span-dynamic-performer.cc:82 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "Ich kann kein (De)crescendo bis zum Ende finden" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:211 #, fuzzy msgid "already have a crescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:212 #, fuzzy msgid "already have a decrescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:217 +#: dynamic-engraver.cc:215 #, fuzzy msgid "Cresc started here" msgstr "Der Balken bagann hier" -#: dynamic-engraver.cc:309 +#: dynamic-engraver.cc:307 #, fuzzy msgid "unterminated (de)crescendo" msgstr "Nichtbeendetes Crescendo" @@ -636,11 +645,11 @@ msgstr "" msgid "no one to print a repeat brace" msgstr "Keiner darf eine Wiederholungsklammer drucken" -#: font-interface.cc:241 +#: font-interface.cc:238 msgid "couldn't find any font satisfying " msgstr "" -#: gourlay-breaking.cc:170 +#: gourlay-breaking.cc:171 msgid "No feasible line breaking found" msgstr "" @@ -710,19 +719,19 @@ msgstr "" msgid "ligature was started here" msgstr "Der Balken bagann hier" -#: lily-guile.cc:137 +#: lily-guile.cc:162 #, c-format msgid "(load path: `%s')" msgstr "(Ladepfad ist `%s')" -#: lily-guile.cc:664 +#: lily-guile.cc:697 #, c-format msgid "" "Can't find property type-check for `%s' (%s). Perhaps you made a typing " "error? Doing assignment anyway." msgstr "" -#: lily-guile.cc:682 +#: lily-guile.cc:715 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" @@ -735,73 +744,76 @@ msgstr "" msgid "round filled box vertical extent smaller than blot; decreasing blot" msgstr "" -#: lyric-phrasing-engraver.cc:279 +#: lyric-phrasing-engraver.cc:301 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:284 +#: lyric-phrasing-engraver.cc:307 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" #. print example usage: lilypond -e "" ? -#: main.cc:108 +#: main.cc:109 msgid "EXPR" msgstr "" -#: main.cc:108 +#: main.cc:109 msgid "Scheme options: try -e \"(set-lily-option 'help 0)\" for more help." msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:111 +#: main.cc:112 msgid "EXT" msgstr "EXT" -#: main.cc:111 +#: main.cc:112 #, fuzzy msgid "use output format EXT (tex [default], pdftex, ps, scm or as)" msgstr "Benutze das Ausgabeformat EXT" -#: main.cc:113 +#: main.cc:114 #, fuzzy msgid "FIELD" msgstr "DATEI" -#: main.cc:113 +#: main.cc:114 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:114 +#: main.cc:115 msgid "add DIR to search path" msgstr "Hänge DIR an den Suchpfad an" -#: main.cc:115 +#: main.cc:116 msgid "use FILE as init file" msgstr "Verwende FILE als Initialisierungsdatei" -#: main.cc:119 +#: main.cc:120 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:120 +#. +#. should audit again. +#. +#: main.cc:125 msgid "inhibit file output naming and exporting" msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:140 +#: main.cc:146 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." -#: main.cc:142 +#: main.cc:148 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Setze Musik oder spiele MIDI von DATEI" -#: main.cc:146 +#: main.cc:152 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" @@ -811,11 +823,11 @@ msgstr "" "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n" "lilyPond ist Teil des GNU-Projekts\n" -#: main.cc:156 +#: main.cc:162 msgid "This binary was compiled with the following options:" msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:" -#: main.cc:177 +#: main.cc:183 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -828,17 +840,17 @@ msgstr "" "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n" "Sie mehr Informationen.\n" -#: main.cc:184 main.cc:196 +#: main.cc:190 main.cc:202 #, c-format msgid "Copyright (c) %s by" msgstr "Urheberrechte (Copyright) (c) %s bei" -#: main.cc:194 +#: main.cc:200 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts" -#: main.cc:202 +#: main.cc:208 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" @@ -868,6 +880,26 @@ msgstr "" "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n" "USA.\n" +#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 +msgid "unexpected case fall-through" +msgstr "" + +#: mensural-ligature-engraver.cc:332 +msgid "ligature with less than 2 heads -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:347 +msgid "can not determine pitch of ligature primitive -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:370 +msgid "prime interval within ligature -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:380 +msgid "mensural ligature: duration none of L, B, S -> skipping" +msgstr "" + #: mensural-ligature.cc:152 #, c-format msgid "Mensural_ligature: thickness undefined on flexa %d; assuming 1.4" @@ -891,26 +923,6 @@ msgstr "" msgid "Menusral_ligature: (join_left == 0)" msgstr "" -#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 -msgid "unexpected case fall-through" -msgstr "" - -#: mensural-ligature-engraver.cc:332 -msgid "ligature with less than 2 heads -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:347 -msgid "can not determine pitch of ligature primitive -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:370 -msgid "prime interval within ligature -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:380 -msgid "mensural ligature: duration none of L, B, S -> skipping" -msgstr "" - #: midi-item.cc:144 #, fuzzy, c-format msgid "no such instrument: `%s'" @@ -924,22 +936,22 @@ msgstr "Unsinnige Dauer" msgid "silly pitch" msgstr "unsinnige Tonhöhe" -#: music.cc:152 -#, fuzzy, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponieren um %s macht Vorzecihen größer als zwei" - #: music-output-def.cc:113 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "Kann Partiturkontext nicht finden" -#: my-lily-lexer.cc:141 +#: music.cc:159 +#, fuzzy, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponieren um %s macht Vorzecihen größer als zwei" + +#: my-lily-lexer.cc:142 #, fuzzy, c-format msgid "Identifier name is a keyword: `%s'" msgstr "name ist ein Schlüsselbegriff (keyword) (`%s')" -#: my-lily-lexer.cc:161 +#: my-lily-lexer.cc:162 #, c-format msgid "error at EOF: %s" msgstr "Fehler am Dateiende(EOF): %s" @@ -953,7 +965,7 @@ msgstr "Verarbeite..." msgid "Braces don't match" msgstr "Klammern passen nicht zusammen" -#: note-collision.cc:332 +#: note-collision.cc:340 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Zu viele aneinanderstoßende Notenspalten. Ich ignoriere sie." @@ -975,7 +987,7 @@ msgstr "Ausgabe auf Papier auf %s..." msgid ", at " msgstr ", bei " -#: paper-score.cc:76 system.cc:346 +#: paper-score.cc:76 #, c-format msgid "Element count %d " msgstr "" @@ -1054,7 +1066,7 @@ msgstr "Kann nicht beide Enden von %s finden" msgid "can't find start of piano pedal: `%s'" msgstr "Kann keine kürzeste Note bei %s finden" -#: piano-pedal-engraver.cc:402 +#: piano-pedal-engraver.cc:404 #, fuzzy msgid "unterminated pedal bracket" msgstr "Unbeendeter Bindestrich" @@ -1101,39 +1113,49 @@ msgstr "" msgid "too many colliding rests" msgstr "Zu viele kollidierende Pausen." -#: scm-option.cc:75 +#: scm-option.cc:77 msgid "lilypond -e EXPR means" msgstr "" -#: scm-option.cc:121 +#: scm-option.cc:123 msgid "Unknown internal option!" msgstr "" -#: score.cc:91 +#: score-engraver.cc:103 +msgid "" +"Could not find feta20.afm. Fonts have not been installed properly; Aborting" +msgstr "" + +#: score-engraver.cc:207 +#, fuzzy, c-format +msgid "unbound spanner `%s'" +msgstr "Unbeschränkter Abstand `%s'" + +#: score.cc:93 +#, c-format +msgid "stack size cur %d, max %d\n" +msgstr "" + +#: score.cc:110 msgid "Interpreting music..." msgstr "Interpretiere die Noten..." -#: score.cc:105 +#: score.cc:123 #, fuzzy msgid "Need music in a score" msgstr "Ich brauche Noten in einer Partitur" #. should we? hampers debugging. -#: score.cc:118 +#: score.cc:136 #, fuzzy msgid "Errors found/*, not processing score*/" msgstr "Habe Fehler gefunden, /* die Partitur wird nicht verarbeitet */" -#: score.cc:125 +#: score.cc:143 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "verstrichene Zeit %.2f Sekunden" -#: score-engraver.cc:181 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "Unbeschränkter Abstand `%s'" - #: scores.cc:107 #, fuzzy msgid "Score contains errors; will not process it" @@ -1160,15 +1182,6 @@ msgstr "Single_malt_grouping_item: Ich saufe zu viel" msgid "No spring between column %d and next one" msgstr "" -#: slur.cc:53 -#, fuzzy -msgid "Putting slur over rest." -msgstr "Setze Bindebogen über Pause. Wird ignoriert" - -#: slur.cc:417 -msgid "Slur over rest?" -msgstr "Bindebogen übe den Rest?" - #: slur-engraver.cc:124 msgid "unterminated slur" msgstr "Unbeendeter Bindebogen" @@ -1180,49 +1193,64 @@ msgstr "Unbeendeter Bindebogen" msgid "can't find start of slur" msgstr "Kann nicht beide Enden von %s finden" +#: slur.cc:53 +#, fuzzy +msgid "Putting slur over rest." +msgstr "Setze Bindebogen über Pause. Wird ignoriert" + +#: slur.cc:417 +msgid "Slur over rest?" +msgstr "Bindebogen übe den Rest?" + +#: spacing-spanner.cc:382 +#, c-format +msgid "Global shortest duration is %s\n" +msgstr "" + #: spring-smob.cc:32 #, c-format msgid "#" msgstr "" -#: staff-symbol.cc:60 +#: staff-symbol.cc:62 msgid "staff symbol: indentation yields beyond end of line" msgstr "" -#: stem.cc:121 -#, fuzzy -msgid "Weird stem size; check for narrow beams" -msgstr "" -"Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" - #: stem-engraver.cc:117 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Setze Note auf unpassenden Hals (Typ = %d)" -#: streams.cc:33 +#: stem.cc:118 +#, fuzzy +msgid "Weird stem size; check for narrow beams" +msgstr "" +"Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" + +#: streams.cc:34 #, fuzzy, c-format msgid "can't create directory: `%s'" msgstr "Kann ein `%s' weder finden noch erzeugen" -#: streams.cc:47 +#: streams.cc:48 #, fuzzy msgid "Error syncing file (disk full?)" msgstr "Fehler beim Abspeichern der Datei (Platte voll?)" -#: system.cc:93 +#: system.cc:109 #, c-format msgid "Element count %d." msgstr "" -#: system.cc:360 +#: system.cc:362 +#, c-format +msgid "Grob count %d " +msgstr "" + +#: system.cc:376 msgid "Calculating column positions..." msgstr "Berechne Position der Spalten..." -#: text-spanner.cc:130 -msgid "Text_spanner too small" -msgstr "" - #: text-spanner-engraver.cc:92 #, fuzzy msgid "can't find start of text spanner" @@ -1238,10 +1266,9 @@ msgstr "Habe schon einen Balken" msgid "unterminated text spanner" msgstr "Unbeendete Linienfortführung" -#: tfm.cc:83 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "Kann ASCII-Zeichen `%d' nicht finden" +#: text-spanner.cc:130 +msgid "Text_spanner too small" +msgstr "" #: tfm-reader.cc:106 #, fuzzy, c-format @@ -1253,6 +1280,11 @@ msgstr "TFM header von `%s' hat nur %u Wort(e)" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM-Datei hat %u Parameter. Das ist mehr als die" +#: tfm.cc:83 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "Kann ASCII-Zeichen `%d' nicht finden" + #: tie-engraver.cc:216 msgid "lonely tie" msgstr "Einsamer Haltebogen" @@ -1300,81 +1332,81 @@ msgstr "Kann ein `%s', genannt `%s' weder finden noch erzeugen" msgid "can't find or create: `%s'" msgstr "Kann ein `%s' weder finden noch erzeugen" -#: volta-engraver.cc:109 +#: volta-engraver.cc:111 msgid "No volta spanner to end" msgstr "" -#: volta-engraver.cc:119 +#: volta-engraver.cc:121 msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "" -#: volta-engraver.cc:123 +#: volta-engraver.cc:125 msgid "Also have a stopped spanner. Giving up." msgstr "" -#: parser.yy:128 +#: parser.yy:129 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:436 +#: parser.yy:437 msgid "Identifier should have alphabetic characters only" msgstr "" -#: parser.yy:724 +#: parser.yy:732 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:780 +#: parser.yy:801 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:785 +#: parser.yy:806 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1355 +#: parser.yy:1390 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1365 +#: parser.yy:1400 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1491 +#: parser.yy:1526 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1502 +#: parser.yy:1537 #, fuzzy msgid "Must have duration object" msgstr "Setze kürzeste Dauer (?)" -#: parser.yy:1511 parser.yy:1519 +#: parser.yy:1546 parser.yy:1554 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "Um Text zu verarbeiten, muß ich im Text-(Lyrics)-Modus sein" -#: parser.yy:1679 parser.yy:1732 +#: parser.yy:1722 parser.yy:1775 #, c-format msgid "not a duration: %d" msgstr "Keine Dauer: %d" -#: parser.yy:1819 +#: parser.yy:1862 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "Für Noten muß ich im Noten-(Note)-Modus sein" -#: parser.yy:1917 +#: parser.yy:1961 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "Für Akkorde muß ich im Akkord-(Chord)-Modus sein" -#: parser.yy:2097 +#: parser.yy:2141 msgid "need integer number arg" msgstr "" -#: parser.yy:2169 +#: parser.yy:2213 msgid "Suspect duration found following this beam" msgstr "" diff --git a/po/es.po b/po/es.po index ba351cc307..545ca81efc 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.4.13\n" -"POT-Creation-Date: 2002-01-29 23:12+0100\n" +"POT-Creation-Date: 2002-07-21 01:00+0200\n" "PO-Revision-Date: 2002-06-28 15:46CET\n" "Last-Translator: Quique \n" "Language-Team: Spanish \n" @@ -13,330 +13,386 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: data-file.cc:118 input.cc:85 ly2dvi.py:112 midi-parser.cc:100 mup2ly.py:93 update-lily.py:118 warn.cc:23 +#: lilypond-book.py:1011 ly2dvi.py:442 ly2dvi.py:468 +#, c-format +msgid "Running %s..." +msgstr "Ejecutando %s..." + +#: ly2dvi.py:126 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " msgstr "advertencia: " -#: input.cc:90 ly2dvi.py:115 ly2dvi.py:131 ly2dvi.py:682 ly2dvi.py:700 mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 +#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:813 ly2dvi.py:831 midi2ly.py:163 +#: midi2ly.py:1012 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160 +#: update-lily.py:152 update-lily.py:458 input.cc:92 msgid "error: " msgstr "error: " -#: ly2dvi.py:132 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:144 midi2ly.py:164 mup2ly.py:161 update-lily.py:153 msgid "Exiting ... " msgstr "Saliendo..." -#: ly2dvi.py:190 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:202 midi2ly.py:222 mup2ly.py:219 update-lily.py:211 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Sintaxis: %s [OPTION]... FICHERO" -#: ly2dvi.py:194 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:206 midi2ly.py:226 mup2ly.py:223 update-lily.py:215 main.cc:158 msgid "Options:" msgstr "Opciones: " -#: ly2dvi.py:198 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:210 midi2ly.py:230 mup2ly.py:227 update-lily.py:219 main.cc:175 #, c-format msgid "Report bugs to %s" msgstr "Informar de gazapos a %s" -#: ly2dvi.py:226 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:238 midi2ly.py:258 mup2ly.py:255 update-lily.py:247 #, c-format msgid "Invoking `%s'" msgstr "Invocando `%s'" -#: ly2dvi.py:230 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:243 midi2ly.py:262 mup2ly.py:260 update-lily.py:251 #, c-format msgid "command exited with value %d" msgstr "fin de la orden con valor %d" -#: ly2dvi.py:232 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:246 midi2ly.py:264 mup2ly.py:263 update-lily.py:253 msgid "(ignored)" msgstr "(ignorado)" -#: ly2dvi.py:242 +#: ly2dvi.py:256 midi2ly.py:274 mup2ly.py:273 update-lily.py:263 #, c-format msgid "Cleaning %s..." msgstr "Limpiando %s..." -#: ly2dvi.py:302 +#: ly2dvi.py:326 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "Generar un fichero .dvi con la ayuda de LaTeX para LilyPond" -#: ly2dvi.py:305 main.cc:113 +#: ly2dvi.py:329 main.cc:117 msgid "write Makefile dependencies for every input file" msgstr "crear las dependencias para Makefile de cada fichero de entrada" -#: ly2dvi.py:306 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:330 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:113 msgid "this help" msgstr "esta ayuda" -#: ly2dvi.py:307 main.cc:111 main.cc:116 +#: ly2dvi.py:331 main.cc:115 main.cc:120 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:307 +#: ly2dvi.py:331 msgid "add DIR to LilyPond's search path" msgstr "añadir DIR a la ruta de búsqueda de LilyPond" -#: ly2dvi.py:308 +#: ly2dvi.py:332 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "conservar todas las salidas, y nombrar el directorio %s.dir" -#: ly2dvi.py:309 +#: ly2dvi.py:333 msgid "don't run LilyPond" msgstr "no ejecutar LilyPond" -#: ly2dvi.py:310 main.cc:114 +#: ly2dvi.py:334 main.cc:118 msgid "produce MIDI output only" msgstr "producir solamente una salida MIDI" -#: ly2dvi.py:311 ly2dvi.py:312 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:335 ly2dvi.py:336 midi2ly.py:100 main.cc:116 main.cc:119 msgid "FILE" msgstr "FICHERO" -#: ly2dvi.py:311 +#: ly2dvi.py:335 midi2ly.py:100 msgid "write ouput to FILE" msgstr "escribir la salida en el FICHERO" -#: ly2dvi.py:312 +#: ly2dvi.py:336 msgid "find pfa fonts used in FILE" msgstr "buscar las fuentes pfa utilizadas en FICHERO" -#: ly2dvi.py:314 +#: ly2dvi.py:338 +msgid "Make a picture of the first system." +msgstr "" + +#: ly2dvi.py:339 +msgid "Set the resolution of the preview to RES." +msgstr "" + +#: ly2dvi.py:340 msgid "generate PostScript output" msgstr "generar una salida PostScript" -#: ly2dvi.py:315 +#: ly2dvi.py:341 msgid "KEY=VAL" msgstr "CLAVE=VALOR" -#: ly2dvi.py:315 +#: ly2dvi.py:341 msgid "change global setting KEY to VAL" msgstr "cambiar el parámetro global CLAVE a VALOR" -#: ly2dvi.py:316 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:342 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:128 msgid "verbose" msgstr "prolijo" -#: ly2dvi.py:317 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:343 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:127 msgid "print version number" msgstr "mostrar número de versión" -#: ly2dvi.py:318 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:344 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:129 msgid "show warranty and copyright" msgstr "mostrar los avisos de garantía y de copyright" -#: ly2dvi.py:397 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:432 #, c-format msgid "no such setting: %s" msgstr "no existe tal parámetro: %s" -#: ly2dvi.py:425 ly2dvi.py:623 ly2dvi.py:648 -#, c-format -msgid "Running %s..." -msgstr "Ejecutando %s..." - -#: ly2dvi.py:440 +#: ly2dvi.py:497 #, c-format msgid "Analyzing %s..." msgstr "Analizando %s..." -#: ly2dvi.py:496 +#: ly2dvi.py:553 #, c-format msgid "no lilypond output found for %s" msgstr "no se ha encontrado ninguna salida de lilypond para %s" -#: ly2dvi.py:538 +#: ly2dvi.py:593 #, c-format msgid "invalid value: %s" msgstr "valor no válido: %s" -#: ly2dvi.py:682 +#: ly2dvi.py:698 +msgid "LaTeX failed on the output file." +msgstr "" + +#: ly2dvi.py:700 +#, c-format +msgid " % logstr))" +msgstr "" + +#: ly2dvi.py:813 #, c-format msgid "not a PostScript file: `%s'" msgstr "no es un fichero PostScript: `%s'" -#: ly2dvi.py:700 +#: ly2dvi.py:831 midi2ly.py:1012 update-lily.py:458 #, c-format msgid "getopt says: `%s'" msgstr "getopt() dice: `%s'" -#: ly2dvi.py:811 +#: ly2dvi.py:918 #, c-format msgid "filename should not contain spaces: `%s'" msgstr "el nombre del fichero no debería contener espacios: `%s'" -#: ly2dvi.py:876 scores.cc:44 +#: ly2dvi.py:988 scores.cc:46 #, c-format msgid "dependencies output to `%s'..." msgstr "dependencias producidas en `%s'..." -#: ly2dvi.py:887 +#: ly2dvi.py:999 midi2ly.py:996 #, c-format msgid "%s output to `%s'..." msgstr "%s producidos en `%s'..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:889 midi-score-parser.cc:24 scores.cc:136 scores.cc:142 +#: ly2dvi.py:1001 includable-lexer.cc:49 lily-guile.cc:160 scores.cc:137 +#: scores.cc:143 #, c-format msgid "can't find file: `%s'" msgstr "no puedo encontrar el fichero: `%s'" -#: ly2dvi.py:900 +#: ly2dvi.py:1009 midi2ly.py:1081 msgid "no files specified on command line." msgstr "no se ha especificado ningún fichero en la línea de órdenes." -#: mup2ly.py:51 -msgid "Convert mup to ly" -msgstr "Convertir mup a ly" +#: midi2ly.py:92 +msgid "Convert MIDI to LilyPond source" +msgstr "" -#: mup2ly.py:166 -#, c-format -msgid "%s is far from completed. Not all constructs are recognised." -msgstr "%s está lejos de estar completo. No se han reconocido todas las construcciones." +#: midi2ly.py:95 +msgid "print absolute pitches" +msgstr "" -#: mup2ly.py:964 -#, c-format -msgid "no such context: %s" -msgstr "no hay tal contexto: %s" +#: midi2ly.py:96 midi2ly.py:101 +msgid "DUR" +msgstr "DUR" + +#: midi2ly.py:96 +msgid "quantise note durations on DUR" +msgstr "" + +#: midi2ly.py:97 +msgid "print explicit durations" +msgstr "" + +#: midi2ly.py:99 +#, fuzzy +msgid "ALT[:MINOR]" +msgstr "ACC[:MENOR]" -#: mup2ly.py:1115 +#: midi2ly.py:99 +msgid "set key: ALT=+sharps|-flats; MINOR=1" +msgstr "" + +#: midi2ly.py:101 +msgid "quantise note starts on DUR" +msgstr "" + +#: midi2ly.py:102 +msgid "DUR*NUM/DEN" +msgstr "" + +#: midi2ly.py:102 +msgid "allow tuplet durations DUR*NUM/DEN" +msgstr "" + +#: midi2ly.py:106 +msgid "treat every text as a lyric" +msgstr "" + +#: midi2ly.py:1027 +msgid "Example:" +msgstr "" + +#: mup2ly.py:69 +#, fuzzy +msgid "Convert mup to LilyPond source" +msgstr "Convertir mup a ly" + +#: mup2ly.py:72 msgid "debug" msgstr "depurar" -#: mup2ly.py:1116 +#: mup2ly.py:73 msgid "define macro NAME [optional expansion EXP]" msgstr "define la macro NOMBRE [EXPRESIÓN de expansión opcional]" -#: main.cc:115 mup2ly.py:1118 +#: mup2ly.py:75 main.cc:119 msgid "write output to FILE" msgstr "escribir la salida en el FICHERO" -#: mup2ly.py:1119 +#: mup2ly.py:76 msgid "only pre-process" msgstr "solamente preprocesar" -#: mup2ly.py:1200 +#: mup2ly.py:1073 +#, c-format +msgid "no such context: %s" +msgstr "no hay tal contexto: %s" + +#: mup2ly.py:1297 #, c-format msgid "Processing `%s'..." msgstr "Procesando `%s'..." -#: mup2ly.py:1219 +#: mup2ly.py:1316 #, c-format msgid "Writing `%s'..." msgstr "Escribiendo `%s'..." -#: update-lily.py:51 +#: update-lily.py:76 msgid "Fetch and rebuild from latest source package" msgstr "Obtener y reconstruir a partir del último paquete fuente" -#: update-lily.py:223 -#, c-format -msgid "Cleaning `%s'..." -msgstr "Limpiando `%s'..." - -#: update-lily.py:243 +#: update-lily.py:79 #, c-format msgid "unpack and build in DIR [%s]" msgstr "desempaquetar y construir en DIR [%s]" -#: update-lily.py:244 +#: update-lily.py:80 msgid "execute COMMAND, subtitute:" msgstr "ejecutar la órden de sustitución:" -#: update-lily.py:245 +#: update-lily.py:81 msgid "%b: build root" msgstr "%b: construir la raíz" -#: update-lily.py:246 +#: update-lily.py:82 #, c-format msgid "%n: package name" msgstr "%n: nombre del paquete" -#: update-lily.py:247 +#: update-lily.py:83 msgid "%r: release directory" msgstr "%r: directorio de publicación" -#: update-lily.py:248 +#: update-lily.py:84 msgid "%t: tarball" msgstr "%t: tarball" -#: update-lily.py:249 +#: update-lily.py:85 msgid "%v: package version" msgstr "%v: versión del paquete" -#: update-lily.py:252 +#: update-lily.py:88 #, c-format msgid "keep all output, and name the directory %s" msgstr "conservar todas las salidas, y nombrar el directorio %s" -#: update-lily.py:253 +#: update-lily.py:89 msgid "upon failure notify EMAIL[,EMAIL]" msgstr "en caso de fallo avisar por EMAIL[,EMAIL]" -#: update-lily.py:254 +#: update-lily.py:90 msgid "remove previous build" msgstr "eliminar la construcción anterior" -#: update-lily.py:257 +#: update-lily.py:93 #, c-format msgid "fetch and build URL [%s]" msgstr "obtener y construir el URL [%s]" -#: update-lily.py:365 +#: update-lily.py:429 #, c-format msgid "Listing `%s'..." msgstr "Listando `%s'..." -#: update-lily.py:426 +#: update-lily.py:497 #, c-format msgid "latest is: %s" msgstr "el último es: %s" -#: update-lily.py:427 +#: update-lily.py:498 #, c-format msgid "relax, %s is up to date" msgstr "calma, %s está al día" -#: update-lily.py:435 update-lily.py:448 +#: update-lily.py:507 update-lily.py:520 #, c-format msgid "Fetching `%s'..." msgstr "Obteniendo `%s'..." -#: update-lily.py:457 +#: update-lily.py:529 #, c-format msgid "Building `%s'..." msgstr "Construyendo `%s'..." -#: data-file.cc:54 -msgid "EOF in a string" -msgstr "Fin de fichero (EOF) en una cadena" - -#: getopt-long.cc:145 +#: getopt-long.cc:146 #, c-format msgid "option `%s' requires an argument" msgstr "la opción `%s' requiere un argumento" -#: getopt-long.cc:149 +#: getopt-long.cc:150 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "la opción `%s' no permite argumentos" -#: getopt-long.cc:153 +#: getopt-long.cc:154 #, c-format msgid "unrecognized option: `%s'" msgstr "opción no reconocida: `%s'" -#: getopt-long.cc:160 +#: getopt-long.cc:161 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "argúmento no válido `%s' para la opción `%s'" -#: input.cc:96 +#: input.cc:98 msgid "non fatal error: " msgstr "error no fatal: " -#: input.cc:104 source-file.cc:63 source-file.cc:156 +#: input.cc:106 source-file.cc:68 source-file.cc:161 msgid "position unknown" msgstr "posición desconocida" @@ -344,7 +400,8 @@ msgstr "posici msgid "can't map file" msgstr "no es posible producir el fichero map" -#: lilypond-stream.cc:112 mapped-file-storage.cc:87 paper-stream.cc:45 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: mapped-file-storage.cc:87 simple-file-storage.cc:44 scores.cc:50 +#: streams.cc:38 #, c-format msgid "can't open file: `%s'" msgstr "no se puede abrir el fichero: `%s'" @@ -354,29 +411,52 @@ msgstr "no se puede abrir el fichero: `%s'" msgid "Huh? Got %d, expected %d characters" msgstr "¿Eh? Se han obtenido %d caracteres, cuando se esperaban %d" -#: text-stream.cc:10 -msgid "" -msgstr "" +#: warn.cc:24 +#, fuzzy, c-format +msgid "warning: %s\n" +msgstr "advertencia: " -#: warn.cc:36 -msgid "programming error: " -msgstr "error de programación: " +#: warn.cc:30 +#, fuzzy, c-format +msgid "error: %s\n" +msgstr "error: " -#: warn.cc:36 -msgid " (Continuing; cross thumbs)" +#: warn.cc:43 +#, fuzzy, c-format +msgid "programming error: %s (Continuing; cross thumbs)\n" msgstr " (Continuando; cruza los dedos)" -#: afm.cc:59 +#: accidental-engraver.cc:181 new-accidental-engraver.cc:234 +#, c-format +msgid "Accidental typesetting list must begin with context-name: %s" +msgstr "" + +#: accidental-engraver.cc:206 new-accidental-engraver.cc:259 +#, c-format +msgid "unknown accidental typesetting: %s. Ignored" +msgstr "" + +#: accidental-engraver.cc:222 new-accidental-engraver.cc:275 +#, c-format +msgid "Symbol is not a parent context: %s. Ignored" +msgstr "" + +#: accidental-engraver.cc:225 new-accidental-engraver.cc:278 +#, c-format +msgid "Accidental typesetting must be pair or context-name: %s" +msgstr "" + +#: afm.cc:60 #, c-format msgid "can't find character number: %d" msgstr "no puedo encontrar el carácter número: %d" -#: afm.cc:74 +#: afm.cc:75 #, c-format msgid "can't find character called: `%s'" msgstr "no puedo encontrar el carácter llamado: `%s'" -#: afm.cc:124 +#: afm.cc:125 #, c-format msgid "Error parsing AFM file: `%s'" msgstr "Error de análisis sintáctico del fichero AFM: `%s'" @@ -392,8 +472,12 @@ 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." -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." +msgid "" +" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " +"to show font paths." +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:167 #, c-format @@ -409,7 +493,7 @@ msgstr "Cargando la fuente por defecto" msgid "can't find default font: `%s'" msgstr "no puedo encontrar la fuente por defecto: `%s'" -#: all-font-metrics.cc:184 includable-lexer.cc:51 scores.cc:137 +#: all-font-metrics.cc:184 includable-lexer.cc:51 scores.cc:138 #, c-format msgid "(search path: `%s')" msgstr "(ruta de búsqueda: `%s')" @@ -418,53 +502,56 @@ msgstr "(ruta de b msgid "Giving up" msgstr "Abandonando" -#: auto-change-iterator.cc:43 change-iterator.cc:59 part-combine-music-iterator.cc:97 +#: auto-change-iterator.cc:43 change-iterator.cc:60 +#: part-combine-music-iterator.cc:97 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:53 +#: bar-check-iterator.cc:58 #, c-format msgid "barcheck failed at: %s" msgstr "" -#: beam-engraver.cc:91 beam-engraver.cc:124 -msgid "can't find start of beam" -msgstr "" - -#: beam-engraver.cc:158 +#: beam-engraver.cc:167 msgid "already have a beam" msgstr "" -#: beam-engraver.cc:222 +#: beam-engraver.cc:234 msgid "unterminated beam" msgstr "" -#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 +#: beam-engraver.cc:267 chord-tremolo-engraver.cc:175 msgid "stem must have Rhythmic structure" msgstr "" -#: beam-engraver.cc:272 +#: beam-engraver.cc:281 msgid "stem doesn't fit in beam" msgstr "" -#: beam-engraver.cc:273 +#: beam-engraver.cc:282 msgid "beam was started here" msgstr "" -#: beam.cc:86 -msgid "beam has less than two stems" +#: beam.cc:138 +msgid "beam has less than two visible stems" msgstr "" -#: beam.cc:637 -msgid "weird beam vertical offset" +#: beam.cc:143 +msgid "Beam has less than two stems. Removing beam." msgstr "" -#: break-align-item.cc:136 -#, c-format -msgid "unknown spacing pair `%s', `%s'" -msgstr "par de espacimiento desconocido `%s', `%s'" +#: beam.cc:797 +msgid "" +"Not sure that we can find a nice beam slope (no viable initial configuration " +"found)." +msgstr "" + +#: break-align-interface.cc:166 +#, fuzzy, c-format +msgid "No spacing entry from %s to `%s'" +msgstr "No se añade el traductor: `%s'" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "no puedo cambiar de `%s' a `%s'" @@ -475,206 +562,246 @@ msgstr "no puedo cambiar de `%s' a `%s'" #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:78 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "Yo mismo soy uno" -#: change-iterator.cc:81 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "ninguno de éstos en mi familia" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 +#: chord-tremolo-engraver.cc:137 percent-repeat-engraver.cc:182 msgid "unterminated chord tremolo" msgstr "acorde de trémolo sin terminar" -#: chord-tremolo-iterator.cc:48 +#: chord-tremolo-iterator.cc:50 msgid "no one to print a tremolos" msgstr "ninguno para la impresión de trémolos" -#: chord.cc:376 +#: chord.cc:313 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "sustracción no válida: no forma parte del acorde: %s" -#: chord.cc:405 +#: chord.cc:342 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "inversión de tonos no válida: no forma parte del acorde: %s" -#: collision.cc:286 -msgid "Too many clashing notecolumns. Ignoring them." -msgstr "Demasiadas columnas de notas que chocan entre sí. Se las ignora." - #: dimensions.cc:13 msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:187 span-dynamic-performer.cc:82 msgid "can't find start of (de)crescendo" msgstr "no puedo encontrar el principio del (de)crescendo" -#: dynamic-engraver.cc:222 +#: dynamic-engraver.cc:211 msgid "already have a crescendo" msgstr "ya tengo un crescendo" -#: dynamic-engraver.cc:223 +#: dynamic-engraver.cc:212 msgid "already have a decrescendo" msgstr "ya tengo un decrescendo" -#: dynamic-engraver.cc:317 +#: dynamic-engraver.cc:215 +msgid "Cresc started here" +msgstr "" + +#: dynamic-engraver.cc:307 msgid "unterminated (de)crescendo" msgstr "(de)crescendo sin terminar" -#: extender-engraver.cc:97 +#: extender-engraver.cc:96 msgid "unterminated extender" msgstr "prolongación sin terminar" -#: extender-engraver.cc:109 +#: extender-engraver.cc:108 msgid "Nothing to connect extender to on the left. Ignoring extender request." -msgstr "Nada a la izquierda a lo que conectar la prologación. Ignorando la petición de prolongación." +msgstr "" +"Nada a la izquierda a lo que conectar la prologación. Ignorando la petición " +"de prolongación." #: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "ninguno para la impresión de llaves repetidas" -#: font-interface.cc:237 +#: font-interface.cc:238 msgid "couldn't find any font satisfying " msgstr "no he podido encontrar ninguna fuente satisfactoria " -#: gourlay-breaking.cc:157 +#: gourlay-breaking.cc:171 msgid "No feasible line breaking found" msgstr "No se ha encontrado ninguna ruptura de línea factible" -#: grace-iterator.cc:43 -msgid "no Grace context available" -msgstr "" - -#: grace-position-engraver.cc:96 -msgid "Unattached grace notes. Attaching to last musical column." -msgstr "" - -#: hairpin.cc:93 +#: hairpin.cc:98 msgid "decrescendo too small" msgstr "decrescendo demasiado pequeño" -#: hairpin.cc:94 +#: hairpin.cc:99 msgid "crescendo too small" msgstr "crescendo demasiado pequeño" -#: hyphen-engraver.cc:90 +#: hyphen-engraver.cc:89 msgid "unterminated hyphen" msgstr "" -#: hyphen-engraver.cc:102 +#: hyphen-engraver.cc:101 msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: key-engraver.cc:99 +#: key-engraver.cc:91 msgid "Conflicting key signatures found." msgstr "" -#: key-engraver.cc:100 +#: key-engraver.cc:92 msgid "This was the other key definition." msgstr "" -#: key-performer.cc:77 +#: key-performer.cc:92 msgid "FIXME: key change merge" msgstr "" -#: lily-guile.cc:141 +#: kpath.cc:64 +#, fuzzy, c-format +msgid "Kpathsea couldn't find TFM file `%s'" +msgstr "no puedo encontrar el fichero: `%s'" + +#: ligature-bracket.cc:105 ligature-bracket.cc:139 ligature-engraver.cc:124 +msgid "no left bound" +msgstr "" + +#: ligature-engraver.cc:81 +#, fuzzy +msgid "can't find start of ligature" +msgstr "no puedo encontrar el principio del (de)crescendo" + +#: ligature-engraver.cc:86 +msgid "no right bound" +msgstr "" + +#: ligature-engraver.cc:108 +#, fuzzy +msgid "already have a ligature" +msgstr "ya tengo un crescendo" + +#: ligature-engraver.cc:166 +#, fuzzy +msgid "unterminated ligature" +msgstr "prolongación sin terminar" + +#: ligature-engraver.cc:183 +msgid "ligature may not contain rest; ignoring rest" +msgstr "" + +#: ligature-engraver.cc:184 +msgid "ligature was started here" +msgstr "" + +#: lily-guile.cc:162 #, c-format msgid "(load path: `%s')" msgstr "(ruta de carga: `%s')" -#: line-of-score.cc:96 +#: lily-guile.cc:697 #, c-format -msgid "Element count %d." -msgstr "Elementos contados %d." +msgid "" +"Can't find property type-check for `%s' (%s). Perhaps you made a typing " +"error? Doing assignment anyway." +msgstr "" -#: line-of-score.cc:253 paper-score.cc:77 +#: lily-guile.cc:715 #, c-format -msgid "Element count %d " -msgstr "Elementos contados %d" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" +msgstr "" -#: line-of-score.cc:267 -msgid "Calculating column positions..." -msgstr "Calculando las posiciones de las columnas" +#: lookup.cc:141 +msgid "round filled box horizontal extent smaller than blot; decreasing blot" +msgstr "" + +#: lookup.cc:146 +msgid "round filled box vertical extent smaller than blot; decreasing blot" +msgstr "" -#: lyric-phrasing-engraver.cc:284 +#: lyric-phrasing-engraver.cc:301 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:289 +#: lyric-phrasing-engraver.cc:307 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? -#: main.cc:105 +#. print example usage: lilypond -e "" ? +#: main.cc:109 msgid "EXPR" msgstr "EXPR" -#: main.cc:105 -msgid "evalute EXPR as Scheme after .scm init is read" +#: main.cc:109 +msgid "Scheme options: try -e \"(set-lily-option 'help 0)\" for more help." msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:108 +#: main.cc:112 msgid "EXT" msgstr "EXT" -#: main.cc:108 -msgid "use output format EXT (scm, ps, tex or as)" +#: main.cc:112 +#, fuzzy +msgid "use output format EXT (tex [default], pdftex, ps, scm or as)" msgstr "utilizar el formato de salida EXT (scm, ps, tex o as) " -#: main.cc:110 +#: main.cc:114 msgid "FIELD" msgstr "CAMPO" -#: main.cc:110 +#: main.cc:114 msgid "write header field to BASENAME.FIELD" msgstr "escribir campo de cabecera a BASENAME.FIELD" -#: main.cc:111 +#: main.cc:115 msgid "add DIR to search path" msgstr "añadir DIR a la ruta de búsqueda" -#: main.cc:112 +#: main.cc:116 msgid "use FILE as init file" msgstr "usar FICHERO como fichero de inicialización" -#: main.cc:116 +#: main.cc:120 msgid "prepend DIR to dependencies" msgstr "añadir el prefijo DIR a las dependencias" -#: main.cc:117 +#. +#. should audit again. +#. +#: main.cc:125 msgid "inhibit file output naming and exporting" msgstr "inhibir la denominación del fichero de salida y la exportación" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:137 +#: main.cc:146 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Sintaxis: %s [OPCIÓN]... FICHERO..." -#: main.cc:139 +#: main.cc:148 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:143 +#: main.cc:152 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" msgstr "" -#: main.cc:153 +#: main.cc:162 msgid "This binary was compiled with the following options:" msgstr "Este binario fue compilado con las siguientes opciones:" -#: main.cc:56 main.cc:180 +#: main.cc:183 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -686,16 +813,16 @@ msgstr "" "él bajo ciertas condiciones. Invócalo como `%s --warranty' para más\n" "información.\n" -#: main.cc:63 main.cc:187 main.cc:199 +#: main.cc:190 main.cc:202 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " -#: main.cc:197 +#: main.cc:200 msgid "GNU LilyPond -- The music typesetter" msgstr "" -#: main.cc:72 main.cc:205 +#: main.cc:208 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" @@ -712,103 +839,125 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:139 -#, c-format -msgid "no such instrument: `%s'" -msgstr "no hay este instrumento: `%s'" +#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 +msgid "unexpected case fall-through" +msgstr "" -#: midi-item.cc:228 -msgid "silly duration" -msgstr "duración ridícula" +#: mensural-ligature-engraver.cc:332 +msgid "ligature with less than 2 heads -> skipping" +msgstr "" -#: midi-item.cc:241 -msgid "silly pitch" +#: mensural-ligature-engraver.cc:347 +msgid "can not determine pitch of ligature primitive -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:370 +msgid "prime interval within ligature -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:380 +msgid "mensural ligature: duration none of L, B, S -> skipping" msgstr "" -#: music-output-def.cc:115 +#: mensural-ligature.cc:152 #, c-format -msgid "can't find `%s' context" -msgstr "no se puede encontrar el contexto de `%s'" +msgid "Mensural_ligature: thickness undefined on flexa %d; assuming 1.4" +msgstr "" -#: music.cc:232 -msgid "ly_get_mus_property (): Not a Music" +#: mensural-ligature.cc:166 +#, c-format +msgid "Mensural_ligature: delta-pitch undefined on flexa %d; assuming 0" msgstr "" -#: music.cc:246 -msgid "ly_set_mus_property (): Not a symbol" +#: mensural-ligature.cc:177 +#, c-format +msgid "Mensural_ligature: flexa-width undefined on flexa %d; assuming 2.0" msgstr "" -#: music.cc:258 -msgid "ly_set_mus_property (): not of type Music" +#: mensural-ligature.cc:208 +msgid "Mensural_ligature: unexpected case fall-through" msgstr "" -#: music.cc:272 -msgid "ly_make_music (): Not a string" +#: mensural-ligature.cc:217 +msgid "Menusral_ligature: (join_left == 0)" msgstr "" -#: music.cc:292 -msgid "ly_music_name (): Not a music expression" +#: midi-item.cc:144 +#, c-format +msgid "no such instrument: `%s'" +msgstr "no hay este instrumento: `%s'" + +#: midi-item.cc:234 +msgid "silly duration" +msgstr "duración ridícula" + +#: midi-item.cc:247 +msgid "silly pitch" msgstr "" -#: musical-request.cc:28 +#: music-output-def.cc:113 +#, c-format +msgid "can't find `%s' context" +msgstr "no se puede encontrar el contexto de `%s'" + +#: music.cc:159 #, c-format msgid "Transposition by %s makes accidental larger than two" msgstr "" -#: my-lily-lexer.cc:139 +#: my-lily-lexer.cc:142 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "El nombre del identificativo es una palabra clave: `%s'" -#: my-lily-lexer.cc:159 +#: my-lily-lexer.cc:162 #, c-format msgid "error at EOF: %s" msgstr "error al final del fichero (EOF): %s" -#: midi-score-parser.cc:94 my-lily-parser.cc:47 +#: my-lily-parser.cc:48 msgid "Parsing..." msgstr "Analizando..." -#: my-lily-parser.cc:57 +#: my-lily-parser.cc:58 msgid "Braces don't match" msgstr "" +#: note-collision.cc:340 +msgid "Too many clashing notecolumns. Ignoring them." +msgstr "Demasiadas columnas de notas que chocan entre sí. Se las ignora." + +#: note-head.cc:127 +msgid "Symbol not found, " +msgstr "" + #: output-property-music-iterator.cc:20 request-chord-iterator.cc:76 #, c-format msgid "Junking request: `%s'" msgstr "" -#: paper-def.cc:109 +#: paper-def.cc:122 #, c-format msgid "paper output to `%s'..." msgstr "" -#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99 +#: paper-outputter.cc:57 msgid ", at " msgstr ", en " -#: paper-outputter.cc:233 +#: paper-score.cc:76 #, c-format -msgid "writing header field `%s' to `%s'..." -msgstr "escribiendo el campo de cabecera `%s' a `%s'" +msgid "Element count %d " +msgstr "Elementos contados %d" -#: paper-score.cc:80 +#: paper-score.cc:79 msgid "Preprocessing elements..." msgstr "Preprocesando elementos..." -#: paper-score.cc:114 +#: paper-score.cc:113 msgid "Outputting Score, defined at: " msgstr "" -#: paper-stream.cc:41 -#, c-format -msgid "can't create directory: `%s'" -msgstr "no se puede crear el directorio: `%s'" - -#: paper-stream.cc:55 -msgid "Error syncing file (disk full?)" -msgstr "" - #. #. We could change the current translator's id, but that would make #. errors hard to catch @@ -825,7 +974,7 @@ msgstr "Yo mismo soy uno: `%s'" msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:117 +#: percent-repeat-engraver.cc:116 msgid "Don't know how to handle a percent repeat of this length." msgstr "" @@ -841,85 +990,130 @@ msgstr "Pista ... " msgid "Creator: " msgstr "Creador: " -#: performance.cc:113 +#: performance.cc:103 +#, 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:168 +#: performance.cc:169 #, c-format msgid "MIDI output to `%s'..." msgstr "Salida MIDI a `%s'..." -#: phrasing-slur-engraver.cc:119 +#: phrasing-slur-engraver.cc:117 msgid "unterminated phrasing slur" msgstr "" -#: phrasing-slur-engraver.cc:134 +#: phrasing-slur-engraver.cc:132 msgid "can't find start of phrasing slur" msgstr "" -#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 piano-pedal-performer.cc:86 +#: piano-pedal-engraver.cc:229 piano-pedal-engraver.cc:244 +#: piano-pedal-engraver.cc:299 piano-pedal-performer.cc:82 #, c-format msgid "can't find start of piano pedal: `%s'" msgstr "" +#: piano-pedal-engraver.cc:404 +#, fuzzy +msgid "unterminated pedal bracket" +msgstr "prolongación sin terminar" + #: pitch.cc:25 msgid "Pitch arguments out of range" msgstr "" -#: property-engraver.cc:121 -#, c-format -msgid "" -"`%s' is deprecated. Use\n" -" \\property %s.%s \\override #'%s = #%s" +#: porrectus.cc:35 +msgid "(left_head == 0)" +msgstr "" + +#: porrectus.cc:46 +#, fuzzy +msgid "undefined left_head" +msgstr "prolongación sin terminar" + +#: porrectus.cc:65 +msgid "(right_head == 0)" +msgstr "" + +#: porrectus.cc:76 +msgid "undefined right_head" msgstr "" -#: property-engraver.cc:145 +#: porrectus.cc:96 +msgid "junking lonely porrectus" +msgstr "" + +#: porrectus.cc:106 +msgid "porrectus style undefined; using mensural" +msgstr "" + +#: porrectus.cc:251 +msgid "ascending vaticana style porrectus" +msgstr "" + +#: property-iterator.cc:64 #, c-format -msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" +msgid "Not a grob name, `%s'." msgstr "" -#: rest-collision.cc:194 +#: rest-collision.cc:186 msgid "too many colliding rests" msgstr "" -#: rest-collision.cc:198 -msgid "too many notes for rest collision" +#: scm-option.cc:77 +msgid "lilypond -e EXPR means" +msgstr "" + +#: scm-option.cc:123 +msgid "Unknown internal option!" msgstr "" -#: scm-option.cc:63 -msgid "Scheme options:" +#: score-engraver.cc:103 +msgid "" +"Could not find feta20.afm. Fonts have not been installed properly; Aborting" msgstr "" -#: score-engraver.cc:188 +#: score-engraver.cc:207 #, c-format msgid "unbound spanner `%s'" msgstr "" -#: score.cc:78 +#: score.cc:93 +#, c-format +msgid "stack size cur %d, max %d\n" +msgstr "" + +#: score.cc:110 msgid "Interpreting music..." msgstr "Interpretación de la música..." -#: score.cc:92 +#: score.cc:123 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:105 +#: score.cc:136 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*/" +msgstr "" +"Erreurs trouvées/*, pas de traitement de la feuille de musique*/ Se han " +"encontrado errores/*, no se procesa la partitura*/" -#: score.cc:112 +#: score.cc:143 #, c-format msgid "elapsed time: %.2f seconds" msgstr "" -#: scores.cc:106 +#: scores.cc:107 msgid "Score contains errors; will not process it" msgstr "La partitura contiene errores; no será procesada." -#: scores.cc:152 +#: scores.cc:153 #, c-format msgid "Now processing: `%s'" msgstr "Ahora en proceso: `%s'" @@ -930,50 +1124,92 @@ msgid "Don't know how to interpret articulation `%s'" msgstr "No se sabe como interpretar la articulación `%s'" #. this shouldn't happen, but let's continue anyway. -#: separation-item.cc:47 +#: separation-item.cc:46 msgid "Separation_item: I've been drinking too much" msgstr "Separation_item: He bebido demasiado" -#: slur-engraver.cc:127 +#: simple-spacer.cc:254 +#, c-format +msgid "No spring between column %d and next one" +msgstr "" + +#: slur-engraver.cc:124 msgid "unterminated slur" msgstr "" #. How to shut up this warning, when Voice_devnull_engraver has #. eaten start request? -#: slur-engraver.cc:144 +#: slur-engraver.cc:141 msgid "can't find start of slur" msgstr "" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." +#: slur.cc:53 +msgid "Putting slur over rest." msgstr "" -#: slur.cc:383 +#: slur.cc:417 msgid "Slur over rest?" msgstr "" -#: stem-engraver.cc:115 +#: spacing-spanner.cc:382 +#, c-format +msgid "Global shortest duration is %s\n" +msgstr "" + +#: spring-smob.cc:32 +#, c-format +msgid "#" +msgstr "" + +#: staff-symbol.cc:62 +msgid "staff symbol: indentation yields beyond end of line" +msgstr "" + +#: stem-engraver.cc:117 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:101 +#: stem.cc:118 msgid "Weird stem size; check for narrow beams" msgstr "" -#: text-spanner-engraver.cc:94 +#: 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:109 +#, c-format +msgid "Element count %d." +msgstr "Elementos contados %d." + +#: system.cc:362 +#, fuzzy, c-format +msgid "Grob count %d " +msgstr "Elementos contados %d" + +#: system.cc:376 +msgid "Calculating column positions..." +msgstr "Calculando las posiciones de las columnas" + +#: text-spanner-engraver.cc:92 msgid "can't find start of text spanner" msgstr "" -#: text-spanner-engraver.cc:114 +#: text-spanner-engraver.cc:112 msgid "already have a text spanner" msgstr "" -#: text-spanner-engraver.cc:169 +#: text-spanner-engraver.cc:167 msgid "unterminated text spanner" msgstr "" -#: text-spanner.cc:121 +#: text-spanner.cc:130 msgid "Text_spanner too small" msgstr "" @@ -987,404 +1223,303 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 +#: tfm.cc:83 #, c-format msgid "can't find ascii character: %d" msgstr "" -#. How to shut up this warning, when no notes appeared because -#. they were suicided by Thread_devnull_engraver? -#: tie-engraver.cc:220 tie-performer.cc:173 -msgid "No ties were created!" +#: tie-engraver.cc:216 +msgid "lonely tie" msgstr "" -#: tie-engraver.cc:240 -msgid "lonely tie" +#: tie-performer.cc:161 +msgid "No ties were created!" msgstr "" #: time-scaled-music-iterator.cc:25 msgid "no one to print a tuplet start bracket" msgstr "" -#: translator-ctors.cc:40 +#: translator-ctors.cc:53 #, c-format msgid "unknown translator: `%s'" msgstr "traductor desconocido: `%s'" -#: translator-def.cc:99 +#: translator-def.cc:87 msgid "Program has no such type" msgstr "El programa no tiene este tipo" -#: translator-def.cc:105 +#: translator-def.cc:93 #, c-format msgid "Already contains: `%s'" msgstr "Ya contiene: `%s'" -#: translator-def.cc:106 +#: translator-def.cc:94 #, c-format msgid "Not adding translator: `%s'" msgstr "No se añade el traductor: `%s'" -#: translator-def.cc:224 +#: translator-def.cc:209 #, c-format msgid "can't find: `%s'" msgstr "no se puede encontrar: `%s'" -#: translator-group.cc:146 +#: translator-group.cc:159 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "no se puede encontrar o crear `%s' llamado `%s'" -#: translator-group.cc:231 +#: translator-group.cc:244 #, c-format msgid "can't find or create: `%s'" msgstr "no se puede encontrar o crear: `%s'" -#: translator-group.cc:414 -#, c-format -msgid "Can't find property type-check for `%s'. Perhaps you made a typing error? Doing assignment anyway." -msgstr "" - -#: translator-group.cc:428 -#, c-format -msgid "Type check for `%s' failed; value `%s' must be of type `%s'" -msgstr "" - -#. programming_error? -#: translator-group.cc:447 -msgid "ly-get-trans-property: expecting a Translator_group argument" -msgstr "" - -#: volta-engraver.cc:87 +#: volta-engraver.cc:111 msgid "No volta spanner to end" msgstr "" -#: volta-engraver.cc:104 +#: volta-engraver.cc:121 msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "" -#: volta-engraver.cc:108 +#: volta-engraver.cc:125 msgid "Also have a stopped spanner. Giving up." msgstr "" -#: parser.yy:121 +#: parser.yy:129 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:423 +#: parser.yy:437 msgid "Identifier should have alphabetic characters only" msgstr "El identificativo debería contener solamente caracteres alfabéticos" -#: parser.yy:697 +#: parser.yy:732 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:761 +#: parser.yy:801 msgid "Second argument must be a symbol" msgstr "El segundo argumento debe ser un símbolo" -#: parser.yy:766 +#: parser.yy:806 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1266 +#: parser.yy:1390 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1276 +#: parser.yy:1400 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1401 +#: parser.yy:1526 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1412 +#: parser.yy:1537 msgid "Must have duration object" msgstr "" -#: parser.yy:1421 parser.yy:1429 +#: parser.yy:1546 parser.yy:1554 msgid "Have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:1584 parser.yy:1637 +#: parser.yy:1722 parser.yy:1775 #, c-format msgid "not a duration: %d" msgstr "no es una duración: %d" -#: parser.yy:1648 +#: parser.yy:1862 msgid "Have to be in Note mode for notes" msgstr "" -#: parser.yy:1731 +#: parser.yy:1961 msgid "Have to be in Chord mode for chords" msgstr "" -#: parser.yy:1911 +#: parser.yy:2141 msgid "need integer number arg" msgstr "" -#: lexer.ll:174 +#: parser.yy:2213 +msgid "Suspect duration found following this beam" +msgstr "" + +#: lexer.ll:175 msgid "EOF found inside a comment" msgstr "" -#: lexer.ll:188 +#: lexer.ll:189 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:212 +#: lexer.ll:213 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "identificativo equivocado o no definido: `%s'" #. backup rule -#: lexer.ll:221 +#: lexer.ll:222 msgid "Missing end quote" msgstr "" #. backup rule -#: lexer.ll:243 lexer.ll:247 +#: lexer.ll:244 lexer.ll:248 msgid "white expected" msgstr "" -#: lexer.ll:256 +#: lexer.ll:257 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:349 +#: lexer.ll:361 msgid "Brace found at end of lyric. Did you forget a space?" msgstr "" -#: lexer.ll:457 +#: lexer.ll:477 #, c-format msgid "invalid character: `%c'" msgstr "carácter no válido: `%c'" -#: lexer.ll:538 +#: lexer.ll:563 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" -#: lexer.ll:617 -#, c-format -msgid "Oldest supported input version: %s" -msgstr "" - -#: lexer.ll:629 +#: lexer.ll:654 #, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "versión de lilypond incorrecta: %s (%s, %s)" -#: lexer.ll:630 +#: lexer.ll:655 msgid "Consider converting the input with the convert-ly script" -msgstr "Considere la conversión de la entrada con ayuda del guión (script) convert-ly" - -#: lilypond-item.cc:161 -#, c-format -msgid "#32 in quarter: %d" msgstr "" +"Considere la conversión de la entrada con ayuda del guión (script) convert-ly" -#: lilypond-score.cc:108 -#, c-format -msgid "LY output to `%s'..." -msgstr "" - -#: lilypond-score.cc:119 -#, c-format -msgid "track %d:" -msgstr "pista %d:" +#~ msgid "%s is far from completed. Not all constructs are recognised." +#~ msgstr "" +#~ "%s está lejos de estar completo. No se han reconocido todas las " +#~ "construcciones." -#: lilypond-score.cc:155 -msgid "Processing..." -msgstr "Procesando..." +#~ msgid "Cleaning `%s'..." +#~ msgstr "Limpiando `%s'..." -#: lilypond-score.cc:164 -msgid "Creating voices..." -msgstr "Creando voces..." +#~ msgid "EOF in a string" +#~ msgstr "Fin de fichero (EOF) en una cadena" -#: lilypond-score.cc:168 -msgid "track " -msgstr "pista " - -#: lilypond-score.cc:177 -msgid "NOT Filtering tempo..." -msgstr "" - -#: lilypond-score.cc:186 -msgid "NOT Quantifying columns..." -msgstr "" +#~ msgid "" +#~ msgstr "" -#: lilypond-score.cc:190 -msgid "Quantifying columns..." -msgstr "" - -#: lilypond-score.cc:223 -msgid "Settling columns..." -msgstr "" - -#: lilypond-staff.cc:141 -msgid "% MIDI copyright:" -msgstr "% Copyright MIDI:" - -#: lilypond-staff.cc:142 -msgid "% MIDI instrument:" -msgstr "% Instrumento MIDI:" - -#: lilypond-stream.cc:37 -#, c-format -msgid "lily indent level: %d" -msgstr "" +#~ msgid "programming error: " +#~ msgstr "error de programación: " -#. Maybe better not to translate these? -#: lilypond-stream.cc:83 -msgid "% Creator: " -msgstr "% Creador: " +#~ msgid "unknown spacing pair `%s', `%s'" +#~ msgstr "par de espacimiento desconocido `%s', `%s'" -#: lilypond-stream.cc:88 -msgid "% Automatically generated" -msgstr "% Generado automáticamente" +#~ msgid "writing header field `%s' to `%s'..." +#~ msgstr "escribiendo el campo de cabecera `%s' a `%s'" -#: lilypond-stream.cc:98 -#, no-c-format -msgid "% from input file: " -msgstr "% a partir del fichero de entrada: " +#~ msgid "track %d:" +#~ msgstr "pista %d:" -#: main.cc:94 -msgid "write exact durations, e.g.: a4*385/384" -msgstr "" +#~ msgid "Processing..." +#~ msgstr "Procesando..." -#: main.cc:95 -msgid "enable debugging output" -msgstr "" +#~ msgid "Creating voices..." +#~ msgstr "Creando voces..." -#: main.cc:97 -msgid "ACC[:MINOR]" -msgstr "ACC[:MENOR]" +#~ msgid "track " +#~ msgstr "pista " -#: main.cc:97 -msgid "set key: ACC +sharps/-flats; :1 minor" -msgstr "" +#~ msgid "% MIDI copyright:" +#~ msgstr "% Copyright MIDI:" -#: main.cc:98 -msgid "don't output tuplets, double dots or rests, smallest is 32" -msgstr "" +#~ msgid "% MIDI instrument:" +#~ msgstr "% Instrumento MIDI:" -#: main.cc:99 -msgid "set FILE as default output" -msgstr "establecer FICHERO como salida por defecto" +#~ msgid "% Creator: " +#~ msgstr "% Creador: " -#: main.cc:100 -msgid "don't output tuplets" -msgstr "" +#~ msgid "% Automatically generated" +#~ msgstr "% Generado automáticamente" -#: main.cc:101 -msgid "be quiet" -msgstr "trabajar en silencio" +#~ msgid "% from input file: " +#~ msgstr "% a partir del fichero de entrada: " -#: main.cc:102 -msgid "don't output rests or skips" -msgstr "no producir pausas o saltos" +#~ msgid "set FILE as default output" +#~ msgstr "establecer FICHERO como salida por defecto" -#: main.cc:103 -msgid "DUR" -msgstr "DUR" +#~ msgid "be quiet" +#~ msgstr "trabajar en silencio" -#: main.cc:103 -msgid "set smallest duration" -msgstr "definir la duración más pequeña" +#~ msgid "don't output rests or skips" +#~ msgstr "no producir pausas o saltos" -#: main.cc:104 -msgid "don't timestamp the output" -msgstr "no datar la salida" +#~ msgid "set smallest duration" +#~ msgstr "definir la duración más pequeña" -#: main.cc:106 -msgid "be verbose" -msgstr "ser prolijo" +#~ msgid "don't timestamp the output" +#~ msgstr "no datar la salida" -#: main.cc:108 -msgid "assume no double dotted notes" -msgstr "no asumir notas doblemente puntuadas" +#~ msgid "be verbose" +#~ msgstr "ser prolijo" -#: main.cc:115 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]" -msgstr "Sintaxis: %s [OPCIÓN]... [FICHERO]" +#~ msgid "assume no double dotted notes" +#~ msgstr "no asumir notas doblemente puntuadas" -#: main.cc:117 -msgid "Translate MIDI-file to lilypond" -msgstr "Traducir un fichero MIDI a lilypond" +#~ msgid "Usage: %s [OPTION]... [FILE]" +#~ msgstr "Sintaxis: %s [OPCIÓN]... [FICHERO]" -#: main.cc:131 -#, c-format -msgid "no_double_dots: %d\n" -msgstr "no_double_dots: %d\n" +#~ msgid "Translate MIDI-file to lilypond" +#~ msgstr "Traducir un fichero MIDI a lilypond" -#: main.cc:133 -#, c-format -msgid "no_rests: %d\n" -msgstr "no_rests: %d\n" +#~ msgid "no_double_dots: %d\n" +#~ msgstr "no_double_dots: %d\n" -#: main.cc:135 -#, c-format -msgid "no_quantify_b_s: %d\n" -msgstr "no_quantify_b_s: %d\n" +#~ msgid "no_rests: %d\n" +#~ msgstr "no_rests: %d\n" -#: main.cc:137 -#, c-format -msgid "no_smaller_than: %d (1/%d)\n" -msgstr "no_smaller_than: %d (1/%d)\n" +#~ msgid "no_quantify_b_s: %d\n" +#~ msgstr "no_quantify_b_s: %d\n" -#: main.cc:140 -#, c-format -msgid "no_tuplets: %d\n" -msgstr "no_tuplets: %d\n" +#~ msgid "no_smaller_than: %d (1/%d)\n" +#~ msgstr "no_smaller_than: %d (1/%d)\n" -#: midi-parser.cc:64 -msgid "zero length string encountered" -msgstr "encontrada cadena de longitud cero" +#~ msgid "no_tuplets: %d\n" +#~ msgstr "no_tuplets: %d\n" -#: midi-score-parser.cc:44 -msgid "MIDI header expected" -msgstr "Esperado encabezado de formato MIDI" +#~ msgid "zero length string encountered" +#~ msgstr "encontrada cadena de longitud cero" -#: midi-score-parser.cc:49 -msgid "invalid header length" -msgstr "longitud del encabezado no válida" +#~ msgid "MIDI header expected" +#~ msgstr "Esperado encabezado de formato MIDI" -#: midi-score-parser.cc:52 -msgid "invalid MIDI format" -msgstr "formato MIDI no válido" +#~ msgid "invalid header length" +#~ msgstr "longitud del encabezado no válida" -#: midi-score-parser.cc:55 -msgid "invalid number of tracks" -msgstr "número de pistas no válido" +#~ msgid "invalid MIDI format" +#~ msgstr "formato MIDI no válido" -#: midi-score-parser.cc:58 -msgid "can't handle non-metrical time" -msgstr "no se pueden manejar tiempos no métricos" +#~ msgid "invalid number of tracks" +#~ msgstr "número de pistas no válido" -#: midi-track-parser.cc:68 -#, c-format -msgid "Junking note-end event: channel = %d, pitch = %d" -msgstr "" +#~ msgid "can't handle non-metrical time" +#~ msgstr "no se pueden manejar tiempos no métricos" -#: midi-track-parser.cc:124 -msgid "invalid running status" -msgstr "estado de ejecución no válido" +#~ msgid "invalid running status" +#~ msgstr "estado de ejecución no válido" -#: midi-track-parser.cc:324 -msgid "unimplemented MIDI meta-event" -msgstr "meta-evento MIDI no implementado" +#~ msgid "unimplemented MIDI meta-event" +#~ msgstr "meta-evento MIDI no implementado" -#: midi-track-parser.cc:329 -msgid "invalid MIDI event" -msgstr "evento MIDI no válido" +#~ msgid "invalid MIDI event" +#~ msgstr "evento MIDI no válido" -#: midi-track-parser.cc:344 -msgid "MIDI track expected" -msgstr "Esperada pista MIDI" +#~ msgid "MIDI track expected" +#~ msgstr "Esperada pista MIDI" -#: midi-track-parser.cc:349 -msgid "invalid track length" -msgstr "longitud de pista no válida" +#~ msgid "invalid track length" +#~ msgstr "longitud de pista no válida" diff --git a/po/fr.po b/po/fr.po index b947320e25..c32732fb5d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,196 +6,205 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2002-06-13 17:14+0200\n" +"POT-Creation-Date: 2002-07-21 01:00+0200\n" "PO-Revision-Date: 1999-12-28 00:32 +1\n" "Last-Translator: Laurent Martelli \n" "Language-Team: \n" "MIME-Version: 1.0\n" -#: lilypond-book.py:1171 ly2dvi.py:439 ly2dvi.py:465 +#: lilypond-book.py:1011 ly2dvi.py:442 ly2dvi.py:468 #, fuzzy, c-format msgid "Running %s..." msgstr "Cration des voix..." -#: ly2dvi.py:126 midi2ly.py:148 update-lily.py:137 input.cc:87 +#: ly2dvi.py:126 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " msgstr "avertissement: " -#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:782 ly2dvi.py:800 midi2ly.py:163 -#: midi2ly.py:1012 midi2ly.py:1081 update-lily.py:152 update-lily.py:458 -#: input.cc:92 +#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:813 ly2dvi.py:831 midi2ly.py:163 +#: midi2ly.py:1012 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160 +#: update-lily.py:152 update-lily.py:458 input.cc:92 msgid "error: " msgstr "erreur: " -#: ly2dvi.py:144 midi2ly.py:164 update-lily.py:153 +#: ly2dvi.py:144 midi2ly.py:164 mup2ly.py:161 update-lily.py:153 #, fuzzy msgid "Exiting ... " msgstr "Ligne ..." -#: ly2dvi.py:202 midi2ly.py:222 update-lily.py:211 +#: ly2dvi.py:202 midi2ly.py:222 mup2ly.py:219 update-lily.py:211 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Usage: %s [OPTION... [FICHIER]" -#: ly2dvi.py:206 midi2ly.py:226 update-lily.py:215 main.cc:152 +#: ly2dvi.py:206 midi2ly.py:226 mup2ly.py:223 update-lily.py:215 main.cc:158 msgid "Options:" msgstr "Options: " -#: ly2dvi.py:210 midi2ly.py:230 update-lily.py:219 main.cc:169 +#: ly2dvi.py:210 midi2ly.py:230 mup2ly.py:227 update-lily.py:219 main.cc:175 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Rapporter les bugs " -#: ly2dvi.py:238 midi2ly.py:258 update-lily.py:247 +#: ly2dvi.py:238 midi2ly.py:258 mup2ly.py:255 update-lily.py:247 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:243 midi2ly.py:262 update-lily.py:251 +#: ly2dvi.py:243 midi2ly.py:262 mup2ly.py:260 update-lily.py:251 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:245 midi2ly.py:264 update-lily.py:253 +#: ly2dvi.py:246 midi2ly.py:264 mup2ly.py:263 update-lily.py:253 msgid "(ignored)" msgstr "" -#: ly2dvi.py:255 midi2ly.py:274 update-lily.py:263 +#: ly2dvi.py:256 midi2ly.py:274 mup2ly.py:273 update-lily.py:263 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Cration des voix..." -#: ly2dvi.py:325 +#: ly2dvi.py:326 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: ly2dvi.py:328 main.cc:116 +#: ly2dvi.py:329 main.cc:117 msgid "write Makefile dependencies for every input file" msgstr "" -#: ly2dvi.py:329 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:112 +#: ly2dvi.py:330 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:113 msgid "this help" msgstr "cette aide" -#: ly2dvi.py:330 main.cc:114 main.cc:119 +#: ly2dvi.py:331 main.cc:115 main.cc:120 msgid "DIR" msgstr "REP" -#: ly2dvi.py:330 +#: ly2dvi.py:331 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "ajoute REP au chemin de recherche" -#: ly2dvi.py:331 +#: ly2dvi.py:332 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:332 +#: ly2dvi.py:333 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:333 main.cc:117 +#: ly2dvi.py:334 main.cc:118 #, fuzzy msgid "produce MIDI output only" msgstr "produit seulement la sortie MIDI" -#: ly2dvi.py:334 ly2dvi.py:335 midi2ly.py:100 main.cc:115 main.cc:118 +#: ly2dvi.py:335 ly2dvi.py:336 midi2ly.py:100 main.cc:116 main.cc:119 msgid "FILE" msgstr "FICHIER" -#: ly2dvi.py:334 midi2ly.py:100 +#: ly2dvi.py:335 midi2ly.py:100 msgid "write ouput to FILE" msgstr "" -#: ly2dvi.py:335 +#: ly2dvi.py:336 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:337 +#: ly2dvi.py:338 msgid "Make a picture of the first system." msgstr "" -#: ly2dvi.py:338 +#: ly2dvi.py:339 msgid "Set the resolution of the preview to RES." msgstr "" -#: ly2dvi.py:339 +#: ly2dvi.py:340 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:341 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:122 +#: ly2dvi.py:342 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:128 msgid "verbose" msgstr "" -#: ly2dvi.py:342 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:121 +#: ly2dvi.py:343 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:127 msgid "print version number" msgstr "afficher le numro de version" -#: ly2dvi.py:343 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:123 +#: ly2dvi.py:344 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:129 msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:429 +#: ly2dvi.py:432 #, fuzzy, c-format msgid "no such setting: %s" msgstr "Pas d'instrument tel: `%s'" -#: ly2dvi.py:480 +#: ly2dvi.py:497 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Cration des voix..." -#: ly2dvi.py:536 +#: ly2dvi.py:553 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:576 +#: ly2dvi.py:593 #, fuzzy, c-format msgid "invalid value: %s" msgstr "caractres illgal: `%c'" -#: ly2dvi.py:782 +#: ly2dvi.py:698 +msgid "LaTeX failed on the output file." +msgstr "" + +#: ly2dvi.py:700 +#, c-format +msgid " % logstr))" +msgstr "" + +#: ly2dvi.py:813 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "impossible d'ouvrir le fichier: `%s'" -#: ly2dvi.py:800 midi2ly.py:1012 update-lily.py:458 +#: ly2dvi.py:831 midi2ly.py:1012 update-lily.py:458 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:887 +#: ly2dvi.py:918 #, fuzzy, c-format msgid "filename should not contain spaces: `%s'" msgstr "Contient dj un `%s'" -#: ly2dvi.py:957 scores.cc:46 +#: ly2dvi.py:988 scores.cc:46 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "Sortie papier vers %s..." -#: ly2dvi.py:968 midi2ly.py:996 +#: ly2dvi.py:999 midi2ly.py:996 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "Sortie de Lily vers %s..." -#: ly2dvi.py:970 includable-lexer.cc:49 lily-guile.cc:135 scores.cc:137 +#: ly2dvi.py:1001 includable-lexer.cc:49 lily-guile.cc:160 scores.cc:137 #: scores.cc:143 #, c-format msgid "can't find file: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: ly2dvi.py:978 midi2ly.py:1081 +#: ly2dvi.py:1009 midi2ly.py:1081 msgid "no files specified on command line." msgstr "" @@ -259,7 +268,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: mup2ly.py:75 main.cc:118 +#: mup2ly.py:75 main.cc:119 msgid "write output to FILE" msgstr "" @@ -267,17 +276,17 @@ msgstr "" msgid "only pre-process" msgstr "" -#: mup2ly.py:827 +#: mup2ly.py:1073 #, fuzzy, c-format msgid "no such context: %s" msgstr "Pas d'instrument tel: `%s'" -#: mup2ly.py:1051 +#: mup2ly.py:1297 #, fuzzy, c-format msgid "Processing `%s'..." msgstr "Traitement..." -#: mup2ly.py:1070 +#: mup2ly.py:1316 #, fuzzy, c-format msgid "Writing `%s'..." msgstr "Ligne ..." @@ -360,22 +369,22 @@ msgstr "Cration des voix..." msgid "Building `%s'..." msgstr "Cration des voix..." -#: getopt-long.cc:145 +#: getopt-long.cc:146 #, c-format msgid "option `%s' requires an argument" msgstr "l'option `%s' requiert un argument" -#: getopt-long.cc:149 +#: getopt-long.cc:150 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "l'option `%s' n'accepte pas d'argument" -#: getopt-long.cc:153 +#: getopt-long.cc:154 #, c-format msgid "unrecognized option: `%s'" msgstr "option non reconnue: `%s'" -#: getopt-long.cc:160 +#: getopt-long.cc:161 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "argument `%s' invalide pour l'option `%s'" @@ -385,7 +394,7 @@ msgstr "argument `%s' invalide pour l'option `%s'" msgid "non fatal error: " msgstr "Erreur non fatale: " -#: input.cc:106 source-file.cc:63 source-file.cc:156 +#: input.cc:106 source-file.cc:68 source-file.cc:161 msgid "position unknown" msgstr "position inconnue" @@ -394,7 +403,7 @@ msgid "can't map file" msgstr "impossible de mapper le fichier" #: mapped-file-storage.cc:87 simple-file-storage.cc:44 scores.cc:50 -#: streams.cc:37 +#: streams.cc:38 #, c-format msgid "can't open file: `%s'" msgstr "impossible d'ouvrir le fichier: `%s'" @@ -404,37 +413,37 @@ msgstr "impossible d'ouvrir le fichier: `%s'" msgid "Huh? Got %d, expected %d characters" msgstr "Hein? %d caractres reus, %d attendus" -#: warn.cc:10 warn.cc:17 -#, fuzzy, c-format -msgid "error: %s\n" -msgstr "erreur: " - -#: warn.cc:23 +#: warn.cc:24 #, fuzzy, c-format msgid "warning: %s\n" msgstr "avertissement: " -#: warn.cc:35 +#: warn.cc:30 +#, fuzzy, c-format +msgid "error: %s\n" +msgstr "erreur: " + +#: warn.cc:43 #, fuzzy, c-format msgid "programming error: %s (Continuing; cross thumbs)\n" msgstr " (je continure; croisez les doigts)" -#: accidental-engraver.cc:174 +#: accidental-engraver.cc:181 new-accidental-engraver.cc:234 #, c-format msgid "Accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:199 +#: accidental-engraver.cc:206 new-accidental-engraver.cc:259 #, fuzzy, c-format msgid "unknown accidental typesetting: %s. Ignored" msgstr "chane d'chappement inconnue: `\\%s'" -#: accidental-engraver.cc:215 +#: accidental-engraver.cc:222 new-accidental-engraver.cc:275 #, c-format msgid "Symbol is not a parent context: %s. Ignored" msgstr "" -#: accidental-engraver.cc:218 +#: accidental-engraver.cc:225 new-accidental-engraver.cc:278 #, c-format msgid "Accidental typesetting must be pair or context-name: %s" msgstr "" @@ -494,7 +503,7 @@ msgstr "chemin de recherche= %s" msgid "Giving up" msgstr "" -#: auto-change-iterator.cc:43 change-iterator.cc:59 +#: auto-change-iterator.cc:43 change-iterator.cc:60 #: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" @@ -504,23 +513,7 @@ msgstr "" msgid "barcheck failed at: %s" msgstr "" -#: beam.cc:153 -#, fuzzy -msgid "beam has less than two visible stems" -msgstr "barre avec moins de deux tiges" - -#: beam.cc:158 -#, fuzzy -msgid "Beam has less than two stems. Removing beam." -msgstr "barre avec moins de deux tiges" - -#: beam.cc:892 -msgid "" -"Not sure that we can find a nice beam slope (no viable initial configuration " -"found)." -msgstr "" - -#: beam-engraver.cc:166 +#: beam-engraver.cc:167 #, fuzzy msgid "already have a beam" msgstr "Il y a dj une barre" @@ -530,7 +523,7 @@ msgstr "Il y a dj une barre" msgid "unterminated beam" msgstr "Barre non termine" -#: beam-engraver.cc:267 chord-tremolo-engraver.cc:185 +#: beam-engraver.cc:267 chord-tremolo-engraver.cc:175 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "La tige doit avoir une structure rythmique." @@ -543,12 +536,28 @@ msgstr "la tige ne rentre pas dans la barre" msgid "beam was started here" msgstr "la barre a commenc ici" +#: beam.cc:138 +#, fuzzy +msgid "beam has less than two visible stems" +msgstr "barre avec moins de deux tiges" + +#: beam.cc:143 +#, fuzzy +msgid "Beam has less than two stems. Removing beam." +msgstr "barre avec moins de deux tiges" + +#: beam.cc:797 +msgid "" +"Not sure that we can find a nice beam slope (no viable initial configuration " +"found)." +msgstr "" + #: break-align-interface.cc:166 #, fuzzy, c-format msgid "No spacing entry from %s to `%s'" msgstr "traducteur inconnu `%s'" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "impossible de changer `%s' en `%s'" @@ -559,14 +568,22 @@ msgstr "impossible de changer `%s' en `%s'" #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:78 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "" -#: change-iterator.cc:81 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "" +#: chord-tremolo-engraver.cc:137 percent-repeat-engraver.cc:182 +msgid "unterminated chord tremolo" +msgstr "" + +#: chord-tremolo-iterator.cc:50 +msgid "no one to print a tremolos" +msgstr "" + #: chord.cc:313 #, c-format msgid "invalid subtraction: not part of chord: %s" @@ -577,39 +594,31 @@ msgstr "soustraction invalide: ne fait pas partie de l'accord: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "renversement invalide: ne fait pas partie de l'accord: %s" -#: chord-tremolo-engraver.cc:142 percent-repeat-engraver.cc:182 -msgid "unterminated chord tremolo" -msgstr "" - -#: chord-tremolo-iterator.cc:49 -msgid "no one to print a tremolos" -msgstr "" - #: dimensions.cc:13 msgid "NaN" msgstr "" -#: dynamic-engraver.cc:189 span-dynamic-performer.cc:82 +#: dynamic-engraver.cc:187 span-dynamic-performer.cc:82 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "ne peut pas trouver un (de)crescendo la fin" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:211 #, fuzzy msgid "already have a crescendo" msgstr "Il y a dj une barre" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:212 #, fuzzy msgid "already have a decrescendo" msgstr "Il y a dj une barre" -#: dynamic-engraver.cc:217 +#: dynamic-engraver.cc:215 #, fuzzy msgid "Cresc started here" msgstr "la barre a commenc ici" -#: dynamic-engraver.cc:309 +#: dynamic-engraver.cc:307 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non termin" @@ -626,11 +635,11 @@ msgstr "" msgid "no one to print a repeat brace" msgstr "" -#: font-interface.cc:241 +#: font-interface.cc:238 msgid "couldn't find any font satisfying " msgstr "" -#: gourlay-breaking.cc:170 +#: gourlay-breaking.cc:171 msgid "No feasible line breaking found" msgstr "" @@ -700,19 +709,19 @@ msgstr "" msgid "ligature was started here" msgstr "la barre a commenc ici" -#: lily-guile.cc:137 +#: lily-guile.cc:162 #, c-format msgid "(load path: `%s')" msgstr "" -#: lily-guile.cc:664 +#: lily-guile.cc:697 #, c-format msgid "" "Can't find property type-check for `%s' (%s). Perhaps you made a typing " "error? Doing assignment anyway." msgstr "" -#: lily-guile.cc:682 +#: lily-guile.cc:715 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" @@ -725,73 +734,76 @@ msgstr "" msgid "round filled box vertical extent smaller than blot; decreasing blot" msgstr "" -#: lyric-phrasing-engraver.cc:279 +#: lyric-phrasing-engraver.cc:301 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:284 +#: lyric-phrasing-engraver.cc:307 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" #. print example usage: lilypond -e "" ? -#: main.cc:108 +#: main.cc:109 msgid "EXPR" msgstr "" -#: main.cc:108 +#: main.cc:109 msgid "Scheme options: try -e \"(set-lily-option 'help 0)\" for more help." msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:111 +#: main.cc:112 msgid "EXT" msgstr "" -#: main.cc:111 +#: main.cc:112 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)" msgstr "" -#: main.cc:113 +#: main.cc:114 #, fuzzy msgid "FIELD" msgstr "FICHIER" -#: main.cc:113 +#: main.cc:114 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:114 +#: main.cc:115 #, fuzzy msgid "add DIR to search path" msgstr "ajoute REP au chemin de recherche" -#: main.cc:115 +#: main.cc:116 #, fuzzy msgid "use FILE as init file" msgstr "utilise FICHIER comme fichier d'initialisation" -#: main.cc:119 +#: main.cc:120 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:120 +#. +#. should audit again. +#. +#: main.cc:125 msgid "inhibit file output naming and exporting" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:140 +#: main.cc:146 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Usage: %s [OPTION]... [FICHIER]..." -#: main.cc:142 +#: main.cc:148 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:146 +#: main.cc:152 #, fuzzy msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" @@ -802,12 +814,12 @@ msgstr "" "paritions partir de description de gaut niveau en entre. Lilypond\n" "fait partie du projet GNU.\n" -#: main.cc:156 +#: main.cc:162 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "Cet excutable a t compil avec les options suivantes:" -#: main.cc:177 +#: main.cc:183 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -815,17 +827,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:184 main.cc:196 +#: main.cc:190 main.cc:202 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s par" -#: main.cc:194 +#: main.cc:200 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:202 +#: main.cc:208 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" @@ -842,6 +854,26 @@ msgid "" "USA.\n" msgstr "" +#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 +msgid "unexpected case fall-through" +msgstr "" + +#: mensural-ligature-engraver.cc:332 +msgid "ligature with less than 2 heads -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:347 +msgid "can not determine pitch of ligature primitive -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:370 +msgid "prime interval within ligature -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:380 +msgid "mensural ligature: duration none of L, B, S -> skipping" +msgstr "" + #: mensural-ligature.cc:152 #, c-format msgid "Mensural_ligature: thickness undefined on flexa %d; assuming 1.4" @@ -865,26 +897,6 @@ msgstr "" msgid "Menusral_ligature: (join_left == 0)" msgstr "" -#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 -msgid "unexpected case fall-through" -msgstr "" - -#: mensural-ligature-engraver.cc:332 -msgid "ligature with less than 2 heads -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:347 -msgid "can not determine pitch of ligature primitive -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:370 -msgid "prime interval within ligature -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:380 -msgid "mensural ligature: duration none of L, B, S -> skipping" -msgstr "" - #: midi-item.cc:144 #, fuzzy, c-format msgid "no such instrument: `%s'" @@ -898,22 +910,22 @@ msgstr "" msgid "silly pitch" msgstr "" -#: music.cc:152 -#, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "" - #: music-output-def.cc:113 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "ne peut pas trouver `%s'" -#: my-lily-lexer.cc:141 +#: music.cc:159 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "" + +#: my-lily-lexer.cc:142 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "" -#: my-lily-lexer.cc:161 +#: my-lily-lexer.cc:162 #, c-format msgid "error at EOF: %s" msgstr "" @@ -926,7 +938,7 @@ msgstr "Analyse..." msgid "Braces don't match" msgstr "" -#: note-collision.cc:332 +#: note-collision.cc:340 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Trop de colonnes de notes superposes. Je les ignore." @@ -949,7 +961,7 @@ msgstr "Sortie papier vers %s..." msgid ", at " msgstr ", " -#: paper-score.cc:76 system.cc:346 +#: paper-score.cc:76 #, c-format msgid "Element count %d " msgstr "" @@ -1027,7 +1039,7 @@ msgstr "impossible de trouver le caractres numro %d" msgid "can't find start of piano pedal: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: piano-pedal-engraver.cc:402 +#: piano-pedal-engraver.cc:404 #, fuzzy msgid "unterminated pedal bracket" msgstr "Barre non termine" @@ -1073,37 +1085,47 @@ msgstr "" msgid "too many colliding rests" msgstr "" -#: scm-option.cc:75 +#: scm-option.cc:77 msgid "lilypond -e EXPR means" msgstr "" -#: scm-option.cc:121 +#: scm-option.cc:123 msgid "Unknown internal option!" msgstr "" -#: score.cc:91 +#: score-engraver.cc:103 +msgid "" +"Could not find feta20.afm. Fonts have not been installed properly; Aborting" +msgstr "" + +#: score-engraver.cc:207 +#, fuzzy, c-format +msgid "unbound spanner `%s'" +msgstr "traducteur inconnu `%s'" + +#: score.cc:93 +#, c-format +msgid "stack size cur %d, max %d\n" +msgstr "" + +#: score.cc:110 msgid "Interpreting music..." msgstr "" -#: score.cc:105 +#: score.cc:123 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:118 +#: score.cc:136 msgid "Errors found/*, not processing score*/" msgstr "" -#: score.cc:125 +#: score.cc:143 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "temps ecoul: %.2f secondes" -#: score-engraver.cc:181 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "traducteur inconnu `%s'" - #: scores.cc:107 msgid "Score contains errors; will not process it" msgstr "" @@ -1128,14 +1150,6 @@ msgstr "" msgid "No spring between column %d and next one" msgstr "" -#: slur.cc:53 -msgid "Putting slur over rest." -msgstr "" - -#: slur.cc:417 -msgid "Slur over rest?" -msgstr "" - #: slur-engraver.cc:124 msgid "unterminated slur" msgstr "" @@ -1147,48 +1161,62 @@ msgstr "" msgid "can't find start of slur" msgstr "impossible de trouver le caractres numro %d" +#: slur.cc:53 +msgid "Putting slur over rest." +msgstr "" + +#: slur.cc:417 +msgid "Slur over rest?" +msgstr "" + +#: spacing-spanner.cc:382 +#, c-format +msgid "Global shortest duration is %s\n" +msgstr "" + #: spring-smob.cc:32 #, c-format msgid "#" msgstr "" -#: staff-symbol.cc:60 +#: staff-symbol.cc:62 msgid "staff symbol: indentation yields beyond end of line" msgstr "" -#: stem.cc:121 -#, fuzzy -msgid "Weird stem size; check for narrow beams" -msgstr "dcallage de barre bizarre, check your knees" - #: stem-engraver.cc:117 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: streams.cc:33 +#: stem.cc:118 +#, fuzzy +msgid "Weird stem size; check for narrow beams" +msgstr "dcallage de barre bizarre, check your knees" + +#: streams.cc:34 #, fuzzy, c-format msgid "can't create directory: `%s'" msgstr "ne peut pas trouver ou crer `%s'" -#: streams.cc:47 +#: streams.cc:48 #, fuzzy msgid "Error syncing file (disk full?)" msgstr ")" -#: system.cc:93 +#: system.cc:109 #, c-format msgid "Element count %d." msgstr "" -#: system.cc:360 +#: system.cc:362 +#, c-format +msgid "Grob count %d " +msgstr "" + +#: system.cc:376 msgid "Calculating column positions..." msgstr "Calcul de la position des colonnes..." -#: text-spanner.cc:130 -msgid "Text_spanner too small" -msgstr "" - #: text-spanner-engraver.cc:92 #, fuzzy msgid "can't find start of text spanner" @@ -1204,10 +1232,9 @@ msgstr "Il y a dj une barre" msgid "unterminated text spanner" msgstr "Barre non termine" -#: tfm.cc:83 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ne peut pas trouver le caractre ascii `%d'" +#: text-spanner.cc:130 +msgid "Text_spanner too small" +msgstr "" #: tfm-reader.cc:106 #, c-format @@ -1219,6 +1246,11 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" +#: tfm.cc:83 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ne peut pas trouver le caractre ascii `%d'" + #: tie-engraver.cc:216 msgid "lonely tie" msgstr "liaison solitaire" @@ -1265,81 +1297,81 @@ msgstr "ne peut pas trouver ou crer `%s' nomm `%s'" msgid "can't find or create: `%s'" msgstr "ne peut pas trouver ou crer `%s'" -#: volta-engraver.cc:109 +#: volta-engraver.cc:111 msgid "No volta spanner to end" msgstr "" -#: volta-engraver.cc:119 +#: volta-engraver.cc:121 msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "" -#: volta-engraver.cc:123 +#: volta-engraver.cc:125 msgid "Also have a stopped spanner. Giving up." msgstr "" -#: parser.yy:128 +#: parser.yy:129 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:436 +#: parser.yy:437 msgid "Identifier should have alphabetic characters only" msgstr "" -#: parser.yy:724 +#: parser.yy:732 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:780 +#: parser.yy:801 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:785 +#: parser.yy:806 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1355 +#: parser.yy:1390 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1365 +#: parser.yy:1400 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1491 +#: parser.yy:1526 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1502 +#: parser.yy:1537 #, fuzzy msgid "Must have duration object" msgstr "Positionne la plus petite dure (?)" -#: parser.yy:1511 parser.yy:1519 +#: parser.yy:1546 parser.yy:1554 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "il fayt tre en mode Parole pour les paroles" -#: parser.yy:1679 parser.yy:1732 +#: parser.yy:1722 parser.yy:1775 #, c-format msgid "not a duration: %d" msgstr "pas une dure: %d" -#: parser.yy:1819 +#: parser.yy:1862 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "il faut tre en mode Note pour les notes" -#: parser.yy:1917 +#: parser.yy:1961 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "il faut tre en mode Accord pour les accords" -#: parser.yy:2097 +#: parser.yy:2141 msgid "need integer number arg" msgstr "" -#: parser.yy:2169 +#: parser.yy:2213 msgid "Suspect duration found following this beam" msgstr "" diff --git a/po/it.po b/po/it.po index 19b0b11bae..3e0a108c1f 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2002-06-13 17:14+0200\n" +"POT-Creation-Date: 2002-07-21 01:00+0200\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -13,194 +13,203 @@ msgstr "" "out --add-comments --keyword=_ --keyword=_f\n" "Files: bow.cc int.cc\n" -#: lilypond-book.py:1171 ly2dvi.py:439 ly2dvi.py:465 +#: lilypond-book.py:1011 ly2dvi.py:442 ly2dvi.py:468 #, fuzzy, c-format msgid "Running %s..." msgstr "Genero le voci..." -#: ly2dvi.py:126 midi2ly.py:148 update-lily.py:137 input.cc:87 +#: ly2dvi.py:126 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " msgstr "attenzione: " -#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:782 ly2dvi.py:800 midi2ly.py:163 -#: midi2ly.py:1012 midi2ly.py:1081 update-lily.py:152 update-lily.py:458 -#: input.cc:92 +#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:813 ly2dvi.py:831 midi2ly.py:163 +#: midi2ly.py:1012 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160 +#: update-lily.py:152 update-lily.py:458 input.cc:92 msgid "error: " msgstr "errore: " -#: ly2dvi.py:144 midi2ly.py:164 update-lily.py:153 +#: ly2dvi.py:144 midi2ly.py:164 mup2ly.py:161 update-lily.py:153 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:202 midi2ly.py:222 update-lily.py:211 +#: ly2dvi.py:202 midi2ly.py:222 mup2ly.py:219 update-lily.py:211 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Uso: %s [OPZIONE... [FILE]" -#: ly2dvi.py:206 midi2ly.py:226 update-lily.py:215 main.cc:152 +#: ly2dvi.py:206 midi2ly.py:226 mup2ly.py:223 update-lily.py:215 main.cc:158 msgid "Options:" msgstr "Opzioni: " -#: ly2dvi.py:210 midi2ly.py:230 update-lily.py:219 main.cc:169 +#: ly2dvi.py:210 midi2ly.py:230 mup2ly.py:227 update-lily.py:219 main.cc:175 #, c-format msgid "Report bugs to %s" msgstr "" -#: ly2dvi.py:238 midi2ly.py:258 update-lily.py:247 +#: ly2dvi.py:238 midi2ly.py:258 mup2ly.py:255 update-lily.py:247 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:243 midi2ly.py:262 update-lily.py:251 +#: ly2dvi.py:243 midi2ly.py:262 mup2ly.py:260 update-lily.py:251 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:245 midi2ly.py:264 update-lily.py:253 +#: ly2dvi.py:246 midi2ly.py:264 mup2ly.py:263 update-lily.py:253 msgid "(ignored)" msgstr "" -#: ly2dvi.py:255 midi2ly.py:274 update-lily.py:263 +#: ly2dvi.py:256 midi2ly.py:274 mup2ly.py:273 update-lily.py:263 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Genero le voci..." -#: ly2dvi.py:325 +#: ly2dvi.py:326 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: ly2dvi.py:328 main.cc:116 +#: ly2dvi.py:329 main.cc:117 #, fuzzy msgid "write Makefile dependencies for every input file" msgstr "" " -d, --dependencies scrive le dependenze del Makefile per ogni file di " "input\n" -#: ly2dvi.py:329 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:112 +#: ly2dvi.py:330 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:113 msgid "this help" msgstr "" -#: ly2dvi.py:330 main.cc:114 main.cc:119 +#: ly2dvi.py:331 main.cc:115 main.cc:120 msgid "DIR" msgstr "" -#: ly2dvi.py:330 +#: ly2dvi.py:331 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: ly2dvi.py:331 +#: ly2dvi.py:332 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:332 +#: ly2dvi.py:333 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:333 main.cc:117 +#: ly2dvi.py:334 main.cc:118 #, fuzzy msgid "produce MIDI output only" msgstr " -M, --no-paper produce solo output midi\n" -#: ly2dvi.py:334 ly2dvi.py:335 midi2ly.py:100 main.cc:115 main.cc:118 +#: ly2dvi.py:335 ly2dvi.py:336 midi2ly.py:100 main.cc:116 main.cc:119 msgid "FILE" msgstr "" -#: ly2dvi.py:334 midi2ly.py:100 +#: ly2dvi.py:335 midi2ly.py:100 msgid "write ouput to FILE" msgstr "" -#: ly2dvi.py:335 +#: ly2dvi.py:336 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:337 +#: ly2dvi.py:338 msgid "Make a picture of the first system." msgstr "" -#: ly2dvi.py:338 +#: ly2dvi.py:339 msgid "Set the resolution of the preview to RES." msgstr "" -#: ly2dvi.py:339 +#: ly2dvi.py:340 #, fuzzy msgid "generate PostScript output" msgstr "vincoli degenerati" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:341 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:122 +#: ly2dvi.py:342 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:128 msgid "verbose" msgstr "" -#: ly2dvi.py:342 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:121 +#: ly2dvi.py:343 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:127 msgid "print version number" msgstr "" -#: ly2dvi.py:343 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:123 +#: ly2dvi.py:344 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:129 #, fuzzy msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" -#: ly2dvi.py:429 +#: ly2dvi.py:432 #, fuzzy, c-format msgid "no such setting: %s" msgstr "% strumento:" -#: ly2dvi.py:480 +#: ly2dvi.py:497 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Genero le voci..." -#: ly2dvi.py:536 +#: ly2dvi.py:553 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:576 +#: ly2dvi.py:593 #, fuzzy, c-format msgid "invalid value: %s" msgstr "carattere illegale: `%c'" -#: ly2dvi.py:782 +#: ly2dvi.py:698 +msgid "LaTeX failed on the output file." +msgstr "" + +#: ly2dvi.py:700 +#, c-format +msgid " % logstr))" +msgstr "" + +#: ly2dvi.py:813 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "non posso aprire il file: `%s'" -#: ly2dvi.py:800 midi2ly.py:1012 update-lily.py:458 +#: ly2dvi.py:831 midi2ly.py:1012 update-lily.py:458 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:887 +#: ly2dvi.py:918 #, c-format msgid "filename should not contain spaces: `%s'" msgstr "" -#: ly2dvi.py:957 scores.cc:46 +#: ly2dvi.py:988 scores.cc:46 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "L'output stampato è inviato a %s..." -#: ly2dvi.py:968 midi2ly.py:996 +#: ly2dvi.py:999 midi2ly.py:996 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "L'output MIDI è inviato a %s..." -#: ly2dvi.py:970 includable-lexer.cc:49 lily-guile.cc:135 scores.cc:137 +#: ly2dvi.py:1001 includable-lexer.cc:49 lily-guile.cc:160 scores.cc:137 #: scores.cc:143 #, c-format msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" -#: ly2dvi.py:978 midi2ly.py:1081 +#: ly2dvi.py:1009 midi2ly.py:1081 msgid "no files specified on command line." msgstr "" @@ -266,7 +275,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: mup2ly.py:75 main.cc:118 +#: mup2ly.py:75 main.cc:119 msgid "write output to FILE" msgstr "" @@ -274,17 +283,17 @@ msgstr "" msgid "only pre-process" msgstr "" -#: mup2ly.py:827 +#: mup2ly.py:1073 #, fuzzy, c-format msgid "no such context: %s" msgstr "% strumento:" -#: mup2ly.py:1051 +#: mup2ly.py:1297 #, fuzzy, c-format msgid "Processing `%s'..." msgstr "Elaboro..." -#: mup2ly.py:1070 +#: mup2ly.py:1316 #, fuzzy, c-format msgid "Writing `%s'..." msgstr "Genero le voci..." @@ -367,22 +376,22 @@ msgstr "Genero le voci..." msgid "Building `%s'..." msgstr "Genero le voci..." -#: getopt-long.cc:145 +#: getopt-long.cc:146 #, c-format msgid "option `%s' requires an argument" msgstr "l'opzione `%s' richiede un argomento" -#: getopt-long.cc:149 +#: getopt-long.cc:150 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "opzione `%s' non accetta argomenti" -#: getopt-long.cc:153 +#: getopt-long.cc:154 #, c-format msgid "unrecognized option: `%s'" msgstr "opzione non riconosciuta: `%s'" -#: getopt-long.cc:160 +#: getopt-long.cc:161 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "argomento `%s' non valido per l'opzione `%s'" @@ -392,7 +401,7 @@ msgstr "argomento `%s' non valido per l'opzione `%s'" msgid "non fatal error: " msgstr "Errore non fatale: " -#: input.cc:106 source-file.cc:63 source-file.cc:156 +#: input.cc:106 source-file.cc:68 source-file.cc:161 msgid "position unknown" msgstr "posizione sconosciuta" @@ -401,7 +410,7 @@ msgid "can't map file" msgstr "non posso mappare il documento" #: mapped-file-storage.cc:87 simple-file-storage.cc:44 scores.cc:50 -#: streams.cc:37 +#: streams.cc:38 #, c-format msgid "can't open file: `%s'" msgstr "non posso aprire il file: `%s'" @@ -411,37 +420,37 @@ msgstr "non posso aprire il file: `%s'" msgid "Huh? Got %d, expected %d characters" msgstr "Come? Ho trovato %d caratteri al posto di %d" -#: warn.cc:10 warn.cc:17 -#, fuzzy, c-format -msgid "error: %s\n" -msgstr "errore: " - -#: warn.cc:23 +#: warn.cc:24 #, fuzzy, c-format msgid "warning: %s\n" msgstr "attenzione: " -#: warn.cc:35 +#: warn.cc:30 +#, fuzzy, c-format +msgid "error: %s\n" +msgstr "errore: " + +#: warn.cc:43 #, c-format msgid "programming error: %s (Continuing; cross thumbs)\n" msgstr "" -#: accidental-engraver.cc:174 +#: accidental-engraver.cc:181 new-accidental-engraver.cc:234 #, c-format msgid "Accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:199 +#: accidental-engraver.cc:206 new-accidental-engraver.cc:259 #, fuzzy, c-format msgid "unknown accidental typesetting: %s. Ignored" msgstr "stringa di escape sconosciuta: `\\%s'" -#: accidental-engraver.cc:215 +#: accidental-engraver.cc:222 new-accidental-engraver.cc:275 #, c-format msgid "Symbol is not a parent context: %s. Ignored" msgstr "" -#: accidental-engraver.cc:218 +#: accidental-engraver.cc:225 new-accidental-engraver.cc:278 #, c-format msgid "Accidental typesetting must be pair or context-name: %s" msgstr "" @@ -500,7 +509,7 @@ msgstr "(Il path di caricamento msgid "Giving up" msgstr "" -#: auto-change-iterator.cc:43 change-iterator.cc:59 +#: auto-change-iterator.cc:43 change-iterator.cc:60 #: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" @@ -510,23 +519,7 @@ msgstr "" msgid "barcheck failed at: %s" msgstr "controllo del battute fallito: %s" -#: beam.cc:153 -#, fuzzy -msgid "beam has less than two visible stems" -msgstr "beam con meno di due gambi" - -#: beam.cc:158 -#, fuzzy -msgid "Beam has less than two stems. Removing beam." -msgstr "beam con meno di due gambi" - -#: beam.cc:892 -msgid "" -"Not sure that we can find a nice beam slope (no viable initial configuration " -"found)." -msgstr "" - -#: beam-engraver.cc:166 +#: beam-engraver.cc:167 msgid "already have a beam" msgstr "" @@ -535,7 +528,7 @@ msgstr "" msgid "unterminated beam" msgstr "beam non terminato" -#: beam-engraver.cc:267 chord-tremolo-engraver.cc:185 +#: beam-engraver.cc:267 chord-tremolo-engraver.cc:175 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "I gambi devono avere una struttura ritmica." @@ -548,12 +541,28 @@ msgstr "il gambo non rientra nel beam" msgid "beam was started here" msgstr "" +#: beam.cc:138 +#, fuzzy +msgid "beam has less than two visible stems" +msgstr "beam con meno di due gambi" + +#: beam.cc:143 +#, fuzzy +msgid "Beam has less than two stems. Removing beam." +msgstr "beam con meno di due gambi" + +#: beam.cc:797 +msgid "" +"Not sure that we can find a nice beam slope (no viable initial configuration " +"found)." +msgstr "" + #: break-align-interface.cc:166 #, fuzzy, c-format msgid "No spacing entry from %s to `%s'" msgstr "traduttore sconosciuto `%s'" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "non posso cambiare `%s' in `%s'" @@ -564,14 +573,23 @@ msgstr "non posso cambiare `%s' in `%s'" #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:78 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "" -#: change-iterator.cc:81 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "" +#: chord-tremolo-engraver.cc:137 percent-repeat-engraver.cc:182 +#, fuzzy +msgid "unterminated chord tremolo" +msgstr "beam non terminato" + +#: chord-tremolo-iterator.cc:50 +msgid "no one to print a tremolos" +msgstr "" + #: chord.cc:313 #, c-format msgid "invalid subtraction: not part of chord: %s" @@ -582,39 +600,30 @@ msgstr "" msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:142 percent-repeat-engraver.cc:182 -#, fuzzy -msgid "unterminated chord tremolo" -msgstr "beam non terminato" - -#: chord-tremolo-iterator.cc:49 -msgid "no one to print a tremolos" -msgstr "" - #: dimensions.cc:13 msgid "NaN" msgstr "" -#: dynamic-engraver.cc:189 span-dynamic-performer.cc:82 +#: dynamic-engraver.cc:187 span-dynamic-performer.cc:82 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "non trovo un (de)crescendo fino alla fine" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:211 #, fuzzy msgid "already have a crescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:212 #, fuzzy msgid "already have a decrescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:217 +#: dynamic-engraver.cc:215 msgid "Cresc started here" msgstr "" -#: dynamic-engraver.cc:309 +#: dynamic-engraver.cc:307 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminato" @@ -631,11 +640,11 @@ msgstr "" msgid "no one to print a repeat brace" msgstr "" -#: font-interface.cc:241 +#: font-interface.cc:238 msgid "couldn't find any font satisfying " msgstr "" -#: gourlay-breaking.cc:170 +#: gourlay-breaking.cc:171 msgid "No feasible line breaking found" msgstr "" @@ -706,19 +715,19 @@ msgstr "" msgid "ligature was started here" msgstr "un cambio di tempo non è ammesso in questo punto" -#: lily-guile.cc:137 +#: lily-guile.cc:162 #, fuzzy, c-format msgid "(load path: `%s')" msgstr "(Il path di caricamento è `%s'" -#: lily-guile.cc:664 +#: lily-guile.cc:697 #, c-format msgid "" "Can't find property type-check for `%s' (%s). Perhaps you made a typing " "error? Doing assignment anyway." msgstr "" -#: lily-guile.cc:682 +#: lily-guile.cc:715 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" @@ -731,56 +740,59 @@ msgstr "" msgid "round filled box vertical extent smaller than blot; decreasing blot" msgstr "" -#: lyric-phrasing-engraver.cc:279 +#: lyric-phrasing-engraver.cc:301 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:284 +#: lyric-phrasing-engraver.cc:307 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" #. print example usage: lilypond -e "" ? -#: main.cc:108 +#: main.cc:109 msgid "EXPR" msgstr "" -#: main.cc:108 +#: main.cc:109 msgid "Scheme options: try -e \"(set-lily-option 'help 0)\" for more help." msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:111 +#: main.cc:112 msgid "EXT" msgstr "" -#: main.cc:111 +#: main.cc:112 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)" msgstr "" -#: main.cc:113 +#: main.cc:114 msgid "FIELD" msgstr "" -#: main.cc:113 +#: main.cc:114 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:114 +#: main.cc:115 #, fuzzy msgid "add DIR to search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: main.cc:115 +#: main.cc:116 #, fuzzy msgid "use FILE as init file" msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" -#: main.cc:119 +#: main.cc:120 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:120 +#. +#. should audit again. +#. +#: main.cc:125 #, fuzzy msgid "inhibit file output naming and exporting" msgstr "" @@ -790,29 +802,29 @@ msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:140 +#: main.cc:146 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:142 +#: main.cc:148 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:146 +#: main.cc:152 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" msgstr "" -#: main.cc:156 +#: main.cc:162 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:177 +#: main.cc:183 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -820,17 +832,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:184 main.cc:196 +#: main.cc:190 main.cc:202 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s di" -#: main.cc:194 +#: main.cc:200 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:202 +#: main.cc:208 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" @@ -862,6 +874,26 @@ msgstr "" "Cambridge, MA 02136\n" "USA.\n" +#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 +msgid "unexpected case fall-through" +msgstr "" + +#: mensural-ligature-engraver.cc:332 +msgid "ligature with less than 2 heads -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:347 +msgid "can not determine pitch of ligature primitive -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:370 +msgid "prime interval within ligature -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:380 +msgid "mensural ligature: duration none of L, B, S -> skipping" +msgstr "" + #: mensural-ligature.cc:152 #, c-format msgid "Mensural_ligature: thickness undefined on flexa %d; assuming 1.4" @@ -885,26 +917,6 @@ msgstr "" msgid "Menusral_ligature: (join_left == 0)" msgstr "" -#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 -msgid "unexpected case fall-through" -msgstr "" - -#: mensural-ligature-engraver.cc:332 -msgid "ligature with less than 2 heads -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:347 -msgid "can not determine pitch of ligature primitive -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:370 -msgid "prime interval within ligature -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:380 -msgid "mensural ligature: duration none of L, B, S -> skipping" -msgstr "" - #: midi-item.cc:144 #, fuzzy, c-format msgid "no such instrument: `%s'" @@ -918,22 +930,22 @@ msgstr "indicazione durata priva di senso" msgid "silly pitch" msgstr "indicazione altezza priva di senso" -#: music.cc:152 -#, fuzzy, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "la trasposizine di %s rende le alterazioni più che doppie" - #: music-output-def.cc:113 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "non trovo `%s'" -#: my-lily-lexer.cc:141 +#: music.cc:159 +#, fuzzy, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "la trasposizine di %s rende le alterazioni più che doppie" + +#: my-lily-lexer.cc:142 #, fuzzy, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Il nome dell'identificatore è una parola chiave (`%s')" -#: my-lily-lexer.cc:161 +#: my-lily-lexer.cc:162 #, c-format msgid "error at EOF: %s" msgstr "errore alla fine del file: %s" @@ -947,7 +959,7 @@ msgstr "Analisi..." msgid "Braces don't match" msgstr "le bretelle no si accoppiano" -#: note-collision.cc:332 +#: note-collision.cc:340 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Troppe collisioni tra colonne di note. Le ignoro." @@ -970,7 +982,7 @@ msgstr "L'output stampato msgid ", at " msgstr ", a " -#: paper-score.cc:76 system.cc:346 +#: paper-score.cc:76 #, c-format msgid "Element count %d " msgstr "" @@ -1049,7 +1061,7 @@ msgstr "non trovo le estremit msgid "can't find start of piano pedal: `%s'" msgstr "non risco a trovare una ruling note a %s" -#: piano-pedal-engraver.cc:402 +#: piano-pedal-engraver.cc:404 #, fuzzy msgid "unterminated pedal bracket" msgstr "beam non terminato" @@ -1096,39 +1108,49 @@ msgstr "" msgid "too many colliding rests" msgstr "Troppi crescendi" -#: scm-option.cc:75 +#: scm-option.cc:77 msgid "lilypond -e EXPR means" msgstr "" -#: scm-option.cc:121 +#: scm-option.cc:123 msgid "Unknown internal option!" msgstr "" -#: score.cc:91 +#: score-engraver.cc:103 +msgid "" +"Could not find feta20.afm. Fonts have not been installed properly; Aborting" +msgstr "" + +#: score-engraver.cc:207 +#, fuzzy, c-format +msgid "unbound spanner `%s'" +msgstr "Spanner non legato `%s'" + +#: score.cc:93 +#, c-format +msgid "stack size cur %d, max %d\n" +msgstr "" + +#: score.cc:110 msgid "Interpreting music..." msgstr "Interpretazione della musica..." -#: score.cc:105 +#: score.cc:123 #, fuzzy msgid "Need music in a score" msgstr "ho bisogno di musica nello spartito" #. should we? hampers debugging. -#: score.cc:118 +#: score.cc:136 #, fuzzy msgid "Errors found/*, not processing score*/" msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/" -#: score.cc:125 +#: score.cc:143 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "durata: %.2f secondi" -#: score-engraver.cc:181 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "Spanner non legato `%s'" - #: scores.cc:107 #, fuzzy msgid "Score contains errors; will not process it" @@ -1154,16 +1176,6 @@ msgstr "" msgid "No spring between column %d and next one" msgstr "" -#: slur.cc:53 -#, fuzzy -msgid "Putting slur over rest." -msgstr "Metto uno slur sulla pausa." - -#: slur.cc:417 -#, fuzzy -msgid "Slur over rest?" -msgstr "Metto uno slur sulla pausa." - #: slur-engraver.cc:124 msgid "unterminated slur" msgstr "slur non terminato" @@ -1175,48 +1187,64 @@ msgstr "slur non terminato" msgid "can't find start of slur" msgstr "non trovo le estremità di %s" +#: slur.cc:53 +#, fuzzy +msgid "Putting slur over rest." +msgstr "Metto uno slur sulla pausa." + +#: slur.cc:417 +#, fuzzy +msgid "Slur over rest?" +msgstr "Metto uno slur sulla pausa." + +#: spacing-spanner.cc:382 +#, c-format +msgid "Global shortest duration is %s\n" +msgstr "" + #: spring-smob.cc:32 #, c-format msgid "#" msgstr "" -#: staff-symbol.cc:60 +#: staff-symbol.cc:62 msgid "staff symbol: indentation yields beyond end of line" msgstr "" -#: stem.cc:121 -#, fuzzy -msgid "Weird stem size; check for narrow beams" -msgstr "dimensione del gambo poco ortodossa; check for narrow beams" - #: stem-engraver.cc:117 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: streams.cc:33 +#: stem.cc:118 +#, fuzzy +msgid "Weird stem size; check for narrow beams" +msgstr "dimensione del gambo poco ortodossa; check for narrow beams" + +#: streams.cc:34 #, fuzzy, c-format msgid "can't create directory: `%s'" msgstr "non trovo e non posso creare `%s'" -#: streams.cc:47 +#: streams.cc:48 #, fuzzy msgid "Error syncing file (disk full?)" msgstr "errore nel sincronizzare il file (disco pieno?)" -#: system.cc:93 +#: system.cc:109 #, c-format msgid "Element count %d." msgstr "" -#: system.cc:360 +#: system.cc:362 +#, c-format +msgid "Grob count %d " +msgstr "" + +#: system.cc:376 msgid "Calculating column positions..." msgstr "Calcolo delle posizioni della colonne..." -#: text-spanner.cc:130 -msgid "Text_spanner too small" -msgstr "" - #: text-spanner-engraver.cc:92 #, fuzzy msgid "can't find start of text spanner" @@ -1232,10 +1260,9 @@ msgstr "crescendo non terminato" msgid "unterminated text spanner" msgstr "extender non terminato" -#: tfm.cc:83 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "non riesco a trovare il carattere `%s'" +#: text-spanner.cc:130 +msgid "Text_spanner too small" +msgstr "" #: tfm-reader.cc:106 #, c-format @@ -1247,6 +1274,11 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" +#: tfm.cc:83 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "non riesco a trovare il carattere `%s'" + #: tie-engraver.cc:216 msgid "lonely tie" msgstr "" @@ -1293,81 +1325,81 @@ msgstr "non trovo e non posso creare '%s' chiamato '%s'" msgid "can't find or create: `%s'" msgstr "non trovo e non posso creare `%s'" -#: volta-engraver.cc:109 +#: volta-engraver.cc:111 msgid "No volta spanner to end" msgstr "" -#: volta-engraver.cc:119 +#: volta-engraver.cc:121 msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "" -#: volta-engraver.cc:123 +#: volta-engraver.cc:125 msgid "Also have a stopped spanner. Giving up." msgstr "" -#: parser.yy:128 +#: parser.yy:129 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:436 +#: parser.yy:437 msgid "Identifier should have alphabetic characters only" msgstr "" -#: parser.yy:724 +#: parser.yy:732 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:780 +#: parser.yy:801 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:785 +#: parser.yy:806 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1355 +#: parser.yy:1390 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1365 +#: parser.yy:1400 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1491 +#: parser.yy:1526 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1502 +#: parser.yy:1537 #, fuzzy msgid "Must have duration object" msgstr "indicazione durata priva di senso" -#: parser.yy:1511 parser.yy:1519 +#: parser.yy:1546 parser.yy:1554 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "bisogna essere in Lyric mode per i testi" -#: parser.yy:1679 parser.yy:1732 +#: parser.yy:1722 parser.yy:1775 #, c-format msgid "not a duration: %d" msgstr "non è una durata: %d" -#: parser.yy:1819 +#: parser.yy:1862 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "bisogna essere in Note mode per le note" -#: parser.yy:1917 +#: parser.yy:1961 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "bisogna essere in Chord mode per gli accordi" -#: parser.yy:2097 +#: parser.yy:2141 msgid "need integer number arg" msgstr "" -#: parser.yy:2169 +#: parser.yy:2213 msgid "Suspect duration found following this beam" msgstr "" diff --git a/po/ja.po b/po/ja.po index 748a6ef87a..ac4388b002 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.2.17\n" -"POT-Creation-Date: 2002-06-13 17:14+0200\n" +"POT-Creation-Date: 2002-07-21 01:00+0200\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -13,192 +13,201 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: lilypond-book.py:1171 ly2dvi.py:439 ly2dvi.py:465 +#: lilypond-book.py:1011 ly2dvi.py:442 ly2dvi.py:468 #, fuzzy, c-format msgid "Running %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:126 midi2ly.py:148 update-lily.py:137 input.cc:87 +#: ly2dvi.py:126 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " msgstr "·Ù¹ð: " -#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:782 ly2dvi.py:800 midi2ly.py:163 -#: midi2ly.py:1012 midi2ly.py:1081 update-lily.py:152 update-lily.py:458 -#: input.cc:92 +#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:813 ly2dvi.py:831 midi2ly.py:163 +#: midi2ly.py:1012 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160 +#: update-lily.py:152 update-lily.py:458 input.cc:92 msgid "error: " msgstr "¥¨¥é¡¼: " -#: ly2dvi.py:144 midi2ly.py:164 update-lily.py:153 +#: ly2dvi.py:144 midi2ly.py:164 mup2ly.py:161 update-lily.py:153 #, fuzzy msgid "Exiting ... " msgstr "¹Ô ..." -#: ly2dvi.py:202 midi2ly.py:222 update-lily.py:211 +#: ly2dvi.py:202 midi2ly.py:222 mup2ly.py:219 update-lily.py:211 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" -#: ly2dvi.py:206 midi2ly.py:226 update-lily.py:215 main.cc:152 +#: ly2dvi.py:206 midi2ly.py:226 mup2ly.py:223 update-lily.py:215 main.cc:158 msgid "Options:" msgstr "¥ª¥×¥·¥ç¥ó:" -#: ly2dvi.py:210 midi2ly.py:230 update-lily.py:219 main.cc:169 +#: ly2dvi.py:210 midi2ly.py:230 mup2ly.py:227 update-lily.py:219 main.cc:175 #, c-format msgid "Report bugs to %s" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" -#: ly2dvi.py:238 midi2ly.py:258 update-lily.py:247 +#: ly2dvi.py:238 midi2ly.py:258 mup2ly.py:255 update-lily.py:247 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:243 midi2ly.py:262 update-lily.py:251 +#: ly2dvi.py:243 midi2ly.py:262 mup2ly.py:260 update-lily.py:251 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:245 midi2ly.py:264 update-lily.py:253 +#: ly2dvi.py:246 midi2ly.py:264 mup2ly.py:263 update-lily.py:253 msgid "(ignored)" msgstr "" -#: ly2dvi.py:255 midi2ly.py:274 update-lily.py:263 +#: ly2dvi.py:256 midi2ly.py:274 mup2ly.py:273 update-lily.py:263 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:325 +#: ly2dvi.py:326 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: ly2dvi.py:328 main.cc:116 +#: ly2dvi.py:329 main.cc:117 msgid "write Makefile dependencies for every input file" msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" -#: ly2dvi.py:329 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:112 +#: ly2dvi.py:330 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:113 msgid "this help" msgstr "¤³¤Î¥Ø¥ë¥×" -#: ly2dvi.py:330 main.cc:114 main.cc:119 +#: ly2dvi.py:331 main.cc:115 main.cc:120 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:330 +#: ly2dvi.py:331 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: ly2dvi.py:331 +#: ly2dvi.py:332 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:332 +#: ly2dvi.py:333 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:333 main.cc:117 +#: ly2dvi.py:334 main.cc:118 msgid "produce MIDI output only" msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß" -#: ly2dvi.py:334 ly2dvi.py:335 midi2ly.py:100 main.cc:115 main.cc:118 +#: ly2dvi.py:335 ly2dvi.py:336 midi2ly.py:100 main.cc:116 main.cc:119 msgid "FILE" msgstr "FILE" -#: ly2dvi.py:334 midi2ly.py:100 +#: ly2dvi.py:335 midi2ly.py:100 #, fuzzy msgid "write ouput to FILE" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" -#: ly2dvi.py:335 +#: ly2dvi.py:336 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:337 +#: ly2dvi.py:338 msgid "Make a picture of the first system." msgstr "" -#: ly2dvi.py:338 +#: ly2dvi.py:339 msgid "Set the resolution of the preview to RES." msgstr "" -#: ly2dvi.py:339 +#: ly2dvi.py:340 #, fuzzy msgid "generate PostScript output" msgstr "À©¸Â¤ò´ËÏÂ" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:341 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:122 +#: ly2dvi.py:342 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:128 #, fuzzy msgid "verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: ly2dvi.py:342 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:121 +#: ly2dvi.py:343 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:127 msgid "print version number" msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" -#: ly2dvi.py:343 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:123 +#: ly2dvi.py:344 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:129 msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" -#: ly2dvi.py:429 +#: ly2dvi.py:432 #, fuzzy, c-format msgid "no such setting: %s" msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:480 +#: ly2dvi.py:497 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:536 +#: ly2dvi.py:553 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:576 +#: ly2dvi.py:593 #, fuzzy, c-format msgid "invalid value: %s" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: ly2dvi.py:782 +#: ly2dvi.py:698 +msgid "LaTeX failed on the output file." +msgstr "" + +#: ly2dvi.py:700 +#, c-format +msgid " % logstr))" +msgstr "" + +#: ly2dvi.py:813 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:800 midi2ly.py:1012 update-lily.py:458 +#: ly2dvi.py:831 midi2ly.py:1012 update-lily.py:458 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:887 +#: ly2dvi.py:918 #, fuzzy, c-format msgid "filename should not contain spaces: `%s'" msgstr "´û¤Ë´Þ¤ó¤Ç¤¤¤Þ¤¹: `%s'" -#: ly2dvi.py:957 scores.cc:46 +#: ly2dvi.py:988 scores.cc:46 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: ly2dvi.py:968 midi2ly.py:996 +#: ly2dvi.py:999 midi2ly.py:996 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: ly2dvi.py:970 includable-lexer.cc:49 lily-guile.cc:135 scores.cc:137 +#: ly2dvi.py:1001 includable-lexer.cc:49 lily-guile.cc:160 scores.cc:137 #: scores.cc:143 #, fuzzy, c-format msgid "can't find file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:978 midi2ly.py:1081 +#: ly2dvi.py:1009 midi2ly.py:1081 msgid "no files specified on command line." msgstr "" @@ -264,7 +273,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: mup2ly.py:75 main.cc:118 +#: mup2ly.py:75 main.cc:119 #, fuzzy msgid "write output to FILE" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" @@ -273,17 +282,17 @@ msgstr "BASENAME[-x]. msgid "only pre-process" msgstr "" -#: mup2ly.py:827 +#: mup2ly.py:1073 #, fuzzy, c-format msgid "no such context: %s" msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" -#: mup2ly.py:1051 +#: mup2ly.py:1297 #, fuzzy, c-format msgid "Processing `%s'..." msgstr "½èÍýÃæ..." -#: mup2ly.py:1070 +#: mup2ly.py:1316 #, fuzzy, c-format msgid "Writing `%s'..." msgstr "¹Ô ..." @@ -366,22 +375,22 @@ msgstr " msgid "Building `%s'..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: getopt-long.cc:145 +#: getopt-long.cc:146 #, fuzzy, c-format msgid "option `%s' requires an argument" msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹" -#: getopt-long.cc:149 +#: getopt-long.cc:150 #, fuzzy, c-format msgid "option `%s' doesn't allow an argument" msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òµö²Ä¤·¤Þ¤»¤ó" -#: getopt-long.cc:153 +#: getopt-long.cc:154 #, c-format msgid "unrecognized option: `%s'" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó: `%s'" -#: getopt-long.cc:160 +#: getopt-long.cc:161 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "¥ª¥×¥·¥ç¥ó `%2$s' ¤ËÂФ¹¤ë̵¸ú¤Ê°ú¿ô `%1$s'" @@ -391,7 +400,7 @@ msgstr " msgid "non fatal error: " msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: " -#: input.cc:106 source-file.cc:63 source-file.cc:156 +#: input.cc:106 source-file.cc:68 source-file.cc:161 msgid "position unknown" msgstr "°ÌÃÖ¤¬È½¤ê¤Þ¤»¤ó" @@ -401,7 +410,7 @@ msgid "can't map file" msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó" #: mapped-file-storage.cc:87 simple-file-storage.cc:44 scores.cc:50 -#: streams.cc:37 +#: streams.cc:38 #, fuzzy, c-format msgid "can't open file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" @@ -411,37 +420,37 @@ msgstr " msgid "Huh? Got %d, expected %d characters" msgstr "¤Ï¡© %2$d ʸ»ú¤¢¤ë¤Ï¤º¤Ê¤Î¤Ë %1$d ʸ»ú¤·¤«¤Ê¤¤" -#: warn.cc:10 warn.cc:17 -#, fuzzy, c-format -msgid "error: %s\n" -msgstr "¥¨¥é¡¼: " - -#: warn.cc:23 +#: warn.cc:24 #, fuzzy, c-format msgid "warning: %s\n" msgstr "·Ù¹ð: " -#: warn.cc:35 +#: warn.cc:30 +#, fuzzy, c-format +msgid "error: %s\n" +msgstr "¥¨¥é¡¼: " + +#: warn.cc:43 #, fuzzy, c-format msgid "programming error: %s (Continuing; cross thumbs)\n" msgstr " (³¤±¤Þ¤¹ -- cross thumbs)" -#: accidental-engraver.cc:174 +#: accidental-engraver.cc:181 new-accidental-engraver.cc:234 #, c-format msgid "Accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:199 +#: accidental-engraver.cc:206 new-accidental-engraver.cc:259 #, fuzzy, c-format msgid "unknown accidental typesetting: %s. Ignored" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'" -#: accidental-engraver.cc:215 +#: accidental-engraver.cc:222 new-accidental-engraver.cc:275 #, c-format msgid "Symbol is not a parent context: %s. Ignored" msgstr "" -#: accidental-engraver.cc:218 +#: accidental-engraver.cc:225 new-accidental-engraver.cc:278 #, c-format msgid "Accidental typesetting must be pair or context-name: %s" msgstr "" @@ -500,7 +509,7 @@ msgstr "( msgid "Giving up" msgstr "Äü¤á¤Þ¤·¤¿" -#: auto-change-iterator.cc:43 change-iterator.cc:59 +#: auto-change-iterator.cc:43 change-iterator.cc:60 #: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹" @@ -510,23 +519,7 @@ msgstr " msgid "barcheck failed at: %s" msgstr "¾®Àá¥Á¥§¥Ã¥¯¤¬¼ºÇÔ: %s" -#: beam.cc:153 -#, fuzzy -msgid "beam has less than two visible stems" -msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" - -#: beam.cc:158 -#, fuzzy -msgid "Beam has less than two stems. Removing beam." -msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" - -#: beam.cc:892 -msgid "" -"Not sure that we can find a nice beam slope (no viable initial configuration " -"found)." -msgstr "" - -#: beam-engraver.cc:166 +#: beam-engraver.cc:167 #, fuzzy msgid "already have a beam" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" @@ -536,7 +529,7 @@ msgstr " msgid "unterminated beam" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" -#: beam-engraver.cc:267 chord-tremolo-engraver.cc:185 +#: beam-engraver.cc:267 chord-tremolo-engraver.cc:175 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "ÉäÈø¤Ï¥ê¥º¥à¹½Â¤¤ò»ý¤¿¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó" @@ -551,12 +544,28 @@ msgstr " msgid "beam was started here" msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿" +#: beam.cc:138 +#, fuzzy +msgid "beam has less than two visible stems" +msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" + +#: beam.cc:143 +#, fuzzy +msgid "Beam has less than two stems. Removing beam." +msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" + +#: beam.cc:797 +msgid "" +"Not sure that we can find a nice beam slope (no viable initial configuration " +"found)." +msgstr "" + #: break-align-interface.cc:166 #, fuzzy, c-format msgid "No spacing entry from %s to `%s'" msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, fuzzy, c-format msgid "can't change `%s' to `%s'" msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó" @@ -567,14 +576,24 @@ msgstr "`%s' #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:78 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤½¤Î¤â¤Î¤Ç¤¹" -#: change-iterator.cc:81 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" +#: chord-tremolo-engraver.cc:137 percent-repeat-engraver.cc:182 +#, fuzzy +msgid "unterminated chord tremolo" +msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" + +#: chord-tremolo-iterator.cc:50 +#, fuzzy +msgid "no one to print a tremolos" +msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" + #: chord.cc:313 #, c-format msgid "invalid subtraction: not part of chord: %s" @@ -585,41 +604,31 @@ msgstr "̵ msgid "invalid inversion pitch: not part of chord: %s" msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: chord-tremolo-engraver.cc:142 percent-repeat-engraver.cc:182 -#, fuzzy -msgid "unterminated chord tremolo" -msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" - -#: chord-tremolo-iterator.cc:49 -#, fuzzy -msgid "no one to print a tremolos" -msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" - #: dimensions.cc:13 msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:189 span-dynamic-performer.cc:82 +#: dynamic-engraver.cc:187 span-dynamic-performer.cc:82 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:211 #, fuzzy msgid "already have a crescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:212 #, fuzzy msgid "already have a decrescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:217 +#: dynamic-engraver.cc:215 #, fuzzy msgid "Cresc started here" msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿" -#: dynamic-engraver.cc:309 +#: dynamic-engraver.cc:307 #, fuzzy msgid "unterminated (de)crescendo" msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É" @@ -636,11 +645,11 @@ msgstr " msgid "no one to print a repeat brace" msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" -#: font-interface.cc:241 +#: font-interface.cc:238 msgid "couldn't find any font satisfying " msgstr "" -#: gourlay-breaking.cc:170 +#: gourlay-breaking.cc:171 msgid "No feasible line breaking found" msgstr "" @@ -710,19 +719,19 @@ msgstr "" msgid "ligature was started here" msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿" -#: lily-guile.cc:137 +#: lily-guile.cc:162 #, c-format msgid "(load path: `%s')" msgstr "(Æɹþ¥Ñ¥¹: `%s')" -#: lily-guile.cc:664 +#: lily-guile.cc:697 #, c-format msgid "" "Can't find property type-check for `%s' (%s). Perhaps you made a typing " "error? Doing assignment anyway." msgstr "" -#: lily-guile.cc:682 +#: lily-guile.cc:715 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" @@ -735,72 +744,75 @@ msgstr "" msgid "round filled box vertical extent smaller than blot; decreasing blot" msgstr "" -#: lyric-phrasing-engraver.cc:279 +#: lyric-phrasing-engraver.cc:301 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:284 +#: lyric-phrasing-engraver.cc:307 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" #. print example usage: lilypond -e "" ? -#: main.cc:108 +#: main.cc:109 msgid "EXPR" msgstr "" -#: main.cc:108 +#: main.cc:109 msgid "Scheme options: try -e \"(set-lily-option 'help 0)\" for more help." msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:111 +#: main.cc:112 msgid "EXT" msgstr "EXT" -#: main.cc:111 +#: main.cc:112 #, fuzzy msgid "use output format EXT (tex [default], pdftex, ps, scm or as)" msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦" -#: main.cc:113 +#: main.cc:114 #, fuzzy msgid "FIELD" msgstr "FILE" -#: main.cc:113 +#: main.cc:114 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:114 +#: main.cc:115 msgid "add DIR to search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: main.cc:115 +#: main.cc:116 msgid "use FILE as init file" msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: main.cc:119 +#: main.cc:120 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:120 +#. +#. should audit again. +#. +#: main.cc:125 msgid "inhibit file output naming and exporting" msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:140 +#: main.cc:146 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." -#: main.cc:142 +#: main.cc:148 msgid "Typeset music and or play MIDI from FILE" msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë" -#: main.cc:146 +#: main.cc:152 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" @@ -810,11 +822,11 @@ msgstr "" "Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU ¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç" "¤¹¡£\n" -#: main.cc:156 +#: main.cc:162 msgid "This binary was compiled with the following options:" msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿" -#: main.cc:177 +#: main.cc:183 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -830,17 +842,17 @@ msgstr "" "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n" "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n" -#: main.cc:184 main.cc:196 +#: main.cc:190 main.cc:202 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s by" -#: main.cc:194 +#: main.cc:200 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- The GNU Project music typesetter" -#: main.cc:202 +#: main.cc:208 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" @@ -887,6 +899,26 @@ msgstr "" "¤Ç¤¹(COPYING ¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢Free Software Foundation,\n" "Inc., 675 Mass Ave, Cambridge, MA 02139, USA ¤Ë¼ê»æ¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" +#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 +msgid "unexpected case fall-through" +msgstr "" + +#: mensural-ligature-engraver.cc:332 +msgid "ligature with less than 2 heads -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:347 +msgid "can not determine pitch of ligature primitive -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:370 +msgid "prime interval within ligature -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:380 +msgid "mensural ligature: duration none of L, B, S -> skipping" +msgstr "" + #: mensural-ligature.cc:152 #, c-format msgid "Mensural_ligature: thickness undefined on flexa %d; assuming 1.4" @@ -910,26 +942,6 @@ msgstr "" msgid "Menusral_ligature: (join_left == 0)" msgstr "" -#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 -msgid "unexpected case fall-through" -msgstr "" - -#: mensural-ligature-engraver.cc:332 -msgid "ligature with less than 2 heads -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:347 -msgid "can not determine pitch of ligature primitive -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:370 -msgid "prime interval within ligature -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:380 -msgid "mensural ligature: duration none of L, B, S -> skipping" -msgstr "" - #: midi-item.cc:144 #, c-format msgid "no such instrument: `%s'" @@ -943,22 +955,22 @@ msgstr " msgid "silly pitch" msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á" -#: music.cc:152 -#, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" - #: music-output-def.cc:113 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: my-lily-lexer.cc:141 +#: music.cc:159 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" + +#: my-lily-lexer.cc:142 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "¼±ÊÌ»Ò̾¤Ï¥­¡¼¥ï¡¼¥É¤Ç¤¹: `%s'" -#: my-lily-lexer.cc:161 +#: my-lily-lexer.cc:162 #, c-format msgid "error at EOF: %s" msgstr "EOF ¤Î¤È¤³¤í¤Ç¥¨¥é¡¼: %s" @@ -971,7 +983,7 @@ msgstr " msgid "Braces don't match" msgstr "¥Ö¥ì¡¼¥¹¤¬°ìÃפ·¤Þ¤»¤ó" -#: note-collision.cc:332 +#: note-collision.cc:340 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£" @@ -993,7 +1005,7 @@ msgstr "%s msgid ", at " msgstr ", at " -#: paper-score.cc:76 system.cc:346 +#: paper-score.cc:76 #, c-format msgid "Element count %d " msgstr "" @@ -1071,7 +1083,7 @@ msgstr " msgid "can't find start of piano pedal: `%s'" msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: piano-pedal-engraver.cc:402 +#: piano-pedal-engraver.cc:404 #, fuzzy msgid "unterminated pedal bracket" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" @@ -1117,37 +1129,47 @@ msgstr "" msgid "too many colliding rests" msgstr "µÙÉä¤Î¾×Æͤ¬Â¿¤¹¤®¤Þ¤¹" -#: scm-option.cc:75 +#: scm-option.cc:77 msgid "lilypond -e EXPR means" msgstr "" -#: scm-option.cc:121 +#: scm-option.cc:123 msgid "Unknown internal option!" msgstr "" -#: score.cc:91 +#: score-engraver.cc:103 +msgid "" +"Could not find feta20.afm. Fonts have not been installed properly; Aborting" +msgstr "" + +#: score-engraver.cc:207 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" + +#: score.cc:93 +#, c-format +msgid "stack size cur %d, max %d\n" +msgstr "" + +#: score.cc:110 msgid "Interpreting music..." msgstr "³Ú¶Ê¤Î²ò¼áÃæ..." -#: score.cc:105 +#: score.cc:123 msgid "Need music in a score" msgstr "³ÚÉè¤Ë¤Ï³Ú¶Ê¤¬É¬ÍפǤ¹" #. should we? hampers debugging. -#: score.cc:118 +#: score.cc:136 msgid "Errors found/*, not processing score*/" msgstr "¥¨¥é¡¼¤òȯ¸«/*, ³ÚÉè¤ò½èÍý¤·¤Þ¤»¤ó*/" -#: score.cc:125 +#: score.cc:143 #, c-format msgid "elapsed time: %.2f seconds" msgstr "·Ð²á»þ´Ö: %.2f ÉÃ" -#: score-engraver.cc:181 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" - #: scores.cc:107 msgid "Score contains errors; will not process it" msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- ½èÍý¤·¤Þ¤»¤ó" @@ -1173,15 +1195,6 @@ msgstr "Single_malt_grouping_item: msgid "No spring between column %d and next one" msgstr "" -#: slur.cc:53 -#, fuzzy -msgid "Putting slur over rest." -msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£" - -#: slur.cc:417 -msgid "Slur over rest?" -msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" - #: slur-engraver.cc:124 msgid "unterminated slur" msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" @@ -1193,46 +1206,61 @@ msgstr " msgid "can't find start of slur" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" +#: slur.cc:53 +#, fuzzy +msgid "Putting slur over rest." +msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£" + +#: slur.cc:417 +msgid "Slur over rest?" +msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" + +#: spacing-spanner.cc:382 +#, c-format +msgid "Global shortest duration is %s\n" +msgstr "" + #: spring-smob.cc:32 #, c-format msgid "#" msgstr "" -#: staff-symbol.cc:60 +#: staff-symbol.cc:62 msgid "staff symbol: indentation yields beyond end of line" msgstr "" -#: stem.cc:121 -msgid "Weird stem size; check for narrow beams" -msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" - #: stem-engraver.cc:117 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)" -#: streams.cc:33 +#: stem.cc:118 +msgid "Weird stem size; check for narrow beams" +msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" + +#: streams.cc:34 #, fuzzy, c-format msgid "can't create directory: `%s'" msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'" -#: streams.cc:47 +#: streams.cc:48 msgid "Error syncing file (disk full?)" msgstr "¥Õ¥¡¥¤¥ë¤ÎƱĴ¥¨¥é¡¼ (¥Ç¥£¥¹¥¯¤¬°ìÇÕ?)" -#: system.cc:93 +#: system.cc:109 #, c-format msgid "Element count %d." msgstr "" -#: system.cc:360 +#: system.cc:362 +#, c-format +msgid "Grob count %d " +msgstr "" + +#: system.cc:376 msgid "Calculating column positions..." msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..." -#: text-spanner.cc:130 -msgid "Text_spanner too small" -msgstr "" - #: text-spanner-engraver.cc:92 #, fuzzy msgid "can't find start of text spanner" @@ -1248,10 +1276,9 @@ msgstr " msgid "unterminated text spanner" msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À" -#: tfm.cc:83 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" +#: text-spanner.cc:130 +msgid "Text_spanner too small" +msgstr "" #: tfm-reader.cc:106 #, fuzzy, c-format @@ -1263,6 +1290,11 @@ msgstr "`%s' msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó" +#: tfm.cc:83 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" + #: tie-engraver.cc:216 msgid "lonely tie" msgstr "°ì¤Ä¤À¤±¤Î¥¿¥¤" @@ -1309,78 +1341,78 @@ msgstr "`%2$s' msgid "can't find or create: `%s'" msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'" -#: volta-engraver.cc:109 +#: volta-engraver.cc:111 msgid "No volta spanner to end" msgstr "" -#: volta-engraver.cc:119 +#: volta-engraver.cc:121 msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "" -#: volta-engraver.cc:123 +#: volta-engraver.cc:125 msgid "Also have a stopped spanner. Giving up." msgstr "" -#: parser.yy:128 +#: parser.yy:129 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:436 +#: parser.yy:437 msgid "Identifier should have alphabetic characters only" msgstr "" -#: parser.yy:724 +#: parser.yy:732 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£" -#: parser.yy:780 +#: parser.yy:801 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:785 +#: parser.yy:806 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1355 +#: parser.yy:1390 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1365 +#: parser.yy:1400 msgid "Can't specify direction for this request" msgstr "¤³¤ÎÍ×µá¤ËÂФ¹¤ëÊý¸þ¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: parser.yy:1491 +#: parser.yy:1526 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1502 +#: parser.yy:1537 #, fuzzy msgid "Must have duration object" msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹" -#: parser.yy:1511 parser.yy:1519 +#: parser.yy:1546 parser.yy:1554 msgid "Have to be in Lyric mode for lyrics" msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1679 parser.yy:1732 +#: parser.yy:1722 parser.yy:1775 #, c-format msgid "not a duration: %d" msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d" -#: parser.yy:1819 +#: parser.yy:1862 msgid "Have to be in Note mode for notes" msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1917 +#: parser.yy:1961 msgid "Have to be in Chord mode for chords" msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:2097 +#: parser.yy:2141 msgid "need integer number arg" msgstr "" -#: parser.yy:2169 +#: parser.yy:2213 msgid "Suspect duration found following this beam" msgstr "" diff --git a/po/lilypond.pot b/po/lilypond.pot index ba1bbbbb44..09902a2cfc 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-06-13 17:14+0200\n" +"POT-Creation-Date: 2002-07-21 01:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,187 +15,196 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: lilypond-book.py:1171 ly2dvi.py:439 ly2dvi.py:465 +#: lilypond-book.py:1011 ly2dvi.py:442 ly2dvi.py:468 #, c-format msgid "Running %s..." msgstr "" -#: ly2dvi.py:126 midi2ly.py:148 update-lily.py:137 input.cc:87 +#: ly2dvi.py:126 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " msgstr "" -#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:782 ly2dvi.py:800 midi2ly.py:163 -#: midi2ly.py:1012 midi2ly.py:1081 update-lily.py:152 update-lily.py:458 -#: input.cc:92 +#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:813 ly2dvi.py:831 midi2ly.py:163 +#: midi2ly.py:1012 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160 +#: update-lily.py:152 update-lily.py:458 input.cc:92 msgid "error: " msgstr "" -#: ly2dvi.py:144 midi2ly.py:164 update-lily.py:153 +#: ly2dvi.py:144 midi2ly.py:164 mup2ly.py:161 update-lily.py:153 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:202 midi2ly.py:222 update-lily.py:211 +#: ly2dvi.py:202 midi2ly.py:222 mup2ly.py:219 update-lily.py:211 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "" -#: ly2dvi.py:206 midi2ly.py:226 update-lily.py:215 main.cc:152 +#: ly2dvi.py:206 midi2ly.py:226 mup2ly.py:223 update-lily.py:215 main.cc:158 msgid "Options:" msgstr "" -#: ly2dvi.py:210 midi2ly.py:230 update-lily.py:219 main.cc:169 +#: ly2dvi.py:210 midi2ly.py:230 mup2ly.py:227 update-lily.py:219 main.cc:175 #, c-format msgid "Report bugs to %s" msgstr "" -#: ly2dvi.py:238 midi2ly.py:258 update-lily.py:247 +#: ly2dvi.py:238 midi2ly.py:258 mup2ly.py:255 update-lily.py:247 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:243 midi2ly.py:262 update-lily.py:251 +#: ly2dvi.py:243 midi2ly.py:262 mup2ly.py:260 update-lily.py:251 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:245 midi2ly.py:264 update-lily.py:253 +#: ly2dvi.py:246 midi2ly.py:264 mup2ly.py:263 update-lily.py:253 msgid "(ignored)" msgstr "" -#: ly2dvi.py:255 midi2ly.py:274 update-lily.py:263 +#: ly2dvi.py:256 midi2ly.py:274 mup2ly.py:273 update-lily.py:263 #, c-format msgid "Cleaning %s..." msgstr "" -#: ly2dvi.py:325 +#: ly2dvi.py:326 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: ly2dvi.py:328 main.cc:116 +#: ly2dvi.py:329 main.cc:117 msgid "write Makefile dependencies for every input file" msgstr "" -#: ly2dvi.py:329 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:112 +#: ly2dvi.py:330 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:113 msgid "this help" msgstr "" -#: ly2dvi.py:330 main.cc:114 main.cc:119 +#: ly2dvi.py:331 main.cc:115 main.cc:120 msgid "DIR" msgstr "" -#: ly2dvi.py:330 +#: ly2dvi.py:331 msgid "add DIR to LilyPond's search path" msgstr "" -#: ly2dvi.py:331 +#: ly2dvi.py:332 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:332 +#: ly2dvi.py:333 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:333 main.cc:117 +#: ly2dvi.py:334 main.cc:118 msgid "produce MIDI output only" msgstr "" -#: ly2dvi.py:334 ly2dvi.py:335 midi2ly.py:100 main.cc:115 main.cc:118 +#: ly2dvi.py:335 ly2dvi.py:336 midi2ly.py:100 main.cc:116 main.cc:119 msgid "FILE" msgstr "" -#: ly2dvi.py:334 midi2ly.py:100 +#: ly2dvi.py:335 midi2ly.py:100 msgid "write ouput to FILE" msgstr "" -#: ly2dvi.py:335 +#: ly2dvi.py:336 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:337 +#: ly2dvi.py:338 msgid "Make a picture of the first system." msgstr "" -#: ly2dvi.py:338 +#: ly2dvi.py:339 msgid "Set the resolution of the preview to RES." msgstr "" -#: ly2dvi.py:339 +#: ly2dvi.py:340 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:341 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:122 +#: ly2dvi.py:342 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:128 msgid "verbose" msgstr "" -#: ly2dvi.py:342 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:121 +#: ly2dvi.py:343 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:127 msgid "print version number" msgstr "" -#: ly2dvi.py:343 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:123 +#: ly2dvi.py:344 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:129 msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:429 +#: ly2dvi.py:432 #, c-format msgid "no such setting: %s" msgstr "" -#: ly2dvi.py:480 +#: ly2dvi.py:497 #, c-format msgid "Analyzing %s..." msgstr "" -#: ly2dvi.py:536 +#: ly2dvi.py:553 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:576 +#: ly2dvi.py:593 #, c-format msgid "invalid value: %s" msgstr "" -#: ly2dvi.py:782 +#: ly2dvi.py:698 +msgid "LaTeX failed on the output file." +msgstr "" + +#: ly2dvi.py:700 +#, c-format +msgid " % logstr))" +msgstr "" + +#: ly2dvi.py:813 #, c-format msgid "not a PostScript file: `%s'" msgstr "" -#: ly2dvi.py:800 midi2ly.py:1012 update-lily.py:458 +#: ly2dvi.py:831 midi2ly.py:1012 update-lily.py:458 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:887 +#: ly2dvi.py:918 #, c-format msgid "filename should not contain spaces: `%s'" msgstr "" -#: ly2dvi.py:957 scores.cc:46 +#: ly2dvi.py:988 scores.cc:46 #, c-format msgid "dependencies output to `%s'..." msgstr "" -#: ly2dvi.py:968 midi2ly.py:996 +#: ly2dvi.py:999 midi2ly.py:996 #, c-format msgid "%s output to `%s'..." msgstr "" -#: ly2dvi.py:970 includable-lexer.cc:49 lily-guile.cc:135 scores.cc:137 +#: ly2dvi.py:1001 includable-lexer.cc:49 lily-guile.cc:160 scores.cc:137 #: scores.cc:143 #, c-format msgid "can't find file: `%s'" msgstr "" -#: ly2dvi.py:978 midi2ly.py:1081 +#: ly2dvi.py:1009 midi2ly.py:1081 msgid "no files specified on command line." msgstr "" @@ -259,7 +268,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: mup2ly.py:75 main.cc:118 +#: mup2ly.py:75 main.cc:119 msgid "write output to FILE" msgstr "" @@ -267,17 +276,17 @@ msgstr "" msgid "only pre-process" msgstr "" -#: mup2ly.py:827 +#: mup2ly.py:1073 #, c-format msgid "no such context: %s" msgstr "" -#: mup2ly.py:1051 +#: mup2ly.py:1297 #, c-format msgid "Processing `%s'..." msgstr "" -#: mup2ly.py:1070 +#: mup2ly.py:1316 #, c-format msgid "Writing `%s'..." msgstr "" @@ -359,22 +368,22 @@ msgstr "" msgid "Building `%s'..." msgstr "" -#: getopt-long.cc:145 +#: getopt-long.cc:146 #, c-format msgid "option `%s' requires an argument" msgstr "" -#: getopt-long.cc:149 +#: getopt-long.cc:150 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "" -#: getopt-long.cc:153 +#: getopt-long.cc:154 #, c-format msgid "unrecognized option: `%s'" msgstr "" -#: getopt-long.cc:160 +#: getopt-long.cc:161 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "" @@ -383,7 +392,7 @@ msgstr "" msgid "non fatal error: " msgstr "" -#: input.cc:106 source-file.cc:63 source-file.cc:156 +#: input.cc:106 source-file.cc:68 source-file.cc:161 msgid "position unknown" msgstr "" @@ -392,7 +401,7 @@ msgid "can't map file" msgstr "" #: mapped-file-storage.cc:87 simple-file-storage.cc:44 scores.cc:50 -#: streams.cc:37 +#: streams.cc:38 #, c-format msgid "can't open file: `%s'" msgstr "" @@ -402,37 +411,37 @@ msgstr "" msgid "Huh? Got %d, expected %d characters" msgstr "" -#: warn.cc:10 warn.cc:17 +#: warn.cc:24 #, c-format -msgid "error: %s\n" +msgid "warning: %s\n" msgstr "" -#: warn.cc:23 +#: warn.cc:30 #, c-format -msgid "warning: %s\n" +msgid "error: %s\n" msgstr "" -#: warn.cc:35 +#: warn.cc:43 #, c-format msgid "programming error: %s (Continuing; cross thumbs)\n" msgstr "" -#: accidental-engraver.cc:174 +#: accidental-engraver.cc:181 new-accidental-engraver.cc:234 #, c-format msgid "Accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:199 +#: accidental-engraver.cc:206 new-accidental-engraver.cc:259 #, c-format msgid "unknown accidental typesetting: %s. Ignored" msgstr "" -#: accidental-engraver.cc:215 +#: accidental-engraver.cc:222 new-accidental-engraver.cc:275 #, c-format msgid "Symbol is not a parent context: %s. Ignored" msgstr "" -#: accidental-engraver.cc:218 +#: accidental-engraver.cc:225 new-accidental-engraver.cc:278 #, c-format msgid "Accidental typesetting must be pair or context-name: %s" msgstr "" @@ -491,7 +500,7 @@ msgstr "" msgid "Giving up" msgstr "" -#: auto-change-iterator.cc:43 change-iterator.cc:59 +#: auto-change-iterator.cc:43 change-iterator.cc:60 #: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" @@ -501,21 +510,7 @@ msgstr "" msgid "barcheck failed at: %s" msgstr "" -#: beam.cc:153 -msgid "beam has less than two visible stems" -msgstr "" - -#: beam.cc:158 -msgid "Beam has less than two stems. Removing beam." -msgstr "" - -#: beam.cc:892 -msgid "" -"Not sure that we can find a nice beam slope (no viable initial configuration " -"found)." -msgstr "" - -#: beam-engraver.cc:166 +#: beam-engraver.cc:167 msgid "already have a beam" msgstr "" @@ -523,7 +518,7 @@ msgstr "" msgid "unterminated beam" msgstr "" -#: beam-engraver.cc:267 chord-tremolo-engraver.cc:185 +#: beam-engraver.cc:267 chord-tremolo-engraver.cc:175 msgid "stem must have Rhythmic structure" msgstr "" @@ -535,12 +530,26 @@ msgstr "" msgid "beam was started here" msgstr "" +#: beam.cc:138 +msgid "beam has less than two visible stems" +msgstr "" + +#: beam.cc:143 +msgid "Beam has less than two stems. Removing beam." +msgstr "" + +#: beam.cc:797 +msgid "" +"Not sure that we can find a nice beam slope (no viable initial configuration " +"found)." +msgstr "" + #: break-align-interface.cc:166 #, c-format msgid "No spacing entry from %s to `%s'" msgstr "" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "" @@ -551,14 +560,22 @@ msgstr "" #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:78 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "" -#: change-iterator.cc:81 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "" +#: chord-tremolo-engraver.cc:137 percent-repeat-engraver.cc:182 +msgid "unterminated chord tremolo" +msgstr "" + +#: chord-tremolo-iterator.cc:50 +msgid "no one to print a tremolos" +msgstr "" + #: chord.cc:313 #, c-format msgid "invalid subtraction: not part of chord: %s" @@ -569,35 +586,27 @@ msgstr "" msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:142 percent-repeat-engraver.cc:182 -msgid "unterminated chord tremolo" -msgstr "" - -#: chord-tremolo-iterator.cc:49 -msgid "no one to print a tremolos" -msgstr "" - #: dimensions.cc:13 msgid "NaN" msgstr "" -#: dynamic-engraver.cc:189 span-dynamic-performer.cc:82 +#: dynamic-engraver.cc:187 span-dynamic-performer.cc:82 msgid "can't find start of (de)crescendo" msgstr "" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:211 msgid "already have a crescendo" msgstr "" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:212 msgid "already have a decrescendo" msgstr "" -#: dynamic-engraver.cc:217 +#: dynamic-engraver.cc:215 msgid "Cresc started here" msgstr "" -#: dynamic-engraver.cc:309 +#: dynamic-engraver.cc:307 msgid "unterminated (de)crescendo" msgstr "" @@ -613,11 +622,11 @@ msgstr "" msgid "no one to print a repeat brace" msgstr "" -#: font-interface.cc:241 +#: font-interface.cc:238 msgid "couldn't find any font satisfying " msgstr "" -#: gourlay-breaking.cc:170 +#: gourlay-breaking.cc:171 msgid "No feasible line breaking found" msgstr "" @@ -682,19 +691,19 @@ msgstr "" msgid "ligature was started here" msgstr "" -#: lily-guile.cc:137 +#: lily-guile.cc:162 #, c-format msgid "(load path: `%s')" msgstr "" -#: lily-guile.cc:664 +#: lily-guile.cc:697 #, c-format msgid "" "Can't find property type-check for `%s' (%s). Perhaps you made a typing " "error? Doing assignment anyway." msgstr "" -#: lily-guile.cc:682 +#: lily-guile.cc:715 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" @@ -707,81 +716,84 @@ msgstr "" msgid "round filled box vertical extent smaller than blot; decreasing blot" msgstr "" -#: lyric-phrasing-engraver.cc:279 +#: lyric-phrasing-engraver.cc:301 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:284 +#: lyric-phrasing-engraver.cc:307 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" #. print example usage: lilypond -e "" ? -#: main.cc:108 +#: main.cc:109 msgid "EXPR" msgstr "" -#: main.cc:108 +#: main.cc:109 msgid "Scheme options: try -e \"(set-lily-option 'help 0)\" for more help." msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:111 +#: main.cc:112 msgid "EXT" msgstr "" -#: main.cc:111 +#: main.cc:112 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)" msgstr "" -#: main.cc:113 +#: main.cc:114 msgid "FIELD" msgstr "" -#: main.cc:113 +#: main.cc:114 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:114 +#: main.cc:115 msgid "add DIR to search path" msgstr "" -#: main.cc:115 +#: main.cc:116 msgid "use FILE as init file" msgstr "" -#: main.cc:119 +#: main.cc:120 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:120 +#. +#. should audit again. +#. +#: main.cc:125 msgid "inhibit file output naming and exporting" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:140 +#: main.cc:146 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "" -#: main.cc:142 +#: main.cc:148 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:146 +#: main.cc:152 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" msgstr "" -#: main.cc:156 +#: main.cc:162 msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:177 +#: main.cc:183 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -789,16 +801,16 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:184 main.cc:196 +#: main.cc:190 main.cc:202 #, c-format msgid "Copyright (c) %s by" msgstr "" -#: main.cc:194 +#: main.cc:200 msgid "GNU LilyPond -- The music typesetter" msgstr "" -#: main.cc:202 +#: main.cc:208 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" @@ -815,6 +827,26 @@ msgid "" "USA.\n" msgstr "" +#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 +msgid "unexpected case fall-through" +msgstr "" + +#: mensural-ligature-engraver.cc:332 +msgid "ligature with less than 2 heads -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:347 +msgid "can not determine pitch of ligature primitive -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:370 +msgid "prime interval within ligature -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:380 +msgid "mensural ligature: duration none of L, B, S -> skipping" +msgstr "" + #: mensural-ligature.cc:152 #, c-format msgid "Mensural_ligature: thickness undefined on flexa %d; assuming 1.4" @@ -838,26 +870,6 @@ msgstr "" msgid "Menusral_ligature: (join_left == 0)" msgstr "" -#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 -msgid "unexpected case fall-through" -msgstr "" - -#: mensural-ligature-engraver.cc:332 -msgid "ligature with less than 2 heads -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:347 -msgid "can not determine pitch of ligature primitive -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:370 -msgid "prime interval within ligature -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:380 -msgid "mensural ligature: duration none of L, B, S -> skipping" -msgstr "" - #: midi-item.cc:144 #, c-format msgid "no such instrument: `%s'" @@ -871,22 +883,22 @@ msgstr "" msgid "silly pitch" msgstr "" -#: music.cc:152 +#: music-output-def.cc:113 #, c-format -msgid "Transposition by %s makes accidental larger than two" +msgid "can't find `%s' context" msgstr "" -#: music-output-def.cc:113 +#: music.cc:159 #, c-format -msgid "can't find `%s' context" +msgid "Transposition by %s makes accidental larger than two" msgstr "" -#: my-lily-lexer.cc:141 +#: my-lily-lexer.cc:142 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "" -#: my-lily-lexer.cc:161 +#: my-lily-lexer.cc:162 #, c-format msgid "error at EOF: %s" msgstr "" @@ -899,7 +911,7 @@ msgstr "" msgid "Braces don't match" msgstr "" -#: note-collision.cc:332 +#: note-collision.cc:340 msgid "Too many clashing notecolumns. Ignoring them." msgstr "" @@ -921,7 +933,7 @@ msgstr "" msgid ", at " msgstr "" -#: paper-score.cc:76 system.cc:346 +#: paper-score.cc:76 #, c-format msgid "Element count %d " msgstr "" @@ -994,7 +1006,7 @@ msgstr "" msgid "can't find start of piano pedal: `%s'" msgstr "" -#: piano-pedal-engraver.cc:402 +#: piano-pedal-engraver.cc:404 msgid "unterminated pedal bracket" msgstr "" @@ -1039,37 +1051,47 @@ msgstr "" msgid "too many colliding rests" msgstr "" -#: scm-option.cc:75 +#: scm-option.cc:77 msgid "lilypond -e EXPR means" msgstr "" -#: scm-option.cc:121 +#: scm-option.cc:123 msgid "Unknown internal option!" msgstr "" -#: score.cc:91 +#: score-engraver.cc:103 +msgid "" +"Could not find feta20.afm. Fonts have not been installed properly; Aborting" +msgstr "" + +#: score-engraver.cc:207 +#, c-format +msgid "unbound spanner `%s'" +msgstr "" + +#: score.cc:93 +#, c-format +msgid "stack size cur %d, max %d\n" +msgstr "" + +#: score.cc:110 msgid "Interpreting music..." msgstr "" -#: score.cc:105 +#: score.cc:123 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:118 +#: score.cc:136 msgid "Errors found/*, not processing score*/" msgstr "" -#: score.cc:125 +#: score.cc:143 #, c-format msgid "elapsed time: %.2f seconds" msgstr "" -#: score-engraver.cc:181 -#, c-format -msgid "unbound spanner `%s'" -msgstr "" - #: scores.cc:107 msgid "Score contains errors; will not process it" msgstr "" @@ -1094,14 +1116,6 @@ msgstr "" msgid "No spring between column %d and next one" msgstr "" -#: slur.cc:53 -msgid "Putting slur over rest." -msgstr "" - -#: slur.cc:417 -msgid "Slur over rest?" -msgstr "" - #: slur-engraver.cc:124 msgid "unterminated slur" msgstr "" @@ -1112,44 +1126,58 @@ msgstr "" msgid "can't find start of slur" msgstr "" +#: slur.cc:53 +msgid "Putting slur over rest." +msgstr "" + +#: slur.cc:417 +msgid "Slur over rest?" +msgstr "" + +#: spacing-spanner.cc:382 +#, c-format +msgid "Global shortest duration is %s\n" +msgstr "" + #: spring-smob.cc:32 #, c-format msgid "#" msgstr "" -#: staff-symbol.cc:60 +#: staff-symbol.cc:62 msgid "staff symbol: indentation yields beyond end of line" msgstr "" -#: stem.cc:121 -msgid "Weird stem size; check for narrow beams" -msgstr "" - #: stem-engraver.cc:117 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: streams.cc:33 +#: stem.cc:118 +msgid "Weird stem size; check for narrow beams" +msgstr "" + +#: streams.cc:34 #, c-format msgid "can't create directory: `%s'" msgstr "" -#: streams.cc:47 +#: streams.cc:48 msgid "Error syncing file (disk full?)" msgstr "" -#: system.cc:93 +#: system.cc:109 #, c-format msgid "Element count %d." msgstr "" -#: system.cc:360 -msgid "Calculating column positions..." +#: system.cc:362 +#, c-format +msgid "Grob count %d " msgstr "" -#: text-spanner.cc:130 -msgid "Text_spanner too small" +#: system.cc:376 +msgid "Calculating column positions..." msgstr "" #: text-spanner-engraver.cc:92 @@ -1164,9 +1192,8 @@ msgstr "" msgid "unterminated text spanner" msgstr "" -#: tfm.cc:83 -#, c-format -msgid "can't find ascii character: %d" +#: text-spanner.cc:130 +msgid "Text_spanner too small" msgstr "" #: tfm-reader.cc:106 @@ -1179,6 +1206,11 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" +#: tfm.cc:83 +#, c-format +msgid "can't find ascii character: %d" +msgstr "" + #: tie-engraver.cc:216 msgid "lonely tie" msgstr "" @@ -1225,77 +1257,77 @@ msgstr "" msgid "can't find or create: `%s'" msgstr "" -#: volta-engraver.cc:109 +#: volta-engraver.cc:111 msgid "No volta spanner to end" msgstr "" -#: volta-engraver.cc:119 +#: volta-engraver.cc:121 msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "" -#: volta-engraver.cc:123 +#: volta-engraver.cc:125 msgid "Also have a stopped spanner. Giving up." msgstr "" -#: parser.yy:128 +#: parser.yy:129 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:436 +#: parser.yy:437 msgid "Identifier should have alphabetic characters only" msgstr "" -#: parser.yy:724 +#: parser.yy:732 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:780 +#: parser.yy:801 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:785 +#: parser.yy:806 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1355 +#: parser.yy:1390 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1365 +#: parser.yy:1400 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1491 +#: parser.yy:1526 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1502 +#: parser.yy:1537 msgid "Must have duration object" msgstr "" -#: parser.yy:1511 parser.yy:1519 +#: parser.yy:1546 parser.yy:1554 msgid "Have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:1679 parser.yy:1732 +#: parser.yy:1722 parser.yy:1775 #, c-format msgid "not a duration: %d" msgstr "" -#: parser.yy:1819 +#: parser.yy:1862 msgid "Have to be in Note mode for notes" msgstr "" -#: parser.yy:1917 +#: parser.yy:1961 msgid "Have to be in Chord mode for chords" msgstr "" -#: parser.yy:2097 +#: parser.yy:2141 msgid "need integer number arg" msgstr "" -#: parser.yy:2169 +#: parser.yy:2213 msgid "Suspect duration found following this beam" msgstr "" diff --git a/po/nl.po b/po/nl.po index 467c5ad9ba..7e500b9be2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.4.6\n" -"POT-Creation-Date: 2002-06-13 17:14+0200\n" +"POT-Creation-Date: 2002-07-21 01:00+0200\n" "PO-Revision-Date: 2001-09-09 17:34+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -23,189 +23,198 @@ msgstr "" "--add-comments --keyword=_\n" "Files: bow.cc int.cc\n" -#: lilypond-book.py:1171 ly2dvi.py:439 ly2dvi.py:465 +#: lilypond-book.py:1011 ly2dvi.py:442 ly2dvi.py:468 #, c-format msgid "Running %s..." msgstr "Uitvoeren %s..." -#: ly2dvi.py:126 midi2ly.py:148 update-lily.py:137 input.cc:87 +#: ly2dvi.py:126 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " msgstr "waarschuwing: " -#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:782 ly2dvi.py:800 midi2ly.py:163 -#: midi2ly.py:1012 midi2ly.py:1081 update-lily.py:152 update-lily.py:458 -#: input.cc:92 +#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:813 ly2dvi.py:831 midi2ly.py:163 +#: midi2ly.py:1012 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160 +#: update-lily.py:152 update-lily.py:458 input.cc:92 msgid "error: " msgstr "fout: " -#: ly2dvi.py:144 midi2ly.py:164 update-lily.py:153 +#: ly2dvi.py:144 midi2ly.py:164 mup2ly.py:161 update-lily.py:153 msgid "Exiting ... " msgstr "Beëidigen ..." -#: ly2dvi.py:202 midi2ly.py:222 update-lily.py:211 +#: ly2dvi.py:202 midi2ly.py:222 mup2ly.py:219 update-lily.py:211 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Gebruik: %s [OPTIE]... BESTAND" -#: ly2dvi.py:206 midi2ly.py:226 update-lily.py:215 main.cc:152 +#: ly2dvi.py:206 midi2ly.py:226 mup2ly.py:223 update-lily.py:215 main.cc:158 msgid "Options:" msgstr "Opties:" -#: ly2dvi.py:210 midi2ly.py:230 update-lily.py:219 main.cc:169 +#: ly2dvi.py:210 midi2ly.py:230 mup2ly.py:227 update-lily.py:219 main.cc:175 #, c-format msgid "Report bugs to %s" msgstr "" "Meld luizen in het programma aan %s;\n" "meld onjuistheden in de vertaling aan of " -#: ly2dvi.py:238 midi2ly.py:258 update-lily.py:247 +#: ly2dvi.py:238 midi2ly.py:258 mup2ly.py:255 update-lily.py:247 #, c-format msgid "Invoking `%s'" msgstr "Uitvoeren `%s'" -#: ly2dvi.py:243 midi2ly.py:262 update-lily.py:251 +#: ly2dvi.py:243 midi2ly.py:262 mup2ly.py:260 update-lily.py:251 #, c-format msgid "command exited with value %d" msgstr "opdracht eindigde met waarde %d" -#: ly2dvi.py:245 midi2ly.py:264 update-lily.py:253 +#: ly2dvi.py:246 midi2ly.py:264 mup2ly.py:263 update-lily.py:253 msgid "(ignored)" msgstr "(genegeerd)" -#: ly2dvi.py:255 midi2ly.py:274 update-lily.py:263 +#: ly2dvi.py:256 midi2ly.py:274 mup2ly.py:273 update-lily.py:263 #, c-format msgid "Cleaning %s..." msgstr "Schoonmaken %s..." -#: ly2dvi.py:325 +#: ly2dvi.py:326 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "Genereer .dvi met LaTeX voor LilyPond" -#: ly2dvi.py:328 main.cc:116 +#: ly2dvi.py:329 main.cc:117 msgid "write Makefile dependencies for every input file" msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" -#: ly2dvi.py:329 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:112 +#: ly2dvi.py:330 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:113 msgid "this help" msgstr "deze hulp" -#: ly2dvi.py:330 main.cc:114 main.cc:119 +#: ly2dvi.py:331 main.cc:115 main.cc:120 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:330 +#: ly2dvi.py:331 msgid "add DIR to LilyPond's search path" msgstr "voeg DIR toe aan LilyPonds zoekpad" -#: ly2dvi.py:331 +#: ly2dvi.py:332 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "bewaar alle uitvoer, en noem de directory %s.dir" -#: ly2dvi.py:332 +#: ly2dvi.py:333 msgid "don't run LilyPond" msgstr "draai LilyPond niet" -#: ly2dvi.py:333 main.cc:117 +#: ly2dvi.py:334 main.cc:118 msgid "produce MIDI output only" msgstr "produceer alleen MIDI uitvoer" -#: ly2dvi.py:334 ly2dvi.py:335 midi2ly.py:100 main.cc:115 main.cc:118 +#: ly2dvi.py:335 ly2dvi.py:336 midi2ly.py:100 main.cc:116 main.cc:119 msgid "FILE" msgstr "BESTAND" -#: ly2dvi.py:334 midi2ly.py:100 +#: ly2dvi.py:335 midi2ly.py:100 msgid "write ouput to FILE" msgstr "schrijf uitvoer naar BESTAND" -#: ly2dvi.py:335 +#: ly2dvi.py:336 msgid "find pfa fonts used in FILE" msgstr "zoek pfa fonts gebruikt in BESTAND" -#: ly2dvi.py:337 +#: ly2dvi.py:338 msgid "Make a picture of the first system." msgstr "" -#: ly2dvi.py:338 +#: ly2dvi.py:339 msgid "Set the resolution of the preview to RES." msgstr "" -#: ly2dvi.py:339 +#: ly2dvi.py:340 msgid "generate PostScript output" msgstr "genereer PostScipt uitvoer" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "KEY=VAL" msgstr "SEUTEL=WAARDE" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "change global setting KEY to VAL" msgstr "verander globale instelling SLEUTEL in WAARDE" -#: ly2dvi.py:341 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:122 +#: ly2dvi.py:342 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:128 msgid "verbose" msgstr "breedsprakig" -#: ly2dvi.py:342 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:121 +#: ly2dvi.py:343 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:127 msgid "print version number" msgstr "druk versienummer af" -#: ly2dvi.py:343 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:123 +#: ly2dvi.py:344 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:129 msgid "show warranty and copyright" msgstr "toon garantie en auteursrechten" -#: ly2dvi.py:429 +#: ly2dvi.py:432 #, c-format msgid "no such setting: %s" msgstr "geen dergelijke instelling: %s" -#: ly2dvi.py:480 +#: ly2dvi.py:497 #, c-format msgid "Analyzing %s..." msgstr "Analyseer %s..." -#: ly2dvi.py:536 +#: ly2dvi.py:553 #, c-format msgid "no lilypond output found for %s" msgstr "geen lilypond uitvoer gevonden voor %s" -#: ly2dvi.py:576 +#: ly2dvi.py:593 #, c-format msgid "invalid value: %s" msgstr "ongeldige waarde: %s" -#: ly2dvi.py:782 +#: ly2dvi.py:698 +msgid "LaTeX failed on the output file." +msgstr "" + +#: ly2dvi.py:700 +#, c-format +msgid " % logstr))" +msgstr "" + +#: ly2dvi.py:813 #, c-format msgid "not a PostScript file: `%s'" msgstr "geen PostScript bestand: `%s'" -#: ly2dvi.py:800 midi2ly.py:1012 update-lily.py:458 +#: ly2dvi.py:831 midi2ly.py:1012 update-lily.py:458 #, c-format msgid "getopt says: `%s'" msgstr "getopt zegt: `%s'" -#: ly2dvi.py:887 +#: ly2dvi.py:918 #, fuzzy, c-format msgid "filename should not contain spaces: `%s'" msgstr "Bevat reeds: `%s'" -#: ly2dvi.py:957 scores.cc:46 +#: ly2dvi.py:988 scores.cc:46 #, c-format msgid "dependencies output to `%s'..." msgstr "afhankelijkheden uitvoer naar `%s'..." -#: ly2dvi.py:968 midi2ly.py:996 +#: ly2dvi.py:999 midi2ly.py:996 #, c-format msgid "%s output to `%s'..." msgstr "%s uitvoer naar `%s'..." -#: ly2dvi.py:970 includable-lexer.cc:49 lily-guile.cc:135 scores.cc:137 +#: ly2dvi.py:1001 includable-lexer.cc:49 lily-guile.cc:160 scores.cc:137 #: scores.cc:143 #, c-format msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" -#: ly2dvi.py:978 midi2ly.py:1081 +#: ly2dvi.py:1009 midi2ly.py:1081 msgid "no files specified on command line." msgstr "geen bestanden gespecificeerd op de commandoregel." @@ -272,7 +281,7 @@ msgstr "debug" msgid "define macro NAME [optional expansion EXP]" msgstr "definieer macro NAAM [optionele expansie EXP]" -#: mup2ly.py:75 main.cc:118 +#: mup2ly.py:75 main.cc:119 msgid "write output to FILE" msgstr "schrijf uitvoer naar BESTAND" @@ -280,17 +289,17 @@ msgstr "schrijf uitvoer naar BESTAND" msgid "only pre-process" msgstr "alleen pre-processen" -#: mup2ly.py:827 +#: mup2ly.py:1073 #, c-format msgid "no such context: %s" msgstr "geen context als: `%s'" -#: mup2ly.py:1051 +#: mup2ly.py:1297 #, c-format msgid "Processing `%s'..." msgstr "Verwerken van `%s'..." -#: mup2ly.py:1070 +#: mup2ly.py:1316 #, c-format msgid "Writing `%s'..." msgstr "Schrijven van `%s'..." @@ -372,22 +381,22 @@ msgstr "Grijpen van `%s'..." msgid "Building `%s'..." msgstr "Bouwen van `%s'..." -#: getopt-long.cc:145 +#: getopt-long.cc:146 #, c-format msgid "option `%s' requires an argument" msgstr "optie `%s' vereist een argument" -#: getopt-long.cc:149 +#: getopt-long.cc:150 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "optie `%s' staat geen argument toe" -#: getopt-long.cc:153 +#: getopt-long.cc:154 #, c-format msgid "unrecognized option: `%s'" msgstr "onbekende optie: `%s'" -#: getopt-long.cc:160 +#: getopt-long.cc:161 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "onjuist argument: `%s' voor optie `%s'" @@ -396,7 +405,7 @@ msgstr "onjuist argument: `%s' voor optie `%s'" msgid "non fatal error: " msgstr "niet noodlottige fout: " -#: input.cc:106 source-file.cc:63 source-file.cc:156 +#: input.cc:106 source-file.cc:68 source-file.cc:161 msgid "position unknown" msgstr "positie onbekend" @@ -405,7 +414,7 @@ msgid "can't map file" msgstr "kan bestand niet inkaarten" #: mapped-file-storage.cc:87 simple-file-storage.cc:44 scores.cc:50 -#: streams.cc:37 +#: streams.cc:38 #, c-format msgid "can't open file: `%s'" msgstr "kan bestand niet openen: `%s'" @@ -415,37 +424,37 @@ msgstr "kan bestand niet openen: `%s'" msgid "Huh? Got %d, expected %d characters" msgstr "Huh? Kreeg %d, verwachtte %d tekens" -#: warn.cc:10 warn.cc:17 -#, fuzzy, c-format -msgid "error: %s\n" -msgstr "fout: " - -#: warn.cc:23 +#: warn.cc:24 #, fuzzy, c-format msgid "warning: %s\n" msgstr "waarschuwing: " -#: warn.cc:35 +#: warn.cc:30 +#, fuzzy, c-format +msgid "error: %s\n" +msgstr "fout: " + +#: warn.cc:43 #, fuzzy, c-format msgid "programming error: %s (Continuing; cross thumbs)\n" msgstr " (Ga verder; duim maar)" -#: accidental-engraver.cc:174 +#: accidental-engraver.cc:181 new-accidental-engraver.cc:234 #, c-format msgid "Accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:199 +#: accidental-engraver.cc:206 new-accidental-engraver.cc:259 #, fuzzy, c-format msgid "unknown accidental typesetting: %s. Ignored" msgstr "onbekende ontsnapte string: `\\%s'" -#: accidental-engraver.cc:215 +#: accidental-engraver.cc:222 new-accidental-engraver.cc:275 #, c-format msgid "Symbol is not a parent context: %s. Ignored" msgstr "" -#: accidental-engraver.cc:218 +#: accidental-engraver.cc:225 new-accidental-engraver.cc:278 #, c-format msgid "Accidental typesetting must be pair or context-name: %s" msgstr "" @@ -506,7 +515,7 @@ msgstr "(zoekpad: `%s')" msgid "Giving up" msgstr "Geef op" -#: auto-change-iterator.cc:43 change-iterator.cc:59 +#: auto-change-iterator.cc:43 change-iterator.cc:60 #: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "Kan niet wisselen van vertaler, ben al hier" @@ -516,23 +525,7 @@ msgstr "Kan niet wisselen van vertaler, ben al hier" msgid "barcheck failed at: %s" msgstr "maatstreep controle gefaald op: %s" -#: beam.cc:153 -#, fuzzy -msgid "beam has less than two visible stems" -msgstr "waardestreep heeft minder dan twee stokken" - -#: beam.cc:158 -#, fuzzy -msgid "Beam has less than two stems. Removing beam." -msgstr "waardestreep heeft minder dan twee stokken" - -#: beam.cc:892 -msgid "" -"Not sure that we can find a nice beam slope (no viable initial configuration " -"found)." -msgstr "" - -#: beam-engraver.cc:166 +#: beam-engraver.cc:167 msgid "already have a beam" msgstr "heb al een waardestreep" @@ -540,7 +533,7 @@ msgstr "heb al een waardestreep" msgid "unterminated beam" msgstr "onbeëindigde waardestreep" -#: beam-engraver.cc:267 chord-tremolo-engraver.cc:185 +#: beam-engraver.cc:267 chord-tremolo-engraver.cc:175 msgid "stem must have Rhythmic structure" msgstr "stok moet Ritmische structuur hebben" @@ -552,12 +545,28 @@ msgstr "stok past niet in waardestreep" msgid "beam was started here" msgstr "waardestreep werd hier gestart" +#: beam.cc:138 +#, fuzzy +msgid "beam has less than two visible stems" +msgstr "waardestreep heeft minder dan twee stokken" + +#: beam.cc:143 +#, fuzzy +msgid "Beam has less than two stems. Removing beam." +msgstr "waardestreep heeft minder dan twee stokken" + +#: beam.cc:797 +msgid "" +"Not sure that we can find a nice beam slope (no viable initial configuration " +"found)." +msgstr "" + #: break-align-interface.cc:166 #, fuzzy, c-format msgid "No spacing entry from %s to `%s'" msgstr "Voeg translator niet toe: `%s'" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "kan `%s' niet in `%s' veranderen" @@ -568,14 +577,22 @@ msgstr "kan `%s' niet in `%s' veranderen" #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:78 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "Ben er zelf een" -#: change-iterator.cc:81 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "geen van deze in mijn gezin" +#: chord-tremolo-engraver.cc:137 percent-repeat-engraver.cc:182 +msgid "unterminated chord tremolo" +msgstr "onbeëindigd akkoordtremolo" + +#: chord-tremolo-iterator.cc:50 +msgid "no one to print a tremolos" +msgstr "niemand om tremolos af te drukken" + #: chord.cc:313 #, c-format msgid "invalid subtraction: not part of chord: %s" @@ -586,36 +603,28 @@ msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s" -#: chord-tremolo-engraver.cc:142 percent-repeat-engraver.cc:182 -msgid "unterminated chord tremolo" -msgstr "onbeëindigd akkoordtremolo" - -#: chord-tremolo-iterator.cc:49 -msgid "no one to print a tremolos" -msgstr "niemand om tremolos af te drukken" - #: dimensions.cc:13 msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:189 span-dynamic-performer.cc:82 +#: dynamic-engraver.cc:187 span-dynamic-performer.cc:82 msgid "can't find start of (de)crescendo" msgstr "kan start van (de)crescendo niet vinden" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:211 msgid "already have a crescendo" msgstr "heb al een crescendo" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:212 msgid "already have a decrescendo" msgstr "heb al een decrescendo" -#: dynamic-engraver.cc:217 +#: dynamic-engraver.cc:215 #, fuzzy msgid "Cresc started here" msgstr "waardestreep werd hier gestart" -#: dynamic-engraver.cc:309 +#: dynamic-engraver.cc:307 msgid "unterminated (de)crescendo" msgstr "onbeëindigd (de)crescendo" @@ -632,11 +641,11 @@ msgstr "" msgid "no one to print a repeat brace" msgstr "niemand om een herhalings haak af te drukken" -#: font-interface.cc:241 +#: font-interface.cc:238 msgid "couldn't find any font satisfying " msgstr "kon geen enkel font vinden dat voldoet aan " -#: gourlay-breaking.cc:170 +#: gourlay-breaking.cc:171 msgid "No feasible line breaking found" msgstr "Geen doenbare regelafbreuk gevonden" @@ -706,12 +715,12 @@ msgstr "" msgid "ligature was started here" msgstr "waardestreep werd hier gestart" -#: lily-guile.cc:137 +#: lily-guile.cc:162 #, c-format msgid "(load path: `%s')" msgstr "(zoekpad: `%s')" -#: lily-guile.cc:664 +#: lily-guile.cc:697 #, fuzzy, c-format msgid "" "Can't find property type-check for `%s' (%s). Perhaps you made a typing " @@ -719,7 +728,7 @@ msgid "" msgstr "" "Kan geen type-controle vinden voor property `%s'. Misschien een tikfout?" -#: lily-guile.cc:682 +#: lily-guile.cc:715 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "Type contole gefaald voor `%s'; waarde `%s' moet type hebben: `%s'" @@ -732,71 +741,74 @@ msgstr "" msgid "round filled box vertical extent smaller than blot; decreasing blot" msgstr "" -#: lyric-phrasing-engraver.cc:279 +#: lyric-phrasing-engraver.cc:301 msgid "lyrics found without any matching notehead" msgstr "liedteksten gevonden zonder bijbehorend nootbolletje" -#: lyric-phrasing-engraver.cc:284 +#: lyric-phrasing-engraver.cc:307 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "Huh? Melismatische noot blijkt bijbehorende liedtekst te hebben." #. print example usage: lilypond -e "" ? -#: main.cc:108 +#: main.cc:109 msgid "EXPR" msgstr "EXPR" -#: main.cc:108 +#: main.cc:109 msgid "Scheme options: try -e \"(set-lily-option 'help 0)\" for more help." msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:111 +#: main.cc:112 msgid "EXT" msgstr "EXT" -#: main.cc:111 +#: main.cc:112 #, fuzzy msgid "use output format EXT (tex [default], pdftex, ps, scm or as)" msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)" -#: main.cc:113 +#: main.cc:114 msgid "FIELD" msgstr "VELD" -#: main.cc:113 +#: main.cc:114 msgid "write header field to BASENAME.FIELD" msgstr "schrijf kop veld naar BASISNAAM.VELD" -#: main.cc:114 +#: main.cc:115 msgid "add DIR to search path" msgstr "voeg DIR toe aan zoekpad" -#: main.cc:115 +#: main.cc:116 msgid "use FILE as init file" msgstr "gebruik BESTAND als initialisatiebestand" -#: main.cc:119 +#: main.cc:120 msgid "prepend DIR to dependencies" msgstr "voeg DIR voor aan afhankelijkheden" -#: main.cc:120 +#. +#. should audit again. +#. +#: main.cc:125 msgid "inhibit file output naming and exporting" msgstr "verbied naamgeving van uitvoerbestand en exportering" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:140 +#: main.cc:146 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Gebruik: %s [OPTIE]... BESTAND..." -#: main.cc:142 +#: main.cc:148 msgid "Typeset music and or play MIDI from FILE" msgstr "Zet muziek en of speel MIDI van BESTAND" -#: main.cc:146 +#: main.cc:152 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" @@ -806,11 +818,11 @@ msgstr "" "uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" "maakt deel uit van het GNU Project.\n" -#: main.cc:156 +#: main.cc:162 msgid "This binary was compiled with the following options:" msgstr "Dit programma is gecompileerd met de volgende instellingen:" -#: main.cc:177 +#: main.cc:183 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -822,16 +834,16 @@ msgstr "" "onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n" "informatie.\n" -#: main.cc:184 main.cc:196 +#: main.cc:190 main.cc:202 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " -#: main.cc:194 +#: main.cc:200 msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- De Muziekzetter" -#: main.cc:202 +#: main.cc:208 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" @@ -861,6 +873,26 @@ msgstr "" "zoniet, schrijf dan naar de Free Software Foundation, Inc.,\n" "675 Mass Ave, Cambridge, MA 02139, USA.\n" +#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 +msgid "unexpected case fall-through" +msgstr "" + +#: mensural-ligature-engraver.cc:332 +msgid "ligature with less than 2 heads -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:347 +msgid "can not determine pitch of ligature primitive -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:370 +msgid "prime interval within ligature -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:380 +msgid "mensural ligature: duration none of L, B, S -> skipping" +msgstr "" + #: mensural-ligature.cc:152 #, c-format msgid "Mensural_ligature: thickness undefined on flexa %d; assuming 1.4" @@ -884,26 +916,6 @@ msgstr "" msgid "Menusral_ligature: (join_left == 0)" msgstr "" -#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 -msgid "unexpected case fall-through" -msgstr "" - -#: mensural-ligature-engraver.cc:332 -msgid "ligature with less than 2 heads -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:347 -msgid "can not determine pitch of ligature primitive -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:370 -msgid "prime interval within ligature -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:380 -msgid "mensural ligature: duration none of L, B, S -> skipping" -msgstr "" - #: midi-item.cc:144 #, c-format msgid "no such instrument: `%s'" @@ -917,22 +929,22 @@ msgstr "rare duur" msgid "silly pitch" msgstr "rare toonhoogte" -#: music.cc:152 -#, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponering van %s geeft tripel kruizen/mollen" - #: music-output-def.cc:113 #, c-format msgid "can't find `%s' context" msgstr "kan `%s' context niet vinden" -#: my-lily-lexer.cc:141 +#: music.cc:159 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponering van %s geeft tripel kruizen/mollen" + +#: my-lily-lexer.cc:142 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Identifier naam is een sleutelwoord: `%s'" -#: my-lily-lexer.cc:161 +#: my-lily-lexer.cc:162 #, c-format msgid "error at EOF: %s" msgstr "fout bij EOF: %s" @@ -945,7 +957,7 @@ msgstr "Ontleden..." msgid "Braces don't match" msgstr "Haakjes paren niet" -#: note-collision.cc:332 +#: note-collision.cc:340 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Te veel botsende nootkolommen. Negeer ze." @@ -967,7 +979,7 @@ msgstr "papier uitvoer naar %s..." msgid ", at " msgstr ", bij " -#: paper-score.cc:76 system.cc:346 +#: paper-score.cc:76 #, c-format msgid "Element count %d " msgstr "Aantal elementen: %d." @@ -1041,7 +1053,7 @@ msgstr "kan start van fraseringsboog niet vinden" msgid "can't find start of piano pedal: `%s'" msgstr "kan start van piano pedaal niet vinden: `%s'" -#: piano-pedal-engraver.cc:402 +#: piano-pedal-engraver.cc:404 #, fuzzy msgid "unterminated pedal bracket" msgstr "onbeëindigde waardestreep" @@ -1087,37 +1099,47 @@ msgstr "" msgid "too many colliding rests" msgstr "te veel botsende rusten" -#: scm-option.cc:75 +#: scm-option.cc:77 msgid "lilypond -e EXPR means" msgstr "" -#: scm-option.cc:121 +#: scm-option.cc:123 msgid "Unknown internal option!" msgstr "" -#: score.cc:91 +#: score-engraver.cc:103 +msgid "" +"Could not find feta20.afm. Fonts have not been installed properly; Aborting" +msgstr "" + +#: score-engraver.cc:207 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ongebonden spanner `%s'" + +#: score.cc:93 +#, c-format +msgid "stack size cur %d, max %d\n" +msgstr "" + +#: score.cc:110 msgid "Interpreting music..." msgstr "Vertolken van muziek..." -#: score.cc:105 +#: score.cc:123 msgid "Need music in a score" msgstr "Heb muziek nodig in een partituur" #. should we? hampers debugging. -#: score.cc:118 +#: score.cc:136 msgid "Errors found/*, not processing score*/" msgstr "Fouten gevonden, /*verwerk partituur niet */" -#: score.cc:125 +#: score.cc:143 #, c-format msgid "elapsed time: %.2f seconds" msgstr "duur: %.2f seconden" -#: score-engraver.cc:181 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ongebonden spanner `%s'" - #: scores.cc:107 msgid "Score contains errors; will not process it" msgstr "Partituur bevat fouten; zal hem niet verwerken" @@ -1142,15 +1164,6 @@ msgstr "Separation_item: Ik heb te veel gedronken" msgid "No spring between column %d and next one" msgstr "" -#: slur.cc:53 -#, fuzzy -msgid "Putting slur over rest." -msgstr "Zet bindingsboog over rust. Negeer." - -#: slur.cc:417 -msgid "Slur over rest?" -msgstr "Boogje over rust?" - #: slur-engraver.cc:124 msgid "unterminated slur" msgstr "onbeëindigde bindingsboog" @@ -1161,46 +1174,61 @@ msgstr "onbe msgid "can't find start of slur" msgstr "kan start van bindingsboog niet vinden" +#: slur.cc:53 +#, fuzzy +msgid "Putting slur over rest." +msgstr "Zet bindingsboog over rust. Negeer." + +#: slur.cc:417 +msgid "Slur over rest?" +msgstr "Boogje over rust?" + +#: spacing-spanner.cc:382 +#, c-format +msgid "Global shortest duration is %s\n" +msgstr "" + #: spring-smob.cc:32 #, c-format msgid "#" msgstr "" -#: staff-symbol.cc:60 +#: staff-symbol.cc:62 msgid "staff symbol: indentation yields beyond end of line" msgstr "" -#: stem.cc:121 -msgid "Weird stem size; check for narrow beams" -msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" - #: stem-engraver.cc:117 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Voeg noot bolletje toe aan onverenigbare stok (type = %d)" -#: streams.cc:33 +#: stem.cc:118 +msgid "Weird stem size; check for narrow beams" +msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" + +#: streams.cc:34 #, c-format msgid "can't create directory: `%s'" msgstr "kan directory niet scheppen: `%s'" -#: streams.cc:47 +#: streams.cc:48 msgid "Error syncing file (disk full?)" msgstr "Fout bij synchroniseren van bestand (schijf vol?)" -#: system.cc:93 +#: system.cc:109 #, c-format msgid "Element count %d." msgstr "Aantal elementen: %d." -#: system.cc:360 +#: system.cc:362 +#, fuzzy, c-format +msgid "Grob count %d " +msgstr "Aantal elementen: %d." + +#: system.cc:376 msgid "Calculating column positions..." msgstr "Berekenen van kolomposities..." -#: text-spanner.cc:130 -msgid "Text_spanner too small" -msgstr "Text_spanner te klein" - #: text-spanner-engraver.cc:92 msgid "can't find start of text spanner" msgstr "kan start van tekst spanner niet vinden" @@ -1213,10 +1241,9 @@ msgstr "heb al een tekst spanner" msgid "unterminated text spanner" msgstr "onbeëindigde tekst spanner" -#: tfm.cc:83 -#, c-format -msgid "can't find ascii character: %d" -msgstr "kan ascii teken niet vinden: %d" +#: text-spanner.cc:130 +msgid "Text_spanner too small" +msgstr "Text_spanner te klein" #: tfm-reader.cc:106 #, c-format @@ -1229,6 +1256,11 @@ msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" "%s: TFM bestand heeft %u parameters, wat meer is dan de %u die ik aan kan" +#: tfm.cc:83 +#, c-format +msgid "can't find ascii character: %d" +msgstr "kan ascii teken niet vinden: %d" + #: tie-engraver.cc:216 msgid "lonely tie" msgstr "eenzame overbinding" @@ -1275,78 +1307,78 @@ msgstr "kan niet vinden of scheppen `%s' genaamd `%s'" msgid "can't find or create: `%s'" msgstr "kan niet vinden of scheppen: `%s'" -#: volta-engraver.cc:109 +#: volta-engraver.cc:111 msgid "No volta spanner to end" msgstr "Geen volta spanner te beëindigen" -#: volta-engraver.cc:119 +#: volta-engraver.cc:121 msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "Heb al een volta spanner. Stop die nu voortijdig." -#: volta-engraver.cc:123 +#: volta-engraver.cc:125 msgid "Also have a stopped spanner. Giving up." msgstr "Heb ook al een gestopte spanner. Geef op." -#: parser.yy:128 +#: parser.yy:129 #, c-format msgid "Expecting %d arguments" msgstr "Verwacht %d argumenten" -#: parser.yy:436 +#: parser.yy:437 msgid "Identifier should have alphabetic characters only" msgstr "Identifier zou alleen alfabetische tekens moeten hebben" -#: parser.yy:724 +#: parser.yy:732 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" "Meer alternatieven dan herhalingen. Schroot overvloedige alternatieven." -#: parser.yy:780 +#: parser.yy:801 msgid "Second argument must be a symbol" msgstr "Tweede argument moet een symbool zijn" -#: parser.yy:785 +#: parser.yy:806 msgid "First argument must be a procedure taking 1 argument" msgstr "Eerste argument moet een procedure zijn met 1 argument" -#: parser.yy:1355 +#: parser.yy:1390 msgid "Expecting string as script definition" msgstr "Verwacht string voor script definitie" -#: parser.yy:1365 +#: parser.yy:1400 msgid "Can't specify direction for this request" msgstr "Kan richting voor dit verzoek niet specificeren" -#: parser.yy:1491 +#: parser.yy:1526 msgid "Expecting musical-pitch value" msgstr "Verwacht musical-pitch waarde" -#: parser.yy:1502 +#: parser.yy:1537 msgid "Must have duration object" msgstr "Moet duur object hebben" -#: parser.yy:1511 parser.yy:1519 +#: parser.yy:1546 parser.yy:1554 msgid "Have to be in Lyric mode for lyrics" msgstr "Moet in Lyric modus zijn voor liedteksten" -#: parser.yy:1679 parser.yy:1732 +#: parser.yy:1722 parser.yy:1775 #, c-format msgid "not a duration: %d" msgstr "geen duur: %d" -#: parser.yy:1819 +#: parser.yy:1862 msgid "Have to be in Note mode for notes" msgstr "Moet in Note modus zijn voor noten" -#: parser.yy:1917 +#: parser.yy:1961 msgid "Have to be in Chord mode for chords" msgstr "Moet in Chord modus zijn voor accoorden" -#: parser.yy:2097 +#: parser.yy:2141 msgid "need integer number arg" msgstr "heb integer getal arg nogig" -#: parser.yy:2169 +#: parser.yy:2213 msgid "Suspect duration found following this beam" msgstr "" diff --git a/po/ru.po b/po/ru.po index 124bf6fe34..745ed0230e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-06-13 17:14+0200\n" +"POT-Creation-Date: 2002-07-21 01:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -14,190 +14,199 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: ENCODING\n" -#: lilypond-book.py:1171 ly2dvi.py:439 ly2dvi.py:465 +#: lilypond-book.py:1011 ly2dvi.py:442 ly2dvi.py:468 #, fuzzy, c-format msgid "Running %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:126 midi2ly.py:148 update-lily.py:137 input.cc:87 +#: ly2dvi.py:126 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " -#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:782 ly2dvi.py:800 midi2ly.py:163 -#: midi2ly.py:1012 midi2ly.py:1081 update-lily.py:152 update-lily.py:458 -#: input.cc:92 +#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:813 ly2dvi.py:831 midi2ly.py:163 +#: midi2ly.py:1012 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160 +#: update-lily.py:152 update-lily.py:458 input.cc:92 msgid "error: " msgstr "ÏÛÉÂËÁ: " -#: ly2dvi.py:144 midi2ly.py:164 update-lily.py:153 +#: ly2dvi.py:144 midi2ly.py:164 mup2ly.py:161 update-lily.py:153 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:202 midi2ly.py:222 update-lily.py:211 +#: ly2dvi.py:202 midi2ly.py:222 mup2ly.py:219 update-lily.py:211 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]" -#: ly2dvi.py:206 midi2ly.py:226 update-lily.py:215 main.cc:152 +#: ly2dvi.py:206 midi2ly.py:226 mup2ly.py:223 update-lily.py:215 main.cc:158 msgid "Options:" msgstr "ïÐÃÉÉ:" -#: ly2dvi.py:210 midi2ly.py:230 update-lily.py:219 main.cc:169 +#: ly2dvi.py:210 midi2ly.py:230 mup2ly.py:227 update-lily.py:219 main.cc:175 #, c-format msgid "Report bugs to %s" msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" -#: ly2dvi.py:238 midi2ly.py:258 update-lily.py:247 +#: ly2dvi.py:238 midi2ly.py:258 mup2ly.py:255 update-lily.py:247 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:243 midi2ly.py:262 update-lily.py:251 +#: ly2dvi.py:243 midi2ly.py:262 mup2ly.py:260 update-lily.py:251 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:245 midi2ly.py:264 update-lily.py:253 +#: ly2dvi.py:246 midi2ly.py:264 mup2ly.py:263 update-lily.py:253 msgid "(ignored)" msgstr "" -#: ly2dvi.py:255 midi2ly.py:274 update-lily.py:263 +#: ly2dvi.py:256 midi2ly.py:274 mup2ly.py:273 update-lily.py:263 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:325 +#: ly2dvi.py:326 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: ly2dvi.py:328 main.cc:116 +#: ly2dvi.py:329 main.cc:117 msgid "write Makefile dependencies for every input file" msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: ly2dvi.py:329 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:112 +#: ly2dvi.py:330 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:113 msgid "this help" msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" -#: ly2dvi.py:330 main.cc:114 main.cc:119 +#: ly2dvi.py:331 main.cc:115 main.cc:120 msgid "DIR" msgstr "ëáô" -#: ly2dvi.py:330 +#: ly2dvi.py:331 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: ly2dvi.py:331 +#: ly2dvi.py:332 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:332 +#: ly2dvi.py:333 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:333 main.cc:117 +#: ly2dvi.py:334 main.cc:118 msgid "produce MIDI output only" msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI" -#: ly2dvi.py:334 ly2dvi.py:335 midi2ly.py:100 main.cc:115 main.cc:118 +#: ly2dvi.py:335 ly2dvi.py:336 midi2ly.py:100 main.cc:116 main.cc:119 msgid "FILE" msgstr "æáêì" -#: ly2dvi.py:334 midi2ly.py:100 +#: ly2dvi.py:335 midi2ly.py:100 #, fuzzy msgid "write ouput to FILE" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" -#: ly2dvi.py:335 +#: ly2dvi.py:336 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:337 +#: ly2dvi.py:338 msgid "Make a picture of the first system." msgstr "" -#: ly2dvi.py:338 +#: ly2dvi.py:339 msgid "Set the resolution of the preview to RES." msgstr "" -#: ly2dvi.py:339 +#: ly2dvi.py:340 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:341 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:122 +#: ly2dvi.py:342 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:128 #, fuzzy msgid "verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: ly2dvi.py:342 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:121 +#: ly2dvi.py:343 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:127 msgid "print version number" msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" -#: ly2dvi.py:343 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:123 +#: ly2dvi.py:344 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:129 msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" -#: ly2dvi.py:429 +#: ly2dvi.py:432 #, fuzzy, c-format msgid "no such setting: %s" msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" -#: ly2dvi.py:480 +#: ly2dvi.py:497 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:536 +#: ly2dvi.py:553 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:576 +#: ly2dvi.py:593 #, fuzzy, c-format msgid "invalid value: %s" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: ly2dvi.py:782 +#: ly2dvi.py:698 +msgid "LaTeX failed on the output file." +msgstr "" + +#: ly2dvi.py:700 +#, c-format +msgid " % logstr))" +msgstr "" + +#: ly2dvi.py:813 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" -#: ly2dvi.py:800 midi2ly.py:1012 update-lily.py:458 +#: ly2dvi.py:831 midi2ly.py:1012 update-lily.py:458 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:887 +#: ly2dvi.py:918 #, fuzzy, c-format msgid "filename should not contain spaces: `%s'" msgstr "õÖÅ ÓÏÄÅÒÖÉÔ: `%s'" -#: ly2dvi.py:957 scores.cc:46 +#: ly2dvi.py:988 scores.cc:46 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: ly2dvi.py:968 midi2ly.py:996 +#: ly2dvi.py:999 midi2ly.py:996 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "×Ù×ÏÄ MIDI × %s..." -#: ly2dvi.py:970 includable-lexer.cc:49 lily-guile.cc:135 scores.cc:137 +#: ly2dvi.py:1001 includable-lexer.cc:49 lily-guile.cc:160 scores.cc:137 #: scores.cc:143 #, c-format msgid "can't find file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" -#: ly2dvi.py:978 midi2ly.py:1081 +#: ly2dvi.py:1009 midi2ly.py:1081 msgid "no files specified on command line." msgstr "" @@ -261,7 +270,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: mup2ly.py:75 main.cc:118 +#: mup2ly.py:75 main.cc:119 #, fuzzy msgid "write output to FILE" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" @@ -270,17 +279,17 @@ msgstr " msgid "only pre-process" msgstr "" -#: mup2ly.py:827 +#: mup2ly.py:1073 #, fuzzy, c-format msgid "no such context: %s" msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" -#: mup2ly.py:1051 +#: mup2ly.py:1297 #, fuzzy, c-format msgid "Processing `%s'..." msgstr "ïÂÒÁÂÁÔÙ×ÁÀ..." -#: mup2ly.py:1070 +#: mup2ly.py:1316 #, fuzzy, c-format msgid "Writing `%s'..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" @@ -363,22 +372,22 @@ msgstr " msgid "Building `%s'..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: getopt-long.cc:145 +#: getopt-long.cc:146 #, c-format msgid "option `%s' requires an argument" msgstr "ÏÐÃÉÑ `%s' ÔÒÅÂÕÅÔ ÁÒÇÕÍÅÎÔ" -#: getopt-long.cc:149 +#: getopt-long.cc:150 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "ÏÐÃÉÑ `%s' ÎÅ ÄÏÐÕÓËÁÅÔ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÁÒÇÕÍÅÎÔÁ" -#: getopt-long.cc:153 +#: getopt-long.cc:154 #, c-format msgid "unrecognized option: `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ: `%s'" -#: getopt-long.cc:160 +#: getopt-long.cc:161 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ ÏÐÃÉÉ `%s'" @@ -387,7 +396,7 @@ msgstr " msgid "non fatal error: " msgstr "ÎÅ ÓÍÅÒÔÅÌØÎÁÑ ÏÛÉÂËÁ: " -#: input.cc:106 source-file.cc:63 source-file.cc:156 +#: input.cc:106 source-file.cc:68 source-file.cc:161 msgid "position unknown" msgstr "ÐÏÌÏÖÅÎÉÅ ÎÅÉÚ×ÅÓÔÎÏ" @@ -396,7 +405,7 @@ msgid "can't map file" msgstr "ÎÅ ÍÏÇÕ ÏÔÏÂÒÁÚÉÔØ ÆÁÊÌ × ÐÁÍÑÔØ" #: mapped-file-storage.cc:87 simple-file-storage.cc:44 scores.cc:50 -#: streams.cc:37 +#: streams.cc:38 #, c-format msgid "can't open file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" @@ -406,37 +415,37 @@ msgstr " msgid "Huh? Got %d, expected %d characters" msgstr "èÍ... ðÏÌÕÞÉÌ %d, Á ÏÖÉÄÁÌ %d ÚÎÁËÏ×" -#: warn.cc:10 warn.cc:17 -#, fuzzy, c-format -msgid "error: %s\n" -msgstr "ÏÛÉÂËÁ: " - -#: warn.cc:23 +#: warn.cc:24 #, fuzzy, c-format msgid "warning: %s\n" msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " -#: warn.cc:35 +#: warn.cc:30 +#, fuzzy, c-format +msgid "error: %s\n" +msgstr "ÏÛÉÂËÁ: " + +#: warn.cc:43 #, fuzzy, c-format msgid "programming error: %s (Continuing; cross thumbs)\n" msgstr " (ðÒÏÄÏÌÖÁÀ; ÓËÒÅÓÔÉÔÅ ÐÁÌØÃÙ)" -#: accidental-engraver.cc:174 +#: accidental-engraver.cc:181 new-accidental-engraver.cc:234 #, c-format msgid "Accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:199 +#: accidental-engraver.cc:206 new-accidental-engraver.cc:259 #, fuzzy, c-format msgid "unknown accidental typesetting: %s. Ignored" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'" -#: accidental-engraver.cc:215 +#: accidental-engraver.cc:222 new-accidental-engraver.cc:275 #, c-format msgid "Symbol is not a parent context: %s. Ignored" msgstr "" -#: accidental-engraver.cc:218 +#: accidental-engraver.cc:225 new-accidental-engraver.cc:278 #, c-format msgid "Accidental typesetting must be pair or context-name: %s" msgstr "" @@ -495,7 +504,7 @@ msgstr "( msgid "Giving up" msgstr "óÄÁÀÓØ" -#: auto-change-iterator.cc:43 change-iterator.cc:59 +#: auto-change-iterator.cc:43 change-iterator.cc:60 #: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ" @@ -505,23 +514,7 @@ msgstr " msgid "barcheck failed at: %s" msgstr "" -#: beam.cc:153 -#, fuzzy -msgid "beam has less than two visible stems" -msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" - -#: beam.cc:158 -#, fuzzy -msgid "Beam has less than two stems. Removing beam." -msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" - -#: beam.cc:892 -msgid "" -"Not sure that we can find a nice beam slope (no viable initial configuration " -"found)." -msgstr "" - -#: beam-engraver.cc:166 +#: beam-engraver.cc:167 msgid "already have a beam" msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ" @@ -529,7 +522,7 @@ msgstr " msgid "unterminated beam" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÇÒÕÐÐÉÒÏ×ËÁ ÛÔÉÌÅÊ" -#: beam-engraver.cc:267 chord-tremolo-engraver.cc:185 +#: beam-engraver.cc:267 chord-tremolo-engraver.cc:175 msgid "stem must have Rhythmic structure" msgstr "ÛÔÉÌØ ÄÏÌÖÅÎ ÉÍÅÔØ ÒÉÔÍÏ×ÕÀ ÓÔÒÕËÔÕÒÕ" @@ -541,12 +534,28 @@ msgstr " msgid "beam was started here" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ" +#: beam.cc:138 +#, fuzzy +msgid "beam has less than two visible stems" +msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" + +#: beam.cc:143 +#, fuzzy +msgid "Beam has less than two stems. Removing beam." +msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" + +#: beam.cc:797 +msgid "" +"Not sure that we can find a nice beam slope (no viable initial configuration " +"found)." +msgstr "" + #: break-align-interface.cc:166 #, fuzzy, c-format msgid "No spacing entry from %s to `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ ÂÕÍÁÇÉ: `%s'" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "ÎÅ ÍÏÇÕ ÓÍÅÎÉÔØ `%s' ÎÁ `%s'" @@ -557,14 +566,23 @@ msgstr " #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:78 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "ñ ÅÄÉÎÓÔ×ÅÎÎÙÊ" -#: change-iterator.cc:81 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" +#: chord-tremolo-engraver.cc:137 percent-repeat-engraver.cc:182 +msgid "unterminated chord tremolo" +msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" + +#: chord-tremolo-iterator.cc:50 +#, fuzzy +msgid "no one to print a tremolos" +msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" + #: chord.cc:313 #, c-format msgid "invalid subtraction: not part of chord: %s" @@ -575,37 +593,28 @@ msgstr " msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:142 percent-repeat-engraver.cc:182 -msgid "unterminated chord tremolo" -msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" - -#: chord-tremolo-iterator.cc:49 -#, fuzzy -msgid "no one to print a tremolos" -msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" - #: dimensions.cc:13 msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:189 span-dynamic-performer.cc:82 +#: dynamic-engraver.cc:187 span-dynamic-performer.cc:82 msgid "can't find start of (de)crescendo" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÁÞÁÌÏ (ÄÅ)ËÒÅÝÅÎÄÏ" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:211 msgid "already have a crescendo" msgstr "ËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:212 msgid "already have a decrescendo" msgstr "ÄÅËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:217 +#: dynamic-engraver.cc:215 #, fuzzy msgid "Cresc started here" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ" -#: dynamic-engraver.cc:309 +#: dynamic-engraver.cc:307 msgid "unterminated (de)crescendo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ (ÄÅ)ËÒÅÝÅÎÄÏ" @@ -621,11 +630,11 @@ msgstr " msgid "no one to print a repeat brace" msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" -#: font-interface.cc:241 +#: font-interface.cc:238 msgid "couldn't find any font satisfying " msgstr "" -#: gourlay-breaking.cc:170 +#: gourlay-breaking.cc:171 msgid "No feasible line breaking found" msgstr "îÅ ÎÁÊÄÅÎÏ ÕÄÏ×ÌÅÔ×ÏÒÉÔÅÌØÎÏÇÏ ÒÁÚÒÙ×Á ÓÔÒÏËÉ" @@ -695,19 +704,19 @@ msgstr "" msgid "ligature was started here" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ" -#: lily-guile.cc:137 +#: lily-guile.cc:162 #, c-format msgid "(load path: `%s')" msgstr "(ÐÕÔØ ÚÁÇÒÕÚËÉ: `%s')" -#: lily-guile.cc:664 +#: lily-guile.cc:697 #, c-format msgid "" "Can't find property type-check for `%s' (%s). Perhaps you made a typing " "error? Doing assignment anyway." msgstr "" -#: lily-guile.cc:682 +#: lily-guile.cc:715 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" @@ -720,72 +729,75 @@ msgstr "" msgid "round filled box vertical extent smaller than blot; decreasing blot" msgstr "" -#: lyric-phrasing-engraver.cc:279 +#: lyric-phrasing-engraver.cc:301 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:284 +#: lyric-phrasing-engraver.cc:307 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" #. print example usage: lilypond -e "" ? -#: main.cc:108 +#: main.cc:109 msgid "EXPR" msgstr "" -#: main.cc:108 +#: main.cc:109 msgid "Scheme options: try -e \"(set-lily-option 'help 0)\" for more help." msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:111 +#: main.cc:112 msgid "EXT" msgstr "òáóû" -#: main.cc:111 +#: main.cc:112 #, fuzzy msgid "use output format EXT (tex [default], pdftex, ps, scm or as)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû" -#: main.cc:113 +#: main.cc:114 #, fuzzy msgid "FIELD" msgstr "æáêì" -#: main.cc:113 +#: main.cc:114 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:114 +#: main.cc:115 msgid "add DIR to search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: main.cc:115 +#: main.cc:116 msgid "use FILE as init file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ" -#: main.cc:119 +#: main.cc:120 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:120 +#. +#. should audit again. +#. +#: main.cc:125 msgid "inhibit file output naming and exporting" msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:140 +#: main.cc:146 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." -#: main.cc:142 +#: main.cc:148 msgid "Typeset music and or play MIDI from FILE" msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ" -#: main.cc:146 +#: main.cc:152 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" @@ -795,11 +807,11 @@ msgstr "" "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n" "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n" -#: main.cc:156 +#: main.cc:162 msgid "This binary was compiled with the following options:" msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:" -#: main.cc:177 +#: main.cc:183 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -811,17 +823,17 @@ msgstr "" "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n" "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n" -#: main.cc:184 main.cc:196 +#: main.cc:190 main.cc:202 #, c-format msgid "Copyright (c) %s by" msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by" -#: main.cc:194 +#: main.cc:200 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU" -#: main.cc:202 +#: main.cc:208 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" @@ -838,6 +850,26 @@ msgid "" "USA.\n" msgstr "" +#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 +msgid "unexpected case fall-through" +msgstr "" + +#: mensural-ligature-engraver.cc:332 +msgid "ligature with less than 2 heads -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:347 +msgid "can not determine pitch of ligature primitive -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:370 +msgid "prime interval within ligature -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:380 +msgid "mensural ligature: duration none of L, B, S -> skipping" +msgstr "" + #: mensural-ligature.cc:152 #, c-format msgid "Mensural_ligature: thickness undefined on flexa %d; assuming 1.4" @@ -861,26 +893,6 @@ msgstr "" msgid "Menusral_ligature: (join_left == 0)" msgstr "" -#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 -msgid "unexpected case fall-through" -msgstr "" - -#: mensural-ligature-engraver.cc:332 -msgid "ligature with less than 2 heads -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:347 -msgid "can not determine pitch of ligature primitive -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:370 -msgid "prime interval within ligature -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:380 -msgid "mensural ligature: duration none of L, B, S -> skipping" -msgstr "" - #: midi-item.cc:144 #, c-format msgid "no such instrument: `%s'" @@ -894,22 +906,22 @@ msgstr " msgid "silly pitch" msgstr "ÇÌÕÐÙÊ ÔÏÎ" -#: music.cc:152 -#, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "" - #: music-output-def.cc:113 #, c-format msgid "can't find `%s' context" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'" -#: my-lily-lexer.cc:141 +#: music.cc:159 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "" + +#: my-lily-lexer.cc:142 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "éÍÑ ËÏÍÁÎÄÙ Ñ×ÌÑÅÔÓÑ ËÌÀÞÅ×ÙÍ ÓÌÏ×ÏÍ: `%s'" -#: my-lily-lexer.cc:161 +#: my-lily-lexer.cc:162 #, c-format msgid "error at EOF: %s" msgstr "ÏÛÍÂËÁ × ËÏÎÃÅ ÆÁÊÌÁ: %s" @@ -922,7 +934,7 @@ msgstr " msgid "Braces don't match" msgstr "æÉÇÕÒÎÙÅ ÓËÏÂËÉ ÎÅ ÓÏ×ÐÁÄÁÀÔ" -#: note-collision.cc:332 +#: note-collision.cc:340 msgid "Too many clashing notecolumns. Ignoring them." msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ." @@ -944,7 +956,7 @@ msgstr "\" msgid ", at " msgstr ", ×" -#: paper-score.cc:76 system.cc:346 +#: paper-score.cc:76 #, c-format msgid "Element count %d " msgstr "" @@ -1022,7 +1034,7 @@ msgstr " msgid "can't find start of piano pedal: `%s'" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" -#: piano-pedal-engraver.cc:402 +#: piano-pedal-engraver.cc:404 #, fuzzy msgid "unterminated pedal bracket" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÇÒÕÐÐÉÒÏ×ËÁ ÛÔÉÌÅÊ" @@ -1068,37 +1080,47 @@ msgstr "" msgid "too many colliding rests" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÎÁÌÅÚÁÀÝÉÈ ÐÁÕÚ" -#: scm-option.cc:75 +#: scm-option.cc:77 msgid "lilypond -e EXPR means" msgstr "" -#: scm-option.cc:121 +#: scm-option.cc:123 msgid "Unknown internal option!" msgstr "" -#: score.cc:91 +#: score-engraver.cc:103 +msgid "" +"Could not find feta20.afm. Fonts have not been installed properly; Aborting" +msgstr "" + +#: score-engraver.cc:207 +#, c-format +msgid "unbound spanner `%s'" +msgstr "" + +#: score.cc:93 +#, c-format +msgid "stack size cur %d, max %d\n" +msgstr "" + +#: score.cc:110 msgid "Interpreting music..." msgstr "éÎÔÅÒÐÒÅÔÉÒÕÀ ÍÕÚÙËÕ..." -#: score.cc:105 +#: score.cc:123 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:118 +#: score.cc:136 msgid "Errors found/*, not processing score*/" msgstr "îÁÊÄÅÎÙ ÏÛÉÂËÉ/*, ÎÅ ÏÂÒÁÂÁÔÙ×ÁÀ ÎÏÔÙ*/" -#: score.cc:125 +#: score.cc:143 #, c-format msgid "elapsed time: %.2f seconds" msgstr "ÚÁÔÒÁÞÅÎÎÏÅ ×ÒÅÍÑ: %.2f ÓÅËÕÎÄ" -#: score-engraver.cc:181 -#, c-format -msgid "unbound spanner `%s'" -msgstr "" - #: scores.cc:107 msgid "Score contains errors; will not process it" msgstr "" @@ -1124,15 +1146,6 @@ msgstr "Single_malt_grouping_item: msgid "No spring between column %d and next one" msgstr "" -#: slur.cc:53 -#, fuzzy -msgid "Putting slur over rest." -msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ." - -#: slur.cc:417 -msgid "Slur over rest?" -msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?" - #: slur-engraver.cc:124 msgid "unterminated slur" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" @@ -1144,46 +1157,61 @@ msgstr " msgid "can't find start of slur" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" +#: slur.cc:53 +#, fuzzy +msgid "Putting slur over rest." +msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ." + +#: slur.cc:417 +msgid "Slur over rest?" +msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?" + +#: spacing-spanner.cc:382 +#, c-format +msgid "Global shortest duration is %s\n" +msgstr "" + #: spring-smob.cc:32 #, c-format msgid "#" msgstr "" -#: staff-symbol.cc:60 +#: staff-symbol.cc:62 msgid "staff symbol: indentation yields beyond end of line" msgstr "" -#: stem.cc:121 -msgid "Weird stem size; check for narrow beams" -msgstr "" - #: stem-engraver.cc:117 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)" -#: streams.cc:33 +#: stem.cc:118 +msgid "Weird stem size; check for narrow beams" +msgstr "" + +#: streams.cc:34 #, fuzzy, c-format msgid "can't create directory: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'" -#: streams.cc:47 +#: streams.cc:48 msgid "Error syncing file (disk full?)" msgstr "ïÛÉÂËÁ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÆÁÊÌÁ (ÄÉÓË ÐÅÒÅÐÏÌÎÅÎ?)" -#: system.cc:93 +#: system.cc:109 #, c-format msgid "Element count %d." msgstr "" -#: system.cc:360 +#: system.cc:362 +#, c-format +msgid "Grob count %d " +msgstr "" + +#: system.cc:376 msgid "Calculating column positions..." msgstr "÷ÙÞÉÓÌÑÀ ÐÏÚÉÃÉÉ ÓÔÏÌÂÃÏ×" -#: text-spanner.cc:130 -msgid "Text_spanner too small" -msgstr "" - #: text-spanner-engraver.cc:92 #, fuzzy msgid "can't find start of text spanner" @@ -1199,10 +1227,9 @@ msgstr " msgid "unterminated text spanner" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ" -#: tfm.cc:83 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" +#: text-spanner.cc:130 +msgid "Text_spanner too small" +msgstr "" #: tfm-reader.cc:106 #, c-format @@ -1214,6 +1241,11 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" +#: tfm.cc:83 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" + #: tie-engraver.cc:216 msgid "lonely tie" msgstr "" @@ -1260,78 +1292,78 @@ msgstr "" msgid "can't find or create: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'" -#: volta-engraver.cc:109 +#: volta-engraver.cc:111 msgid "No volta spanner to end" msgstr "" -#: volta-engraver.cc:119 +#: volta-engraver.cc:121 msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "" -#: volta-engraver.cc:123 +#: volta-engraver.cc:125 msgid "Also have a stopped spanner. Giving up." msgstr "" -#: parser.yy:128 +#: parser.yy:129 #, c-format msgid "Expecting %d arguments" msgstr "" -#: parser.yy:436 +#: parser.yy:437 msgid "Identifier should have alphabetic characters only" msgstr "" -#: parser.yy:724 +#: parser.yy:732 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:780 +#: parser.yy:801 msgid "Second argument must be a symbol" msgstr "÷ÔÏÒÏÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÓÉÍ×ÏÌÏÍ" -#: parser.yy:785 +#: parser.yy:806 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1355 +#: parser.yy:1390 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1365 +#: parser.yy:1400 msgid "Can't specify direction for this request" msgstr "îÅ ÍÏÇÕ ÕËÁÚÁÔØ ÎÁÐÒÁ×ÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ÚÁÐÒÏÓÁ" -#: parser.yy:1491 +#: parser.yy:1526 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1502 +#: parser.yy:1537 #, fuzzy msgid "Must have duration object" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÎÁÉÍÅÎØÛÕÀ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: parser.yy:1511 parser.yy:1519 +#: parser.yy:1546 parser.yy:1554 msgid "Have to be in Lyric mode for lyrics" msgstr "äÏÌÖÅÎ ÂÙÔØ × ìÉÒÉÞÅÓËÏÍ ÒÅÖÉÍÅ ÄÌÑ ÌÉÒÉËÉ" -#: parser.yy:1679 parser.yy:1732 +#: parser.yy:1722 parser.yy:1775 #, c-format msgid "not a duration: %d" msgstr "ÎÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ: %d" -#: parser.yy:1819 +#: parser.yy:1862 msgid "Have to be in Note mode for notes" msgstr "äÏÌÖÅÎ ÂÙÔØ × îÏÔÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÎÏÔ" -#: parser.yy:1917 +#: parser.yy:1961 msgid "Have to be in Chord mode for chords" msgstr "äÏÌÖÅÎ ÂÙÔØ × áËËÏÒÄÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÁËËÏÒÄÏ×" -#: parser.yy:2097 +#: parser.yy:2141 msgid "need integer number arg" msgstr "" -#: parser.yy:2169 +#: parser.yy:2213 msgid "Suspect duration found following this beam" msgstr "" diff --git a/po/sv.po b/po/sv.po index 952026501c..f814a2f49d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.4.6\n" -"POT-Creation-Date: 2002-06-13 17:14+0200\n" +"POT-Creation-Date: 2002-07-21 01:00+0200\n" "PO-Revision-Date: 2001-09-03 21:00+0200\n" "Last-Translator: Martin Norbäck \n" "Language-Team: Swedish \n" @@ -13,196 +13,205 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: lilypond-book.py:1171 ly2dvi.py:439 ly2dvi.py:465 +#: lilypond-book.py:1011 ly2dvi.py:442 ly2dvi.py:468 #, c-format msgid "Running %s..." msgstr "Kör %s..." -#: ly2dvi.py:126 midi2ly.py:148 update-lily.py:137 input.cc:87 +#: ly2dvi.py:126 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " msgstr "varning: " -#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:782 ly2dvi.py:800 midi2ly.py:163 -#: midi2ly.py:1012 midi2ly.py:1081 update-lily.py:152 update-lily.py:458 -#: input.cc:92 +#: ly2dvi.py:129 ly2dvi.py:143 ly2dvi.py:813 ly2dvi.py:831 midi2ly.py:163 +#: midi2ly.py:1012 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160 +#: update-lily.py:152 update-lily.py:458 input.cc:92 msgid "error: " msgstr "fel: " -#: ly2dvi.py:144 midi2ly.py:164 update-lily.py:153 +#: ly2dvi.py:144 midi2ly.py:164 mup2ly.py:161 update-lily.py:153 msgid "Exiting ... " msgstr "Avslutar... " -#: ly2dvi.py:202 midi2ly.py:222 update-lily.py:211 +#: ly2dvi.py:202 midi2ly.py:222 mup2ly.py:219 update-lily.py:211 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Användning: %s [FLAGGA]... FIL" -#: ly2dvi.py:206 midi2ly.py:226 update-lily.py:215 main.cc:152 +#: ly2dvi.py:206 midi2ly.py:226 mup2ly.py:223 update-lily.py:215 main.cc:158 msgid "Options:" msgstr "Flaggor:" -#: ly2dvi.py:210 midi2ly.py:230 update-lily.py:219 main.cc:169 +#: ly2dvi.py:210 midi2ly.py:230 mup2ly.py:227 update-lily.py:219 main.cc:175 #, c-format msgid "Report bugs to %s" msgstr "" "Rapportera programfel till %s\n" "Rapportera fel i översättningen till " -#: ly2dvi.py:238 midi2ly.py:258 update-lily.py:247 +#: ly2dvi.py:238 midi2ly.py:258 mup2ly.py:255 update-lily.py:247 #, c-format msgid "Invoking `%s'" msgstr "Startar \"%s\"" -#: ly2dvi.py:243 midi2ly.py:262 update-lily.py:251 +#: ly2dvi.py:243 midi2ly.py:262 mup2ly.py:260 update-lily.py:251 #, c-format msgid "command exited with value %d" msgstr "kommandot avslutade med värde %d" -#: ly2dvi.py:245 midi2ly.py:264 update-lily.py:253 +#: ly2dvi.py:246 midi2ly.py:264 mup2ly.py:263 update-lily.py:253 msgid "(ignored)" msgstr "(ignorerat)" # här är det fråga om rensning av en temporärkatalog -#: ly2dvi.py:255 midi2ly.py:274 update-lily.py:263 +#: ly2dvi.py:256 midi2ly.py:274 mup2ly.py:273 update-lily.py:263 #, c-format msgid "Cleaning %s..." msgstr "Rensar %s..." -#: ly2dvi.py:325 +#: ly2dvi.py:326 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "Generera .dvi med LaTeX för LilyPond" -#: ly2dvi.py:328 main.cc:116 +#: ly2dvi.py:329 main.cc:117 msgid "write Makefile dependencies for every input file" msgstr "skriv Makefile-beroenden för varje indatafil" # förklaring av flaggan -h -#: ly2dvi.py:329 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:112 +#: ly2dvi.py:330 midi2ly.py:98 mup2ly.py:74 update-lily.py:87 main.cc:113 msgid "this help" msgstr "denna hjälp" -#: ly2dvi.py:330 main.cc:114 main.cc:119 +#: ly2dvi.py:331 main.cc:115 main.cc:120 msgid "DIR" msgstr "KATALOG" -#: ly2dvi.py:330 +#: ly2dvi.py:331 msgid "add DIR to LilyPond's search path" msgstr "lägg till KATALOG till LilyPonds sökväg" # %s är programmets namn -#: ly2dvi.py:331 +#: ly2dvi.py:332 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "behåll all utdata, och namnge katalogen %s.dir" -#: ly2dvi.py:332 +#: ly2dvi.py:333 msgid "don't run LilyPond" msgstr "kör inte LilyPond" -#: ly2dvi.py:333 main.cc:117 +#: ly2dvi.py:334 main.cc:118 msgid "produce MIDI output only" msgstr "skapa enbart MIDI-utdata" -#: ly2dvi.py:334 ly2dvi.py:335 midi2ly.py:100 main.cc:115 main.cc:118 +#: ly2dvi.py:335 ly2dvi.py:336 midi2ly.py:100 main.cc:116 main.cc:119 msgid "FILE" msgstr "FIL" -#: ly2dvi.py:334 midi2ly.py:100 +#: ly2dvi.py:335 midi2ly.py:100 msgid "write ouput to FILE" msgstr "skriv utdata till FIL" -#: ly2dvi.py:335 +#: ly2dvi.py:336 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:337 +#: ly2dvi.py:338 msgid "Make a picture of the first system." msgstr "" -#: ly2dvi.py:338 +#: ly2dvi.py:339 msgid "Set the resolution of the preview to RES." msgstr "" -#: ly2dvi.py:339 +#: ly2dvi.py:340 msgid "generate PostScript output" msgstr "skapa PostScript-utdata" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "KEY=VAL" msgstr "NYCKEL=VÄRDE" -#: ly2dvi.py:340 +#: ly2dvi.py:341 msgid "change global setting KEY to VAL" msgstr "ändra global inställning NYCKEL till VÄRDE" # Förklaring till --verbose (borde vara längre) -#: ly2dvi.py:341 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:122 +#: ly2dvi.py:342 midi2ly.py:103 mup2ly.py:77 update-lily.py:91 main.cc:128 msgid "verbose" msgstr "utförlig utdata" -#: ly2dvi.py:342 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:121 +#: ly2dvi.py:343 midi2ly.py:104 mup2ly.py:78 update-lily.py:92 main.cc:127 msgid "print version number" msgstr "visa versionsnummer" -#: ly2dvi.py:343 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:123 +#: ly2dvi.py:344 midi2ly.py:105 mup2ly.py:79 update-lily.py:94 main.cc:129 msgid "show warranty and copyright" msgstr "visa garanti och copyright" -#: ly2dvi.py:429 +#: ly2dvi.py:432 #, c-format msgid "no such setting: %s" msgstr "inställningen finns inte: %s" -#: ly2dvi.py:480 +#: ly2dvi.py:497 #, c-format msgid "Analyzing %s..." msgstr "Analyserar %s..." -#: ly2dvi.py:536 +#: ly2dvi.py:553 #, c-format msgid "no lilypond output found for %s" msgstr "ingen lilypondutdata funnen för %s" -#: ly2dvi.py:576 +#: ly2dvi.py:593 #, c-format msgid "invalid value: %s" msgstr "ogiltigt värde: %s" -#: ly2dvi.py:782 +#: ly2dvi.py:698 +msgid "LaTeX failed on the output file." +msgstr "" + +#: ly2dvi.py:700 +#, c-format +msgid " % logstr))" +msgstr "" + +#: ly2dvi.py:813 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "kan inte öppna fil: \"%s\"" -#: ly2dvi.py:800 midi2ly.py:1012 update-lily.py:458 +#: ly2dvi.py:831 midi2ly.py:1012 update-lily.py:458 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:887 +#: ly2dvi.py:918 #, fuzzy, c-format msgid "filename should not contain spaces: `%s'" msgstr "Innehåller redan: \"%s\"" # här är det fråga om skrivning till en fil -#: ly2dvi.py:957 scores.cc:46 +#: ly2dvi.py:988 scores.cc:46 #, c-format msgid "dependencies output to `%s'..." msgstr "beroenden skrivna till \"%s\"..." # här är det fråga om skrivning till en fil (första parametern är t.ex # DVI, LATEX, MIDI, TEX) -#: ly2dvi.py:968 midi2ly.py:996 +#: ly2dvi.py:999 midi2ly.py:996 #, c-format msgid "%s output to `%s'..." msgstr "%s skrivet till \"%s\"..." -#: ly2dvi.py:970 includable-lexer.cc:49 lily-guile.cc:135 scores.cc:137 +#: ly2dvi.py:1001 includable-lexer.cc:49 lily-guile.cc:160 scores.cc:137 #: scores.cc:143 #, c-format msgid "can't find file: `%s'" msgstr "kan inte hitta fil: \"%s\"" -#: ly2dvi.py:978 midi2ly.py:1081 +#: ly2dvi.py:1009 midi2ly.py:1081 msgid "no files specified on command line." msgstr "inga filer angivna på kommandoraden." @@ -269,7 +278,7 @@ msgstr "fels msgid "define macro NAME [optional expansion EXP]" msgstr "definiera makro NAME [valfri makroersättning EXP]" -#: mup2ly.py:75 main.cc:118 +#: mup2ly.py:75 main.cc:119 msgid "write output to FILE" msgstr "skriv utdata till FIL" @@ -277,17 +286,17 @@ msgstr "skriv utdata till FIL" msgid "only pre-process" msgstr "förbehandla enbart" -#: mup2ly.py:827 +#: mup2ly.py:1073 #, c-format msgid "no such context: %s" msgstr "omgivning finns inte: %s" -#: mup2ly.py:1051 +#: mup2ly.py:1297 #, c-format msgid "Processing `%s'..." msgstr "Behandlar \"%s\"..." -#: mup2ly.py:1070 +#: mup2ly.py:1316 #, c-format msgid "Writing `%s'..." msgstr "Skriver \"%s\"..." @@ -369,22 +378,22 @@ msgstr "H msgid "Building `%s'..." msgstr "Bygger \"%s\"..." -#: getopt-long.cc:145 +#: getopt-long.cc:146 #, c-format msgid "option `%s' requires an argument" msgstr "flaggan \"%s\" kräver ett argument" -#: getopt-long.cc:149 +#: getopt-long.cc:150 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "flaggan \"%s\" tillåter inget argument" -#: getopt-long.cc:153 +#: getopt-long.cc:154 #, c-format msgid "unrecognized option: `%s'" msgstr "okänd flagga: \"%s\"" -#: getopt-long.cc:160 +#: getopt-long.cc:161 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "ogiltigt argument \"%s\" till flaggan \"%s\"" @@ -393,7 +402,7 @@ msgstr "ogiltigt argument \"%s\" till flaggan \"%s\"" msgid "non fatal error: " msgstr "icke-fatalt fel: " -#: input.cc:106 source-file.cc:63 source-file.cc:156 +#: input.cc:106 source-file.cc:68 source-file.cc:161 msgid "position unknown" msgstr "okänd position" @@ -403,7 +412,7 @@ msgid "can't map file" msgstr "kan inte göra \"mmap\" på filen" #: mapped-file-storage.cc:87 simple-file-storage.cc:44 scores.cc:50 -#: streams.cc:37 +#: streams.cc:38 #, c-format msgid "can't open file: `%s'" msgstr "kan inte öppna fil: \"%s\"" @@ -413,37 +422,37 @@ msgstr "kan inte msgid "Huh? Got %d, expected %d characters" msgstr "Öh? Fick %d, väntade %d tecken" -#: warn.cc:10 warn.cc:17 -#, fuzzy, c-format -msgid "error: %s\n" -msgstr "fel: " - -#: warn.cc:23 +#: warn.cc:24 #, fuzzy, c-format msgid "warning: %s\n" msgstr "varning: " -#: warn.cc:35 +#: warn.cc:30 +#, fuzzy, c-format +msgid "error: %s\n" +msgstr "fel: " + +#: warn.cc:43 #, fuzzy, c-format msgid "programming error: %s (Continuing; cross thumbs)\n" msgstr " (Fortsätter, håll tummarna)" -#: accidental-engraver.cc:174 +#: accidental-engraver.cc:181 new-accidental-engraver.cc:234 #, c-format msgid "Accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:199 +#: accidental-engraver.cc:206 new-accidental-engraver.cc:259 #, fuzzy, c-format msgid "unknown accidental typesetting: %s. Ignored" msgstr "okänd \"escaped\" sträng: \"\\%s\"" -#: accidental-engraver.cc:215 +#: accidental-engraver.cc:222 new-accidental-engraver.cc:275 #, c-format msgid "Symbol is not a parent context: %s. Ignored" msgstr "" -#: accidental-engraver.cc:218 +#: accidental-engraver.cc:225 new-accidental-engraver.cc:278 #, c-format msgid "Accidental typesetting must be pair or context-name: %s" msgstr "" @@ -504,7 +513,7 @@ msgstr "(s msgid "Giving up" msgstr "Ger upp" -#: auto-change-iterator.cc:43 change-iterator.cc:59 +#: auto-change-iterator.cc:43 change-iterator.cc:60 #: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "Kan inte byta översättare, jag är redan där" @@ -514,23 +523,7 @@ msgstr "Kan inte byta msgid "barcheck failed at: %s" msgstr "taktkontroll misslyckades vid: %s" -#: beam.cc:153 -#, fuzzy -msgid "beam has less than two visible stems" -msgstr "balk har mindre än två skaft" - -#: beam.cc:158 -#, fuzzy -msgid "Beam has less than two stems. Removing beam." -msgstr "balk har mindre än två skaft" - -#: beam.cc:892 -msgid "" -"Not sure that we can find a nice beam slope (no viable initial configuration " -"found)." -msgstr "" - -#: beam-engraver.cc:166 +#: beam-engraver.cc:167 msgid "already have a beam" msgstr "har redan en balk" @@ -538,7 +531,7 @@ msgstr "har redan en balk" msgid "unterminated beam" msgstr "oavslutad balk" -#: beam-engraver.cc:267 chord-tremolo-engraver.cc:185 +#: beam-engraver.cc:267 chord-tremolo-engraver.cc:175 msgid "stem must have Rhythmic structure" msgstr "skaft måste ha en rytmisk struktur" @@ -550,12 +543,28 @@ msgstr "skaftet passar inte i balken" msgid "beam was started here" msgstr "balken startade här" +#: beam.cc:138 +#, fuzzy +msgid "beam has less than two visible stems" +msgstr "balk har mindre än två skaft" + +#: beam.cc:143 +#, fuzzy +msgid "Beam has less than two stems. Removing beam." +msgstr "balk har mindre än två skaft" + +#: beam.cc:797 +msgid "" +"Not sure that we can find a nice beam slope (no viable initial configuration " +"found)." +msgstr "" + #: break-align-interface.cc:166 #, fuzzy, c-format msgid "No spacing entry from %s to `%s'" msgstr "Lägger inte till översättare: \"%s\"" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "kan inte ändra \"%s\" till \"%s\"" @@ -566,14 +575,22 @@ msgstr "kan inte #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:78 +#: change-iterator.cc:79 msgid "I'm one myself" msgstr "Jag är en själv" -#: change-iterator.cc:81 +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "ingen av dessa i min familj" +#: chord-tremolo-engraver.cc:137 percent-repeat-engraver.cc:182 +msgid "unterminated chord tremolo" +msgstr "icke avslutat ackordtremolo" + +#: chord-tremolo-iterator.cc:50 +msgid "no one to print a tremolos" +msgstr "det finns ingen som kan skriva tremolon" + #: chord.cc:313 #, c-format msgid "invalid subtraction: not part of chord: %s" @@ -585,36 +602,28 @@ msgstr "ogiltig subtraktion: inte del av ackord: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "ogiltig ton för inversion: inte del av ett ackord: %s" -#: chord-tremolo-engraver.cc:142 percent-repeat-engraver.cc:182 -msgid "unterminated chord tremolo" -msgstr "icke avslutat ackordtremolo" - -#: chord-tremolo-iterator.cc:49 -msgid "no one to print a tremolos" -msgstr "det finns ingen som kan skriva tremolon" - #: dimensions.cc:13 msgid "NaN" msgstr "-" -#: dynamic-engraver.cc:189 span-dynamic-performer.cc:82 +#: dynamic-engraver.cc:187 span-dynamic-performer.cc:82 msgid "can't find start of (de)crescendo" msgstr "kan inte hitta start på crescendo/diminuendo" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:211 msgid "already have a crescendo" msgstr "har redan ett crescendo" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:212 msgid "already have a decrescendo" msgstr "har redan ett diminuendo" -#: dynamic-engraver.cc:217 +#: dynamic-engraver.cc:215 #, fuzzy msgid "Cresc started here" msgstr "balken startade här" -#: dynamic-engraver.cc:309 +#: dynamic-engraver.cc:307 msgid "unterminated (de)crescendo" msgstr "oavslutat crescendo/diminuendo" @@ -632,11 +641,11 @@ msgstr "" msgid "no one to print a repeat brace" msgstr "det finns ingen som kan skriva ett repristecken" -#: font-interface.cc:241 +#: font-interface.cc:238 msgid "couldn't find any font satisfying " msgstr "kunde inte hitta något typsnitt som uppfyller " -#: gourlay-breaking.cc:170 +#: gourlay-breaking.cc:171 msgid "No feasible line breaking found" msgstr "Ingen lämplig radbrytning hittades" @@ -707,12 +716,12 @@ msgstr "" msgid "ligature was started here" msgstr "balken startade här" -#: lily-guile.cc:137 +#: lily-guile.cc:162 #, c-format msgid "(load path: `%s')" msgstr "(inläsningssökväg: \"%s\"" -#: lily-guile.cc:664 +#: lily-guile.cc:697 #, fuzzy, c-format msgid "" "Can't find property type-check for `%s' (%s). Perhaps you made a typing " @@ -721,7 +730,7 @@ msgstr "" "Kan inte hitta egenskapstypkontroll för \"%s\". Kanske har du gjort ett " "typfel? Gör tilldelning i alla fall." -#: lily-guile.cc:682 +#: lily-guile.cc:715 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" @@ -735,71 +744,74 @@ msgstr "" msgid "round filled box vertical extent smaller than blot; decreasing blot" msgstr "" -#: lyric-phrasing-engraver.cc:279 +#: lyric-phrasing-engraver.cc:301 msgid "lyrics found without any matching notehead" msgstr "text hittad utan något matchande nothuvud" -#: lyric-phrasing-engraver.cc:284 +#: lyric-phrasing-engraver.cc:307 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "Öh? Melismatisk not har tillhörande text." #. print example usage: lilypond -e "" ? -#: main.cc:108 +#: main.cc:109 msgid "EXPR" msgstr "UTTR" -#: main.cc:108 +#: main.cc:109 msgid "Scheme options: try -e \"(set-lily-option 'help 0)\" for more help." msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:111 +#: main.cc:112 msgid "EXT" msgstr "FMT" -#: main.cc:111 +#: main.cc:112 #, fuzzy msgid "use output format EXT (tex [default], pdftex, ps, scm or as)" msgstr "använd utdataformat FMT (scm, ps, tex eller as)" -#: main.cc:113 +#: main.cc:114 msgid "FIELD" msgstr "FÄLT" -#: main.cc:113 +#: main.cc:114 msgid "write header field to BASENAME.FIELD" msgstr "skriv rubrikfält till BASNAMN.FÄLT" -#: main.cc:114 +#: main.cc:115 msgid "add DIR to search path" msgstr "lägg till KATALOG till sökvägen" -#: main.cc:115 +#: main.cc:116 msgid "use FILE as init file" msgstr "använd FIL som init-fil" -#: main.cc:119 +#: main.cc:120 msgid "prepend DIR to dependencies" msgstr "lägg till KATALOG efter beroenden" -#: main.cc:120 +#. +#. should audit again. +#. +#: main.cc:125 msgid "inhibit file output naming and exporting" msgstr "hindra namngivning av filutdata och exportering" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:140 +#: main.cc:146 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Användning: %s [FLAGGA]... FIL..." -#: main.cc:142 +#: main.cc:148 msgid "Typeset music and or play MIDI from FILE" msgstr "Typsätt musik och/eller spela MIDI från FIL" -#: main.cc:146 +#: main.cc:152 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" @@ -809,11 +821,11 @@ msgstr "" "högnivåbeskrivning av musiken i en fil. LilyPond är en del av\n" "GNU-projektet.\n" -#: main.cc:156 +#: main.cc:162 msgid "This binary was compiled with the following options:" msgstr "Detta program kompilerades med följande alternativ:" -#: main.cc:177 +#: main.cc:183 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -824,16 +836,16 @@ msgstr "" "och du får ändra och/eller distribuera kopior av den under vissa\n" "villkor. Kör \"%s --warranty\" för mer information.\n" -#: main.cc:184 main.cc:196 +#: main.cc:190 main.cc:202 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright © %s av" -#: main.cc:194 +#: main.cc:200 msgid "GNU LilyPond -- The music typesetter" msgstr "GNU Lilypond -- Musiktypsättaren" -#: main.cc:202 +#: main.cc:208 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" @@ -863,6 +875,26 @@ msgstr "" "detta program. Om inte, skriv till Free Software Foundation, Inc., 59\n" "Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n" +#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 +msgid "unexpected case fall-through" +msgstr "" + +#: mensural-ligature-engraver.cc:332 +msgid "ligature with less than 2 heads -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:347 +msgid "can not determine pitch of ligature primitive -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:370 +msgid "prime interval within ligature -> skipping" +msgstr "" + +#: mensural-ligature-engraver.cc:380 +msgid "mensural ligature: duration none of L, B, S -> skipping" +msgstr "" + #: mensural-ligature.cc:152 #, c-format msgid "Mensural_ligature: thickness undefined on flexa %d; assuming 1.4" @@ -886,26 +918,6 @@ msgstr "" msgid "Menusral_ligature: (join_left == 0)" msgstr "" -#: mensural-ligature-engraver.cc:321 mensural-ligature-engraver.cc:483 -msgid "unexpected case fall-through" -msgstr "" - -#: mensural-ligature-engraver.cc:332 -msgid "ligature with less than 2 heads -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:347 -msgid "can not determine pitch of ligature primitive -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:370 -msgid "prime interval within ligature -> skipping" -msgstr "" - -#: mensural-ligature-engraver.cc:380 -msgid "mensural ligature: duration none of L, B, S -> skipping" -msgstr "" - #: midi-item.cc:144 #, c-format msgid "no such instrument: `%s'" @@ -919,22 +931,22 @@ msgstr "tokig l msgid "silly pitch" msgstr "tokig ton" -#: music.cc:152 -#, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponering med %s gör höjning/sänkning större än två" - #: music-output-def.cc:113 #, c-format msgid "can't find `%s' context" msgstr "kan inte hitta omgivningen \"%s\"" -#: my-lily-lexer.cc:141 +#: music.cc:159 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponering med %s gör höjning/sänkning större än två" + +#: my-lily-lexer.cc:142 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Identifierarnamn är ett nyckelord: \"%s\"" -#: my-lily-lexer.cc:161 +#: my-lily-lexer.cc:162 #, c-format msgid "error at EOF: %s" msgstr "fel vid filslut: %s" @@ -947,7 +959,7 @@ msgstr "Tolkar..." msgid "Braces don't match" msgstr "Krullparenteser matchar inte" -#: note-collision.cc:332 +#: note-collision.cc:340 msgid "Too many clashing notecolumns. Ignoring them." msgstr "För många krockande notkolumner. Ignorerar dem." @@ -969,7 +981,7 @@ msgstr "pappersutdata till \"%s\"..." msgid ", at " msgstr ", vid " -#: paper-score.cc:76 system.cc:346 +#: paper-score.cc:76 #, c-format msgid "Element count %d " msgstr "Elementantal %d " @@ -1043,7 +1055,7 @@ msgstr "kan inte hitta start p msgid "can't find start of piano pedal: `%s'" msgstr "kan inte hitta start på pianopedal: \"%s\"" -#: piano-pedal-engraver.cc:402 +#: piano-pedal-engraver.cc:404 #, fuzzy msgid "unterminated pedal bracket" msgstr "oavslutad balk" @@ -1089,37 +1101,47 @@ msgstr "" msgid "too many colliding rests" msgstr "för många krockande pauser" -#: scm-option.cc:75 +#: scm-option.cc:77 msgid "lilypond -e EXPR means" msgstr "" -#: scm-option.cc:121 +#: scm-option.cc:123 msgid "Unknown internal option!" msgstr "" -#: score.cc:91 +#: score-engraver.cc:103 +msgid "" +"Could not find feta20.afm. Fonts have not been installed properly; Aborting" +msgstr "" + +#: score-engraver.cc:207 +#, c-format +msgid "unbound spanner `%s'" +msgstr "obunden bryggare \"%s\"" + +#: score.cc:93 +#, c-format +msgid "stack size cur %d, max %d\n" +msgstr "" + +#: score.cc:110 msgid "Interpreting music..." msgstr "Tolkar musik..." -#: score.cc:105 +#: score.cc:123 msgid "Need music in a score" msgstr "Behöver musik i partitur" #. should we? hampers debugging. -#: score.cc:118 +#: score.cc:136 msgid "Errors found/*, not processing score*/" msgstr "Fel funna/*, behandlar inte partitur*/" -#: score.cc:125 +#: score.cc:143 #, c-format msgid "elapsed time: %.2f seconds" msgstr "tidsåtgång: %.2f sekunder" -#: score-engraver.cc:181 -#, c-format -msgid "unbound spanner `%s'" -msgstr "obunden bryggare \"%s\"" - #: scores.cc:107 msgid "Score contains errors; will not process it" msgstr "Partitur innehåller fel; kommer inte behandla det" @@ -1144,15 +1166,6 @@ msgstr "Separation_item: Jag har druckit f msgid "No spring between column %d and next one" msgstr "" -#: slur.cc:53 -#, fuzzy -msgid "Putting slur over rest." -msgstr "Sätter båge över paus. Ignorerar." - -#: slur.cc:417 -msgid "Slur over rest?" -msgstr "Båge över paus?" - #: slur-engraver.cc:124 msgid "unterminated slur" msgstr "oavslutat båge" @@ -1163,46 +1176,61 @@ msgstr "oavslutat b msgid "can't find start of slur" msgstr "kan inte hitta start på båge" +#: slur.cc:53 +#, fuzzy +msgid "Putting slur over rest." +msgstr "Sätter båge över paus. Ignorerar." + +#: slur.cc:417 +msgid "Slur over rest?" +msgstr "Båge över paus?" + +#: spacing-spanner.cc:382 +#, c-format +msgid "Global shortest duration is %s\n" +msgstr "" + #: spring-smob.cc:32 #, c-format msgid "#" msgstr "" -#: staff-symbol.cc:60 +#: staff-symbol.cc:62 msgid "staff symbol: indentation yields beyond end of line" msgstr "" -#: stem.cc:121 -msgid "Weird stem size; check for narrow beams" -msgstr "Konstig skaftstorlek; kolla efter smala balkar" - #: stem-engraver.cc:117 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Lägger till nothuvud till inkompatibel båge (typ = %d)" -#: streams.cc:33 +#: stem.cc:118 +msgid "Weird stem size; check for narrow beams" +msgstr "Konstig skaftstorlek; kolla efter smala balkar" + +#: streams.cc:34 #, c-format msgid "can't create directory: `%s'" msgstr "kan inte skapa katalog: \"%s\"" -#: streams.cc:47 +#: streams.cc:48 msgid "Error syncing file (disk full?)" msgstr "Fel vid synkning av fil (disken full?)" -#: system.cc:93 +#: system.cc:109 #, c-format msgid "Element count %d." msgstr "Elementantal %d." -#: system.cc:360 +#: system.cc:362 +#, fuzzy, c-format +msgid "Grob count %d " +msgstr "Elementantal %d " + +#: system.cc:376 msgid "Calculating column positions..." msgstr "Beräknar kolumnpositioner..." -#: text-spanner.cc:130 -msgid "Text_spanner too small" -msgstr "Textbryggare för liten" - #: text-spanner-engraver.cc:92 msgid "can't find start of text spanner" msgstr "kan inte hitta start på textbryggare" @@ -1215,10 +1243,9 @@ msgstr "har redan en textbryggare" msgid "unterminated text spanner" msgstr "oavslutad textbryggare" -#: tfm.cc:83 -#, c-format -msgid "can't find ascii character: %d" -msgstr "kan inte hitta ASCII-tecken: %d" +#: text-spanner.cc:130 +msgid "Text_spanner too small" +msgstr "Textbryggare för liten" #: tfm-reader.cc:106 #, c-format @@ -1230,6 +1257,11 @@ msgstr "TFM-rubrik i \"%s\" har bara %u ord" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM-fil har %u parametrar, vilket är mer än de %u jag kan hantera" +#: tfm.cc:83 +#, c-format +msgid "can't find ascii character: %d" +msgstr "kan inte hitta ASCII-tecken: %d" + #: tie-engraver.cc:216 msgid "lonely tie" msgstr "ensam båge" @@ -1276,77 +1308,77 @@ msgstr "kan inte hitta eller skapa \"%s\" kallad \"%s\"" msgid "can't find or create: `%s'" msgstr "kan inte hitta eller skapa: \"%s\"" -#: volta-engraver.cc:109 +#: volta-engraver.cc:111 msgid "No volta spanner to end" msgstr "Ingen reprisbryggare till slutet" -#: volta-engraver.cc:119 +#: volta-engraver.cc:121 msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "Har redan en reprisbryggare. Stoppar den tidigare." -#: volta-engraver.cc:123 +#: volta-engraver.cc:125 msgid "Also have a stopped spanner. Giving up." msgstr "Har också en stoppad bryggare. Ger upp." -#: parser.yy:128 +#: parser.yy:129 #, c-format msgid "Expecting %d arguments" msgstr "Väntade %d argument" -#: parser.yy:436 +#: parser.yy:437 msgid "Identifier should have alphabetic characters only" msgstr "Identifierare får bara innehålla alfabetiska tecken" -#: parser.yy:724 +#: parser.yy:732 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "Fler alternativ än repriser. Slänger överblivna alternativ." -#: parser.yy:780 +#: parser.yy:801 msgid "Second argument must be a symbol" msgstr "Andra argumentet måste vara en symbol" -#: parser.yy:785 +#: parser.yy:806 msgid "First argument must be a procedure taking 1 argument" msgstr "Första argumentet måste vara en procedur som tar 1 argument" -#: parser.yy:1355 +#: parser.yy:1390 msgid "Expecting string as script definition" msgstr "Väntade sträng som skriptdefinition" -#: parser.yy:1365 +#: parser.yy:1400 msgid "Can't specify direction for this request" msgstr "Kan inte ange riktning för denna förfrågan" -#: parser.yy:1491 +#: parser.yy:1526 msgid "Expecting musical-pitch value" msgstr "Väntade notvärde" -#: parser.yy:1502 +#: parser.yy:1537 msgid "Must have duration object" msgstr "Måste ha längdobjekt" -#: parser.yy:1511 parser.yy:1519 +#: parser.yy:1546 parser.yy:1554 msgid "Have to be in Lyric mode for lyrics" msgstr "Måste vara i textläge (Lyric mode) för text" -#: parser.yy:1679 parser.yy:1732 +#: parser.yy:1722 parser.yy:1775 #, c-format msgid "not a duration: %d" msgstr "inte en längd: %d" -#: parser.yy:1819 +#: parser.yy:1862 msgid "Have to be in Note mode for notes" msgstr "Måste vara i notläge (Note mode) för noter" -#: parser.yy:1917 +#: parser.yy:1961 msgid "Have to be in Chord mode for chords" msgstr "Måste vara i ackordläge (Chord mode) för ackord" -#: parser.yy:2097 +#: parser.yy:2141 msgid "need integer number arg" msgstr "behöver heltalsargument" -#: parser.yy:2169 +#: parser.yy:2213 msgid "Suspect duration found following this beam" msgstr "" diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps index 952cd49065..9ca5846657 100644 --- a/ps/music-drawing-routines.ps +++ b/ps/music-drawing-routines.ps @@ -7,7 +7,6 @@ % fucking redhat xdvi patch. /skeel { scale } bind def - /set_tex_dimen { cvr def } bind def @@ -17,7 +16,6 @@ 1 copy mul exch 1 copy mul add sqrt } bind def -/skeel { scale } bind def % FIXME. translate to middle of box. % Nice rectangle with rounded corners /draw_box % breapth width depth height -- 2.39.2