From: Jan Nieuwenhuizen Date: Sun, 16 Sep 2001 17:48:48 +0000 (+0200) Subject: patch::: 1.4.7.jcn2 X-Git-Tag: release/1.4.8~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a078e3a2964438b8e4ef63c0ed9b6e298afa9449;p=lilypond.git patch::: 1.4.7.jcn2 1.4.7.jcn2 --- diff --git a/CHANGES b/CHANGES index 5d7820e960..d6db14e7f7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,12 @@ -1.4.7.jcn1 +1.4.7.jcn2 ========== +* Fixed off by one error for point and click. + +* po update. + +* windows doc update. + * Add mktextfm wrapper for windows (thanks Mats). 1.4.7 diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index f4099dd970..ed10f24052 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -466,8 +466,9 @@ For Debian 2.2: For Debian in development ("unstable", the future 2.3 or 3.0): @example - apt-get install task-debian-devel task-c++-dev \ - python-base libguile9-dev tetex-bin libkpathsea-dev \ + apt-get install binutils cpp gcc libc6-dev \ + g++ libstdc++2.10-dev \ + python-base libguile-dev tetex-bin libkpathsea-dev \ tetex-extra flex bison texinfo bibtex2html groff gs \ netpbm m4 gettext @end example diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi index 2f9c4f66e0..dac89d0f61 100644 --- a/Documentation/windows/compiling.texi +++ b/Documentation/windows/compiling.texi @@ -8,7 +8,7 @@ ftp://ftp.lilypond.org/pub/LilyPond/}. You need the following packages to compile Lilypond on Windows. @table @code -@item The GNU + Cygnus tools, 1.1.7 or newer. +@item The GNU + Cygnus tools, 1.3.2 or newer. Check out the @uref{http://sources.redhat.com/cygwin,Cygwin webpage}. You can get the latest version of the GNU + Cygnus tools from cygnus @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}. @@ -23,8 +23,8 @@ included in LilyPond's source distribution. These binaries are cross compiled for Windows on a GNU/Linux box. You may want to check out the -@uref{http://www.lilypond.org/gnu-windows/cross.tar.gz,cross compilation -scripts}. +@uref{http://www.lilypond.org/gnu-windows/cygwin-cross.tar.gz,cross +compilation scripts}. @subsection Compiling on Windows @@ -50,16 +50,17 @@ Compiling @file{setup.exe} has been complicated a bit with the introduction of the non-feature bzip2. Here's how I did it: @quotation @example - tar xjf cygwin-src-20010531.tar.bz2 - tar xjf winsup-src-20010531.tar.bz2 - tar xzf mingw-20010424-1.tar.gz + mkdir cygwin-20010709 + cd cygwin-20010709 + tar xjf cygwin-src-20010709.tar.bz2 cd winsup/cinstall - patch < ../../cygwin-installer.patch - cp /home/cygwin/cygwin-1.3.2/usr/lib/mingw/crt2.o . - cd ../bzip + patch < $HOME/usr/src/lilypond/Documentation/windows/cygwin-installer.patch + cd ../bz2lib MINGW32=yes CFLAGS='-mno-cygwin' ./configure make cd - + MINGW32=yes CFLAGS='-mno-cygwin' ./configure + cp $HOME/usr/src/cygwin/cygwin-1.3.2/usr/lib/mingw/crt2.o . make w32api_lib=/home/cygwin/cygwin-1.3.2/usr/lib/w32api \ CXX='g++ -L/home/cygwin/cygwin-1.3.2/usr/lib/mingw' @end example diff --git a/VERSION b/VERSION index 6dc322dae4..b91ade6ae5 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 PATCH_LEVEL=7 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh index 0e8b8f2b86..b82571b20c 100644 --- a/lily/include/my-lily-parser.hh +++ b/lily/include/my-lily-parser.hh @@ -50,7 +50,7 @@ public: bool ignore_version_b_; Input here_input () const; - void remember_spot (); + void push_spot (); Input pop_spot (); void do_yyparse (); diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index f6553c9cb5..4a44f5919a 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -64,7 +64,7 @@ My_lily_parser::parse_file (String init, String s) } void -My_lily_parser::remember_spot () +My_lily_parser::push_spot () { define_spot_array_.push (here_input ()); } diff --git a/lily/parser.yy b/lily/parser.yy index cf67bb9a93..c684d4237e 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -409,7 +409,7 @@ lilypond_header: */ assignment: STRING { - THIS->remember_spot (); + THIS->push_spot (); } /* cont */ '=' identifier_init { @@ -535,7 +535,7 @@ translator_spec_body: */ score_block: SCORE { - THIS->remember_spot (); + THIS->push_spot (); } /*cont*/ '{' score_body '}' { THIS->pop_spot (); @@ -822,7 +822,7 @@ Composite_music: $$ = csm; } | TIMES { - THIS->remember_spot (); + THIS->push_spot (); } /* CONTINUED */ fraction Music @@ -1042,18 +1042,19 @@ scalar: request_chord: - pre_requests simple_element post_requests { - Music_sequence *l = dynamic_cast ($2); + pre_requests { + THIS->push_spot (); + } /*cont */ simple_element post_requests { + Music_sequence *l = dynamic_cast ($3); if (l) { for (int i=0; i < $1->size (); i++) l->append_music ($1->elem (i)); - for (int i=0; i < $3->size (); i++) - l->append_music ($3->elem (i)); + for (int i=0; i < $4->size (); i++) + l->append_music ($4->elem (i)); } else programming_error ("Need Sequence to add music to"); - $$ = $2; - + $$ = $3; } | command_element ; @@ -1641,6 +1642,8 @@ tremolo_type: simple_element: pitch exclamations questions optional_notemode_duration { + + Input i = THIS->pop_spot (); if (!THIS->lexer_p_->note_state_b ()) THIS->parser_error (_ ("Have to be in Note mode for notes")); @@ -1657,40 +1660,36 @@ simple_element: Simultaneous_music*v = new Request_chord (SCM_EOL); v->set_mus_property ("elements", gh_list (n->self_scm (), SCM_UNDEFINED)); -/* -FIXME: location is one off, since ptich & duration don't contain origin refs. -*/ - v->set_spot (THIS->here_input ()); - n->set_spot (THIS->here_input ()); - + v->set_spot (i); + n->set_spot (i); $$ = v; } | RESTNAME optional_notemode_duration { - SCM e = SCM_UNDEFINED; - if (ly_scm2string ($1) =="s") - { /* Space */ - Skip_req * skip_p = new Skip_req; - skip_p->set_mus_property ("duration" ,$2); - - skip_p->set_spot (THIS->here_input ()); + Input i = THIS->pop_spot (); + SCM e = SCM_UNDEFINED; + if (ly_scm2string ($1) =="s") { + /* Space */ + Skip_req * skip_p = new Skip_req; + skip_p->set_mus_property ("duration" ,$2); + skip_p->set_spot (i); e = skip_p->self_scm (); - } - else - { - Rest_req * rest_req_p = new Rest_req; - rest_req_p->set_mus_property ("duration", $2); - rest_req_p->set_spot (THIS->here_input ()); + } + else { + Rest_req * rest_req_p = new Rest_req; + rest_req_p->set_mus_property ("duration", $2); + rest_req_p->set_spot (i); e = rest_req_p->self_scm (); } - Simultaneous_music* velt_p = new Request_chord (SCM_EOL); + Simultaneous_music* velt_p = new Request_chord (SCM_EOL); velt_p-> set_mus_property ("elements", gh_list (e,SCM_UNDEFINED)); - velt_p->set_spot (THIS->here_input ()); - + velt_p->set_spot (i); - $$ = velt_p; + $$ = velt_p; } | MULTI_MEASURE_REST optional_notemode_duration { + Input i = THIS->pop_spot (); + Skip_req * sk = new Skip_req; sk->set_mus_property ("duration", $2); Span_req *sp1 = new Span_req; @@ -1714,19 +1713,20 @@ FIXME: location is one off, since ptich & duration don't contain origin refs. $$->set_mus_property ("elements", ms); } | STRING optional_notemode_duration { + Input i = THIS->pop_spot (); Lyric_req* lreq_p = new Lyric_req; lreq_p->set_mus_property ("text", $1); lreq_p->set_mus_property ("duration",$2); - lreq_p->set_spot (THIS->here_input ()); + lreq_p->set_spot (i); Simultaneous_music* velt_p = new Request_chord (SCM_EOL); velt_p->set_mus_property ("elements", gh_list (lreq_p->self_scm (), SCM_UNDEFINED)); - $$= velt_p; - } | chord { + Input i = THIS->pop_spot (); + if (!THIS->lexer_p_->chord_state_b ()) THIS->parser_error (_ ("Have to be in Chord mode for chords")); $$ = $1; diff --git a/po/de.po b/po/de.po index 39ee516b13..e40f655d1c 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: 2001-06-14 13:22+0200\n" +"POT-Creation-Date: 2001-09-09 17:30+0200\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -13,166 +13,181 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: ENCODING\n" -#: ly2dvi.py:105 +#: ly2dvi.py:106 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "Warnung: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 -#: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 +#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 +#: warn.cc:17 msgid "error: " msgstr "Fehler: " -#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 #, fuzzy msgid "Exiting ... " msgstr "Linie ... " -#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]" -#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Optionen:" -#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Melde Fehler an" -#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:321 +#: ly2dvi.py:322 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 #, fuzzy, c-format msgid "no such setting: %s" msgstr "Kein solches instrument: `%s'" -#: ly2dvi.py:349 main.cc:112 +#: ly2dvi.py:350 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" -#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "Diese Hilfe" -#: ly2dvi.py:351 main.cc:110 main.cc:115 +#: ly2dvi.py:352 main.cc:111 main.cc:116 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:351 +#: ly2dvi.py:352 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "Hänge DIR an den Suchpfad an" -#: ly2dvi.py:352 +#: ly2dvi.py:353 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:353 +#: ly2dvi.py:354 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:354 main.cc:113 +#: ly2dvi.py:355 main.cc:114 #, fuzzy msgid "produce MIDI output only" msgstr "Nur Midiausgabe" -#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 +#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "DATEI" -#: ly2dvi.py:355 +#: ly2dvi.py:356 #, fuzzy msgid "write ouput to FILE" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" #: ly2dvi.py:357 +msgid "find pfa fonts used in FILE" +msgstr "" + +#: ly2dvi.py:359 #, fuzzy msgid "generate PostScript output" msgstr "Degenerierte Zwangsbedingungen" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 #, fuzzy msgid "verbose" msgstr "Sei geschwätzig" -#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "Zeige die Versionsnummer" -#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" -#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 +#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 #, fuzzy, c-format msgid "Running %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:396 +#: ly2dvi.py:398 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:452 +#: ly2dvi.py:454 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:494 +#: ly2dvi.py:496 #, fuzzy, c-format msgid "invalid value: %s" msgstr "Ungültiger Buchstabe `%c'" -#: ly2dvi.py:781 scores.cc:44 +#: ly2dvi.py:639 +#, fuzzy, c-format +msgid "not a PostScript file: `%s'" +msgstr "Kann die Datei %s nicht öffnen" + +#: ly2dvi.py:657 +#, c-format +msgid "getopt says: `%s'" +msgstr "" + +#: ly2dvi.py:824 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "Ausgabe auf Papier auf %s..." -#: ly2dvi.py:791 +#: ly2dvi.py:835 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "MIDI-Ausgabe nach %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "Kann Datei `%s' nicht finden" -#: ly2dvi.py:804 +#: ly2dvi.py:848 msgid "no files specified on command line." msgstr "" @@ -198,7 +213,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:114 mup2ly.py:1118 +#: main.cc:115 mup2ly.py:1118 #, fuzzy msgid "write output to FILE" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" @@ -422,15 +437,6 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" -#: beam.cc:86 -#, fuzzy -msgid "beam has less than two stems" -msgstr "Balken mit weniger als zwei Hälsen" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "" - #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -459,6 +465,15 @@ msgstr "Notenhals passt nicht in den Balken" msgid "beam was started here" msgstr "Der Balken bagann hier" +#: beam.cc:86 +#, fuzzy +msgid "beam has less than two stems" +msgstr "Balken mit weniger als zwei Hälsen" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "" + #: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -483,16 +498,6 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord.cc:369 -#, c-format -msgid "invalid subtraction: not part of chord: %s" -msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" - -#: 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 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" @@ -503,6 +508,16 @@ msgstr "Unbeendeter Bindestrich" msgid "no one to print a tremolos" msgstr "Keiner darf eine Wiederholungsklammer drucken" +#: chord.cc:376 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" + +#: chord.cc:405 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" +msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" + #: collision.cc:127 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Zu viele aneinanderstoßende Notenspalten. Ich ignoriere sie." @@ -619,64 +634,65 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? +#: main.cc:105 msgid "EXPR" msgstr "" -#: main.cc:104 +#: main.cc:105 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:107 +#: main.cc:108 msgid "EXT" msgstr "EXT" -#: main.cc:107 +#: main.cc:108 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "Benutze das Ausgabeformat EXT" -#: main.cc:109 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "DATEI" -#: main.cc:109 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:110 +#: main.cc:111 msgid "add DIR to search path" msgstr "Hänge DIR an den Suchpfad an" -#: main.cc:111 +#: main.cc:112 msgid "use FILE as init file" msgstr "Verwende FILE als Initialisierungsdatei" -#: main.cc:115 +#: main.cc:116 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:116 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:136 +#: main.cc:137 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." -#: main.cc:138 +#: main.cc:139 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Setze Musik oder spiele MIDI von DATEI" -#: main.cc:142 +#: main.cc:143 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" @@ -686,11 +702,11 @@ msgstr "" "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n" "lilyPond ist Teil des GNU-Projekts\n" -#: main.cc:152 +#: main.cc:153 msgid "This binary was compiled with the following options:" msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:" -#: main.cc:56 main.cc:179 +#: main.cc:56 main.cc:180 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -703,17 +719,17 @@ msgstr "" "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n" "Sie mehr Informationen.\n" -#: main.cc:63 main.cc:186 main.cc:198 +#: main.cc:63 main.cc:187 main.cc:199 #, c-format msgid "Copyright (c) %s by" msgstr "Urheberrechte (Copyright) (c) %s bei" -#: main.cc:196 +#: main.cc:197 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts" -#: main.cc:72 main.cc:204 +#: main.cc:72 main.cc:205 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" @@ -756,10 +772,10 @@ msgstr "Unsinnige Dauer" msgid "silly pitch" msgstr "unsinnige Tonhöhe" -#: musical-request.cc:28 +#: 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" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -781,10 +797,10 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, 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" #: my-lily-lexer.cc:139 #, fuzzy, c-format @@ -929,11 +945,16 @@ msgstr "Zu viele kollidierende Pausen." msgid "too many notes for rest collision" msgstr "Zu viele Noten für kollidierende Pausen." -#: scm-option.cc:59 +#: scm-option.cc:63 #, fuzzy msgid "Scheme options:" msgstr "Optionen:" +#: score-engraver.cc:188 +#, fuzzy, c-format +msgid "unbound spanner `%s'" +msgstr "Unbeschränkter Abstand `%s'" + #: score.cc:78 msgid "Interpreting music..." msgstr "Interpretiere die Noten..." @@ -954,11 +975,6 @@ msgstr "Habe Fehler gefunden, /* die Partitur wird nicht verarbeitet */" msgid "elapsed time: %.2f seconds" msgstr "verstrichene Zeit %.2f Sekunden" -#: score-engraver.cc:188 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "Unbeschränkter Abstand `%s'" - #: scores.cc:106 #, fuzzy msgid "Score contains errors; will not process it" @@ -980,15 +996,6 @@ msgstr "Ich wei msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ich saufe zu viel" -#: slur.cc:48 -#, fuzzy -msgid "Putting slur over rest. Ignoring." -msgstr "Setze Bindebogen über Pause. Wird ignoriert" - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "Bindebogen übe den Rest?" - #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "Unbeendeter Bindebogen" @@ -1000,20 +1007,25 @@ msgstr "Unbeendeter Bindebogen" msgid "can't find start of slur" msgstr "Kann nicht beide Enden von %s finden" -#: stem.cc:116 +#: slur.cc:48 #, fuzzy -msgid "Weird stem size; check for narrow beams" -msgstr "" -"Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" +msgid "Putting slur over rest. Ignoring." +msgstr "Setze Bindebogen über Pause. Wird ignoriert" + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "Bindebogen übe den Rest?" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Setze Note auf unpassenden Hals (Typ = %d)" -#: text-spanner.cc:121 -msgid "Text_spanner too small" +#: 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" #: text-spanner-engraver.cc:94 #, fuzzy @@ -1030,10 +1042,9 @@ msgstr "Habe schon einen Balken" msgid "unterminated text spanner" msgstr "Unbeendete Linienfortführung" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "Kann ASCII-Zeichen `%d' nicht finden" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "" #: tfm-reader.cc:106 #, fuzzy, c-format @@ -1045,6 +1056,11 @@ msgstr "TFM header von `%s' hat nur %u Wort(e)" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM-Datei hat %u Parameter. Das ist mehr als die" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "Kann ASCII-Zeichen `%d' nicht finden" + #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1186,7 +1202,7 @@ msgstr "F msgid "Have to be in Chord mode for chords" msgstr "Für Akkorde muß ich im Akkord-(Chord)-Modus sein" -#: parser.yy:1910 +#: parser.yy:1911 msgid "need integer number arg" msgstr "" diff --git a/po/fr.po b/po/fr.po index 6cad31a3d9..feffb80143 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,169 +6,184 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2001-06-14 13:22+0200\n" +"POT-Creation-Date: 2001-09-09 17:30+0200\n" "PO-Revision-Date: 1999-12-28 00:32 +1\n" "Last-Translator: Laurent Martelli \n" "Language-Team: \n" "MIME-Version: 1.0\n" -#: ly2dvi.py:105 +#: ly2dvi.py:106 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "avertissement: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 -#: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 +#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 +#: warn.cc:17 msgid "error: " msgstr "erreur: " -#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 #, fuzzy msgid "Exiting ... " msgstr "Ligne ..." -#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Usage: %s [OPTION... [FICHIER]" -#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Options: " -#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Rapporter les bugs " -#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:321 +#: ly2dvi.py:322 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Cration des voix..." -#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 #, fuzzy, c-format msgid "no such setting: %s" msgstr "Pas d'instrument tel: `%s'" -#: ly2dvi.py:349 main.cc:112 +#: ly2dvi.py:350 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "" -#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "cette aide" -#: ly2dvi.py:351 main.cc:110 main.cc:115 +#: ly2dvi.py:352 main.cc:111 main.cc:116 msgid "DIR" msgstr "REP" -#: ly2dvi.py:351 +#: ly2dvi.py:352 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "ajoute REP au chemin de recherche" -#: ly2dvi.py:352 +#: ly2dvi.py:353 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:353 +#: ly2dvi.py:354 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:354 main.cc:113 +#: ly2dvi.py:355 main.cc:114 #, fuzzy msgid "produce MIDI output only" msgstr "produit seulement la sortie MIDI" -#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 +#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "FICHIER" -#: ly2dvi.py:355 +#: ly2dvi.py:356 msgid "write ouput to FILE" msgstr "" #: ly2dvi.py:357 +msgid "find pfa fonts used in FILE" +msgstr "" + +#: ly2dvi.py:359 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "" -#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "afficher le numro de version" -#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 +#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 #, fuzzy, c-format msgid "Running %s..." msgstr "Cration des voix..." -#: ly2dvi.py:396 +#: ly2dvi.py:398 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Cration des voix..." -#: ly2dvi.py:452 +#: ly2dvi.py:454 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:494 +#: ly2dvi.py:496 #, fuzzy, c-format msgid "invalid value: %s" msgstr "caractres illgal: `%c'" -#: ly2dvi.py:781 scores.cc:44 +#: ly2dvi.py:639 +#, fuzzy, c-format +msgid "not a PostScript file: `%s'" +msgstr "impossible d'ouvrir le fichier: `%s'" + +#: ly2dvi.py:657 +#, c-format +msgid "getopt says: `%s'" +msgstr "" + +#: ly2dvi.py:824 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "Sortie papier vers %s..." -#: ly2dvi.py:791 +#: ly2dvi.py:835 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "Sortie de Lily vers %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: ly2dvi.py:804 +#: ly2dvi.py:848 msgid "no files specified on command line." msgstr "" @@ -194,7 +209,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:114 mup2ly.py:1118 +#: main.cc:115 mup2ly.py:1118 msgid "write output to FILE" msgstr "" @@ -418,15 +433,6 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" -#: beam.cc:86 -#, fuzzy -msgid "beam has less than two stems" -msgstr "barre avec moins de deux tiges" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "" - #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -455,6 +461,15 @@ msgstr "la tige ne rentre pas dans la barre" msgid "beam was started here" msgstr "la barre a commenc ici" +#: beam.cc:86 +#, fuzzy +msgid "beam has less than two stems" +msgstr "barre avec moins de deux tiges" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "" + #: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -479,16 +494,6 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: 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: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 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "" @@ -497,6 +502,16 @@ msgstr "" msgid "no one to print a tremolos" msgstr "" +#: chord.cc:376 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "soustraction invalide: ne fait pas partie de l'accord: %s" + +#: chord.cc:405 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" +msgstr "renversement invalide: ne fait pas partie de l'accord: %s" + #: collision.cc:127 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." @@ -611,64 +626,65 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? +#: main.cc:105 msgid "EXPR" msgstr "" -#: main.cc:104 +#: main.cc:105 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:107 +#: main.cc:108 msgid "EXT" msgstr "" -#: main.cc:107 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:109 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "FICHIER" -#: main.cc:109 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:110 +#: main.cc:111 #, fuzzy msgid "add DIR to search path" msgstr "ajoute REP au chemin de recherche" -#: main.cc:111 +#: main.cc:112 #, fuzzy msgid "use FILE as init file" msgstr "utilise FICHIER comme fichier d'initialisation" -#: main.cc:115 +#: main.cc:116 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:116 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:136 +#: main.cc:137 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Usage: %s [OPTION]... [FICHIER]..." -#: main.cc:138 +#: main.cc:139 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:142 +#: main.cc:143 #, fuzzy msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" @@ -679,12 +695,12 @@ msgstr "" "paritions partir de description de gaut niveau en entre. Lilypond\n" "fait partie du projet GNU.\n" -#: main.cc:152 +#: main.cc:153 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "Cet excutable a t compil avec les options suivantes:" -#: main.cc:56 main.cc:179 +#: main.cc:56 main.cc:180 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -692,17 +708,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:63 main.cc:186 main.cc:198 +#: main.cc:63 main.cc:187 main.cc:199 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s par" -#: main.cc:196 +#: main.cc:197 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:72 main.cc:204 +#: main.cc:72 main.cc:205 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" @@ -732,10 +748,10 @@ msgstr "" msgid "silly pitch" msgstr "" -#: musical-request.cc:28 -#, 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'" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -757,10 +773,10 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: music-output-def.cc:115 -#, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "ne peut pas trouver `%s'" +#: musical-request.cc:28 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "" #: my-lily-lexer.cc:139 #, c-format @@ -901,11 +917,16 @@ msgstr "" msgid "too many notes for rest collision" msgstr "" -#: scm-option.cc:59 +#: scm-option.cc:63 #, fuzzy msgid "Scheme options:" msgstr "Options: " +#: score-engraver.cc:188 +#, fuzzy, c-format +msgid "unbound spanner `%s'" +msgstr "traducteur inconnu `%s'" + #: score.cc:78 msgid "Interpreting music..." msgstr "" @@ -924,11 +945,6 @@ msgstr "" msgid "elapsed time: %.2f seconds" msgstr "temps ecoul: %.2f secondes" -#: score-engraver.cc:188 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "traducteur inconnu `%s'" - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" @@ -948,14 +964,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "" - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "" - #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "" @@ -967,19 +975,23 @@ msgstr "" msgid "can't find start of slur" msgstr "impossible de trouver le caractres numro %d" -#: stem.cc:116 -#, fuzzy -msgid "Weird stem size; check for narrow beams" -msgstr "dcallage de barre bizarre, check your knees" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "" + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "" +#: stem.cc:116 +#, fuzzy +msgid "Weird stem size; check for narrow beams" +msgstr "dcallage de barre bizarre, check your knees" #: text-spanner-engraver.cc:94 #, fuzzy @@ -996,10 +1008,9 @@ msgstr "Il y a dj une barre" msgid "unterminated text spanner" msgstr "Barre non termine" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ne peut pas trouver le caractre ascii `%d'" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "" #: tfm-reader.cc:106 #, c-format @@ -1011,6 +1022,11 @@ 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 caractre ascii `%d'" + #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1151,7 +1167,7 @@ msgstr "il faut tre en mode Note pour les notes" msgid "Have to be in Chord mode for chords" msgstr "il faut tre en mode Accord pour les accords" -#: parser.yy:1910 +#: parser.yy:1911 msgid "need integer number arg" msgstr "" diff --git a/po/it.po b/po/it.po index 0aa67d4b4e..af424e7b1e 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2001-06-14 13:22+0200\n" +"POT-Creation-Date: 2001-09-09 17:30+0200\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -13,167 +13,182 @@ msgstr "" "out --add-comments --keyword=_ --keyword=_f\n" "Files: bow.cc int.cc\n" -#: ly2dvi.py:105 +#: ly2dvi.py:106 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "attenzione: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 -#: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 +#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 +#: warn.cc:17 msgid "error: " msgstr "errore: " -#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Uso: %s [OPZIONE... [FILE]" -#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Opzioni: " -#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" -#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:321 +#: ly2dvi.py:322 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Genero le voci..." -#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 #, fuzzy, c-format msgid "no such setting: %s" msgstr "% strumento:" -#: ly2dvi.py:349 main.cc:112 +#: ly2dvi.py:350 main.cc:113 #, fuzzy msgid "write Makefile dependencies for every input file" msgstr "" " -d, --dependencies scrive le dependenze del Makefile per ogni file di " "input\n" -#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "" -#: ly2dvi.py:351 main.cc:110 main.cc:115 +#: ly2dvi.py:352 main.cc:111 main.cc:116 msgid "DIR" msgstr "" -#: ly2dvi.py:351 +#: ly2dvi.py:352 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: ly2dvi.py:352 +#: ly2dvi.py:353 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:353 +#: ly2dvi.py:354 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:354 main.cc:113 +#: ly2dvi.py:355 main.cc:114 #, fuzzy msgid "produce MIDI output only" msgstr " -M, --no-paper produce solo output midi\n" -#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 +#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "" -#: ly2dvi.py:355 +#: ly2dvi.py:356 msgid "write ouput to FILE" msgstr "" #: ly2dvi.py:357 +msgid "find pfa fonts used in FILE" +msgstr "" + +#: ly2dvi.py:359 #, fuzzy msgid "generate PostScript output" msgstr "vincoli degenerati" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "" -#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "" -#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 #, fuzzy msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" -#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 +#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 #, fuzzy, c-format msgid "Running %s..." msgstr "Genero le voci..." -#: ly2dvi.py:396 +#: ly2dvi.py:398 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Genero le voci..." -#: ly2dvi.py:452 +#: ly2dvi.py:454 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:494 +#: ly2dvi.py:496 #, fuzzy, c-format msgid "invalid value: %s" msgstr "carattere illegale: `%c'" -#: ly2dvi.py:781 scores.cc:44 +#: ly2dvi.py:639 +#, fuzzy, c-format +msgid "not a PostScript file: `%s'" +msgstr "non posso aprire il file: `%s'" + +#: ly2dvi.py:657 +#, c-format +msgid "getopt says: `%s'" +msgstr "" + +#: ly2dvi.py:824 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "L'output stampato è inviato a %s..." -#: ly2dvi.py:791 +#: ly2dvi.py:835 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "L'output MIDI è inviato a %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" -#: ly2dvi.py:804 +#: ly2dvi.py:848 msgid "no files specified on command line." msgstr "" @@ -199,7 +214,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:114 mup2ly.py:1118 +#: main.cc:115 mup2ly.py:1118 msgid "write output to FILE" msgstr "" @@ -419,15 +434,6 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" -#: beam.cc:86 -#, fuzzy -msgid "beam has less than two stems" -msgstr "beam con meno di due gambi" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "" - #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -455,6 +461,15 @@ msgstr "il gambo non rientra nel beam" msgid "beam was started here" msgstr "" +#: beam.cc:86 +#, fuzzy +msgid "beam has less than two stems" +msgstr "beam con meno di due gambi" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "" + #: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -479,16 +494,6 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord.cc:369 -#, c-format -msgid "invalid subtraction: not part of chord: %s" -msgstr "" - -#: chord.cc:398 -#, c-format -msgid "invalid inversion pitch: not part of chord: %s" -msgstr "" - #: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" @@ -498,6 +503,16 @@ msgstr "beam non terminato" msgid "no one to print a tremolos" msgstr "" +#: chord.cc:376 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "" + +#: chord.cc:405 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" +msgstr "" + #: collision.cc:127 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." @@ -613,47 +628,48 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? +#: main.cc:105 msgid "EXPR" msgstr "" -#: main.cc:104 +#: main.cc:105 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:107 +#: main.cc:108 msgid "EXT" msgstr "" -#: main.cc:107 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:109 +#: main.cc:110 msgid "FIELD" msgstr "" -#: main.cc:109 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:110 +#: main.cc:111 #, fuzzy msgid "add DIR to search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: main.cc:111 +#: main.cc:112 #, fuzzy msgid "use FILE as init file" msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" -#: main.cc:115 +#: main.cc:116 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:116 +#: main.cc:117 #, fuzzy msgid "inhibit file output naming and exporting" msgstr "" @@ -663,29 +679,29 @@ msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:136 +#: main.cc:137 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:138 +#: main.cc:139 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:142 +#: main.cc:143 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:152 +#: main.cc:153 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:56 main.cc:179 +#: main.cc:56 main.cc:180 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -693,17 +709,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:63 main.cc:186 main.cc:198 +#: main.cc:63 main.cc:187 main.cc:199 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s di" -#: main.cc:196 +#: main.cc:197 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:72 main.cc:204 +#: main.cc:72 main.cc:205 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" @@ -748,10 +764,10 @@ msgstr "indicazione durata priva di senso" msgid "silly pitch" msgstr "indicazione altezza priva di senso" -#: musical-request.cc:28 +#: 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'" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -773,10 +789,10 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, 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" #: my-lily-lexer.cc:139 #, fuzzy, c-format @@ -920,11 +936,16 @@ msgstr "Troppi crescendi" msgid "too many notes for rest collision" msgstr "" -#: scm-option.cc:59 +#: scm-option.cc:63 #, fuzzy msgid "Scheme options:" msgstr "Opzioni: " +#: score-engraver.cc:188 +#, fuzzy, c-format +msgid "unbound spanner `%s'" +msgstr "Spanner non legato `%s'" + #: score.cc:78 msgid "Interpreting music..." msgstr "Interpretazione della musica..." @@ -945,11 +966,6 @@ msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/" msgid "elapsed time: %.2f seconds" msgstr "durata: %.2f secondi" -#: score-engraver.cc:188 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "Spanner non legato `%s'" - #: scores.cc:106 #, fuzzy msgid "Score contains errors; will not process it" @@ -970,16 +986,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: slur.cc:48 -#, fuzzy -msgid "Putting slur over rest. Ignoring." -msgstr "Metto uno slur sulla pausa." - -#: slur.cc:383 -#, fuzzy -msgid "Slur over rest?" -msgstr "Metto uno slur sulla pausa." - #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "slur non terminato" @@ -991,19 +997,25 @@ msgstr "slur non terminato" msgid "can't find start of slur" msgstr "non trovo le estremità di %s" -#: stem.cc:116 +#: slur.cc:48 #, fuzzy -msgid "Weird stem size; check for narrow beams" -msgstr "dimensione del gambo poco ortodossa; check for narrow beams" +msgid "Putting slur over rest. Ignoring." +msgstr "Metto uno slur sulla pausa." + +#: slur.cc:383 +#, fuzzy +msgid "Slur over rest?" +msgstr "Metto uno slur sulla pausa." #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "" +#: stem.cc:116 +#, fuzzy +msgid "Weird stem size; check for narrow beams" +msgstr "dimensione del gambo poco ortodossa; check for narrow beams" #: text-spanner-engraver.cc:94 #, fuzzy @@ -1020,10 +1032,9 @@ msgstr "crescendo non terminato" msgid "unterminated text spanner" msgstr "extender non terminato" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "non riesco a trovare il carattere `%s'" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "" #: tfm-reader.cc:106 #, c-format @@ -1035,6 +1046,11 @@ 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'" + #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1175,7 +1191,7 @@ msgstr "bisogna essere in Note mode per le note" msgid "Have to be in Chord mode for chords" msgstr "bisogna essere in Chord mode per gli accordi" -#: parser.yy:1910 +#: parser.yy:1911 msgid "need integer number arg" msgstr "" diff --git a/po/ja.po b/po/ja.po index f652910f64..c62e927173 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: 2001-06-14 13:22+0200\n" +"POT-Creation-Date: 2001-09-09 17:30+0200\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -13,165 +13,180 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: ly2dvi.py:105 +#: ly2dvi.py:106 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "·Ù¹ð: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 -#: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 +#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 +#: warn.cc:17 msgid "error: " msgstr "¥¨¥é¡¼: " -#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 #, fuzzy msgid "Exiting ... " msgstr "¹Ô ..." -#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" -#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "¥ª¥×¥·¥ç¥ó:" -#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" -#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:321 +#: ly2dvi.py:322 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 #, fuzzy, c-format msgid "no such setting: %s" msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:349 main.cc:112 +#: ly2dvi.py:350 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" -#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "¤³¤Î¥Ø¥ë¥×" -#: ly2dvi.py:351 main.cc:110 main.cc:115 +#: ly2dvi.py:352 main.cc:111 main.cc:116 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:351 +#: ly2dvi.py:352 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: ly2dvi.py:352 +#: ly2dvi.py:353 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:353 +#: ly2dvi.py:354 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:354 main.cc:113 +#: ly2dvi.py:355 main.cc:114 msgid "produce MIDI output only" msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß" -#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 +#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "FILE" -#: ly2dvi.py:355 +#: ly2dvi.py:356 #, fuzzy msgid "write ouput to FILE" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" #: ly2dvi.py:357 +msgid "find pfa fonts used in FILE" +msgstr "" + +#: ly2dvi.py:359 #, fuzzy msgid "generate PostScript output" msgstr "À©¸Â¤ò´ËÏÂ" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 #, fuzzy msgid "verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" -#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" -#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 +#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 #, fuzzy, c-format msgid "Running %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:396 +#: ly2dvi.py:398 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:452 +#: ly2dvi.py:454 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:494 +#: ly2dvi.py:496 #, fuzzy, c-format msgid "invalid value: %s" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: ly2dvi.py:781 scores.cc:44 +#: ly2dvi.py:639 +#, fuzzy, c-format +msgid "not a PostScript file: `%s'" +msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" + +#: ly2dvi.py:657 +#, c-format +msgid "getopt says: `%s'" +msgstr "" + +#: ly2dvi.py:824 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: ly2dvi.py:791 +#: ly2dvi.py:835 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, fuzzy, c-format msgid "can't find file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:804 +#: ly2dvi.py:848 msgid "no files specified on command line." msgstr "" @@ -197,7 +212,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:114 mup2ly.py:1118 +#: main.cc:115 mup2ly.py:1118 #, fuzzy msgid "write output to FILE" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" @@ -419,15 +434,6 @@ msgstr " msgid "Can't switch translators, I'm there already" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: beam.cc:86 -#, fuzzy -msgid "beam has less than two stems" -msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã" - #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -457,6 +463,15 @@ msgstr " msgid "beam was started here" msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿" +#: beam.cc:86 +#, fuzzy +msgid "beam has less than two stems" +msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã" + #: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -481,16 +496,6 @@ msgstr " msgid "none of these in my family" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: chord.cc:369 -#, c-format -msgid "invalid subtraction: not part of chord: %s" -msgstr "̵¸ú¤Ê°ú¤­»»: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" - -#: chord.cc:398 -#, c-format -msgid "invalid inversion pitch: not part of chord: %s" -msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" - #: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" @@ -501,6 +506,16 @@ msgstr " msgid "no one to print a tremolos" msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" +#: chord.cc:376 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "̵¸ú¤Ê°ú¤­»»: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" + +#: chord.cc:405 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" +msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" + #: collision.cc:127 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£" @@ -613,63 +628,64 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? +#: main.cc:105 msgid "EXPR" msgstr "" -#: main.cc:104 +#: main.cc:105 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:107 +#: main.cc:108 msgid "EXT" msgstr "EXT" -#: main.cc:107 +#: main.cc:108 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦" -#: main.cc:109 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "FILE" -#: main.cc:109 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:110 +#: main.cc:111 msgid "add DIR to search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: main.cc:111 +#: main.cc:112 msgid "use FILE as init file" msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: main.cc:115 +#: main.cc:116 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:116 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:136 +#: main.cc:137 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." -#: main.cc:138 +#: main.cc:139 msgid "Typeset music and or play MIDI from FILE" msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë" -#: main.cc:142 +#: main.cc:143 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" @@ -679,11 +695,11 @@ msgstr "" "Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU ¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç" "¤¹¡£\n" -#: main.cc:152 +#: main.cc:153 msgid "This binary was compiled with the following options:" msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿" -#: main.cc:56 main.cc:179 +#: main.cc:56 main.cc:180 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -699,17 +715,17 @@ msgstr "" "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n" "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n" -#: main.cc:63 main.cc:186 main.cc:198 +#: main.cc:63 main.cc:187 main.cc:199 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s by" -#: main.cc:196 +#: main.cc:197 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- The GNU Project music typesetter" -#: main.cc:72 main.cc:204 +#: main.cc:72 main.cc:205 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" @@ -769,10 +785,10 @@ msgstr " msgid "silly pitch" msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á" -#: musical-request.cc:28 -#, 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' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -794,10 +810,10 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: music-output-def.cc:115 -#, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" +#: musical-request.cc:28 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" #: my-lily-lexer.cc:139 #, c-format @@ -937,11 +953,16 @@ msgstr " msgid "too many notes for rest collision" msgstr "µÙÉä¤Î¾×ÆͤËÂФ·¤Æ²»É䤬¿¤¹¤®¤Þ¤¹" -#: scm-option.cc:59 +#: scm-option.cc:63 #, fuzzy msgid "Scheme options:" msgstr "¥ª¥×¥·¥ç¥ó:" +#: score-engraver.cc:188 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" + #: score.cc:78 msgid "Interpreting music..." msgstr "³Ú¶Ê¤Î²ò¼áÃæ..." @@ -960,11 +981,6 @@ msgstr " msgid "elapsed time: %.2f seconds" msgstr "·Ð²á»þ´Ö: %.2f ÉÃ" -#: score-engraver.cc:188 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- ½èÍý¤·¤Þ¤»¤ó" @@ -985,14 +1001,6 @@ msgstr " msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£" - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" - #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" @@ -1004,18 +1012,22 @@ msgstr " msgid "can't find start of slur" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: stem.cc:116 -msgid "Weird stem size; check for narrow beams" -msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£" + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "" +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" #: text-spanner-engraver.cc:94 #, fuzzy @@ -1032,10 +1044,9 @@ msgstr " msgid "unterminated text spanner" msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "" #: tfm-reader.cc:106 #, fuzzy, c-format @@ -1047,6 +1058,11 @@ msgstr "`%s' msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" + #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1184,7 +1200,7 @@ msgstr " msgid "Have to be in Chord mode for chords" msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1910 +#: parser.yy:1911 msgid "need integer number arg" msgstr "" diff --git a/po/lilypond.pot b/po/lilypond.pot index d85c3cfe60..6f6e3e2a1e 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-06-14 13:22+0200\n" +"POT-Creation-Date: 2001-09-09 17:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,160 +14,175 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ly2dvi.py:105 +#: ly2dvi.py:106 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "" -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 -#: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 +#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 +#: warn.cc:17 msgid "error: " msgstr "" -#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "" -#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "" -#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" -#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:321 +#: ly2dvi.py:322 #, c-format msgid "Cleaning %s..." msgstr "" -#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 #, c-format msgid "no such setting: %s" msgstr "" -#: ly2dvi.py:349 main.cc:112 +#: ly2dvi.py:350 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "" -#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "" -#: ly2dvi.py:351 main.cc:110 main.cc:115 +#: ly2dvi.py:352 main.cc:111 main.cc:116 msgid "DIR" msgstr "" -#: ly2dvi.py:351 +#: ly2dvi.py:352 msgid "add DIR to LilyPond's search path" msgstr "" -#: ly2dvi.py:352 +#: ly2dvi.py:353 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:353 +#: ly2dvi.py:354 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:354 main.cc:113 +#: ly2dvi.py:355 main.cc:114 msgid "produce MIDI output only" msgstr "" -#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 +#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "" -#: ly2dvi.py:355 +#: ly2dvi.py:356 msgid "write ouput to FILE" msgstr "" #: ly2dvi.py:357 +msgid "find pfa fonts used in FILE" +msgstr "" + +#: ly2dvi.py:359 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "" -#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "" -#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 +#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 #, c-format msgid "Running %s..." msgstr "" -#: ly2dvi.py:396 +#: ly2dvi.py:398 #, c-format msgid "Analyzing %s..." msgstr "" -#: ly2dvi.py:452 +#: ly2dvi.py:454 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:494 +#: ly2dvi.py:496 #, c-format msgid "invalid value: %s" msgstr "" -#: ly2dvi.py:781 scores.cc:44 +#: ly2dvi.py:639 +#, c-format +msgid "not a PostScript file: `%s'" +msgstr "" + +#: ly2dvi.py:657 +#, c-format +msgid "getopt says: `%s'" +msgstr "" + +#: ly2dvi.py:824 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "" -#: ly2dvi.py:791 +#: ly2dvi.py:835 #, c-format msgid "%s output to `%s'..." msgstr "" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "" -#: ly2dvi.py:804 +#: ly2dvi.py:848 msgid "no files specified on command line." msgstr "" @@ -193,7 +208,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:114 mup2ly.py:1118 +#: main.cc:115 mup2ly.py:1118 msgid "write output to FILE" msgstr "" @@ -411,14 +426,6 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" -#: beam.cc:86 -msgid "beam has less than two stems" -msgstr "" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "" - #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -443,6 +450,14 @@ msgstr "" msgid "beam was started here" msgstr "" +#: beam.cc:86 +msgid "beam has less than two stems" +msgstr "" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "" + #: break-align-item.cc:136 #, c-format msgid "unknown spacing pair `%s', `%s'" @@ -467,16 +482,6 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord.cc:369 -#, c-format -msgid "invalid subtraction: not part of chord: %s" -msgstr "" - -#: chord.cc:398 -#, c-format -msgid "invalid inversion pitch: not part of chord: %s" -msgstr "" - #: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "" @@ -485,6 +490,16 @@ msgstr "" msgid "no one to print a tremolos" msgstr "" +#: chord.cc:376 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "" + +#: chord.cc:405 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" +msgstr "" + #: collision.cc:127 msgid "Too many clashing notecolumns. Ignoring them." msgstr "" @@ -592,72 +607,73 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? +#: main.cc:105 msgid "EXPR" msgstr "" -#: main.cc:104 +#: main.cc:105 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:107 +#: main.cc:108 msgid "EXT" msgstr "" -#: main.cc:107 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:109 +#: main.cc:110 msgid "FIELD" msgstr "" -#: main.cc:109 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:110 +#: main.cc:111 msgid "add DIR to search path" msgstr "" -#: main.cc:111 +#: main.cc:112 msgid "use FILE as init file" msgstr "" -#: main.cc:115 +#: main.cc:116 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:116 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:136 +#: main.cc:137 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "" -#: main.cc:138 +#: main.cc:139 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:142 +#: main.cc:143 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:152 +#: main.cc:153 msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:56 main.cc:179 +#: main.cc:56 main.cc:180 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -665,16 +681,16 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:63 main.cc:186 main.cc:198 +#: main.cc:63 main.cc:187 main.cc:199 #, c-format msgid "Copyright (c) %s by" msgstr "" -#: main.cc:196 +#: main.cc:197 msgid "GNU LilyPond -- The music typesetter" msgstr "" -#: main.cc:72 main.cc:204 +#: main.cc:72 main.cc:205 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" @@ -704,9 +720,9 @@ msgstr "" msgid "silly pitch" msgstr "" -#: musical-request.cc:28 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" +msgid "can't find `%s' context" msgstr "" #: music.cc:232 @@ -729,9 +745,9 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, c-format -msgid "can't find `%s' context" +msgid "Transposition by %s makes accidental larger than two" msgstr "" #: my-lily-lexer.cc:139 @@ -868,10 +884,15 @@ msgstr "" msgid "too many notes for rest collision" msgstr "" -#: scm-option.cc:59 +#: scm-option.cc:63 msgid "Scheme options:" msgstr "" +#: score-engraver.cc:188 +#, c-format +msgid "unbound spanner `%s'" +msgstr "" + #: score.cc:78 msgid "Interpreting music..." msgstr "" @@ -890,11 +911,6 @@ msgstr "" msgid "elapsed time: %.2f seconds" msgstr "" -#: score-engraver.cc:188 -#, c-format -msgid "unbound spanner `%s'" -msgstr "" - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" @@ -914,14 +930,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "" - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "" - #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "" @@ -932,8 +940,12 @@ msgstr "" msgid "can't find start of slur" msgstr "" -#: stem.cc:116 -msgid "Weird stem size; check for narrow beams" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "" + +#: slur.cc:383 +msgid "Slur over rest?" msgstr "" #: stem-engraver.cc:115 @@ -941,8 +953,8 @@ msgstr "" msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: text-spanner.cc:121 -msgid "Text_spanner too small" +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" msgstr "" #: text-spanner-engraver.cc:94 @@ -957,9 +969,8 @@ msgstr "" msgid "unterminated text spanner" msgstr "" -#: tfm.cc:77 -#, c-format -msgid "can't find ascii character: %d" +#: text-spanner.cc:121 +msgid "Text_spanner too small" msgstr "" #: tfm-reader.cc:106 @@ -972,6 +983,11 @@ 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 "" + #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1108,7 +1124,7 @@ msgstr "" msgid "Have to be in Chord mode for chords" msgstr "" -#: parser.yy:1910 +#: parser.yy:1911 msgid "need integer number arg" msgstr "" diff --git a/po/nl.po b/po/nl.po index c8d1627e0c..06bb49fc6c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9,9 +9,9 @@ # msgid "" msgstr "" -"Project-Id-Version: lilypond 1.4.1\n" -"POT-Creation-Date: 2001-06-14 13:22+0200\n" -"PO-Revision-Date: 2001-05-09 23:29+0200\n" +"Project-Id-Version: lilypond 1.4.6\n" +"POT-Creation-Date: 2001-09-09 17:30+0200\n" +"PO-Revision-Date: 2001-09-09 17:34+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -19,166 +19,180 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Date: 2001-05-09 23:29+0200\n" "From: \n" -"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po " -"--add-comments --keyword=_\n" +"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po --add-comments --keyword=_\n" "Files: bow.cc int.cc\n" -#: ly2dvi.py:105 +#: ly2dvi.py:106 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "Genereer .dvi met LaTeX voor LilyPond" -#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "waarschuwing: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 -#: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 +#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 +#: warn.cc:17 msgid "error: " msgstr "fout: " -#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "Beëidigen ..." -#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Gebruik: %s [OPTIE]... BESTAND" -#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Opties:" -#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" "Meld luizen in het programma aan %s;\n" "meld onjuistheden in de vertaling aan of " -#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "Uitvoeren `%s'" -#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "opdracht eindigde met waarde %d" -#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "(genegeerd)" -#: ly2dvi.py:321 +#: ly2dvi.py:322 #, c-format msgid "Cleaning %s..." msgstr "Schoonmaken %s..." -#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 #, c-format msgid "no such setting: %s" msgstr "geen dergelijke instelling: %s" -#: ly2dvi.py:349 main.cc:112 +#: ly2dvi.py:350 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" -#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "deze hulp" -#: ly2dvi.py:351 main.cc:110 main.cc:115 +#: ly2dvi.py:352 main.cc:111 main.cc:116 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:351 +#: ly2dvi.py:352 msgid "add DIR to LilyPond's search path" msgstr "voeg DIR toe aan LilyPonds zoekpad" -#: ly2dvi.py:352 +#: ly2dvi.py:353 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "bewaar alle uitvoer, en noem de directory %s.dir" -#: ly2dvi.py:353 +#: ly2dvi.py:354 msgid "don't run LilyPond" msgstr "draai LilyPond niet" -#: ly2dvi.py:354 main.cc:113 +#: ly2dvi.py:355 main.cc:114 msgid "produce MIDI output only" msgstr "produceer alleen MIDI uitvoer" -#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 +#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "BESTAND" -#: ly2dvi.py:355 +#: ly2dvi.py:356 msgid "write ouput to FILE" msgstr "schrijf uitvoer naar BESTAND" #: ly2dvi.py:357 +msgid "find pfa fonts used in FILE" +msgstr "zoek pfa fonts gebruikt in BESTAND" + +#: ly2dvi.py:359 msgid "generate PostScript output" msgstr "genereer PostScipt uitvoer" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "KEY=VAL" msgstr "SEUTEL=WAARDE" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "change global setting KEY to VAL" msgstr "verander globale instelling SLEUTEL in WAARDE" -#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "breedsprakig" -#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "druk versienummer af" -#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "toon garantie en auteursrechten" -#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 +#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 #, c-format msgid "Running %s..." msgstr "Uitvoeren %s..." -#: ly2dvi.py:396 +#: ly2dvi.py:398 #, c-format msgid "Analyzing %s..." msgstr "Analyseer %s..." -#: ly2dvi.py:452 +#: ly2dvi.py:454 #, c-format msgid "no lilypond output found for %s" msgstr "geen lilypond uitvoer gevonden voor %s" -#: ly2dvi.py:494 +#: ly2dvi.py:496 #, c-format msgid "invalid value: %s" msgstr "ongeldige waarde: %s" -#: ly2dvi.py:781 scores.cc:44 +#: ly2dvi.py:639 +#, c-format +msgid "not a PostScript file: `%s'" +msgstr "geen PostScript bestand: `%s'" + +#: ly2dvi.py:657 +#, c-format +msgid "getopt says: `%s'" +msgstr "getopt zegt: `%s'" + +#: ly2dvi.py:824 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." -msgstr "afhankelijkheden uitvoer naar %s..." +msgstr "afhankelijkheden uitvoer naar `%s'..." -#: ly2dvi.py:791 +#: ly2dvi.py:835 #, c-format msgid "%s output to `%s'..." msgstr "%s uitvoer naar `%s'..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" -#: ly2dvi.py:804 +#: ly2dvi.py:848 msgid "no files specified on command line." msgstr "geen bestanden gespecificeerd op de commandoregel." @@ -204,7 +218,7 @@ msgstr "debug" msgid "define macro NAME [optional expansion EXP]" msgstr "definieer macro NAAM [optionele expansie EXP]" -#: main.cc:114 mup2ly.py:1118 +#: main.cc:115 mup2ly.py:1118 msgid "write output to FILE" msgstr "schrijf uitvoer naar BESTAND" @@ -376,12 +390,12 @@ msgstr "kan teken niet vinden genaamd: `%s'" #: afm.cc:124 #, c-format msgid "Error parsing AFM file: `%s'" -msgstr "Fout bij ontleden AFM bestand: `%s'" +msgstr "Fout bij ontleden AFM-bestand: `%s'" #: all-font-metrics.cc:95 #, c-format msgid "checksum mismatch for font file: `%s'" -msgstr "checksum fout voor font bestand: `%s'" +msgstr "checksum fout voor fontbestand: `%s'" #: all-font-metrics.cc:97 #, c-format @@ -424,14 +438,6 @@ msgstr "Geef op" msgid "Can't switch translators, I'm there already" msgstr "Kan niet wisselen van vertaler, ben al hier" -#: beam.cc:86 -msgid "beam has less than two stems" -msgstr "waardestreep heeft minder dan twee stokken" - -#: beam.cc:637 -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" @@ -456,6 +462,14 @@ msgstr "stok past niet in waardestreep" msgid "beam was started here" msgstr "waardestreep werd hier gestart" +#: beam.cc:86 +msgid "beam has less than two stems" +msgstr "waardestreep heeft minder dan twee stokken" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "rare verticale waardestreep verplaatsing" + #: break-align-item.cc:136 #, c-format msgid "unknown spacing pair `%s', `%s'" @@ -480,16 +494,6 @@ msgstr "Ben er zelf een" msgid "none of these in my family" msgstr "geen van deze in mijn gezin" -#: 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: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 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "onbeëindigd akkoordtremolo" @@ -498,6 +502,16 @@ msgstr "onbe msgid "no one to print a tremolos" msgstr "niemand om tremolos af te drukken" +#: chord.cc:376 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" + +#: chord.cc:405 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" +msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s" + #: collision.cc:127 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Te veel botsende nootkolommen. Negeer ze." @@ -607,61 +621,62 @@ 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:104 +#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? +#: main.cc:105 msgid "EXPR" msgstr "EXPR" -#: main.cc:104 +#: main.cc:105 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "evalueer EXPR als Scheme nadat .scm init is gelezen" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:107 +#: main.cc:108 msgid "EXT" msgstr "EXT" -#: main.cc:107 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)" -#: main.cc:109 +#: main.cc:110 msgid "FIELD" msgstr "VELD" -#: main.cc:109 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "schrijf kop veld naar BASISNAAM.VELD" -#: main.cc:110 +#: main.cc:111 msgid "add DIR to search path" msgstr "voeg DIR toe aan zoekpad" -#: main.cc:111 +#: main.cc:112 msgid "use FILE as init file" msgstr "gebruik BESTAND als initialisatiebestand" -#: main.cc:115 +#: main.cc:116 msgid "prepend DIR to dependencies" msgstr "voeg DIR voor aan afhankelijkheden" -#: main.cc:116 +#: main.cc:117 msgid "inhibit file output naming and exporting" -msgstr "verbied naamgeving van uitvoer bestand en exportering" +msgstr "verbied naamgeving van uitvoerbestand en exportering" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:136 +#: main.cc:137 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Gebruik: %s [OPTIE]... BESTAND..." -#: main.cc:138 +#: main.cc:139 msgid "Typeset music and or play MIDI from FILE" msgstr "Zet muziek en of speel MIDI van BESTAND" -#: main.cc:142 +#: main.cc:143 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" @@ -671,11 +686,11 @@ msgstr "" "uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" "maakt deel uit van het GNU Project.\n" -#: main.cc:152 +#: main.cc:153 msgid "This binary was compiled with the following options:" msgstr "Dit programma is gecompileerd met de volgende instellingen:" -#: main.cc:56 main.cc:179 +#: main.cc:56 main.cc:180 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -687,16 +702,16 @@ msgstr "" "onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n" "informatie.\n" -#: main.cc:63 main.cc:186 main.cc:198 +#: main.cc:63 main.cc:187 main.cc:199 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " -#: main.cc:196 +#: main.cc:197 msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- De Muziekzetter" -#: main.cc:72 main.cc:204 +#: main.cc:72 main.cc:205 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" @@ -739,10 +754,10 @@ msgstr "rare duur" msgid "silly pitch" msgstr "rare toonhoogte" -#: musical-request.cc:28 +#: 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" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -764,10 +779,10 @@ msgstr "ly_make_music (): Geen string" msgid "ly_music_name (): Not a music expression" msgstr "ly_make_music (): Geen muziek expressie" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, 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" #: my-lily-lexer.cc:139 #, c-format @@ -821,7 +836,7 @@ msgstr "kan directory niet scheppen: `%s'" #: paper-stream.cc:55 msgid "Error syncing file (disk full?)" -msgstr "Fout by synchroniseren van bestand (disk vol?)" +msgstr "Fout bij synchroniseren van bestand (schijf vol?)" #. #. We could change the current translator's id, but that would make @@ -905,10 +920,15 @@ msgstr "te veel botsende rusten" msgid "too many notes for rest collision" msgstr "te veel noten voor bosting met rusten" -#: scm-option.cc:59 +#: scm-option.cc:63 msgid "Scheme options:" msgstr "Scheme opties:" +#: score-engraver.cc:188 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ongebonden spanner `%s'" + #: score.cc:78 msgid "Interpreting music..." msgstr "Vertolken van muziek..." @@ -927,11 +947,6 @@ msgstr "Fouten gevonden, /*verwerk partituur niet */" msgid "elapsed time: %.2f seconds" msgstr "duur: %.2f seconden" -#: score-engraver.cc:188 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ongebonden spanner `%s'" - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "Partituur bevat fouten; zal hem niet verwerken" @@ -951,14 +966,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.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "Zet bindingsboog over rust. Negeer." - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "Boogje over rust?" - #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "onbeëindigde bindingsboog" @@ -969,18 +976,22 @@ msgstr "onbe 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" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "Zet bindingsboog over rust. Negeer." + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "Boogje over rust?" #: 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)" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "Text_spanner te klein" +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" #: text-spanner-engraver.cc:94 msgid "can't find start of text spanner" @@ -994,10 +1005,9 @@ msgstr "heb al een tekst spanner" msgid "unterminated text spanner" msgstr "onbeëindigde tekst spanner" -#: tfm.cc:77 -#, c-format -msgid "can't find ascii character: %d" -msgstr "kan ascii teken niet vinden: %d" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "Text_spanner te klein" #: tfm-reader.cc:106 #, c-format @@ -1010,6 +1020,11 @@ msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" "%s: TFM bestand heeft %u parameters, wat meer is dan de %u die ik aan kan" +#: tfm.cc:77 +#, c-format +msgid "can't find ascii character: %d" +msgstr "kan ascii teken niet vinden: %d" + #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1148,7 +1163,7 @@ msgstr "Moet in Note modus zijn voor noten" msgid "Have to be in Chord mode for chords" msgstr "Moet in Chord modus zijn voor accoorden" -#: parser.yy:1910 +#: parser.yy:1911 msgid "need integer number arg" msgstr "heb integer getal arg nogig" diff --git a/po/ru.po b/po/ru.po index 67c9d6b344..a1b406243f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-06-14 13:22+0200\n" +"POT-Creation-Date: 2001-09-09 17:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -14,163 +14,178 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: ENCODING\n" -#: ly2dvi.py:105 +#: ly2dvi.py:106 msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 -#: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 +#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 +#: warn.cc:17 msgid "error: " msgstr "ÏÛÉÂËÁ: " -#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]" -#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "ïÐÃÉÉ:" -#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" -#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:321 +#: ly2dvi.py:322 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 +#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 #, fuzzy, c-format msgid "no such setting: %s" msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" -#: ly2dvi.py:349 main.cc:112 +#: ly2dvi.py:350 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" -#: ly2dvi.py:351 main.cc:110 main.cc:115 +#: ly2dvi.py:352 main.cc:111 main.cc:116 msgid "DIR" msgstr "ëáô" -#: ly2dvi.py:351 +#: ly2dvi.py:352 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: ly2dvi.py:352 +#: ly2dvi.py:353 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:353 +#: ly2dvi.py:354 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:354 main.cc:113 +#: ly2dvi.py:355 main.cc:114 msgid "produce MIDI output only" msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI" -#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 +#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "æáêì" -#: ly2dvi.py:355 +#: ly2dvi.py:356 #, fuzzy msgid "write ouput to FILE" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" #: ly2dvi.py:357 +msgid "find pfa fonts used in FILE" +msgstr "" + +#: ly2dvi.py:359 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:358 +#: ly2dvi.py:360 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 #, fuzzy msgid "verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" -#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" -#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 +#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 #, fuzzy, c-format msgid "Running %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:396 +#: ly2dvi.py:398 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:452 +#: ly2dvi.py:454 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:494 +#: ly2dvi.py:496 #, fuzzy, c-format msgid "invalid value: %s" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: ly2dvi.py:781 scores.cc:44 +#: ly2dvi.py:639 +#, fuzzy, c-format +msgid "not a PostScript file: `%s'" +msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" + +#: ly2dvi.py:657 +#, c-format +msgid "getopt says: `%s'" +msgstr "" + +#: ly2dvi.py:824 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: ly2dvi.py:791 +#: ly2dvi.py:835 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "×Ù×ÏÄ MIDI × %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" -#: ly2dvi.py:804 +#: ly2dvi.py:848 msgid "no files specified on command line." msgstr "" @@ -196,7 +211,7 @@ msgstr "" msgid "define macro NAME [optional expansion EXP]" msgstr "" -#: main.cc:114 mup2ly.py:1118 +#: main.cc:115 mup2ly.py:1118 #, fuzzy msgid "write output to FILE" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" @@ -416,14 +431,6 @@ msgstr " msgid "Can't switch translators, I'm there already" msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ" -#: beam.cc:86 -msgid "beam has less than two stems" -msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" - #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" @@ -448,6 +455,14 @@ msgstr " msgid "beam was started here" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ" +#: beam.cc:86 +msgid "beam has less than two stems" +msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" + #: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -472,16 +487,6 @@ msgstr " msgid "none of these in my family" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" -#: chord.cc:369 -#, c-format -msgid "invalid subtraction: not part of chord: %s" -msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÞÉÔÁÎÉÅ: ÎÅ ÞÁÓÔØ ÁËËÏÒÄÁ: %s" - -#: chord.cc:398 -#, c-format -msgid "invalid inversion pitch: not part of chord: %s" -msgstr "" - #: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" @@ -491,6 +496,16 @@ msgstr " msgid "no one to print a tremolos" msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" +#: chord.cc:376 +#, c-format +msgid "invalid subtraction: not part of chord: %s" +msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÞÉÔÁÎÉÅ: ÎÅ ÞÁÓÔØ ÁËËÏÒÄÁ: %s" + +#: chord.cc:405 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" +msgstr "" + #: collision.cc:127 msgid "Too many clashing notecolumns. Ignoring them." msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ." @@ -599,63 +614,64 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? +#: main.cc:105 msgid "EXPR" msgstr "" -#: main.cc:104 +#: main.cc:105 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:107 +#: main.cc:108 msgid "EXT" msgstr "òáóû" -#: main.cc:107 +#: main.cc:108 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû" -#: main.cc:109 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "æáêì" -#: main.cc:109 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:110 +#: main.cc:111 msgid "add DIR to search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: main.cc:111 +#: main.cc:112 msgid "use FILE as init file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ" -#: main.cc:115 +#: main.cc:116 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:116 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:136 +#: main.cc:137 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." -#: main.cc:138 +#: main.cc:139 msgid "Typeset music and or play MIDI from FILE" msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ" -#: main.cc:142 +#: main.cc:143 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" @@ -665,11 +681,11 @@ msgstr "" "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n" "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n" -#: main.cc:152 +#: main.cc:153 msgid "This binary was compiled with the following options:" msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:" -#: main.cc:56 main.cc:179 +#: main.cc:56 main.cc:180 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -681,17 +697,17 @@ msgstr "" "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n" "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n" -#: main.cc:63 main.cc:186 main.cc:198 +#: main.cc:63 main.cc:187 main.cc:199 #, c-format msgid "Copyright (c) %s by" msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by" -#: main.cc:196 +#: main.cc:197 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU" -#: main.cc:72 main.cc:204 +#: main.cc:72 main.cc:205 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" @@ -721,10 +737,10 @@ msgstr " msgid "silly pitch" msgstr "ÇÌÕÐÙÊ ÔÏÎ" -#: musical-request.cc:28 +#: 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'" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -746,10 +762,10 @@ msgstr "" msgid "ly_music_name (): Not a music expression" msgstr "" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, c-format -msgid "can't find `%s' context" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'" +msgid "Transposition by %s makes accidental larger than two" +msgstr "" #: my-lily-lexer.cc:139 #, c-format @@ -889,11 +905,16 @@ msgstr " msgid "too many notes for rest collision" msgstr "" -#: scm-option.cc:59 +#: scm-option.cc:63 #, fuzzy msgid "Scheme options:" msgstr "ïÐÃÉÉ:" +#: score-engraver.cc:188 +#, c-format +msgid "unbound spanner `%s'" +msgstr "" + #: score.cc:78 msgid "Interpreting music..." msgstr "éÎÔÅÒÐÒÅÔÉÒÕÀ ÍÕÚÙËÕ..." @@ -912,11 +933,6 @@ msgstr " msgid "elapsed time: %.2f seconds" msgstr "ÚÁÔÒÁÞÅÎÎÏÅ ×ÒÅÍÑ: %.2f ÓÅËÕÎÄ" -#: score-engraver.cc:188 -#, c-format -msgid "unbound spanner `%s'" -msgstr "" - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" @@ -937,14 +953,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ñ ÌÉÛËÏÍ ÍÎÏÇÏ ×ÙÐÉÌ" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ." - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?" - #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" @@ -956,17 +964,21 @@ msgstr " msgid "can't find start of slur" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" -#: stem.cc:116 -msgid "Weird stem size; check for narrow beams" -msgstr "" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ." + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)" -#: text-spanner.cc:121 -msgid "Text_spanner too small" +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" msgstr "" #: text-spanner-engraver.cc:94 @@ -984,10 +996,9 @@ msgstr " msgid "unterminated text spanner" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "" #: tfm-reader.cc:106 #, c-format @@ -999,6 +1010,11 @@ 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'" + #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? #: tie-engraver.cc:220 tie-performer.cc:173 @@ -1136,7 +1152,7 @@ msgstr " msgid "Have to be in Chord mode for chords" msgstr "äÏÌÖÅÎ ÂÙÔØ × áËËÏÒÄÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÁËËÏÒÄÏ×" -#: parser.yy:1910 +#: parser.yy:1911 msgid "need integer number arg" msgstr ""