From 347426c0c9d2fb8e4e75216f717606f1f2124b1a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 17 Dec 2000 15:49:08 +0100 Subject: [PATCH] patch::: 1.3.117.jcn2 1.3.117.jcn2 ============ * Resurrected direct scheme output, ie. lilypond -fscm * Warning message fixes and po update. * Bugfix: debian package. --- Generated by janneke@gnu.org, From = lilypond-1.3.117.jcn1, To = lilypond-1.3.117.jcn2 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.117.jcn2.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- CHANGES | 16 +- Documentation/regression-test.tely | 2 + VERSION | 2 +- debian/changelog | 7 + debian/rules | 8 +- input/bugs/guile-state.ly | 77 ++++ input/bugs/triplets.ly | 27 ++ input/test/slur-broken-cross-staff.ly | 52 +++ input/test/triplets.ly | 27 ++ lily/all-font-metrics.cc | 4 +- lily/include/lily-guile.hh | 1 + lily/lily-guile.cc | 17 + lily/paper-outputter.cc | 21 +- lily/property-engraver.cc | 39 +- lily/spacing-spanner.cc | 6 +- lily/text-item.cc | 7 + lily/tfm.cc | 2 +- lily/translator-group.cc | 27 +- lily/volta-engraver.cc | 4 +- po/de.po | 530 +++++++++++++++----------- po/fr.po | 502 +++++++++++++----------- po/it.po | 509 ++++++++++++++----------- po/ja.po | 527 ++++++++++++++----------- po/lilypond.pot | 472 +++++++++++++---------- po/nl.po | 517 ++++++++++++++----------- po/ru.po | 513 ++++++++++++++----------- scm/c++.scm | 121 ++++++ scm/clef.scm | 94 +++++ scm/lily.scm | 443 +++------------------ scm/output-lib.scm | 108 ++++++ scm/standalone.scm | 37 ++ scm/tex.scm | 3 +- 32 files changed, 2755 insertions(+), 1967 deletions(-) create mode 100644 input/bugs/guile-state.ly create mode 100644 input/bugs/triplets.ly create mode 100644 input/test/slur-broken-cross-staff.ly create mode 100644 input/test/triplets.ly create mode 100644 scm/c++.scm create mode 100644 scm/clef.scm create mode 100644 scm/output-lib.scm create mode 100644 scm/standalone.scm diff --git a/CHANGES b/CHANGES index 4259d2bee6..49d9d23e51 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,18 @@ ---- ../lilypond-1.3.117/CHANGES Thu Dec 14 18:44:08 2000 +--- ../lilypond-1.3.117.jcn1/CHANGES Sat Dec 16 16:27:51 2000 +++ b/CHANGES Sun Dec 17 15:49:08 2000 +@@ -1,3 +1,12 @@ +1.3.117.jcn2 +============ + +* Resurrected direct scheme output, ie. lilypond -fscm + +* Warning message fixes and po update. + +* Bugfix: debian package. + + 1.3.117.jcn1 + ============ + --- ../lilypond-1.3.117/CHANGES Thu Dec 14 18:44:08 2000 ++ b/CHANGES Sat Dec 16 21:58:37 2000 @@ -1,3 +1,16 @@ 1.3.117.mb1 diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index 34d110de79..4bec2bfaec 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -91,6 +91,8 @@ and documenting bugfixes. @lilypondfile{beam-length.ly} +@lilypondfile{triplets.ly} + @lilypondfile{slur-nice.ly} @lilypondfile{slur-symmetry.ly} @lilypondfile{slur-symmetry-1.ly} diff --git a/VERSION b/VERSION index 110c6def11..a2f11a7e8d 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=117 -MY_PATCH_LEVEL=mb1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/debian/changelog b/debian/changelog index 672ef00d2a..0514490184 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lilypond1.3 (1.3.117) unstable; urgency=low + + * Don't install native debian package LilyPond1.3's upstream changelog + CHANGES using dh_installchangelogs -k (oh, and I'm still not Anthony :-). + + -- Jan Nieuwenhuizen Sat, 16 Dec 2000 22:25:28 +0100 + lilypond1.3 (1.3.107) unstable; urgency=low * Fixed watch location. diff --git a/debian/rules b/debian/rules index de648132d4..b3aa3e6391 100755 --- a/debian/rules +++ b/debian/rules @@ -104,7 +104,13 @@ binary-arch: build install # dh_installcron # dh_installmanpages # dh_undocumented - dh_installchangelogs -k CHANGES +# dh_installchangelogs -k CHANGES +# dh_installchangelogs CHANGES +# These give all errrors. +# Strange, in the maint-guide, it says add the upstream changelog name. +# Let's install as doc, then. --jcn + dh_installdocs CHANGES + dh_installchangelogs dh_link dh_strip dh_compress diff --git a/input/bugs/guile-state.ly b/input/bugs/guile-state.ly new file mode 100644 index 0000000000..2ca522dd5a --- /dev/null +++ b/input/bugs/guile-state.ly @@ -0,0 +1,77 @@ +\header{ +texidoc="Real header: the slurBeginAttachment setting still lives in the +second example, breaking the cross staff broken slur. +"; +} + +\header{ +texidoc=" +Slurs can be forced to always attach to note heads. +"; +} + + +\score{ + \notes \relative c''{ + \property Voice.VerticalDirection = #1 + \property Voice.slurBeginAttachment = #'head + \property Voice.slurEndAttachment = #'head + g16()g()g()g()d'()d()d()d + } + \paper{ + indent = 0.0; + linewidth = 60.0\mm; + } +} + +\header{ +texidoc=" +The same goes for slurs. They behave decently when broken across +linebreak. +"; +} + +\score{ + \context PianoStaff < + \context Staff=one \notes\relative c'{ +%{ + \stemUp \slurUp + c4( c \translator Staff=two c )c | + \translator Staff=one + \stemUp \slurUp + c4( c \translator Staff=two c )c | + \stemUp \slurUp + c4( c \translator Staff=one c )c | + \translator Staff=two + \stemUp \slurUp + c4( c \translator Staff=one c )c | + \translator Staff=two + \stemUp \slurUp + c4( \translator Staff=one c c )c | +%} + r2 + \translator Staff=two + \stemUp \slurUp + c4( \translator Staff=one c + \break + c )c + r2 + +%{ + \stemDown \slurDown + d4( \translator Staff=two c c \translator Staff=one )d + \translator Staff=two + \stemUp \slurUp + c4( \translator Staff=one c c \translator Staff=two )c + r1 +%} + } + \context Staff=two \notes\relative c'{ + \clef bass; + s1 s1 %s1 s1 s1 s1 s1 s1 s1 s1 + } + > + \paper { indent = 0.; linewidth = 40.*\staffspace; } +} + +\version "1.3.110"; diff --git a/input/bugs/triplets.ly b/input/bugs/triplets.ly new file mode 100644 index 0000000000..802727f22e --- /dev/null +++ b/input/bugs/triplets.ly @@ -0,0 +1,27 @@ +\header { +texidoc="Simple beams. This broke somewhere < 1.3.110 +"; + title = "Gammes Chromatiques"; + composer = ""; + filename = "gammes_chromatiques.ly"; +} + +linebreak = \penalty -1000; + +$ex8 = \notes \relative c' { + \repeat "volta" 2 { + \times 2/3 {c8( cis d} \times 2/3 {dis e f} + \times 2/3 {fis g gis} \times 2/3 {a bes b} | + \property Voice.TupletBracket \override #'tuplet-number-visibility = ##f + \property Voice.TupletBracket \override #'tuplet-bracket-visibility = ##f + \times 2/3 {c8 cis d} \times 2/3 {dis e f} + \times 2/3 {fis g gis} \times 2/3 {a bes b} | + \times 2/3 {c b bes} \times 2/3 {a aes g} + \times 2/3 {fis f e} \times 2/3 {ees d des} | + \times 2/3 {c b bes} \times 2/3 {a aes g} + \times 2/3 {fis f e} \times 2/3 {ees d )des} + } + c1 || \linebreak +} + +\score { \context Staff { \notes { \$ex8 } } } diff --git a/input/test/slur-broken-cross-staff.ly b/input/test/slur-broken-cross-staff.ly new file mode 100644 index 0000000000..42afbb9940 --- /dev/null +++ b/input/test/slur-broken-cross-staff.ly @@ -0,0 +1,52 @@ +\header{ +texidoc=" +The same goes for slurs. They behave decently when broken across +linebreak. +"; +} + + +\score{ + \context PianoStaff < + \context Staff=one \notes\relative c'{ +%{ + \stemUp \slurUp + c4( c \translator Staff=two c )c | + \translator Staff=one + \stemUp \slurUp + c4( c \translator Staff=two c )c | + \stemUp \slurUp + c4( c \translator Staff=one c )c | + \translator Staff=two + \stemUp \slurUp + c4( c \translator Staff=one c )c | + \translator Staff=two + \stemUp \slurUp + c4( \translator Staff=one c c )c | +%} + r2 + \translator Staff=two + \stemUp \slurUp + c4( \translator Staff=one c + \break + c )c + r2 + +%{ + \stemDown \slurDown + d4( \translator Staff=two c c \translator Staff=one )d + \translator Staff=two + \stemUp \slurUp + c4( \translator Staff=one c c \translator Staff=two )c + r1 +%} + } + \context Staff=two \notes\relative c'{ + \clef bass; + s1 s1 %s1 s1 s1 s1 s1 s1 s1 s1 + } + > + \paper { indent = 0.; linewidth = 40.*\staffspace; } +} + +\version "1.3.110"; diff --git a/input/test/triplets.ly b/input/test/triplets.ly new file mode 100644 index 0000000000..802727f22e --- /dev/null +++ b/input/test/triplets.ly @@ -0,0 +1,27 @@ +\header { +texidoc="Simple beams. This broke somewhere < 1.3.110 +"; + title = "Gammes Chromatiques"; + composer = ""; + filename = "gammes_chromatiques.ly"; +} + +linebreak = \penalty -1000; + +$ex8 = \notes \relative c' { + \repeat "volta" 2 { + \times 2/3 {c8( cis d} \times 2/3 {dis e f} + \times 2/3 {fis g gis} \times 2/3 {a bes b} | + \property Voice.TupletBracket \override #'tuplet-number-visibility = ##f + \property Voice.TupletBracket \override #'tuplet-bracket-visibility = ##f + \times 2/3 {c8 cis d} \times 2/3 {dis e f} + \times 2/3 {fis g gis} \times 2/3 {a bes b} | + \times 2/3 {c b bes} \times 2/3 {a aes g} + \times 2/3 {fis f e} \times 2/3 {ees d des} | + \times 2/3 {c b bes} \times 2/3 {a aes g} + \times 2/3 {fis f e} \times 2/3 {ees d )des} + } + c1 || \linebreak +} + +\score { \context Staff { \notes { \$ex8 } } } diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index b678dc5adf..2a67d59770 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -84,12 +84,12 @@ All_font_metrics::find_afm (String name) if (tfm->info_.checksum != afm->checksum_) { - String s = _f("Font checksum mismatch for font file `%s'", path.ch_C()); + String s = _f ("checksum mismatch for font file: `%s'", path.ch_C ()); s+= "\n"; s += " TFM: " + to_str ((int) tfm->info_.checksum); s += " AFM: " + to_str ((int) afm->checksum_); s += "\n"; - s += _(" Rebuild all AFM files, and remove all .pk and .tfm files. Rerun with -V to show font paths."); + s += _(" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V to show font paths."); error (s); } diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 9e18991490..fdda2b6977 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -34,6 +34,7 @@ SCM ly_last (SCM list); SCM ly_str02scm (char const*c); +SCM ly_write2scm (SCM s); SCM ly_deep_copy (SCM); SCM ly_symbol2scm (char const *); String ly_scm2string (SCM s); diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 1b71965951..a994eac36d 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -36,6 +36,23 @@ ly_str02scm (char const*c) return gh_str02scm ((char*)c); } + +SCM +ly_write2scm (SCM s) +{ + SCM port = scm_mkstrport (SCM_INUM0, + scm_make_string (SCM_INUM0, SCM_UNDEFINED), + SCM_OPN | SCM_WRTNG, + "ly_write2string"); + // SCM write = scm_eval_3 (ly_symbol2scm ("write"), s, SCM_EOL); + SCM write = scm_eval2 (ly_symbol2scm ("write"), SCM_EOL); + + // scm_apply (write, port, SCM_EOL); + gh_call2 (write, s, port); + return scm_strport_to_string (port); +} + + /* Pass string to scm parser, evaluate one expression. Return result value and #chars read. diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 0bf6c9db98..5d383c9f34 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -45,10 +45,10 @@ Paper_outputter::Paper_outputter (Paper_stream * ps ) { *ps << "" ";;; Usage: guile -s x.scm > x.tex\n" - "(primitive-load-path 'lily.scm)\n" - "(scm-tex-output)\n" - ";(scm-ps-output)\n" - "(map (lambda (x) (display (eval x))) '(\n" + "(primitive-load-path 'standalone.scm)\n" + ";(scm-tex-output)\n" + "(scm-ps-output)\n" + "(map (lambda (x) (display (ly-eval x))) '(\n" ; } @@ -139,18 +139,7 @@ Paper_outputter::dump_scheme (SCM s) { if (verbatim_scheme_b_) { - SCM p; - - p = scm_mkstrport (SCM_INUM0, - scm_make_string (SCM_INUM0, SCM_UNDEFINED), - SCM_OPN | SCM_WRTNG, - "Paper_outputter::dump_scheme()"); - - SCM wr =scm_eval2 (ly_symbol2scm ("write"), SCM_EOL); - scm_apply (wr, s, gh_list (p, SCM_UNDEFINED)); - - SCM result = scm_strport_to_string (p); - *stream_p_ << ly_scm2string (result); + *stream_p_ << ly_scm2string (ly_write2scm (s)); } else { diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index d8f5836835..79227b5590 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -117,19 +117,16 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin) e->set_grob_property (elt_prop_sym, val); SCM errport = scm_current_error_port (); - scm_display (prop_sym, errport); - scm_puts (_(" is deprecated. Use\n \\property ").ch_C(), errport); - - scm_puts (origin->type_str_.ch_C(), errport); - scm_puts (".", errport); - - SCM name = e->get_grob_property ("meta"); - name = scm_assoc (ly_symbol2scm ("name"), name); - scm_display (gh_cdr(name), errport); - scm_puts(" \\override #'",errport); - scm_write (elt_prop_sym,errport); - scm_puts ( " = #",errport); - scm_write (val, scm_current_error_port ()); + SCM meta = e->get_grob_property ("meta"); + SCM name = scm_assoc (ly_symbol2scm ("name"), meta); + /* warning () ? */ + scm_puts (_f ("%s is deprecated. Use\n \\property %s.%s \\override #'%s = #%s", + ly_symbol2string (prop_sym).ch_C (), + origin->type_str_.ch_C (), + ly_scm2string (gh_cdr (name)).ch_C (), + ly_symbol2string (elt_prop_sym).ch_C (), + ly_scm2string (ly_write2scm (val)).ch_C ()).ch_C (), + errport); scm_puts ("\n", errport); } else @@ -147,17 +144,13 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin) if (val != SCM_EOL) { // not the right type: error message. SCM errport = scm_current_error_port (); - warning (_("Wrong type for property")); - scm_display (prop_sym, errport); - scm_puts (", type: ", errport); - SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); - - scm_display (gh_call1 (typefunc, type_p), errport); - scm_puts (", value found: ", errport); - scm_write (val, errport); - scm_puts (" type: ", errport); - scm_display (ly_type (val), errport); + SCM type_name = gh_call1 (typefunc, type_p); + warning (_f ("Wrong type for property: %s, type: %s, value found: %s, type: %s", + ly_symbol2string (prop_sym).ch_C (), + ly_symbol2string (type_name).ch_C (), + ly_scm2string (ly_write2scm (val)).ch_C (), + ly_scm2string (ly_type (val)).ch_C ())); scm_puts ("\n", errport); } } diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 94a2bebf25..3cd903f731 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -103,7 +103,7 @@ Spacing_spanner::do_measure (Grob*me, Link_array cols) SCM stretch_hint = lc->get_grob_property ("stretch-distance"); SCM next_stretch_hint = rc->get_grob_property ("stretch-distance"); - Real left_distance; + Real left_distance = 0; if (gh_pair_p (hint)) { left_distance = gh_scm2double (gh_cdr (hint)); @@ -117,7 +117,9 @@ Spacing_spanner::do_measure (Grob*me, Link_array cols) { left_distance = note_spacing (me,lc, rc, shortest get_grob_property ("font-magnification"); @@ -115,8 +117,13 @@ Text_item::lookup_text (Grob *me, Font_metric*fm, SCM text) assert (false); } +#else + SCM magnification = me->get_grob_property ("font-magnification"); + if (gh_number_p (magnification) && gh_scm2double (magnification) > 1) + programming_error ("font-magnification disabled"); #endif + SCM list = gh_list (ly_symbol2scm ("text"), text, SCM_UNDEFINED); list = fontify_atom (fm, list); diff --git a/lily/tfm.cc b/lily/tfm.cc index 751dc75513..4e7d22f4fa 100644 --- a/lily/tfm.cc +++ b/lily/tfm.cc @@ -74,7 +74,7 @@ Tex_font_metric::find_ascii (int ascii, bool warn) const return & char_metrics_[ascii_to_metric_idx_ [ascii]]; else if (warn) { - warning (_f ("can't find ascii character %d", ascii)); + warning (_f ("can't find ascii character: %d", ascii)); } return &dummy_static_char_metric; } diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 4bf75074a0..82a25ae4b7 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -401,11 +401,11 @@ type_check_assignment (SCM val, SCM sym, SCM type_symbol) if (type_p != SCM_EOL && !gh_procedure_p (type_p)) { - scm_puts (_("Couldn't find property type-check for `").ch_C(),errport); - scm_puts (String ("'").ch_C(), errport); - scm_display (sym, errport); - - scm_puts (_(". Perhaps you made a typing error?\n").ch_C(),errport); + /* warning () ? */ + scm_puts (_f ("Can't find property type-check for `%s'. Perhaps you made a typing error?", + ly_symbol2string (sym).ch_C ()).ch_C (), + errport); + scm_puts ("\n", errport); } else { @@ -414,13 +414,15 @@ type_check_assignment (SCM val, SCM sym, SCM type_symbol) && gh_call1 (type_p, val) == SCM_BOOL_F) { ok = false; - scm_puts (_("Failed typecheck for `").ch_C (),errport); - scm_display (sym,errport); - scm_puts ( _("', value `").ch_C (), errport); - scm_write (val, errport); - scm_puts (_("' must be of type ").ch_C (), errport); SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); - scm_display (gh_call1 (typefunc, type_p), errport); + SCM type_name = gh_call1 (typefunc, type_p); + /* warning () ? */ + scm_puts (_f ("Failed typecheck for `%s', value `%s' must be of type `%s'", + ly_symbol2string (sym).ch_C (), + ly_symbol2string (val).ch_C (), + ly_scm2string (ly_write2scm (val)).ch_C (), + ly_symbol2string (type_name).ch_C ()).ch_C (), + errport); scm_puts ("\n", errport); } } @@ -434,7 +436,8 @@ ly_get_trans_property (SCM context, SCM name) Translator_group* tr= dynamic_cast (t); if (!t || !tr) { - warning ("ly-get-trans-property: expecting a Translator_group argument"); + /* programming_error? */ + warning (_ ("ly-get-trans-property: expecting a Translator_group argument")); return SCM_EOL; } return tr->get_property (name); diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index a4d1af1512..e4dae39b63 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -101,11 +101,11 @@ Volta_engraver::process_music () if (gh_string_p (start_str_) && volta_span_p_) { - warning (_ ("Already have a volta spanner. Stopping that one prematurely.")); + warning (_ ("Already have a volta spanner. Stopping that one prematurely.")); if (end_volta_span_p_) { - warning (_("Also have a stopped spanner. Giving up.")); + warning (_ ("Also have a stopped spanner. Giving up.")); return ; } diff --git a/po/de.po b/po/de.po index 4f64c43cc5..dc7d3ddaf9 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Lilypond 1.2.8\n" -"POT-Creation-Date: 2000-09-17 12:01+0200\n" +"POT-Creation-Date: 2000-12-17 15:35+0100\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -13,40 +13,40 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: data-file.cc:52 +#: data-file.cc:54 msgid "EOF in a string" msgstr "Dateiende in Zeichenkette" -#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "Warnung: " -#: dstream.cc:187 +#: dstream.cc:186 #, fuzzy msgid "not enough fields in Dstream init" msgstr "Nicht genug Felder in der Dstream Inititalisierung" -#: getopt-long.cc:143 +#: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" msgstr "Option `%s' erwartet ein Argument" -#: getopt-long.cc:147 +#: getopt-long.cc:149 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "Option `%s' erlaubt kein Argument" -#: getopt-long.cc:151 +#: getopt-long.cc:153 #, c-format msgid "unrecognized option: `%s'" msgstr "Unbekannte Option: `%s'" -#: getopt-long.cc:158 +#: getopt-long.cc:160 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "Argument `%s' für Optione '%s' ist nicht erlaubt" -#: input.cc:90 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:9 warn.cc:17 msgid "error: " msgstr "Fehler: " @@ -64,7 +64,7 @@ msgid "can't map file" msgstr "Kann die Datei nicht mappen" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "Kann die Datei %s nicht öffnen" @@ -74,106 +74,118 @@ msgstr "Kann die Datei %s nicht msgid "Huh? Got %d, expected %d characters" msgstr "Was? Ich habe %d erhalten, erwartete aber %d Zeichen" -#: text-stream.cc:9 +#: text-stream.cc:10 msgid "" msgstr "" -#: warn.cc:35 +#: warn.cc:36 #, fuzzy msgid "programming error: " msgstr "Programmierfehler: " -#: warn.cc:35 +#: warn.cc:36 #, fuzzy msgid " (Continuing; cross thumbs)" msgstr " (Ich mache weiter: Drück´ mir die Daumen!)" -#: afm.cc:51 +#: afm.cc:53 #, fuzzy, c-format msgid "can't find character number: %d" msgstr "ich kann das Zeichen nummer %d nicht finden" -#: afm.cc:66 +#: afm.cc:68 #, fuzzy, c-format msgid "can't find character called: `%s'" msgstr "Ich kann das Zeichen `%s' nicht finden" -#: afm.cc:96 -msgid "Error parsing AFM file" +#: afm.cc:113 +#, c-format +msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:151 lookup.cc:80 +#: all-font-metrics.cc:87 +#, c-format +msgid "checksum mismatch for font file: `%s'" +msgstr "" + +#: all-font-metrics.cc:92 +msgid "" +" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " +"to show font paths." +msgstr "" + +#: all-font-metrics.cc:153 #, c-format msgid "can't find font: `%s'" msgstr "Kann Schrift `%s' nicht finden" -#: all-font-metrics.cc:152 +#: all-font-metrics.cc:154 #, fuzzy msgid "Loading default font" msgstr "Kann die Schrift %s nicht finden, lade die Standardschrift." -#: all-font-metrics.cc:169 +#: all-font-metrics.cc:171 #, fuzzy, c-format msgid "can't find default font: `%s'" msgstr "Kann Schrift `%s' nicht finden" -#: all-font-metrics.cc:170 includable-lexer.cc:50 lookup.cc:81 scores.cc:109 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 #, c-format msgid "(search path: `%s')" msgstr "(Suchpfad: `%s')" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:173 parser.yy:1642 msgid "Giving up" msgstr "" -#: auto-change-iterator.cc:43 change-iterator.cc:60 +#: auto-change-iterator.cc:43 change-iterator.cc:59 #: part-combine-music-iterator.cc:85 msgid "Can't switch translators, I'm there already" msgstr "" -#: beam-engraver.cc:76 beam-engraver.cc:109 +#: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" msgstr "Kann nicht beide Enden von %s finden" -#: beam-engraver.cc:138 +#: beam-engraver.cc:158 #, fuzzy msgid "already have a beam" msgstr "Habe schon einen Balken" -#: beam-engraver.cc:202 +#: beam-engraver.cc:224 #, fuzzy msgid "unterminated beam" msgstr "Unbeendeter Bindestrich" -#: beam-engraver.cc:240 chord-tremolo-engraver.cc:176 +#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "Ein Notenhals muss rhythmische Struktur haben." -#: beam-engraver.cc:251 +#: beam-engraver.cc:274 msgid "stem doesn't fit in beam" msgstr "Notenhals passt nicht in den Balken" -#: beam-engraver.cc:252 +#: beam-engraver.cc:275 msgid "beam was started here" msgstr "Der Balken bagann hier" -#: beam.cc:84 +#: beam.cc:83 #, fuzzy msgid "beam has less than two stems" msgstr "Balken mit weniger als zwei Hälsen" -#: beam.cc:511 +#: beam.cc:506 msgid "weird beam vertical offset" msgstr "" -#: break-align-item.cc:119 +#: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "unbekannter Übersetzer `%s'" -#: change-iterator.cc:22 +#: change-iterator.cc:21 #, c-format msgid "can't change `%s' to `%s'" msgstr "Kann `%s' nicht zu `%s' ändern" @@ -184,15 +196,15 @@ msgstr "Kann `%s' nicht zu `%s' #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:79 +#: change-iterator.cc:78 msgid "I'm one myself" msgstr "" -#: change-iterator.cc:82 +#: change-iterator.cc:81 msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:115 +#: chord-tremolo-engraver.cc:119 #, fuzzy msgid "unterminated chord tremolo" msgstr "Unbeendeter Bindestrich" @@ -202,37 +214,23 @@ msgstr "Unbeendeter Bindestrich" msgid "no one to print a tremolos" msgstr "Keiner darf eine Wiederholungsklammer drucken" -#: chord.cc:162 +#: chord.cc:365 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" -#: chord.cc:386 +#: chord.cc:394 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" -#: clef-engraver.cc:165 -#, fuzzy -msgid "unknown clef type" -msgstr "Unbekannter Notenschlüssel" - -#: collision.cc:118 +#: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Zu viele aneinanderstoßende Notenspalten. Ich ignoriere sie." -#: crescendo.cc:65 -msgid "crescendo" -msgstr "Crescendo" - -#: crescendo.cc:65 -msgid "too small" -msgstr "zu klein" - -#: cross-staff.cc:22 +#: cross-staff.cc:24 #, fuzzy -msgid "" -"minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" +msgid "not a forced distance; cross-staff spanners may be broken" msgstr "" "minVerticalAlign != maxVerticalAlign: Balken/Bindebögen zwischen den " "Systemen sind möglichischerweise unvollständig" @@ -251,22 +249,22 @@ msgstr "Kann die Speicher msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:192 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 #, 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:220 #, fuzzy msgid "already have a crescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:221 #, fuzzy msgid "already have a decrescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:298 #, fuzzy msgid "unterminated (de)crescendo" msgstr "Nichtbeendetes Crescendo" @@ -279,11 +277,15 @@ msgstr "Unbeendete Linienfortf msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:64 +#: folded-repeat-iterator.cc:70 #, fuzzy msgid "no one to print a repeat brace" msgstr "Keiner darf eine Wiederholungsklammer drucken" +#: font-interface.cc:199 +msgid "couldn't find any font satisfying " +msgstr "" + #: gourlay-breaking.cc:157 msgid "No feasible line breaking found" msgstr "" @@ -293,12 +295,21 @@ msgstr "" msgid "no Grace context available" msgstr "Kein Verzierungskontext vorhanden!" -#: grace-position-engraver.cc:94 +#: grace-position-engraver.cc:96 msgid "Unattached grace notes. Attaching to last musical column." msgstr "" "Unverknüpfte Verzierungsnoten. Ich verknüpfe sie mit der letzten " "musikalischen Spalte." +#: hairpin.cc:71 +msgid "decrescendo too small" +msgstr "" + +#: hairpin.cc:72 +#, fuzzy +msgid "crescendo too small" +msgstr "Crescendo" + #: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "Unbeendeter Bindestrich" @@ -312,17 +323,17 @@ msgstr "" msgid "wrong identifier type, expected: `%s'" msgstr "Falscher Typ von Identifier: " -#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 -#: scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 +#: scores.cc:106 scores.cc:112 #, c-format msgid "can't find file: `%s'" msgstr "Kann Datei `%s' nicht finden" -#: key-engraver.cc:101 key-performer.cc:54 +#: key-engraver.cc:103 key-performer.cc:72 msgid "FIXME: key change merge" msgstr "" -#: lily-guile.cc:119 +#: lily-guile.cc:141 #, c-format msgid "(load path: `%s')" msgstr "(Ladepfad ist `%s')" @@ -332,49 +343,45 @@ msgstr "(Ladepfad ist `%s')" msgid "Element count %d." msgstr "" -#: line-of-score.cc:255 paper-score.cc:79 +#: line-of-score.cc:253 paper-score.cc:77 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:269 +#: line-of-score.cc:267 msgid "Calculating column positions..." msgstr "Berechne Position der Spalten..." -#: lookup.cc:82 -msgid "Aborting" -msgstr "Ich breche nieder" - -#: lookup.cc:223 -#, fuzzy, c-format -msgid "Non-matching braces in text `%s', adding braces" -msgstr "Nicht zusammenpassende Klammern im Text `%s', füge Klammern hinzu." - -#: lyric-phrasing-engraver.cc:245 +#: lyric-phrasing-engraver.cc:269 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:250 +#: lyric-phrasing-engraver.cc:274 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 main.cc:93 -msgid "enable debugging output" -msgstr "Debugger Ausgabe an" - -#: main.cc:76 +#: main.cc:75 msgid "EXT" msgstr "EXT" -#: main.cc:76 +#: main.cc:75 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "Benutze das Ausgabeformat EXT" -#: main.cc:77 main.cc:94 +#: main.cc:76 main.cc:95 msgid "this help" msgstr "Diese Hilfe" +#: main.cc:77 +#, fuzzy +msgid "FIELD" +msgstr "DATEI" + +#: main.cc:77 +msgid "write header field to BASENAME.FIELD" +msgstr "" + #: main.cc:78 msgid "DIR" msgstr "DIR" @@ -383,7 +390,7 @@ msgstr "DIR" msgid "add DIR to search path" msgstr "Hänge DIR an den Suchpfad an" -#: main.cc:79 main.cc:97 +#: main.cc:79 main.cc:98 msgid "FILE" msgstr "DATEI" @@ -416,7 +423,7 @@ msgstr "Zeige alle Ver msgid "inhibit file output naming and exporting" msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export" -#: main.cc:85 main.cc:102 +#: main.cc:85 main.cc:103 msgid "don't timestamp the output" msgstr "Keine Datumsangabe auf der Ausgabe" @@ -424,7 +431,7 @@ msgstr "Keine Datumsangabe auf der Ausgabe" msgid "switch on experimental features" msgstr "Schalte experimentelle Möglichkeiten an" -#: main.cc:87 main.cc:103 +#: main.cc:87 main.cc:104 msgid "print version number" msgstr "Zeige die Versionsnummer" @@ -433,24 +440,24 @@ msgstr "Zeige die Versionsnummer" msgid "verbose" msgstr "Sei geschwätzig" -#: main.cc:89 main.cc:105 +#: main.cc:89 main.cc:106 msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:107 +#: main.cc:106 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." -#: main.cc:109 +#: main.cc:108 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Setze Musik oder spiele MIDI von DATEI" -#: main.cc:113 +#: main.cc:112 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" @@ -464,16 +471,16 @@ msgstr "" msgid "Options:" msgstr "Optionen:" -#: main.cc:123 +#: main.cc:122 msgid "This binary was compiled with the following options:" msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:" -#: main.cc:122 main.cc:142 +#: main.cc:123 main.cc:141 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Melde Fehler an" -#: main.cc:54 main.cc:150 +#: main.cc:55 main.cc:149 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -486,17 +493,17 @@ msgstr "" "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n" "Sie mehr Informationen.\n" -#: main.cc:61 main.cc:157 main.cc:169 +#: main.cc:62 main.cc:156 main.cc:168 #, c-format msgid "Copyright (c) %s by" msgstr "Urheberrechte (Copyright) (c) %s bei" -#. GNU GNU? -#: main.cc:167 -msgid "GNU LilyPond -- The GNU Project music typesetter" +#: main.cc:166 +#, fuzzy +msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts" -#: main.cc:70 main.cc:175 +#: main.cc:71 main.cc:174 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" @@ -526,21 +533,21 @@ msgstr "" "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n" "USA.\n" -#: midi-item.cc:310 +#: midi-item.cc:311 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "Kein solches instrument: `%s'" -#: midi-item.cc:365 +#: midi-item.cc:366 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "Ungewöhnliche Tonart: Bes: %d, Kreuze: %d" -#: midi-item.cc:412 +#: midi-item.cc:413 msgid "silly duration" msgstr "Unsinnige Dauer" -#: midi-item.cc:425 +#: midi-item.cc:426 msgid "silly pitch" msgstr "unsinnige Tonhöhe" @@ -549,22 +556,34 @@ msgstr "unsinnige Tonh msgid "Error syncing file (disk full?)" msgstr "Fehler beim Abspeichern der Datei (Platte voll?)" -#: music-output-def.cc:71 +#: music-output-def.cc:72 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "Kann Partiturkontext nicht finden" -#: musical-request.cc:42 +#: music.cc:222 +msgid "ly_get_mus_property (): Not a Music" +msgstr "" + +#: music.cc:236 +msgid "ly_set_mus_property (): Not a symbol" +msgstr "" + +#: music.cc:248 +msgid "ly_set_mus_property (): not of type Music" +msgstr "" + +#: musical-request.cc:29 #, 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:124 +#: my-lily-lexer.cc:132 #, fuzzy, c-format msgid "Identifier name is a keyword: `%s'" msgstr "name ist ein Schlüsselbegriff (keyword) (`%s')" -#: my-lily-lexer.cc:143 +#: my-lily-lexer.cc:151 #, c-format msgid "error at EOF: %s" msgstr "Fehler am Dateiende(EOF): %s" @@ -578,20 +597,30 @@ msgstr "Verarbeite..." msgid "Braces don't match" msgstr "Klammern passen nicht zusammen" -#: paper-def.cc:149 +#: output-property-music-iterator.cc:20 request-chord-iterator.cc:76 +#, fuzzy, c-format +msgid "Junking request: `%s'" +msgstr "Uralt-Bitte: `%s'" + +#: paper-def.cc:116 #, fuzzy, c-format msgid "paper output to %s..." msgstr "Ausgabe auf Papier auf %s..." -#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 msgid ", at " msgstr ", bei " -#: paper-score.cc:82 +#: paper-outputter.cc:239 +#, fuzzy, c-format +msgid "writing header field %s to %s..." +msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." + +#: paper-score.cc:80 msgid "Preprocessing elements..." msgstr "Verarbeite Element vor..." -#: paper-score.cc:107 +#: paper-score.cc:105 #, fuzzy msgid "Outputting Score, defined at: " msgstr "Gebe Partitur aus, definiert bei: " @@ -630,43 +659,45 @@ msgstr "Automatisch generiert" msgid "from musical definition: %s" msgstr "von der musiaklischen Definition: %s" -#: performance.cc:174 +#: performance.cc:161 #, c-format msgid "MIDI output to %s..." msgstr "MIDI-Ausgabe nach %s..." -#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 +#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" msgstr "Kann keine kürzeste Note bei %s finden" -#: property-engraver.cc:131 -#, fuzzy -msgid "Wrong type for property" -msgstr "Falsche Type für Besitz-Wert" - -#: request-chord-iterator.cc:93 -#, fuzzy, c-format -msgid "Junking request: `%s'" -msgstr "Uralt-Bitte: `%s'" +#: pitch.cc:25 +msgid "Pitch arguments out of range" +msgstr "" -#: request-chord-iterator.cc:96 +#. warning () ? +#: property-engraver.cc:124 #, c-format -msgid "Huh? Not a Request: `%s'" -msgstr "Wie? Keine Anforderung: `%s'" +msgid "" +"%s is deprecated. Use\n" +" \\property %s.%s \\override #'%s = #%s" +msgstr "" + +#: property-engraver.cc:150 +#, fuzzy, c-format +msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" +msgstr "Falsche Type für Besitz-Wert" -#: rest-collision.cc:159 +#: rest-collision.cc:190 #, fuzzy msgid "too many colliding rests" msgstr "Zu viele kollidierende Pausen." -#: rest-collision.cc:163 +#: rest-collision.cc:194 #, fuzzy msgid "too many notes for rest collision" msgstr "Zu viele Noten für kollidierende Pausen." -#: score-engraver.cc:149 +#: score-engraver.cc:177 #, fuzzy, c-format msgid "unbound spanner `%s'" msgstr "Unbeschränkter Abstand `%s'" @@ -701,12 +732,12 @@ msgstr "Schreibe Datei mit Abh msgid "Score contains errors; will not process it" msgstr "Partitur enthält Fehler; ich werde sie nicht weiterverarbeiten" -#: scores.cc:124 +#: scores.cc:122 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "Unbekannte Sonder-Zeichenkette" -#: script-engraver.cc:66 +#: script-engraver.cc:67 #, fuzzy, c-format msgid "Don't know how to interpret articulation `%s'" msgstr "Ich weiß nicht, wie ich die Artikulation `%s' interpretieren soll\n" @@ -717,64 +748,74 @@ msgstr "Ich wei msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ich saufe zu viel" -#: sequential-music-iterator.cc:35 -msgid "Must stop before this music ends" -msgstr "" - -#: simple-music-iterator.cc:36 -#, fuzzy, c-format -msgid "Junking music: `%s'" -msgstr "Uralt-Bitte: `%s'" - -#: slur-engraver.cc:89 +#: slur-engraver.cc:128 msgid "unterminated slur" msgstr "Unbeendeter Bindebogen" -#: slur-engraver.cc:104 +#: slur-engraver.cc:143 #, fuzzy msgid "can't find start of slur" msgstr "Kann nicht beide Enden von %s finden" -#: slur.cc:48 +#: slur.cc:49 #, fuzzy msgid "Putting slur over rest. Ignoring." msgstr "Setze Bindebogen über Pause. Wird ignoriert" -#: slur.cc:324 +#: slur.cc:379 msgid "Slur over rest?" msgstr "Bindebogen übe den Rest?" -#: stem-engraver.cc:128 +#: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Setze Note auf unpassenden Hals (Typ = %d)" -#: stem.cc:116 +#: stem.cc:117 #, fuzzy msgid "Weird stem size; check for narrow beams" msgstr "" "Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" +#: text-spanner-engraver.cc:95 +#, fuzzy +msgid "can't find start of text spanner" +msgstr "Kann nicht beide Enden von %s finden" + +#: text-spanner-engraver.cc:114 +#, fuzzy +msgid "already have a text spanner" +msgstr "Habe schon einen Balken" + +#: text-spanner-engraver.cc:167 +#, fuzzy +msgid "unterminated text spanner" +msgstr "Unbeendete Linienfortführung" + +#: text-spanner.cc:115 +msgid "Text_spanner too small" +msgstr "" + #: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "TFM header von `%s' hat nur %u Wort(e)" -#: tfm-reader.cc:143 +#: tfm-reader.cc:139 #, fuzzy, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM-Datei hat %u Parameter. Das ist mehr als die" -#: tfm.cc:71 +#: tfm.cc:77 #, fuzzy, c-format -msgid "can't find ascii character: `%d'" +msgid "can't find ascii character: %d" msgstr "Kann ASCII-Zeichen `%d' nicht finden" -#: tie-engraver.cc:203 tie-performer.cc:109 +#: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "Es wurden keine Haltebögen erzeugt!" -#: tie-engraver.cc:242 +#: tie-engraver.cc:231 msgid "lonely tie" msgstr "Einsamer Haltebogen" @@ -783,15 +824,7 @@ msgstr "Einsamer Haltebogen" msgid "no one to print a tuplet start bracket" msgstr "Niemand schreibt eine mehrfahce Anfangsklammer" -#: timing-translator.cc:36 -msgid "conflicting timing request" -msgstr "Widersprechende Zeitangaben" - -#: timing-translator.cc:37 -msgid "This is the other timing request" -msgstr "" - -#: timing-translator.cc:65 +#: timing-translator.cc:38 #, fuzzy, c-format msgid "barcheck failed at: %s" msgstr "Überprüfung der Takte is fehlgeschlagen bei: %s" @@ -820,218 +853,247 @@ msgstr "unbekannter msgid "can't find: `%s'" msgstr "Kann `%s' nicht finden" -#: translator-group.cc:142 +#: translator-group.cc:146 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "Kann ein `%s', genannt `%s' weder finden noch erzeugen" -#: translator-group.cc:246 +#: translator-group.cc:231 #, fuzzy, c-format msgid "can't find or create: `%s'" msgstr "Kann ein `%s' weder finden noch erzeugen" -#: unfolded-repeat-iterator.cc:146 -#, fuzzy -msgid "no one to print a volta bracket" -msgstr "Niemand schreibt eine Volta-Klammer" +#. warning () ? +#: translator-group.cc:405 +#, c-format +msgid "" +"Can't find property type-check for `%s'. Perhaps you made a typing error?" +msgstr "" -#: parser.yy:61 +#. warning () ? +#: translator-group.cc:420 +#, c-format +msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgstr "" + +#. programming_error? +#: translator-group.cc:440 +msgid "ly-get-trans-property: expecting a Translator_group argument" +msgstr "" + +#: volta-engraver.cc:87 +msgid "No volta spanner to end" +msgstr "" + +#: volta-engraver.cc:104 +msgid "Already have a volta spanner. Stopping that one prematurely." +msgstr "" + +#: volta-engraver.cc:108 +msgid "Also have a stopped spanner. Giving up." +msgstr "" + +#: parser.yy:71 #, c-format msgid "Oldest supported input version: %s" msgstr "Älteste noch unterstütze Version der Eingabe: %s" -#: parser.yy:447 +#: parser.yy:467 msgid "Wrong type for property value" msgstr "Falsche Type für Besitz-Wert" -#: parser.yy:633 +#: parser.yy:668 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:673 +#: parser.yy:732 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:678 +#: parser.yy:737 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1015 +#: parser.yy:1217 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1025 +#: parser.yy:1227 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1117 -#, c-format -msgid "Expecting %d arguments" +#: parser.yy:1348 +msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1133 -msgid "Must have 2 arguments for duration" -msgstr "" +#: parser.yy:1359 +#, fuzzy +msgid "Must have duration object" +msgstr "Setze kürzeste Dauer (?)" -#: parser.yy:1140 parser.yy:1148 parser.yy:1383 +#: parser.yy:1368 parser.yy:1376 parser.yy:1640 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "Um Text zu verarbeiten, muß ich im Text-(Lyrics)-Modus sein" -#: parser.yy:1289 parser.yy:1309 +#: parser.yy:1525 parser.yy:1554 #, c-format msgid "not a duration: %d" msgstr "Keine Dauer: %d" -#: parser.yy:1318 +#: parser.yy:1563 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "Für Noten muß ich im Noten-(Note)-Modus sein" -#: parser.yy:1396 +#: parser.yy:1659 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "Für Akkorde muß ich im Akkord-(Chord)-Modus sein" -#: parser.yy:1558 parser.yy:1576 +#: parser.yy:1821 parser.yy:1839 msgid "need integer number arg" msgstr "" -#: parser.yy:1562 +#: parser.yy:1825 msgid "Must be positive integer" msgstr "" -#: lexer.ll:159 +#: lexer.ll:164 msgid "EOF found inside a comment" msgstr "Während eines Kommentar war die Datei zu Ende (EOF gefunden)" -#: lexer.ll:173 +#: lexer.ll:178 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:197 +#: lexer.ll:202 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "Unbekannter Identifier: `%s'" #. backup rule -#: lexer.ll:202 +#: lexer.ll:207 #, fuzzy msgid "Missing end quote" msgstr "Endnote fehlt" #. backup rule -#: lexer.ll:224 lexer.ll:228 +#: lexer.ll:229 lexer.ll:233 msgid "white expected" msgstr "Erwarte Weiß" -#: lexer.ll:236 +#: lexer.ll:241 #, fuzzy msgid "Can't evaluate Scheme in safe mode" msgstr "Kann Scheme nicht interpretieren, wenn ich im sicheren Modus bin" -#: lexer.ll:432 +#: lexer.ll:433 #, c-format msgid "invalid character: `%c'" msgstr "Ungültiger Buchstabe `%c'" -#: lexer.ll:512 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "Unbekannte Sonder-Zeichenkette" -#: lexer.ll:598 -#, c-format -msgid "incorrect mudela version: %s (%s, %s)" +#: lexer.ll:597 +#, fuzzy, c-format +msgid "incorrect lilypond version: %s (%s, %s)" msgstr "Falsche Version von Mudela: (s /%s, %s)" -#: lexer.ll:599 -msgid "Consider converting the input with the convert-mudela script" +#: lexer.ll:598 +msgid "Consider converting the input with the convert-ly script" msgstr "" -#: main.cc:92 +#: main.cc:93 msgid "write exact durations, e.g.: a4*385/384" msgstr "Schreibe genaue Dauer, z.B.: a4*385/384" -#: main.cc:95 +#: main.cc:94 +msgid "enable debugging output" +msgstr "Debugger Ausgabe an" + +#: main.cc:96 msgid "ACC[:MINOR]" msgstr "ACC[:MOLL]" -#: main.cc:95 +#: main.cc:96 msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "Setze Tonart: ACC +Kreuze/-Bes; :1 Moll" -#: main.cc:96 +#: main.cc:97 #, fuzzy msgid "don't output tuplets, double dots or rests, smallest is 32" msgstr "" "Nimm an, dass keine -olen (Triolen, Quintolen etc.) oder Doppelpunkte \n" "vorliegen. Kleinste Teilung sind 32igstel" -#: main.cc:97 +#: main.cc:98 msgid "set FILE as default output" msgstr "Ausgabe standardmäßig in Datei FILE" -#: main.cc:98 +#: main.cc:99 msgid "don't output tuplets" msgstr "" -#: main.cc:99 +#: main.cc:100 msgid "be quiet" msgstr "Sei ruhig" -#: main.cc:100 +#: main.cc:101 msgid "don't output rests or skips" msgstr "" -#: main.cc:101 +#: main.cc:102 msgid "DUR" msgstr "DUR" -#: main.cc:101 +#: main.cc:102 #, fuzzy msgid "set smallest duration" msgstr "Setze kürzeste Dauer (?)" -#: main.cc:104 +#: main.cc:105 msgid "be verbose" msgstr "Sei geschwätzig" -#: main.cc:106 +#: main.cc:107 msgid "assume no double dotted notes" msgstr "Keine Noten mit Doppelpunkt" -#: main.cc:113 +#: main.cc:114 #, c-format msgid "Usage: %s [OPTION]... [FILE]" msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]" -#: main.cc:115 +#: main.cc:116 #, fuzzy msgid "Translate MIDI-file to mudela" msgstr "Übersetze MIDI in mudela" -#: main.cc:129 +#: main.cc:130 #, c-format msgid "no_double_dots: %d\n" msgstr "" -#: main.cc:131 +#: main.cc:132 #, c-format msgid "no_rests: %d\n" msgstr "" -#: main.cc:133 +#: main.cc:134 #, c-format msgid "no_quantify_b_s: %d\n" msgstr "" -#: main.cc:135 +#: main.cc:136 #, c-format msgid "no_smaller_than: %d (1/%d)\n" msgstr "" -#: main.cc:138 +#: main.cc:139 #, c-format msgid "no_tuplets: %d\n" msgstr "" @@ -1089,7 +1151,7 @@ msgstr "Erwarte MIDI-St msgid "invalid track length" msgstr "Unzulässige Länge für ein Stück" -#: mudela-item.cc:160 +#: mudela-item.cc:161 #, c-format msgid "#32 in quarter: %d" msgstr "#32 in Vierteln: %d" @@ -1161,6 +1223,38 @@ msgstr "% Automatisch generiert" msgid "% from input file: " msgstr "% aus Eingabedatei: " +#, fuzzy +#~ msgid "Wrong type for property" +#~ msgstr "Falsche Type für Besitz-Wert" + +#, fuzzy +#~ msgid "unknown clef type" +#~ msgstr "Unbekannter Notenschlüssel" + +#~ msgid "too small" +#~ msgstr "zu klein" + +#~ msgid "Aborting" +#~ msgstr "Ich breche nieder" + +#, fuzzy +#~ msgid "Non-matching braces in text `%s', adding braces" +#~ msgstr "Nicht zusammenpassende Klammern im Text `%s', füge Klammern hinzu." + +#~ msgid "Huh? Not a Request: `%s'" +#~ msgstr "Wie? Keine Anforderung: `%s'" + +#, fuzzy +#~ msgid "Junking music: `%s'" +#~ msgstr "Uralt-Bitte: `%s'" + +#~ msgid "conflicting timing request" +#~ msgstr "Widersprechende Zeitangaben" + +#, fuzzy +#~ msgid "no one to print a volta bracket" +#~ msgstr "Niemand schreibt eine Volta-Klammer" + #~ msgid "Interpretation context with empty type" #~ msgstr "Interpretationskontext mit leerer Typangabe" diff --git a/po/fr.po b/po/fr.po index 488e91445d..5ea9e6a350 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,47 +6,47 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2000-09-17 12:01+0200\n" +"POT-Creation-Date: 2000-12-17 15:35+0100\n" "PO-Revision-Date: 1999-12-28 00:32 +1\n" "Last-Translator: Laurent Martelli \n" "Language-Team: \n" "MIME-Version: 1.0\n" -#: data-file.cc:52 +#: data-file.cc:54 #, fuzzy msgid "EOF in a string" msgstr "EOF dans une chaîne" -#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "avertissement: " -#: dstream.cc:187 +#: dstream.cc:186 #, fuzzy msgid "not enough fields in Dstream init" msgstr "Pas assez de champs dans l'initialisation de Dstream." -#: getopt-long.cc:143 +#: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" msgstr "l'option `%s' requiert un argument" -#: getopt-long.cc:147 +#: getopt-long.cc:149 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "l'option `%s' n'accepte pas d'argument" -#: getopt-long.cc:151 +#: getopt-long.cc:153 #, c-format msgid "unrecognized option: `%s'" msgstr "option non reconnue: `%s'" -#: getopt-long.cc:158 +#: getopt-long.cc:160 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "argument `%s' invalide pour l'option `%s'" -#: input.cc:90 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:9 warn.cc:17 msgid "error: " msgstr "erreur: " @@ -64,7 +64,7 @@ msgid "can't map file" msgstr "impossible de mapper le fichier" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "impossible d'ouvrir le fichier: `%s'" @@ -74,106 +74,118 @@ msgstr "impossible d'ouvrir le fichier: `%s'" msgid "Huh? Got %d, expected %d characters" msgstr "Hein? %d caractères reçus, %d attendus" -#: text-stream.cc:9 +#: text-stream.cc:10 msgid "" msgstr "" -#: warn.cc:35 +#: warn.cc:36 #, fuzzy msgid "programming error: " msgstr "Erreur de programmation: " -#: warn.cc:35 +#: warn.cc:36 #, fuzzy msgid " (Continuing; cross thumbs)" msgstr " (je continure; croisez les doigts)" -#: afm.cc:51 +#: afm.cc:53 #, fuzzy, c-format msgid "can't find character number: %d" msgstr "impossible de trouver le caractères numéro %d" -#: afm.cc:66 +#: afm.cc:68 #, fuzzy, c-format msgid "can't find character called: `%s'" msgstr "impossible de trouver le caractères appelé `%s'" -#: afm.cc:96 -msgid "Error parsing AFM file" +#: afm.cc:113 +#, c-format +msgid "Error parsing AFM file: %s" +msgstr "" + +#: all-font-metrics.cc:87 +#, c-format +msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:151 lookup.cc:80 +#: all-font-metrics.cc:92 +msgid "" +" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " +"to show font paths." +msgstr "" + +#: all-font-metrics.cc:153 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: all-font-metrics.cc:152 +#: all-font-metrics.cc:154 #, fuzzy msgid "Loading default font" msgstr "Impossible de trouver la police `%s', chargement la police par défaut" -#: all-font-metrics.cc:169 +#: all-font-metrics.cc:171 #, fuzzy, c-format msgid "can't find default font: `%s'" msgstr "Impossible de trouver la fonte par défaut `%s', abandon." -#: all-font-metrics.cc:170 includable-lexer.cc:50 lookup.cc:81 scores.cc:109 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 #, fuzzy, c-format msgid "(search path: `%s')" msgstr "chemin de recherche= %s" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:173 parser.yy:1642 msgid "Giving up" msgstr "" -#: auto-change-iterator.cc:43 change-iterator.cc:60 +#: auto-change-iterator.cc:43 change-iterator.cc:59 #: part-combine-music-iterator.cc:85 msgid "Can't switch translators, I'm there already" msgstr "" -#: beam-engraver.cc:76 beam-engraver.cc:109 +#: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" msgstr "impossible de trouver le caractères numéro %d" -#: beam-engraver.cc:138 +#: beam-engraver.cc:158 #, fuzzy msgid "already have a beam" msgstr "Il y a déjà une barre" -#: beam-engraver.cc:202 +#: beam-engraver.cc:224 #, fuzzy msgid "unterminated beam" msgstr "Barre non terminée" -#: beam-engraver.cc:240 chord-tremolo-engraver.cc:176 +#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "La tige doit avoir une structure rythmique." -#: beam-engraver.cc:251 +#: beam-engraver.cc:274 msgid "stem doesn't fit in beam" msgstr "la tige ne rentre pas dans la barre" -#: beam-engraver.cc:252 +#: beam-engraver.cc:275 msgid "beam was started here" msgstr "la barre a commencé ici" -#: beam.cc:84 +#: beam.cc:83 #, fuzzy msgid "beam has less than two stems" msgstr "barre avec moins de deux tiges" -#: beam.cc:511 +#: beam.cc:506 msgid "weird beam vertical offset" msgstr "" -#: break-align-item.cc:119 +#: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "traducteur inconnu `%s'" -#: change-iterator.cc:22 +#: change-iterator.cc:21 #, c-format msgid "can't change `%s' to `%s'" msgstr "impossible de changer `%s' en `%s'" @@ -184,15 +196,15 @@ msgstr "impossible de changer `%s' en `%s'" #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:79 +#: change-iterator.cc:78 msgid "I'm one myself" msgstr "" -#: change-iterator.cc:82 +#: change-iterator.cc:81 msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:115 +#: chord-tremolo-engraver.cc:119 msgid "unterminated chord tremolo" msgstr "" @@ -200,37 +212,23 @@ msgstr "" msgid "no one to print a tremolos" msgstr "" -#: chord.cc:162 +#: chord.cc:365 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "soustraction invalide: ne fait pas partie de l'accord: %s" -#: chord.cc:386 +#: chord.cc:394 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "renversement invalide: ne fait pas partie de l'accord: %s" -#: clef-engraver.cc:165 -#, fuzzy -msgid "unknown clef type" -msgstr "type de clé inconnu" - -#: collision.cc:118 +#: collision.cc:116 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Trop de colonnes de notes superposées. Je les ignore." -#: crescendo.cc:65 -msgid "crescendo" -msgstr "" - -#: crescendo.cc:65 -msgid "too small" -msgstr "trop petit" - -#: cross-staff.cc:22 -msgid "" -"minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" +#: cross-staff.cc:24 +msgid "not a forced distance; cross-staff spanners may be broken" msgstr "" #: debug.cc:26 @@ -247,22 +245,22 @@ msgstr "impossible de positionner mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:192 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 #, 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:220 #, fuzzy msgid "already have a crescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:221 #, fuzzy msgid "already have a decrescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:298 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminé" @@ -275,10 +273,14 @@ msgstr "" msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:64 +#: folded-repeat-iterator.cc:70 msgid "no one to print a repeat brace" msgstr "" +#: font-interface.cc:199 +msgid "couldn't find any font satisfying " +msgstr "" + #: gourlay-breaking.cc:157 msgid "No feasible line breaking found" msgstr "" @@ -288,10 +290,19 @@ msgstr "" msgid "no Grace context available" msgstr "pas une vrai variable" -#: grace-position-engraver.cc:94 +#: grace-position-engraver.cc:96 msgid "Unattached grace notes. Attaching to last musical column." msgstr "" +#: hairpin.cc:71 +msgid "decrescendo too small" +msgstr "" + +#: hairpin.cc:72 +#, fuzzy +msgid "crescendo too small" +msgstr "trop petit" + #: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "" @@ -305,17 +316,17 @@ msgstr "" msgid "wrong identifier type, expected: `%s'" msgstr "Mauvais type d'indentifiant: " -#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 -#: scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 +#: scores.cc:106 scores.cc:112 #, c-format msgid "can't find file: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: key-engraver.cc:101 key-performer.cc:54 +#: key-engraver.cc:103 key-performer.cc:72 msgid "FIXME: key change merge" msgstr "" -#: lily-guile.cc:119 +#: lily-guile.cc:141 #, c-format msgid "(load path: `%s')" msgstr "" @@ -325,48 +336,44 @@ msgstr "" msgid "Element count %d." msgstr "" -#: line-of-score.cc:255 paper-score.cc:79 +#: line-of-score.cc:253 paper-score.cc:77 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:269 +#: line-of-score.cc:267 msgid "Calculating column positions..." msgstr "Calcul de la position des colonnes..." -#: lookup.cc:82 -msgid "Aborting" -msgstr "Annulation" - -#: lookup.cc:223 -#, c-format -msgid "Non-matching braces in text `%s', adding braces" -msgstr "" - -#: lyric-phrasing-engraver.cc:245 +#: lyric-phrasing-engraver.cc:269 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:250 +#: lyric-phrasing-engraver.cc:274 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 main.cc:93 -msgid "enable debugging output" -msgstr "" - -#: main.cc:76 +#: main.cc:75 msgid "EXT" msgstr "" -#: main.cc:76 +#: main.cc:75 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:77 main.cc:94 +#: main.cc:76 main.cc:95 msgid "this help" msgstr "cette aide" +#: main.cc:77 +#, fuzzy +msgid "FIELD" +msgstr "FICHIER" + +#: main.cc:77 +msgid "write header field to BASENAME.FIELD" +msgstr "" + #: main.cc:78 msgid "DIR" msgstr "REP" @@ -376,7 +383,7 @@ msgstr "REP" msgid "add DIR to search path" msgstr "ajoute REP au chemin de recherche" -#: main.cc:79 main.cc:97 +#: main.cc:79 main.cc:98 msgid "FILE" msgstr "FICHIER" @@ -410,7 +417,7 @@ msgstr "" msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:85 main.cc:102 +#: main.cc:85 main.cc:103 msgid "don't timestamp the output" msgstr "" @@ -418,7 +425,7 @@ msgstr "" msgid "switch on experimental features" msgstr "" -#: main.cc:87 main.cc:103 +#: main.cc:87 main.cc:104 msgid "print version number" msgstr "afficher le numéro de version" @@ -426,23 +433,23 @@ msgstr "afficher le num msgid "verbose" msgstr "" -#: main.cc:89 main.cc:105 +#: main.cc:89 main.cc:106 msgid "show warranty and copyright" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:107 +#: main.cc:106 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Usage: %s [OPTION]... [FICHIER]..." -#: main.cc:109 +#: main.cc:108 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:113 +#: main.cc:112 #, fuzzy msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" @@ -457,17 +464,17 @@ msgstr "" msgid "Options:" msgstr "Options: " -#: main.cc:123 +#: main.cc:122 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "Cet exécutable a été compilé avec les options suivantes:" -#: main.cc:122 main.cc:142 +#: main.cc:123 main.cc:141 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Rapporter les bugs à" -#: main.cc:54 main.cc:150 +#: main.cc:55 main.cc:149 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -475,17 +482,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:61 main.cc:157 main.cc:169 +#: main.cc:62 main.cc:156 main.cc:168 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s par" -#. GNU GNU? -#: main.cc:167 -msgid "GNU LilyPond -- The GNU Project music typesetter" +#: main.cc:166 +#, fuzzy +msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:70 main.cc:175 +#: main.cc:71 main.cc:174 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" @@ -502,21 +509,21 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:310 +#: midi-item.cc:311 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "Pas d'instrument tel: `%s'" -#: midi-item.cc:365 +#: midi-item.cc:366 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "" -#: midi-item.cc:412 +#: midi-item.cc:413 msgid "silly duration" msgstr "" -#: midi-item.cc:425 +#: midi-item.cc:426 msgid "silly pitch" msgstr "" @@ -525,22 +532,34 @@ msgstr "" msgid "Error syncing file (disk full?)" msgstr ")" -#: music-output-def.cc:71 +#: music-output-def.cc:72 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "ne peut pas trouver `%s'" -#: musical-request.cc:42 +#: music.cc:222 +msgid "ly_get_mus_property (): Not a Music" +msgstr "" + +#: music.cc:236 +msgid "ly_set_mus_property (): Not a symbol" +msgstr "" + +#: music.cc:248 +msgid "ly_set_mus_property (): not of type Music" +msgstr "" + +#: musical-request.cc:29 #, c-format msgid "Transposition by %s makes accidental larger than two" msgstr "" -#: my-lily-lexer.cc:124 +#: my-lily-lexer.cc:132 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "" -#: my-lily-lexer.cc:143 +#: my-lily-lexer.cc:151 #, c-format msgid "error at EOF: %s" msgstr "" @@ -553,20 +572,30 @@ msgstr "Analyse..." msgid "Braces don't match" msgstr "" -#: paper-def.cc:149 +#: output-property-music-iterator.cc:20 request-chord-iterator.cc:76 +#, c-format +msgid "Junking request: `%s'" +msgstr "" + +#: paper-def.cc:116 #, fuzzy, c-format msgid "paper output to %s..." msgstr "Sortie papier vers %s..." -#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 msgid ", at " msgstr ", à " -#: paper-score.cc:82 +#: paper-outputter.cc:239 +#, fuzzy, c-format +msgid "writing header field %s to %s..." +msgstr "impossible d'ouvrir le fichier: `%s'" + +#: paper-score.cc:80 msgid "Preprocessing elements..." msgstr "" -#: paper-score.cc:107 +#: paper-score.cc:105 msgid "Outputting Score, defined at: " msgstr "" @@ -605,41 +634,43 @@ msgstr "G msgid "from musical definition: %s" msgstr "" -#: performance.cc:174 +#: performance.cc:161 #, c-format msgid "MIDI output to %s..." msgstr "" -#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 +#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" msgstr "ne peut pas trouver le fichier: `%s'" -#: property-engraver.cc:131 -#, fuzzy -msgid "Wrong type for property" -msgstr "Mauvais type pour la valeur de la propriété" - -#: request-chord-iterator.cc:93 -#, c-format -msgid "Junking request: `%s'" +#: pitch.cc:25 +msgid "Pitch arguments out of range" msgstr "" -#: request-chord-iterator.cc:96 +#. warning () ? +#: property-engraver.cc:124 #, c-format -msgid "Huh? Not a Request: `%s'" +msgid "" +"%s is deprecated. Use\n" +" \\property %s.%s \\override #'%s = #%s" msgstr "" -#: rest-collision.cc:159 +#: property-engraver.cc:150 +#, fuzzy, c-format +msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" +msgstr "Mauvais type pour la valeur de la propriété" + +#: rest-collision.cc:190 msgid "too many colliding rests" msgstr "" -#: rest-collision.cc:163 +#: rest-collision.cc:194 msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:149 +#: score-engraver.cc:177 #, fuzzy, c-format msgid "unbound spanner `%s'" msgstr "traducteur inconnu `%s'" @@ -671,12 +702,12 @@ msgstr "impossible d'ouvrir le fichier: `%s'" msgid "Score contains errors; will not process it" msgstr "" -#: scores.cc:124 +#: scores.cc:122 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "chaîne d'échappement inconnue: `\\%s'" -#: script-engraver.cc:66 +#: script-engraver.cc:67 #, c-format msgid "Don't know how to interpret articulation `%s'" msgstr "" @@ -686,62 +717,72 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: sequential-music-iterator.cc:35 -msgid "Must stop before this music ends" -msgstr "" - -#: simple-music-iterator.cc:36 -#, c-format -msgid "Junking music: `%s'" -msgstr "" - -#: slur-engraver.cc:89 +#: slur-engraver.cc:128 msgid "unterminated slur" msgstr "" -#: slur-engraver.cc:104 +#: slur-engraver.cc:143 #, fuzzy msgid "can't find start of slur" msgstr "impossible de trouver le caractères numéro %d" -#: slur.cc:48 +#: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "" -#: slur.cc:324 +#: slur.cc:379 msgid "Slur over rest?" msgstr "" -#: stem-engraver.cc:128 +#: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:116 +#: stem.cc:117 #, fuzzy msgid "Weird stem size; check for narrow beams" msgstr "décallage de barre bizarre, check your knees" +#: text-spanner-engraver.cc:95 +#, fuzzy +msgid "can't find start of text spanner" +msgstr "impossible de trouver le caractères numéro %d" + +#: text-spanner-engraver.cc:114 +#, fuzzy +msgid "already have a text spanner" +msgstr "Il y a déjà une barre" + +#: text-spanner-engraver.cc:167 +#, fuzzy +msgid "unterminated text spanner" +msgstr "Barre non terminée" + +#: text-spanner.cc:115 +msgid "Text_spanner too small" +msgstr "" + #: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "" -#: tfm-reader.cc:143 +#: tfm-reader.cc:139 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:71 +#: tfm.cc:77 #, fuzzy, c-format -msgid "can't find ascii character: `%d'" +msgid "can't find ascii character: %d" msgstr "ne peut pas trouver le caractère ascii `%d'" -#: tie-engraver.cc:203 tie-performer.cc:109 +#: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "Aucune liaison n'a été crée" -#: tie-engraver.cc:242 +#: tie-engraver.cc:231 msgid "lonely tie" msgstr "liaison solitaire" @@ -749,15 +790,7 @@ msgstr "liaison solitaire" msgid "no one to print a tuplet start bracket" msgstr "" -#: timing-translator.cc:36 -msgid "conflicting timing request" -msgstr "" - -#: timing-translator.cc:37 -msgid "This is the other timing request" -msgstr "" - -#: timing-translator.cc:65 +#: timing-translator.cc:38 #, c-format msgid "barcheck failed at: %s" msgstr "" @@ -786,213 +819,243 @@ msgstr "traducteur inconnu `%s'" msgid "can't find: `%s'" msgstr "ne peut pas trouver `%s'" -#: translator-group.cc:142 +#: translator-group.cc:146 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "ne peut pas trouver ou créer `%s' nommé `%s'" -#: translator-group.cc:246 +#: translator-group.cc:231 #, fuzzy, c-format msgid "can't find or create: `%s'" msgstr "ne peut pas trouver ou créer `%s'" -#: unfolded-repeat-iterator.cc:146 -msgid "no one to print a volta bracket" +#. warning () ? +#: translator-group.cc:405 +#, c-format +msgid "" +"Can't find property type-check for `%s'. Perhaps you made a typing error?" +msgstr "" + +#. warning () ? +#: translator-group.cc:420 +#, c-format +msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgstr "" + +#. programming_error? +#: translator-group.cc:440 +msgid "ly-get-trans-property: expecting a Translator_group argument" +msgstr "" + +#: volta-engraver.cc:87 +msgid "No volta spanner to end" +msgstr "" + +#: volta-engraver.cc:104 +msgid "Already have a volta spanner. Stopping that one prematurely." +msgstr "" + +#: volta-engraver.cc:108 +msgid "Also have a stopped spanner. Giving up." msgstr "" -#: parser.yy:61 +#: parser.yy:71 #, c-format msgid "Oldest supported input version: %s" msgstr "Plus ancienne version supportée: %s" -#: parser.yy:447 +#: parser.yy:467 msgid "Wrong type for property value" msgstr "Mauvais type pour la valeur de la propriété" -#: parser.yy:633 +#: parser.yy:668 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:673 +#: parser.yy:732 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:678 +#: parser.yy:737 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1015 +#: parser.yy:1217 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1025 +#: parser.yy:1227 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1117 -#, c-format -msgid "Expecting %d arguments" +#: parser.yy:1348 +msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1133 -msgid "Must have 2 arguments for duration" -msgstr "" +#: parser.yy:1359 +#, fuzzy +msgid "Must have duration object" +msgstr "Positionne la plus petite durée (?)" -#: parser.yy:1140 parser.yy:1148 parser.yy:1383 +#: parser.yy:1368 parser.yy:1376 parser.yy:1640 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "il fayt être en mode Parole pour les paroles" -#: parser.yy:1289 parser.yy:1309 +#: parser.yy:1525 parser.yy:1554 #, c-format msgid "not a duration: %d" msgstr "pas une durée: %d" -#: parser.yy:1318 +#: parser.yy:1563 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "il faut être en mode Note pour les notes" -#: parser.yy:1396 +#: parser.yy:1659 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "il faut être en mode Accord pour les accords" -#: parser.yy:1558 parser.yy:1576 +#: parser.yy:1821 parser.yy:1839 msgid "need integer number arg" msgstr "" -#: parser.yy:1562 +#: parser.yy:1825 msgid "Must be positive integer" msgstr "" -#: lexer.ll:159 +#: lexer.ll:164 msgid "EOF found inside a comment" msgstr "EOF trouvé dans un commentaire" -#: lexer.ll:173 +#: lexer.ll:178 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:197 +#: lexer.ll:202 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "indentifiant non défini: `%s'" #. backup rule -#: lexer.ll:202 +#: lexer.ll:207 msgid "Missing end quote" msgstr "" #. backup rule -#: lexer.ll:224 lexer.ll:228 +#: lexer.ll:229 lexer.ll:233 msgid "white expected" msgstr "blanche attendue" -#: lexer.ll:236 +#: lexer.ll:241 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:432 +#: lexer.ll:433 #, fuzzy, c-format msgid "invalid character: `%c'" msgstr "caractères illégal: `%c'" -#: lexer.ll:512 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "chaîne d'échappement inconnue: `\\%s'" -#: lexer.ll:598 -#, c-format -msgid "incorrect mudela version: %s (%s, %s)" +#: lexer.ll:597 +#, fuzzy, c-format +msgid "incorrect lilypond version: %s (%s, %s)" msgstr "version de mudela incorrecte: %s (%s, %s)" -#: lexer.ll:599 -msgid "Consider converting the input with the convert-mudela script" +#: lexer.ll:598 +msgid "Consider converting the input with the convert-ly script" msgstr "" -#: main.cc:92 +#: main.cc:93 msgid "write exact durations, e.g.: a4*385/384" msgstr "" -#: main.cc:95 +#: main.cc:94 +msgid "enable debugging output" +msgstr "" + +#: main.cc:96 msgid "ACC[:MINOR]" msgstr "" -#: main.cc:95 +#: main.cc:96 msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "" -#: main.cc:96 +#: main.cc:97 msgid "don't output tuplets, double dots or rests, smallest is 32" msgstr "" -#: main.cc:97 +#: main.cc:98 #, fuzzy msgid "set FILE as default output" msgstr " -o, --output=FILE set FILE come output di default\n" -#: main.cc:98 +#: main.cc:99 msgid "don't output tuplets" msgstr "" -#: main.cc:99 +#: main.cc:100 msgid "be quiet" msgstr "mode silencieux" -#: main.cc:100 +#: main.cc:101 msgid "don't output rests or skips" msgstr "" -#: main.cc:101 +#: main.cc:102 msgid "DUR" msgstr "" -#: main.cc:101 +#: main.cc:102 #, fuzzy msgid "set smallest duration" msgstr "Positionne la plus petite durée (?)" -#: main.cc:104 +#: main.cc:105 msgid "be verbose" msgstr "" -#: main.cc:106 +#: main.cc:107 msgid "assume no double dotted notes" msgstr "" -#: main.cc:113 +#: main.cc:114 #, c-format msgid "Usage: %s [OPTION]... [FILE]" msgstr "Usage: %s [OPTION... [FICHIER]" -#: main.cc:115 +#: main.cc:116 #, fuzzy msgid "Translate MIDI-file to mudela" msgstr "Traduction du fichier MIDI en mudela" -#: main.cc:129 +#: main.cc:130 #, c-format msgid "no_double_dots: %d\n" msgstr "" -#: main.cc:131 +#: main.cc:132 #, c-format msgid "no_rests: %d\n" msgstr "" -#: main.cc:133 +#: main.cc:134 #, c-format msgid "no_quantify_b_s: %d\n" msgstr "" -#: main.cc:135 +#: main.cc:136 #, c-format msgid "no_smaller_than: %d (1/%d)\n" msgstr "" -#: main.cc:138 +#: main.cc:139 #, c-format msgid "no_tuplets: %d\n" msgstr "" @@ -1050,7 +1113,7 @@ msgstr "piste MIDI attendue" msgid "invalid track length" msgstr "taille de piste invalide" -#: mudela-item.cc:160 +#: mudela-item.cc:161 #, c-format msgid "#32 in quarter: %d" msgstr "" @@ -1121,6 +1184,17 @@ msgstr "% G msgid "% from input file: " msgstr "% dal file di input: " +#, fuzzy +#~ msgid "Wrong type for property" +#~ msgstr "Mauvais type pour la valeur de la propriété" + +#, fuzzy +#~ msgid "unknown clef type" +#~ msgstr "type de clé inconnu" + +#~ msgid "Aborting" +#~ msgstr "Annulation" + #, fuzzy #~ msgid "lost in time:" #~ msgstr "perdu dans le temps" diff --git a/po/it.po b/po/it.po index 961b893efe..a083e18a43 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2000-09-17 12:01+0200\n" +"POT-Creation-Date: 2000-12-17 15:35+0100\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -13,40 +13,40 @@ msgstr "" "--output-dir=../po/out --add-comments --keyword=_ --keyword=_f\n" "Files: bow.cc int.cc\n" -#: data-file.cc:52 +#: data-file.cc:54 msgid "EOF in a string" msgstr "EOF in una corda" -#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "attenzione: " -#: dstream.cc:187 +#: dstream.cc:186 #, fuzzy msgid "not enough fields in Dstream init" msgstr "Non ci sono sufficienti campi in Dstream init." -#: getopt-long.cc:143 +#: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" msgstr "l'opzione `%s' richiede un argomento" -#: getopt-long.cc:147 +#: getopt-long.cc:149 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "opzione `%s' non accetta argomenti" -#: getopt-long.cc:151 +#: getopt-long.cc:153 #, c-format msgid "unrecognized option: `%s'" msgstr "opzione non riconosciuta: `%s'" -#: getopt-long.cc:158 +#: getopt-long.cc:160 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "argomento `%s' non valido per l'opzione `%s'" -#: input.cc:90 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:9 warn.cc:17 msgid "error: " msgstr "errore: " @@ -64,7 +64,7 @@ msgid "can't map file" msgstr "non posso mappare il documento" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "non posso aprire il file: `%s'" @@ -74,102 +74,114 @@ msgstr "non posso aprire il file: `%s'" msgid "Huh? Got %d, expected %d characters" msgstr "Come? Ho trovato %d caratteri al posto di %d" -#: text-stream.cc:9 +#: text-stream.cc:10 msgid "" msgstr "" -#: warn.cc:35 +#: warn.cc:36 msgid "programming error: " msgstr "" -#: warn.cc:35 +#: warn.cc:36 msgid " (Continuing; cross thumbs)" msgstr "" -#: afm.cc:51 +#: afm.cc:53 #, fuzzy, c-format msgid "can't find character number: %d" msgstr "non riesco a trovare il carattere `%s'" -#: afm.cc:66 +#: afm.cc:68 #, fuzzy, c-format msgid "can't find character called: `%s'" msgstr "non riesco a trovare il carattere `%s'" -#: afm.cc:96 -msgid "Error parsing AFM file" +#: afm.cc:113 +#, c-format +msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:151 lookup.cc:80 +#: all-font-metrics.cc:87 +#, c-format +msgid "checksum mismatch for font file: `%s'" +msgstr "" + +#: all-font-metrics.cc:92 +msgid "" +" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " +"to show font paths." +msgstr "" + +#: all-font-metrics.cc:153 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "non trovo il file: `%s'" -#: all-font-metrics.cc:152 +#: all-font-metrics.cc:154 msgid "Loading default font" msgstr "" -#: all-font-metrics.cc:169 +#: all-font-metrics.cc:171 #, fuzzy, c-format msgid "can't find default font: `%s'" msgstr "non trovo il file: `%s'" -#: all-font-metrics.cc:170 includable-lexer.cc:50 lookup.cc:81 scores.cc:109 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 #, fuzzy, c-format msgid "(search path: `%s')" msgstr "(Il path di caricamento è `%s'" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:173 parser.yy:1642 msgid "Giving up" msgstr "" -#: auto-change-iterator.cc:43 change-iterator.cc:60 +#: auto-change-iterator.cc:43 change-iterator.cc:59 #: part-combine-music-iterator.cc:85 msgid "Can't switch translators, I'm there already" msgstr "" -#: beam-engraver.cc:76 beam-engraver.cc:109 +#: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" msgstr "non trovo le estremità di %s" -#: beam-engraver.cc:138 +#: beam-engraver.cc:158 msgid "already have a beam" msgstr "" -#: beam-engraver.cc:202 +#: beam-engraver.cc:224 #, fuzzy msgid "unterminated beam" msgstr "beam non terminato" -#: beam-engraver.cc:240 chord-tremolo-engraver.cc:176 +#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "I gambi devono avere una struttura ritmica." -#: beam-engraver.cc:251 +#: beam-engraver.cc:274 msgid "stem doesn't fit in beam" msgstr "il gambo non rientra nel beam" -#: beam-engraver.cc:252 +#: beam-engraver.cc:275 msgid "beam was started here" msgstr "" -#: beam.cc:84 +#: beam.cc:83 #, fuzzy msgid "beam has less than two stems" msgstr "beam con meno di due gambi" -#: beam.cc:511 +#: beam.cc:506 msgid "weird beam vertical offset" msgstr "" -#: break-align-item.cc:119 +#: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "traduttore sconosciuto `%s'" -#: change-iterator.cc:22 +#: change-iterator.cc:21 #, c-format msgid "can't change `%s' to `%s'" msgstr "non posso cambiare `%s' in `%s'" @@ -180,15 +192,15 @@ msgstr "non posso cambiare `%s' in `%s'" #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:79 +#: change-iterator.cc:78 msgid "I'm one myself" msgstr "" -#: change-iterator.cc:82 +#: change-iterator.cc:81 msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:115 +#: chord-tremolo-engraver.cc:119 #, fuzzy msgid "unterminated chord tremolo" msgstr "beam non terminato" @@ -197,37 +209,23 @@ msgstr "beam non terminato" msgid "no one to print a tremolos" msgstr "" -#: chord.cc:162 +#: chord.cc:365 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:386 +#: chord.cc:394 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: clef-engraver.cc:165 -#, fuzzy -msgid "unknown clef type" -msgstr "tipo di chiave sconosciuto" - -#: collision.cc:118 +#: collision.cc:116 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Troppe collisioni tra colonne di note. Le ignoro." -#: crescendo.cc:65 -msgid "crescendo" -msgstr "" - -#: crescendo.cc:65 -msgid "too small" -msgstr "troppo piccolo" - -#: cross-staff.cc:22 -msgid "" -"minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" +#: cross-staff.cc:24 +msgid "not a forced distance; cross-staff spanners may be broken" msgstr "" #: debug.cc:26 @@ -244,22 +242,22 @@ msgstr "non posso settare mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:192 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 #, 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:220 #, fuzzy msgid "already have a crescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:221 #, fuzzy msgid "already have a decrescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:298 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminato" @@ -272,10 +270,14 @@ msgstr "extender non terminato" msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:64 +#: folded-repeat-iterator.cc:70 msgid "no one to print a repeat brace" msgstr "" +#: font-interface.cc:199 +msgid "couldn't find any font satisfying " +msgstr "" + #: gourlay-breaking.cc:157 msgid "No feasible line breaking found" msgstr "" @@ -285,10 +287,19 @@ msgstr "" msgid "no Grace context available" msgstr "non è una vera variabile" -#: grace-position-engraver.cc:94 +#: grace-position-engraver.cc:96 msgid "Unattached grace notes. Attaching to last musical column." msgstr "" +#: hairpin.cc:71 +msgid "decrescendo too small" +msgstr "" + +#: hairpin.cc:72 +#, fuzzy +msgid "crescendo too small" +msgstr "troppo piccolo" + #: hyphen-engraver.cc:90 #, fuzzy msgid "unterminated hyphen" @@ -303,17 +314,17 @@ msgstr "" msgid "wrong identifier type, expected: `%s'" msgstr "Tipo di identificatore sbagliato: " -#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 -#: scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 +#: scores.cc:106 scores.cc:112 #, c-format msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" -#: key-engraver.cc:101 key-performer.cc:54 +#: key-engraver.cc:103 key-performer.cc:72 msgid "FIXME: key change merge" msgstr "" -#: lily-guile.cc:119 +#: lily-guile.cc:141 #, fuzzy, c-format msgid "(load path: `%s')" msgstr "(Il path di caricamento è `%s'" @@ -323,49 +334,43 @@ msgstr "(Il path di caricamento msgid "Element count %d." msgstr "" -#: line-of-score.cc:255 paper-score.cc:79 +#: line-of-score.cc:253 paper-score.cc:77 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:269 +#: line-of-score.cc:267 msgid "Calculating column positions..." msgstr "Calcolo delle posizioni della colonne..." -#: lookup.cc:82 -msgid "Aborting" -msgstr "" - -#: lookup.cc:223 -#, c-format -msgid "Non-matching braces in text `%s', adding braces" -msgstr "" - -#: lyric-phrasing-engraver.cc:245 +#: lyric-phrasing-engraver.cc:269 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:250 +#: lyric-phrasing-engraver.cc:274 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 main.cc:93 -#, fuzzy -msgid "enable debugging output" -msgstr " -D, --debug abilita l'output di debugging\n" - -#: main.cc:76 +#: main.cc:75 msgid "EXT" msgstr "" -#: main.cc:76 +#: main.cc:75 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:77 main.cc:94 +#: main.cc:76 main.cc:95 msgid "this help" msgstr "" +#: main.cc:77 +msgid "FIELD" +msgstr "" + +#: main.cc:77 +msgid "write header field to BASENAME.FIELD" +msgstr "" + #: main.cc:78 msgid "DIR" msgstr "" @@ -375,7 +380,7 @@ msgstr "" msgid "add DIR to search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: main.cc:79 main.cc:97 +#: main.cc:79 main.cc:98 msgid "FILE" msgstr "" @@ -418,7 +423,7 @@ msgstr "" " -s, --safe inibisce la rinomina dei file di output e " "l'esportazione di macro di TeX\n" -#: main.cc:85 main.cc:102 +#: main.cc:85 main.cc:103 #, fuzzy msgid "don't timestamp the output" msgstr "" @@ -429,7 +434,7 @@ msgstr "" msgid "switch on experimental features" msgstr " -t, --test usa le caratteristiche sperimentali\n" -#: main.cc:87 main.cc:103 +#: main.cc:87 main.cc:104 msgid "print version number" msgstr "" @@ -437,7 +442,7 @@ msgstr "" msgid "verbose" msgstr "" -#: main.cc:89 main.cc:105 +#: main.cc:89 main.cc:106 #, fuzzy msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" @@ -445,17 +450,17 @@ msgstr " -w, --warranty mostra la garanzia e il copyright\n" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:107 +#: main.cc:106 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:109 +#: main.cc:108 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:113 +#: main.cc:112 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" @@ -466,17 +471,17 @@ msgstr "" msgid "Options:" msgstr "Opzioni: " -#: main.cc:123 +#: main.cc:122 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:122 main.cc:142 +#: main.cc:123 main.cc:141 #, c-format msgid "Report bugs to %s" msgstr "" -#: main.cc:54 main.cc:150 +#: main.cc:55 main.cc:149 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -484,17 +489,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:61 main.cc:157 main.cc:169 +#: main.cc:62 main.cc:156 main.cc:168 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s di" -#. GNU GNU? -#: main.cc:167 -msgid "GNU LilyPond -- The GNU Project music typesetter" +#: main.cc:166 +#, fuzzy +msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:70 main.cc:175 +#: main.cc:71 main.cc:174 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" @@ -526,21 +531,21 @@ msgstr "" "Cambridge, MA 02136\n" "USA.\n" -#: midi-item.cc:310 +#: midi-item.cc:311 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "% strumento:" -#: midi-item.cc:365 +#: midi-item.cc:366 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "armatura non convenzionale: %d bemolli e %d diesis" -#: midi-item.cc:412 +#: midi-item.cc:413 msgid "silly duration" msgstr "indicazione durata priva di senso" -#: midi-item.cc:425 +#: midi-item.cc:426 msgid "silly pitch" msgstr "indicazione altezza priva di senso" @@ -549,22 +554,34 @@ msgstr "indicazione altezza priva di senso" msgid "Error syncing file (disk full?)" msgstr "errore nel sincronizzare il file (disco pieno?)" -#: music-output-def.cc:71 +#: music-output-def.cc:72 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "non trovo `%s'" -#: musical-request.cc:42 +#: music.cc:222 +msgid "ly_get_mus_property (): Not a Music" +msgstr "" + +#: music.cc:236 +msgid "ly_set_mus_property (): Not a symbol" +msgstr "" + +#: music.cc:248 +msgid "ly_set_mus_property (): not of type Music" +msgstr "" + +#: musical-request.cc:29 #, 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:124 +#: my-lily-lexer.cc:132 #, fuzzy, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Il nome dell'identificatore è una parola chiave (`%s')" -#: my-lily-lexer.cc:143 +#: my-lily-lexer.cc:151 #, c-format msgid "error at EOF: %s" msgstr "errore alla fine del file: %s" @@ -578,20 +595,30 @@ msgstr "Analisi..." msgid "Braces don't match" msgstr "le bretelle no si accoppiano" -#: paper-def.cc:149 +#: output-property-music-iterator.cc:20 request-chord-iterator.cc:76 +#, fuzzy, c-format +msgid "Junking request: `%s'" +msgstr "Cosa? Non è una richiesta: `%s'" + +#: paper-def.cc:116 #, fuzzy, c-format msgid "paper output to %s..." msgstr "L'output stampato è inviato a %s..." -#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 msgid ", at " msgstr ", a " -#: paper-score.cc:82 +#: paper-outputter.cc:239 +#, fuzzy, c-format +msgid "writing header field %s to %s..." +msgstr "scrivo il file delle dipendenze: `%s'..." + +#: paper-score.cc:80 msgid "Preprocessing elements..." msgstr "Pre-elaborazione..." -#: paper-score.cc:107 +#: paper-score.cc:105 #, fuzzy msgid "Outputting Score, defined at: " msgstr "emetto lo Score, definito a: " @@ -631,42 +658,44 @@ msgstr "Generato automaticamente" msgid "from musical definition: %s" msgstr "della definizione musicale: %s" -#: performance.cc:174 +#: performance.cc:161 #, c-format msgid "MIDI output to %s..." msgstr "L'output MIDI è inviato a %s..." -#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 +#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" msgstr "non risco a trovare una ruling note a %s" -#: property-engraver.cc:131 -#, fuzzy -msgid "Wrong type for property" -msgstr "Tipo sbagliato per il valore di una proprietà" +#: pitch.cc:25 +msgid "Pitch arguments out of range" +msgstr "" -#: request-chord-iterator.cc:93 -#, fuzzy, c-format -msgid "Junking request: `%s'" -msgstr "Cosa? Non è una richiesta: `%s'" +#. warning () ? +#: property-engraver.cc:124 +#, c-format +msgid "" +"%s is deprecated. Use\n" +" \\property %s.%s \\override #'%s = #%s" +msgstr "" -#: request-chord-iterator.cc:96 +#: property-engraver.cc:150 #, fuzzy, c-format -msgid "Huh? Not a Request: `%s'" -msgstr "Cosa? Non è una richiesta: `%s'" +msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" +msgstr "Tipo sbagliato per il valore di una proprietà" -#: rest-collision.cc:159 +#: rest-collision.cc:190 #, fuzzy msgid "too many colliding rests" msgstr "Troppi crescendi" -#: rest-collision.cc:163 +#: rest-collision.cc:194 msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:149 +#: score-engraver.cc:177 #, fuzzy, c-format msgid "unbound spanner `%s'" msgstr "Spanner non legato `%s'" @@ -701,12 +730,12 @@ msgstr "scrivo il file delle dipendenze: `%s'..." msgid "Score contains errors; will not process it" msgstr "lo spartito contiene errori; non lo elaborerò" -#: scores.cc:124 +#: scores.cc:122 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "stringa di escape sconosciuta: `\\%s'" -#: script-engraver.cc:66 +#: script-engraver.cc:67 #, c-format msgid "Don't know how to interpret articulation `%s'" msgstr "" @@ -716,64 +745,74 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: sequential-music-iterator.cc:35 -msgid "Must stop before this music ends" -msgstr "" - -#: simple-music-iterator.cc:36 -#, c-format -msgid "Junking music: `%s'" -msgstr "" - -#: slur-engraver.cc:89 +#: slur-engraver.cc:128 msgid "unterminated slur" msgstr "slur non terminato" -#: slur-engraver.cc:104 +#: slur-engraver.cc:143 #, fuzzy msgid "can't find start of slur" msgstr "non trovo le estremità di %s" -#: slur.cc:48 +#: slur.cc:49 #, fuzzy msgid "Putting slur over rest. Ignoring." msgstr "Metto uno slur sulla pausa." -#: slur.cc:324 +#: slur.cc:379 #, fuzzy msgid "Slur over rest?" msgstr "Metto uno slur sulla pausa." -#: stem-engraver.cc:128 +#: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:116 +#: stem.cc:117 #, fuzzy msgid "Weird stem size; check for narrow beams" msgstr "dimensione del gambo poco ortodossa; check for narrow beams" +#: text-spanner-engraver.cc:95 +#, fuzzy +msgid "can't find start of text spanner" +msgstr "non trovo le estremità di %s" + +#: text-spanner-engraver.cc:114 +#, fuzzy +msgid "already have a text spanner" +msgstr "crescendo non terminato" + +#: text-spanner-engraver.cc:167 +#, fuzzy +msgid "unterminated text spanner" +msgstr "extender non terminato" + +#: text-spanner.cc:115 +msgid "Text_spanner too small" +msgstr "" + #: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "" -#: tfm-reader.cc:143 +#: tfm-reader.cc:139 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:71 +#: tfm.cc:77 #, fuzzy, c-format -msgid "can't find ascii character: `%d'" +msgid "can't find ascii character: %d" msgstr "non riesco a trovare il carattere `%s'" -#: tie-engraver.cc:203 tie-performer.cc:109 +#: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "" -#: tie-engraver.cc:242 +#: tie-engraver.cc:231 msgid "lonely tie" msgstr "" @@ -781,15 +820,7 @@ msgstr "" msgid "no one to print a tuplet start bracket" msgstr "" -#: timing-translator.cc:36 -msgid "conflicting timing request" -msgstr "richieste di timing in conflitto" - -#: timing-translator.cc:37 -msgid "This is the other timing request" -msgstr "" - -#: timing-translator.cc:65 +#: timing-translator.cc:38 #, fuzzy, c-format msgid "barcheck failed at: %s" msgstr "controllo del battute fallito: %s" @@ -818,222 +849,253 @@ msgstr "traduttore sconosciuto `%s'" msgid "can't find: `%s'" msgstr "non trovo `%s'" -#: translator-group.cc:142 +#: translator-group.cc:146 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "non trovo e non posso creare '%s' chiamato '%s'" -#: translator-group.cc:246 +#: translator-group.cc:231 #, fuzzy, c-format msgid "can't find or create: `%s'" msgstr "non trovo e non posso creare `%s'" -#: unfolded-repeat-iterator.cc:146 -msgid "no one to print a volta bracket" +#. warning () ? +#: translator-group.cc:405 +#, c-format +msgid "" +"Can't find property type-check for `%s'. Perhaps you made a typing error?" +msgstr "" + +#. warning () ? +#: translator-group.cc:420 +#, c-format +msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgstr "" + +#. programming_error? +#: translator-group.cc:440 +msgid "ly-get-trans-property: expecting a Translator_group argument" +msgstr "" + +#: volta-engraver.cc:87 +msgid "No volta spanner to end" msgstr "" -#: parser.yy:61 +#: volta-engraver.cc:104 +msgid "Already have a volta spanner. Stopping that one prematurely." +msgstr "" + +#: volta-engraver.cc:108 +msgid "Also have a stopped spanner. Giving up." +msgstr "" + +#: parser.yy:71 #, c-format msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:447 +#: parser.yy:467 msgid "Wrong type for property value" msgstr "Tipo sbagliato per il valore di una proprietà" -#: parser.yy:633 +#: parser.yy:668 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:673 +#: parser.yy:732 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:678 +#: parser.yy:737 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1015 +#: parser.yy:1217 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1025 +#: parser.yy:1227 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1117 -#, c-format -msgid "Expecting %d arguments" +#: parser.yy:1348 +msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1133 -msgid "Must have 2 arguments for duration" -msgstr "" +#: parser.yy:1359 +#, fuzzy +msgid "Must have duration object" +msgstr "indicazione durata priva di senso" -#: parser.yy:1140 parser.yy:1148 parser.yy:1383 +#: parser.yy:1368 parser.yy:1376 parser.yy:1640 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "bisogna essere in Lyric mode per i testi" -#: parser.yy:1289 parser.yy:1309 +#: parser.yy:1525 parser.yy:1554 #, c-format msgid "not a duration: %d" msgstr "non è una durata: %d" -#: parser.yy:1318 +#: parser.yy:1563 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "bisogna essere in Note mode per le note" -#: parser.yy:1396 +#: parser.yy:1659 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "bisogna essere in Chord mode per gli accordi" -#: parser.yy:1558 parser.yy:1576 +#: parser.yy:1821 parser.yy:1839 msgid "need integer number arg" msgstr "" -#: parser.yy:1562 +#: parser.yy:1825 msgid "Must be positive integer" msgstr "" -#: lexer.ll:159 +#: lexer.ll:164 msgid "EOF found inside a comment" msgstr "ho trovato un EOF in un commento" -#: lexer.ll:173 +#: lexer.ll:178 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:197 +#: lexer.ll:202 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "indentificatore non definito: `%s'" #. backup rule -#: lexer.ll:202 +#: lexer.ll:207 #, fuzzy msgid "Missing end quote" msgstr "apice finale mancante" #. backup rule -#: lexer.ll:224 lexer.ll:228 +#: lexer.ll:229 lexer.ll:233 msgid "white expected" msgstr "aspettavo uno spazio bianco" -#: lexer.ll:236 +#: lexer.ll:241 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:432 +#: lexer.ll:433 #, fuzzy, c-format msgid "invalid character: `%c'" msgstr "carattere illegale: `%c'" -#: lexer.ll:512 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "stringa di escape sconosciuta: `\\%s'" -#: lexer.ll:598 -#, c-format -msgid "incorrect mudela version: %s (%s, %s)" +#: lexer.ll:597 +#, fuzzy, c-format +msgid "incorrect lilypond version: %s (%s, %s)" msgstr "versione di mudela errata: %s (%s, %s)" -#: lexer.ll:599 -msgid "Consider converting the input with the convert-mudela script" +#: lexer.ll:598 +msgid "Consider converting the input with the convert-ly script" msgstr "" -#: main.cc:92 +#: main.cc:93 #, fuzzy msgid "write exact durations, e.g.: a4*385/384" msgstr " -b, --no-quantify scrive durate esatte, p.es.: a4*385/384\n" -#: main.cc:95 +#: main.cc:94 +#, fuzzy +msgid "enable debugging output" +msgstr " -D, --debug abilita l'output di debugging\n" + +#: main.cc:96 msgid "ACC[:MINOR]" msgstr "" -#: main.cc:95 +#: main.cc:96 #, fuzzy msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "" " -k, --key=ACC[:MINOR] imposta l'armatura: ACC +diesis/-bemolli; :1 minore\n" -#: main.cc:96 +#: main.cc:97 #, fuzzy msgid "don't output tuplets, double dots or rests, smallest is 32" msgstr "" " -n, --no-silly assume che non ci siano gruppetti o doppi punti, la " "figura più piccola è 32\n" -#: main.cc:97 +#: main.cc:98 #, fuzzy msgid "set FILE as default output" msgstr " -o, --output=FILE set FILE come output di default\n" -#: main.cc:98 +#: main.cc:99 msgid "don't output tuplets" msgstr "" -#: main.cc:99 +#: main.cc:100 msgid "be quiet" msgstr "" -#: main.cc:100 +#: main.cc:101 msgid "don't output rests or skips" msgstr "" -#: main.cc:101 +#: main.cc:102 msgid "DUR" msgstr "" -#: main.cc:101 +#: main.cc:102 #, fuzzy msgid "set smallest duration" msgstr "indicazione durata priva di senso" -#: main.cc:104 +#: main.cc:105 msgid "be verbose" msgstr "" -#: main.cc:106 +#: main.cc:107 #, fuzzy msgid "assume no double dotted notes" msgstr "" " -x, --no-double-dots assume che non ci siano note con doppio punto\n" -#: main.cc:113 +#: main.cc:114 #, c-format msgid "Usage: %s [OPTION]... [FILE]" msgstr "Uso: %s [OPZIONE... [FILE]" -#: main.cc:115 +#: main.cc:116 #, fuzzy msgid "Translate MIDI-file to mudela" msgstr "Traduce un file midi in mudela" -#: main.cc:129 +#: main.cc:130 #, c-format msgid "no_double_dots: %d\n" msgstr "" -#: main.cc:131 +#: main.cc:132 #, c-format msgid "no_rests: %d\n" msgstr "" -#: main.cc:133 +#: main.cc:134 #, c-format msgid "no_quantify_b_s: %d\n" msgstr "" -#: main.cc:135 +#: main.cc:136 #, c-format msgid "no_smaller_than: %d (1/%d)\n" msgstr "" -#: main.cc:138 +#: main.cc:139 #, c-format msgid "no_tuplets: %d\n" msgstr "" @@ -1091,7 +1153,7 @@ msgstr "mi spettavo una traccia MIDI" msgid "invalid track length" msgstr "lunghezza della traccia non valida" -#: mudela-item.cc:160 +#: mudela-item.cc:161 #, c-format msgid "#32 in quarter: %d" msgstr "#32 in un quarto: %d" @@ -1162,6 +1224,21 @@ msgstr "% Generato automaticamente" msgid "% from input file: " msgstr "% dal file di input: " +#, fuzzy +#~ msgid "Wrong type for property" +#~ msgstr "Tipo sbagliato per il valore di una proprietà" + +#, fuzzy +#~ msgid "unknown clef type" +#~ msgstr "tipo di chiave sconosciuto" + +#, fuzzy +#~ msgid "Huh? Not a Request: `%s'" +#~ msgstr "Cosa? Non è una richiesta: `%s'" + +#~ msgid "conflicting timing request" +#~ msgstr "richieste di timing in conflitto" + #~ msgid "can't find both ends of %s" #~ msgstr "non trovo le estremità di %s" diff --git a/po/ja.po b/po/ja.po index 3222c14fe4..915c1d6a5d 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: 2000-09-17 12:01+0200\n" +"POT-Creation-Date: 2000-12-17 15:35+0100\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -13,39 +13,39 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: data-file.cc:52 +#: data-file.cc:54 msgid "EOF in a string" msgstr "ʸ»úÎóÃæ¤Ë EOF ¤¬¤¢¤ê¤Þ¤¹" -#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "·Ù¹ð: " -#: dstream.cc:187 +#: dstream.cc:186 msgid "not enough fields in Dstream init" msgstr "Dstream ½é´ü²½»þ¤Î¥Õ¥£¡¼¥ë¥É¤¬ÉÔ½½Ê¬" -#: getopt-long.cc:143 +#: getopt-long.cc:145 #, fuzzy, c-format msgid "option `%s' requires an argument" msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹" -#: getopt-long.cc:147 +#: getopt-long.cc:149 #, fuzzy, c-format msgid "option `%s' doesn't allow an argument" msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òµö²Ä¤·¤Þ¤»¤ó" -#: getopt-long.cc:151 +#: getopt-long.cc:153 #, c-format msgid "unrecognized option: `%s'" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó: `%s'" -#: getopt-long.cc:158 +#: getopt-long.cc:160 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "¥ª¥×¥·¥ç¥ó `%2$s' ¤ËÂФ¹¤ë̵¸ú¤Ê°ú¿ô `%1$s'" -#: input.cc:90 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:9 warn.cc:17 msgid "error: " msgstr "¥¨¥é¡¼: " @@ -64,7 +64,7 @@ msgid "can't map file" msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 #, fuzzy, c-format msgid "can't open file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" @@ -74,104 +74,116 @@ msgstr " msgid "Huh? Got %d, expected %d characters" msgstr "¤Ï¡© %2$d ʸ»ú¤¢¤ë¤Ï¤º¤Ê¤Î¤Ë %1$d ʸ»ú¤·¤«¤Ê¤¤" -#: text-stream.cc:9 +#: text-stream.cc:10 msgid "" msgstr "" -#: warn.cc:35 +#: warn.cc:36 msgid "programming error: " msgstr "¥×¥í¥°¥é¥à¾å¤Î¥¨¥é¡¼: " -#: warn.cc:35 +#: warn.cc:36 msgid " (Continuing; cross thumbs)" msgstr " (³¤±¤Þ¤¹ -- cross thumbs)" -#: afm.cc:51 +#: afm.cc:53 #, fuzzy, c-format msgid "can't find character number: %d" msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d" -#: afm.cc:66 +#: afm.cc:68 #, fuzzy, c-format msgid "can't find character called: `%s'" msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: afm.cc:96 -msgid "Error parsing AFM file" +#: afm.cc:113 +#, c-format +msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:151 lookup.cc:80 +#: all-font-metrics.cc:87 +#, c-format +msgid "checksum mismatch for font file: `%s'" +msgstr "" + +#: all-font-metrics.cc:92 +msgid "" +" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " +"to show font paths." +msgstr "" + +#: all-font-metrics.cc:153 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: all-font-metrics.cc:152 +#: all-font-metrics.cc:154 msgid "Loading default font" msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹" -#: all-font-metrics.cc:169 +#: all-font-metrics.cc:171 #, fuzzy, c-format msgid "can't find default font: `%s'" msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: all-font-metrics.cc:170 includable-lexer.cc:50 lookup.cc:81 scores.cc:109 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 #, c-format msgid "(search path: `%s')" msgstr "(¸¡º÷¥Ñ¥¹: `%s')" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:173 parser.yy:1642 msgid "Giving up" msgstr "Äü¤á¤Þ¤·¤¿" -#: auto-change-iterator.cc:43 change-iterator.cc:60 +#: auto-change-iterator.cc:43 change-iterator.cc:59 #: part-combine-music-iterator.cc:85 msgid "Can't switch translators, I'm there already" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: beam-engraver.cc:76 beam-engraver.cc:109 +#: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" -#: beam-engraver.cc:138 +#: beam-engraver.cc:158 #, fuzzy msgid "already have a beam" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: beam-engraver.cc:202 +#: beam-engraver.cc:224 #, fuzzy msgid "unterminated beam" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" -#: beam-engraver.cc:240 chord-tremolo-engraver.cc:176 +#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "ÉäÈø¤Ï¥ê¥º¥à¹½Â¤¤ò»ý¤¿¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: beam-engraver.cc:251 +#: beam-engraver.cc:274 #, fuzzy msgid "stem doesn't fit in beam" msgstr "ÉäÈø¤¬³Ã¤ÎÃæ¤Ë¤ª¤µ¤Þ¤ê¤Þ¤»¤ó" -#: beam-engraver.cc:252 +#: beam-engraver.cc:275 #, fuzzy msgid "beam was started here" msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿" -#: beam.cc:84 +#: beam.cc:83 #, fuzzy msgid "beam has less than two stems" msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" -#: beam.cc:511 +#: beam.cc:506 msgid "weird beam vertical offset" msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã" -#: break-align-item.cc:119 +#: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'" -#: change-iterator.cc:22 +#: change-iterator.cc:21 #, fuzzy, c-format msgid "can't change `%s' to `%s'" msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó" @@ -182,15 +194,15 @@ msgstr "`%s' #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:79 +#: change-iterator.cc:78 msgid "I'm one myself" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤½¤Î¤â¤Î¤Ç¤¹" -#: change-iterator.cc:82 +#: change-iterator.cc:81 msgid "none of these in my family" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: chord-tremolo-engraver.cc:115 +#: chord-tremolo-engraver.cc:119 #, fuzzy msgid "unterminated chord tremolo" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" @@ -200,36 +212,23 @@ msgstr " msgid "no one to print a tremolos" msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" -#: chord.cc:162 +#: chord.cc:365 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "̵¸ú¤Ê°ú¤­»»: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: chord.cc:386 +#: chord.cc:394 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: clef-engraver.cc:165 -msgid "unknown clef type" -msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)" - -#: collision.cc:118 +#: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£" -#: crescendo.cc:65 -msgid "crescendo" -msgstr "¥¯¥ì¥Ã¥·¥§¥ó¥É" - -#: crescendo.cc:65 -msgid "too small" -msgstr "¾®¤µ¤¹¤®¤Þ¤¹" - -#: cross-staff.cc:22 +#: cross-staff.cc:24 #, fuzzy -msgid "" -"minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" +msgid "not a forced distance; cross-staff spanners may be broken" msgstr "" "minVerticalAlign != maxVerticalAlign: ÆâÉôŪ¤Ê beams/slurs ¤¬²õ¤ì¤Þ¤·¤¿" @@ -246,22 +245,22 @@ msgstr " msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:192 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:220 #, fuzzy msgid "already have a crescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:221 #, fuzzy msgid "already have a decrescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:298 #, fuzzy msgid "unterminated (de)crescendo" msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É" @@ -274,10 +273,14 @@ msgstr " msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "¥¨¥¯¥¹¥Æ¥ó¥À¤¬º¸Â¦¤Ë¤Ä¤Ê¤¬¤ê¤Þ¤»¤ó¡£¥¨¥¯¥¹¥Æ¥ó¥ÀÍ×µá¤ò̵»ë¤·¤Þ¤¹¡£" -#: folded-repeat-iterator.cc:64 +#: folded-repeat-iterator.cc:70 msgid "no one to print a repeat brace" msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" +#: font-interface.cc:199 +msgid "couldn't find any font satisfying " +msgstr "" + #: gourlay-breaking.cc:157 msgid "No feasible line breaking found" msgstr "" @@ -286,10 +289,19 @@ msgstr "" msgid "no Grace context available" msgstr "Áõ¾þ¥³¥ó¥Æ¥­¥¹¥È¤¬¤¢¤ê¤Þ¤»¤ó" -#: grace-position-engraver.cc:94 +#: grace-position-engraver.cc:96 msgid "Unattached grace notes. Attaching to last musical column." msgstr "Áõ¾þ²»É䤬¤Ä¤±¤é¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£Ä¾Á°¤Î¥«¥é¥à¤Ë¤Ä¤±¤Þ¤¹" +#: hairpin.cc:71 +msgid "decrescendo too small" +msgstr "" + +#: hairpin.cc:72 +#, fuzzy +msgid "crescendo too small" +msgstr "¥¯¥ì¥Ã¥·¥§¥ó¥É" + #: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" @@ -303,17 +315,17 @@ msgstr " msgid "wrong identifier type, expected: `%s'" msgstr "´Ö°ã¤Ã¤¿¼±Ê̻ҷ¿¡¢¤³¤³¤ËÍè¤ë¤Ù¤­¤â¤Î¤Ï: `%s'" -#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 -#: scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 +#: scores.cc:106 scores.cc:112 #, fuzzy, c-format msgid "can't find file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: key-engraver.cc:101 key-performer.cc:54 +#: key-engraver.cc:103 key-performer.cc:72 msgid "FIXME: key change merge" msgstr "FIXME: ¥­¡¼Êѹ¹¤Î¥Þ¡¼¥¸" -#: lily-guile.cc:119 +#: lily-guile.cc:141 #, c-format msgid "(load path: `%s')" msgstr "(Æɹþ¥Ñ¥¹: `%s')" @@ -323,49 +335,45 @@ msgstr "( msgid "Element count %d." msgstr "" -#: line-of-score.cc:255 paper-score.cc:79 +#: line-of-score.cc:253 paper-score.cc:77 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:269 +#: line-of-score.cc:267 msgid "Calculating column positions..." msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..." -#: lookup.cc:82 -msgid "Aborting" -msgstr "½ªÎ»¤·¤Þ¤¹" - -#: lookup.cc:223 -#, c-format -msgid "Non-matching braces in text `%s', adding braces" -msgstr "¥Æ¥­¥¹¥È `%s' Ãæ¤Ë°ìÃפ¹¤ë¥Ö¥ì¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ö¥ì¡¼¥¹¤òÄɲä·¤Þ¤¹" - -#: lyric-phrasing-engraver.cc:245 +#: lyric-phrasing-engraver.cc:269 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:250 +#: lyric-phrasing-engraver.cc:274 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 main.cc:93 -msgid "enable debugging output" -msgstr "¥Ç¥Ð¥Ã¥°½ÐÎϤòÍ­¸ú" - -#: main.cc:76 +#: main.cc:75 msgid "EXT" msgstr "EXT" -#: main.cc:76 +#: main.cc:75 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦" -#: main.cc:77 main.cc:94 +#: main.cc:76 main.cc:95 msgid "this help" msgstr "¤³¤Î¥Ø¥ë¥×" +#: main.cc:77 +#, fuzzy +msgid "FIELD" +msgstr "FILE" + +#: main.cc:77 +msgid "write header field to BASENAME.FIELD" +msgstr "" + #: main.cc:78 msgid "DIR" msgstr "DIR" @@ -374,7 +382,7 @@ msgstr "DIR" msgid "add DIR to search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: main.cc:79 main.cc:97 +#: main.cc:79 main.cc:98 msgid "FILE" msgstr "FILE" @@ -406,7 +414,7 @@ msgstr " msgid "inhibit file output naming and exporting" msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë" -#: main.cc:85 main.cc:102 +#: main.cc:85 main.cc:103 msgid "don't timestamp the output" msgstr "½ÐÎϤ˥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤" @@ -414,7 +422,7 @@ msgstr " msgid "switch on experimental features" msgstr "¼Â¸³Åª¤Êµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë" -#: main.cc:87 main.cc:103 +#: main.cc:87 main.cc:104 msgid "print version number" msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" @@ -423,23 +431,23 @@ msgstr " msgid "verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: main.cc:89 main.cc:105 +#: main.cc:89 main.cc:106 msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:107 +#: main.cc:106 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." -#: main.cc:109 +#: main.cc:108 msgid "Typeset music and or play MIDI from FILE" msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë" -#: main.cc:113 +#: main.cc:112 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" @@ -453,16 +461,16 @@ msgstr "" msgid "Options:" msgstr "¥ª¥×¥·¥ç¥ó:" -#: main.cc:123 +#: main.cc:122 msgid "This binary was compiled with the following options:" msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿" -#: main.cc:122 main.cc:142 +#: main.cc:123 main.cc:141 #, c-format msgid "Report bugs to %s" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" -#: main.cc:54 main.cc:150 +#: main.cc:55 main.cc:149 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -478,17 +486,17 @@ msgstr "" "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n" "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n" -#: main.cc:61 main.cc:157 main.cc:169 +#: main.cc:62 main.cc:156 main.cc:168 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s by" -#. GNU GNU? -#: main.cc:167 -msgid "GNU LilyPond -- The GNU Project music typesetter" +#: main.cc:166 +#, fuzzy +msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- The GNU Project music typesetter" -#: main.cc:70 main.cc:175 +#: main.cc:71 main.cc:174 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" @@ -535,21 +543,21 @@ msgstr "" "¤Ç¤¹(COPYING ¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢Free Software Foundation,\n" "Inc., 675 Mass Ave, Cambridge, MA 02139, USA ¤Ë¼ê»æ¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: midi-item.cc:310 +#: midi-item.cc:311 #, c-format msgid "no such instrument: `%s'" msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" -#: midi-item.cc:365 +#: midi-item.cc:366 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "´·½¬¤Ë¹ç¤ï¤Ê¤¤¥­¡¼¤Ç¤¹: ¥Õ¥é¥Ã¥È: %d ¸Ä, ¥·¥ã¡¼¥× %d ¸Ä" -#: midi-item.cc:412 +#: midi-item.cc:413 msgid "silly duration" msgstr "Çϼ¯¤²¤¿²»Ä¹" -#: midi-item.cc:425 +#: midi-item.cc:426 msgid "silly pitch" msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á" @@ -557,22 +565,34 @@ msgstr " msgid "Error syncing file (disk full?)" msgstr "¥Õ¥¡¥¤¥ë¤ÎƱĴ¥¨¥é¡¼ (¥Ç¥£¥¹¥¯¤¬°ìÇÕ?)" -#: music-output-def.cc:71 +#: music-output-def.cc:72 #, fuzzy, c-format msgid "can't find `%s' context" msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: musical-request.cc:42 +#: music.cc:222 +msgid "ly_get_mus_property (): Not a Music" +msgstr "" + +#: music.cc:236 +msgid "ly_set_mus_property (): Not a symbol" +msgstr "" + +#: music.cc:248 +msgid "ly_set_mus_property (): not of type Music" +msgstr "" + +#: musical-request.cc:29 #, c-format msgid "Transposition by %s makes accidental larger than two" msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" -#: my-lily-lexer.cc:124 +#: my-lily-lexer.cc:132 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "¼±ÊÌ»Ò̾¤Ï¥­¡¼¥ï¡¼¥É¤Ç¤¹: `%s'" -#: my-lily-lexer.cc:143 +#: my-lily-lexer.cc:151 #, c-format msgid "error at EOF: %s" msgstr "EOF ¤Î¤È¤³¤í¤Ç¥¨¥é¡¼: %s" @@ -585,20 +605,30 @@ msgstr " msgid "Braces don't match" msgstr "¥Ö¥ì¡¼¥¹¤¬°ìÃפ·¤Þ¤»¤ó" -#: paper-def.cc:149 +#: output-property-music-iterator.cc:20 request-chord-iterator.cc:76 +#, c-format +msgid "Junking request: `%s'" +msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" + +#: paper-def.cc:116 #, c-format msgid "paper output to %s..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 msgid ", at " msgstr ", at " -#: paper-score.cc:82 +#: paper-outputter.cc:239 +#, fuzzy, c-format +msgid "writing header field %s to %s..." +msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." + +#: paper-score.cc:80 msgid "Preprocessing elements..." msgstr "Í×ÁǤòÁ°½èÍýÃæ..." -#: paper-score.cc:107 +#: paper-score.cc:105 msgid "Outputting Score, defined at: " msgstr "ÉèÌ̤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤³¤ÇÄêµÁ: " @@ -636,41 +666,43 @@ msgstr " msgid "from musical definition: %s" msgstr "²»³ÚŪÄêµÁ¤è¤ê: %s" -#: performance.cc:174 +#: performance.cc:161 #, c-format msgid "MIDI output to %s..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 +#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: property-engraver.cc:131 -#, fuzzy -msgid "Wrong type for property" -msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" +#: pitch.cc:25 +msgid "Pitch arguments out of range" +msgstr "" -#: request-chord-iterator.cc:93 +#. warning () ? +#: property-engraver.cc:124 #, c-format -msgid "Junking request: `%s'" -msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" +msgid "" +"%s is deprecated. Use\n" +" \\property %s.%s \\override #'%s = #%s" +msgstr "" -#: request-chord-iterator.cc:96 -#, c-format -msgid "Huh? Not a Request: `%s'" -msgstr "¤Ï? Í×µá¤Ç¤Ï¤Ê¤¤: `%s'" +#: property-engraver.cc:150 +#, fuzzy, c-format +msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" +msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: rest-collision.cc:159 +#: rest-collision.cc:190 msgid "too many colliding rests" msgstr "µÙÉä¤Î¾×Æͤ¬Â¿¤¹¤®¤Þ¤¹" -#: rest-collision.cc:163 +#: rest-collision.cc:194 msgid "too many notes for rest collision" msgstr "µÙÉä¤Î¾×ÆͤËÂФ·¤Æ²»É䤬¿¤¹¤®¤Þ¤¹" -#: score-engraver.cc:149 +#: score-engraver.cc:177 #, c-format msgid "unbound spanner `%s'" msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" @@ -702,12 +734,12 @@ msgstr " msgid "Score contains errors; will not process it" msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- ½èÍý¤·¤Þ¤»¤ó" -#: scores.cc:124 +#: scores.cc:122 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'" -#: script-engraver.cc:66 +#: script-engraver.cc:67 #, c-format msgid "Don't know how to interpret articulation `%s'" msgstr "²»Àá `%s' ¤Î²ò¼áÊýË¡¤¬È½¤ê¤Þ¤»¤ó" @@ -718,61 +750,71 @@ msgstr " msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿" -#: sequential-music-iterator.cc:35 -msgid "Must stop before this music ends" -msgstr "¤³¤Î³Ú¶Ê¤Î½ª¤ï¤ê¤Þ¤Ç¤Ë»ß¤á¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" - -#: simple-music-iterator.cc:36 -#, fuzzy, c-format -msgid "Junking music: `%s'" -msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" - -#: slur-engraver.cc:89 +#: slur-engraver.cc:128 msgid "unterminated slur" msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" -#: slur-engraver.cc:104 +#: slur-engraver.cc:143 #, fuzzy msgid "can't find start of slur" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: slur.cc:48 +#: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£" -#: slur.cc:324 +#: slur.cc:379 msgid "Slur over rest?" msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" -#: stem-engraver.cc:128 +#: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)" -#: stem.cc:116 +#: stem.cc:117 msgid "Weird stem size; check for narrow beams" msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" +#: text-spanner-engraver.cc:95 +#, fuzzy +msgid "can't find start of text spanner" +msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" + +#: text-spanner-engraver.cc:114 +#, fuzzy +msgid "already have a text spanner" +msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" + +#: text-spanner-engraver.cc:167 +#, fuzzy +msgid "unterminated text spanner" +msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À" + +#: text-spanner.cc:115 +msgid "Text_spanner too small" +msgstr "" + #: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "`%s' ¤Î TFM ¥Ø¥Ã¥À¤Ë %u ¸ì¤·¤«¤¢¤ê¤Þ¤»¤ó" -#: tfm-reader.cc:143 +#: tfm-reader.cc:139 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó" -#: tfm.cc:71 +#: tfm.cc:77 #, fuzzy, c-format -msgid "can't find ascii character: `%d'" +msgid "can't find ascii character: %d" msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" -#: tie-engraver.cc:203 tie-performer.cc:109 +#: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "ºî¤é¤ì¤¿¥¿¥¤¤¬¤¢¤ê¤Þ¤»¤ó!" -#: tie-engraver.cc:242 +#: tie-engraver.cc:231 msgid "lonely tie" msgstr "°ì¤Ä¤À¤±¤Î¥¿¥¤" @@ -780,15 +822,7 @@ msgstr " msgid "no one to print a tuplet start bracket" msgstr "¥¿¥×¥ì¥Ã¥È³«»Ï¥Ö¥é¥±¥Ã¥È¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" -#: timing-translator.cc:36 -msgid "conflicting timing request" -msgstr "Çï»Ò¤ÎÍ׵᤬¶¥¹ç¤·¤Þ¤¹" - -#: timing-translator.cc:37 -msgid "This is the other timing request" -msgstr "" - -#: timing-translator.cc:65 +#: timing-translator.cc:38 #, c-format msgid "barcheck failed at: %s" msgstr "¾®Àá¥Á¥§¥Ã¥¯¤¬¼ºÇÔ: %s" @@ -817,208 +851,238 @@ msgstr "Ƚ msgid "can't find: `%s'" msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: translator-group.cc:142 +#: translator-group.cc:146 #, fuzzy, c-format msgid "can't find or create `%s' called `%s'" msgstr "`%2$s' ¤Ë¸Æ¤Ð¤ì¤¿ `%1$s' ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó" -#: translator-group.cc:246 +#: translator-group.cc:231 #, fuzzy, c-format msgid "can't find or create: `%s'" msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'" -#: unfolded-repeat-iterator.cc:146 -msgid "no one to print a volta bracket" -msgstr "volta ¥Ö¥é¥±¥Ã¥È¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" +#. warning () ? +#: translator-group.cc:405 +#, c-format +msgid "" +"Can't find property type-check for `%s'. Perhaps you made a typing error?" +msgstr "" -#: parser.yy:61 +#. warning () ? +#: translator-group.cc:420 +#, c-format +msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgstr "" + +#. programming_error? +#: translator-group.cc:440 +msgid "ly-get-trans-property: expecting a Translator_group argument" +msgstr "" + +#: volta-engraver.cc:87 +msgid "No volta spanner to end" +msgstr "" + +#: volta-engraver.cc:104 +msgid "Already have a volta spanner. Stopping that one prematurely." +msgstr "" + +#: volta-engraver.cc:108 +msgid "Also have a stopped spanner. Giving up." +msgstr "" + +#: parser.yy:71 #, c-format msgid "Oldest supported input version: %s" msgstr "°ìÈָŤ¤ÆþÎϲÄǽ¥Ð¡¼¥¸¥ç¥ó: %s" -#: parser.yy:447 +#: parser.yy:467 msgid "Wrong type for property value" msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: parser.yy:633 +#: parser.yy:668 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£" -#: parser.yy:673 +#: parser.yy:732 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:678 +#: parser.yy:737 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1015 +#: parser.yy:1217 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1025 +#: parser.yy:1227 msgid "Can't specify direction for this request" msgstr "¤³¤ÎÍ×µá¤ËÂФ¹¤ëÊý¸þ¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: parser.yy:1117 -#, c-format -msgid "Expecting %d arguments" +#: parser.yy:1348 +msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1133 -msgid "Must have 2 arguments for duration" -msgstr "" +#: parser.yy:1359 +#, fuzzy +msgid "Must have duration object" +msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹" -#: parser.yy:1140 parser.yy:1148 parser.yy:1383 +#: parser.yy:1368 parser.yy:1376 parser.yy:1640 msgid "Have to be in Lyric mode for lyrics" msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1289 parser.yy:1309 +#: parser.yy:1525 parser.yy:1554 #, c-format msgid "not a duration: %d" msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d" -#: parser.yy:1318 +#: parser.yy:1563 msgid "Have to be in Note mode for notes" msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1396 +#: parser.yy:1659 msgid "Have to be in Chord mode for chords" msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1558 parser.yy:1576 +#: parser.yy:1821 parser.yy:1839 msgid "need integer number arg" msgstr "" -#: parser.yy:1562 +#: parser.yy:1825 msgid "Must be positive integer" msgstr "" -#: lexer.ll:159 +#: lexer.ll:164 msgid "EOF found inside a comment" msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lexer.ll:173 +#: lexer.ll:178 msgid "\\maininput disallowed outside init files" msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó" -#: lexer.ll:197 +#: lexer.ll:202 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "̤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'" #. backup rule -#: lexer.ll:202 +#: lexer.ll:207 msgid "Missing end quote" msgstr "½ªÎ»¥¯¥ª¡¼¥È¤¬¤¢¤ê¤Þ¤»¤ó" #. backup rule -#: lexer.ll:224 lexer.ll:228 +#: lexer.ll:229 lexer.ll:233 msgid "white expected" msgstr "¶õÇò¤¬É¬ÍפǤ¹" -#: lexer.ll:236 +#: lexer.ll:241 msgid "Can't evaluate Scheme in safe mode" msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó" -#: lexer.ll:432 +#: lexer.ll:433 #, c-format msgid "invalid character: `%c'" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: lexer.ll:512 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'" -#: lexer.ll:598 -#, c-format -msgid "incorrect mudela version: %s (%s, %s)" +#: lexer.ll:597 +#, fuzzy, c-format +msgid "incorrect lilypond version: %s (%s, %s)" msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)" -#: lexer.ll:599 -msgid "Consider converting the input with the convert-mudela script" +#: lexer.ll:598 +msgid "Consider converting the input with the convert-ly script" msgstr "" -#: main.cc:92 +#: main.cc:93 msgid "write exact durations, e.g.: a4*385/384" msgstr "Àµ³Î¤Ê²»Ä¹¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£Îã: a4*385/384" -#: main.cc:95 +#: main.cc:94 +msgid "enable debugging output" +msgstr "¥Ç¥Ð¥Ã¥°½ÐÎϤòÍ­¸ú" + +#: main.cc:96 msgid "ACC[:MINOR]" msgstr "ACC[:MINOR]" -#: main.cc:95 +#: main.cc:96 msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "Ä´¤òÀßÄê: ACC +¥·¥ã¡¼¥×/-¥Õ¥é¥Ã¥È :1 ûĴ" -#: main.cc:96 +#: main.cc:97 #, fuzzy msgid "don't output tuplets, double dots or rests, smallest is 32" msgstr "ÉäÅÀ¤äÊ£ÉäÅÀ¤ò¤Ê¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹¡¢ºÇ¾®¤Ï 32" -#: main.cc:97 +#: main.cc:98 msgid "set FILE as default output" msgstr "¥Ç¥Õ¥©¥ë¥È½ÐÎϤȤ·¤Æ FILE ¤òÀßÄꤹ¤ë" -#: main.cc:98 +#: main.cc:99 msgid "don't output tuplets" msgstr "" -#: main.cc:99 +#: main.cc:100 msgid "be quiet" msgstr "ÀŤ«¤Ë¤·¤Þ¤¹" -#: main.cc:100 +#: main.cc:101 msgid "don't output rests or skips" msgstr "" -#: main.cc:101 +#: main.cc:102 msgid "DUR" msgstr "DUR" -#: main.cc:101 +#: main.cc:102 msgid "set smallest duration" msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹" -#: main.cc:104 +#: main.cc:105 msgid "be verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: main.cc:106 +#: main.cc:107 msgid "assume no double dotted notes" msgstr "Ê£ÉäÅÀ²»Éä¤ò̵¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹" -#: main.cc:113 +#: main.cc:114 #, c-format msgid "Usage: %s [OPTION]... [FILE]" msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" -#: main.cc:115 +#: main.cc:116 msgid "Translate MIDI-file to mudela" msgstr "MIDI ¥Õ¥¡¥¤¥ë¤ò mudela ¤ËÊÑ´¹¤·¤Þ¤¹" -#: main.cc:129 +#: main.cc:130 #, c-format msgid "no_double_dots: %d\n" msgstr "" -#: main.cc:131 +#: main.cc:132 #, c-format msgid "no_rests: %d\n" msgstr "" -#: main.cc:133 +#: main.cc:134 #, c-format msgid "no_quantify_b_s: %d\n" msgstr "" -#: main.cc:135 +#: main.cc:136 #, c-format msgid "no_smaller_than: %d (1/%d)\n" msgstr "" -#: main.cc:138 +#: main.cc:139 #, c-format msgid "no_tuplets: %d\n" msgstr "" @@ -1073,7 +1137,7 @@ msgstr "MIDI msgid "invalid track length" msgstr "̵¸ú¤Ê¥È¥é¥Ã¥¯Ä¹¤Ç¤¹" -#: mudela-item.cc:160 +#: mudela-item.cc:161 #, c-format msgid "#32 in quarter: %d" msgstr "»Íʬ¤ÎÃæ¤Ë #32: %d" @@ -1143,6 +1207,39 @@ msgstr "% Automatically generated" msgid "% from input file: " msgstr "% from input file: " +#, fuzzy +#~ msgid "Wrong type for property" +#~ msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" + +#~ msgid "unknown clef type" +#~ msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)" + +#~ msgid "too small" +#~ msgstr "¾®¤µ¤¹¤®¤Þ¤¹" + +#~ msgid "Aborting" +#~ msgstr "½ªÎ»¤·¤Þ¤¹" + +#~ msgid "Non-matching braces in text `%s', adding braces" +#~ msgstr "" +#~ "¥Æ¥­¥¹¥È `%s' Ãæ¤Ë°ìÃפ¹¤ë¥Ö¥ì¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ö¥ì¡¼¥¹¤òÄɲä·¤Þ¤¹" + +#~ msgid "Huh? Not a Request: `%s'" +#~ msgstr "¤Ï? Í×µá¤Ç¤Ï¤Ê¤¤: `%s'" + +#~ msgid "Must stop before this music ends" +#~ msgstr "¤³¤Î³Ú¶Ê¤Î½ª¤ï¤ê¤Þ¤Ç¤Ë»ß¤á¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" + +#, fuzzy +#~ msgid "Junking music: `%s'" +#~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" + +#~ msgid "conflicting timing request" +#~ msgstr "Çï»Ò¤ÎÍ׵᤬¶¥¹ç¤·¤Þ¤¹" + +#~ msgid "no one to print a volta bracket" +#~ msgstr "volta ¥Ö¥é¥±¥Ã¥È¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" + #~ msgid "Interpretation context with empty type" #~ msgstr "¶õ¥¿¥¤¥×¤Î²ò¼á¥³¥ó¥Æ¥­¥¹¥È" diff --git a/po/lilypond.pot b/po/lilypond.pot index 4a1243f802..745a5966d3 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-09-17 12:01+0200\n" +"POT-Creation-Date: 2000-12-17 15:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,39 +14,39 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: data-file.cc:52 +#: data-file.cc:54 msgid "EOF in a string" msgstr "" -#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "" -#: dstream.cc:187 +#: dstream.cc:186 msgid "not enough fields in Dstream init" msgstr "" -#: getopt-long.cc:143 +#: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" msgstr "" -#: getopt-long.cc:147 +#: getopt-long.cc:149 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "" -#: getopt-long.cc:151 +#: getopt-long.cc:153 #, c-format msgid "unrecognized option: `%s'" msgstr "" -#: getopt-long.cc:158 +#: getopt-long.cc:160 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "" -#: input.cc:90 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:9 warn.cc:17 msgid "error: " msgstr "" @@ -63,7 +63,7 @@ msgid "can't map file" msgstr "" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "" @@ -73,98 +73,110 @@ msgstr "" msgid "Huh? Got %d, expected %d characters" msgstr "" -#: text-stream.cc:9 +#: text-stream.cc:10 msgid "" msgstr "" -#: warn.cc:35 +#: warn.cc:36 msgid "programming error: " msgstr "" -#: warn.cc:35 +#: warn.cc:36 msgid " (Continuing; cross thumbs)" msgstr "" -#: afm.cc:51 +#: afm.cc:53 #, c-format msgid "can't find character number: %d" msgstr "" -#: afm.cc:66 +#: afm.cc:68 #, c-format msgid "can't find character called: `%s'" msgstr "" -#: afm.cc:96 -msgid "Error parsing AFM file" +#: afm.cc:113 +#, c-format +msgid "Error parsing AFM file: %s" +msgstr "" + +#: all-font-metrics.cc:87 +#, c-format +msgid "checksum mismatch for font file: `%s'" +msgstr "" + +#: all-font-metrics.cc:92 +msgid "" +" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " +"to show font paths." msgstr "" -#: all-font-metrics.cc:151 lookup.cc:80 +#: all-font-metrics.cc:153 #, c-format msgid "can't find font: `%s'" msgstr "" -#: all-font-metrics.cc:152 +#: all-font-metrics.cc:154 msgid "Loading default font" msgstr "" -#: all-font-metrics.cc:169 +#: all-font-metrics.cc:171 #, c-format msgid "can't find default font: `%s'" msgstr "" -#: all-font-metrics.cc:170 includable-lexer.cc:50 lookup.cc:81 scores.cc:109 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 #, c-format msgid "(search path: `%s')" msgstr "" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:173 parser.yy:1642 msgid "Giving up" msgstr "" -#: auto-change-iterator.cc:43 change-iterator.cc:60 +#: auto-change-iterator.cc:43 change-iterator.cc:59 #: part-combine-music-iterator.cc:85 msgid "Can't switch translators, I'm there already" msgstr "" -#: beam-engraver.cc:76 beam-engraver.cc:109 +#: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" -#: beam-engraver.cc:138 +#: beam-engraver.cc:158 msgid "already have a beam" msgstr "" -#: beam-engraver.cc:202 +#: beam-engraver.cc:224 msgid "unterminated beam" msgstr "" -#: beam-engraver.cc:240 chord-tremolo-engraver.cc:176 +#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 msgid "stem must have Rhythmic structure" msgstr "" -#: beam-engraver.cc:251 +#: beam-engraver.cc:274 msgid "stem doesn't fit in beam" msgstr "" -#: beam-engraver.cc:252 +#: beam-engraver.cc:275 msgid "beam was started here" msgstr "" -#: beam.cc:84 +#: beam.cc:83 msgid "beam has less than two stems" msgstr "" -#: beam.cc:511 +#: beam.cc:506 msgid "weird beam vertical offset" msgstr "" -#: break-align-item.cc:119 +#: break-align-item.cc:131 #, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "" -#: change-iterator.cc:22 +#: change-iterator.cc:21 #, c-format msgid "can't change `%s' to `%s'" msgstr "" @@ -175,15 +187,15 @@ msgstr "" #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:79 +#: change-iterator.cc:78 msgid "I'm one myself" msgstr "" -#: change-iterator.cc:82 +#: change-iterator.cc:81 msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:115 +#: chord-tremolo-engraver.cc:119 msgid "unterminated chord tremolo" msgstr "" @@ -191,35 +203,22 @@ msgstr "" msgid "no one to print a tremolos" msgstr "" -#: chord.cc:162 +#: chord.cc:365 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:386 +#: chord.cc:394 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: clef-engraver.cc:165 -msgid "unknown clef type" -msgstr "" - -#: collision.cc:118 +#: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "" -#: crescendo.cc:65 -msgid "crescendo" -msgstr "" - -#: crescendo.cc:65 -msgid "too small" -msgstr "" - -#: cross-staff.cc:22 -msgid "" -"minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" +#: cross-staff.cc:24 +msgid "not a forced distance; cross-staff spanners may be broken" msgstr "" #: debug.cc:26 @@ -234,19 +233,19 @@ msgstr "" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:192 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:220 msgid "already have a crescendo" msgstr "" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:221 msgid "already have a decrescendo" msgstr "" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:298 msgid "unterminated (de)crescendo" msgstr "" @@ -258,10 +257,14 @@ msgstr "" msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:64 +#: folded-repeat-iterator.cc:70 msgid "no one to print a repeat brace" msgstr "" +#: font-interface.cc:199 +msgid "couldn't find any font satisfying " +msgstr "" + #: gourlay-breaking.cc:157 msgid "No feasible line breaking found" msgstr "" @@ -270,10 +273,18 @@ msgstr "" msgid "no Grace context available" msgstr "" -#: grace-position-engraver.cc:94 +#: grace-position-engraver.cc:96 msgid "Unattached grace notes. Attaching to last musical column." msgstr "" +#: hairpin.cc:71 +msgid "decrescendo too small" +msgstr "" + +#: hairpin.cc:72 +msgid "crescendo too small" +msgstr "" + #: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "" @@ -287,17 +298,17 @@ msgstr "" msgid "wrong identifier type, expected: `%s'" msgstr "" -#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 -#: scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 +#: scores.cc:106 scores.cc:112 #, c-format msgid "can't find file: `%s'" msgstr "" -#: key-engraver.cc:101 key-performer.cc:54 +#: key-engraver.cc:103 key-performer.cc:72 msgid "FIXME: key change merge" msgstr "" -#: lily-guile.cc:119 +#: lily-guile.cc:141 #, c-format msgid "(load path: `%s')" msgstr "" @@ -307,48 +318,43 @@ msgstr "" msgid "Element count %d." msgstr "" -#: line-of-score.cc:255 paper-score.cc:79 +#: line-of-score.cc:253 paper-score.cc:77 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:269 +#: line-of-score.cc:267 msgid "Calculating column positions..." msgstr "" -#: lookup.cc:82 -msgid "Aborting" -msgstr "" - -#: lookup.cc:223 -#, c-format -msgid "Non-matching braces in text `%s', adding braces" -msgstr "" - -#: lyric-phrasing-engraver.cc:245 +#: lyric-phrasing-engraver.cc:269 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:250 +#: lyric-phrasing-engraver.cc:274 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 main.cc:93 -msgid "enable debugging output" -msgstr "" - -#: main.cc:76 +#: main.cc:75 msgid "EXT" msgstr "" -#: main.cc:76 +#: main.cc:75 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:77 main.cc:94 +#: main.cc:76 main.cc:95 msgid "this help" msgstr "" +#: main.cc:77 +msgid "FIELD" +msgstr "" + +#: main.cc:77 +msgid "write header field to BASENAME.FIELD" +msgstr "" + #: main.cc:78 msgid "DIR" msgstr "" @@ -357,7 +363,7 @@ msgstr "" msgid "add DIR to search path" msgstr "" -#: main.cc:79 main.cc:97 +#: main.cc:79 main.cc:98 msgid "FILE" msgstr "" @@ -389,7 +395,7 @@ msgstr "" msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:85 main.cc:102 +#: main.cc:85 main.cc:103 msgid "don't timestamp the output" msgstr "" @@ -397,7 +403,7 @@ msgstr "" msgid "switch on experimental features" msgstr "" -#: main.cc:87 main.cc:103 +#: main.cc:87 main.cc:104 msgid "print version number" msgstr "" @@ -405,23 +411,23 @@ msgstr "" msgid "verbose" msgstr "" -#: main.cc:89 main.cc:105 +#: main.cc:89 main.cc:106 msgid "show warranty and copyright" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:107 +#: main.cc:106 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "" -#: main.cc:109 +#: main.cc:108 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:113 +#: main.cc:112 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" @@ -432,16 +438,16 @@ msgstr "" msgid "Options:" msgstr "" -#: main.cc:123 +#: main.cc:122 msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:122 main.cc:142 +#: main.cc:123 main.cc:141 #, c-format msgid "Report bugs to %s" msgstr "" -#: main.cc:54 main.cc:150 +#: main.cc:55 main.cc:149 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -449,17 +455,16 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:61 main.cc:157 main.cc:169 +#: main.cc:62 main.cc:156 main.cc:168 #, c-format msgid "Copyright (c) %s by" msgstr "" -#. GNU GNU? -#: main.cc:167 -msgid "GNU LilyPond -- The GNU Project music typesetter" +#: main.cc:166 +msgid "GNU LilyPond -- The music typesetter" msgstr "" -#: main.cc:70 main.cc:175 +#: main.cc:71 main.cc:174 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" @@ -476,21 +481,21 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:310 +#: midi-item.cc:311 #, c-format msgid "no such instrument: `%s'" msgstr "" -#: midi-item.cc:365 +#: midi-item.cc:366 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "" -#: midi-item.cc:412 +#: midi-item.cc:413 msgid "silly duration" msgstr "" -#: midi-item.cc:425 +#: midi-item.cc:426 msgid "silly pitch" msgstr "" @@ -498,22 +503,34 @@ msgstr "" msgid "Error syncing file (disk full?)" msgstr "" -#: music-output-def.cc:71 +#: music-output-def.cc:72 #, c-format msgid "can't find `%s' context" msgstr "" -#: musical-request.cc:42 +#: music.cc:222 +msgid "ly_get_mus_property (): Not a Music" +msgstr "" + +#: music.cc:236 +msgid "ly_set_mus_property (): Not a symbol" +msgstr "" + +#: music.cc:248 +msgid "ly_set_mus_property (): not of type Music" +msgstr "" + +#: musical-request.cc:29 #, c-format msgid "Transposition by %s makes accidental larger than two" msgstr "" -#: my-lily-lexer.cc:124 +#: my-lily-lexer.cc:132 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "" -#: my-lily-lexer.cc:143 +#: my-lily-lexer.cc:151 #, c-format msgid "error at EOF: %s" msgstr "" @@ -526,20 +543,30 @@ msgstr "" msgid "Braces don't match" msgstr "" -#: paper-def.cc:149 +#: output-property-music-iterator.cc:20 request-chord-iterator.cc:76 +#, c-format +msgid "Junking request: `%s'" +msgstr "" + +#: paper-def.cc:116 #, c-format msgid "paper output to %s..." msgstr "" -#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 msgid ", at " msgstr "" -#: paper-score.cc:82 +#: paper-outputter.cc:239 +#, c-format +msgid "writing header field %s to %s..." +msgstr "" + +#: paper-score.cc:80 msgid "Preprocessing elements..." msgstr "" -#: paper-score.cc:107 +#: paper-score.cc:105 msgid "Outputting Score, defined at: " msgstr "" @@ -577,40 +604,43 @@ msgstr "" msgid "from musical definition: %s" msgstr "" -#: performance.cc:174 +#: performance.cc:161 #, c-format msgid "MIDI output to %s..." msgstr "" -#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 +#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 #: piano-pedal-performer.cc:87 #, c-format msgid "can't find start of piano pedal: %s" msgstr "" -#: property-engraver.cc:131 -msgid "Wrong type for property" +#: pitch.cc:25 +msgid "Pitch arguments out of range" msgstr "" -#: request-chord-iterator.cc:93 +#. warning () ? +#: property-engraver.cc:124 #, c-format -msgid "Junking request: `%s'" +msgid "" +"%s is deprecated. Use\n" +" \\property %s.%s \\override #'%s = #%s" msgstr "" -#: request-chord-iterator.cc:96 +#: property-engraver.cc:150 #, c-format -msgid "Huh? Not a Request: `%s'" +msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "" -#: rest-collision.cc:159 +#: rest-collision.cc:190 msgid "too many colliding rests" msgstr "" -#: rest-collision.cc:163 +#: rest-collision.cc:194 msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:149 +#: score-engraver.cc:177 #, c-format msgid "unbound spanner `%s'" msgstr "" @@ -642,12 +672,12 @@ msgstr "" msgid "Score contains errors; will not process it" msgstr "" -#: scores.cc:124 +#: scores.cc:122 #, c-format msgid "Now processing: `%s'" msgstr "" -#: script-engraver.cc:66 +#: script-engraver.cc:67 #, c-format msgid "Don't know how to interpret articulation `%s'" msgstr "" @@ -657,60 +687,67 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: sequential-music-iterator.cc:35 -msgid "Must stop before this music ends" -msgstr "" - -#: simple-music-iterator.cc:36 -#, c-format -msgid "Junking music: `%s'" -msgstr "" - -#: slur-engraver.cc:89 +#: slur-engraver.cc:128 msgid "unterminated slur" msgstr "" -#: slur-engraver.cc:104 +#: slur-engraver.cc:143 msgid "can't find start of slur" msgstr "" -#: slur.cc:48 +#: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "" -#: slur.cc:324 +#: slur.cc:379 msgid "Slur over rest?" msgstr "" -#: stem-engraver.cc:128 +#: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:116 +#: stem.cc:117 msgid "Weird stem size; check for narrow beams" msgstr "" +#: text-spanner-engraver.cc:95 +msgid "can't find start of text spanner" +msgstr "" + +#: text-spanner-engraver.cc:114 +msgid "already have a text spanner" +msgstr "" + +#: text-spanner-engraver.cc:167 +msgid "unterminated text spanner" +msgstr "" + +#: text-spanner.cc:115 +msgid "Text_spanner too small" +msgstr "" + #: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "" -#: tfm-reader.cc:143 +#: tfm-reader.cc:139 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:71 +#: tfm.cc:77 #, c-format -msgid "can't find ascii character: `%d'" +msgid "can't find ascii character: %d" msgstr "" -#: tie-engraver.cc:203 tie-performer.cc:109 +#: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "" -#: tie-engraver.cc:242 +#: tie-engraver.cc:231 msgid "lonely tie" msgstr "" @@ -718,15 +755,7 @@ msgstr "" msgid "no one to print a tuplet start bracket" msgstr "" -#: timing-translator.cc:36 -msgid "conflicting timing request" -msgstr "" - -#: timing-translator.cc:37 -msgid "This is the other timing request" -msgstr "" - -#: timing-translator.cc:65 +#: timing-translator.cc:38 #, c-format msgid "barcheck failed at: %s" msgstr "" @@ -755,207 +784,236 @@ msgstr "" msgid "can't find: `%s'" msgstr "" -#: translator-group.cc:142 +#: translator-group.cc:146 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "" -#: translator-group.cc:246 +#: translator-group.cc:231 #, c-format msgid "can't find or create: `%s'" msgstr "" -#: unfolded-repeat-iterator.cc:146 -msgid "no one to print a volta bracket" +#. warning () ? +#: translator-group.cc:405 +#, c-format +msgid "" +"Can't find property type-check for `%s'. Perhaps you made a typing error?" +msgstr "" + +#. warning () ? +#: translator-group.cc:420 +#, c-format +msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgstr "" + +#. programming_error? +#: translator-group.cc:440 +msgid "ly-get-trans-property: expecting a Translator_group argument" +msgstr "" + +#: volta-engraver.cc:87 +msgid "No volta spanner to end" +msgstr "" + +#: volta-engraver.cc:104 +msgid "Already have a volta spanner. Stopping that one prematurely." msgstr "" -#: parser.yy:61 +#: volta-engraver.cc:108 +msgid "Also have a stopped spanner. Giving up." +msgstr "" + +#: parser.yy:71 #, c-format msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:447 +#: parser.yy:467 msgid "Wrong type for property value" msgstr "" -#: parser.yy:633 +#: parser.yy:668 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:673 +#: parser.yy:732 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:678 +#: parser.yy:737 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1015 +#: parser.yy:1217 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1025 +#: parser.yy:1227 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1117 -#, c-format -msgid "Expecting %d arguments" +#: parser.yy:1348 +msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1133 -msgid "Must have 2 arguments for duration" +#: parser.yy:1359 +msgid "Must have duration object" msgstr "" -#: parser.yy:1140 parser.yy:1148 parser.yy:1383 +#: parser.yy:1368 parser.yy:1376 parser.yy:1640 msgid "Have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:1289 parser.yy:1309 +#: parser.yy:1525 parser.yy:1554 #, c-format msgid "not a duration: %d" msgstr "" -#: parser.yy:1318 +#: parser.yy:1563 msgid "Have to be in Note mode for notes" msgstr "" -#: parser.yy:1396 +#: parser.yy:1659 msgid "Have to be in Chord mode for chords" msgstr "" -#: parser.yy:1558 parser.yy:1576 +#: parser.yy:1821 parser.yy:1839 msgid "need integer number arg" msgstr "" -#: parser.yy:1562 +#: parser.yy:1825 msgid "Must be positive integer" msgstr "" -#: lexer.ll:159 +#: lexer.ll:164 msgid "EOF found inside a comment" msgstr "" -#: lexer.ll:173 +#: lexer.ll:178 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:197 +#: lexer.ll:202 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "" #. backup rule -#: lexer.ll:202 +#: lexer.ll:207 msgid "Missing end quote" msgstr "" #. backup rule -#: lexer.ll:224 lexer.ll:228 +#: lexer.ll:229 lexer.ll:233 msgid "white expected" msgstr "" -#: lexer.ll:236 +#: lexer.ll:241 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:432 +#: lexer.ll:433 #, c-format msgid "invalid character: `%c'" msgstr "" -#: lexer.ll:512 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" -#: lexer.ll:598 +#: lexer.ll:597 #, c-format -msgid "incorrect mudela version: %s (%s, %s)" +msgid "incorrect lilypond version: %s (%s, %s)" msgstr "" -#: lexer.ll:599 -msgid "Consider converting the input with the convert-mudela script" +#: lexer.ll:598 +msgid "Consider converting the input with the convert-ly script" msgstr "" -#: main.cc:92 +#: main.cc:93 msgid "write exact durations, e.g.: a4*385/384" msgstr "" -#: main.cc:95 +#: main.cc:94 +msgid "enable debugging output" +msgstr "" + +#: main.cc:96 msgid "ACC[:MINOR]" msgstr "" -#: main.cc:95 +#: main.cc:96 msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "" -#: main.cc:96 +#: main.cc:97 msgid "don't output tuplets, double dots or rests, smallest is 32" msgstr "" -#: main.cc:97 +#: main.cc:98 msgid "set FILE as default output" msgstr "" -#: main.cc:98 +#: main.cc:99 msgid "don't output tuplets" msgstr "" -#: main.cc:99 +#: main.cc:100 msgid "be quiet" msgstr "" -#: main.cc:100 +#: main.cc:101 msgid "don't output rests or skips" msgstr "" -#: main.cc:101 +#: main.cc:102 msgid "DUR" msgstr "" -#: main.cc:101 +#: main.cc:102 msgid "set smallest duration" msgstr "" -#: main.cc:104 +#: main.cc:105 msgid "be verbose" msgstr "" -#: main.cc:106 +#: main.cc:107 msgid "assume no double dotted notes" msgstr "" -#: main.cc:113 +#: main.cc:114 #, c-format msgid "Usage: %s [OPTION]... [FILE]" msgstr "" -#: main.cc:115 +#: main.cc:116 msgid "Translate MIDI-file to mudela" msgstr "" -#: main.cc:129 +#: main.cc:130 #, c-format msgid "no_double_dots: %d\n" msgstr "" -#: main.cc:131 +#: main.cc:132 #, c-format msgid "no_rests: %d\n" msgstr "" -#: main.cc:133 +#: main.cc:134 #, c-format msgid "no_quantify_b_s: %d\n" msgstr "" -#: main.cc:135 +#: main.cc:136 #, c-format msgid "no_smaller_than: %d (1/%d)\n" msgstr "" -#: main.cc:138 +#: main.cc:139 #, c-format msgid "no_tuplets: %d\n" msgstr "" @@ -1009,7 +1067,7 @@ msgstr "" msgid "invalid track length" msgstr "" -#: mudela-item.cc:160 +#: mudela-item.cc:161 #, c-format msgid "#32 in quarter: %d" msgstr "" diff --git a/po/nl.po b/po/nl.po index e0f7d4173c..be49057db7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.59\n" -"POT-Creation-Date: 2000-09-17 12:01+0200\n" +"POT-Creation-Date: 2000-12-17 15:35+0100\n" "PO-Revision-Date: 2000-06-09 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -23,39 +23,39 @@ msgstr "" "--add-comments --keyword=_\n" "Files: bow.cc int.cc\n" -#: data-file.cc:52 +#: data-file.cc:54 msgid "EOF in a string" msgstr "EOF in een string" -#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "waarschuwing: " -#: dstream.cc:187 +#: dstream.cc:186 msgid "not enough fields in Dstream init" msgstr "onvoldoende velden in Dstream init" -#: getopt-long.cc:143 +#: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" msgstr "optie `%s' vereist een argument" -#: getopt-long.cc:147 +#: getopt-long.cc:149 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "optie `%s' staat geen argument toe" -#: getopt-long.cc:151 +#: getopt-long.cc:153 #, c-format msgid "unrecognized option: `%s'" msgstr "onbekende optie: `%s'" -#: getopt-long.cc:158 +#: getopt-long.cc:160 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "onjuist argument: `%s' voor optie `%s'" -#: input.cc:90 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:9 warn.cc:17 msgid "error: " msgstr "fout: " @@ -72,7 +72,7 @@ msgid "can't map file" msgstr "kan bestand niet inkaarten" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "kan bestand niet openen: `%s'" @@ -82,98 +82,112 @@ msgstr "kan bestand niet openen: `%s'" msgid "Huh? Got %d, expected %d characters" msgstr "Huh? Kreeg %d, verwachtte %d tekens" -#: text-stream.cc:9 +#: text-stream.cc:10 msgid "" msgstr "" -#: warn.cc:35 +#: warn.cc:36 msgid "programming error: " msgstr "programmeerfout: " -#: warn.cc:35 +#: warn.cc:36 msgid " (Continuing; cross thumbs)" msgstr " (Ga verder; duim maar)" -#: afm.cc:51 +#: afm.cc:53 #, c-format msgid "can't find character number: %d" msgstr "kan teken niet vinden met nummer: %d" -#: afm.cc:66 +#: afm.cc:68 #, c-format msgid "can't find character called: `%s'" msgstr "kan teken niet vinden genaamd: `%s'" -#: afm.cc:96 -msgid "Error parsing AFM file" -msgstr "Fout bij ontleden AFM bestand" +#: afm.cc:113 +#, c-format +msgid "Error parsing AFM file: %s" +msgstr "Fout bij ontleden AFM bestand: %s" + +#: all-font-metrics.cc:87 +#, c-format +msgid "checksum mismatch for font file: `%s'" +msgstr "checksum fout van font bestand: `%s'" + +#: all-font-metrics.cc:92 +msgid "" +" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " +"to show font paths." +msgstr "" +"Bouw alle .afm bestanden opnieuw en verwijder alle .pk en .tfm bestanden. " +"Voer nog eens uit met -V om font paden te tonen." -#: all-font-metrics.cc:151 lookup.cc:80 +#: all-font-metrics.cc:153 #, c-format msgid "can't find font: `%s'" msgstr "kan font niet vinden: `%s'" -#: all-font-metrics.cc:152 +#: all-font-metrics.cc:154 msgid "Loading default font" msgstr "Laad verstek font" -#: all-font-metrics.cc:169 +#: all-font-metrics.cc:171 #, c-format msgid "can't find default font: `%s'" msgstr "kan verstekfont niet vinden: `%s'" -#: all-font-metrics.cc:170 includable-lexer.cc:50 lookup.cc:81 scores.cc:109 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 #, c-format msgid "(search path: `%s')" msgstr "(zoekpad: `%s')" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:173 parser.yy:1642 msgid "Giving up" msgstr "Geef op" -#: auto-change-iterator.cc:43 change-iterator.cc:60 +#: auto-change-iterator.cc:43 change-iterator.cc:59 #: part-combine-music-iterator.cc:85 msgid "Can't switch translators, I'm there already" msgstr "Kan niet wisselen van vertaler, ben al hier" -#: beam-engraver.cc:76 beam-engraver.cc:109 +#: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "kan start van waardestreep niet vinden" -#: beam-engraver.cc:138 +#: beam-engraver.cc:158 msgid "already have a beam" msgstr "heb al een waardestreep" -#: beam-engraver.cc:202 +#: beam-engraver.cc:224 msgid "unterminated beam" msgstr "onbeëindigde waardestreep" -#: beam-engraver.cc:240 chord-tremolo-engraver.cc:176 +#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 msgid "stem must have Rhythmic structure" msgstr "stok moet Ritmische structuur hebben" -#: beam-engraver.cc:251 +#: beam-engraver.cc:274 msgid "stem doesn't fit in beam" msgstr "stok past niet in waardestreep" -#: beam-engraver.cc:252 +#: beam-engraver.cc:275 msgid "beam was started here" msgstr "waardestreep werd hier gestart" -#: beam.cc:84 +#: beam.cc:83 msgid "beam has less than two stems" msgstr "waardestreep heeft minder dan twee stokken" -#: beam.cc:511 +#: beam.cc:506 msgid "weird beam vertical offset" msgstr "rare verticale waardestreep verplaatsing" -#: break-align-item.cc:119 +#: break-align-item.cc:131 #, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "onbekend ruimte paar `%s', `%s'" -#: change-iterator.cc:22 +#: change-iterator.cc:21 #, c-format msgid "can't change `%s' to `%s'" msgstr "kan `%s' niet in `%s' veranderen" @@ -184,15 +198,15 @@ msgstr "kan `%s' niet in `%s' veranderen" #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:79 +#: change-iterator.cc:78 msgid "I'm one myself" msgstr "Ben er zelf een" -#: change-iterator.cc:82 +#: change-iterator.cc:81 msgid "none of these in my family" msgstr "geen van deze in mijn gezin" -#: chord-tremolo-engraver.cc:115 +#: chord-tremolo-engraver.cc:119 msgid "unterminated chord tremolo" msgstr "onbeëindigd akkoordtremolo" @@ -200,38 +214,23 @@ msgstr "onbe msgid "no one to print a tremolos" msgstr "niemand om tremolos af te drukken" -#: chord.cc:162 +#: chord.cc:365 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" -#: chord.cc:386 +#: chord.cc:394 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s" -#: clef-engraver.cc:165 -msgid "unknown clef type" -msgstr "onbekend type sleutel" - -#: collision.cc:118 +#: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Te veel botsende nootkolommen. Negeer ze." -#: crescendo.cc:65 -msgid "crescendo" -msgstr "crescendo" - -#: crescendo.cc:65 -msgid "too small" -msgstr "te klein" - -#: cross-staff.cc:22 -msgid "" -"minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" -msgstr "" -"minVerticalAlign != maxVerticalAlign: waardestrepen/bindingsbogen tussen " -"notenbalken kunnen breken" +#: cross-staff.cc:24 +msgid "not a forced distance; cross-staff spanners may be broken" +msgstr "geen opgelegde aftstand: spanners tussen notenbalken kunnen breken" #: debug.cc:26 msgid "floating point exception" @@ -245,19 +244,19 @@ msgstr "kan geheugen controle niet zetten!" msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:192 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "kan start van (de)crescendo niet vinden" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:220 msgid "already have a crescendo" msgstr "heb al een crescendo" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:221 msgid "already have a decrescendo" msgstr "heb al een decrescendo" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:298 msgid "unterminated (de)crescendo" msgstr "onbeëindigd (de)crescendo" @@ -270,10 +269,14 @@ msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" "Niets om extender aan linkerkant aan vast te maken. Negeer extender verzoek." -#: folded-repeat-iterator.cc:64 +#: folded-repeat-iterator.cc:70 msgid "no one to print a repeat brace" msgstr "niemand om een herhalings haak af te drukken" +#: font-interface.cc:199 +msgid "couldn't find any font satisfying " +msgstr "kon geen enkel font vinden dat voldoet aan " + #: gourlay-breaking.cc:157 msgid "No feasible line breaking found" msgstr "Geen doenbare regelafbreuk gevonden" @@ -282,10 +285,18 @@ msgstr "Geen doenbare regelafbreuk gevonden" msgid "no Grace context available" msgstr "geen Grace context voor handen" -#: grace-position-engraver.cc:94 +#: grace-position-engraver.cc:96 msgid "Unattached grace notes. Attaching to last musical column." msgstr "Losse grace noten. Maak ze vast aan vorige muziekale kolom." +#: hairpin.cc:71 +msgid "decrescendo too small" +msgstr "decrescendo te klein" + +#: hairpin.cc:72 +msgid "crescendo too small" +msgstr "crescendo te klein" + #: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "onafgesloten waardestreep" @@ -300,17 +311,17 @@ msgstr "" msgid "wrong identifier type, expected: `%s'" msgstr "verkeerd type identifier, verwachtte: `%s'" -#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 -#: scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 +#: scores.cc:106 scores.cc:112 #, c-format msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" -#: key-engraver.cc:101 key-performer.cc:54 +#: key-engraver.cc:103 key-performer.cc:72 msgid "FIXME: key change merge" msgstr "MAAKME: toonsoort sleutel samenvoeging" -#: lily-guile.cc:119 +#: lily-guile.cc:141 #, c-format msgid "(load path: `%s')" msgstr "(zoekpad: `%s')" @@ -320,48 +331,43 @@ msgstr "(zoekpad: `%s')" msgid "Element count %d." msgstr "Aantal elementen: %d." -#: line-of-score.cc:255 paper-score.cc:79 +#: line-of-score.cc:253 paper-score.cc:77 #, c-format msgid "Element count %d " msgstr "Aantal elementen: %d." -#: line-of-score.cc:269 +#: line-of-score.cc:267 msgid "Calculating column positions..." msgstr "Berekenen van kolomposities..." -#: lookup.cc:82 -msgid "Aborting" -msgstr "Breek af" - -#: lookup.cc:223 -#, c-format -msgid "Non-matching braces in text `%s', adding braces" -msgstr "Ongepaarde haakjes in tekst `%s', voeg haakjes toe" - -#: lyric-phrasing-engraver.cc:245 +#: lyric-phrasing-engraver.cc:269 msgid "lyrics found without any matching notehead" msgstr "liedteksten gevonden zonder bijbehorend nootbolletje" -#: lyric-phrasing-engraver.cc:250 +#: lyric-phrasing-engraver.cc:274 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "Huh? Melismatische noot blijkt bijbehorende liedtekst te hebben." -#: main.cc:75 main.cc:93 -msgid "enable debugging output" -msgstr "maak ontluis uitvoer mogelijk" - -#: main.cc:76 +#: main.cc:75 msgid "EXT" msgstr "EXT" -#: main.cc:76 +#: main.cc:75 msgid "use output format EXT (scm, ps, tex or as)" msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)" -#: main.cc:77 main.cc:94 +#: main.cc:76 main.cc:95 msgid "this help" msgstr "deze hulp" +#: main.cc:77 +msgid "FIELD" +msgstr "VELD" + +#: main.cc:77 +msgid "write header field to BASENAME.FIELD" +msgstr "schrijf kop veld naar BASISNAAM.VELD" + #: main.cc:78 msgid "DIR" msgstr "DIR" @@ -370,7 +376,7 @@ msgstr "DIR" msgid "add DIR to search path" msgstr "voeg DIR toe aan zoekpad" -#: main.cc:79 main.cc:97 +#: main.cc:79 main.cc:98 msgid "FILE" msgstr "BESTAND" @@ -402,7 +408,7 @@ msgstr "toon veranderingen voor relatieve mode" msgid "inhibit file output naming and exporting" msgstr "verbied naamgeving van uitvoer bestand en exportering" -#: main.cc:85 main.cc:102 +#: main.cc:85 main.cc:103 msgid "don't timestamp the output" msgstr "geen tijdsstempel in de uitvoer" @@ -410,7 +416,7 @@ msgstr "geen tijdsstempel in de uitvoer" msgid "switch on experimental features" msgstr "zet experimentele kunstjes aan" -#: main.cc:87 main.cc:103 +#: main.cc:87 main.cc:104 msgid "print version number" msgstr "druk versienummer af" @@ -418,23 +424,23 @@ msgstr "druk versienummer af" msgid "verbose" msgstr "breedsprakig" -#: main.cc:89 main.cc:105 +#: main.cc:89 main.cc:106 msgid "show warranty and copyright" msgstr "toon garantie en auteursrechten" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:107 +#: main.cc:106 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." -#: main.cc:109 +#: main.cc:108 msgid "Typeset music and or play MIDI from FILE" msgstr "Zet muziek en of speel MIDI van BESTAND" -#: main.cc:113 +#: main.cc:112 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" @@ -448,18 +454,18 @@ msgstr "" msgid "Options:" msgstr "Opties:" -#: main.cc:123 +#: main.cc:122 msgid "This binary was compiled with the following options:" msgstr "Dit programma is gecompileerd met de volgende instellingen:" -#: main.cc:122 main.cc:142 +#: main.cc:123 main.cc:141 #, c-format msgid "Report bugs to %s" msgstr "" "Meld luizen in het programma aan %s;\n" "meld onjuistheden in de vertaling aan of " -#: main.cc:54 main.cc:150 +#: main.cc:55 main.cc:149 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -471,17 +477,16 @@ msgstr "" "onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n" "informatie.\n" -#: main.cc:61 main.cc:157 main.cc:169 +#: main.cc:62 main.cc:156 main.cc:168 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " -#. GNU GNU? -#: main.cc:167 -msgid "GNU LilyPond -- The GNU Project music typesetter" -msgstr "GNU LilyPond -- De Muziekzetter van het GNU Project" +#: main.cc:166 +msgid "GNU LilyPond -- The music typesetter" +msgstr "GNU LilyPond -- De Muziekzetter" -#: main.cc:70 main.cc:175 +#: main.cc:71 main.cc:174 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" @@ -511,21 +516,21 @@ msgstr "" "zoniet, schrijf dan naar de Free Software Foundation, Inc.,\n" "675 Mass Ave, Cambridge, MA 02139, USA.\n" -#: midi-item.cc:310 +#: midi-item.cc:311 #, c-format msgid "no such instrument: `%s'" msgstr "geen dergelijk instrument: `%s'" -#: midi-item.cc:365 +#: midi-item.cc:366 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "vreemde toonsoort: %d mollen, %d kruizen" -#: midi-item.cc:412 +#: midi-item.cc:413 msgid "silly duration" msgstr "rare duur" -#: midi-item.cc:425 +#: midi-item.cc:426 msgid "silly pitch" msgstr "rare toonhoogte" @@ -533,22 +538,34 @@ msgstr "rare toonhoogte" msgid "Error syncing file (disk full?)" msgstr "Fout by synchroniseren van bestand (disk vol?)" -#: music-output-def.cc:71 +#: music-output-def.cc:72 #, c-format msgid "can't find `%s' context" msgstr "kan `%s' context niet vinden" -#: musical-request.cc:42 +#: music.cc:222 +msgid "ly_get_mus_property (): Not a Music" +msgstr "ly_get_mus_property (): Geen Muziek" + +#: music.cc:236 +msgid "ly_set_mus_property (): Not a symbol" +msgstr "ly_set_mus_property (): Geen symbool" + +#: music.cc:248 +msgid "ly_set_mus_property (): not of type Music" +msgstr "ly_set_mus_property (): niet van type Muziek" + +#: musical-request.cc:29 #, c-format msgid "Transposition by %s makes accidental larger than two" msgstr "Transponering van %s geeft tripel kruizen/mollen" -#: my-lily-lexer.cc:124 +#: my-lily-lexer.cc:132 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Identifier naam is een sleutelwoord: `%s'" -#: my-lily-lexer.cc:143 +#: my-lily-lexer.cc:151 #, c-format msgid "error at EOF: %s" msgstr "fout bij EOF: %s" @@ -561,20 +578,30 @@ msgstr "Ontleden..." msgid "Braces don't match" msgstr "Haakjes paren niet" -#: paper-def.cc:149 +#: output-property-music-iterator.cc:20 request-chord-iterator.cc:76 +#, c-format +msgid "Junking request: `%s'" +msgstr "Schroot verzoek: `%s'" + +#: paper-def.cc:116 #, c-format msgid "paper output to %s..." msgstr "papier uitvoer naar %s..." -#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 msgid ", at " msgstr ", bij " -#: paper-score.cc:82 +#: paper-outputter.cc:239 +#, c-format +msgid "writing header field %s to %s..." +msgstr "Schijven van kop veld %s naar bestand %s..." + +#: paper-score.cc:80 msgid "Preprocessing elements..." msgstr "Voorbewerken van elementen..." -#: paper-score.cc:107 +#: paper-score.cc:105 msgid "Outputting Score, defined at: " msgstr "Uitvoer van Score, gedefinieerd op: " @@ -585,10 +612,12 @@ msgstr "Uitvoer van Score, gedefinieerd op: " #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. #: part-combine-music-iterator.cc:104 +#, c-format msgid "I'm one myself: `%s'" msgstr "Ben er zelf een: `%s'" #: part-combine-music-iterator.cc:107 +#, c-format msgid "none of these in my family: `%s'" msgstr "geen van deze in mijn gezin: `%s'" @@ -610,40 +639,45 @@ msgstr "Automatisch gegenerederd" msgid "from musical definition: %s" msgstr "van muzikale definitie: %s" -#: performance.cc:174 +#: performance.cc:161 #, c-format msgid "MIDI output to %s..." msgstr "MIDI uitvoer naar %s..." -#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 +#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 #: piano-pedal-performer.cc:87 #, c-format msgid "can't find start of piano pedal: %s" msgstr "kan start van piano pedaal niet vinden: %s" -#: property-engraver.cc:131 -msgid "Wrong type for property" -msgstr "Verkeerd type voor property" +#: pitch.cc:25 +msgid "Pitch arguments out of range" +msgstr "Toonhoogte argumenten buiten schaal" -#: request-chord-iterator.cc:93 +#. warning () ? +#: property-engraver.cc:124 #, c-format -msgid "Junking request: `%s'" -msgstr "Schroot verzoek: `%s'" +msgid "" +"%s is deprecated. Use\n" +" \\property %s.%s \\override #'%s = #%s" +msgstr "" +"%s is verouderd. Gebruik\n" +" \\property %s.%s \\override #'%s = #%s" -#: request-chord-iterator.cc:96 +#: property-engraver.cc:150 #, c-format -msgid "Huh? Not a Request: `%s'" -msgstr "Huh? Geen Request: `%s'" +msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" +msgstr "Verkeerd type voor property: %s, type: %s, gevonden: %s, type: %s" -#: rest-collision.cc:159 +#: rest-collision.cc:190 msgid "too many colliding rests" msgstr "te veel botsende rusten" -#: rest-collision.cc:163 +#: rest-collision.cc:194 msgid "too many notes for rest collision" msgstr "te veel noten voor bosting met rusten" -#: score-engraver.cc:149 +#: score-engraver.cc:177 #, c-format msgid "unbound spanner `%s'" msgstr "ongebonden spanner `%s'" @@ -675,12 +709,12 @@ msgstr "Schijven van afhankelijkheden bestand: `%s'..." msgid "Score contains errors; will not process it" msgstr "Partituur bevat fouten; zal hem niet verwerken" -#: scores.cc:124 +#: scores.cc:122 #, c-format msgid "Now processing: `%s'" msgstr "Nu wordt verwerkt: `%s'" -#: script-engraver.cc:66 +#: script-engraver.cc:67 #, c-format msgid "Don't know how to interpret articulation `%s'" msgstr "Weet niet hoe articulatie te vertolken `%s'" @@ -690,61 +724,68 @@ msgstr "Weet niet hoe articulatie te vertolken `%s'" msgid "Separation_item: I've been drinking too much" msgstr "Separation_item: Ik heb te veel gedronken" -#: sequential-music-iterator.cc:35 -msgid "Must stop before this music ends" -msgstr "Moet stoppen voordat deze muziek ophoudt" - -#: simple-music-iterator.cc:36 -#, c-format -msgid "Junking music: `%s'" -msgstr "Schroot muziek: `%s'" - -#: slur-engraver.cc:89 +#: slur-engraver.cc:128 msgid "unterminated slur" msgstr "onbeëindigde bindingsboog" -#: slur-engraver.cc:104 +#: slur-engraver.cc:143 msgid "can't find start of slur" msgstr "kan start van bindingsboog niet vinden" -#: slur.cc:48 +#: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "Zet bindingsboog over rust. Negeer." -#: slur.cc:324 +#: slur.cc:379 msgid "Slur over rest?" msgstr "Boogje over rust?" -#: stem-engraver.cc:128 +#: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Voeg noot bolletje toe aan onverenigbare stok (type = %d)" -#: stem.cc:116 +#: stem.cc:117 msgid "Weird stem size; check for narrow beams" msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" +#: text-spanner-engraver.cc:95 +msgid "can't find start of text spanner" +msgstr "kan start van tekst spanner niet vinden" + +#: text-spanner-engraver.cc:114 +msgid "already have a text spanner" +msgstr "heb al een tekst spanner" + +#: text-spanner-engraver.cc:167 +msgid "unterminated text spanner" +msgstr "onbeëindigde tekst spanner" + +#: text-spanner.cc:115 +msgid "Text_spanner too small" +msgstr "Text_spanner te klein" + #: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "TFM kop van `%s' heeft slechts %u woord(en)" -#: tfm-reader.cc:143 +#: tfm-reader.cc:139 #, c-format 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:71 +#: tfm.cc:77 #, c-format -msgid "can't find ascii character: `%d'" -msgstr "kan ascii teken niet vinden: `%d'" +msgid "can't find ascii character: %d" +msgstr "kan ascii teken niet vinden: %d" -#: tie-engraver.cc:203 tie-performer.cc:109 +#: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "Geen overbindingen geschapen!" -#: tie-engraver.cc:242 +#: tie-engraver.cc:231 msgid "lonely tie" msgstr "eenzame overbinding" @@ -752,15 +793,7 @@ msgstr "eenzame overbinding" msgid "no one to print a tuplet start bracket" msgstr "niemand om een x-ool start haak af te drukken" -#: timing-translator.cc:36 -msgid "conflicting timing request" -msgstr "strijdig timing verzoek" - -#: timing-translator.cc:37 -msgid "This is the other timing request" -msgstr "Dit is het andere timing verzoek" - -#: timing-translator.cc:65 +#: timing-translator.cc:38 #, c-format msgid "barcheck failed at: %s" msgstr "maatstreep controle gefaald op: %s" @@ -768,7 +801,7 @@ msgstr "maatstreep controle gefaald op: %s" #: translator-ctors.cc:40 #, c-format msgid "unknown translator: `%s'" -msgstr "onbekende papier varanderlijke: `%s'" +msgstr "onbekende translator: `%s'" #: translator-def.cc:96 msgid "Program has no such type" @@ -789,211 +822,241 @@ msgstr "Voeg translator niet toe: `%s'" msgid "can't find: `%s'" msgstr "kan niet vinden: `%s'" -#: translator-group.cc:142 +#: translator-group.cc:146 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "kan niet vinden of scheppen `%s' genaamd `%s'" -#: translator-group.cc:246 +#: translator-group.cc:231 #, c-format msgid "can't find or create: `%s'" msgstr "kan niet vinden of scheppen: `%s'" -#: unfolded-repeat-iterator.cc:146 -msgid "no one to print a volta bracket" -msgstr "niemand om een volta haak af te drukken" +#. warning () ? +#: translator-group.cc:405 +#, c-format +msgid "" +"Can't find property type-check for `%s'. Perhaps you made a typing error?" +msgstr "" +"Kan geen type-controle vinden voor property `%s'. Misschien een tiepfout?" + +#. warning () ? +#: translator-group.cc:420 +#, c-format +msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgstr "Type contole gefaald voor `%s', waarde `%s' moet type hebben: `%s'" + +#. programming_error? +#: translator-group.cc:440 +msgid "ly-get-trans-property: expecting a Translator_group argument" +msgstr "ly-get-trans-property: verwacht een Translator_group argument" + +#: volta-engraver.cc:87 +msgid "No volta spanner to end" +msgstr "Geen volta spanner te beëindigen" + +#: volta-engraver.cc:104 +msgid "Already have a volta spanner. Stopping that one prematurely." +msgstr "Heb al een volta spanner. Stop die nu voortijdig." -#: parser.yy:61 +#: volta-engraver.cc:108 +msgid "Also have a stopped spanner. Giving up." +msgstr "Heb ook al een gestopte spanner. Geef op." + +#: parser.yy:71 #, c-format msgid "Oldest supported input version: %s" msgstr "Oudst ondersteunde invoerversie: %s" -#: parser.yy:447 +#: parser.yy:467 msgid "Wrong type for property value" msgstr "Verkeerd type voor property waarde" -#: parser.yy:633 +#: parser.yy:668 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" "Meer alternatieven dan herhalingen. Schroot overvloedige alternatieven." -#: parser.yy:673 +#: parser.yy:732 msgid "Second argument must be a symbol" msgstr "Tweede argument moet een symbool zijn" -#: parser.yy:678 +#: parser.yy:737 msgid "First argument must be a procedure taking 1 argument" msgstr "Eerste argument moet een procedure zijn met 1 argument" -#: parser.yy:1015 +#: parser.yy:1217 msgid "Expecting string as script definition" msgstr "Verwacht string voor script definitie" -#: parser.yy:1025 +#: parser.yy:1227 msgid "Can't specify direction for this request" msgstr "Kan richting voor dit verzoek niet specificeren" -#: parser.yy:1117 -#, c-format -msgid "Expecting %d arguments" -msgstr "Verwacht %d argumenten" +#: parser.yy:1348 +msgid "Expecting musical-pitch value" +msgstr "Verwacht musical-pitch waarde" -#: parser.yy:1133 -msgid "Must have 2 arguments for duration" -msgstr "Moet 2 argumenten hebben voor duur" +#: parser.yy:1359 +msgid "Must have duration object" +msgstr "Moet duur object hebben" -#: parser.yy:1140 parser.yy:1148 parser.yy:1383 +#: parser.yy:1368 parser.yy:1376 parser.yy:1640 msgid "Have to be in Lyric mode for lyrics" msgstr "Moet in Lyric modus zijn voor liedteksten" -#: parser.yy:1289 parser.yy:1309 +#: parser.yy:1525 parser.yy:1554 #, c-format msgid "not a duration: %d" msgstr "geen duur: %d" -#: parser.yy:1318 +#: parser.yy:1563 msgid "Have to be in Note mode for notes" msgstr "Moet in Note modus zijn voor noten" -#: parser.yy:1396 +#: parser.yy:1659 msgid "Have to be in Chord mode for chords" msgstr "Moet in Chord modus zijn voor accoorden" -#: parser.yy:1558 parser.yy:1576 +#: parser.yy:1821 parser.yy:1839 msgid "need integer number arg" msgstr "heb integer getal arg nogig" -#: parser.yy:1562 +#: parser.yy:1825 msgid "Must be positive integer" msgstr "Moet positieve integer zijn" -#: lexer.ll:159 +#: lexer.ll:164 msgid "EOF found inside a comment" msgstr "EOF gevonden in een kommentaar" -#: lexer.ll:173 +#: lexer.ll:178 msgid "\\maininput disallowed outside init files" msgstr "\\maininput niet toegestaan buiten init bestanden" -#: lexer.ll:197 +#: lexer.ll:202 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "verkeerde of ongedefiniëerde identifier: `%s'" #. backup rule -#: lexer.ll:202 +#: lexer.ll:207 msgid "Missing end quote" msgstr "Aanhalingsteken sluiten mist" #. backup rule -#: lexer.ll:224 lexer.ll:228 +#: lexer.ll:229 lexer.ll:233 msgid "white expected" msgstr "wit verwacht" -#: lexer.ll:236 +#: lexer.ll:241 msgid "Can't evaluate Scheme in safe mode" msgstr "Kan Scheme niet evalueren in veilige modus" -#: lexer.ll:432 +#: lexer.ll:433 #, c-format msgid "invalid character: `%c'" msgstr "ongeldig teken: `%c'" -#: lexer.ll:512 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "onbekende ontsnapte string: `\\%s'" -#: lexer.ll:598 +#: lexer.ll:597 #, c-format -msgid "incorrect mudela version: %s (%s, %s)" -msgstr "verkeerde mudela versie: %s (%s, %s)" +msgid "incorrect lilypond version: %s (%s, %s)" +msgstr "verkeerde lilypond versie: %s (%s, %s)" -#: lexer.ll:599 -msgid "Consider converting the input with the convert-mudela script" -msgstr "Overweeg de invoer te converteren met het convert-mudela script" +#: lexer.ll:598 +msgid "Consider converting the input with the convert-ly script" +msgstr "Overweeg de invoer te converteren met het convert-ly script" -#: main.cc:92 +#: main.cc:93 msgid "write exact durations, e.g.: a4*385/384" msgstr "schrijf exacte duren, bijv.: a4*385/384" -#: main.cc:95 +#: main.cc:94 +msgid "enable debugging output" +msgstr "maak ontluis uitvoer mogelijk" + +#: main.cc:96 msgid "ACC[:MINOR]" msgstr "ACC[:MINEUR]" -#: main.cc:95 +#: main.cc:96 msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "zet toonsoort: ACC +kruizen/-mollen; :1 mineur" -#: main.cc:96 +#: main.cc:97 msgid "don't output tuplets, double dots or rests, smallest is 32" msgstr "maak geen n-olen of dubbel gepunkteerd, kortste is 32" -#: main.cc:97 +#: main.cc:98 msgid "set FILE as default output" msgstr "zet BESTAND als verstek uitvoer" -#: main.cc:98 +#: main.cc:99 msgid "don't output tuplets" msgstr "maak geen n-olen" -#: main.cc:99 +#: main.cc:100 msgid "be quiet" msgstr "wees stil" -#: main.cc:100 +#: main.cc:101 msgid "don't output rests or skips" msgstr "maak geen rusten of skips" -#: main.cc:101 +#: main.cc:102 msgid "DUR" msgstr "DUUR" -#: main.cc:101 +#: main.cc:102 msgid "set smallest duration" msgstr "zet kortste duur" -#: main.cc:104 +#: main.cc:105 msgid "be verbose" msgstr "wees breedsprakig" -#: main.cc:106 +#: main.cc:107 msgid "assume no double dotted notes" msgstr "ga niet uit van dubbel gepunteerde noten" -#: main.cc:113 +#: main.cc:114 #, c-format msgid "Usage: %s [OPTION]... [FILE]" msgstr "Gebruik: %s [OPTIE]... [BESTAND]" -#: main.cc:115 +#: main.cc:116 msgid "Translate MIDI-file to mudela" msgstr "Vertaal MIDI-bestand naar mudela" -#: main.cc:129 +#: main.cc:130 #, c-format msgid "no_double_dots: %d\n" -msgstr "" +msgstr "no_double_dots: %d\n" -#: main.cc:131 +#: main.cc:132 #, c-format msgid "no_rests: %d\n" -msgstr "" +msgstr "no_rests: %d\n" -#: main.cc:133 +#: main.cc:134 #, c-format msgid "no_quantify_b_s: %d\n" -msgstr "" +msgstr "no_quantify_b_s: %d\n" -#: main.cc:135 +#: main.cc:136 #, c-format msgid "no_smaller_than: %d (1/%d)\n" -msgstr "" +msgstr "no_smaller_than: %d (1/%d)\n" -#: main.cc:138 +#: main.cc:139 #, c-format msgid "no_tuplets: %d\n" -msgstr "" +msgstr "no_tuplets: %d\n" #: midi-parser.cc:64 msgid "zero length string encountered" @@ -1044,7 +1107,7 @@ msgstr "MIDI spoor verwacht" msgid "invalid track length" msgstr "ongeldige spoorlengte" -#: mudela-item.cc:160 +#: mudela-item.cc:161 #, c-format msgid "#32 in quarter: %d" msgstr "#32 in kwart: %d" diff --git a/po/ru.po b/po/ru.po index c3f3dcae8f..daa64e7b53 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-09-17 12:01+0200\n" +"POT-Creation-Date: 2000-12-17 15:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -14,39 +14,39 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: ENCODING\n" -#: data-file.cc:52 +#: data-file.cc:54 msgid "EOF in a string" msgstr "EOF × ÓÔÒÏËÅ" -#: data-file.cc:116 input.cc:85 midi-parser.cc:100 warn.cc:22 +#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " -#: dstream.cc:187 +#: dstream.cc:186 msgid "not enough fields in Dstream init" msgstr "ÎÅ ÄÏÓÔÁÔÏÞÎÏ ÐÏÌÅÊ × Dstream init" -#: getopt-long.cc:143 +#: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" msgstr "ÏÐÃÉÑ `%s' ÔÒÅÂÕÅÔ ÁÒÇÕÍÅÎÔ" -#: getopt-long.cc:147 +#: getopt-long.cc:149 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "ÏÐÃÉÑ `%s' ÎÅ ÄÏÐÕÓËÁÅÔ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÁÒÇÕÍÅÎÔÁ" -#: getopt-long.cc:151 +#: getopt-long.cc:153 #, c-format msgid "unrecognized option: `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ: `%s'" -#: getopt-long.cc:158 +#: getopt-long.cc:160 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ ÏÐÃÉÉ `%s'" -#: input.cc:90 warn.cc:8 warn.cc:16 +#: input.cc:90 warn.cc:9 warn.cc:17 msgid "error: " msgstr "ÏÛÉÂËÁ: " @@ -63,7 +63,7 @@ msgid "can't map file" msgstr "ÎÅ ÍÏÇÕ ÏÔÏÂÒÁÚÉÔØ ÆÁÊÌ × ÐÁÍÑÔØ" #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22 +#: paper-stream.cc:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" @@ -73,98 +73,110 @@ msgstr " msgid "Huh? Got %d, expected %d characters" msgstr "èÍ... ðÏÌÕÞÉÌ %d, Á ÏÖÉÄÁÌ %d ÚÎÁËÏ×" -#: text-stream.cc:9 +#: text-stream.cc:10 msgid "" msgstr "<ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ>" -#: warn.cc:35 +#: warn.cc:36 msgid "programming error: " msgstr "ÏÛÉÂËÁ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ: " -#: warn.cc:35 +#: warn.cc:36 msgid " (Continuing; cross thumbs)" msgstr " (ðÒÏÄÏÌÖÁÀ; ÓËÒÅÓÔÉÔÅ ÐÁÌØÃÙ)" -#: afm.cc:51 +#: afm.cc:53 #, c-format msgid "can't find character number: %d" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ Ó ÎÏÍÅÒÏÍ: %d" -#: afm.cc:66 +#: afm.cc:68 #, c-format msgid "can't find character called: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ÐÏÄ ÎÁÚ×ÁÎÉÅÍ: `%s'" -#: afm.cc:96 -msgid "Error parsing AFM file" +#: afm.cc:113 +#, fuzzy, c-format +msgid "Error parsing AFM file: %s" msgstr "ïÛÉÂËÁ ÐÒÉ ÁÎÁÌÉÚÅ ÆÁÊÌÁ AFM" -#: all-font-metrics.cc:151 lookup.cc:80 +#: all-font-metrics.cc:87 +#, c-format +msgid "checksum mismatch for font file: `%s'" +msgstr "" + +#: all-font-metrics.cc:92 +msgid "" +" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " +"to show font paths." +msgstr "" + +#: all-font-metrics.cc:153 #, c-format msgid "can't find font: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ: `%s'" -#: all-font-metrics.cc:152 +#: all-font-metrics.cc:154 msgid "Loading default font" msgstr "úÁÇÒÕÖÁÀ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: all-font-metrics.cc:169 +#: all-font-metrics.cc:171 #, c-format msgid "can't find default font: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'" -#: all-font-metrics.cc:170 includable-lexer.cc:50 lookup.cc:81 scores.cc:109 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 #, c-format msgid "(search path: `%s')" msgstr "(ÐÕÔØ ÐÏÉÓËÁ: `%s')" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:173 parser.yy:1642 msgid "Giving up" msgstr "óÄÁÀÓØ" -#: auto-change-iterator.cc:43 change-iterator.cc:60 +#: auto-change-iterator.cc:43 change-iterator.cc:59 #: part-combine-music-iterator.cc:85 msgid "Can't switch translators, I'm there already" msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ" -#: beam-engraver.cc:76 beam-engraver.cc:109 +#: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" -#: beam-engraver.cc:138 +#: beam-engraver.cc:158 msgid "already have a beam" msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ" -#: beam-engraver.cc:202 +#: beam-engraver.cc:224 msgid "unterminated beam" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÇÒÕÐÐÉÒÏ×ËÁ ÛÔÉÌÅÊ" -#: beam-engraver.cc:240 chord-tremolo-engraver.cc:176 +#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 msgid "stem must have Rhythmic structure" msgstr "ÛÔÉÌØ ÄÏÌÖÅÎ ÉÍÅÔØ ÒÉÔÍÏ×ÕÀ ÓÔÒÕËÔÕÒÕ" -#: beam-engraver.cc:251 +#: beam-engraver.cc:274 msgid "stem doesn't fit in beam" msgstr "ÛÔÉÌØ ÎÅ ×ÌÅÚÁÅÔ × ÇÒÕÐÐÉÒÏ×ËÕ" -#: beam-engraver.cc:252 +#: beam-engraver.cc:275 msgid "beam was started here" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ" -#: beam.cc:84 +#: beam.cc:83 msgid "beam has less than two stems" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" -#: beam.cc:511 +#: beam.cc:506 msgid "weird beam vertical offset" msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" -#: break-align-item.cc:119 +#: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ ÂÕÍÁÇÉ: `%s'" -#: change-iterator.cc:22 +#: change-iterator.cc:21 #, c-format msgid "can't change `%s' to `%s'" msgstr "ÎÅ ÍÏÇÕ ÓÍÅÎÉÔØ `%s' ÎÁ `%s'" @@ -175,15 +187,15 @@ msgstr " #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: change-iterator.cc:79 +#: change-iterator.cc:78 msgid "I'm one myself" msgstr "ñ ÅÄÉÎÓÔ×ÅÎÎÙÊ" -#: change-iterator.cc:82 +#: change-iterator.cc:81 msgid "none of these in my family" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" -#: chord-tremolo-engraver.cc:115 +#: chord-tremolo-engraver.cc:119 msgid "unterminated chord tremolo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" @@ -192,35 +204,23 @@ msgstr " msgid "no one to print a tremolos" msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" -#: chord.cc:162 +#: chord.cc:365 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÞÉÔÁÎÉÅ: ÎÅ ÞÁÓÔØ ÁËËÏÒÄÁ: %s" -#: chord.cc:386 +#: chord.cc:394 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: clef-engraver.cc:165 -msgid "unknown clef type" -msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ËÌÀÞÁ" - -#: collision.cc:118 +#: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ." -#: crescendo.cc:65 -msgid "crescendo" -msgstr "ËÒÅÝÅÎÄÏ" - -#: crescendo.cc:65 -msgid "too small" -msgstr "ÓÌÉÛËÏÍ ÍÁÌÏ" - -#: cross-staff.cc:22 -msgid "" -"minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken" +#: cross-staff.cc:24 +#, fuzzy +msgid "not a forced distance; cross-staff spanners may be broken" msgstr "" "minVerticalAlign != maxVerticalAlign: ÍÅÖÄÕÓÔÒÏÞÎÙÅ ÌÉÇÉ ÍÏÇÕÔ ÂÙÔØ ÎÅ×ÅÒÎÙÍÉ" @@ -236,19 +236,19 @@ msgstr " msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:192 span-dynamic-performer.cc:87 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÁÞÁÌÏ (ÄÅ)ËÒÅÝÅÎÄÏ" -#: dynamic-engraver.cc:213 +#: dynamic-engraver.cc:220 msgid "already have a crescendo" msgstr "ËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:214 +#: dynamic-engraver.cc:221 msgid "already have a decrescendo" msgstr "ÄÅËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:298 msgid "unterminated (de)crescendo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ (ÄÅ)ËÒÅÝÅÎÄÏ" @@ -260,10 +260,14 @@ msgstr " msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "îÅËÕÄÁ ÐÒÉÓÏÅÄÉÎÉÔØ ÒÁÓÛÉÒÉÔÅÌØ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÒÁÓÛÉÒÉÔÅÌÑ." -#: folded-repeat-iterator.cc:64 +#: folded-repeat-iterator.cc:70 msgid "no one to print a repeat brace" msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" +#: font-interface.cc:199 +msgid "couldn't find any font satisfying " +msgstr "" + #: gourlay-breaking.cc:157 msgid "No feasible line breaking found" msgstr "îÅ ÎÁÊÄÅÎÏ ÕÄÏ×ÌÅÔ×ÏÒÉÔÅÌØÎÏÇÏ ÒÁÚÒÙ×Á ÓÔÒÏËÉ" @@ -272,10 +276,19 @@ msgstr " msgid "no Grace context available" msgstr "ÎÅÔ ÄÏÓÔÕÐÎÏÇÏ æÏÒÛÌÁÇ-ËÏÎÔÅËÓÔÁ" -#: grace-position-engraver.cc:94 +#: grace-position-engraver.cc:96 msgid "Unattached grace notes. Attaching to last musical column." msgstr "æÏÒÛÌÁÇ ÂÅÚ ÐÒÉ×ÑÚËÉ. ðÒÉ×ÑÚÙ×ÁÀ Ë ÐÏÓÌÅÄÎÅÍÕ ÍÕÚÙËÁÌØÎÏÍÕ ÓÔÏÌÂÃÕ." +#: hairpin.cc:71 +msgid "decrescendo too small" +msgstr "" + +#: hairpin.cc:72 +#, fuzzy +msgid "crescendo too small" +msgstr "ËÒÅÝÅÎÄÏ" + #: hyphen-engraver.cc:90 msgid "unterminated hyphen" msgstr "ÐÅÒÅÎÏÓ ÂÅÚ ÏËÏÎÞÁÎÉÑ" @@ -289,17 +302,17 @@ msgstr " msgid "wrong identifier type, expected: `%s'" msgstr "ÎÅ×ÅÒÎÙÊ ÔÉÐ ÐÅÒÅÍÅÎÎÏÊ, ÏÖÉÄÁÌÓÑ: `%s'" -#: includable-lexer.cc:48 lily-guile.cc:117 midi-score-parser.cc:24 -#: scores.cc:108 scores.cc:114 +#: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 +#: scores.cc:106 scores.cc:112 #, c-format msgid "can't find file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" -#: key-engraver.cc:101 key-performer.cc:54 +#: key-engraver.cc:103 key-performer.cc:72 msgid "FIXME: key change merge" msgstr "éóðòá÷øíåîñ: ÓÌÉÑÎÉÅ ÓÍÅÎÙ ËÌÀÞÁ" -#: lily-guile.cc:119 +#: lily-guile.cc:141 #, c-format msgid "(load path: `%s')" msgstr "(ÐÕÔØ ÚÁÇÒÕÚËÉ: `%s')" @@ -309,49 +322,45 @@ msgstr "( msgid "Element count %d." msgstr "" -#: line-of-score.cc:255 paper-score.cc:79 +#: line-of-score.cc:253 paper-score.cc:77 #, c-format msgid "Element count %d " msgstr "" -#: line-of-score.cc:269 +#: line-of-score.cc:267 msgid "Calculating column positions..." msgstr "÷ÙÞÉÓÌÑÀ ÐÏÚÉÃÉÉ ÓÔÏÌÂÃÏ×" -#: lookup.cc:82 -msgid "Aborting" -msgstr "óÏ×ÅÒÛÁÀ ÈÁÒÁËÉÒÉ" - -#: lookup.cc:223 -#, c-format -msgid "Non-matching braces in text `%s', adding braces" -msgstr "æÉÇÕÒÎÙÅ ÓËÏÂËÉ × ÔÅËÓÔÅ `%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ, ÄÏÂÁ×ÌÑÀ ÓËÏÂËÉ" - -#: lyric-phrasing-engraver.cc:245 +#: lyric-phrasing-engraver.cc:269 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:250 +#: lyric-phrasing-engraver.cc:274 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 main.cc:93 -msgid "enable debugging output" -msgstr "×ËÌÀÞÉÔØ ×Ù×ÏÄ ÏÔÌÁÄÏÞÎÏÊ ÉÎÆÏÒÍÁÃÉÉ" - -#: main.cc:76 +#: main.cc:75 msgid "EXT" msgstr "òáóû" -#: main.cc:76 +#: main.cc:75 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû" -#: main.cc:77 main.cc:94 +#: main.cc:76 main.cc:95 msgid "this help" msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" +#: main.cc:77 +#, fuzzy +msgid "FIELD" +msgstr "æáêì" + +#: main.cc:77 +msgid "write header field to BASENAME.FIELD" +msgstr "" + #: main.cc:78 msgid "DIR" msgstr "ëáô" @@ -360,7 +369,7 @@ msgstr " msgid "add DIR to search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: main.cc:79 main.cc:97 +#: main.cc:79 main.cc:98 msgid "FILE" msgstr "æáêì" @@ -392,7 +401,7 @@ msgstr " msgid "inhibit file output naming and exporting" msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ" -#: main.cc:85 main.cc:102 +#: main.cc:85 main.cc:103 msgid "don't timestamp the output" msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ" @@ -400,7 +409,7 @@ msgstr " msgid "switch on experimental features" msgstr "×ËÌÀÞÉÔØ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÅ ×ÏÚÍÏÖÎÏÓÔÉ" -#: main.cc:87 main.cc:103 +#: main.cc:87 main.cc:104 msgid "print version number" msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" @@ -409,23 +418,23 @@ msgstr " msgid "verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: main.cc:89 main.cc:105 +#: main.cc:89 main.cc:106 msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:107 +#: main.cc:106 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." -#: main.cc:109 +#: main.cc:108 msgid "Typeset music and or play MIDI from FILE" msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ" -#: main.cc:113 +#: main.cc:112 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" @@ -439,16 +448,16 @@ msgstr "" msgid "Options:" msgstr "ïÐÃÉÉ:" -#: main.cc:123 +#: main.cc:122 msgid "This binary was compiled with the following options:" msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:" -#: main.cc:122 main.cc:142 +#: main.cc:123 main.cc:141 #, c-format msgid "Report bugs to %s" msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" -#: main.cc:54 main.cc:150 +#: main.cc:55 main.cc:149 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -460,17 +469,17 @@ msgstr "" "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n" "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n" -#: main.cc:61 main.cc:157 main.cc:169 +#: main.cc:62 main.cc:156 main.cc:168 #, c-format msgid "Copyright (c) %s by" msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by" -#. GNU GNU? -#: main.cc:167 -msgid "GNU LilyPond -- The GNU Project music typesetter" +#: main.cc:166 +#, fuzzy +msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU" -#: main.cc:70 main.cc:175 +#: main.cc:71 main.cc:174 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" @@ -487,21 +496,21 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:310 +#: midi-item.cc:311 #, c-format msgid "no such instrument: `%s'" msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" -#: midi-item.cc:365 +#: midi-item.cc:366 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "ÎÅÓÔÁÎÄÁÒÔÎÙÊ ËÌÀÞ: ÂÅÍÏÌÉ: %d, ÄÉÅÚÙ: %d" -#: midi-item.cc:412 +#: midi-item.cc:413 msgid "silly duration" msgstr "ÇÌÕÐÁÑ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: midi-item.cc:425 +#: midi-item.cc:426 msgid "silly pitch" msgstr "ÇÌÕÐÙÊ ÔÏÎ" @@ -509,22 +518,34 @@ msgstr " msgid "Error syncing file (disk full?)" msgstr "ïÛÉÂËÁ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÆÁÊÌÁ (ÄÉÓË ÐÅÒÅÐÏÌÎÅÎ?)" -#: music-output-def.cc:71 +#: music-output-def.cc:72 #, c-format msgid "can't find `%s' context" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'" -#: musical-request.cc:42 +#: music.cc:222 +msgid "ly_get_mus_property (): Not a Music" +msgstr "" + +#: music.cc:236 +msgid "ly_set_mus_property (): Not a symbol" +msgstr "" + +#: music.cc:248 +msgid "ly_set_mus_property (): not of type Music" +msgstr "" + +#: musical-request.cc:29 #, c-format msgid "Transposition by %s makes accidental larger than two" msgstr "" -#: my-lily-lexer.cc:124 +#: my-lily-lexer.cc:132 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "éÍÑ ËÏÍÁÎÄÙ Ñ×ÌÑÅÔÓÑ ËÌÀÞÅ×ÙÍ ÓÌÏ×ÏÍ: `%s'" -#: my-lily-lexer.cc:143 +#: my-lily-lexer.cc:151 #, c-format msgid "error at EOF: %s" msgstr "ÏÛÍÂËÁ × ËÏÎÃÅ ÆÁÊÌÁ: %s" @@ -537,20 +558,30 @@ msgstr " msgid "Braces don't match" msgstr "æÉÇÕÒÎÙÅ ÓËÏÂËÉ ÎÅ ÓÏ×ÐÁÄÁÀÔ" -#: paper-def.cc:149 +#: output-property-music-iterator.cc:20 request-chord-iterator.cc:76 +#, c-format +msgid "Junking request: `%s'" +msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÚÁÐÒÏÓ: `%s'" + +#: paper-def.cc:116 #, c-format msgid "paper output to %s..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: mudela-stream.cc:93 paper-outputter.cc:91 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 msgid ", at " msgstr ", ×" -#: paper-score.cc:82 +#: paper-outputter.cc:239 +#, fuzzy, c-format +msgid "writing header field %s to %s..." +msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." + +#: paper-score.cc:80 msgid "Preprocessing elements..." msgstr "ðÒÅÄ×ÁÒÉÔÅÌØÎÏ ÏÂÒÁÂÁÔÙ×ÁÀ ÜÌÅÍÅÎÔÙ..." -#: paper-score.cc:107 +#: paper-score.cc:105 msgid "Outputting Score, defined at: " msgstr "" @@ -588,40 +619,43 @@ msgstr " msgid "from musical definition: %s" msgstr "ÉÚ ÍÕÚÙËÁÌØÎÏÊ ÎÏÔÁÃÉÉ %s" -#: performance.cc:174 +#: performance.cc:161 #, c-format msgid "MIDI output to %s..." msgstr "×Ù×ÏÄ MIDI × %s..." -#: piano-pedal-engraver.cc:157 piano-pedal-engraver.cc:169 +#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" -#: property-engraver.cc:131 -msgid "Wrong type for property" -msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ ÄÌÑ Ó×ÏÊÓÔ×Á" +#: pitch.cc:25 +msgid "Pitch arguments out of range" +msgstr "" -#: request-chord-iterator.cc:93 +#. warning () ? +#: property-engraver.cc:124 #, c-format -msgid "Junking request: `%s'" -msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÚÁÐÒÏÓ: `%s'" +msgid "" +"%s is deprecated. Use\n" +" \\property %s.%s \\override #'%s = #%s" +msgstr "" -#: request-chord-iterator.cc:96 +#: property-engraver.cc:150 #, c-format -msgid "Huh? Not a Request: `%s'" -msgstr "á? îå úÁÐÒÏÓ: `%s'" +msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" +msgstr "" -#: rest-collision.cc:159 +#: rest-collision.cc:190 msgid "too many colliding rests" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÎÁÌÅÚÁÀÝÉÈ ÐÁÕÚ" -#: rest-collision.cc:163 +#: rest-collision.cc:194 msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:149 +#: score-engraver.cc:177 #, c-format msgid "unbound spanner `%s'" msgstr "" @@ -653,12 +687,12 @@ msgstr " msgid "Score contains errors; will not process it" msgstr "" -#: scores.cc:124 +#: scores.cc:122 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'" -#: script-engraver.cc:66 +#: script-engraver.cc:67 #, c-format msgid "Don't know how to interpret articulation `%s'" msgstr "" @@ -669,61 +703,71 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ñ ÌÉÛËÏÍ ÍÎÏÇÏ ×ÙÐÉÌ" -#: sequential-music-iterator.cc:35 -msgid "Must stop before this music ends" -msgstr "" - -#: simple-music-iterator.cc:36 -#, c-format -msgid "Junking music: `%s'" -msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" - -#: slur-engraver.cc:89 +#: slur-engraver.cc:128 msgid "unterminated slur" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" -#: slur-engraver.cc:104 +#: slur-engraver.cc:143 #, fuzzy msgid "can't find start of slur" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" -#: slur.cc:48 +#: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ." -#: slur.cc:324 +#: slur.cc:379 msgid "Slur over rest?" msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?" -#: stem-engraver.cc:128 +#: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)" -#: stem.cc:116 +#: stem.cc:117 msgid "Weird stem size; check for narrow beams" msgstr "" +#: text-spanner-engraver.cc:95 +#, fuzzy +msgid "can't find start of text spanner" +msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" + +#: text-spanner-engraver.cc:114 +#, fuzzy +msgid "already have a text spanner" +msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ" + +#: text-spanner-engraver.cc:167 +#, fuzzy +msgid "unterminated text spanner" +msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ" + +#: text-spanner.cc:115 +msgid "Text_spanner too small" +msgstr "" + #: tfm-reader.cc:105 #, c-format msgid "TFM header of `%s' has only %u word(s)" msgstr "" -#: tfm-reader.cc:143 +#: tfm-reader.cc:139 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:71 -#, c-format -msgid "can't find ascii character: `%d'" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" -#: tie-engraver.cc:203 tie-performer.cc:109 +#: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "" -#: tie-engraver.cc:242 +#: tie-engraver.cc:231 msgid "lonely tie" msgstr "" @@ -731,15 +775,7 @@ msgstr "" msgid "no one to print a tuplet start bracket" msgstr "" -#: timing-translator.cc:36 -msgid "conflicting timing request" -msgstr "" - -#: timing-translator.cc:37 -msgid "This is the other timing request" -msgstr "" - -#: timing-translator.cc:65 +#: timing-translator.cc:38 #, c-format msgid "barcheck failed at: %s" msgstr "" @@ -768,208 +804,238 @@ msgstr "" msgid "can't find: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ: `%s'" -#: translator-group.cc:142 +#: translator-group.cc:146 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "" -#: translator-group.cc:246 +#: translator-group.cc:231 #, c-format msgid "can't find or create: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'" -#: unfolded-repeat-iterator.cc:146 -msgid "no one to print a volta bracket" +#. warning () ? +#: translator-group.cc:405 +#, c-format +msgid "" +"Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#: parser.yy:61 +#. warning () ? +#: translator-group.cc:420 +#, c-format +msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgstr "" + +#. programming_error? +#: translator-group.cc:440 +msgid "ly-get-trans-property: expecting a Translator_group argument" +msgstr "" + +#: volta-engraver.cc:87 +msgid "No volta spanner to end" +msgstr "" + +#: volta-engraver.cc:104 +msgid "Already have a volta spanner. Stopping that one prematurely." +msgstr "" + +#: volta-engraver.cc:108 +msgid "Also have a stopped spanner. Giving up." +msgstr "" + +#: parser.yy:71 #, c-format msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:447 +#: parser.yy:467 msgid "Wrong type for property value" msgstr "" -#: parser.yy:633 +#: parser.yy:668 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:673 +#: parser.yy:732 msgid "Second argument must be a symbol" msgstr "÷ÔÏÒÏÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÓÉÍ×ÏÌÏÍ" -#: parser.yy:678 +#: parser.yy:737 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1015 +#: parser.yy:1217 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1025 +#: parser.yy:1227 msgid "Can't specify direction for this request" msgstr "îÅ ÍÏÇÕ ÕËÁÚÁÔØ ÎÁÐÒÁ×ÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ÚÁÐÒÏÓÁ" -#: parser.yy:1117 -#, c-format -msgid "Expecting %d arguments" +#: parser.yy:1348 +msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1133 -msgid "Must have 2 arguments for duration" -msgstr "" +#: parser.yy:1359 +#, fuzzy +msgid "Must have duration object" +msgstr "ÕÓÔÁÎÏ×ÉÔØ ÎÁÉÍÅÎØÛÕÀ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: parser.yy:1140 parser.yy:1148 parser.yy:1383 +#: parser.yy:1368 parser.yy:1376 parser.yy:1640 msgid "Have to be in Lyric mode for lyrics" msgstr "äÏÌÖÅÎ ÂÙÔØ × ìÉÒÉÞÅÓËÏÍ ÒÅÖÉÍÅ ÄÌÑ ÌÉÒÉËÉ" -#: parser.yy:1289 parser.yy:1309 +#: parser.yy:1525 parser.yy:1554 #, c-format msgid "not a duration: %d" msgstr "ÎÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ: %d" -#: parser.yy:1318 +#: parser.yy:1563 msgid "Have to be in Note mode for notes" msgstr "äÏÌÖÅÎ ÂÙÔØ × îÏÔÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÎÏÔ" -#: parser.yy:1396 +#: parser.yy:1659 msgid "Have to be in Chord mode for chords" msgstr "äÏÌÖÅÎ ÂÙÔØ × áËËÏÒÄÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÁËËÏÒÄÏ×" -#: parser.yy:1558 parser.yy:1576 +#: parser.yy:1821 parser.yy:1839 msgid "need integer number arg" msgstr "" -#: parser.yy:1562 +#: parser.yy:1825 msgid "Must be positive integer" msgstr "" -#: lexer.ll:159 +#: lexer.ll:164 msgid "EOF found inside a comment" msgstr "ëÏÎÅà ÆÁÊÌÁ ×ÎÕÔÒÉ ËÏÍÍÅÎÔÁÒÉÑ" -#: lexer.ll:173 +#: lexer.ll:178 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:197 +#: lexer.ll:202 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÍÅÔËÁ/ËÏÍÁÎÄÁ: `%s'" #. backup rule -#: lexer.ll:202 +#: lexer.ll:207 msgid "Missing end quote" msgstr "ïÔÓÕÔÓ×ÕÅÔ ÚÁËÌÀÞÉÔÅÌØÎÁÑ ËÁ×ÙÞËÁ" #. backup rule -#: lexer.ll:224 lexer.ll:228 +#: lexer.ll:229 lexer.ll:233 msgid "white expected" msgstr "× ÔÏ ×ÒÅÍÑ ËÁË ÏÖÉÄÁÌÏÓØ" -#: lexer.ll:236 +#: lexer.ll:241 msgid "Can't evaluate Scheme in safe mode" msgstr "îÅ ÍÏÇÕ ×ÙÐÏÌÎÑÔØ ËÏÄ ÓÈÅÍÙ × ÂÅÚÏÐÁÓÎÏÍ ÒÅÖÉÍÅ" -#: lexer.ll:432 +#: lexer.ll:433 #, c-format msgid "invalid character: `%c'" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: lexer.ll:512 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'" -#: lexer.ll:598 -#, c-format -msgid "incorrect mudela version: %s (%s, %s)" +#: lexer.ll:597 +#, fuzzy, c-format +msgid "incorrect lilypond version: %s (%s, %s)" msgstr "ÎÅ×ÅÒÎÁÑ ×ÅÒÓÉÑ mudela: %s (%s, %s)" -#: lexer.ll:599 -msgid "Consider converting the input with the convert-mudela script" +#: lexer.ll:598 +msgid "Consider converting the input with the convert-ly script" msgstr "" -#: main.cc:92 +#: main.cc:93 msgid "write exact durations, e.g.: a4*385/384" msgstr "" -#: main.cc:95 +#: main.cc:94 +msgid "enable debugging output" +msgstr "×ËÌÀÞÉÔØ ×Ù×ÏÄ ÏÔÌÁÄÏÞÎÏÊ ÉÎÆÏÒÍÁÃÉÉ" + +#: main.cc:96 msgid "ACC[:MINOR]" msgstr "" -#: main.cc:95 +#: main.cc:96 msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "" -#: main.cc:96 +#: main.cc:97 msgid "don't output tuplets, double dots or rests, smallest is 32" msgstr "" -#: main.cc:97 +#: main.cc:98 msgid "set FILE as default output" msgstr "ÕÓÔÁÎÏ×ÉÔØ æáêì ÄÌÑ ×Ù×ÏÄÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: main.cc:98 +#: main.cc:99 msgid "don't output tuplets" msgstr "ÎÅ ×Ù×ÏÄÉÔØ ÓËÏÂÙ ÔÒÉÏÌÅÊ" -#: main.cc:99 +#: main.cc:100 msgid "be quiet" msgstr "ÂÙÔØ ÍÏÌÞÁÌÉ×ÙÍ" -#: main.cc:100 +#: main.cc:101 #, fuzzy msgid "don't output rests or skips" msgstr "ÎÅ ×Ù×ÏÄÉÔØ ÓËÏÂÙ ÔÒÉÏÌÅÊ" -#: main.cc:101 +#: main.cc:102 msgid "DUR" msgstr "íáöïò" -#: main.cc:101 +#: main.cc:102 msgid "set smallest duration" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÎÁÉÍÅÎØÛÕÀ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: main.cc:104 +#: main.cc:105 msgid "be verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: main.cc:106 +#: main.cc:107 msgid "assume no double dotted notes" msgstr "" -#: main.cc:113 +#: main.cc:114 #, c-format msgid "Usage: %s [OPTION]... [FILE]" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]" -#: main.cc:115 +#: main.cc:116 msgid "Translate MIDI-file to mudela" msgstr "ôÒÁÎÓÌÉÒÏ×ÁÔØ MIDI-ÆÁÊÌ × mudela" -#: main.cc:129 +#: main.cc:130 #, c-format msgid "no_double_dots: %d\n" msgstr "" -#: main.cc:131 +#: main.cc:132 #, c-format msgid "no_rests: %d\n" msgstr "" -#: main.cc:133 +#: main.cc:134 #, c-format msgid "no_quantify_b_s: %d\n" msgstr "" -#: main.cc:135 +#: main.cc:136 #, c-format msgid "no_smaller_than: %d (1/%d)\n" msgstr "" -#: main.cc:138 +#: main.cc:139 #, c-format msgid "no_tuplets: %d\n" msgstr "" @@ -1023,7 +1089,7 @@ msgstr " msgid "invalid track length" msgstr "ÎÅ×ÅÒÎÁÑ ÄÌÉÎÁ ÄÏÒÏÖËÉ" -#: mudela-item.cc:160 +#: mudela-item.cc:161 #, c-format msgid "#32 in quarter: %d" msgstr "#32 × ÞÅÔ×ÅÒÔÎÏÊ: %d" @@ -1093,6 +1159,27 @@ msgstr "% msgid "% from input file: " msgstr "% ÉÚ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ: " +#~ msgid "Wrong type for property" +#~ msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ ÄÌÑ Ó×ÏÊÓÔ×Á" + +#~ msgid "unknown clef type" +#~ msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ËÌÀÞÁ" + +#~ msgid "too small" +#~ msgstr "ÓÌÉÛËÏÍ ÍÁÌÏ" + +#~ msgid "Aborting" +#~ msgstr "óÏ×ÅÒÛÁÀ ÈÁÒÁËÉÒÉ" + +#~ msgid "Non-matching braces in text `%s', adding braces" +#~ msgstr "æÉÇÕÒÎÙÅ ÓËÏÂËÉ × ÔÅËÓÔÅ `%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ, ÄÏÂÁ×ÌÑÀ ÓËÏÂËÉ" + +#~ msgid "Huh? Not a Request: `%s'" +#~ msgstr "á? îå úÁÐÒÏÓ: `%s'" + +#~ msgid "Junking music: `%s'" +#~ msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" + #~ msgid "can't find both ends of %s" #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÏÂÁ ËÏÎÃÁ Õ %s" diff --git a/scm/c++.scm b/scm/c++.scm new file mode 100644 index 0000000000..e3ce13b875 --- /dev/null +++ b/scm/c++.scm @@ -0,0 +1,121 @@ +;;;; c++.scm -- implement Scheme frontends to C++ functions +;;;; +;;;; source file of the GNU LilyPond music typesetter +;;;; +;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; Han-Wen Nienhuys + +;;; Note: this file can't be used without LilyPond executable + +(define (number-pair? x) + (and (pair? x) (number? (car x)) (number? (cdr x)))) + +(define (boolean-or-symbol? x) (or boolean? x) (or symbol? x)) + +(define (number-or-string? x) (or (number? x) (string? x))) + +(define markup? + (lambda (x) (or (string? x) (list? x)))) + +;; ugh: code dup ; merge. +(define (object-type obj) + (cond + ((dir? obj) "direction") + ((number-pair? obj) "pair of numbers") + ((ly-input-location? obj) "input location") + ((ly-grob? obj) "grob (GRaphical OBject)") + ((pair? obj) "pair") + ((integer? obj) "integer") + ((list? obj) "list") + ((symbol? obj) "symbol") + ((string? obj) "string") + ((boolean? obj) "boolean") + ((moment? obj) "moment") + ((number? obj) "number") + ((char? obj) "char") + ((input-port? obj) "input port") + ((output-port? obj) "output port") + ((vector? obj) "vector") + ((procedure? obj) "procedure") + ((boolean-or-symbol? obj) "boolean or symbol") + ((number-or-string? obj) "number or string") + ((markup? obj) "markup (list or string)") + (else "unknown type"))) + + +(define (type-name predicate) + (cond + ((eq? predicate dir?) "direction") + ((eq? predicate number-pair?) "pair of numbers") + ((eq? predicate ly-input-location?) "input location") + ((eq? predicate ly-grob?) "Grob") + ((eq? predicate pair?) "pair") + ((eq? predicate integer?) "integer") + ((eq? predicate list?) "list") + ((eq? predicate symbol?) "symbol") + ((eq? predicate string?) "string") + ((eq? predicate boolean?) "boolean") + ((eq? predicate moment?) "moment") + ((eq? predicate number?) "number") + ((eq? predicate char?) "char") + ((eq? predicate input-port?) "input port") + ((eq? predicate output-port?) "output port") + ((eq? predicate vector?) "vector") + ((eq? predicate procedure?) "procedure") + ((eq? predicate boolean-or-symbol?) "boolean or symbol") + ((eq? predicate number-or-string?) "number or string") + ((eq? predicate markup?) "markup (list or string)") + (else "unknown type"))) + + +(define (uniqued-alist alist acc) + (if (null? alist) acc + (if (assoc (caar alist) acc) + (uniqued-alist (cdr alist) acc) + (uniqued-alist (cdr alist) (cons (car alist) acc))))) + + + +;;(define (cons-map f x) +;; (cons (f (car x)) (f (cdr x)))) + + +;;(define (reduce operator list) +;; (if (null? (cdr list)) (car list) +;; (operator (car list) (reduce operator (cdr list))))) + + + +; Make a function that checks score element for being of a specific type. +(define (make-type-checker symbol) + (lambda (elt) + ;;(display symbol) + ;;(eq? #t (ly-get-elt-property elt symbol)) + (not (eq? #f (memq symbol (ly-get-elt-property elt 'interfaces)))))) + + +(define (index-cell cell dir) + (if (equal? dir 1) + (cdr cell) + (car cell))) + +(define (repeat-name-to-ctor name) + (let* + ((supported-reps + `(("volta" . ((iterator-ctor . ,Volta_repeat_iterator::constructor) + (length . ,Repeated_music::volta_music_length))) + ("unfold" . ((iterator-ctor . ,Unfolded_repeat_iterator::constructor) + (length . ,Repeated_music::unfolded_music_length))) + ("fold" . ((iterator-ctor . ,Folded_repeat_iterator::constructor) + (length . ,Repeated_music::folded_music_length))) + ("tremolo" . ((iterator-ctor . ,Chord_tremolo_iterator::constructor) + (length . ,Repeated_music::unfolded_music_length))))) + + (handle (assoc name supported-reps))) + + (if (pair? handle) + (cdr handle) + (begin + (ly-warn + (string-append "Unknown repeat type `" name "'\nSee scm/lily.scm for supported repeats")) + '(type . 'repeated-music))))) diff --git a/scm/clef.scm b/scm/clef.scm new file mode 100644 index 0000000000..f1504ac46f --- /dev/null +++ b/scm/clef.scm @@ -0,0 +1,94 @@ + + +;; +;; (name . (glyph clef-position octavation)) +;; -- the name clefOctavation is misleading the value 7 is 1 octave not 7 Octaves. +;; +(define supported-clefs '( + ("treble" . ("clefs-G" -2 0)) + ("violin" . ("clefs-G" -2 0)) + ("G" . ("clefs-G" -2 0)) + ("G2" . ("clefs-G" -2 0)) + ("french" . ("clefs-G" -4 0)) + ("soprano" . ("clefs-C" -4 0)) + ("mezzosoprano" . ("clefs-C" -2 0)) + ("alto" . ("clefs-C" 0 0)) + ("tenor" . ("clefs-C" 2 0)) + ("baritone" . ("clefs-C" 4 0)) + ("varbaritone" . ("clefs-F" 0 0)) + ("bass" . ("clefs-F" 2 0)) + ("F" . ( "clefs-F" 2 0)) + ("subbass" . ("clefs-F" 4 0)) + + ;; should move mensural stuff to separate file? + ("vaticana_do1" . ("clefs-vaticana_do" -1 0)) + ("vaticana_do2" . ("clefs-vaticana_do" 1 0)) + ("vaticana_do3" . ("clefs-vaticana_do" 3 0)) + ("vaticana_fa1" . ("clefs-vaticana_fa" -1 0)) + ("vaticana_fa2" . ("clefs-vaticana_fa" 1 0)) + ("medicaea_do1" . ("clefs-medicaea_do" -1 0)) + ("medicaea_do2" . ("clefs-medicaea_do" 1 0)) + ("medicaea_do3" . ("clefs-medicaea_do" 3 0)) + ("medicaea_fa1" . ("clefs-medicaea_fa" -1 0)) + ("medicaea_fa2" . ("clefs-medicaea_fa" 1 0)) + ("hufnagel_do1" . ("clefs-hufnagel_do" -1 0)) + ("hufnagel_do2" . ("clefs-hufnagel_do" 1 0)) + ("hufnagel_do3" . ("clefs-hufnagel_do" 3 0)) + ("hufnagel_fa1" . ("clefs-hufnagel_fa" -1 0)) + ("hufnagel_fa2" . ("clefs-hufnagel_fa" 1 0)) + ("hufnagel" . ("clefs-hufnagel_do_fa" 4 0)) + ("mensural1_c1" . ("clefs-mensural1_c" -4 0)) + ("mensural1_c2" . ("clefs-mensural1_c" -2 0)) + ("mensural1_c3" . ("clefs-mensural1_c" 0 0)) + ("mensural1_c4" . ("clefs-mensural1_c" 2 0)) + ("mensural2_c1" . ("clefs-mensural2_c" -4 0)) + ("mensural2_c2" . ("clefs-mensural2_c" -2 0)) + ("mensural2_c3" . ("clefs-mensural2_c" 0 0)) + ("mensural2_c4" . ("clefs-mensural2_c" 2 0)) + ("mensural2_c5" . ("clefs-mensural2_c" 4 0)) + ("mensural3_c1" . ("clefs-mensural3_c" -2 0)) + ("mensural3_c2" . ("clefs-mensural3_c" 0 0)) + ("mensural3_c3" . ("clefs-mensural3_c" 2 0)) + ("mensural3_c4" . ("clefs-mensural3_c" 4 0)) + ("mensural_f" . ("clefs-mensural_f" 2 0)) + ) +) + +(define (clef-name-to-properties cl) + (let ((e '()) + (oct 0) + (l (string-length cl)) + ) + + ;; ugh. cleanme + (if (equal? "8" (substring cl (- l 1) l)) + (begin + (if (equal? "^" (substring cl (- l 2) (- l 1))) + (set! oct 7) + (set! oct -7)) + + (set! cl (substring cl 0 (- l 2))))) + + + (set! e (assoc cl supported-clefs)) + (if (pair? e) + `(((symbol . clefGlyph) + (iterator-ctor . ,Property_iterator::constructor) + (value . ,(cadr e)) + ) + ((symbol . clefPosition) + (iterator-ctor . ,Property_iterator::constructor) + (value . ,(caddr e)) + ) + ,(if (not (equal? oct 0)) + `((symbol . clefOctavation) + (iterator-ctor . ,Property_iterator::constructor) + (value . ,oct) + )) + ) + (begin + (ly-warn (string-append "Unknown clef type `" cl "'\nSee scm/lily.scm for supported clefs")) + '()) + ))) + + diff --git a/scm/lily.scm b/scm/lily.scm index a9cc251bfb..3c065bf642 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -1,94 +1,27 @@ -;;; lily.scm -- implement Scheme output routines for TeX and PostScript -;;; -;;; source file of the GNU LilyPond music typesetter -;;; -;;; (c) 1998--2000 Jan Nieuwenhuizen -;;; Han-Wen Nienhuys +;;;; lily.scm -- implement Scheme output routines for TeX and PostScript +;;;; +;;;; source file of the GNU LilyPond music typesetter +;;;; +;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; Han-Wen Nienhuys +;;; Library funtions -;;; This file contains various routines in Scheme that are easier to -;;; do here than in C++. At present it is an unorganised mess. Sorry. +(use-modules (ice-9 regex)) +;;(write standalone (current-error-port)) -;;; We should repartition the entire scm side of lily in a -;;; more sane way, using namesspaces/modules? +;;; General settings (debug-enable 'backtrace) - (define point-and-click #f) +(define security-paranoia #f) +(define default-script-alist '()) +(define font-name-alist '()) -;;; library funtions - -(use-modules (ice-9 regex)) - -(define (number-pair? x) - (and (pair? x) (number? (car x)) (number? (cdr x)))) -(define (boolean-or-symbol? x) (or boolean? x) (or symbol? x)) -(define (number-or-string? x) (or (number? x) (string? x))) -(define markup? - (lambda (x) (or (string? x) (list? x)))) - -;; ugh: code dup ; merge. -(define (object-type obj) - (cond - ((dir? obj) "direction") - ((number-pair? obj) "pair of numbers") - ((ly-input-location? obj) "input location") - ((ly-grob? obj) "grob (GRaphical OBject)") - ((pair? obj) "pair") - ((integer? obj) "integer") - ((list? obj) "list") - ((symbol? obj) "symbol") - ((string? obj) "string") - ((boolean? obj) "boolean") - ((moment? obj) "moment") - ((number? obj) "number") - ((char? obj) "char") - ((input-port? obj) "input port") - ((output-port? obj) "output port") - ((vector? obj) "vector") - ((procedure? obj) "procedure") - ((boolean-or-symbol? obj) "boolean or symbol") - ((number-or-string? obj) "number or string") - ((markup? obj) "markup (list or string)") - (else "unknown type") - )) - - -(define (type-name predicate) - (cond - ((eq? predicate dir?) "direction") - ((eq? predicate number-pair?) "pair of numbers") - ((eq? predicate ly-input-location?) "input location") - ((eq? predicate ly-grob?) "Grob") - ((eq? predicate pair?) "pair") - ((eq? predicate integer?) "integer") - ((eq? predicate list?) "list") - ((eq? predicate symbol?) "symbol") - ((eq? predicate string?) "string") - ((eq? predicate boolean?) "boolean") - ((eq? predicate moment?) "moment") - ((eq? predicate number?) "number") - ((eq? predicate char?) "char") - ((eq? predicate input-port?) "input port") - ((eq? predicate output-port?) "output port") - ((eq? predicate vector?) "vector") - ((eq? predicate procedure?) "procedure") - ((eq? predicate boolean-or-symbol?) "boolean or symbol") - ((eq? predicate number-or-string?) "number or string") - ((eq? predicate markup?) "markup (list or string)") - (else "unknown type") - )) - - -(define (uniqued-alist alist acc) - (if (null? alist) acc - (if (assoc (caar alist) acc) - (uniqued-alist (cdr alist) acc) - (uniqued-alist (cdr alist) (cons (car alist) acc) - )))) - +(if (not (defined? 'standalone)) + (define standalone (not (defined? 'ly-gulp-file)))) ;; The regex module may not be available, or may be broken. (define use-regex @@ -99,330 +32,50 @@ (define use-regex #t) ;;(define use-regex #f) -;; do nothing in .scm output -(define (comment s) "") + +;;; Un-assorted stuff ;; URG guile-1.3/1.4 compatibility (define (ly-eval x) (eval2 x #f)) -(define (comment s) "") - -(define (mm-to-pt x) - (* (/ 72.27 25.40) x) - ) - -(define (cons-map f x) - (cons (f (car x)) (f (cdr x)))) - -(define (reduce operator list) - (if (null? (cdr list)) (car list) - (operator (car list) (reduce operator (cdr list))) - ) - ) - - -(define (numbers->string l) - (apply string-append (map ly-number->string l))) - -; (define (chop-decimal x) (if (< (abs x) 0.001) 0.0 x)) - -(define (number->octal-string x) - (let* ((n (inexact->exact x)) - (n64 (quotient n 64)) - (n8 (quotient (- n (* n64 64)) 8))) - (string-append - (number->string n64) - (number->string n8) - (number->string (remainder (- n (+ (* n64 64) (* n8 8))) 8))))) - -(define (inexact->string x radix) - (let ((n (inexact->exact x))) - (number->string n radix))) - - -(define (control->string c) - (string-append (number->string (car c)) " " - (number->string (cdr c)) " ")) - -(define (font i) - (string-append - "font" - (make-string 1 (integer->char (+ (char->integer #\A) i))) - )) - -(define (scm-scm action-name) - 1) - -(define security-paranoia #f) - - -;; silly, use alist? -(define (find-notehead-symbol duration style) - (case style - ((cross) "2cross") - ((harmonic) "0mensural") - ((baroque) - (string-append (number->string duration) - (if (< duration 0) "mensural" ""))) - ((default) (number->string duration)) - (else - (string-append (number->string duration) (symbol->string style)))) - ) - -(define (string-encode-integer i) - (cond - ((= i 0) "o") - ((< i 0) (string-append "n" (string-encode-integer (- i)))) - (else (string-append - (make-string 1 (integer->char (+ 65 (modulo i 26)))) - (string-encode-integer (quotient i 26)) - )) - ) - ) - -(define default-script-alist '()) - -(define font-name-alist '()) -(define (tex-encoded-fontswitch name-mag) - (let* ( - (iname-mag (car name-mag)) - (ename-mag (cdr name-mag)) - ) - (cons iname-mag - (cons ename-mag - (string-append "magfont" - (string-encode-integer - (hashq (car ename-mag) 1000000)) - "m" - (string-encode-integer - (inexact->exact (* 1000 (cdr ename-mag)))) - - ) - ) - ))) - -(define (define-fonts internal-external-name-mag-pairs) - (set! font-name-alist (map tex-encoded-fontswitch - internal-external-name-mag-pairs)) - (apply string-append - (map (lambda (x) - (font-load-command (car x) (cdr x))) - (map cdr font-name-alist) - - ))) - -(define (fontify name-mag-pair exp) - (string-append (select-font name-mag-pair) - exp) - ) - -;;;;;;;;;;;;;;;;;;;; - - -; Make a function that checks score element for being of a specific type. -(define (make-type-checker symbol) - (lambda (elt) - ;;(display symbol) - ;;(eq? #t (ly-get-elt-property elt symbol)) - (not (eq? #f (memq symbol (ly-get-elt-property elt 'interfaces)))) - )) - - -(define (arg->string arg) - (cond ((number? arg) (inexact->string arg 10)) - ((string? arg) (string-append "\"" arg "\"")) - ((symbol? arg) (string-append "\"" (symbol->string arg) "\"")))) - -; ugh: naming. -(define (func name . args) - (string-append - "(" name - (if (null? args) - "" - (apply string-append - (map (lambda (x) (string-append " " (arg->string x))) args))) - ")\n")) - (define (sign x) (if (= x 0) 1 (if (< x 0) -1 1))) -(define (gulp-file name) - (let* ((file (open-input-file name)) - (text (read-delimited "" file))) - (close file) - text)) -;; urg: Use when standalone, do: -;; (define ly-gulp-file scm-gulp-file) -(define (scm-gulp-file name) - (set! %load-path - (cons (string-append (getenv 'LILYPONDPREFIX) "/ly") - (cons (string-append (getenv 'LILYPONDPREFIX) "/ps") - %load-path))) - (let ((path (%search-load-path name))) - (if path - (gulp-file path) - (gulp-file name)))) +;;(define major-scale +;; '( +;; (0 . 0) +;; (1 . 0) +;; (2 . 0) +;; (3 . 0) +;; (4 . 0) +;; (5 . 0) +;; (6 . 0) +;; )) - -(define (index-cell cell dir) - (if (equal? dir 1) - (cdr cell) - (car cell))) -(define major-scale - '( - (0 . 0) - (1 . 0) - (2 . 0) - (3 . 0) - (4 . 0) - (5 . 0) - (6 . 0) - ) - ) - - - -;; -;; (name . (glyph clef-position octavation)) -;; -- the name clefOctavation is misleading the value 7 is 1 octave not 7 Octaves. -;; -(define supported-clefs '( - ("treble" . ("clefs-G" -2 0)) - ("violin" . ("clefs-G" -2 0)) - ("G" . ("clefs-G" -2 0)) - ("G2" . ("clefs-G" -2 0)) - ("french" . ("clefs-G" -4 0)) - ("soprano" . ("clefs-C" -4 0)) - ("mezzosoprano" . ("clefs-C" -2 0)) - ("alto" . ("clefs-C" 0 0)) - ("tenor" . ("clefs-C" 2 0)) - ("baritone" . ("clefs-C" 4 0)) - ("varbaritone" . ("clefs-F" 0 0)) - ("bass" . ("clefs-F" 2 0)) - ("F" . ( "clefs-F" 2 0)) - ("subbass" . ("clefs-F" 4 0)) - - ;; should move mensural stuff to separate file? - ("vaticana_do1" . ("clefs-vaticana_do" -1 0)) - ("vaticana_do2" . ("clefs-vaticana_do" 1 0)) - ("vaticana_do3" . ("clefs-vaticana_do" 3 0)) - ("vaticana_fa1" . ("clefs-vaticana_fa" -1 0)) - ("vaticana_fa2" . ("clefs-vaticana_fa" 1 0)) - ("medicaea_do1" . ("clefs-medicaea_do" -1 0)) - ("medicaea_do2" . ("clefs-medicaea_do" 1 0)) - ("medicaea_do3" . ("clefs-medicaea_do" 3 0)) - ("medicaea_fa1" . ("clefs-medicaea_fa" -1 0)) - ("medicaea_fa2" . ("clefs-medicaea_fa" 1 0)) - ("hufnagel_do1" . ("clefs-hufnagel_do" -1 0)) - ("hufnagel_do2" . ("clefs-hufnagel_do" 1 0)) - ("hufnagel_do3" . ("clefs-hufnagel_do" 3 0)) - ("hufnagel_fa1" . ("clefs-hufnagel_fa" -1 0)) - ("hufnagel_fa2" . ("clefs-hufnagel_fa" 1 0)) - ("hufnagel" . ("clefs-hufnagel_do_fa" 4 0)) - ("mensural1_c1" . ("clefs-mensural1_c" -4 0)) - ("mensural1_c2" . ("clefs-mensural1_c" -2 0)) - ("mensural1_c3" . ("clefs-mensural1_c" 0 0)) - ("mensural1_c4" . ("clefs-mensural1_c" 2 0)) - ("mensural2_c1" . ("clefs-mensural2_c" -4 0)) - ("mensural2_c2" . ("clefs-mensural2_c" -2 0)) - ("mensural2_c3" . ("clefs-mensural2_c" 0 0)) - ("mensural2_c4" . ("clefs-mensural2_c" 2 0)) - ("mensural2_c5" . ("clefs-mensural2_c" 4 0)) - ("mensural3_c1" . ("clefs-mensural3_c" -2 0)) - ("mensural3_c2" . ("clefs-mensural3_c" 0 0)) - ("mensural3_c3" . ("clefs-mensural3_c" 2 0)) - ("mensural3_c4" . ("clefs-mensural3_c" 4 0)) - ("mensural_f" . ("clefs-mensural_f" 2 0)) - ) -) - -(define (clef-name-to-properties cl) - (let ((e '()) - (oct 0) - (l (string-length cl)) - ) - - ;; ugh. cleanme - (if (equal? "8" (substring cl (- l 1) l)) - (begin - (if (equal? "^" (substring cl (- l 2) (- l 1))) - (set! oct 7) - (set! oct -7)) - - (set! cl (substring cl 0 (- l 2))))) - - - (set! e (assoc cl supported-clefs)) - (if (pair? e) - `(((symbol . clefGlyph) - (iterator-ctor . ,Property_iterator::constructor) - (value . ,(cadr e)) - ) - ((symbol . clefPosition) - (iterator-ctor . ,Property_iterator::constructor) - (value . ,(caddr e)) - ) - ,(if (not (equal? oct 0)) - `((symbol . clefOctavation) - (iterator-ctor . ,Property_iterator::constructor) - (value . ,oct) - )) - ) - (begin - (ly-warn (string-append "Unknown clef type `" cl "'\nSee scm/lily.scm for supported clefs")) - '()) - ))) - - - -(define (repeat-name-to-ctor name) - (let* - ((supported-reps - `(("volta" . ((iterator-ctor . ,Volta_repeat_iterator::constructor) - (length . ,Repeated_music::volta_music_length) - )) - ("unfold" . ((iterator-ctor . ,Unfolded_repeat_iterator::constructor) - (length . ,Repeated_music::unfolded_music_length) - )) - ("fold" . ((iterator-ctor . ,Folded_repeat_iterator::constructor) - (length . ,Repeated_music::folded_music_length) - )) - ("tremolo" . ((iterator-ctor . ,Chord_tremolo_iterator::constructor) - (length . ,Repeated_music::unfolded_music_length) - )) - )) - - (handle (assoc name supported-reps)) - ) - - (if (pair? handle) - (cdr handle) - (begin - (ly-warn - (string-append "Unknown repeat type `" name "'\nSee scm/lily.scm for supported repeats") - ) - '(type . 'repeated-music)) - ) - )) - - -(map (lambda (x) (eval-string (ly-gulp-file x))) - '("tex.scm" +(map (lambda (x) (eval-string (ly-gulp-file x))) + '("output-lib.scm" + "tex.scm" "ps.scm" -; "ascii-script.scm" - "backend-property.scm" - "translator-properties.scm" - "interface.scm" - "beam.scm" - "slur.scm" - "font.scm" - "auto-beam.scm" - "generic-property.scm" - "basic-properties.scm" - "chord-name.scm" - "element-descriptions.scm" + ;; "ascii-script.scm" )) + +(if (not standalone) + (map (lambda (x) (eval-string (ly-gulp-file x))) + '("c++.scm" + "backend-property.scm" + "translator-properties.scm" + "interface.scm" + "beam.scm" + "clef.scm" + "slur.scm" + "font.scm" + "auto-beam.scm" + "generic-property.scm" + "basic-properties.scm" + "chord-name.scm" + "element-descriptions.scm" + ))) diff --git a/scm/output-lib.scm b/scm/output-lib.scm new file mode 100644 index 0000000000..2ccf6c576e --- /dev/null +++ b/scm/output-lib.scm @@ -0,0 +1,108 @@ +;;;; output-lib.scm -- implement Scheme output helper functions +;;;; +;;;; source file of the GNU LilyPond music typesetter +;;;; +;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; Han-Wen Nienhuys + + +(define (arg->string arg) + (cond ((number? arg) (inexact->string arg 10)) + ((string? arg) (string-append "\"" arg "\"")) + ((symbol? arg) (string-append "\"" (symbol->string arg) "\"")))) + +;; ugh: naming. +(define (func name . args) + (string-append + "(" name + (if (null? args) + "" + (apply string-append + (map (lambda (x) (string-append " " (arg->string x))) args))) + ")\n")) + + +;;(define (mm-to-pt x) +;; (* (/ 72.27 25.40) x)) + +;; do nothing in .scm output +(define (comment s) "") + +(define (numbers->string l) + (apply string-append (map ly-number->string l))) + +; (define (chop-decimal x) (if (< (abs x) 0.001) 0.0 x)) + +(define (number->octal-string x) + (let* ((n (inexact->exact x)) + (n64 (quotient n 64)) + (n8 (quotient (- n (* n64 64)) 8))) + (string-append + (number->string n64) + (number->string n8) + (number->string (remainder (- n (+ (* n64 64) (* n8 8))) 8))))) + +(define (inexact->string x radix) + (let ((n (inexact->exact x))) + (number->string n radix))) + + +(define (control->string c) + (string-append (number->string (car c)) " " + (number->string (cdr c)) " ")) + +(define (font i) + (string-append + "font" + (make-string 1 (integer->char (+ (char->integer #\A) i))))) + +(define (scm-scm action-name) + 1) + + +;; silly, use alist? +(define (find-notehead-symbol duration style) + (case style + ((cross) "2cross") + ((harmonic) "0mensural") + ((baroque) + (string-append (number->string duration) + (if (< duration 0) "mensural" ""))) + ((default) (number->string duration)) + (else + (string-append (number->string duration) (symbol->string style))))) + + +(define (string-encode-integer i) + (cond + ((= i 0) "o") + ((< i 0) (string-append "n" (string-encode-integer (- i)))) + (else (string-append + (make-string 1 (integer->char (+ 65 (modulo i 26)))) + (string-encode-integer (quotient i 26)))))) + + +(define (tex-encoded-fontswitch name-mag) + (let* ((iname-mag (car name-mag)) + (ename-mag (cdr name-mag))) + (cons iname-mag + (cons ename-mag + (string-append "magfont" + (string-encode-integer + (hashq (car ename-mag) 1000000)) + "m" + (string-encode-integer + (inexact->exact (* 1000 (cdr ename-mag))))))))) + +(define (define-fonts internal-external-name-mag-pairs) + (set! font-name-alist (map tex-encoded-fontswitch + internal-external-name-mag-pairs)) + (apply string-append + (map (lambda (x) + (font-load-command (car x) (cdr x))) + (map cdr font-name-alist)))) + +(define (fontify name-mag-pair exp) + (string-append (select-font name-mag-pair) + exp)) + diff --git a/scm/standalone.scm b/scm/standalone.scm new file mode 100644 index 0000000000..dc3ee80fce --- /dev/null +++ b/scm/standalone.scm @@ -0,0 +1,37 @@ +;;;; standalone.scm -- implement Scheme stuff for use without LilyPond +;;;; +;;;; source file of the GNU LilyPond music typesetter +;;;; +;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; Han-Wen Nienhuys + +(define standalone (not (defined? 'ly-gulp-file))) +(write standalone (current-error-port)) + +(define (gulp-file name) + (let* ((file (open-input-file name)) + (text (read-delimited "" file))) + (close file) + text)) + +(define (scm-gulp-file name) + (set! %load-path + (cons (string-append (getenv 'LILYPONDPREFIX) "/ly") + (cons (string-append (getenv 'LILYPONDPREFIX) "/ps") + %load-path))) + (let ((path (%search-load-path name))) + (if path + (gulp-file path) + (gulp-file name)))) + +(define (scm-number->string x) + (let ((e (inexact->exact x))) + (string-append (if (= e x) + (number->string e) + (number->string x)) + " "))) + +(define ly-gulp-file scm-gulp-file) +(define ly-number->string scm-number->string) + +(eval-string (ly-gulp-file "lily.scm")) \ No newline at end of file diff --git a/scm/tex.scm b/scm/tex.scm index 85260f0390..fb3212d412 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -136,7 +136,8 @@ "{" (output-tex-string val) "}\n")) (define (number->dim x) - (string-append + (string-append + ;;ugh ly-* in backend needs compatibility func for standalone output (ly-number->string x) " \\outputscale ")) (define (placebox x y s) -- 2.39.5