From be8fa0394e6f3d8f64641d0ef351fd833d422956 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 22:25:00 +0000 Subject: [PATCH] lilypond-1.2.2 --- Documentation/BLURB.in | 1 - Documentation/FLAPTEKST.in | 10 +- flower/getopt-long.cc | 108 ++++++++- flower/include/international.hh | 7 + lily/main.cc | 152 +++++-------- midi2ly/main.cc | 351 ++++++++++++++---------------- po/GNUmakefile | 1 + po/it.po | 335 ++++++++++++++++------------ po/lilypond.po | 205 ++++++++--------- po/nl.po | 296 +++++++++++++------------ stepmake/stepmake/po-targets.make | 2 +- 11 files changed, 795 insertions(+), 673 deletions(-) diff --git a/Documentation/BLURB.in b/Documentation/BLURB.in index 591817db35..6933b58e2e 100644 --- a/Documentation/BLURB.in +++ b/Documentation/BLURB.in @@ -2,4 +2,3 @@ LilyPond is a music typesetter. It produces beautiful sheet music using a high level description file as input. LilyPond is part of the GNU Project. - diff --git a/Documentation/FLAPTEKST.in b/Documentation/FLAPTEKST.in index cedaa2e995..b09dbad7b3 100644 --- a/Documentation/FLAPTEKST.in +++ b/Documentation/FLAPTEKST.in @@ -1,7 +1,3 @@ -LilyPond is de muziekzetter van het GNU Project. Dit programma drukt -prachtige bladmuziek volgens een muzikaal definitie bestand. Ook kan -het een mechanische uitvoering afspelen naar een MIDI bestand. -Bijzondere kunstjes zijn verscheidene notenbalken, maatsoorten, sleutels, -toonaarden, zangteksten, krachtige invoer taal, cadensa, balken, boogjes, -triolen, accoordnamen, transponeren, partituren, en uittreksels voor -individuele partijen. Een fraaie set muziektekens is inbegrepen. +LilyPond is een muziekzetter. Zij maakt prachtige bladmuziek +uitgaande van een hoog niveau beschrijving bestand. LilyPond +maakt deel uit van het GNU Project. diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc index e3a3176b27..c63f04e353 100644 --- a/flower/getopt-long.cc +++ b/flower/getopt-long.cc @@ -7,8 +7,20 @@ #include #include #include +#include "config.hh" #include "getopt-long.hh" #include "international.hh" +#include "string-convert.hh" + +#if !HAVE_GETTEXT +inline char* +gettext (char const* s) +{ + return s; +} +#else +#include +#endif long Getopt_long::argument_to_i() @@ -33,7 +45,7 @@ Getopt_long::parselong() found_option_l_=0; for (int i=0; i< table_len_i_; i++) { - char const *ln = option_a_[i].longname; + char const *ln = option_a_[i].longname_sz_; if (ln && !strncmp (ln, optnm, searchlen)) { @@ -51,7 +63,7 @@ Getopt_long::parselong() argument_index_i_ = 0; - if (found_option_l_->take_arg) + if (found_option_l_->take_arg_sz_) { if (endopt) optional_argument_ch_C_ = endopt +1; // a '=' @@ -78,15 +90,41 @@ String Long_option_init::str () const { String str; - if (shortname) - str += "-" + shortname; - if (shortname && longname) + if (shortname_ch_) + str += "-" + shortname_ch_; + if (shortname_ch_ && longname_sz_) str += ", "; - if (longname) - str += String ("`--") + longname + "'"; + if (longname_sz_) + str += String ("`--") + longname_sz_ + "'"; return str; } +String +Long_option_init::str_for_help () const +{ + String s; + if (shortname_ch_) + s = "-" + to_str (shortname_ch_); + else + s = " "; + + s = s + ((shortname_ch_ && longname_sz_) ? "," : " "); + + if (longname_sz_) + s = s + "--" + longname_sz_; + + if (take_arg_sz_) + { + if (longname_sz_) + s = s + "="; + else + s = s + " "; + + s = s + gettext (take_arg_sz_); + } + return s; +} + // report an error, GNU style. void Getopt_long::report (Errorcod c) @@ -131,7 +169,7 @@ Getopt_long::parseshort() assert (c); for (int i=0; i < table_len_i_; i++) - if (option_a_[i].shortname == c) + if (option_a_[i].shortname_ch_ == c) { found_option_l_ = option_a_+i; break; @@ -144,7 +182,7 @@ Getopt_long::parseshort() } argument_index_i_++; - if (!found_option_l_->take_arg) + if (!found_option_l_->take_arg_sz_) { optional_argument_ch_C_ = 0; return found_option_l_; @@ -205,6 +243,8 @@ Getopt_long::operator()() } } + + Getopt_long::Getopt_long (int c, char **v, Long_option_init *lo) { option_a_ = lo; @@ -216,8 +256,9 @@ Getopt_long::Getopt_long (int c, char **v, Long_option_init *lo) // reached end of option table? table_len_i_ =0; - for (int i = 0; option_a_[i].longname ||option_a_[i].shortname; i++) + for (int i = 0; option_a_[i].longname_sz_ ||option_a_[i].shortname_ch_; i++) table_len_i_ ++; + } bool @@ -258,3 +299,50 @@ Getopt_long::get_next_arg() } return a; } + + +const int EXTRA_SPACES = 5; + +String +Long_option_init::table_str (Long_option_init *l) +{ + String argstr = "ARG"; + String tabstr = ""; + + int wid = 0; + for (int i=0; l[i].shortname_ch_ || l[i].longname_sz_; i++) + { + wid = wid >? l[i].str_for_help ().length_i (); + } + + for (int i=0; l[i].shortname_ch_ || l[i].longname_sz_; i++) + { + String s = " " + l[i].str_for_help (); + s += String_convert::char_str (' ', wid - s.length_i () + EXTRA_SPACES); + + tabstr += s + gettext (l[i].help_sz_) + "\n"; + } + + + return tabstr; +} + +int +Long_option_init::compare (Long_option_init const &a, Long_option_init const &b) +{ + if (a.shortname_ch_ && b.shortname_ch_ && a.shortname_ch_- b.shortname_ch_) + return a.shortname_ch_ - b.shortname_ch_; + + if (b.shortname_ch_ && a.longname_sz_) + { + char s[2] = {b.shortname_ch_, 0}; + return strcmp (a.longname_sz_, s); + } + if (a.shortname_ch_ && b.longname_sz_) + { + char s[2] = {a.shortname_ch_, 0}; + return strcmp (s, b.longname_sz_); + } + + return strcmp (a.longname_sz_, b.longname_sz_); +} diff --git a/flower/include/international.hh b/flower/include/international.hh index 49a414a394..5ebbb65aee 100644 --- a/flower/include/international.hh +++ b/flower/include/international.hh @@ -12,6 +12,13 @@ #include "string.hh" +/** + Internationalisation: _i ("to be translated") gets an entry in the POT file + gettext () must be invoked explicitely to do the actual "translation". + See flower/getopt-long.cc. + */ +#define _i(sz) sz + // don't inline: get warnings only once /** Internationalisation: _ ("to be translated") gets "translated" by GNU gettext diff --git a/lily/main.cc b/lily/main.cc index e48887a977..bb3fb5d973 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -59,83 +59,47 @@ Getopt_long * oparser_global_p = 0; String distill_inname_str (String name_str, String& ext_r); +/* + Internationalisation kludge in two steps: + * use _i () to get entry in POT file + * call gettext () explicitely for actual "translation" + */ Long_option_init theopts[] = { - {0, "about", 'a'}, - {1, "output", 'o'}, - {0, "warranty", 'w'}, - {0, "help", 'h'}, - {0, "test", 't'}, - {0, "debug", 'd'}, - {1, "init", 'i'}, - {1, "include", 'I'}, - {0, "no-paper", 'm'}, - {0, "dependencies", 'M'}, // like GCC - {0, "no-timestamps", 'T'}, // why do we have this option? - {0, "find-old-relative", 'Q'}, - {0, "ignore-version", 'V'}, - {0, "version", 'v'}, - {1, "output-format", 'f'}, - {0, "safe", 's'}, - {0,0,0} + {_i ("BASENAME"), "output", 'o', _i ("write output to BASENAME[-x].extension")}, + {0, "warranty", 'w', _i ("show warranty and copyright")}, + {0, "help", 'h', _i ("this help")}, + {0, "test", 't', _i ("switch on experimental features")}, + {0, "debug", 'd', _i ("enable debugging output")}, + {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, + {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, + {0, "no-paper", 'm', _i ("produce midi output only")}, + {0, "dependencies", 'M', _i ("write Makefile dependencies for every input file")}, + {0, "no-timestamps", 'T', _i ("don't timestamp the output")}, + {0, "find-old-relative", 'Q', _i ("show all changes in relative syntax")}, + {0, "ignore-version", 'V', _i ("ignore mudela version")}, + {0, "version", 'v', _i ("print version number")}, + {_i ("EXT"), "output-format", 'f', _i ("use output format EXT")}, + {0, "safe", 's', _i ("inhibit file output naming and exporting")}, + {0,0,0, 0} }; void usage () { - cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond") << '\n'; - cout << _ ("Typeset music and or play MIDI from FILE or "); - cout << '\n'; + cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond"); + cout << "\n\n"; + cout << _ ("Typeset music and or play MIDI from FILE."); + cout << "\n\n"; + cout << +#include "BLURB.hh" + cout << '\n'; cout << _ ("Options:"); cout << '\n'; - cout << _ ( - " -a, --about about LilyPond\n" - ); - cout << _ ( - " -d, --debug enable debugging output\n" - ); - cout << _ ( - " -M, --dependencies write Makefile dependencies for every input file\n" - ); - cout << _ ( - " -h, --help this help\n" - ); - cout << _ ( - " -f, --output-format=X use output format X\n" - ); - cout << _ ( - " -I, --include=DIR add DIR to search path\n" - ); - cout << _ ( - " -i, --init=FILE use FILE as init file\n" - ); - cout << _ ( - " -m, --no-paper produce midi output only\n" - ); - cout << _ ( - " -o, --output=FILE set FILE as default output base\n" - ); - cout << _ ( - " -Q, --find-old-relative show all changes in relative syntax\n" - ); - cout << _ ( - " -s, --safe inhibit file output naming and exporting TeX macros\n"); - cout << _ ( - " -t, --test switch on experimental features\n" - ); - cout << _ ( - " -T, --no-timestamps don't timestamp the output\n" - ); - cout << _ ( - " -V, --ignore-version ignore mudela version\n" - ); - cout << _ ( - " -w, --warranty show warranty and copyright\n" - ); - cout << '\n'; - cout << _ ("GNU LilyPond was compiled with the following settings:"); + cout << Long_option_init::table_str (theopts); cout << '\n'; - cout << + cout << _ ("This binary was compiled with the following options:") + << " " << #ifdef NDEBUG "NDEBUG " #endif @@ -145,44 +109,51 @@ usage () #ifdef STRING_UTILS_INLINED "STRING_UTILS_INLINED " #endif - "datadir=" DIR_DATADIR + "datadir =" DIR_DATADIR "\n" - "localedir=" DIR_LOCALEDIR + "localedir =" DIR_LOCALEDIR - "\n"; + "\n\n"; - ; + cout << _("Report bugs to") << " bug-gnu-music@gnu.org" << endl; print_mudela_versions (cout); } void -about () +identify () { + cout << gnu_lilypond_version_str () << endl; +} + +void +version () +{ + identify (); cout << '\n'; - cout << -#include "BLURB.hh" - cout << '\n'; - cout << _ ("GNU LilyPond is Free software, see --warranty"); - cout << '\n'; - cout << '\n'; + cout << _f ("" + "This is free software. It is covered by the GNU General Public License," + "and you are welcome to change it and/or distribute copies of it under" + "certain conditions. Invoke as `%s --warranty' for more information.\n", + "lilypond"); + cout << endl; + cout << _f ("Copyright (c) %s by", "1996--1999"); - cout << '\n'; - cout << " " + _ ("Han-Wen Nienhuys ") + "\n"; - cout << " " + _ ("Jan Nieuwenhuizen ") + "\n"; - cout << '\n'; + cout << "Han-Wen Nienhuys \n" + << "Jan Nieuwenhuizen \n"; } void notice () { cout << '\n'; + // GNU GNU? cout << _ ("GNU LilyPond -- The GNU Project music typesetter"); cout << '\n'; cout << _f ("Copyright (c) %s by", "1996--1999"); cout << '\n'; - cout << " " + _ ("Han-Wen Nienhuys ") + "\n"; - cout << " " + _ ("Jan Nieuwenhuizen ") + "\n"; + cout << " Han-Wen Nienhuys \n"; + cout << " Jan Nieuwenhuizen \n"; cout << '\n'; cout << _ ( " This program is free software; you can redistribute it and/or\n" @@ -200,11 +171,6 @@ notice () "USA.\n"); } -void -identify () -{ - *mlog << gnu_lilypond_version_str () << endl; -} void setup_paths () @@ -319,16 +285,16 @@ main_prog (int, char**) int main (int argc, char **argv) { - identify (); debug_init (); // should be first setup_paths (); oparser_global_p = new Getopt_long(argc, argv,theopts); while (Long_option_init const * opt = (*oparser_global_p)()) { - switch (opt->shortname) + switch (opt->shortname_ch_) { case 'v': + version(); exit (0); // we print a version anyway. break; case 't': @@ -354,9 +320,6 @@ main (int argc, char **argv) case 'i': init_str_global = oparser_global_p->optional_argument_ch_C_; break; - case 'a': - about (); - exit (0); case 'h': usage (); exit (0); @@ -384,6 +347,7 @@ main (int argc, char **argv) break; } } + identify (); #ifdef WINNT gh_enter (argc, argv, main_prog); diff --git a/midi2ly/main.cc b/midi2ly/main.cc index 1fc5c25f59..2cf9e95917 100644 --- a/midi2ly/main.cc +++ b/midi2ly/main.cc @@ -36,92 +36,87 @@ static File_path path; Verbose level_ver = NORMAL_ver; + void -usage() +identify() { - cout << _f ("Usage: %s [OPTION]... [FILE]", "midi2ly"); - cout << '\n'; - cout << _ ("Translate midi-file to mudela"); - cout << '\n'; - cout << '\n'; - cout << _ ("Options:"); - cout << '\n'; - cout << _ ( - " -b, --no-quantify write exact durations, e.g.: a4*385/384\n" - ); - cout << _ ( - " -D, --debug enable debugging output\n" - ); - cout << _ ( - " -h, --help this help\n" - ); - cout << _ ( - " -I, --include=DIR add DIR to search path\n" - ); - cout << _ ( - " -k, --key=ACC[:MINOR] set key: ACC +sharps/-flats; :1 minor\n" - ); - cout << _ ( - " -n, --no-silly assume no tuplets or double dots, smallest is 32\n" - ); - cout << _ ( - " -o, --output=FILE set FILE as default output\n" - ); - cout << _ ( - " -p, --no-tuplets assume no tuplets\n" - ); - cout << _ ( - " -q, --quiet be quiet\n" - ); - cout << _ ( - " -T, --no-timestamps don't timestamp the output\n" - ); - cout << _ ( - " -s, --smallest=N assume no shorter (reciprocal) durations than N\n" - ); - cout << _ ( - " -v, --verbose be verbose\n" - ); - cout << _ ( - " -w, --warranty show warranty and copyright\n" - ); - cout << _ ( - " -x, --no-double-dots assume no double dotted notes\n" - ); - ; +cout << midi2ly_version_str() << endl; + } void -identify() +version () { - LOGOUT(NORMAL_ver) << midi2ly_version_str() << endl; + identify (); + cout << '\n'; + cout << _f ("" + "This is free software. It is covered by the GNU General Public License," + "and you are welcome to change it and/or distribute copies of it under" + "certain conditions. Invoke as `%s --warranty' for more information.\n", + "midi2ly"); + cout << endl; + + cout << _f ("Copyright (c) %s by", "1996--1999"); + cout << "Han-Wen Nienhuys \n" + << "Jan Nieuwenhuizen \n"; } void notice() { - LOGOUT(NORMAL_ver) << '\n'; - LOGOUT(NORMAL_ver) << _ ("Midi2ly, translate midi to mudela"); - LOGOUT(NORMAL_ver) << '\n'; - LOGOUT(NORMAL_ver) << _f ("Copyright (c) %s by", "1997, 1998"); - LOGOUT(NORMAL_ver) << '\n'; - LOGOUT(NORMAL_ver) << " " + _ ("Han-Wen Nienhuys ") + "\n"; - LOGOUT(NORMAL_ver) << " " + _ ("Jan Nieuwenhuizen ") + "\n"; - LOGOUT(NORMAL_ver) << '\n'; - LOGOUT(NORMAL_ver) << _ ( - " This program is free software; you can redistribute it and/or\n" - "modify it under the terms of the GNU General Public License version 2\n" - "as published by the Free Software Foundation.\n" - "\n" - " This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" - "General Public License for more details.\n" - "\n" - " You should have received a copy (refer to the file COPYING) of the\n" - "GNU General Public License along with this program; if not, write to\n" - "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n" - "USA.\n"); + cout << _ ( + " This program is free software; you can redistribute it and/or\n" + "modify it under the terms of the GNU General Public License version 2\n" + "as published by the Free Software Foundation.\n" + "\n" + " This program is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" + "General Public License for more details.\n" + "\n" + " You should have received a copy (refer to the file COPYING) of the\n" + "GNU General Public License along with this program; if not, write to\n" + "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n" + "USA.\n"); +} + +/* + Internationalisation kludge in two steps: + * use _i () to get entry in POT file + * call gettext () explicitely for actual "translation" + */ +Long_option_init long_option_init_a[] = +{ + {0, "no-quantify", 'b', _i ("write exact durations, e.g.: a4*385/384")}, + {0, "debug", 'd', _i ("enable debugging output")}, + {0, "help", 'h', _i ("this help")}, + {_i ("ACC[:MINOR]"), "key", 'k', _i ("set key: ACC +sharps/-flats; :1 minor")}, + {0, "no-silly", 'n', _i ("assume no tuplets or double dots, smallest is 32")}, + {_i ("FILE"), "output", 'o', _i ("set FILE as default output")}, + {0, "no-tuplets", 'p', _i ("assume no tuplets")}, + {0, "quiet", 'q', _i ("be quiet")}, + {_i ("DUR"), "smallest", 's', _i ("Set smallest duration (?)")}, + {0, "no-timestamps", 'T', _i ("don't timestamp the output")}, + {0, "verbose", 'v', _i ("be verbose")}, + {0, "warranty", 'w', _i ("show warranty and copyright")}, + {0, "no-double-dots", 'x', _i ("assume no double dotted notes")}, + {0, "version", 'V', _i ("print version number")}, + {0,0,0, 0} +}; + +void +usage() +{ + cout << _f ("Usage: %s [OPTION]... [FILE]", "midi2ly"); + cout << '\n'; + cout << _ ("Translate midi-file to mudela"); + cout << '\n'; + cout << '\n'; + cout << _ ("Options:"); + cout << '\n'; + cout << Long_option_init::table_str (long_option_init_a) << endl; + + cout << _("Report bugs to") << " bug-gnu-music@gnu.org" << endl; } int @@ -140,98 +135,86 @@ main (int argc_i, char* argv_sz_a[]) bool key_override_b = false; Mudela_key key (0, 0); - Long_option_init long_option_init_a[] = - { - {0, "no-quantify", 'b'}, - {0, "debug", 'D'}, - {0, "help", 'h'}, - {1, "key", 'k'}, - {0, "no-silly", 'n'}, - {1, "output", 'o'}, - {0, "no-tuplets", 'p'}, - {0, "quiet", 'q'}, - {1, "smallest", 's'}, - {0, "no-timestamps", 'T'}, - {0, "verbose", 'v'}, - {0, "warranty", 'w'}, - {0, "no-double-dots", 'x'}, - {0,0,0} - }; + Getopt_long getopt_long (argc_i, argv_sz_a, long_option_init_a); String output_str; while (Long_option_init const* long_option_init_p = getopt_long()) - switch (long_option_init_p->shortname) - { - case 'b': - Duration_convert::no_quantify_b_s = true; - break; - case 'D': - level_ver = DEBUG_ver; - break; - case 'h': - identify(); - usage(); - exit (0); - break; -// case 'I': -// path->push (getopt_long.optional_argument_ch_C_); -// break; - case 'k': - { - String str = getopt_long.optional_argument_ch_C_; - int i = str.index_i (':'); - i = (i >=0 ? i : str.length_i ()); - key.accidentals_i_ = String_convert::dec2_i (str.left_str (i)); - key.minor_i_ = (int)(bool)String_convert::dec2_i (str.cut_str (i + 1, str.length_i ())); - key_override_b = true; - break; - } - case 'n': - Duration_convert::no_double_dots_b_s = true; - Duration_convert::no_triplets_b_s = true; - Duration_convert::no_smaller_than_i_s = 5; - break; - case 'o': - output_str = getopt_long.optional_argument_ch_C_; - break; - case 'p': - Duration_convert::no_triplets_b_s = true; - break; - case 'q': - level_ver = QUIET_ver; - break; - case 'T': - no_timestamps_b_g = true; - break; - case 's': - { - int i = String_convert::dec2_i (getopt_long.optional_argument_ch_C_); - if (!i) - { - identify(); - usage(); - exit (2); //usage - } - Duration_convert::no_smaller_than_i_s = - Duration_convert::i2_type(i); - } - break; - case 'v': - level_ver = VERBOSE_ver; - break; - case 'w': - identify(); - notice(); - exit (0); - break; - case 'x': - Duration_convert::no_double_dots_b_s = true; - break; - default: - assert (0); - break; + switch (long_option_init_p->shortname_ch_) + { + case 'b': + Duration_convert::no_quantify_b_s = true; + break; + case 'd': + level_ver = DEBUG_ver; + break; + case 'h': + usage(); + exit (0); + break; + // case 'I': + // path->push (getopt_long.optional_argument_ch_C_); + // break; + case 'k': + { + String str = getopt_long.optional_argument_ch_C_; + int i = str.index_i (':'); + i = (i >=0 ? i : str.length_i ()); + key.accidentals_i_ = String_convert::dec2_i (str.left_str (i)); + key.minor_i_ = (int)(bool)String_convert::dec2_i (str.cut_str (i + 1, str.length_i ())); + key_override_b = true; + break; + } + case 'n': + Duration_convert::no_double_dots_b_s = true; + Duration_convert::no_triplets_b_s = true; + Duration_convert::no_smaller_than_i_s = 5; + break; + case 'o': + output_str = getopt_long.optional_argument_ch_C_; + break; + case 'p': + Duration_convert::no_triplets_b_s = true; + break; + case 'q': + level_ver = QUIET_ver; + break; + case 'T': + no_timestamps_b_g = true; + break; + case 's': + { + int i = String_convert::dec2_i (getopt_long.optional_argument_ch_C_); + if (!i) + { + identify(); + usage(); + exit (2); //usage } + Duration_convert::no_smaller_than_i_s = + Duration_convert::i2_type(i); + } + break; + case 'v': + level_ver = VERBOSE_ver; + break; + + case 'V': + version (); + exit (0); + break; + case 'w': + identify(); + notice(); + exit (0); + break; + case 'x': + Duration_convert::no_double_dots_b_s = true; + break; + default: + assert (0); + break; + } // flag -q must be checked first identify(); @@ -243,28 +226,28 @@ main (int argc_i, char* argv_sz_a[]) char const* arg_sz = 0; while ( (arg_sz = getopt_long.get_next_arg ())) { - filename_str_g = arg_sz; - Midi_score_parser midi_parser; - Mudela_score* score_p = midi_parser.parse (arg_sz, &source); - - if (!score_p) - return 1; - - // if given on command line: override - if (key_override_b || !score_p->mudela_key_l_) - score_p->mudela_key_l_ = &key; - mudela_score_l_g = score_p; - score_p->process(); - - if (!output_str.length_i ()) - { - String d, dir, base, ext; - split_path (arg_sz, d, dir, base, ext); - output_str = base + ext + ".ly"; - } - - score_p->output (output_str); - delete score_p; + filename_str_g = arg_sz; + Midi_score_parser midi_parser; + Mudela_score* score_p = midi_parser.parse (arg_sz, &source); + + if (!score_p) + return 1; + + // if given on command line: override + if (key_override_b || !score_p->mudela_key_l_) + score_p->mudela_key_l_ = &key; + mudela_score_l_g = score_p; + score_p->process(); + + if (!output_str.length_i ()) + { + String d, dir, base, ext; + split_path (arg_sz, d, dir, base, ext); + output_str = base + ext + ".ly"; + } + + score_p->output (output_str); + delete score_p; } return 0; } diff --git a/po/GNUmakefile b/po/GNUmakefile index 2eddf0eeba..f4b7500f5d 100644 --- a/po/GNUmakefile +++ b/po/GNUmakefile @@ -6,6 +6,7 @@ depth = .. NAME = lilypond MODULE_NAME = po +POT_FILES = $(wildcard *.pot) PO_FILES = $(wildcard *.po) MO_FILES = $(addprefix $(outdir)/, $(PO_FILES:.po=.mo)) HELP_CATALOGS = $(PO_FILES:%.po=%) diff --git a/po/it.po b/po/it.po index ad3a0346d4..6b8a5ba49a 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 1999-08-15 23:58+0200\n" +"POT-Creation-Date: 1999-08-20 18:48+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -29,27 +29,27 @@ msgstr "Non ci sono sufficienti campi in Dstream init." msgid "Debug output disabled. Compiled with NPRINT." msgstr "L'output di debug è disabilitato. Compilato con NPRINT." -#: getopt-long.cc:103 +#: getopt-long.cc:141 #, c-format msgid "option `%s' requires an argument" msgstr "l'opzione `%s' richiede un argomento" -#: getopt-long.cc:107 +#: getopt-long.cc:145 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "opzione `%s' non accetta argomenti" -#: getopt-long.cc:111 +#: getopt-long.cc:149 #, c-format msgid "unrecognized option: `%s'" msgstr "opzione non riconosciuta: `%s'" -#: getopt-long.cc:113 +#: getopt-long.cc:151 #, c-format msgid "%c" msgstr "" -#: getopt-long.cc:117 +#: getopt-long.cc:155 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "argomento `%s' non valido per l'opzione `%s'" @@ -371,124 +371,147 @@ msgstr "" msgid "Aborting" msgstr "" -#: lookup.cc:434 +#: lookup.cc:436 #, c-format msgid "Non-matching braces in text `%s', adding braces." msgstr "" -#: main.cc:85 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." -msgstr "Uso: %s [OPZIONE]... [FILE]..." +#: main.cc:68 +msgid "BASENAME" +msgstr "" -#: main.cc:86 -msgid "Typeset music and or play MIDI from FILE or " -msgstr "Stampa partitura oppure suona una song MIDI da FILE o " +#: main.cc:68 +msgid "write output to BASENAME[-x].extension" +msgstr "" -#: main.cc:47 main.cc:89 -msgid "Options:" -msgstr "Opzioni: " +#: main.cc:69 main.cc:101 +#, fuzzy +msgid "show warranty and copyright" +msgstr " -w, --warranty mostra la garanzia e il copyright\n" -#: main.cc:92 -msgid " -a, --about about LilyPond\n" -msgstr " -a, --about cos'è LilyPond\n" +#: main.cc:70 main.cc:92 +msgid "this help" +msgstr "" -#: main.cc:95 +#: main.cc:71 #, fuzzy -msgid " -d, --debug enable debugging output\n" -msgstr " -D, --debug abilita l'output di debugging\n" +msgid "switch on experimental features" +msgstr " -t, --test usa le caratteristiche sperimentali\n" -#: main.cc:98 +#: main.cc:72 main.cc:91 #, fuzzy -msgid "" -" -M, --dependencies write Makefile dependencies for every input file\n" +msgid "enable debugging output" +msgstr " -D, --debug abilita l'output di debugging\n" + +#: main.cc:73 main.cc:95 +msgid "FILE" msgstr "" -" -d, --dependencies scrive le dependenze del Makefile per ogni file di " -"input\n" -#: main.cc:56 main.cc:101 -msgid " -h, --help this help\n" -msgstr " -h, --help questo help\n" +#: main.cc:73 +#, fuzzy +msgid "use FILE as init file" +msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" -#: main.cc:104 -msgid " -f, --output-format=X use output format X\n" -msgstr " -f, --output-format=X usa il formato dell'ouput X\n" +#: main.cc:74 +msgid "DIR" +msgstr "" -#: main.cc:59 main.cc:107 -msgid " -I, --include=DIR add DIR to search path\n" +#: main.cc:74 +#, fuzzy +msgid "add DIR to search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: main.cc:110 -msgid " -i, --init=FILE use FILE as init file\n" -msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" - -#: main.cc:113 +#: main.cc:75 #, fuzzy -msgid " -m, --no-paper produce midi output only\n" +msgid "produce midi output only" msgstr " -M, --no-paper produce solo output midi\n" -#: main.cc:116 -msgid " -o, --output=FILE set FILE as default output base\n" +#: main.cc:76 +#, fuzzy +msgid "write Makefile dependencies for every input file" msgstr "" -" -o, --output=FILE indica FILE come base di default per l'output\n" +" -d, --dependencies scrive le dependenze del Makefile per ogni file di " +"input\n" -#: main.cc:119 -msgid " -Q, --find-old-relative show all changes in relative syntax\n" +#: main.cc:77 main.cc:99 +#, fuzzy +msgid "don't timestamp the output" +msgstr "" +" -T, --no-timestamps non inserisce marcatori temporali nell'output\n" + +#: main.cc:78 +#, fuzzy +msgid "show all changes in relative syntax" msgstr "" " -Q, --find-old-relative mostra tutti i cambiamenti nella sintassi " "relativa\n" -#: main.cc:122 -msgid "" -" -s, --safe inhibit file output naming and exporting TeX " -"macros\n" +#: main.cc:79 +#, fuzzy +msgid "ignore mudela version" +msgstr "versione di mudela errata: %s (%s, %s)" + +#: main.cc:80 main.cc:103 +msgid "print version number" msgstr "" -" -s, --safe inibisce la rinomina dei file di output e " -"l'esportazione di macro di TeX\n" -#: main.cc:124 -msgid " -t, --test switch on experimental features\n" -msgstr " -t, --test usa le caratteristiche sperimentali\n" +#: main.cc:81 +msgid "EXT" +msgstr "" -#: main.cc:77 main.cc:127 -msgid " -T, --no-timestamps don't timestamp the output\n" +#: main.cc:81 +msgid "use output format EXT" msgstr "" -" -T, --no-timestamps non inserisce marcatori temporali nell'output\n" -#: main.cc:130 -msgid " -V, --ignore-version ignore mudela version\n" -msgstr " -V, --ignore-version ignora la versione di mudela\n" +#: main.cc:82 +#, 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:86 main.cc:133 -msgid " -w, --warranty show warranty and copyright\n" -msgstr " -w, --warranty mostra la garanzia e il copyright\n" +#: main.cc:89 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]..." +msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:136 -msgid "GNU LilyPond was compiled with the following settings:" -msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" +#: main.cc:91 +#, fuzzy +msgid "Typeset music and or play MIDI from FILE." +msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:166 -msgid "GNU LilyPond is Free software, see --warranty" -msgstr "GNU LilyPond è Free software, vedi --warranty" +#: main.cc:97 main.cc:115 +msgid "Options:" +msgstr "Opzioni: " -#: main.cc:106 main.cc:169 main.cc:182 -#, c-format -msgid "Copyright (c) %s by" -msgstr "Copyright (c) %s di" +#: main.cc:101 +#, fuzzy +msgid "This binary was compiled with the following options:" +msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:108 main.cc:171 main.cc:184 -msgid "Han-Wen Nienhuys " +#: main.cc:118 main.cc:119 +msgid "Report bugs to" msgstr "" -#: main.cc:109 main.cc:172 main.cc:185 -msgid "Jan Nieuwenhuizen " +#: main.cc:52 main.cc:134 +#, c-format +msgid "" +"This is free software. It is covered by the GNU General Public License,and " +"you are welcome to change it and/or distribute copies of it undercertain " +"conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:180 +#: main.cc:59 main.cc:141 main.cc:153 +#, c-format +msgid "Copyright (c) %s by" +msgstr "Copyright (c) %s di" + +#. GNU GNU? +#: main.cc:151 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:112 main.cc:188 +#: main.cc:68 main.cc:159 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -973,7 +996,6 @@ msgid "" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" "\n" -"\n" msgstr "" #: out/COPERTINA.hh:2 @@ -992,78 +1014,73 @@ msgstr "" #: out/FLAPTEKST.hh:2 msgid "" -"LilyPond is de muziekzetter van het GNU Project. Dit programma drukt\n" -"prachtige bladmuziek volgens een muzikaal definitie bestand. Ook kan\n" -"het een mechanische uitvoering afspelen naar een MIDI bestand.\n" -"Bijzondere kunstjes zijn verscheidene notenbalken, maatsoorten, sleutels, \n" -"toonaarden, zangteksten, krachtige invoer taal, cadensa, balken, boogjes, \n" -"triolen, accoordnamen, transponeren, partituren, en uittreksels voor \n" -"individuele partijen. Een fraaie set muziektekens is inbegrepen.\n" +"LilyPond is een muziekzetter. Zij maakt prachtige bladmuziek\n" +"uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" +"maakt deel uit van het GNU Project.\n" msgstr "" -#: main.cc:42 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]" -msgstr "Uso: %s [OPZIONE... [FILE]" - -#: main.cc:44 -msgid "Translate midi-file to mudela" -msgstr "Traduce un file midi in mudela" - -#: main.cc:50 -msgid " -b, --no-quantify write exact durations, e.g.: a4*385/384\n" +#: main.cc:90 +#, fuzzy +msgid "write exact durations, e.g.: a4*385/384" msgstr " -b, --no-quantify scrive durate esatte, p.es.: a4*385/384\n" -#: main.cc:53 -msgid " -D, --debug enable debugging output\n" -msgstr " -D, --debug abilita l'output di debugging\n" +#: main.cc:93 +msgid "ACC[:MINOR]" +msgstr "" -#: main.cc:62 -msgid " -k, --key=ACC[:MINOR] set key: ACC +sharps/-flats; :1 minor\n" +#: main.cc:93 +#, fuzzy +msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "" " -k, --key=ACC[:MINOR] imposta l'armatura: ACC +diesis/-bemolli; :1 minore\n" -#: main.cc:65 +#: main.cc:94 #, fuzzy -msgid "" -" -n, --no-silly assume no tuplets or double dots, smallest is 32\n" +msgid "assume no tuplets or double dots, smallest is 32" msgstr "" " -n, --no-silly assume che non ci siano gruppetti o doppi punti, la " "figura più piccola è 32\n" -#: main.cc:68 -msgid " -o, --output=FILE set FILE as default output\n" +#: main.cc:95 +#, fuzzy +msgid "set FILE as default output" msgstr " -o, --output=FILE set FILE come output di default\n" -#: main.cc:71 -#, fuzzy -msgid " -p, --no-tuplets assume no tuplets\n" -msgstr " -p, --no-plets assume che non ci siano gruppetti\n" +#: main.cc:96 +msgid "assume no tuplets" +msgstr "" -#: main.cc:74 -msgid " -q, --quiet be quiet\n" -msgstr " -q, --quiet sii silenzioso\n" +#: main.cc:97 +msgid "be quiet" +msgstr "" -#: main.cc:80 -msgid "" -" -s, --smallest=N assume no shorter (reciprocal) durations than N\n" +#: main.cc:98 +msgid "DUR" msgstr "" -" -s, --smallest=N assume che non ci siano durate (reciproche) " -"inferiori a N\n" -#: main.cc:83 -msgid " -v, --verbose be verbose\n" -msgstr " -v, --verbose sii loquace\n" +#: main.cc:98 +#, fuzzy +msgid "Set smallest duration (?)" +msgstr "indicazione durata priva di senso" -#: main.cc:89 -msgid " -x, --no-double-dots assume no double dotted notes\n" +#: main.cc:100 +msgid "be verbose" msgstr "" -" -x, --no-double-dots assume che non ci siano note con doppio punto\n" -#: main.cc:104 +#: main.cc:102 #, fuzzy -msgid "Midi2ly, translate midi to mudela" -msgstr "Mi2mu, tradice midi in mudela" +msgid "assume no double dotted notes" +msgstr "" +" -x, --no-double-dots assume che non ci siano note con doppio punto\n" + +#: main.cc:110 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]" +msgstr "Uso: %s [OPZIONE... [FILE]" + +#: main.cc:112 +msgid "Translate midi-file to mudela" +msgstr "Traduce un file midi in mudela" #: midi-parser.cc:64 msgid "zero length string encountered" @@ -1189,9 +1206,59 @@ msgstr "% Generato automaticamente" msgid "% from input file: " msgstr "% dal file di input: " -#: version.cc:11 -msgid "of" -msgstr "di" +#, fuzzy +#~ msgid "enable debugging output " +#~ msgstr " -D, --debug abilita l'output di debugging\n" + +#, fuzzy +#~ msgid "don't timestamp the output " +#~ msgstr "" +#~ " -T, --no-timestamps non inserisce marcatori temporali nell'output\n" + +#~ msgid " -a, --about about LilyPond\n" +#~ msgstr " -a, --about cos'è LilyPond\n" + +#~ msgid " -h, --help this help\n" +#~ msgstr " -h, --help questo help\n" + +#~ msgid " -f, --output-format=X use output format X\n" +#~ msgstr " -f, --output-format=X usa il formato dell'ouput X\n" + +#~ msgid " -o, --output=FILE set FILE as default output base\n" +#~ msgstr "" +#~ " -o, --output=FILE indica FILE come base di default per l'output\n" + +#~ msgid " -V, --ignore-version ignore mudela version\n" +#~ msgstr " -V, --ignore-version ignora la versione di mudela\n" + +#~ msgid "GNU LilyPond is Free software, see --warranty" +#~ msgstr "GNU LilyPond è Free software, vedi --warranty" + +#~ msgid " -D, --debug enable debugging output\n" +#~ msgstr " -D, --debug abilita l'output di debugging\n" + +#, fuzzy +#~ msgid " -p, --no-tuplets assume no tuplets\n" +#~ msgstr " -p, --no-plets assume che non ci siano gruppetti\n" + +#~ msgid " -q, --quiet be quiet\n" +#~ msgstr " -q, --quiet sii silenzioso\n" + +#~ msgid "" +#~ " -s, --smallest=N assume no shorter (reciprocal) durations than N\n" +#~ msgstr "" +#~ " -s, --smallest=N assume che non ci siano durate (reciproche) " +#~ "inferiori a N\n" + +#~ msgid " -v, --verbose be verbose\n" +#~ msgstr " -v, --verbose sii loquace\n" + +#, fuzzy +#~ msgid "Midi2ly, translate midi to mudela" +#~ msgstr "Mi2mu, tradice midi in mudela" + +#~ msgid "of" +#~ msgstr "di" #~ msgid "please fix me" #~ msgstr "correggimi, per favore" diff --git a/po/lilypond.po b/po/lilypond.po index 23a27594e6..66cadce854 100644 --- a/po/lilypond.po +++ b/po/lilypond.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-08-15 23:58+0200\n" +"POT-Creation-Date: 1999-08-20 18:48+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,27 +30,27 @@ msgstr "" msgid "Debug output disabled. Compiled with NPRINT." msgstr "" -#: getopt-long.cc:103 +#: getopt-long.cc:141 #, c-format msgid "option `%s' requires an argument" msgstr "" -#: getopt-long.cc:107 +#: getopt-long.cc:145 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "" -#: getopt-long.cc:111 +#: getopt-long.cc:149 #, c-format msgid "unrecognized option: `%s'" msgstr "" -#: getopt-long.cc:113 +#: getopt-long.cc:151 #, c-format msgid "%c" msgstr "" -#: getopt-long.cc:117 +#: getopt-long.cc:155 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "" @@ -370,113 +370,127 @@ msgstr "" msgid "Aborting" msgstr "" -#: lookup.cc:434 +#: lookup.cc:436 #, c-format msgid "Non-matching braces in text `%s', adding braces." msgstr "" -#: main.cc:85 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#: main.cc:68 +msgid "BASENAME" msgstr "" -#: main.cc:86 -msgid "Typeset music and or play MIDI from FILE or " +#: main.cc:68 +msgid "write output to BASENAME[-x].extension" msgstr "" -#: main.cc:47 main.cc:89 -msgid "Options:" +#: main.cc:69 main.cc:101 +msgid "show warranty and copyright" msgstr "" -#: main.cc:92 -msgid " -a, --about about LilyPond\n" +#: main.cc:70 main.cc:92 +msgid "this help" msgstr "" -#: main.cc:95 -msgid " -d, --debug enable debugging output\n" +#: main.cc:71 +msgid "switch on experimental features" msgstr "" -#: main.cc:98 -msgid "" -" -M, --dependencies write Makefile dependencies for every input file\n" +#: main.cc:72 main.cc:91 +msgid "enable debugging output" msgstr "" -#: main.cc:56 main.cc:101 -msgid " -h, --help this help\n" +#: main.cc:73 main.cc:95 +msgid "FILE" msgstr "" -#: main.cc:104 -msgid " -f, --output-format=X use output format X\n" +#: main.cc:73 +msgid "use FILE as init file" msgstr "" -#: main.cc:59 main.cc:107 -msgid " -I, --include=DIR add DIR to search path\n" +#: main.cc:74 +msgid "DIR" msgstr "" -#: main.cc:110 -msgid " -i, --init=FILE use FILE as init file\n" +#: main.cc:74 +msgid "add DIR to search path" msgstr "" -#: main.cc:113 -msgid " -m, --no-paper produce midi output only\n" +#: main.cc:75 +msgid "produce midi output only" msgstr "" -#: main.cc:116 -msgid " -o, --output=FILE set FILE as default output base\n" +#: main.cc:76 +msgid "write Makefile dependencies for every input file" msgstr "" -#: main.cc:119 -msgid " -Q, --find-old-relative show all changes in relative syntax\n" +#: main.cc:77 main.cc:99 +msgid "don't timestamp the output" msgstr "" -#: main.cc:122 -msgid "" -" -s, --safe inhibit file output naming and exporting TeX " -"macros\n" +#: main.cc:78 +msgid "show all changes in relative syntax" msgstr "" -#: main.cc:124 -msgid " -t, --test switch on experimental features\n" +#: main.cc:79 +msgid "ignore mudela version" msgstr "" -#: main.cc:77 main.cc:127 -msgid " -T, --no-timestamps don't timestamp the output\n" +#: main.cc:80 main.cc:103 +msgid "print version number" msgstr "" -#: main.cc:130 -msgid " -V, --ignore-version ignore mudela version\n" +#: main.cc:81 +msgid "EXT" msgstr "" -#: main.cc:86 main.cc:133 -msgid " -w, --warranty show warranty and copyright\n" +#: main.cc:81 +msgid "use output format EXT" msgstr "" -#: main.cc:136 -msgid "GNU LilyPond was compiled with the following settings:" +#: main.cc:82 +msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:166 -msgid "GNU LilyPond is Free software, see --warranty" +#: main.cc:89 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]..." msgstr "" -#: main.cc:106 main.cc:169 main.cc:182 -#, c-format -msgid "Copyright (c) %s by" +#: main.cc:91 +msgid "Typeset music and or play MIDI from FILE." +msgstr "" + +#: main.cc:97 main.cc:115 +msgid "Options:" +msgstr "" + +#: main.cc:101 +msgid "This binary was compiled with the following options:" +msgstr "" + +#: main.cc:118 main.cc:119 +msgid "Report bugs to" msgstr "" -#: main.cc:108 main.cc:171 main.cc:184 -msgid "Han-Wen Nienhuys " +#: main.cc:52 main.cc:134 +#, c-format +msgid "" +"This is free software. It is covered by the GNU General Public License,and " +"you are welcome to change it and/or distribute copies of it undercertain " +"conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:109 main.cc:172 main.cc:185 -msgid "Jan Nieuwenhuizen " +#: main.cc:59 main.cc:141 main.cc:153 +#, c-format +msgid "Copyright (c) %s by" msgstr "" -#: main.cc:180 +#. GNU GNU? +#: main.cc:151 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "" -#: main.cc:112 main.cc:188 +#: main.cc:68 main.cc:159 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" @@ -940,7 +954,6 @@ msgid "" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" "\n" -"\n" msgstr "" #: out/COPERTINA.hh:2 @@ -959,68 +972,62 @@ msgstr "" #: out/FLAPTEKST.hh:2 msgid "" -"LilyPond is de muziekzetter van het GNU Project. Dit programma drukt\n" -"prachtige bladmuziek volgens een muzikaal definitie bestand. Ook kan\n" -"het een mechanische uitvoering afspelen naar een MIDI bestand.\n" -"Bijzondere kunstjes zijn verscheidene notenbalken, maatsoorten, sleutels, \n" -"toonaarden, zangteksten, krachtige invoer taal, cadensa, balken, boogjes, \n" -"triolen, accoordnamen, transponeren, partituren, en uittreksels voor \n" -"individuele partijen. Een fraaie set muziektekens is inbegrepen.\n" +"LilyPond is een muziekzetter. Zij maakt prachtige bladmuziek\n" +"uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" +"maakt deel uit van het GNU Project.\n" msgstr "" -#: main.cc:42 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]" +#: main.cc:90 +msgid "write exact durations, e.g.: a4*385/384" msgstr "" -#: main.cc:44 -msgid "Translate midi-file to mudela" +#: main.cc:93 +msgid "ACC[:MINOR]" msgstr "" -#: main.cc:50 -msgid " -b, --no-quantify write exact durations, e.g.: a4*385/384\n" +#: main.cc:93 +msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "" -#: main.cc:53 -msgid " -D, --debug enable debugging output\n" +#: main.cc:94 +msgid "assume no tuplets or double dots, smallest is 32" msgstr "" -#: main.cc:62 -msgid " -k, --key=ACC[:MINOR] set key: ACC +sharps/-flats; :1 minor\n" +#: main.cc:95 +msgid "set FILE as default output" msgstr "" -#: main.cc:65 -msgid "" -" -n, --no-silly assume no tuplets or double dots, smallest is 32\n" +#: main.cc:96 +msgid "assume no tuplets" msgstr "" -#: main.cc:68 -msgid " -o, --output=FILE set FILE as default output\n" +#: main.cc:97 +msgid "be quiet" msgstr "" -#: main.cc:71 -msgid " -p, --no-tuplets assume no tuplets\n" +#: main.cc:98 +msgid "DUR" msgstr "" -#: main.cc:74 -msgid " -q, --quiet be quiet\n" +#: main.cc:98 +msgid "Set smallest duration (?)" msgstr "" -#: main.cc:80 -msgid "" -" -s, --smallest=N assume no shorter (reciprocal) durations than N\n" +#: main.cc:100 +msgid "be verbose" msgstr "" -#: main.cc:83 -msgid " -v, --verbose be verbose\n" +#: main.cc:102 +msgid "assume no double dotted notes" msgstr "" -#: main.cc:89 -msgid " -x, --no-double-dots assume no double dotted notes\n" +#: main.cc:110 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]" msgstr "" -#: main.cc:104 -msgid "Midi2ly, translate midi to mudela" +#: main.cc:112 +msgid "Translate midi-file to mudela" msgstr "" #: midi-parser.cc:64 @@ -1146,7 +1153,3 @@ msgstr "" #, c-format msgid "% from input file: " msgstr "" - -#: version.cc:11 -msgid "of" -msgstr "" diff --git a/po/nl.po b/po/nl.po index e32dcdb374..1f5dfdd10c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1999-08-15 23:58+0200\n" +"POT-Creation-Date: 1999-08-20 18:48+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-26 11:26:28+0200\n" "From: \n" @@ -28,27 +28,27 @@ msgstr "Onvoldoende velden in Dstream init." msgid "Debug output disabled. Compiled with NPRINT." msgstr "Ontluis berichten zijn uitgeschakeld. Vertaald met NPRINT." -#: getopt-long.cc:103 +#: getopt-long.cc:141 #, c-format msgid "option `%s' requires an argument" msgstr "optie `%s' vereist een argument" -#: getopt-long.cc:107 +#: getopt-long.cc:145 #, c-format msgid "option `%s' doesn't allow an argument" msgstr "optie `%s' staat geen argument toe" -#: getopt-long.cc:111 +#: getopt-long.cc:149 #, c-format msgid "unrecognized option: `%s'" msgstr "onbekende optie: `%s'" -#: getopt-long.cc:113 +#: getopt-long.cc:151 #, c-format msgid "%c" msgstr "" -#: getopt-long.cc:117 +#: getopt-long.cc:155 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "onjuist argument: `%s' voor optie `%s'" @@ -368,117 +368,127 @@ msgstr "" msgid "Aborting" msgstr "" -#: lookup.cc:434 +#: lookup.cc:436 #, c-format msgid "Non-matching braces in text `%s', adding braces." msgstr "" -#: main.cc:85 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." -msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." - -#: main.cc:86 -msgid "Typeset music and or play MIDI from FILE or " -msgstr "Zet muziek en of speel MIDI van FILE of " +#: main.cc:68 +msgid "BASENAME" +msgstr "BASISNAAM" -#: main.cc:47 main.cc:89 -msgid "Options:" -msgstr "Opties:" +#: main.cc:68 +msgid "write output to BASENAME[-x].extension" +msgstr "schrijf uitvoer naar BASISNAME[-x].extensie" -#: main.cc:92 -msgid " -a, --about about LilyPond\n" -msgstr " -a, --about over LilyPond\n" +#: main.cc:69 main.cc:101 +msgid "show warranty and copyright" +msgstr "toon garantie en copyright" -#: main.cc:95 -msgid " -d, --debug enable debugging output\n" -msgstr " -D, --debug toon ontluis berichten\n" +#: main.cc:70 main.cc:92 +msgid "this help" +msgstr "deze hulp" -#: main.cc:98 -msgid "" -" -M, --dependencies write Makefile dependencies for every input file\n" -msgstr "" -" -d, --dependencies schrijf Makefile afhankelijkheden voor elk\n" -" invoerbestand\n" +#: main.cc:71 +msgid "switch on experimental features" +msgstr "doe experimentele kunstjes" -#: main.cc:56 main.cc:101 -msgid " -h, --help this help\n" -msgstr " -h, --help deze hulp\n" +#: main.cc:72 main.cc:91 +msgid "enable debugging output" +msgstr "toon ontluis berichten" -#: main.cc:104 -msgid " -f, --output-format=X use output format X\n" -msgstr " -f, --output-format=X gebruik uitvoer formaat X\n" +#: main.cc:73 main.cc:95 +msgid "FILE" +msgstr "BESTAND" -#: main.cc:59 main.cc:107 -msgid " -I, --include=DIR add DIR to search path\n" -msgstr " -I, --include=INDEX voeg INDEX toe aan zoekpad\n" +#: main.cc:73 +msgid "use FILE as init file" +msgstr "gebruik BESTAND als initialisatiebestand" -#: main.cc:110 -msgid " -i, --init=FILE use FILE as init file\n" -msgstr " -i, --init=BESTAND gebruik BESTAND als initialisatiebestand\n" +#: main.cc:74 +msgid "DIR" +msgstr "DIR" -#: main.cc:113 -msgid " -m, --no-paper produce midi output only\n" -msgstr " -M, --no-paper produceer alleen midi uitvoer\n" +#: main.cc:74 +msgid "add DIR to search path" +msgstr "voeg DIR toe aan zoekpad" -#: main.cc:116 -msgid " -o, --output=FILE set FILE as default output base\n" -msgstr " -o, --output=BESTAND zet BESTAND als uitvoer basis\n" +#: main.cc:75 +msgid "produce midi output only" +msgstr "produceer alleen midi uitvoer" -#: main.cc:119 -msgid " -Q, --find-old-relative show all changes in relative syntax\n" -msgstr " -Q, --find-old-relative toon veranderingen voor relatieve mode\n" +#: main.cc:76 +msgid "write Makefile dependencies for every input file" +msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" -#: main.cc:122 -msgid "" -" -s, --safe inhibit file output naming and exporting TeX " -"macros\n" -msgstr "" -" -s, --safe verbiedt naamgeving van uitvoer bestand en TeX " -"macro's\n" +#: main.cc:77 main.cc:99 +msgid "don't timestamp the output" +msgstr "geen tijdstempel in de uitvoer" -#: main.cc:124 -msgid " -t, --test switch on experimental features\n" -msgstr " -t, --test doe experimentele kunstjes\n" +#: main.cc:78 +msgid "show all changes in relative syntax" +msgstr "toon veranderingen voor relatieve mode" -#: main.cc:77 main.cc:127 -msgid " -T, --no-timestamps don't timestamp the output\n" -msgstr " -T, --no-timestamps zet geen tijdstempel in de uitvoer\n" +#: main.cc:79 +msgid "ignore mudela version" +msgstr "verkeerde mudela versie: %s (%s, %s)" -#: main.cc:130 -msgid " -V, --ignore-version ignore mudela version\n" -msgstr " -V, --ignore-version negeer mudela versie\n" +#: main.cc:80 main.cc:103 +msgid "print version number" +msgstr "toon versienummer" -#: main.cc:86 main.cc:133 -msgid " -w, --warranty show warranty and copyright\n" -msgstr " -w, --warranty toon garantie en copyright\n" +#: main.cc:81 +msgid "EXT" +msgstr "EXT" -#: main.cc:136 -msgid "GNU LilyPond was compiled with the following settings:" -msgstr "GNU LilyPond is vertaald met de volgende instellingen:" +#: main.cc:81 +msgid "use output format EXT" +msgstr "gebruik uitvoer formaat EXT" -#: main.cc:166 -msgid "GNU LilyPond is Free software, see --warranty" -msgstr "GNU LilyPond is Vrij bedenksel, zie --warranty" +#: main.cc:82 +msgid "inhibit file output naming and exporting" +msgstr "verbiedt naamgeving van uitvoer bestand en TeX macro's" -#: main.cc:106 main.cc:169 main.cc:182 +#: main.cc:89 #, c-format -msgid "Copyright (c) %s by" -msgstr "Copyright (c) %s " +msgid "Usage: %s [OPTION]... [FILE]..." +msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." -#: main.cc:108 main.cc:171 main.cc:184 -msgid "Han-Wen Nienhuys " -msgstr "" +#: main.cc:91 +msgid "Typeset music and or play MIDI from FILE." +msgstr "Zet muziek en of speel MIDI van FILE of " + +#: main.cc:97 main.cc:115 +msgid "Options:" +msgstr "Opties:" + +#: main.cc:101 +msgid "This binary was compiled with the following options:" +msgstr "Dit programma is vertaald met de volgende instellingen:" + +#: main.cc:118 main.cc:119 +msgid "Report bugs to" +msgstr "Rapporteer bugs naar" -#: main.cc:109 main.cc:172 main.cc:185 -msgid "Jan Nieuwenhuizen " +#: main.cc:52 main.cc:134 +#, c-format +msgid "" +"This is free software. It is covered by the GNU General Public License,and " +"you are welcome to change it and/or distribute copies of it undercertain " +"conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:180 +#: main.cc:59 main.cc:141 main.cc:153 +#, c-format +msgid "Copyright (c) %s by" +msgstr "Copyright (c) %s " + +#. GNU GNU? +#: main.cc:151 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- De Muziekzetter van het GNU Project" -#: main.cc:112 main.cc:188 +#: main.cc:68 main.cc:159 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" @@ -872,7 +882,7 @@ msgstr "Ik ben te dik." #: parser.yy:55 #, c-format msgid "Oldest supported input version: %s" -msgstr "" +msgstr "Oudst ondersteunde invoer versie: %s" #: parser.yy:313 msgid "Cannot evaluate Scheme in safe mode" @@ -955,8 +965,11 @@ msgid "" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" "\n" -"\n" msgstr "" +"LilyPond is een muziekzetter. Zij maakt prachtige bladmuziek\n" +"uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" +"maakt deel uit van het GNU Project.\n" +"\n" #: out/COPERTINA.hh:2 msgid "" @@ -974,70 +987,63 @@ msgstr "" #: out/FLAPTEKST.hh:2 msgid "" -"LilyPond is de muziekzetter van het GNU Project. Dit programma drukt\n" -"prachtige bladmuziek volgens een muzikaal definitie bestand. Ook kan\n" -"het een mechanische uitvoering afspelen naar een MIDI bestand.\n" -"Bijzondere kunstjes zijn verscheidene notenbalken, maatsoorten, sleutels, \n" -"toonaarden, zangteksten, krachtige invoer taal, cadensa, balken, boogjes, \n" -"triolen, accoordnamen, transponeren, partituren, en uittreksels voor \n" -"individuele partijen. Een fraaie set muziektekens is inbegrepen.\n" +"LilyPond is een muziekzetter. Zij maakt prachtige bladmuziek\n" +"uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" +"maakt deel uit van het GNU Project.\n" msgstr "" -#: main.cc:42 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]" -msgstr "Gebruik: %s [OPTIE]... [BESTAND]" +#: main.cc:90 +msgid "write exact durations, e.g.: a4*385/384" +msgstr "schrijf exacte duren, bijv.: a4*385/384" -#: main.cc:44 -msgid "Translate midi-file to mudela" -msgstr "Vertaal midi-bestand naar mudela" +#: main.cc:93 +msgid "ACC[:MINOR]" +msgstr "ACC[:MINEUR]" -#: main.cc:50 -msgid " -b, --no-quantify write exact durations, e.g.: a4*385/384\n" -msgstr " -b, --no-quantify schrijf exacte duren, bijv.: a4*385/384\n" +#: main.cc:93 +msgid "set key: ACC +sharps/-flats; :1 minor" +msgstr "zet toonsoort: ACC +kruizen/-mollen; :1 mineur" -#: main.cc:53 -msgid " -D, --debug enable debugging output\n" -msgstr " -D, --debug toon ontluis berichten\n" +#: main.cc:94 +msgid "assume no tuplets or double dots, smallest is 32" +msgstr "ga niet uit van tuplets of dubbel gepunkteerd, kortste is 32" -#: main.cc:62 -msgid " -k, --key=ACC[:MINOR] set key: ACC +sharps/-flats; :1 minor\n" -msgstr " -k, --key=ACC[:MINEUR] zet toonsoort: ACC +kruizen/-mollen; :1 mineur\n" +#: main.cc:95 +msgid "set FILE as default output" +msgstr "zet BESTAND als verval uitvoer" -#: main.cc:65 -msgid "" -" -n, --no-silly assume no tuplets or double dots, smallest is 32\n" -msgstr " -n, --no-silly ga niet uit van tuplets of dubbel gepunteerd, " -" kortste is 32\n" +#: main.cc:96 +msgid "assume no tuplets" +msgstr "ga niet uit van tuplets" -#: main.cc:68 -msgid " -o, --output=FILE set FILE as default output\n" -msgstr " -o, --output=BESTAND zet BESTAND als verval uitvoer\n" +#: main.cc:97 +msgid "be quiet" +msgstr "wees stil" -#: main.cc:71 -msgid " -p, --no-tuplets assume no tuplets\n" -msgstr " -p, --no-tuplets ga uit van geen tuplets\n" +#: main.cc:98 +msgid "DUR" +msgstr "DUUR" -#: main.cc:74 -msgid " -q, --quiet be quiet\n" -msgstr " -q, --quiet wees stil\n" +#: main.cc:98 +msgid "Set smallest duration (?)" +msgstr "Zet kortste duur (?)" -#: main.cc:80 -msgid "" -" -s, --smallest=N assume no shorter (reciprocal) durations than N\n" -msgstr " -s, --smallest=N ga niet uit van kortere (reciproke) duren dan N\n" +#: main.cc:100 +msgid "be verbose" +msgstr "wees breedsprakig" -#: main.cc:83 -msgid " -v, --verbose be verbose\n" -msgstr " -v, --verbose wees breedsprakig\n" +#: main.cc:102 +msgid "assume no double dotted notes" +msgstr "ga niet uit van dubbel gepunkteerde noten" -#: main.cc:89 -msgid " -x, --no-double-dots assume no double dotted notes\n" -msgstr " -x, --no-double-dots ga niet uit van dubbel gepunkteerde noten\n" +#: main.cc:110 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]" +msgstr "Gebruik: %s [OPTIE]... [BESTAND]" -#: main.cc:104 -msgid "Midi2ly, translate midi to mudela" -msgstr "Midi2ly, vertaal midi naar mudela" +#: main.cc:112 +msgid "Translate midi-file to mudela" +msgstr "Vertaal midi-bestand naar mudela" #: midi-parser.cc:64 msgid "zero length string encountered" @@ -1163,9 +1169,17 @@ msgstr "" msgid "% from input file: " msgstr "" -#: version.cc:11 -msgid "of" -msgstr "van" +#~ msgid "this help " +#~ msgstr "deze hulp" + +#~ msgid "GNU LilyPond is Free Software, see --warranty" +#~ msgstr "GNU LilyPond is Vrij bedenksel, zie --warranty" + +#~ msgid "Midi2ly, translate midi to mudela" +#~ msgstr "Midi2ly, vertaal midi naar mudela" + +#~ msgid "of" +#~ msgstr "van" #~ msgid "please fix me" #~ msgstr "repareer mij alsjeblieft" diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make index 9b66622603..6b5e125743 100644 --- a/stepmake/stepmake/po-targets.make +++ b/stepmake/stepmake/po-targets.make @@ -23,7 +23,7 @@ ifneq ($(strip $(ALL_PO_SOURCES)),) @echo $(ALL_PO_SOURCES) xgettext --c++ --default-domain=$(package) --join \ --output-dir=$(po-dir)/$(outdir) --add-comments \ - --keyword=_ --keyword=_f $(ALL_PO_SOURCES) + --keyword=_ --keyword=_f --keyword=_i $(ALL_PO_SOURCES) endif endif -- 2.39.5