From 74aea94b4620d812567260532d74d386be8fb571 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 23 Feb 2001 12:08:31 +0100 Subject: [PATCH] patch::: 1.3.130.jcn3 1.3.130.jcn3 --- CHANGES | 13 +- VERSION | 2 +- flower/file-path.cc | 4 +- flower/include/file-path.hh | 20 +- flower/simple-file-storage.cc | 2 +- lily/all-font-metrics.cc | 3 +- lily/auto-beam-engraver.cc | 2 - lily/beam-engraver.cc | 2 - lily/beam.cc | 12 - lily/chord-tremolo-engraver.cc | 1 - lily/include/beam.hh | 1 - lily/include/main.hh | 37 ++- lily/include/midi-def.hh | 7 +- lily/include/music-output-def.hh | 2 +- lily/include/paper-def.hh | 6 +- lily/main.cc | 211 ++++++++++------- lily/midi-def.cc | 16 +- lily/midi-stream.cc | 2 +- lily/music-output-def.cc | 10 +- lily/my-lily-parser.cc | 2 +- lily/paper-def.cc | 12 +- lily/paper-outputter.cc | 12 +- lily/paper-score.cc | 8 +- lily/paper-stream.cc | 14 +- lily/performance.cc | 9 +- lily/scores.cc | 8 +- lily/translator-group.cc | 2 +- po/de.po | 391 ++++++++++++++++--------------- po/fr.po | 374 ++++++++++++++--------------- po/it.po | 386 +++++++++++++++--------------- po/ja.po | 390 +++++++++++++++--------------- po/lilypond.pot | 341 +++++++++++++-------------- po/nl.po | 360 ++++++++++++++-------------- po/ru.po | 380 ++++++++++++++++-------------- 34 files changed, 1551 insertions(+), 1491 deletions(-) diff --git a/CHANGES b/CHANGES index d58fe10b43..6ad09c4548 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,16 @@ -1.3.130.jcn2 +1.3.130.jcn3 ============ -////* Changed default output extension to ".lytex". +* nl.po update. + +* Bugfixes and cleanups of mainly main.cc. + +* Enabled changing default tex output extension to ".lytex". + +* Bugfix: use init file extension .ly for extensionless input. + +1.3.130.jcn2 +============ * Ignore outname = ; settings in output blocks. diff --git a/VERSION b/VERSION index a6392e0bc9..c425c63dc6 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=130 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/flower/file-path.cc b/flower/file-path.cc index a17f47c43a..03ae895f93 100644 --- a/flower/file-path.cc +++ b/flower/file-path.cc @@ -5,6 +5,7 @@ #include "config.h" #include #include + #if HAVE_SYS_STAT_H #include #endif @@ -28,8 +29,9 @@ #define EXTSEP '.' #endif +/* Join components to full path. */ String -Path::path () const +Path::str () const { String s; if (!root.empty_b ()) diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh index 898bb3939f..c7eb980c3b 100644 --- a/flower/include/file-path.hh +++ b/flower/include/file-path.hh @@ -1,13 +1,14 @@ /* - path.hh -- declare File_path + file-path.hh -- declare Path and File_path source file of the Flower Library (c) 1997--2000 Han-Wen Nienhuys */ -#ifndef PATH_HH -#define PATH_HH +#ifndef FILE_PATH_HH +#define FILE_PATH_HH + #include "string.hh" #include "array.hh" @@ -19,8 +20,6 @@ Search a number of dirs for a file. TODO: add a unix style PATH interface - Should use kpathsea? - */ class Path @@ -31,7 +30,7 @@ public: String base; String ext; - String path () const; + String str () const; }; class File_path : private Array @@ -46,13 +45,6 @@ public: void parse_path (String); }; -/** split a path into its components. - - @params path - - @return - String &drive, String &dirs, String &filebase, String &extension - */ Path split_path (String path); -#endif +#endif /* FILE_PATH */ diff --git a/flower/simple-file-storage.cc b/flower/simple-file-storage.cc index 5b61cc1f43..34cda9d1f4 100644 --- a/flower/simple-file-storage.cc +++ b/flower/simple-file-storage.cc @@ -74,7 +74,7 @@ Simple_file_storage::Simple_file_storage (String s) data_p_ = 0; len_i_ = 0; - if (!s.length_i () || (s == "-")) + if ((s == "-")) load_stdin (); else load_file (s); diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 33a4667ef7..43b9deee6c 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -81,7 +81,8 @@ All_font_metrics::find_afm (String name) if (tfm->info_.checksum != afm->checksum_) { - String s = _f ("checksum mismatch for font file:\n`%s'", path.ch_C ()); + String s = _f ("checksum mismatch for font file: `%s'", + path.ch_C ()); s += " " + _f ("does not match: `%s'", tfm->path_.ch_C()); // FIXME s += "\n"; s += " TFM: " + to_str ((int) tfm->info_.checksum); diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 1dafaad75b..aa4013d2fd 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -219,8 +219,6 @@ Spanner* Auto_beam_engraver::create_beam_p () { Spanner* beam_p = new Spanner (get_property ("Beam")); - Beam::set_interface (beam_p); - for (int i = 0; i < stem_l_arr_p_->size (); i++) { /* diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index fdb459ccb2..59f41ea6b1 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -161,8 +161,6 @@ Beam_engraver::create_grobs () prev_start_req_ = reqs_drul_[START]; beam_p_ = new Spanner (get_property ("Beam")); - Beam::set_interface (beam_p_); - SCM smp = get_property ("measurePosition"); Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); diff --git a/lily/beam.cc b/lily/beam.cc index d58054aa8f..1c00665db9 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1066,15 +1066,3 @@ Beam::has_interface (Grob*me) return me->has_interface (ly_symbol2scm ("beam-interface")); } -void -Beam::set_interface (Grob*me) -{ -#if 0 - /* - why the init? No way to tell difference between default and user - override. */ - me->set_grob_property ("y" ,gh_double2scm (0)); - me->set_grob_property ("dy", gh_double2scm (0)); - me->set_interface (ly_symbol2scm("beam-interface")); -#endif -} diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index e990addf9b..52727f7a1f 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -107,7 +107,6 @@ Chord_tremolo_engraver::process_music () if (sequential_body_b_ && !beam_p_) { beam_p_ = new Spanner (get_property ("Beam")); - Beam::set_interface (beam_p_); beam_p_->set_grob_property ("chord-tremolo", SCM_BOOL_T); diff --git a/lily/include/beam.hh b/lily/include/beam.hh index c1eb843b1a..3f0b1a8b2a 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -19,7 +19,6 @@ public: static Item* first_visible_stem (Grob*); static Item* last_visible_stem (Grob*); static bool has_interface (Grob*); - static void set_interface (Grob*); DECLARE_SCHEME_CALLBACK(rest_collision_callback, (SCM element, SCM axis)); Beam (SCM); static void add_stem (Grob*,Grob*); diff --git a/lily/include/main.hh b/lily/include/main.hh index 3d543bb01a..af12beda0b 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -18,34 +18,27 @@ void add_score (Score* s); void set_default_output (String s); String find_file (String); void call_constructors (); +extern Array get_inclusion_names (); +extern void set_inclusion_names (Array); -extern Sources* source_global_l; +/* options */ +extern bool dependency_global_b; +extern Array dump_header_fieldnames_global; extern bool no_paper_global_b; -extern bool safe_global_b; extern bool no_timestamps_global_b; -extern bool find_old_relative_b; - -extern int exit_status_i_; -extern bool experimental_features_global_b; -extern bool dependency_global_b; +extern String output_format_global; +extern String output_name_global; +extern bool safe_global_b; extern bool verbose_global_b; - -extern Array get_inclusion_names (); -extern void set_inclusion_names (Array); - -extern File_path global_path; - -/* - names of header fields to be dumped to a separate file. -*/ -extern Array global_dumped_header_fieldnames; - -extern String outname_global; -extern String outext_global; -extern int default_count_global; +/* misc */ extern All_font_metrics *all_fonts_global_p; +extern int exit_status_global; +extern File_path global_path; +extern int score_count_global; +extern Sources* source_global_l; class ostream; void print_lilypond_versions (ostream &os); -#endif + +#endif /* MAIN_HH */ diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh index adf7a3e792..b670897c66 100644 --- a/lily/include/midi-def.hh +++ b/lily/include/midi-def.hh @@ -20,18 +20,17 @@ definitions for midi output. Rather empty */ class Midi_def : public Music_output_def { - static int default_count_i_; + static int score_count_i_; public: VIRTUAL_COPY_CONS(Music_output_def); Midi_def(); - ~Midi_def(); int get_tempo_i (Moment moment); void set_tempo (Moment moment, int count_per_minute_i); - virtual int get_next_default_count () const; - static void reset_default_count(); + virtual int get_next_score_count () const; + static void reset_score_count(); }; #endif // MIDI_DEF_HH diff --git a/lily/include/music-output-def.hh b/lily/include/music-output-def.hh index 7d5872de6d..0fbae9e427 100644 --- a/lily/include/music-output-def.hh +++ b/lily/include/music-output-def.hh @@ -35,7 +35,7 @@ public: VIRTUAL_COPY_CONS(Music_output_def); Music_output_def (Music_output_def const&); Music_output_def (); - virtual int get_next_default_count () const; + virtual int get_next_score_count () const; Global_translator *get_global_translator_p (); Translator_group *get_group_translator_p (String type) const; diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh index 8346074e30..55c15c5e01 100644 --- a/lily/include/paper-def.hh +++ b/lily/include/paper-def.hh @@ -54,7 +54,7 @@ protected: public: SCM font_descriptions ()const; virtual ~Paper_def (); - static int default_count_i_; + static int score_count_i_; /* JUNKME @@ -68,8 +68,8 @@ public: Interval line_dimensions_int (int) const; - virtual int get_next_default_count () const; - static void reset_default_count(); + virtual int get_next_score_count () const; + static void reset_score_count (); void output_settings (Paper_outputter*) const; Paper_outputter* paper_outputter_p () ; diff --git a/lily/main.cc b/lily/main.cc index 9db178b17d..d5ed455e4b 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -11,16 +11,20 @@ #include #include +#include "config.h" + +#if HAVE_GETTEXT +#include +#endif + #include "lily-guile.hh" #include "lily-version.hh" - #include "all-font-metrics.hh" #include "getopt-long.hh" #include "misc.hh" #include "string.hh" #include "main.hh" #include "file-path.hh" -#include "config.h" #include "file-results.hh" #include "debug.hh" #include "lily-guile.hh" @@ -30,42 +34,61 @@ #include "kpath.hh" -#if HAVE_GETTEXT -#include -#endif +/* + Global options that can be overridden through command line. +*/ +/* Write dependencies file? */ +bool dependency_global_b = false; +/* Names of header fields to be dumped to a separate file. */ +Array dump_header_fieldnames_global; -bool verbose_global_b = false; +/* Name of initialisation file. */ +String init_name_global; + +/* Do not calculate and write paper output? */ bool no_paper_global_b = false; + +/* Do not write timestamps in output? */ bool no_timestamps_global_b = false; -bool find_old_relative_b = false; -All_font_metrics *all_fonts_global_p; +/* Selected output format. + One of tex, ps, scm, as. */ +String output_format_global = "tex"; -String outname_global; -// Hmm: -// (lytex-scm (quote all-definitions)) -// String outext_global = "lytex"; -String outext_global = "tex"; +/* Current output name. */ +String output_name_global; -String init_name_global; +/* Run in safe mode? -- FIXME: should be re-analised */ +bool safe_global_b = false; + +/* Verbose progress indication? */ +bool verbose_global_b = false; + + + +/* + Misc. global stuff. + */ -// default? count -int default_count_global; + +All_font_metrics *all_fonts_global_p; +int exit_status_global; File_path global_path; -Array global_dumped_header_fieldnames; +/* Number of current score output block. If there's more than one + score block, this counter will be added to the output filename. */ +int score_count_global; -bool safe_global_b = false; -bool experimental_features_global_b = false; -bool dependency_global_b = false; -int exit_status_i_; -Getopt_long * oparser_global_p = 0; +/* + File globals. + */ -Path distill_inname (String name_str); +/* The option parser */ +static Getopt_long *oparser_p_static = 0; /* Internationalisation kludge in two steps: @@ -75,7 +98,7 @@ Path distill_inname (String name_str); Note: these messages all start with lower case (ie, don't follow regular localisation guidelines). */ -Long_option_init theopts[] = { +static Long_option_init options_static[] = { {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, {0, "help", 'h', _i ("this help")}, {_i ("FIELD"), "header", 'H', _i ("write header field to BASENAME.FIELD")}, @@ -84,10 +107,8 @@ Long_option_init theopts[] = { {0, "dependencies", 'M', _i ("write Makefile dependencies for every input file")}, {0, "no-paper", 'm', _i ("produce MIDI output only")}, {_i ("NAME"), "output", 'o', _i ("write output to NAME")}, - {0, "find-old-relative", 'Q', _i ("show all changes in relative syntax")}, {0, "safe", 's', _i ("inhibit file output naming and exporting")}, {0, "no-timestamps", 'T', _i ("don't timestamp the output")}, - {0, "test", 't', _i ("switch on experimental features")}, {0, "version", 'v', _i ("print version number")}, {0, "verbose", 'V', _i("verbose")}, {0, "warranty", 'w', _i ("show warranty and copyright")}, @@ -121,7 +142,7 @@ _( cout << '\n'; cout << _ ("Options:"); cout << '\n'; - cout << Long_option_init::table_str (theopts); + cout << Long_option_init::table_str (options_static); cout << '\n'; cout << _ ("This binary was compiled with the following options:") << " " << @@ -248,6 +269,45 @@ setup_paths () } } +/** + Make input file name from command argument. + + Path describes file name with added default extension, + ".ly" if none. "-" is stdin. + */ +Path +distill_inname (String str) +{ + Path p = split_path (str); + if (str.empty_b () || str == "-") + p.base = "-"; + else + { + String orig_ext = p.ext; + char const *extensions[] = {"ly", "fly", "sly", "", 0}; + for (int i = 0; extensions[i]; i++) + { + p.ext = orig_ext; + if (*extensions[i] && !p.ext.empty_b ()) + p.ext += "."; + p.ext += extensions[i]; + if (!global_path.find (p.str ()).empty_b ()) + break; + } + /* Reshuffle extension */ + p = split_path (p.str ()); + } + return p; +} + +String +format_to_ext (String format) +{ + if (format == "tex") + /* .lytex change in separate (revertable) patch: 1.3.130.jcn4 */ + return "tex"; // "lytex"; + return format; +} void main_prog (int, char**) @@ -266,7 +326,7 @@ main_prog (int, char**) int p=0; const char *arg ; - while ((arg = oparser_global_p->get_next_arg ()) || p == 0) + while ((arg = oparser_p_static->get_next_arg ()) || p == 0) { String infile; @@ -280,38 +340,50 @@ main_prog (int, char**) // file, but only if user didn't specify a outname? Huh? // if (outname_str_global == "") { - Midi_def::reset_default_count (); - Paper_def::reset_default_count (); + Midi_def::reset_score_count (); + Paper_def::reset_score_count (); } Path inpath = distill_inname (infile); + + /* By default, use base name of input file for output file name */ Path outpath = inpath; - outpath.ext = outext_global; - if (!outname_global.empty_b ()) - outpath = split_path (outname_global); + if (inpath.str () != "-") + outpath.ext = format_to_ext (output_format_global); + + /* By default, write output to cwd; do not copy directory part + of input file name */ + outpath.root = ""; + outpath.dir = ""; + + if (!output_name_global.empty_b ()) + outpath = split_path (output_name_global); String init; if (!init_name_global.empty_b ()) init = init_name_global; - else + else if (!inpath.ext.empty_b ()) init = "init." + inpath.ext; - + else + init = "init.ly"; + /* Burp: output name communication goes through _global */ - String save_outname_global = outname_global; - outname_global = outpath.path (); - do_one_file (init, inpath.path ()); - outname_global = save_outname_global; + String save_output_name_global = output_name_global; + output_name_global = outpath.str (); + do_one_file (init, inpath.str ()); + output_name_global = save_output_name_global; + p++; } - delete oparser_global_p; - exit (exit_status_i_); + delete oparser_p_static; + exit (exit_status_global); } int main (int argc, char **argv) { - debug_init (); // should be first + debug_init (); // should be first (can see that; but Why?) setup_paths (); /* @@ -324,8 +396,8 @@ main (int argc, char **argv) ly_init_kpath (argv[0]); - oparser_global_p = new Getopt_long(argc, argv,theopts); - while (Long_option_init const * opt = (*oparser_global_p)()) + oparser_p_static = new Getopt_long(argc, argv, options_static); + while (Long_option_init const * opt = (*oparser_p_static)()) { switch (opt->shortname_ch_) { @@ -333,17 +405,13 @@ main (int argc, char **argv) version (); exit (0); // we print a version anyway. break; - case 't': - experimental_features_global_b = true; - progress_indication ("*** enabling experimental features, you're on your own now ***\n"); - break; case 'o': { - String s = oparser_global_p->optional_argument_ch_C_; + String s = oparser_p_static->optional_argument_ch_C_; Path p = split_path (s); if (p.ext.empty_b ()) - p.ext = outext_global; - outname_global = p.path (); + p.ext = format_to_ext (output_format_global); + output_name_global = p.str (); } break; case 'w': @@ -351,19 +419,16 @@ main (int argc, char **argv) exit (0); break; case 'f': - outext_global = oparser_global_p->optional_argument_ch_C_; - break; - case 'Q': - find_old_relative_b= true; + output_format_global = oparser_p_static->optional_argument_ch_C_; break; case 'H': - global_dumped_header_fieldnames.push (oparser_global_p->optional_argument_ch_C_); + dump_header_fieldnames_global.push (oparser_p_static->optional_argument_ch_C_); break; case 'I': - global_path.push (oparser_global_p->optional_argument_ch_C_); + global_path.push (oparser_p_static->optional_argument_ch_C_); break; case 'i': - init_name_global = oparser_global_p->optional_argument_ch_C_; + init_name_global = oparser_p_static->optional_argument_ch_C_; break; case 'h': usage (); @@ -400,34 +465,4 @@ main (int argc, char **argv) return 0; // unreachable } -/** - Make input file name from command argument. - - Path describes file name with added default extension, - ".ly" if none. "-" is stdin. - */ -Path -distill_inname (String str) -{ - Path p = split_path (str); - if (str.empty_b () || str == "-") - p.base = "-"; - else - { - String orig_ext = p.ext; - char const *extensions[] = {"ly", "fly", "sly", "", 0}; - for (int i = 0; extensions[i]; i++) - { - p.ext = orig_ext; - if (*extensions[i] && !p.ext.empty_b ()) - p.ext += "."; - p.ext += extensions[i]; - if (!global_path.find (p.path ()).empty_b ()) - break; - } - /* Reshuffle extension */ - p = split_path (p.path ()); - } - return p; -} diff --git a/lily/midi-def.cc b/lily/midi-def.cc index 685076461b..1917ef03c6 100644 --- a/lily/midi-def.cc +++ b/lily/midi-def.cc @@ -19,12 +19,6 @@ Midi_def::Midi_def() set_tempo (Moment (1, 4), 60); } -Midi_def::~Midi_def() -{ -} - - - int Midi_def::get_tempo_i (Moment one_beat_mom) { @@ -44,16 +38,16 @@ Midi_def::set_tempo (Moment one_beat_mom, int beats_per_minute_i) } -int Midi_def::default_count_i_=0; +int Midi_def::score_count_i_=0; int -Midi_def::get_next_default_count () const +Midi_def::get_next_score_count () const { - return default_count_i_++; + return score_count_i_++; } void -Midi_def::reset_default_count () +Midi_def::reset_score_count () { - default_count_i_ = 0; + score_count_i_ = 0; } diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index f84544976f..e45aa67b88 100644 --- a/lily/midi-stream.cc +++ b/lily/midi-stream.cc @@ -27,7 +27,7 @@ Midi_stream::~Midi_stream () if (!*os_p_) { warning (_ ("Error syncing file (disk full?)")); - exit_status_i_ = 1; + exit_status_global = 1; } delete os_p_; } diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index bf46b4645c..fe351cdcb4 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -21,7 +21,7 @@ #include "ly-smobs.icc" int -Music_output_def::get_next_default_count () const +Music_output_def::get_next_score_count () const { return 0; } @@ -134,13 +134,13 @@ Music_output_def::print_smob (SCM s, SCM p, scm_print_state *) String Music_output_def::outname_str () { - String out = outname_global; - int def = get_next_default_count (); - if (def) + String out = output_name_global; + int def = get_next_score_count (); + if (def && out != "-") { Path p = split_path (out); p.base += "-" + to_str (def); - out = p.path (); + out = p.str (); } return out; } diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index b19386cb30..3294631c41 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -78,7 +78,7 @@ My_lily_parser::parser_error (String s) { here_input().error (s); error_level_i_ = 1; - exit_status_i_ = 1; + exit_status_global = 1; } void diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 063051f595..4958419c19 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -87,18 +87,18 @@ Paper_def::line_dimensions_int (int n) const -int Paper_def::default_count_i_ = 0; +int Paper_def::score_count_i_ = 0; int -Paper_def::get_next_default_count () const +Paper_def::get_next_score_count () const { - return default_count_i_ ++; + return score_count_i_ ++; } void -Paper_def::reset_default_count() +Paper_def::reset_score_count() { - default_count_i_ = 0; + score_count_i_ = 0; } @@ -113,7 +113,7 @@ Paper_def::paper_outputter_p () Paper_outputter * po = new Paper_outputter (outname); Path p = split_path (outname); p.ext = ""; - po->basename_ = p.path (); + po->basename_ = p.str (); return po; } diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 7afa06e812..c27fafdcb1 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -41,12 +41,12 @@ Paper_outputter::Paper_outputter (String name) lilypond -f scm x.ly guile -s x.scm */ - verbatim_scheme_b_ = outext_global == "scm"; + verbatim_scheme_b_ = output_format_global == "scm"; if (verbatim_scheme_b_) { *stream_p_ << "" - ";;; Usage: guile -s x.scm > x.tex\n" + ";;; Usage: guile -s x.scm > x.lytex\n" "(primitive-load-path 'standalone.scm)\n" ";(scm-tex-output)\n" "(scm-ps-output)\n" @@ -74,7 +74,7 @@ Paper_outputter::output_header () gh_define ("security-paranoia", SCM_BOOL_T); } - SCM exp = gh_list (ly_symbol2scm ((outext_global + "-scm").ch_C()), + SCM exp = gh_list (ly_symbol2scm ((output_format_global + "-scm").ch_C()), ly_quote_scm (ly_symbol2scm ("all-definitions")), SCM_UNDEFINED); exp = scm_eval2 (exp, SCM_EOL); @@ -250,12 +250,12 @@ Paper_outputter::write_header_field_to_file (String filename, String key, String void Paper_outputter::write_header_fields_to_file (Scope * header) { - if (global_dumped_header_fieldnames.size ()) + if (dump_header_fieldnames_global.size ()) { SCM fields = header->to_alist (); - for (int i = 0; i < global_dumped_header_fieldnames.size (); i++) + for (int i = 0; i < dump_header_fieldnames_global.size (); i++) { - String key = global_dumped_header_fieldnames[i]; + String key = dump_header_fieldnames_global[i]; SCM val = gh_assoc (ly_symbol2scm (key.ch_C ()), fields); String s; /* Only write header field to file if it exists */ diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 82d2287446..3b4b40cc1e 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -115,13 +115,7 @@ Paper_score::process () if (paper_l_->scope_p_) outputter_l_->output_scope (paper_l_->scope_p_, "lilypondpaper"); - SCM scm; - if (experimental_features_global_b) - { - SCM scm = gh_list (ly_symbol2scm ("experimental-on"), SCM_UNDEFINED); - outputter_l_->output_scheme (scm); - } - scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED); + SCM scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED); outputter_l_->output_scheme (scm); line_l_->output_lines (); diff --git a/lily/paper-stream.cc b/lily/paper-stream.cc index b15e262892..23e72a6363 100644 --- a/lily/paper-stream.cc +++ b/lily/paper-stream.cc @@ -7,10 +7,14 @@ */ #include -#include #include #include +#include "config.h" +#if HAVE_SYS_STAT_H +#include +#endif + #include "main.hh" #include "paper-stream.hh" #include "file-path.hh" @@ -22,7 +26,9 @@ ostream * open_file_stream (String filename) { ostream *os; - if (!filename.empty_b () && (filename != "-")) + if ((filename == "-")) + os = new ostream (cout._strbuf); + else { Path p = split_path (filename); if (!p.dir.empty_b ()) @@ -30,8 +36,6 @@ open_file_stream (String filename) error (_f ("can't create directory: `%s'", p.dir)); os = new ofstream (filename.ch_C ()); } - else - os = new ostream (cout._strbuf); if (!*os) error (_f ("can't open file: `%s'", filename)); return os; @@ -44,7 +48,7 @@ close_file_stream (ostream *os) if (!*os) { warning (_ ("Error syncing file (disk full?)")); - exit_status_i_ = 1; + exit_status_global = 1; } delete os; } diff --git a/lily/performance.cc b/lily/performance.cc index 53d223c7d2..be4b2c73c6 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -92,7 +92,8 @@ Performance::output_header_track (Midi_stream& midi_stream) Midi_text creator (&creator_a); midi_track.add (Moment (0), &creator); - str = _("Generated automatically by: "); + /* Better not translate this */ + str = "Generated automatically by: "; str += id_str; if (no_timestamps_global_b) str += ".\n"; @@ -145,15 +146,15 @@ Performance::add_element (Audio_element *p) void Performance::process() { - String out = outname_global; + String out = output_name_global; if (out == "-") out = "lelie.midi"; - int def = midi_l_->get_next_default_count (); + int def = midi_l_->get_next_score_count (); if (def) { Path p = split_path (out); p.base += "-" + to_str (def); - out = p.path (); + out = p.str (); } Midi_stream midi_stream (out); diff --git a/lily/scores.cc b/lily/scores.cc index 894a6a46c3..0e8659a1d8 100644 --- a/lily/scores.cc +++ b/lily/scores.cc @@ -60,9 +60,9 @@ do_deps() { if (dependency_global_b) { - Path p = split_path (outname_global); + Path p = split_path (output_name_global); p.ext = "dep"; - write_dependency_file (p.path (), + write_dependency_file (p.str (), target_str_global_array, inclusion_global_array); } @@ -81,7 +81,7 @@ do_scores() if (is_p->errorlevel_i_) { is_p->warning (_("Score contains errors; will not process it")); - exit_status_i_ |= 1; + exit_status_global |= 1; } else { @@ -132,7 +132,7 @@ do_one_file (String init_str, String file_str) if (parser.error_level_i_) { - exit_status_i_ = 1; + exit_status_global = 1; } else do_scores (); diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 1ae75fc8b9..702c42bf01 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -414,7 +414,7 @@ type_check_assignment (SCM val, SCM sym, SCM type_symbol) SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); SCM type_name = gh_call1 (typefunc, type_p); - scm_puts (_f ("Failed typecheck for `%s', value `%s' must be of type `%s'", + scm_puts (_f ("Type check for `%s' failed; value `%s' must be of type `%s'", ly_symbol2string (sym).ch_C (), ly_scm2string (ly_write2scm( val)).ch_C (), ly_scm2string (type_name).ch_C ()).ch_C (), diff --git a/po/de.po b/po/de.po index 3c1a256a87..7f7e5eeeea 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-12-17 15:35+0100\n" +"POT-Creation-Date: 2001-02-23 11:58+0100\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -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:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 +#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "Kann die Datei %s nicht öffnen" @@ -103,23 +103,28 @@ msgstr "Ich kann das Zeichen `%s' nicht finden" msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 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 +#: all-font-metrics.cc:155 #, c-format msgid "can't find font: `%s'" msgstr "Kann Schrift `%s' nicht finden" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 #, fuzzy msgid "Loading default font" msgstr "Kann die Schrift %s nicht finden, lade die Standardschrift." @@ -129,20 +134,29 @@ msgstr "Kann die Schrift %s nicht finden, lade die Standardschrift." msgid "can't find default font: `%s'" msgstr "Kann Schrift `%s' nicht finden" -#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114 #, c-format msgid "(search path: `%s')" msgstr "(Suchpfad: `%s')" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:84 +#, fuzzy +msgid "beam has less than two stems" +msgstr "Balken mit weniger als zwei Hälsen" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -153,33 +167,24 @@ msgstr "Kann nicht beide Enden von %s finden" msgid "already have a beam" msgstr "Habe schon einen Balken" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 #, fuzzy msgid "unterminated beam" msgstr "Unbeendeter Bindestrich" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "Ein Notenhals muss rhythmische Struktur haben." -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "Notenhals passt nicht in den Balken" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "Der Balken bagann hier" -#: beam.cc:83 -#, fuzzy -msgid "beam has less than two stems" -msgstr "Balken mit weniger als zwei Hälsen" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -204,37 +209,30 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:119 -#, fuzzy -msgid "unterminated chord tremolo" -msgstr "Unbeendeter Bindestrich" - -#: chord-tremolo-iterator.cc:42 -#, fuzzy -msgid "no one to print a tremolos" -msgstr "Keiner darf eine Wiederholungsklammer drucken" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" +#: chord-tremolo-engraver.cc:141 +#, fuzzy +msgid "unterminated chord tremolo" +msgstr "Unbeendeter Bindestrich" + +#: chord-tremolo-iterator.cc:48 +#, fuzzy +msgid "no one to print a tremolos" +msgstr "Keiner darf eine Wiederholungsklammer drucken" + #: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Zu viele aneinanderstoßende Notenspalten. Ich ignoriere sie." -#: cross-staff.cc:24 -#, fuzzy -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" - #: debug.cc:26 #, fuzzy msgid "floating point exception" @@ -249,40 +247,40 @@ msgstr "Kann die Speicher msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 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:220 +#: dynamic-engraver.cc:219 #, fuzzy msgid "already have a crescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 #, fuzzy msgid "already have a decrescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 #, fuzzy msgid "unterminated (de)crescendo" msgstr "Nichtbeendetes Crescendo" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "Unbeendete Linienfortführung" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 #, fuzzy msgid "no one to print a repeat brace" msgstr "Keiner darf eine Wiederholungsklammer drucken" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -318,13 +316,8 @@ msgstr "Unbeendeter Bindestrich" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:49 -#, fuzzy, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "Falscher Typ von Identifier: " - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:113 scores.cc:119 #, c-format msgid "can't find file: `%s'" msgstr "Kann Datei `%s' nicht finden" @@ -360,104 +353,98 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:102 msgid "EXT" msgstr "EXT" -#: main.cc:75 +#: main.cc:102 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "Benutze das Ausgabeformat EXT" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:103 msgid "this help" msgstr "Diese Hilfe" -#: main.cc:77 +#: main.cc:104 #, fuzzy msgid "FIELD" msgstr "DATEI" -#: main.cc:77 +#: main.cc:104 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:105 msgid "DIR" msgstr "DIR" -#: main.cc:78 +#: main.cc:105 msgid "add DIR to search path" msgstr "Hänge DIR an den Suchpfad an" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:106 msgid "FILE" msgstr "DATEI" -#: main.cc:79 +#: main.cc:106 msgid "use FILE as init file" msgstr "Verwende FILE als Initialisierungsdatei" -#: main.cc:80 +#: main.cc:107 msgid "write Makefile dependencies for every input file" msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" -#: main.cc:81 +#: main.cc:108 #, fuzzy msgid "produce MIDI output only" msgstr "Nur Midiausgabe" -#: main.cc:82 -msgid "BASENAME" +#: main.cc:109 +#, fuzzy +msgid "NAME" msgstr "BASENAME" -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:109 +#, fuzzy +msgid "write output to NAME" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" -#: main.cc:83 -msgid "show all changes in relative syntax" -msgstr "Zeige alle Veränderungen in relativer Syntax" - -#: main.cc:84 +#: main.cc:110 msgid "inhibit file output naming and exporting" msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:111 msgid "don't timestamp the output" msgstr "Keine Datumsangabe auf der Ausgabe" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "Schalte experimentelle Möglichkeiten an" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:112 msgid "print version number" msgstr "Zeige die Versionsnummer" -#: main.cc:88 +#: main.cc:113 #, fuzzy msgid "verbose" msgstr "Sei geschwätzig" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:114 msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:131 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." -#: main.cc:108 +#: main.cc:133 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Setze Musik oder spiele MIDI von DATEI" -#: main.cc:112 +#: main.cc:137 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" @@ -467,20 +454,20 @@ msgstr "" "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n" "lilyPond ist Teil des GNU-Projekts\n" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:143 msgid "Options:" msgstr "Optionen:" -#: main.cc:122 +#: main.cc:147 msgid "This binary was compiled with the following options:" msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:" -#: main.cc:123 main.cc:141 +#: main.cc:123 main.cc:166 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Melde Fehler an" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:174 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -493,17 +480,17 @@ msgstr "" "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n" "Sie mehr Informationen.\n" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:181 main.cc:193 #, c-format msgid "Copyright (c) %s by" msgstr "Urheberrechte (Copyright) (c) %s bei" -#: main.cc:166 +#: main.cc:191 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts" -#: main.cc:71 main.cc:174 +#: main.cc:71 main.cc:199 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" @@ -551,15 +538,15 @@ msgstr "Unsinnige Dauer" msgid "silly pitch" msgstr "unsinnige Tonhöhe" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 #, fuzzy msgid "Error syncing file (disk full?)" msgstr "Fehler beim Abspeichern der Datei (Platte voll?)" -#: music-output-def.cc:72 +#: musical-request.cc:29 #, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "Kann Partiturkontext nicht finden" +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponieren um %s macht Vorzecihen größer als zwei" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -573,17 +560,17 @@ msgstr "" msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: musical-request.cc:29 +#: music-output-def.cc:115 #, fuzzy, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponieren um %s macht Vorzecihen größer als zwei" +msgid "can't find `%s' context" +msgstr "Kann Partiturkontext nicht finden" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, fuzzy, c-format msgid "Identifier name is a keyword: `%s'" msgstr "name ist ein Schlüsselbegriff (keyword) (`%s')" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "Fehler am Dateiende(EOF): %s" @@ -602,16 +589,16 @@ msgstr "Klammern passen nicht zusammen" msgid "Junking request: `%s'" msgstr "Uralt-Bitte: `%s'" -#: paper-def.cc:116 +#: paper-def.cc:109 #, fuzzy, c-format msgid "paper output to %s..." msgstr "Ausgabe auf Papier auf %s..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", bei " -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." @@ -620,41 +607,41 @@ msgstr "Schreibe Datei mit Abh msgid "Preprocessing elements..." msgstr "Verarbeite Element vor..." -#: paper-score.cc:105 +#: paper-score.cc:112 #, fuzzy msgid "Outputting Score, defined at: " msgstr "Gebe Partitur aus, definiert bei: " +#: paper-stream.cc:36 +#, fuzzy, c-format +msgid "can't create directory: `%s'" +msgstr "Kann ein `%s' weder finden noch erzeugen" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, c-format msgid "I'm one myself: `%s'" msgstr "" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, c-format msgid "none of these in my family: `%s'" msgstr "" -#: performance.cc:50 +#: performance.cc:51 msgid "Track ... " msgstr "Stück ... " -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "Erstellt von: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "Automatisch generiert" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "von der musiaklischen Definition: %s" @@ -664,7 +651,17 @@ msgstr "von der musiaklischen Definition: %s" msgid "MIDI output to %s..." msgstr "MIDI-Ausgabe nach %s..." -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +#, fuzzy +msgid "unterminated phrasing slur" +msgstr "Unbeendeter Bindebogen" + +#: phrasing-slur-engraver.cc:134 +#, fuzzy +msgid "can't find start of phrasing slur" +msgstr "Kann nicht beide Enden von %s finden" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" @@ -674,15 +671,14 @@ msgstr "Kann keine k msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, fuzzy, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "Falsche Type für Besitz-Wert" @@ -697,42 +693,42 @@ msgstr "Zu viele kollidierende Pausen." msgid "too many notes for rest collision" msgstr "Zu viele Noten für kollidierende Pausen." -#: score-engraver.cc:177 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "Unbeschränkter Abstand `%s'" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "Interpretiere die Noten..." -#: score.cc:81 +#: score.cc:92 #, fuzzy msgid "Need music in a score" msgstr "Ich brauche Noten in einer Partitur" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 #, fuzzy msgid "Errors found/*, not processing score*/" msgstr "Habe Fehler gefunden, /* die Partitur wird nicht verarbeitet */" -#: score.cc:101 +#: score.cc:112 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "verstrichene Zeit %.2f Sekunden" -#: scores.cc:34 +#: score-engraver.cc:177 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." -msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." +msgid "unbound spanner `%s'" +msgstr "Unbeschränkter Abstand `%s'" + +#: scores.cc:35 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "Ausgabe auf Papier auf %s..." -#: scores.cc:79 +#: scores.cc:83 #, fuzzy msgid "Score contains errors; will not process it" msgstr "Partitur enthält Fehler; ich werde sie nicht weiterverarbeiten" -#: scores.cc:122 +#: scores.cc:129 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "Unbekannte Sonder-Zeichenkette" @@ -748,15 +744,6 @@ msgstr "Ich wei msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ich saufe zu viel" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "Unbeendeter Bindebogen" - -#: slur-engraver.cc:143 -#, fuzzy -msgid "can't find start of slur" -msgstr "Kann nicht beide Enden von %s finden" - #: slur.cc:49 #, fuzzy msgid "Putting slur over rest. Ignoring." @@ -766,18 +753,31 @@ msgstr "Setze Bindebogen msgid "Slur over rest?" msgstr "Bindebogen übe den Rest?" +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "Unbeendeter Bindebogen" + +#: slur-engraver.cc:142 +#, fuzzy +msgid "can't find start of slur" +msgstr "Kann nicht beide Enden von %s finden" + +#: stem.cc:116 +#, fuzzy +msgid "Weird stem size; check for narrow beams" +msgstr "" +"Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Setze Note auf unpassenden Hals (Typ = %d)" -#: stem.cc:117 -#, fuzzy -msgid "Weird stem size; check for narrow beams" +#: text-spanner.cc:117 +msgid "Text_spanner too small" msgstr "" -"Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 #, fuzzy msgid "can't find start of text spanner" msgstr "Kann nicht beide Enden von %s finden" @@ -787,14 +787,15 @@ msgstr "Kann nicht beide Enden von %s finden" msgid "already have a text spanner" msgstr "Habe schon einen Balken" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 #, fuzzy msgid "unterminated text spanner" msgstr "Unbeendete Linienfortführung" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "Kann ASCII-Zeichen `%d' nicht finden" #: tfm-reader.cc:105 #, c-format @@ -806,11 +807,6 @@ msgstr "TFM header von `%s' hat nur %u Wort(e)" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM-Datei hat %u Parameter. Das ist mehr als die" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "Kann ASCII-Zeichen `%d' nicht finden" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "Es wurden keine Haltebögen erzeugt!" @@ -863,21 +859,19 @@ msgstr "Kann ein `%s', genannt `%s' weder finden noch erzeugen" msgid "can't find or create: `%s'" msgstr "Kann ein `%s' weder finden noch erzeugen" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -898,112 +892,112 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "Älteste noch unterstütze Version der Eingabe: %s" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "Falsche Type für Besitz-Wert" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 #, fuzzy msgid "Must have duration object" msgstr "Setze kürzeste Dauer (?)" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "Um Text zu verarbeiten, muß ich im Text-(Lyrics)-Modus sein" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "Keine Dauer: %d" -#: parser.yy:1563 +#: parser.yy:1584 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "Für Noten muß ich im Noten-(Note)-Modus sein" -#: parser.yy:1659 +#: parser.yy:1680 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "Für Akkorde muß ich im Akkord-(Chord)-Modus sein" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "Während eines Kommentar war die Datei zu Ende (EOF gefunden)" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 +#: lexer.ll:203 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "Unbekannter Identifier: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 #, fuzzy msgid "Missing end quote" msgstr "Endnote fehlt" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "Erwarte Weiß" -#: lexer.ll:241 +#: lexer.ll:243 #, fuzzy msgid "Can't evaluate Scheme in safe mode" msgstr "Kann Scheme nicht interpretieren, wenn ich im sicheren Modus bin" -#: lexer.ll:433 +#: lexer.ll:439 #, c-format msgid "invalid character: `%c'" msgstr "Ungültiger Buchstabe `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "Unbekannte Sonder-Zeichenkette" -#: lexer.ll:597 +#: lexer.ll:602 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "Falsche Version von Mudela: (s /%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1223,6 +1217,29 @@ msgstr "% Automatisch generiert" msgid "% from input file: " msgstr "% aus Eingabedatei: " +#, fuzzy +#~ 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" + +#, fuzzy +#~ msgid "wrong identifier type, expected: `%s'" +#~ msgstr "Falscher Typ von Identifier: " + +#~ msgid "show all changes in relative syntax" +#~ msgstr "Zeige alle Veränderungen in relativer Syntax" + +#~ msgid "switch on experimental features" +#~ msgstr "Schalte experimentelle Möglichkeiten an" + +#~ msgid "Automatically generated" +#~ msgstr "Automatisch generiert" + +#, fuzzy +#~ msgid "Writing dependency file: `%s'..." +#~ msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." + #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "Falsche Type für Besitz-Wert" diff --git a/po/fr.po b/po/fr.po index 5ea9e6a350..f7c0f112e6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2000-12-17 15:35+0100\n" +"POT-Creation-Date: 2001-02-23 11:58+0100\n" "PO-Revision-Date: 1999-12-28 00:32 +1\n" "Last-Translator: Laurent Martelli \n" "Language-Team: \n" @@ -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:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 +#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "impossible d'ouvrir le fichier: `%s'" @@ -103,23 +103,28 @@ msgstr "impossible de trouver le caract msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 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 +#: all-font-metrics.cc:155 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 #, fuzzy msgid "Loading default font" msgstr "Impossible de trouver la police `%s', chargement la police par défaut" @@ -129,20 +134,29 @@ msgstr "Impossible de trouver la police `%s', chargement la police par d msgid "can't find default font: `%s'" msgstr "Impossible de trouver la fonte par défaut `%s', abandon." -#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114 #, fuzzy, c-format msgid "(search path: `%s')" msgstr "chemin de recherche= %s" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:84 +#, fuzzy +msgid "beam has less than two stems" +msgstr "barre avec moins de deux tiges" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -153,33 +167,24 @@ msgstr "impossible de trouver le caract msgid "already have a beam" msgstr "Il y a déjà une barre" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 #, fuzzy msgid "unterminated beam" msgstr "Barre non terminée" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "La tige doit avoir une structure rythmique." -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "la tige ne rentre pas dans la barre" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "la barre a commencé ici" -#: beam.cc:83 -#, fuzzy -msgid "beam has less than two stems" -msgstr "barre avec moins de deux tiges" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -204,33 +209,29 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:119 -msgid "unterminated chord tremolo" -msgstr "" - -#: chord-tremolo-iterator.cc:42 -msgid "no one to print a tremolos" -msgstr "" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "soustraction invalide: ne fait pas partie de l'accord: %s" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "renversement invalide: ne fait pas partie de l'accord: %s" +#: chord-tremolo-engraver.cc:141 +msgid "unterminated chord tremolo" +msgstr "" + +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "" + #: collision.cc:116 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Trop de colonnes de notes superposées. Je les ignore." -#: cross-staff.cc:24 -msgid "not a forced distance; cross-staff spanners may be broken" -msgstr "" - #: debug.cc:26 #, fuzzy msgid "floating point exception" @@ -245,39 +246,39 @@ msgstr "impossible de positionner mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 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:220 +#: dynamic-engraver.cc:219 #, fuzzy msgid "already have a crescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 #, fuzzy msgid "already have a decrescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminé" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -311,13 +312,8 @@ msgstr "" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:49 -#, fuzzy, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "Mauvais type d'indentifiant: " - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:113 scores.cc:119 #, c-format msgid "can't find file: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" @@ -353,103 +349,95 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:102 msgid "EXT" msgstr "" -#: main.cc:75 +#: main.cc:102 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:103 msgid "this help" msgstr "cette aide" -#: main.cc:77 +#: main.cc:104 #, fuzzy msgid "FIELD" msgstr "FICHIER" -#: main.cc:77 +#: main.cc:104 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:105 msgid "DIR" msgstr "REP" -#: main.cc:78 +#: main.cc:105 #, fuzzy msgid "add DIR to search path" msgstr "ajoute REP au chemin de recherche" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:106 msgid "FILE" msgstr "FICHIER" -#: main.cc:79 +#: main.cc:106 #, fuzzy msgid "use FILE as init file" msgstr "utilise FICHIER comme fichier d'initialisation" -#: main.cc:80 +#: main.cc:107 msgid "write Makefile dependencies for every input file" msgstr "" -#: main.cc:81 +#: main.cc:108 #, fuzzy msgid "produce MIDI output only" msgstr "produit seulement la sortie MIDI" -#: main.cc:82 -msgid "BASENAME" -msgstr "" - -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:109 +msgid "NAME" msgstr "" -#: main.cc:83 -msgid "show all changes in relative syntax" +#: main.cc:109 +msgid "write output to NAME" msgstr "" -#: main.cc:84 +#: main.cc:110 msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:111 msgid "don't timestamp the output" msgstr "" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:112 msgid "print version number" msgstr "afficher le numéro de version" -#: main.cc:88 +#: main.cc:113 msgid "verbose" msgstr "" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:114 msgid "show warranty and copyright" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:131 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Usage: %s [OPTION]... [FICHIER]..." -#: main.cc:108 +#: main.cc:133 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:112 +#: main.cc:137 #, fuzzy msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" @@ -460,21 +448,21 @@ msgstr "" "paritions à partir de description de gaut niveau en entrée. Lilypond\n" "fait partie du projet GNU.\n" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:143 msgid "Options:" msgstr "Options: " -#: main.cc:122 +#: main.cc:147 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "Cet exécutable a été compilé avec les options suivantes:" -#: main.cc:123 main.cc:141 +#: main.cc:123 main.cc:166 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Rapporter les bugs à" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:174 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -482,17 +470,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:181 main.cc:193 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s par" -#: main.cc:166 +#: main.cc:191 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:71 main.cc:174 +#: main.cc:71 main.cc:199 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" @@ -527,15 +515,15 @@ msgstr "" msgid "silly pitch" msgstr "" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 #, fuzzy msgid "Error syncing file (disk full?)" msgstr ")" -#: music-output-def.cc:72 -#, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "ne peut pas trouver `%s'" +#: musical-request.cc:29 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -549,17 +537,17 @@ msgstr "" 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 "" +#: music-output-def.cc:115 +#, fuzzy, c-format +msgid "can't find `%s' context" +msgstr "ne peut pas trouver `%s'" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "" @@ -577,16 +565,16 @@ msgstr "" msgid "Junking request: `%s'" msgstr "" -#: paper-def.cc:116 +#: paper-def.cc:109 #, fuzzy, c-format msgid "paper output to %s..." msgstr "Sortie papier vers %s..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", à " -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "impossible d'ouvrir le fichier: `%s'" @@ -595,41 +583,41 @@ msgstr "impossible d'ouvrir le fichier: `%s'" msgid "Preprocessing elements..." msgstr "" -#: paper-score.cc:105 +#: paper-score.cc:112 msgid "Outputting Score, defined at: " msgstr "" +#: paper-stream.cc:36 +#, fuzzy, c-format +msgid "can't create directory: `%s'" +msgstr "ne peut pas trouver ou créer `%s'" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, c-format msgid "I'm one myself: `%s'" msgstr "" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, c-format msgid "none of these in my family: `%s'" msgstr "" -#: performance.cc:50 +#: performance.cc:51 #, fuzzy msgid "Track ... " msgstr "Piste ... " -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "Auteur: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "Généré automatiquement" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "" @@ -639,7 +627,17 @@ msgstr "" msgid "MIDI output to %s..." msgstr "" -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +#, fuzzy +msgid "unterminated phrasing slur" +msgstr "Barre non terminée" + +#: phrasing-slur-engraver.cc:134 +#, fuzzy +msgid "can't find start of phrasing slur" +msgstr "impossible de trouver le caractères numéro %d" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" @@ -649,15 +647,14 @@ msgstr "ne peut pas trouver le fichier: `%s'" msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, 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é" @@ -670,39 +667,39 @@ msgstr "" msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:177 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "traducteur inconnu `%s'" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "" -#: score.cc:81 +#: score.cc:92 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 msgid "Errors found/*, not processing score*/" msgstr "" -#: score.cc:101 +#: score.cc:112 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "temps ecoulé: %.2f secondes" -#: scores.cc:34 +#: score-engraver.cc:177 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." -msgstr "impossible d'ouvrir le fichier: `%s'" +msgid "unbound spanner `%s'" +msgstr "traducteur inconnu `%s'" + +#: scores.cc:35 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "Sortie papier vers %s..." -#: scores.cc:79 +#: scores.cc:83 msgid "Score contains errors; will not process it" msgstr "" -#: scores.cc:122 +#: scores.cc:129 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "chaîne d'échappement inconnue: `\\%s'" @@ -717,15 +714,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "" - -#: slur-engraver.cc:143 -#, fuzzy -msgid "can't find start of slur" -msgstr "impossible de trouver le caractères numéro %d" - #: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "" @@ -734,17 +722,30 @@ msgstr "" msgid "Slur over rest?" msgstr "" -#: stem-engraver.cc:115 -#, c-format -msgid "Adding note head to incompatible stem (type = %d)" +#: slur-engraver.cc:127 +msgid "unterminated slur" msgstr "" -#: stem.cc:117 +#: slur-engraver.cc:142 +#, fuzzy +msgid "can't find start of slur" +msgstr "impossible de trouver le caractères numéro %d" + +#: stem.cc:116 #, fuzzy msgid "Weird stem size; check for narrow beams" msgstr "décallage de barre bizarre, check your knees" -#: text-spanner-engraver.cc:95 +#: stem-engraver.cc:115 +#, c-format +msgid "Adding note head to incompatible stem (type = %d)" +msgstr "" + +#: text-spanner.cc:117 +msgid "Text_spanner too small" +msgstr "" + +#: text-spanner-engraver.cc:94 #, fuzzy msgid "can't find start of text spanner" msgstr "impossible de trouver le caractères numéro %d" @@ -754,14 +755,15 @@ msgstr "impossible de trouver le caract msgid "already have a text spanner" msgstr "Il y a déjà une barre" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 #, fuzzy msgid "unterminated text spanner" msgstr "Barre non terminée" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ne peut pas trouver le caractère ascii `%d'" #: tfm-reader.cc:105 #, c-format @@ -773,11 +775,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ne peut pas trouver le caractère ascii `%d'" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "Aucune liaison n'a été crée" @@ -829,21 +826,19 @@ msgstr "ne peut pas trouver ou cr msgid "can't find or create: `%s'" msgstr "ne peut pas trouver ou créer `%s'" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -864,110 +859,110 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "Plus ancienne version supportée: %s" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "Mauvais type pour la valeur de la propriété" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 #, fuzzy msgid "Must have duration object" msgstr "Positionne la plus petite durée (?)" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "il fayt être en mode Parole pour les paroles" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "pas une durée: %d" -#: parser.yy:1563 +#: parser.yy:1584 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "il faut être en mode Note pour les notes" -#: parser.yy:1659 +#: parser.yy:1680 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "il faut être en mode Accord pour les accords" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "EOF trouvé dans un commentaire" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 +#: lexer.ll:203 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "indentifiant non défini: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 msgid "Missing end quote" msgstr "" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "blanche attendue" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:433 +#: lexer.ll:439 #, fuzzy, c-format msgid "invalid character: `%c'" msgstr "caractères illégal: `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "chaîne d'échappement inconnue: `\\%s'" -#: lexer.ll:597 +#: lexer.ll:602 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "version de mudela incorrecte: %s (%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1184,6 +1179,17 @@ msgstr "% G msgid "% from input file: " msgstr "% dal file di input: " +#, fuzzy +#~ msgid "wrong identifier type, expected: `%s'" +#~ msgstr "Mauvais type d'indentifiant: " + +#~ msgid "Automatically generated" +#~ msgstr "Généré automatiquement" + +#, fuzzy +#~ msgid "Writing dependency file: `%s'..." +#~ msgstr "impossible d'ouvrir le fichier: `%s'" + #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "Mauvais type pour la valeur de la propriété" diff --git a/po/it.po b/po/it.po index cc09a30495..e8cecaa10c 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2000-12-17 15:35+0100\n" +"POT-Creation-Date: 2001-02-23 11:58+0100\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -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:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 +#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "non posso aprire il file: `%s'" @@ -101,23 +101,28 @@ msgstr "non riesco a trovare il carattere `%s'" msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 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 +#: all-font-metrics.cc:155 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "non trovo il file: `%s'" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 msgid "Loading default font" msgstr "" @@ -126,20 +131,29 @@ msgstr "" msgid "can't find default font: `%s'" msgstr "non trovo il file: `%s'" -#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114 #, fuzzy, c-format msgid "(search path: `%s')" msgstr "(Il path di caricamento è `%s'" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:84 +#, fuzzy +msgid "beam has less than two stems" +msgstr "beam con meno di due gambi" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -149,33 +163,24 @@ msgstr "non trovo le estremit msgid "already have a beam" msgstr "" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 #, fuzzy msgid "unterminated beam" msgstr "beam non terminato" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "I gambi devono avere una struttura ritmica." -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "il gambo non rientra nel beam" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "" -#: beam.cc:83 -#, fuzzy -msgid "beam has less than two stems" -msgstr "beam con meno di due gambi" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -200,34 +205,30 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:119 -#, fuzzy -msgid "unterminated chord tremolo" -msgstr "beam non terminato" - -#: chord-tremolo-iterator.cc:42 -msgid "no one to print a tremolos" -msgstr "" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" +#: chord-tremolo-engraver.cc:141 +#, fuzzy +msgid "unterminated chord tremolo" +msgstr "beam non terminato" + +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "" + #: collision.cc:116 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Troppe collisioni tra colonne di note. Le ignoro." -#: cross-staff.cc:24 -msgid "not a forced distance; cross-staff spanners may be broken" -msgstr "" - #: debug.cc:26 #, fuzzy msgid "floating point exception" @@ -242,39 +243,39 @@ msgstr "non posso settare mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 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:220 +#: dynamic-engraver.cc:219 #, fuzzy msgid "already have a crescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 #, fuzzy msgid "already have a decrescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminato" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "extender non terminato" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -309,13 +310,8 @@ msgstr "beam non terminato" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:49 -#, fuzzy, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "Tipo di identificatore sbagliato: " - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:113 scores.cc:119 #, c-format msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" @@ -351,98 +347,86 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:102 msgid "EXT" msgstr "" -#: main.cc:75 +#: main.cc:102 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:103 msgid "this help" msgstr "" -#: main.cc:77 +#: main.cc:104 msgid "FIELD" msgstr "" -#: main.cc:77 +#: main.cc:104 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:105 msgid "DIR" msgstr "" -#: main.cc:78 +#: main.cc:105 #, fuzzy msgid "add DIR to search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:106 msgid "FILE" msgstr "" -#: main.cc:79 +#: main.cc:106 #, fuzzy msgid "use FILE as init file" msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" -#: main.cc:80 +#: main.cc:107 #, fuzzy msgid "write Makefile dependencies for every input file" msgstr "" " -d, --dependencies scrive le dependenze del Makefile per ogni file di " "input\n" -#: main.cc:81 +#: main.cc:108 #, fuzzy msgid "produce MIDI output only" msgstr " -M, --no-paper produce solo output midi\n" -#: main.cc:82 -msgid "BASENAME" +#: main.cc:109 +msgid "NAME" msgstr "" -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:109 +msgid "write output to NAME" msgstr "" -#: main.cc:83 -#, fuzzy -msgid "show all changes in relative syntax" -msgstr "" -" -Q, --find-old-relative mostra tutti i cambiamenti nella sintassi " -"relativa\n" - -#: main.cc:84 +#: main.cc:110 #, fuzzy msgid "inhibit file output naming and exporting" msgstr "" " -s, --safe inibisce la rinomina dei file di output e " "l'esportazione di macro di TeX\n" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:111 #, fuzzy msgid "don't timestamp the output" msgstr "" " -T, --no-timestamps non inserisce marcatori temporali nell'output\n" -#: main.cc:86 -#, fuzzy -msgid "switch on experimental features" -msgstr " -t, --test usa le caratteristiche sperimentali\n" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:112 msgid "print version number" msgstr "" -#: main.cc:88 +#: main.cc:113 msgid "verbose" msgstr "" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:114 #, fuzzy msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" @@ -450,38 +434,38 @@ msgstr " -w, --warranty mostra la garanzia e il copyright\n" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:131 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:108 +#: main.cc:133 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:112 +#: main.cc:137 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" msgstr "" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:143 msgid "Options:" msgstr "Opzioni: " -#: main.cc:122 +#: main.cc:147 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:123 main.cc:141 +#: main.cc:123 main.cc:166 #, c-format msgid "Report bugs to %s" msgstr "" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:174 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -489,17 +473,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:181 main.cc:193 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s di" -#: main.cc:166 +#: main.cc:191 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:71 main.cc:174 +#: main.cc:71 main.cc:199 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" @@ -549,15 +533,15 @@ msgstr "indicazione durata priva di senso" msgid "silly pitch" msgstr "indicazione altezza priva di senso" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 #, fuzzy msgid "Error syncing file (disk full?)" msgstr "errore nel sincronizzare il file (disco pieno?)" -#: music-output-def.cc:72 +#: musical-request.cc:29 #, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "non trovo `%s'" +msgid "Transposition by %s makes accidental larger than two" +msgstr "la trasposizine di %s rende le alterazioni più che doppie" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -571,17 +555,17 @@ msgstr "" msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: musical-request.cc:29 +#: music-output-def.cc:115 #, fuzzy, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "la trasposizine di %s rende le alterazioni più che doppie" +msgid "can't find `%s' context" +msgstr "non trovo `%s'" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, fuzzy, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Il nome dell'identificatore è una parola chiave (`%s')" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "errore alla fine del file: %s" @@ -600,16 +584,16 @@ msgstr "le bretelle no si accoppiano" msgid "Junking request: `%s'" msgstr "Cosa? Non è una richiesta: `%s'" -#: paper-def.cc:116 +#: paper-def.cc:109 #, fuzzy, c-format msgid "paper output to %s..." msgstr "L'output stampato è inviato a %s..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", a " -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "scrivo il file delle dipendenze: `%s'..." @@ -618,42 +602,42 @@ msgstr "scrivo il file delle dipendenze: `%s'..." msgid "Preprocessing elements..." msgstr "Pre-elaborazione..." -#: paper-score.cc:105 +#: paper-score.cc:112 #, fuzzy msgid "Outputting Score, defined at: " msgstr "emetto lo Score, definito a: " +#: paper-stream.cc:36 +#, fuzzy, c-format +msgid "can't create directory: `%s'" +msgstr "non trovo e non posso creare `%s'" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, c-format msgid "I'm one myself: `%s'" msgstr "" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, c-format msgid "none of these in my family: `%s'" msgstr "" -#: performance.cc:50 +#: performance.cc:51 #, fuzzy msgid "Track ... " msgstr "traccia " -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "Autore: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "Generato automaticamente" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "della definizione musicale: %s" @@ -663,7 +647,17 @@ msgstr "della definizione musicale: %s" msgid "MIDI output to %s..." msgstr "L'output MIDI è inviato a %s..." -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +#, fuzzy +msgid "unterminated phrasing slur" +msgstr "slur non terminato" + +#: phrasing-slur-engraver.cc:134 +#, fuzzy +msgid "can't find start of phrasing slur" +msgstr "non trovo le estremità di %s" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" @@ -673,15 +667,14 @@ msgstr "non risco a trovare una ruling note a %s" msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, fuzzy, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "Tipo sbagliato per il valore di una proprietà" @@ -695,42 +688,42 @@ msgstr "Troppi crescendi" msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:177 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "Spanner non legato `%s'" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "Interpretazione della musica..." -#: score.cc:81 +#: score.cc:92 #, fuzzy msgid "Need music in a score" msgstr "ho bisogno di musica nello spartito" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 #, fuzzy msgid "Errors found/*, not processing score*/" msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/" -#: score.cc:101 +#: score.cc:112 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "durata: %.2f secondi" -#: scores.cc:34 +#: score-engraver.cc:177 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." -msgstr "scrivo il file delle dipendenze: `%s'..." +msgid "unbound spanner `%s'" +msgstr "Spanner non legato `%s'" -#: scores.cc:79 +#: scores.cc:35 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "L'output stampato è inviato a %s..." + +#: scores.cc:83 #, fuzzy msgid "Score contains errors; will not process it" msgstr "lo spartito contiene errori; non lo elaborerò" -#: scores.cc:122 +#: scores.cc:129 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "stringa di escape sconosciuta: `\\%s'" @@ -745,15 +738,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "slur non terminato" - -#: slur-engraver.cc:143 -#, fuzzy -msgid "can't find start of slur" -msgstr "non trovo le estremità di %s" - #: slur.cc:49 #, fuzzy msgid "Putting slur over rest. Ignoring." @@ -764,17 +748,30 @@ msgstr "Metto uno slur sulla pausa." msgid "Slur over rest?" msgstr "Metto uno slur sulla pausa." +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "slur non terminato" + +#: slur-engraver.cc:142 +#, fuzzy +msgid "can't find start of slur" +msgstr "non trovo le estremità di %s" + +#: stem.cc:116 +#, fuzzy +msgid "Weird stem size; check for narrow beams" +msgstr "dimensione del gambo poco ortodossa; check for narrow beams" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:117 -#, fuzzy -msgid "Weird stem size; check for narrow beams" -msgstr "dimensione del gambo poco ortodossa; check for narrow beams" +#: text-spanner.cc:117 +msgid "Text_spanner too small" +msgstr "" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 #, fuzzy msgid "can't find start of text spanner" msgstr "non trovo le estremità di %s" @@ -784,14 +781,15 @@ msgstr "non trovo le estremit msgid "already have a text spanner" msgstr "crescendo non terminato" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 #, fuzzy msgid "unterminated text spanner" msgstr "extender non terminato" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "non riesco a trovare il carattere `%s'" #: tfm-reader.cc:105 #, c-format @@ -803,11 +801,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "non riesco a trovare il carattere `%s'" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "" @@ -859,21 +852,19 @@ msgstr "non trovo e non posso creare '%s' chiamato '%s'" msgid "can't find or create: `%s'" msgstr "non trovo e non posso creare `%s'" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -894,111 +885,111 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "Tipo sbagliato per il valore di una proprietà" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 #, fuzzy msgid "Must have duration object" msgstr "indicazione durata priva di senso" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "bisogna essere in Lyric mode per i testi" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "non è una durata: %d" -#: parser.yy:1563 +#: parser.yy:1584 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "bisogna essere in Note mode per le note" -#: parser.yy:1659 +#: parser.yy:1680 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "bisogna essere in Chord mode per gli accordi" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "ho trovato un EOF in un commento" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 +#: lexer.ll:203 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "indentificatore non definito: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 #, fuzzy msgid "Missing end quote" msgstr "apice finale mancante" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "aspettavo uno spazio bianco" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:433 +#: lexer.ll:439 #, fuzzy, c-format msgid "invalid character: `%c'" msgstr "carattere illegale: `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "stringa di escape sconosciuta: `\\%s'" -#: lexer.ll:597 +#: lexer.ll:602 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "versione di mudela errata: %s (%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1224,6 +1215,27 @@ msgstr "% Generato automaticamente" msgid "% from input file: " msgstr "% dal file di input: " +#, fuzzy +#~ msgid "wrong identifier type, expected: `%s'" +#~ msgstr "Tipo di identificatore sbagliato: " + +#, fuzzy +#~ msgid "show all changes in relative syntax" +#~ msgstr "" +#~ " -Q, --find-old-relative mostra tutti i cambiamenti nella sintassi " +#~ "relativa\n" + +#, fuzzy +#~ msgid "switch on experimental features" +#~ msgstr " -t, --test usa le caratteristiche sperimentali\n" + +#~ msgid "Automatically generated" +#~ msgstr "Generato automaticamente" + +#, fuzzy +#~ msgid "Writing dependency file: `%s'..." +#~ msgstr "scrivo il file delle dipendenze: `%s'..." + #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "Tipo sbagliato per il valore di una proprietà" diff --git a/po/ja.po b/po/ja.po index 915c1d6a5d..58f5e86b34 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-12-17 15:35+0100\n" +"POT-Creation-Date: 2001-02-23 11:58+0100\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -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:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 +#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23 #, fuzzy, c-format msgid "can't open file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" @@ -101,23 +101,28 @@ msgstr " msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 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 +#: all-font-metrics.cc:155 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 msgid "Loading default font" msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹" @@ -126,20 +131,29 @@ msgstr " msgid "can't find default font: `%s'" msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114 #, c-format msgid "(search path: `%s')" msgstr "(¸¡º÷¥Ñ¥¹: `%s')" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "Äü¤á¤Þ¤·¤¿" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹" +#: beam.cc:84 +#, fuzzy +msgid "beam has less than two stems" +msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -149,35 +163,26 @@ msgstr "" msgid "already have a beam" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 #, fuzzy msgid "unterminated beam" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "ÉäÈø¤Ï¥ê¥º¥à¹½Â¤¤ò»ý¤¿¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 #, fuzzy msgid "stem doesn't fit in beam" msgstr "ÉäÈø¤¬³Ã¤ÎÃæ¤Ë¤ª¤µ¤Þ¤ê¤Þ¤»¤ó" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 #, fuzzy msgid "beam was started here" msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿" -#: beam.cc:83 -#, fuzzy -msgid "beam has less than two stems" -msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã" - #: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -202,36 +207,30 @@ msgstr " msgid "none of these in my family" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: chord-tremolo-engraver.cc:119 -#, fuzzy -msgid "unterminated chord tremolo" -msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" - -#: chord-tremolo-iterator.cc:42 -#, fuzzy -msgid "no one to print a tremolos" -msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "̵¸ú¤Ê°ú¤­»»: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" +#: chord-tremolo-engraver.cc:141 +#, fuzzy +msgid "unterminated chord tremolo" +msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" + +#: chord-tremolo-iterator.cc:48 +#, fuzzy +msgid "no one to print a tremolos" +msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" + #: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£" -#: cross-staff.cc:24 -#, fuzzy -msgid "not a forced distance; cross-staff spanners may be broken" -msgstr "" -"minVerticalAlign != maxVerticalAlign: ÆâÉôŪ¤Ê beams/slurs ¤¬²õ¤ì¤Þ¤·¤¿" - #: debug.cc:26 msgid "floating point exception" msgstr "ÉâÆ°¾®¿ôÅÀÎã³°" @@ -245,39 +244,39 @@ msgstr " msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 #, fuzzy msgid "already have a crescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 #, fuzzy msgid "already have a decrescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 #, fuzzy msgid "unterminated (de)crescendo" msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "¥¨¥¯¥¹¥Æ¥ó¥À¤¬º¸Â¦¤Ë¤Ä¤Ê¤¬¤ê¤Þ¤»¤ó¡£¥¨¥¯¥¹¥Æ¥ó¥ÀÍ×µá¤ò̵»ë¤·¤Þ¤¹¡£" -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -310,13 +309,8 @@ msgstr " msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "º¸Â¦¤Ë·Ò¤²¤ë¥Ï¥¤¥Õ¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ï¥¤¥Õ¥ó¤ÎÍ×µá¤ò̵»ë¤·¤Þ¤¹" -#: identifier.cc:49 -#, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "´Ö°ã¤Ã¤¿¼±Ê̻ҷ¿¡¢¤³¤³¤ËÍè¤ë¤Ù¤­¤â¤Î¤Ï: `%s'" - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:113 scores.cc:119 #, fuzzy, c-format msgid "can't find file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" @@ -352,102 +346,96 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:102 msgid "EXT" msgstr "EXT" -#: main.cc:75 +#: main.cc:102 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:103 msgid "this help" msgstr "¤³¤Î¥Ø¥ë¥×" -#: main.cc:77 +#: main.cc:104 #, fuzzy msgid "FIELD" msgstr "FILE" -#: main.cc:77 +#: main.cc:104 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:105 msgid "DIR" msgstr "DIR" -#: main.cc:78 +#: main.cc:105 msgid "add DIR to search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:106 msgid "FILE" msgstr "FILE" -#: main.cc:79 +#: main.cc:106 msgid "use FILE as init file" msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: main.cc:80 +#: main.cc:107 msgid "write Makefile dependencies for every input file" msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" -#: main.cc:81 +#: main.cc:108 msgid "produce MIDI output only" msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß" -#: main.cc:82 -msgid "BASENAME" +#: main.cc:109 +#, fuzzy +msgid "NAME" msgstr "BASENAME" -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:109 +#, fuzzy +msgid "write output to NAME" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" -#: main.cc:83 -msgid "show all changes in relative syntax" -msgstr "´ØÏ¢¤¹¤ëʸˡ¤«¤éÁ´¤Æ¤ÎÊѹ¹¤òɽ¼¨" - -#: main.cc:84 +#: main.cc:110 msgid "inhibit file output naming and exporting" msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:111 msgid "don't timestamp the output" msgstr "½ÐÎϤ˥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "¼Â¸³Åª¤Êµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:112 msgid "print version number" msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" -#: main.cc:88 +#: main.cc:113 #, fuzzy msgid "verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:114 msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:131 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." -#: main.cc:108 +#: main.cc:133 msgid "Typeset music and or play MIDI from FILE" msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë" -#: main.cc:112 +#: main.cc:137 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" @@ -457,20 +445,20 @@ msgstr "" "Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU " "¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤¹¡£\n" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:143 msgid "Options:" msgstr "¥ª¥×¥·¥ç¥ó:" -#: main.cc:122 +#: main.cc:147 msgid "This binary was compiled with the following options:" msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿" -#: main.cc:123 main.cc:141 +#: main.cc:123 main.cc:166 #, c-format msgid "Report bugs to %s" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:174 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -486,17 +474,17 @@ msgstr "" "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n" "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:181 main.cc:193 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s by" -#: main.cc:166 +#: main.cc:191 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- The GNU Project music typesetter" -#: main.cc:71 main.cc:174 +#: main.cc:71 main.cc:199 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" @@ -561,14 +549,14 @@ msgstr " msgid "silly pitch" msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 msgid "Error syncing file (disk full?)" msgstr "¥Õ¥¡¥¤¥ë¤ÎƱĴ¥¨¥é¡¼ (¥Ç¥£¥¹¥¯¤¬°ìÇÕ?)" -#: music-output-def.cc:72 -#, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" +#: musical-request.cc:29 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -582,17 +570,17 @@ msgstr "" 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 ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" +#: music-output-def.cc:115 +#, fuzzy, c-format +msgid "can't find `%s' context" +msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "¼±ÊÌ»Ò̾¤Ï¥­¡¼¥ï¡¼¥É¤Ç¤¹: `%s'" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "EOF ¤Î¤È¤³¤í¤Ç¥¨¥é¡¼: %s" @@ -610,16 +598,16 @@ msgstr " msgid "Junking request: `%s'" msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: paper-def.cc:116 +#: paper-def.cc:109 #, c-format msgid "paper output to %s..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", at " -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." @@ -628,40 +616,40 @@ msgstr " msgid "Preprocessing elements..." msgstr "Í×ÁǤòÁ°½èÍýÃæ..." -#: paper-score.cc:105 +#: paper-score.cc:112 msgid "Outputting Score, defined at: " msgstr "ÉèÌ̤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤³¤ÇÄêµÁ: " +#: paper-stream.cc:36 +#, fuzzy, c-format +msgid "can't create directory: `%s'" +msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, fuzzy, c-format msgid "I'm one myself: `%s'" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤½¤Î¤â¤Î¤Ç¤¹" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, fuzzy, c-format msgid "none of these in my family: `%s'" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: performance.cc:50 +#: performance.cc:51 msgid "Track ... " msgstr "¥È¥é¥Ã¥¯ ..." -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "ºî¶Ê¼Ô: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "¼«Æ°À¸À®¤µ¤ì¤¿" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "²»³ÚŪÄêµÁ¤è¤ê: %s" @@ -671,7 +659,17 @@ msgstr " msgid "MIDI output to %s..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +#, fuzzy +msgid "unterminated phrasing slur" +msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" + +#: phrasing-slur-engraver.cc:134 +#, fuzzy +msgid "can't find start of phrasing slur" +msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" @@ -681,15 +679,14 @@ msgstr " msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, fuzzy, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" @@ -702,39 +699,39 @@ msgstr " msgid "too many notes for rest collision" msgstr "µÙÉä¤Î¾×ÆͤËÂФ·¤Æ²»É䤬¿¤¹¤®¤Þ¤¹" -#: score-engraver.cc:177 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "³Ú¶Ê¤Î²ò¼áÃæ..." -#: score.cc:81 +#: score.cc:92 msgid "Need music in a score" msgstr "³ÚÉè¤Ë¤Ï³Ú¶Ê¤¬É¬ÍפǤ¹" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 msgid "Errors found/*, not processing score*/" msgstr "¥¨¥é¡¼¤òȯ¸«/*, ³ÚÉè¤ò½èÍý¤·¤Þ¤»¤ó*/" -#: score.cc:101 +#: score.cc:112 #, c-format msgid "elapsed time: %.2f seconds" msgstr "·Ð²á»þ´Ö: %.2f ÉÃ" -#: scores.cc:34 +#: score-engraver.cc:177 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" + +#: scores.cc:35 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." -msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." +msgid "dependencies output to %s..." +msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: scores.cc:79 +#: scores.cc:83 msgid "Score contains errors; will not process it" msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- ½èÍý¤·¤Þ¤»¤ó" -#: scores.cc:122 +#: scores.cc:129 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'" @@ -750,15 +747,6 @@ msgstr " msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" - -#: slur-engraver.cc:143 -#, fuzzy -msgid "can't find start of slur" -msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" - #: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£" @@ -767,16 +755,29 @@ msgstr " msgid "Slur over rest?" msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" + +#: slur-engraver.cc:142 +#, fuzzy +msgid "can't find start of slur" +msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" + +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)" -#: stem.cc:117 -msgid "Weird stem size; check for narrow beams" -msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" +#: text-spanner.cc:117 +msgid "Text_spanner too small" +msgstr "" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 #, fuzzy msgid "can't find start of text spanner" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" @@ -786,14 +787,15 @@ msgstr " msgid "already have a text spanner" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 #, fuzzy msgid "unterminated text spanner" msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" #: tfm-reader.cc:105 #, c-format @@ -805,11 +807,6 @@ msgstr "`%s' msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "ºî¤é¤ì¤¿¥¿¥¤¤¬¤¢¤ê¤Þ¤»¤ó!" @@ -861,21 +858,19 @@ msgstr "`%2$s' msgid "can't find or create: `%s'" msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -896,107 +891,107 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "°ìÈָŤ¤ÆþÎϲÄǽ¥Ð¡¼¥¸¥ç¥ó: %s" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "¤³¤ÎÍ×µá¤ËÂФ¹¤ëÊý¸þ¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 #, fuzzy msgid "Must have duration object" msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 msgid "Have to be in Lyric mode for lyrics" msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d" -#: parser.yy:1563 +#: parser.yy:1584 msgid "Have to be in Note mode for notes" msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1659 +#: parser.yy:1680 msgid "Have to be in Chord mode for chords" msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó" -#: lexer.ll:202 +#: lexer.ll:203 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "̤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 msgid "Missing end quote" msgstr "½ªÎ»¥¯¥ª¡¼¥È¤¬¤¢¤ê¤Þ¤»¤ó" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "¶õÇò¤¬É¬ÍפǤ¹" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó" -#: lexer.ll:433 +#: lexer.ll:439 #, c-format msgid "invalid character: `%c'" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'" -#: lexer.ll:597 +#: lexer.ll:602 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1207,6 +1202,27 @@ msgstr "% Automatically generated" msgid "% from input file: " msgstr "% from input file: " +#, fuzzy +#~ msgid "not a forced distance; cross-staff spanners may be broken" +#~ msgstr "" +#~ "minVerticalAlign != maxVerticalAlign: ÆâÉôŪ¤Ê beams/slurs ¤¬²õ¤ì¤Þ¤·¤¿" + +#~ msgid "wrong identifier type, expected: `%s'" +#~ msgstr "´Ö°ã¤Ã¤¿¼±Ê̻ҷ¿¡¢¤³¤³¤ËÍè¤ë¤Ù¤­¤â¤Î¤Ï: `%s'" + +#~ msgid "show all changes in relative syntax" +#~ msgstr "´ØÏ¢¤¹¤ëʸˡ¤«¤éÁ´¤Æ¤ÎÊѹ¹¤òɽ¼¨" + +#~ msgid "switch on experimental features" +#~ msgstr "¼Â¸³Åª¤Êµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë" + +#~ msgid "Automatically generated" +#~ msgstr "¼«Æ°À¸À®¤µ¤ì¤¿" + +#, fuzzy +#~ msgid "Writing dependency file: `%s'..." +#~ msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." + #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" diff --git a/po/lilypond.pot b/po/lilypond.pot index 745a5966d3..921a6cd58b 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-12-17 15:35+0100\n" +"POT-Creation-Date: 2001-02-23 11:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -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:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 +#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "" @@ -100,23 +100,28 @@ msgstr "" msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 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 +#: all-font-metrics.cc:155 #, c-format msgid "can't find font: `%s'" msgstr "" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 msgid "Loading default font" msgstr "" @@ -125,20 +130,28 @@ msgstr "" msgid "can't find default font: `%s'" msgstr "" -#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114 #, c-format msgid "(search path: `%s')" msgstr "" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:84 +msgid "beam has less than two stems" +msgstr "" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -147,30 +160,22 @@ msgstr "" msgid "already have a beam" msgstr "" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 msgid "unterminated beam" msgstr "" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 msgid "stem must have Rhythmic structure" msgstr "" -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "" -#: beam.cc:83 -msgid "beam has less than two stems" -msgstr "" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:131 #, c-format msgid "unknown spacing pair `%s', `%s'" @@ -195,30 +200,26 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:119 -msgid "unterminated chord tremolo" -msgstr "" - -#: chord-tremolo-iterator.cc:42 -msgid "no one to print a tremolos" -msgstr "" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: collision.cc:116 -msgid "Too many clashing notecolumns. Ignoring them." +#: chord-tremolo-engraver.cc:141 +msgid "unterminated chord tremolo" msgstr "" -#: cross-staff.cc:24 -msgid "not a forced distance; cross-staff spanners may be broken" +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "" + +#: collision.cc:116 +msgid "Too many clashing notecolumns. Ignoring them." msgstr "" #: debug.cc:26 @@ -233,35 +234,35 @@ msgstr "" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 msgid "already have a crescendo" msgstr "" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 msgid "already have a decrescendo" msgstr "" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 msgid "unterminated (de)crescendo" msgstr "" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -293,13 +294,8 @@ msgstr "" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:49 -#, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "" - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:113 scores.cc:119 #, c-format msgid "can't find file: `%s'" msgstr "" @@ -335,119 +331,111 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:102 msgid "EXT" msgstr "" -#: main.cc:75 +#: main.cc:102 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:103 msgid "this help" msgstr "" -#: main.cc:77 +#: main.cc:104 msgid "FIELD" msgstr "" -#: main.cc:77 +#: main.cc:104 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:105 msgid "DIR" msgstr "" -#: main.cc:78 +#: main.cc:105 msgid "add DIR to search path" msgstr "" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:106 msgid "FILE" msgstr "" -#: main.cc:79 +#: main.cc:106 msgid "use FILE as init file" msgstr "" -#: main.cc:80 +#: main.cc:107 msgid "write Makefile dependencies for every input file" msgstr "" -#: main.cc:81 +#: main.cc:108 msgid "produce MIDI output only" msgstr "" -#: main.cc:82 -msgid "BASENAME" -msgstr "" - -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:109 +msgid "NAME" msgstr "" -#: main.cc:83 -msgid "show all changes in relative syntax" +#: main.cc:109 +msgid "write output to NAME" msgstr "" -#: main.cc:84 +#: main.cc:110 msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:111 msgid "don't timestamp the output" msgstr "" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:112 msgid "print version number" msgstr "" -#: main.cc:88 +#: main.cc:113 msgid "verbose" msgstr "" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:114 msgid "show warranty and copyright" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:131 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "" -#: main.cc:108 +#: main.cc:133 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:112 +#: main.cc:137 msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" msgstr "" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:143 msgid "Options:" msgstr "" -#: main.cc:122 +#: main.cc:147 msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:123 main.cc:141 +#: main.cc:123 main.cc:166 #, c-format msgid "Report bugs to %s" msgstr "" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:174 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -455,16 +443,16 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:181 main.cc:193 #, c-format msgid "Copyright (c) %s by" msgstr "" -#: main.cc:166 +#: main.cc:191 msgid "GNU LilyPond -- The music typesetter" msgstr "" -#: main.cc:71 main.cc:174 +#: main.cc:71 main.cc:199 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" @@ -499,13 +487,13 @@ msgstr "" msgid "silly pitch" msgstr "" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 msgid "Error syncing file (disk full?)" msgstr "" -#: music-output-def.cc:72 +#: musical-request.cc:29 #, c-format -msgid "can't find `%s' context" +msgid "Transposition by %s makes accidental larger than two" msgstr "" #: music.cc:222 @@ -520,17 +508,17 @@ msgstr "" msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: musical-request.cc:29 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" +msgid "can't find `%s' context" msgstr "" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "" @@ -548,16 +536,16 @@ msgstr "" msgid "Junking request: `%s'" msgstr "" -#: paper-def.cc:116 +#: paper-def.cc:109 #, c-format msgid "paper output to %s..." msgstr "" -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr "" -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, c-format msgid "writing header field %s to %s..." msgstr "" @@ -566,40 +554,40 @@ msgstr "" msgid "Preprocessing elements..." msgstr "" -#: paper-score.cc:105 +#: paper-score.cc:112 msgid "Outputting Score, defined at: " msgstr "" +#: paper-stream.cc:36 +#, c-format +msgid "can't create directory: `%s'" +msgstr "" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, c-format msgid "I'm one myself: `%s'" msgstr "" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, c-format msgid "none of these in my family: `%s'" msgstr "" -#: performance.cc:50 +#: performance.cc:51 msgid "Track ... " msgstr "" -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "" -#: performance.cc:92 -msgid "Automatically generated" -msgstr "" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "" @@ -609,7 +597,15 @@ msgstr "" msgid "MIDI output to %s..." msgstr "" -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +msgid "unterminated phrasing slur" +msgstr "" + +#: phrasing-slur-engraver.cc:134 +msgid "can't find start of phrasing slur" +msgstr "" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, c-format msgid "can't find start of piano pedal: %s" @@ -619,15 +615,14 @@ msgstr "" msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "" @@ -640,39 +635,39 @@ msgstr "" msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:177 -#, c-format -msgid "unbound spanner `%s'" -msgstr "" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "" -#: score.cc:81 +#: score.cc:92 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 msgid "Errors found/*, not processing score*/" msgstr "" -#: score.cc:101 +#: score.cc:112 #, c-format msgid "elapsed time: %.2f seconds" msgstr "" -#: scores.cc:34 +#: score-engraver.cc:177 +#, c-format +msgid "unbound spanner `%s'" +msgstr "" + +#: scores.cc:35 #, c-format -msgid "Writing dependency file: `%s'..." +msgid "dependencies output to %s..." msgstr "" -#: scores.cc:79 +#: scores.cc:83 msgid "Score contains errors; will not process it" msgstr "" -#: scores.cc:122 +#: scores.cc:129 #, c-format msgid "Now processing: `%s'" msgstr "" @@ -687,14 +682,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "" - -#: slur-engraver.cc:143 -msgid "can't find start of slur" -msgstr "" - #: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "" @@ -703,16 +690,28 @@ msgstr "" msgid "Slur over rest?" msgstr "" +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "" + +#: slur-engraver.cc:142 +msgid "can't find start of slur" +msgstr "" + +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:117 -msgid "Weird stem size; check for narrow beams" +#: text-spanner.cc:117 +msgid "Text_spanner too small" msgstr "" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 msgid "can't find start of text spanner" msgstr "" @@ -720,12 +719,13 @@ msgstr "" msgid "already have a text spanner" msgstr "" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 msgid "unterminated text spanner" msgstr "" -#: text-spanner.cc:115 -msgid "Text_spanner too small" +#: tfm.cc:77 +#, c-format +msgid "can't find ascii character: %d" msgstr "" #: tfm-reader.cc:105 @@ -738,11 +738,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, c-format -msgid "can't find ascii character: %d" -msgstr "" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "" @@ -794,21 +789,19 @@ msgstr "" msgid "can't find or create: `%s'" msgstr "" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -829,106 +822,106 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 msgid "Must have duration object" msgstr "" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 msgid "Have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "" -#: parser.yy:1563 +#: parser.yy:1584 msgid "Have to be in Note mode for notes" msgstr "" -#: parser.yy:1659 +#: parser.yy:1680 msgid "Have to be in Chord mode for chords" msgstr "" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 +#: lexer.ll:203 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 msgid "Missing end quote" msgstr "" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:433 +#: lexer.ll:439 #, c-format msgid "invalid character: `%c'" msgstr "" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" -#: lexer.ll:597 +#: lexer.ll:602 #, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" diff --git a/po/nl.po b/po/nl.po index 10482e6c3a..4751b80033 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.59\n" -"POT-Creation-Date: 2000-12-17 15:35+0100\n" +"POT-Creation-Date: 2001-02-23 11:58+0100\n" "PO-Revision-Date: 2000-06-09 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -73,7 +73,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:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 +#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "kan bestand niet openen: `%s'" @@ -110,12 +110,17 @@ msgstr "kan teken niet vinden genaamd: `%s'" msgid "Error parsing AFM file: %s" msgstr "Fout bij ontleden AFM bestand: %s" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" -msgstr "checksum fout van font bestand: `%s'" +msgstr "checksum fout voor font bestand: `%s'" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "komt niet overeen met: `%s'" + +#: all-font-metrics.cc:91 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." @@ -123,12 +128,12 @@ 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:153 +#: all-font-metrics.cc:155 #, c-format msgid "can't find font: `%s'" msgstr "kan font niet vinden: `%s'" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 msgid "Loading default font" msgstr "Laad verstek font" @@ -137,20 +142,28 @@ msgstr "Laad verstek font" msgid "can't find default font: `%s'" msgstr "kan verstekfont niet vinden: `%s'" -#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114 #, c-format msgid "(search path: `%s')" msgstr "(zoekpad: `%s')" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "Geef op" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "Kan niet wisselen van vertaler, ben al hier" +#: beam.cc:84 +msgid "beam has less than two stems" +msgstr "waardestreep heeft minder dan twee stokken" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "rare verticale waardestreep verplaatsing" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "kan start van waardestreep niet vinden" @@ -159,30 +172,22 @@ msgstr "kan start van waardestreep niet vinden" msgid "already have a beam" msgstr "heb al een waardestreep" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 msgid "unterminated beam" msgstr "onbeëindigde waardestreep" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 msgid "stem must have Rhythmic structure" msgstr "stok moet Ritmische structuur hebben" -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "stok past niet in waardestreep" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "waardestreep werd hier gestart" -#: beam.cc:83 -msgid "beam has less than two stems" -msgstr "waardestreep heeft minder dan twee stokken" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "rare verticale waardestreep verplaatsing" - #: break-align-item.cc:131 #, c-format msgid "unknown spacing pair `%s', `%s'" @@ -207,32 +212,28 @@ msgstr "Ben er zelf een" msgid "none of these in my family" msgstr "geen van deze in mijn gezin" -#: chord-tremolo-engraver.cc:119 -msgid "unterminated chord tremolo" -msgstr "onbeëindigd akkoordtremolo" - -#: chord-tremolo-iterator.cc:42 -msgid "no one to print a tremolos" -msgstr "niemand om tremolos af te drukken" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s" +#: chord-tremolo-engraver.cc:141 +msgid "unterminated chord tremolo" +msgstr "onbeëindigd akkoordtremolo" + +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "niemand om tremolos af te drukken" + #: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Te veel botsende nootkolommen. Negeer ze." -#: 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" msgstr "zwevende komma exceptie" @@ -245,36 +246,36 @@ msgstr "kan geheugen controle niet zetten!" msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "kan start van (de)crescendo niet vinden" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 msgid "already have a crescendo" msgstr "heb al een crescendo" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 msgid "already have a decrescendo" msgstr "heb al een decrescendo" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 msgid "unterminated (de)crescendo" msgstr "onbeëindigd (de)crescendo" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "onbeëindigde extender" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 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:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "niemand om een herhalings haak af te drukken" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "kon geen enkel font vinden dat voldoet aan " @@ -307,13 +308,8 @@ msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" "Niets om streepje aan linkerkant aan vast te maken. Negeer streepje verzoek." -#: identifier.cc:49 -#, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "verkeerd type identifier, verwachtte: `%s'" - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:113 scores.cc:119 #, c-format msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" @@ -349,99 +345,91 @@ msgstr "liedteksten gevonden zonder bijbehorend nootbolletje" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "Huh? Melismatische noot blijkt bijbehorende liedtekst te hebben." -#: main.cc:75 +#: main.cc:102 msgid "EXT" msgstr "EXT" -#: main.cc:75 +#: main.cc:102 msgid "use output format EXT (scm, ps, tex or as)" msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:103 msgid "this help" msgstr "deze hulp" -#: main.cc:77 +#: main.cc:104 msgid "FIELD" msgstr "VELD" -#: main.cc:77 +#: main.cc:104 msgid "write header field to BASENAME.FIELD" msgstr "schrijf kop veld naar BASISNAAM.VELD" -#: main.cc:78 +#: main.cc:105 msgid "DIR" msgstr "DIR" -#: main.cc:78 +#: main.cc:105 msgid "add DIR to search path" msgstr "voeg DIR toe aan zoekpad" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:106 msgid "FILE" msgstr "BESTAND" -#: main.cc:79 +#: main.cc:106 msgid "use FILE as init file" msgstr "gebruik BESTAND als initialisatiebestand" -#: main.cc:80 +#: main.cc:107 msgid "write Makefile dependencies for every input file" msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" -#: main.cc:81 +#: main.cc:108 msgid "produce MIDI output only" msgstr "produceer alleen MIDI uitvoer" -#: main.cc:82 -msgid "BASENAME" -msgstr "BASISNAAM" - -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" -msgstr "schrijf uitvoer naar BASISNAAM[-x].extensie" +#: main.cc:109 +msgid "NAME" +msgstr "NAAM" -#: main.cc:83 -msgid "show all changes in relative syntax" -msgstr "toon veranderingen voor relatieve mode" +#: main.cc:109 +msgid "write output to NAME" +msgstr "schrijf uitvoer naar NAAM" -#: main.cc:84 +#: main.cc:110 msgid "inhibit file output naming and exporting" msgstr "verbied naamgeving van uitvoer bestand en exportering" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:111 msgid "don't timestamp the output" msgstr "geen tijdsstempel in de uitvoer" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "zet experimentele kunstjes aan" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:112 msgid "print version number" msgstr "druk versienummer af" -#: main.cc:88 +#: main.cc:113 msgid "verbose" msgstr "breedsprakig" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:114 msgid "show warranty and copyright" msgstr "toon garantie en auteursrechten" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:131 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." -#: main.cc:108 +#: main.cc:133 msgid "Typeset music and or play MIDI from FILE" msgstr "Zet muziek en of speel MIDI van BESTAND" -#: main.cc:112 +#: main.cc:137 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" @@ -451,22 +439,22 @@ msgstr "" "uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" "maakt deel uit van het GNU Project.\n" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:143 msgid "Options:" msgstr "Opties:" -#: main.cc:122 +#: main.cc:147 msgid "This binary was compiled with the following options:" msgstr "Dit programma is gecompileerd met de volgende instellingen:" -#: main.cc:123 main.cc:141 +#: main.cc:123 main.cc:166 #, 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:55 main.cc:149 +#: main.cc:55 main.cc:174 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -478,16 +466,16 @@ msgstr "" "onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n" "informatie.\n" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:181 main.cc:193 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " -#: main.cc:166 +#: main.cc:191 msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- De Muziekzetter" -#: main.cc:71 main.cc:174 +#: main.cc:71 main.cc:199 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,14 +523,14 @@ msgstr "rare duur" msgid "silly pitch" msgstr "rare toonhoogte" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 msgid "Error syncing file (disk full?)" msgstr "Fout by synchroniseren van bestand (disk vol?)" -#: music-output-def.cc:72 +#: musical-request.cc:29 #, c-format -msgid "can't find `%s' context" -msgstr "kan `%s' context niet vinden" +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponering van %s geeft tripel kruizen/mollen" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -556,17 +544,17 @@ msgstr "ly_set_mus_property (): Geen symbool" msgid "ly_set_mus_property (): not of type Music" msgstr "ly_set_mus_property (): niet van type Muziek" -#: musical-request.cc:29 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponering van %s geeft tripel kruizen/mollen" +msgid "can't find `%s' context" +msgstr "kan `%s' context niet vinden" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Identifier naam is een sleutelwoord: `%s'" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "fout bij EOF: %s" @@ -584,16 +572,16 @@ msgstr "Haakjes paren niet" msgid "Junking request: `%s'" msgstr "Schroot verzoek: `%s'" -#: paper-def.cc:116 +#: paper-def.cc:109 #, c-format msgid "paper output to %s..." msgstr "papier uitvoer naar %s..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", bij " -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, c-format msgid "writing header field %s to %s..." msgstr "Schijven van kop veld %s naar bestand %s..." @@ -602,40 +590,40 @@ msgstr "Schijven van kop veld %s naar bestand %s..." msgid "Preprocessing elements..." msgstr "Voorbewerken van elementen..." -#: paper-score.cc:105 +#: paper-score.cc:112 msgid "Outputting Score, defined at: " msgstr "Uitvoer van Score, gedefinieerd op: " +#: paper-stream.cc:36 +#, c-format +msgid "can't create directory: `%s'" +msgstr "kan directory niet scheppen: `%s'" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, c-format msgid "I'm one myself: `%s'" msgstr "Ben er zelf een: `%s'" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, c-format msgid "none of these in my family: `%s'" msgstr "geen van deze in mijn gezin: `%s'" -#: performance.cc:50 +#: performance.cc:51 msgid "Track ... " msgstr "Spoor ... " -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "Schepper: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "Automatisch gegenerederd" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "van muzikale definitie: %s" @@ -645,7 +633,15 @@ msgstr "van muzikale definitie: %s" msgid "MIDI output to %s..." msgstr "MIDI uitvoer naar %s..." -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +msgid "unterminated phrasing slur" +msgstr "onbeëindigde fraseringsboog" + +#: phrasing-slur-engraver.cc:134 +msgid "can't find start of phrasing slur" +msgstr "kan start van fraseringsboog niet vinden" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, c-format msgid "can't find start of piano pedal: %s" @@ -655,8 +651,7 @@ msgstr "kan start van piano pedaal niet vinden: %s" msgid "Pitch arguments out of range" msgstr "Toonhoogte argumenten buiten schaal" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" @@ -665,7 +660,7 @@ msgstr "" "%s is verouderd. Gebruik\n" " \\property %s.%s \\override #'%s = #%s" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, c-format 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" @@ -678,39 +673,39 @@ msgstr "te veel botsende rusten" msgid "too many notes for rest collision" msgstr "te veel noten voor bosting met rusten" -#: score-engraver.cc:177 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ongebonden spanner `%s'" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "Vertolken van muziek..." -#: score.cc:81 +#: score.cc:92 msgid "Need music in a score" msgstr "Heb muziek nodig in een partituur" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 msgid "Errors found/*, not processing score*/" msgstr "Fouten gevonden, /*verwerk partituur niet */" -#: score.cc:101 +#: score.cc:112 #, c-format msgid "elapsed time: %.2f seconds" msgstr "duur: %.2f seconden" -#: scores.cc:34 +#: score-engraver.cc:177 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ongebonden spanner `%s'" + +#: scores.cc:35 #, c-format -msgid "Writing dependency file: `%s'..." -msgstr "Schijven van afhankelijkheden bestand: `%s'..." +msgid "dependencies output to %s..." +msgstr "afhankelijkheden uitvoer naar %s..." -#: scores.cc:79 +#: scores.cc:83 msgid "Score contains errors; will not process it" msgstr "Partituur bevat fouten; zal hem niet verwerken" -#: scores.cc:122 +#: scores.cc:129 #, c-format msgid "Now processing: `%s'" msgstr "Nu wordt verwerkt: `%s'" @@ -725,14 +720,6 @@ msgstr "Weet niet hoe articulatie te vertolken `%s'" msgid "Separation_item: I've been drinking too much" msgstr "Separation_item: Ik heb te veel gedronken" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "onbeëindigde bindingsboog" - -#: slur-engraver.cc:143 -msgid "can't find start of slur" -msgstr "kan start van bindingsboog niet vinden" - #: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "Zet bindingsboog over rust. Negeer." @@ -741,16 +728,28 @@ msgstr "Zet bindingsboog over rust. Negeer." msgid "Slur over rest?" msgstr "Boogje over rust?" +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "onbeëindigde bindingsboog" + +#: slur-engraver.cc:142 +msgid "can't find start of slur" +msgstr "kan start van bindingsboog niet vinden" + +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" + #: 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:117 -msgid "Weird stem size; check for narrow beams" -msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" +#: text-spanner.cc:117 +msgid "Text_spanner too small" +msgstr "Text_spanner te klein" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 msgid "can't find start of text spanner" msgstr "kan start van tekst spanner niet vinden" @@ -758,13 +757,14 @@ msgstr "kan start van tekst spanner niet vinden" msgid "already have a text spanner" msgstr "heb al een tekst spanner" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 msgid "unterminated text spanner" msgstr "onbeëindigde tekst spanner" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "Text_spanner te klein" +#: tfm.cc:77 +#, c-format +msgid "can't find ascii character: %d" +msgstr "kan ascii teken niet vinden: %d" #: tfm-reader.cc:105 #, c-format @@ -777,11 +777,6 @@ 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:77 -#, c-format -msgid "can't find ascii character: %d" -msgstr "kan ascii teken niet vinden: %d" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "Geen overbindingen geschapen!" @@ -833,22 +828,20 @@ msgstr "kan niet vinden of scheppen `%s' genaamd `%s'" msgid "can't find or create: `%s'" msgstr "kan niet vinden of scheppen: `%s'" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, 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 tikfout?" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, 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'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" +msgstr "Type contole gefaald voor `%s'; waarde `%s' moet type hebben: `%s'" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "ly-get-trans-property: verwacht een Translator_group argument" @@ -869,107 +862,107 @@ msgstr "Heb ook al een gestopte spanner. Geef op." msgid "Oldest supported input version: %s" msgstr "Oudst ondersteunde invoerversie: %s" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "Verkeerd type voor property waarde" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" "Meer alternatieven dan herhalingen. Schroot overvloedige alternatieven." -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "Tweede argument moet een symbool zijn" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "Eerste argument moet een procedure zijn met 1 argument" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "Verwacht string voor script definitie" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "Kan richting voor dit verzoek niet specificeren" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "Verwacht musical-pitch waarde" -#: parser.yy:1359 +#: parser.yy:1364 msgid "Must have duration object" msgstr "Moet duur object hebben" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 msgid "Have to be in Lyric mode for lyrics" msgstr "Moet in Lyric modus zijn voor liedteksten" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "geen duur: %d" -#: parser.yy:1563 +#: parser.yy:1584 msgid "Have to be in Note mode for notes" msgstr "Moet in Note modus zijn voor noten" -#: parser.yy:1659 +#: parser.yy:1680 msgid "Have to be in Chord mode for chords" msgstr "Moet in Chord modus zijn voor accoorden" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "heb integer getal arg nogig" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "Moet positieve integer zijn" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "EOF gevonden in een kommentaar" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "\\maininput niet toegestaan buiten init bestanden" -#: lexer.ll:202 +#: lexer.ll:203 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "verkeerde of ongedefiniëerde identifier: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 msgid "Missing end quote" msgstr "Aanhalingsteken sluiten mist" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "wit verwacht" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "Kan Scheme niet evalueren in veilige modus" -#: lexer.ll:433 +#: lexer.ll:439 #, c-format msgid "invalid character: `%c'" msgstr "ongeldig teken: `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "onbekende ontsnapte string: `\\%s'" -#: lexer.ll:597 +#: lexer.ll:602 #, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "verkeerde lilypond versie: %s (%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "Overweeg de invoer te converteren met het convert-ly script" @@ -1177,3 +1170,4 @@ msgstr "% Automatisch gegenereerd" #, c-format msgid "% from input file: " msgstr "% van invoerbestand: " + diff --git a/po/ru.po b/po/ru.po index daa64e7b53..74d9dddfef 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-12-17 15:35+0100\n" +"POT-Creation-Date: 2001-02-23 11:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -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:26 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:23 +#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23 #, c-format msgid "can't open file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" @@ -100,23 +100,28 @@ msgstr " msgid "Error parsing AFM file: %s" msgstr "ïÛÉÂËÁ ÐÒÉ ÁÎÁÌÉÚÅ ÆÁÊÌÁ AFM" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 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 +#: all-font-metrics.cc:155 #, c-format msgid "can't find font: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ: `%s'" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 msgid "Loading default font" msgstr "úÁÇÒÕÖÁÀ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ" @@ -125,20 +130,28 @@ msgstr " msgid "can't find default font: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'" -#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114 #, c-format msgid "(search path: `%s')" msgstr "(ÐÕÔØ ÐÏÉÓËÁ: `%s')" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "óÄÁÀÓØ" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ" +#: beam.cc:84 +msgid "beam has less than two stems" +msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" @@ -147,30 +160,22 @@ msgstr " msgid "already have a beam" msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 msgid "unterminated beam" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÇÒÕÐÐÉÒÏ×ËÁ ÛÔÉÌÅÊ" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 msgid "stem must have Rhythmic structure" msgstr "ÛÔÉÌØ ÄÏÌÖÅÎ ÉÍÅÔØ ÒÉÔÍÏ×ÕÀ ÓÔÒÕËÔÕÒÕ" -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "ÛÔÉÌØ ÎÅ ×ÌÅÚÁÅÔ × ÇÒÕÐÐÉÒÏ×ËÕ" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ" -#: beam.cc:83 -msgid "beam has less than two stems" -msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" - #: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -195,35 +200,29 @@ msgstr " msgid "none of these in my family" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" -#: chord-tremolo-engraver.cc:119 -msgid "unterminated chord tremolo" -msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" - -#: chord-tremolo-iterator.cc:42 -#, fuzzy -msgid "no one to print a tremolos" -msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÞÉÔÁÎÉÅ: ÎÅ ÞÁÓÔØ ÁËËÏÒÄÁ: %s" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" +#: chord-tremolo-engraver.cc:141 +msgid "unterminated chord tremolo" +msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" + +#: chord-tremolo-iterator.cc:48 +#, fuzzy +msgid "no one to print a tremolos" +msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" + #: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ." -#: cross-staff.cc:24 -#, fuzzy -msgid "not a forced distance; cross-staff spanners may be broken" -msgstr "" -"minVerticalAlign != maxVerticalAlign: ÍÅÖÄÕÓÔÒÏÞÎÙÅ ÌÉÇÉ ÍÏÇÕÔ ÂÙÔØ ÎÅ×ÅÒÎÙÍÉ" - #: debug.cc:26 msgid "floating point exception" msgstr "ÉÓËÌÀÞÅÎÉÅ ÁÒÉÆÍÅÔÉËÉ Ó ÐÌÁ×ÁÀÝÅÊ ÚÁÐÑÔÏÊ" @@ -236,35 +235,35 @@ msgstr " msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÁÞÁÌÏ (ÄÅ)ËÒÅÝÅÎÄÏ" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 msgid "already have a crescendo" msgstr "ËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 msgid "already have a decrescendo" msgstr "ÄÅËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 msgid "unterminated (de)crescendo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ (ÄÅ)ËÒÅÝÅÎÄÏ" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "îÅËÕÄÁ ÐÒÉÓÏÅÄÉÎÉÔØ ÒÁÓÛÉÒÉÔÅÌØ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÒÁÓÛÉÒÉÔÅÌÑ." -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -297,13 +296,8 @@ msgstr " msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "îÅ Ë ÞÅÍÕ ÐÒÉÓÏÅÄÉÎÉÔØ ÐÅÒÅÎÏÓ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÐÅÒÅÎÏÓÁ." -#: identifier.cc:49 -#, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "ÎÅ×ÅÒÎÙÊ ÔÉÐ ÐÅÒÅÍÅÎÎÏÊ, ÏÖÉÄÁÌÓÑ: `%s'" - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:113 scores.cc:119 #, c-format msgid "can't find file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" @@ -339,102 +333,96 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:102 msgid "EXT" msgstr "òáóû" -#: main.cc:75 +#: main.cc:102 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:103 msgid "this help" msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" -#: main.cc:77 +#: main.cc:104 #, fuzzy msgid "FIELD" msgstr "æáêì" -#: main.cc:77 +#: main.cc:104 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:105 msgid "DIR" msgstr "ëáô" -#: main.cc:78 +#: main.cc:105 msgid "add DIR to search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:106 msgid "FILE" msgstr "æáêì" -#: main.cc:79 +#: main.cc:106 msgid "use FILE as init file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ" -#: main.cc:80 +#: main.cc:107 msgid "write Makefile dependencies for every input file" msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: main.cc:81 +#: main.cc:108 msgid "produce MIDI output only" msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI" -#: main.cc:82 -msgid "BASENAME" +#: main.cc:109 +#, fuzzy +msgid "NAME" msgstr "ïóîï÷á" -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:109 +#, fuzzy +msgid "write output to NAME" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" -#: main.cc:83 -msgid "show all changes in relative syntax" -msgstr "ÐÏËÁÚÙ×ÁÔØ ×ÓÅ ÉÚÍÅÎÅÎÉÑ × ÏÔÎÏÓÉÔÅÌØÎÏÍ ÓÉÎÔÁËÓÉÓÅ" - -#: main.cc:84 +#: main.cc:110 msgid "inhibit file output naming and exporting" msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:111 msgid "don't timestamp the output" msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "×ËÌÀÞÉÔØ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÅ ×ÏÚÍÏÖÎÏÓÔÉ" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:112 msgid "print version number" msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" -#: main.cc:88 +#: main.cc:113 #, fuzzy msgid "verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:114 msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:131 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." -#: main.cc:108 +#: main.cc:133 msgid "Typeset music and or play MIDI from FILE" msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ" -#: main.cc:112 +#: main.cc:137 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" @@ -444,20 +432,20 @@ msgstr "" "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n" "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:143 msgid "Options:" msgstr "ïÐÃÉÉ:" -#: main.cc:122 +#: main.cc:147 msgid "This binary was compiled with the following options:" msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:" -#: main.cc:123 main.cc:141 +#: main.cc:123 main.cc:166 #, c-format msgid "Report bugs to %s" msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:174 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -469,17 +457,17 @@ msgstr "" "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n" "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:181 main.cc:193 #, c-format msgid "Copyright (c) %s by" msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by" -#: main.cc:166 +#: main.cc:191 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU" -#: main.cc:71 main.cc:174 +#: main.cc:71 main.cc:199 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" @@ -514,14 +502,14 @@ msgstr " msgid "silly pitch" msgstr "ÇÌÕÐÙÊ ÔÏÎ" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 msgid "Error syncing file (disk full?)" msgstr "ïÛÉÂËÁ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÆÁÊÌÁ (ÄÉÓË ÐÅÒÅÐÏÌÎÅÎ?)" -#: music-output-def.cc:72 +#: musical-request.cc:29 #, c-format -msgid "can't find `%s' context" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'" +msgid "Transposition by %s makes accidental larger than two" +msgstr "" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -535,17 +523,17 @@ msgstr "" msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: musical-request.cc:29 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "" +msgid "can't find `%s' context" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "éÍÑ ËÏÍÁÎÄÙ Ñ×ÌÑÅÔÓÑ ËÌÀÞÅ×ÙÍ ÓÌÏ×ÏÍ: `%s'" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "ÏÛÍÂËÁ × ËÏÎÃÅ ÆÁÊÌÁ: %s" @@ -563,16 +551,16 @@ msgstr " msgid "Junking request: `%s'" msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÚÁÐÒÏÓ: `%s'" -#: paper-def.cc:116 +#: paper-def.cc:109 #, c-format msgid "paper output to %s..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", ×" -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." @@ -581,40 +569,40 @@ msgstr " msgid "Preprocessing elements..." msgstr "ðÒÅÄ×ÁÒÉÔÅÌØÎÏ ÏÂÒÁÂÁÔÙ×ÁÀ ÜÌÅÍÅÎÔÙ..." -#: paper-score.cc:105 +#: paper-score.cc:112 msgid "Outputting Score, defined at: " msgstr "" +#: paper-stream.cc:36 +#, fuzzy, c-format +msgid "can't create directory: `%s'" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, fuzzy, c-format msgid "I'm one myself: `%s'" msgstr "ñ ÅÄÉÎÓÔ×ÅÎÎÙÊ" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, fuzzy, c-format msgid "none of these in my family: `%s'" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" -#: performance.cc:50 +#: performance.cc:51 msgid "Track ... " msgstr "äÏÒÏÖËÁ ..." -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "óÏÚÄÁÔÅÌØ: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "ÉÚ ÍÕÚÙËÁÌØÎÏÊ ÎÏÔÁÃÉÉ %s" @@ -624,7 +612,17 @@ msgstr " msgid "MIDI output to %s..." msgstr "×Ù×ÏÄ MIDI × %s..." -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +#, fuzzy +msgid "unterminated phrasing slur" +msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" + +#: phrasing-slur-engraver.cc:134 +#, fuzzy +msgid "can't find start of phrasing slur" +msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" @@ -634,15 +632,14 @@ msgstr " msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "" @@ -655,39 +652,39 @@ msgstr " msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:177 -#, c-format -msgid "unbound spanner `%s'" -msgstr "" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "éÎÔÅÒÐÒÅÔÉÒÕÀ ÍÕÚÙËÕ..." -#: score.cc:81 +#: score.cc:92 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 msgid "Errors found/*, not processing score*/" msgstr "îÁÊÄÅÎÙ ÏÛÉÂËÉ/*, ÎÅ ÏÂÒÁÂÁÔÙ×ÁÀ ÎÏÔÙ*/" -#: score.cc:101 +#: score.cc:112 #, c-format msgid "elapsed time: %.2f seconds" msgstr "ÚÁÔÒÁÞÅÎÎÏÅ ×ÒÅÍÑ: %.2f ÓÅËÕÎÄ" -#: scores.cc:34 +#: score-engraver.cc:177 +#, c-format +msgid "unbound spanner `%s'" +msgstr "" + +#: scores.cc:35 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." -msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." +msgid "dependencies output to %s..." +msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: scores.cc:79 +#: scores.cc:83 msgid "Score contains errors; will not process it" msgstr "" -#: scores.cc:122 +#: scores.cc:129 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'" @@ -703,15 +700,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ñ ÌÉÛËÏÍ ÍÎÏÇÏ ×ÙÐÉÌ" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" - -#: slur-engraver.cc:143 -#, fuzzy -msgid "can't find start of slur" -msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" - #: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ." @@ -720,16 +708,29 @@ msgstr " msgid "Slur over rest?" msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?" +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" + +#: slur-engraver.cc:142 +#, fuzzy +msgid "can't find start of slur" +msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" + +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)" -#: stem.cc:117 -msgid "Weird stem size; check for narrow beams" +#: text-spanner.cc:117 +msgid "Text_spanner too small" msgstr "" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 #, fuzzy msgid "can't find start of text spanner" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" @@ -739,14 +740,15 @@ msgstr " msgid "already have a text spanner" msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 #, fuzzy msgid "unterminated text spanner" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" #: tfm-reader.cc:105 #, c-format @@ -758,11 +760,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "" @@ -814,21 +811,19 @@ msgstr "" msgid "can't find or create: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -849,107 +844,107 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "÷ÔÏÒÏÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÓÉÍ×ÏÌÏÍ" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "îÅ ÍÏÇÕ ÕËÁÚÁÔØ ÎÁÐÒÁ×ÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ÚÁÐÒÏÓÁ" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 #, fuzzy msgid "Must have duration object" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÎÁÉÍÅÎØÛÕÀ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 msgid "Have to be in Lyric mode for lyrics" msgstr "äÏÌÖÅÎ ÂÙÔØ × ìÉÒÉÞÅÓËÏÍ ÒÅÖÉÍÅ ÄÌÑ ÌÉÒÉËÉ" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "ÎÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ: %d" -#: parser.yy:1563 +#: parser.yy:1584 msgid "Have to be in Note mode for notes" msgstr "äÏÌÖÅÎ ÂÙÔØ × îÏÔÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÎÏÔ" -#: parser.yy:1659 +#: parser.yy:1680 msgid "Have to be in Chord mode for chords" msgstr "äÏÌÖÅÎ ÂÙÔØ × áËËÏÒÄÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÁËËÏÒÄÏ×" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "ëÏÎÅà ÆÁÊÌÁ ×ÎÕÔÒÉ ËÏÍÍÅÎÔÁÒÉÑ" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 +#: lexer.ll:203 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÍÅÔËÁ/ËÏÍÁÎÄÁ: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 msgid "Missing end quote" msgstr "ïÔÓÕÔÓ×ÕÅÔ ÚÁËÌÀÞÉÔÅÌØÎÁÑ ËÁ×ÙÞËÁ" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "× ÔÏ ×ÒÅÍÑ ËÁË ÏÖÉÄÁÌÏÓØ" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "îÅ ÍÏÇÕ ×ÙÐÏÌÎÑÔØ ËÏÄ ÓÈÅÍÙ × ÂÅÚÏÐÁÓÎÏÍ ÒÅÖÉÍÅ" -#: lexer.ll:433 +#: lexer.ll:439 #, c-format msgid "invalid character: `%c'" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'" -#: lexer.ll:597 +#: lexer.ll:602 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "ÎÅ×ÅÒÎÁÑ ×ÅÒÓÉÑ mudela: %s (%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1159,6 +1154,27 @@ msgstr "% msgid "% from input file: " msgstr "% ÉÚ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ: " +#, fuzzy +#~ msgid "not a forced distance; cross-staff spanners may be broken" +#~ msgstr "" +#~ "minVerticalAlign != maxVerticalAlign: ÍÅÖÄÕÓÔÒÏÞÎÙÅ ÌÉÇÉ ÍÏÇÕÔ ÂÙÔØ ÎÅ×ÅÒÎÙÍÉ" + +#~ msgid "wrong identifier type, expected: `%s'" +#~ msgstr "ÎÅ×ÅÒÎÙÊ ÔÉÐ ÐÅÒÅÍÅÎÎÏÊ, ÏÖÉÄÁÌÓÑ: `%s'" + +#~ msgid "show all changes in relative syntax" +#~ msgstr "ÐÏËÁÚÙ×ÁÔØ ×ÓÅ ÉÚÍÅÎÅÎÉÑ × ÏÔÎÏÓÉÔÅÌØÎÏÍ ÓÉÎÔÁËÓÉÓÅ" + +#~ msgid "switch on experimental features" +#~ msgstr "×ËÌÀÞÉÔØ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÅ ×ÏÚÍÏÖÎÏÓÔÉ" + +#~ msgid "Automatically generated" +#~ msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ" + +#, fuzzy +#~ msgid "Writing dependency file: `%s'..." +#~ msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." + #~ msgid "Wrong type for property" #~ msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ ÄÌÑ Ó×ÏÊÓÔ×Á" -- 2.39.2