From 801403a95ad820339266d9c40263631c293bd79b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 15 Aug 1999 23:37:29 +0200 Subject: [PATCH] patch::: 1.2.0.jcn2 pl 0.jcn2 - po fixes --- NEWS | 3 + VERSION | 2 +- lily/parser.yy | 3 +- lily/transposed-music.cc | 2 +- midi2ly/main.cc | 6 +- po/it.po | 790 +++++++++++++++------------ po/lilypond.po | 691 +++++++++++++---------- po/nl.po | 705 ++++++++++++++---------- stepmake/NEWS | 3 + stepmake/VERSION | 2 +- stepmake/stepmake/podir-targets.make | 11 +- 11 files changed, 1280 insertions(+), 938 deletions(-) diff --git a/NEWS b/NEWS index aa8a93aea1..fe760ecb10 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +pl 0.jcn2 + - po fixes + pl 0.jcn1 - gcc-2.95 nitpicks - added pointers to mailing lists in toplevel docs diff --git a/VERSION b/VERSION index 181d5b07c3..11c9f17fee 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=2 PATCH_LEVEL=0 -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/parser.yy b/lily/parser.yy index 62bda87e06..9346b9c546 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -52,7 +52,8 @@ Mudela_version oldest_version ("1.1.52"); void print_mudela_versions (ostream &os) { - os << "Oldest supported input version: " << oldest_version.str () << endl; + os << _f ("Oldest supported input version: %s", oldest_version.str ()) + << endl; } // needed for bison.simple's malloc() and free() #include diff --git a/lily/transposed-music.cc b/lily/transposed-music.cc index 02fe088973..2d9c310bad 100644 --- a/lily/transposed-music.cc +++ b/lily/transposed-music.cc @@ -28,7 +28,7 @@ Musical_pitch Transposed_music::to_relative_octave (Musical_pitch p) { #if 0 // Mats? - warning (_("Will ignore \relative for transposed music")); + warning (_ ("Will ignore \\relative for transposed music")); #endif return p; } diff --git a/midi2ly/main.cc b/midi2ly/main.cc index 33a179b47a..1fc5c25f59 100644 --- a/midi2ly/main.cc +++ b/midi2ly/main.cc @@ -62,13 +62,13 @@ usage() " -k, --key=ACC[:MINOR] set key: ACC +sharps/-flats; :1 minor\n" ); cout << _ ( - " -n, --no-silly assume no plets or double dots, smallest is 32\n" + " -n, --no-silly assume no tuplets or double dots, smallest is 32\n" ); cout << _ ( " -o, --output=FILE set FILE as default output\n" ); cout << _ ( - " -p, --no-plets assume no plets\n" + " -p, --no-tuplets assume no tuplets\n" ); cout << _ ( " -q, --quiet be quiet\n" @@ -148,7 +148,7 @@ main (int argc_i, char* argv_sz_a[]) {1, "key", 'k'}, {0, "no-silly", 'n'}, {1, "output", 'o'}, - {0, "no-plets", 'p'}, + {0, "no-tuplets", 'p'}, {0, "quiet", 'q'}, {1, "smallest", 's'}, {0, "no-timestamps", 'T'}, diff --git a/po/it.po b/po/it.po index c5eafcad21..ad3a0346d4 100644 --- a/po/it.po +++ b/po/it.po @@ -1,26 +1,23 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. -# -#, fuzzy # it.po -- GNU LilyPond's italian language file -# Copyright (C) 1998 Free Software Foundation, Inc. # Tineke de Munnik , 1998. # Modified by Maurizio Umberto Puxeddu , Feb1999 # +#, fuzzy msgid "" msgstr "" +"POT-Creation-Date: 1999-08-15 23:58+0200\n" +"Content-Type: text/plain; charset=\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" -"Content-Type: text/plain; charset=\n" -"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po/out --add-comments --keyword=_ --keyword=_f\n" +"Xgettext-Options: --c++ --default-domain=lilypond --join " +"--output-dir=../po/out --add-comments --keyword=_ --keyword=_f\n" "Files: bow.cc int.cc\n" #: data-file.cc:52 msgid "EOF in a string" msgstr "EOF in una corda" -#: data-file.cc:121 input.cc:86 midi-parser.cc:100 warn.cc:21 +#: data-file.cc:116 input.cc:86 midi-parser.cc:100 warn.cc:21 msgid "warning: " msgstr "attenzione: " @@ -75,7 +72,7 @@ msgstr "errore: " msgid "Non fatal error: " msgstr "Errore non fatale: " -#: input.cc:105 source-file.cc:64 source-file.cc:157 +#: input.cc:105 source-file.cc:63 source-file.cc:156 msgid "position unknown" msgstr "posizione sconosciuta" @@ -96,20 +93,29 @@ msgstr "" msgid "Huh? got %d, expected %d characters" msgstr "Come? Ho trovato %d caratteri al posto di %d" -#: abbreviation-beam-engraver.cc:72 -msgid "unterminated beam" -msgstr "beam non terminato" +#: warn.cc:33 +msgid "Programming error: " +msgstr "" + +#: warn.cc:33 +msgid " (continuing; cross thumbs)" +msgstr "" -#: afm.cc:127 +#: afm.cc:129 #, c-format msgid "can't find character called `%s'" msgstr "non riesco a trovare il carattere `%s'" -#: afm.cc:151 +#: afm.cc:154 #, c-format msgid "can't find character number %d" msgstr "" +#: all-font-metrics.cc:69 +#, c-format +msgid "Can't find font `%s', loading default font." +msgstr "" + #: all-font-metrics.cc:74 #, c-format msgid "Can't find default font `%s', giving up." @@ -120,82 +126,73 @@ msgstr "" msgid "search path = %s" msgstr "" -#: beam-engraver.cc:37 +#: beam-engraver.cc:42 msgid "No Beam to end" msgstr "" -#: beam-engraver.cc:53 +#: beam-engraver.cc:58 msgid "No beam to end" msgstr "" -#: beam-engraver.cc:66 +#: beam-engraver.cc:87 msgid "Already have a Beam" msgstr "" -#: beam-engraver.cc:132 +#: beam-engraver.cc:149 msgid "Unfinished beam" msgstr "" -#: beam-engraver.cc:152 +#: beam-engraver.cc:174 msgid "Stem must have Rhythmic structure." msgstr "I gambi devono avere una struttura ritmica." -#: beam-engraver.cc:164 +#: beam-engraver.cc:185 msgid "stem doesn't fit in beam" msgstr "il gambo non rientra nel beam" -#: beam-engraver.cc:165 +#: beam-engraver.cc:186 msgid "beam was started here" msgstr "" -#: beam-engraver.cc:176 -msgid "please fix me" -msgstr "correggimi, per favore" - -#: beam-engraver.cc:177 -#, c-format -msgid "stem at %s doesn't fit in beam" -msgstr "il gambo a $s non rientra nel beam" - -#: beam.cc:117 +#: beam.cc:142 msgid "beam with less than two stems" msgstr "beam con meno di due gambi" -#: beam.cc:260 +#: beam.cc:307 msgid "weird beam shift, check your knees" msgstr "" -#: break.cc:25 +#: break-algorithm.cc:25 msgid "0 lines" msgstr "0 linee" -#: break.cc:27 +#: break-algorithm.cc:27 #, c-format msgid "1 line (of %.0f columns)" msgstr "1 linea (da %.0f colonne)" -#: break.cc:29 +#: break-algorithm.cc:29 #, c-format msgid "%d lines (with an average of %.1f columns)" msgstr "%d linee (con una media di %.f colonne)" -#: break.cc:148 +#: break-algorithm.cc:148 msgid "score does not have any columns" msgstr "lo spartito non contiene nessuna colonna" -#: break.cc:174 -#, c-format -msgid "approximated: %s" +#: break-algorithm.cc:165 +#, fuzzy, c-format +msgid "approximated %s" msgstr "approssimato: %s:" -#: break.cc:176 -#, c-format -msgid "calculated exactly: %s" +#: break-algorithm.cc:167 +#, fuzzy, c-format +msgid "calculated %s exactly" msgstr "calcolato esattamente: %s" -#: break.cc:177 score.cc:112 -#, c-format -msgid "time: %.2f seconds" +#: break-algorithm.cc:168 +#, fuzzy, c-format +msgid "elapsed time %.2f seconds" msgstr "durata: %.2f secondi" #: change-iterator.cc:22 @@ -203,41 +200,41 @@ msgstr "durata: %.2f secondi" msgid "can't change `%s' to `%s'" msgstr "non posso cambiare `%s' in `%s'" -#: chord.cc:185 +#: chord-tremolo-engraver.cc:41 chord-tremolo-engraver.cc:58 +msgid "No abbreviation beam to end" +msgstr "" + +#: chord-tremolo-engraver.cc:83 +msgid "Already have an abbreviation beam" +msgstr "" + +#: chord-tremolo-engraver.cc:124 +msgid "Unfinished abbreviation beam" +msgstr "" + +#: chord.cc:231 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:199 +#: chord.cc:245 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: clef-engraver.cc:175 +#: clef-engraver.cc:178 msgid "unknown clef type " msgstr "tipo di chiave sconosciuto" -#: collision.cc:63 -msgid "No stem direction set. Ignoring column in clash." -msgstr "Nessuna direzione del gambo è selezionata. Ignoro la colonna." - -#: collision.cc:76 +#: collision.cc:95 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Troppe collisioni tra colonne di note. Le ignoro." -#: command-request.cc:217 -msgid "don't know how handle empty keys" -msgstr "non so manipolare tasti vuoti" - -#: compressed-music-iterator.cc:25 -msgid "No one to print a tuplet start bracket" -msgstr "" - -#: crescendo.cc:47 +#: crescendo.cc:42 msgid "crescendo" msgstr "" -#: crescendo.cc:47 +#: crescendo.cc:42 msgid "too small" msgstr "troppo piccolo" @@ -253,197 +250,245 @@ msgstr "non posso settare mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:91 +#: dynamic-engraver.cc:109 msgid "Got a dynamic already. Continuing dazed and confused" msgstr "E' già presente una dinamica. Continuo, ma sono confusa" -#: dynamic-engraver.cc:125 +#: dynamic-engraver.cc:162 msgid "can't find (de)crescendo to end" msgstr "non trovo un (de)crescendo fino alla fine" -#: dynamic-engraver.cc:155 +#: dynamic-engraver.cc:216 msgid "Too many crescendi here" msgstr "Troppi crescendi" -#: dynamic-engraver.cc:196 +#: dynamic-engraver.cc:254 msgid "unended crescendo" msgstr "crescendo non terminato" -#: encompass-info.cc:79 stem-info.cc:123 -msgid "minVerticalAlign != maxVerticalAlign: interstaff slurs may be broken" +#: encompass-info.cc:32 +#, fuzzy +msgid "Slur over rest?" +msgstr "Metto uno slur sulla pausa." + +#: encompass-info.cc:67 stem-info.cc:140 +msgid "" +"minVerticalAlign != maxVerticalAlign: interstaff beams/slurs may be broken" msgstr "" -#: extender-engraver.cc:65 +#: extender-engraver.cc:62 msgid "unterminated extender" msgstr "extender non terminato" -#: identifier.cc:47 +#: folded-repeat-iterator.cc:64 +msgid "No one to print a repeat brace" +msgstr "" + +#: grace-iterator.cc:43 +msgid "No Grace context available!" +msgstr "" + +#: grace-position-engraver.cc:89 +msgid "Unattached grace notes. Attaching to last musical column." +msgstr "" + +#: hyphen-engraver.cc:60 +#, fuzzy +msgid "unterminated hyphen" +msgstr "beam non terminato" + +#: identifier.cc:46 msgid "Wrong identifier type: " msgstr "Tipo di identificatore sbagliato: " -#: identifier.cc:48 +#: identifier.cc:47 #, c-format msgid "%s expected" msgstr "aspettavo %s" -#: includable-lexer.cc:45 midi-score-parser.cc:24 scores.cc:111 scores.cc:117 +#: includable-lexer.cc:47 midi-score-parser.cc:24 scores.cc:108 scores.cc:114 #, c-format msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" +#: includable-lexer.cc:48 +#, fuzzy, c-format +msgid "" +"\n" +"Search path is `%s'\n" +msgstr "(Il path di caricamento è `%s'" + #: ineq-constrained-qp.cc:169 #, c-format msgid "Ineq_constrained_qp::solve (): Constraint off by %f" msgstr "" -#: ineq-constrained-qp.cc:224 +#: ineq-constrained-qp.cc:233 msgid "didn't converge!" msgstr "non converge!" -#: ineq-constrained-qp.cc:226 +#: ineq-constrained-qp.cc:235 msgid "Too much degeneracy. " msgstr "Troppa degenerazione. " -#: key-engraver.cc:133 +#: key-def.cc:31 msgid "No key name: assuming `C'" msgstr "Nessuna armatura di chiave: assumo Do'" -#: lily-guile.cc:69 +#: key-def.cc:92 +msgid "don't know how handle empty keys" +msgstr "non so manipolare tasti vuoti" + +#: lily-guile.cc:84 lily-guile.cc:107 #, c-format msgid "Can not find file `%s'" msgstr "Non trovo il file `%s'" -#: lily-guile.cc:71 +#: lily-guile.cc:86 lily-guile.cc:109 #, c-format msgid "(Load path is `%s'" msgstr "(Il path di caricamento è `%s'" -#: local-key-engraver.cc:39 +#: local-key-engraver.cc:42 msgid "out of tune" msgstr "stonato" -#: local-key-engraver.cc:39 time-signature-engraver.cc:28 +#: local-key-engraver.cc:42 time-signature-engraver.cc:28 msgid "can't find" msgstr "non trovo" -#: lookup.cc:102 +#: lookup.cc:103 #, c-format msgid "Can't open `%s'\n" msgstr "" -#: lookup.cc:103 +#: lookup.cc:104 #, c-format msgid "Search path %s\n" msgstr "" -#: lookup.cc:104 +#: lookup.cc:105 msgid "Aborting" msgstr "" -#: main.cc:84 +#: lookup.cc:434 +#, c-format +msgid "Non-matching braces in text `%s', adding braces." +msgstr "" + +#: main.cc:85 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:85 +#: main.cc:86 msgid "Typeset music and or play MIDI from FILE or " msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:48 main.cc:88 +#: main.cc:47 main.cc:89 msgid "Options:" msgstr "Opzioni: " -#: main.cc:91 +#: main.cc:92 msgid " -a, --about about LilyPond\n" msgstr " -a, --about cos'è LilyPond\n" -#: main.cc:54 main.cc:94 -msgid " -D, --debug enable debugging output\n" +#: main.cc:95 +#, fuzzy +msgid " -d, --debug enable debugging output\n" msgstr " -D, --debug abilita l'output di debugging\n" -#: main.cc:97 +#: main.cc:98 +#, fuzzy msgid "" -" -d, --dependencies write Makefile dependencies for every input file\n" +" -M, --dependencies write Makefile dependencies for every input file\n" msgstr "" -" -d, --dependencies scrive le dependenze del Makefile per ogni file di input\n" +" -d, --dependencies scrive le dependenze del Makefile per ogni file di " +"input\n" -#: main.cc:57 main.cc:100 +#: main.cc:56 main.cc:101 msgid " -h, --help this help\n" msgstr " -h, --help questo help\n" -#: main.cc:103 +#: main.cc:104 msgid " -f, --output-format=X use output format X\n" msgstr " -f, --output-format=X usa il formato dell'ouput X\n" -#: main.cc:60 main.cc:106 +#: main.cc:59 main.cc:107 msgid " -I, --include=DIR add DIR to search path\n" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: main.cc:109 +#: main.cc:110 msgid " -i, --init=FILE use FILE as init file\n" msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" -#: main.cc:112 -msgid " -M, --no-paper produce midi output only\n" +#: main.cc:113 +#, fuzzy +msgid " -m, --no-paper produce midi output only\n" msgstr " -M, --no-paper produce solo output midi\n" -#: main.cc:115 +#: main.cc:116 msgid " -o, --output=FILE set FILE as default output base\n" -msgstr " -o, --output=FILE indica FILE come base di default per l'output\n" +msgstr "" +" -o, --output=FILE indica FILE come base di default per l'output\n" -#: main.cc:118 +#: main.cc:119 msgid " -Q, --find-old-relative show all changes in relative syntax\n" -msgstr " -Q, --find-old-relative mostra tutti i cambiamenti nella sintassi relativa\n" +msgstr "" +" -Q, --find-old-relative mostra tutti i cambiamenti nella sintassi " +"relativa\n" -#: main.cc:121 +#: main.cc:122 msgid "" " -s, --safe inhibit file output naming and exporting TeX " "macros\n" msgstr "" -" -s, --safe inibisce la rinomina dei file di output e l'esportazione di macro di TeX\n" +" -s, --safe inibisce la rinomina dei file di output e " +"l'esportazione di macro di TeX\n" -#: main.cc:123 +#: main.cc:124 msgid " -t, --test switch on experimental features\n" msgstr " -t, --test usa le caratteristiche sperimentali\n" -#: main.cc:78 main.cc:126 +#: main.cc:77 main.cc:127 msgid " -T, --no-timestamps don't timestamp the output\n" -msgstr " -T, --no-timestamps non inserisce marcatori temporali nell'output\n" +msgstr "" +" -T, --no-timestamps non inserisce marcatori temporali nell'output\n" -#: main.cc:129 +#: main.cc:130 msgid " -V, --ignore-version ignore mudela version\n" msgstr " -V, --ignore-version ignora la versione di mudela\n" -#: main.cc:87 main.cc:132 +#: main.cc:86 main.cc:133 msgid " -w, --warranty show warranty and copyright\n" msgstr " -w, --warranty mostra la garanzia e il copyright\n" -#: main.cc:135 +#: main.cc:136 msgid "GNU LilyPond was compiled with the following settings:" msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:163 +#: main.cc:166 msgid "GNU LilyPond is Free software, see --warranty" msgstr "GNU LilyPond è Free software, vedi --warranty" -#: main.cc:107 main.cc:166 main.cc:179 +#: main.cc:106 main.cc:169 main.cc:182 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s di" -#: main.cc:109 main.cc:168 main.cc:181 +#: main.cc:108 main.cc:171 main.cc:184 msgid "Han-Wen Nienhuys " msgstr "" -#: main.cc:110 main.cc:169 main.cc:182 +#: main.cc:109 main.cc:172 main.cc:185 msgid "Jan Nieuwenhuizen " msgstr "" -#: main.cc:177 +#: main.cc:180 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:113 main.cc:185 +#: main.cc:112 main.cc:188 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" @@ -460,28 +505,36 @@ msgid "" "USA.\n" msgstr "" " Questo programma è free software; puoi ridistribuirlo e/o\n" -"modificarlo sotto le condizioni della GNU General Public License, versione 2,\n" +"modificarlo sotto le condizioni della GNU General Public License, versione " +"2,\n" "come pubblicata dalla Free Software Foundation.\n" " Questo programma è distribuito nella speranza che possa essere utile,\n" "ma SENZA ALCUNA GARANZIA; è privo anche di garanzia implicita di\n" -"COMMERCIABILITA' o della POSSIBILITA' D'USO A SCOPI PARTICOLARI. Si veda la GNU\n" +"COMMERCIABILITA' o della POSSIBILITA' D'USO A SCOPI PARTICOLARI. Si veda la " +"GNU\n" "General Public License per ulteriori dettagli.\n" "\n" " Con questo programma dovresti aver ricevuto una copia della\n" -"GNU General Public License (ci riferiamo al file COPYING); se ciò non è" -"avvenuto, scrivi a: Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02136\n" -"USA.\n" +"GNU General Public License (ci riferiamo al file COPYING); se ciò non " +"èavvenuto, scrivi a: Free Software Foundation, Inc., 675 Mass Ave, " +"Cambridge, MA 02136\n" +"USA.\n" + +#: midi-item.cc:303 +#, fuzzy, c-format +msgid "No such instrument: `%s'" +msgstr "% strumento:" -#: midi-item.cc:364 +#: midi-item.cc:357 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "armatura non convenzionale: %d bemolli e %d diesis" -#: midi-item.cc:411 +#: midi-item.cc:402 msgid "silly duration" msgstr "indicazione durata priva di senso" -#: midi-item.cc:424 +#: midi-item.cc:415 msgid "silly pitch" msgstr "indicazione altezza priva di senso" @@ -489,92 +542,112 @@ msgstr "indicazione altezza priva di senso" msgid "error syncing file (disk full?)" msgstr "errore nel sincronizzare il file (disco pieno?)" -#: music-list.cc:92 -msgid "\\relative mode changed here, old value: " -msgstr "\\il modo relativo è cambiato in questo punto, valore vecchio: " +#: music-output-def.cc:56 +msgid "Interpretation context with empty type" +msgstr "" -#: music-output-def.cc:79 +#: music-output-def.cc:83 msgid "Can't find Score context" msgstr "Non trovo il contesto dello Score" -#: musical-request.cc:97 +#: musical-request.cc:42 #, c-format msgid "transposition by %s makes accidental larger than two" msgstr "la trasposizine di %s rende le alterazioni più che doppie" -#: my-lily-lexer.cc:130 +#: my-lily-lexer.cc:137 #, c-format msgid "redeclaration of `\\%s'" msgstr "doppia dichiarazione di `\\%s'" -#: my-lily-lexer.cc:136 +#: my-lily-lexer.cc:143 #, c-format msgid "Identifier name is a keyword (`%s')" msgstr "Il nome dell'identificatore è una parola chiave (`%s')" -#: my-lily-lexer.cc:164 +#: my-lily-lexer.cc:172 #, c-format msgid "error at EOF: %s" msgstr "errore alla fine del file: %s" -#: my-lily-parser.cc:58 +#: my-lily-parser.cc:60 msgid "Parsing..." msgstr "Analisi..." -#: my-lily-parser.cc:67 +#: my-lily-parser.cc:69 msgid "braces don't match" msgstr "le bretelle no si accoppiano" -#: p-score.cc:116 -msgid "Can't solve this casting problem exactly; revert to Word_wrap" -msgstr "Non posso risolvere esattamente questo problema di conversione; ritorno al Word_wrap" - -#: p-score.cc:196 -msgid "Preprocessing elements..." -msgstr "Pre-elaborazione..." - -#: p-score.cc:200 -msgid "Calculating column positions..." -msgstr "Calcolo delle posizioni della colonne..." - -#: paper-def.cc:73 +#: paper-def.cc:95 #, c-format msgid "unknown paper variable: `%s'" msgstr "variabile paper sconosciuta: `%s'" -#: paper-def.cc:77 +#: paper-def.cc:99 msgid "not a real variable" msgstr "non è una vera variabile" #. for now; breaks -fscm output -#: paper-def.cc:240 +#: paper-def.cc:251 msgid "outputting Score, defined at: " msgstr "emetto lo Score, definito a: " -#: paper-def.cc:275 +#: paper-def.cc:280 #, c-format msgid "Paper output to %s..." msgstr "L'output stampato è inviato a %s..." -#: mudela-stream.cc:85 paper-outputter.cc:74 performance.cc:70 +#: mudela-stream.cc:85 paper-outputter.cc:76 performance.cc:97 msgid ", at " msgstr ", a " +#: paper-outputter.cc:130 +#, c-format +msgid "Improbable offset for object type `%s'" +msgstr "" + +#: paper-score.cc:131 +msgid "Can't solve this casting problem exactly; revert to Word_wrap" +msgstr "" +"Non posso risolvere esattamente questo problema di conversione; ritorno al " +"Word_wrap" + +#: paper-score.cc:156 +msgid "Preprocessing elements..." +msgstr "Pre-elaborazione..." + +#: paper-score.cc:160 +msgid "Calculating column positions..." +msgstr "Calcolo delle posizioni della colonne..." + +#: paper-score.cc:179 +msgid " elements. " +msgstr "" + +#: paper-score.cc:182 +msgid "Line ... " +msgstr "" + +#: performance.cc:50 +#, fuzzy +msgid "Track ... " +msgstr "traccia " + #. perhaps multiple text events? -#: performance.cc:55 +#: performance.cc:77 msgid "Creator: " msgstr "Autore: " -#: performance.cc:65 +#: performance.cc:92 msgid "Automatically generated" msgstr "Generato automaticamente" -#: performance.cc:78 +#: performance.cc:106 #, c-format msgid "from musical definition: %s" msgstr "della definizione musicale: %s" -#: performance.cc:143 +#: performance.cc:174 #, c-format msgid "MIDI output to %s..." msgstr "L'output MIDI è inviato a %s..." @@ -583,47 +656,52 @@ msgstr "L'output MIDI msgid "degenerate constraints" msgstr "vincoli degenerati" -#: repeated-music-iterator.cc:50 -msgid "No one to print a volta bracket" -msgstr "" - -#: request-iterator.cc:72 +#: request-chord-iterator.cc:73 #, c-format msgid "junking request: `%s'" msgstr "" -#: request-iterator.cc:75 +#: request-chord-iterator.cc:76 #, c-format msgid "Huh? Not a Request: `%s'" msgstr "Cosa? Non è una richiesta: `%s'" -#: score-column.cc:55 -#, c-format -msgid "ignoring zero duration added to column at %s" -msgstr "ingnoro le durate nulle aggiunte alla colonna a %s" +#: rest-collision.cc:64 +#, fuzzy +msgid "Too many colliding rests." +msgstr "Troppi crescendi" -#: score-engraver.cc:143 +#: rest-collision.cc:68 +msgid "Too many notes for rest collision." +msgstr "" + +#: score-engraver.cc:149 #, c-format msgid "Unbound spanner `%s'" msgstr "Spanner non legato `%s'" -#: score.cc:57 +#: score.cc:56 msgid "no toplevel translator" msgstr "non c'è un traduttore di livello massimo" -#: score.cc:60 +#: score.cc:59 msgid "Interpreting music..." msgstr "Interpretazione della musica..." -#: score.cc:71 +#: score.cc:70 msgid "need music in a score" msgstr "ho bisogno di musica nello spartito" #. should we? hampers debugging. -#: score.cc:107 +#: score.cc:83 msgid "errors found, /*not processing score*/" msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/" +#: score.cc:88 +#, c-format +msgid "time: %.2f seconds" +msgstr "durata: %.2f secondi" + #: scores.cc:35 #, c-format msgid "writing dependency file: `%s'..." @@ -633,77 +711,72 @@ msgstr "scrivo il file delle dipendenze: `%s'..." msgid "score contains errors; will not process it" msgstr "lo spartito contiene errori; non lo elaborerò" -#: scores.cc:112 +#: scores.cc:109 #, c-format msgid "Search path: %s" msgstr "" -#: script.cc:61 -msgid "script needs stem direction" -msgstr "lo script ha bisogno di una direzione per il gambo" +#: script-engraver.cc:49 +#, c-format +msgid "don't know how to interpret articulation `%s'\n" +msgstr "" #. this shouldn't happen, but let's continue anyway. -#: single-malt-grouping-item.cc:40 -msgid "Single_malt_grouping_item: I've been drinking too much (fixme)" +#: single-malt-grouping-item.cc:42 +msgid "Single_malt_grouping_item: I've been drinking too much" msgstr "" -#: slur-engraver.cc:49 +#: slur-engraver.cc:64 msgid "unterminated slur" msgstr "slur non terminato" -#: slur-engraver.cc:65 +#: slur-engraver.cc:80 #, c-format msgid "can't find both ends of %s" msgstr "non trovo le estremità di %s" -#: slur-engraver.cc:65 +#: slur-engraver.cc:80 msgid "slur" msgstr "" -#: slur.cc:41 -msgid "Putting slur over rest." +#: slur.cc:39 +#, fuzzy +msgid "Putting slur over rest. Ignoring" msgstr "Metto uno slur sulla pausa." -#: spanner.cc:44 +#: spacing-spanner.cc:215 +#, c-format +msgid "can't find a ruling note at %s" +msgstr "non risco a trovare una ruling note a %s" + +#: spacing-spanner.cc:221 +#, c-format +msgid "no minimum in measure at %s" +msgstr "non c'è minimo nella misura a %s" + +#: spanner.cc:39 msgid "left spanpoint is right spanpoint\n" msgstr "" -#: spanner.cc:105 +#: spanner.cc:109 #, c-format msgid "Spanner `%s' with equal left and right spanpoints" -msgstr "I punti di span sinistro e destro dello spanner `%s' coincidono" +msgstr "I punti di span sinistro e destro dello spanner `%s' coincidono" -#: spring-spacer.cc:85 -#, c-format -msgid "unconnected column: %d" -msgstr "colonna sconnessa: %d" - -#: spring-spacer.cc:189 +#: spring-spacer.cc:134 msgid "I'm too fat; call Oprah" msgstr "Son troppo grassa; chiama Oprah" -#: spring-spacer.cc:350 +#: spring-spacer.cc:295 msgid "solution doesn't satisfy constraints" msgstr "la soluzione non soddisfa i vincoli" -#: spring-spacer.cc:639 +#: stem-engraver.cc:80 #, c-format -msgid "can't find a ruling note at %s" -msgstr "non risco a trovare una ruling note a %s" - -#: spring-spacer.cc:645 -#, c-format -msgid "no minimum in measure at %s" -msgstr "non c'è minimo nella misura a %s" - -#: staff-side.cc:61 -msgid "" -"Staff_side::get_position_f(): somebody forgot to set my direction, returning " -"-20" -msgstr "taff_side::get_position_f(): qualcuno ha dimenticato di impostare la" -"mia direzione, quindi restituisco -20" +msgid "Adding note head to incompatible stem (type = %d)" +msgstr "" -#: stem.cc:111 +#: stem.cc:106 msgid "weird stem size; check for narrow beams" msgstr "dimensione del gambo poco ortodossa; check for narrow beams" @@ -722,7 +795,11 @@ msgstr "" msgid "can't find ascii character `%d'" msgstr "" -#: tie.cc:50 +#: tie-engraver.cc:155 tie-performer.cc:106 +msgid "No ties were created!" +msgstr "" + +#: tie.cc:55 msgid "lonely tie" msgstr "" @@ -738,19 +815,23 @@ msgstr "la misura parziale deve essere non-negativa" msgid "partial measure too large" msgstr "misura parziale troppo grande" +#: time-scaled-music-iterator.cc:25 +msgid "No one to print a tuplet start bracket" +msgstr "" + #: time-signature-engraver.cc:28 msgid "lost in time" msgstr "mi sono persa nel tempo" -#: timing-translator.cc:31 +#: timing-translator.cc:26 msgid "conflicting timing request" msgstr "richieste di timing in conflitto" -#: timing-translator.cc:67 +#: timing-translator.cc:62 msgid "time signature change not allowed here" msgstr "un cambio di tempo non è ammesso in questo punto" -#: timing-translator.cc:90 +#: timing-translator.cc:83 #, c-format msgid "barcheck failed by: %s" msgstr "controllo del battute fallito: %s" @@ -760,131 +841,140 @@ msgstr "controllo del battute fallito: %s" msgid "unknown translator `%s'" msgstr "traduttore sconosciuto `%s'" -#: translator-group.cc:187 +#: translator-group.cc:82 translator-group.cc:97 +#, c-format +msgid "Already contains a `%s'" +msgstr "" + +#: translator-group.cc:207 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "non trovo e non posso creare '%s' chiamato '%s'" -#: translator-group.cc:314 +#: translator-group.cc:341 #, c-format msgid "can't find or create `%s'" msgstr "non trovo e non posso creare `%s'" -#: translator-group.cc:409 +#: translator-group.cc:437 translator-group.cc:446 #, c-format msgid "can't find `%s'" msgstr "non trovo `%s'" -#: transposed-music.cc:33 -msgid "Will ignore \relative for transposed music" -msgstr "Ignorerò \relative per la musica trasposta " +#: transposed-music.cc:31 +msgid "Will ignore \\relative for transposed music" +msgstr "Ignorerò \\relative per la musica trasposta " + +#: unfolded-repeat-iterator.cc:145 +msgid "No one to print a volta bracket" +msgstr "" -#: word-wrap.cc:71 +#: word-wrap.cc:75 msgid "ugh, this measure is too long" msgstr "ops, questa misura è troppo lunga" -#: word-wrap.cc:72 +#: word-wrap.cc:76 #, c-format msgid "breakpoint: %d" msgstr "" -#: word-wrap.cc:73 +#: word-wrap.cc:77 msgid "generating stupido solution" msgstr "" -#: word-wrap.cc:91 +#: word-wrap.cc:95 msgid "I don't fit; put me on Montignac" msgstr "Non ci sto; mettimi su Montignac" -#: parser.yy:329 parser.yy:332 +#: parser.yy:55 #, c-format -msgid "incorrect mudela version: %s (%s, %s)" -msgstr "versione di mudela errata: %s (%s, %s)" +msgid "Oldest supported input version: %s" +msgstr "" -#: parser.yy:460 +#: parser.yy:313 +msgid "Cannot evaluate Scheme in safe mode" +msgstr "" + +#: parser.yy:433 parser.yy:441 parser.yy:465 msgid "Need a translator group for a context" msgstr "Ho bisogno di un gruppo di traduzione per un contesto" -#: parser.yy:478 +#: parser.yy:459 msgid "Wrong type for property value" msgstr "Tipo sbagliato per il valore di una proprietà" -#: parser.yy:529 +#: parser.yy:515 msgid "More than one music block" msgstr "Più di un blocco di musica" -#: parser.yy:1122 parser.yy:1396 -msgid "have to be in Lyric mode for lyrics" -msgstr "bisogna essere in Lyric mode per i testi" - -#: parser.yy:1344 parser.yy:1364 +#: parser.yy:946 parser.yy:1360 parser.yy:1380 #, c-format msgid "not a duration: %d" msgstr "non è una durata: %d" -#: parser.yy:1366 +#: parser.yy:948 parser.yy:1382 msgid "can't abbreviate" msgstr "non posso abbreviare" -#: parser.yy:1376 +#: parser.yy:1211 parser.yy:1219 parser.yy:1444 +msgid "have to be in Lyric mode for lyrics" +msgstr "bisogna essere in Lyric mode per i testi" + +#: parser.yy:1391 msgid "have to be in Note mode for notes" msgstr "bisogna essere in Note mode per le note" -#: parser.yy:1402 +#: parser.yy:1403 +#, fuzzy +msgid "can't abbreviate tuplet" +msgstr "non posso abbreviare" + +#: parser.yy:1450 msgid "have to be in Chord mode for chords" msgstr "bisogna essere in Chord mode per gli accordi" -#: parser.yy:1407 -msgid "have to be in Note mode for @chords" -msgstr "bisogna essere in Note mode per i @chords" - -#: lexer.ll:131 +#: lexer.ll:155 msgid "EOF found inside a comment" msgstr "ho trovato un EOF in un commento" -#: lexer.ll:175 +#: lexer.ll:199 #, c-format msgid "undefined identifier: `%s'" msgstr "indentificatore non definito: `%s'" #. backup rule -#: lexer.ll:180 +#: lexer.ll:204 msgid "missing end quote" msgstr "apice finale mancante" #. backup rule -#: lexer.ll:203 lexer.ll:207 +#: lexer.ll:227 lexer.ll:231 msgid "white expected" msgstr "aspettavo uno spazio bianco" -#: lexer.ll:365 -#, c-format -msgid "illegal character: `%c'" +#: lexer.ll:401 +#, fuzzy, c-format +msgid "invalid character: `%c'" msgstr "carattere illegale: `%c'" -#: lexer.ll:421 +#: lexer.ll:457 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "stringa di escape sconosciuta: `\\%s'" +#: lexer.ll:543 +#, c-format +msgid "incorrect mudela version: %s (%s, %s)" +msgstr "versione di mudela errata: %s (%s, %s)" + #: out/BLURB.hh:2 msgid "" -"LilyPond is the GNU Project music typesetter. This program can print\n" -"beautiful sheet music from a music definition file. It can also play\n" -"mechanical performances to a MIDI file. Features include multiple\n" -"staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,\n" -"beams, slurs, triplets, named chords, transposing, formatting scores, \n" -"part extraction. It includes a nice font of musical symbols.\n" +"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" +"\n" +"\n" msgstr "" -"LilyPond è il programma di notazione musicale del progetto\n" -"GNU. Questo programma può generare delle ottime partiture musicali\n" -"a partire da un file contenente la descrizione della musica. Può\n" -"anche generare esecuzioni meccaniche della partitura in formato\n" -"MIDI. Le caratteristiche del programma includono un versatile\n" -"linguaggio di descrizione musicale, pentagrammi multipli, segni di\n" -"divisione, chiavi, tasti, parole, cadenze, legature, acciaccature,\n" -"terzine, segni di formattazione ed estrazione automatica delle parti. Nella\n" -"distribuzione è compreso anche un font di simboli musicali.\n" #: out/COPERTINA.hh:2 msgid "" @@ -911,57 +1001,68 @@ msgid "" "individuele partijen. Een fraaie set muziektekens is inbegrepen.\n" msgstr "" -#: main.cc:43 +#: main.cc:42 #, c-format msgid "Usage: %s [OPTION]... [FILE]" msgstr "Uso: %s [OPZIONE... [FILE]" -#: main.cc:45 +#: main.cc:44 msgid "Translate midi-file to mudela" msgstr "Traduce un file midi in mudela" -#: main.cc:51 +#: main.cc:50 msgid " -b, --no-quantify write exact durations, e.g.: a4*385/384\n" msgstr " -b, --no-quantify scrive durate esatte, p.es.: a4*385/384\n" -#: main.cc:63 +#: main.cc:53 +msgid " -D, --debug enable debugging output\n" +msgstr " -D, --debug abilita l'output di debugging\n" + +#: main.cc:62 msgid " -k, --key=ACC[:MINOR] set key: ACC +sharps/-flats; :1 minor\n" -msgstr " -k, --key=ACC[:MINOR] imposta l'armatura: ACC +diesis/-bemolli; :1 minore\n" +msgstr "" +" -k, --key=ACC[:MINOR] imposta l'armatura: ACC +diesis/-bemolli; :1 minore\n" -#: main.cc:66 +#: main.cc:65 +#, fuzzy msgid "" -" -n, --no-silly assume no plets or double dots, smallest is 32\n" +" -n, --no-silly assume no tuplets or double dots, smallest is 32\n" msgstr "" -" -n, --no-silly assume che non ci siano gruppetti o doppi punti, la figura più piccola è 32\n" +" -n, --no-silly assume che non ci siano gruppetti o doppi punti, la " +"figura più piccola è 32\n" -#: main.cc:69 +#: main.cc:68 msgid " -o, --output=FILE set FILE as default output\n" msgstr " -o, --output=FILE set FILE come output di default\n" -#: main.cc:72 -msgid " -p, --no-plets assume no plets\n" +#: main.cc:71 +#, fuzzy +msgid " -p, --no-tuplets assume no tuplets\n" msgstr " -p, --no-plets assume che non ci siano gruppetti\n" -#: main.cc:75 +#: main.cc:74 msgid " -q, --quiet be quiet\n" msgstr " -q, --quiet sii silenzioso\n" -#: main.cc:81 +#: main.cc:80 msgid "" " -s, --smallest=N assume no shorter (reciprocal) durations than N\n" msgstr "" -" -s, --smallest=N assume che non ci siano durate (reciproche) inferiori a N\n" +" -s, --smallest=N assume che non ci siano durate (reciproche) " +"inferiori a N\n" -#: main.cc:84 +#: main.cc:83 msgid " -v, --verbose be verbose\n" msgstr " -v, --verbose sii loquace\n" -#: main.cc:90 +#: main.cc:89 msgid " -x, --no-double-dots assume no double dotted notes\n" -msgstr " -x, --no-double-dots assume che non ci siano note con doppio punto\n" +msgstr "" +" -x, --no-double-dots assume che non ci siano note con doppio punto\n" -#: main.cc:105 -msgid "Mi2mu, translate midi to mudela" +#: main.cc:104 +#, fuzzy +msgid "Midi2ly, translate midi to mudela" msgstr "Mi2mu, tradice midi in mudela" #: midi-parser.cc:64 @@ -997,77 +1098,75 @@ msgstr "tempo non metrico" msgid "Parsing...\n" msgstr "Interpreto...\n" -#: midi-track-parser.cc:70 +#: midi-track-parser.cc:68 #, c-format msgid "junking note-end event: channel = %d, pitch = %d" msgstr "" -#: midi-track-parser.cc:125 +#: midi-track-parser.cc:124 msgid "invalid running status" msgstr "stato di eseguzione non valido" -#: midi-track-parser.cc:326 +#: midi-track-parser.cc:328 msgid "unimplemented MIDI meta-event" msgstr "meta-evento MIDI non implementato" -#: midi-track-parser.cc:331 +#: midi-track-parser.cc:333 msgid "invalid MIDI event" msgstr "evento MIDI non valido" -#: midi-track-parser.cc:346 +#: midi-track-parser.cc:348 msgid "MIDI track expected" msgstr "mi spettavo una traccia MIDI" -#: midi-track-parser.cc:351 +#: midi-track-parser.cc:353 msgid "invalid track length" msgstr "lunghezza della traccia non valida" -#: mudela-item.cc:139 +#: mudela-item.cc:160 #, c-format msgid "#32 in quarter: %d" msgstr "#32 in un quarto: %d" -#: mudela-score.cc:117 +#: mudela-score.cc:108 #, c-format msgid "Lily output to %s..." msgstr "Output di Lily in %s..." -#: mudela-score.cc:127 mudela-score.cc:191 +#: mudela-score.cc:119 mudela-score.cc:168 msgid "track " msgstr "traccia " -#: mudela-score.cc:176 +#: mudela-score.cc:155 msgid "Processing..." msgstr "Elaboro..." -#: mudela-score.cc:187 +#: mudela-score.cc:164 msgid "Creating voices..." msgstr "Genero le voci..." -#: mudela-score.cc:200 +#: mudela-score.cc:177 msgid "NOT Filtering tempo..." msgstr "NON filtro il tempo..." -#: mudela-score.cc:209 +#: mudela-score.cc:186 msgid "NOT Quantifying columns..." msgstr "NON quantifico le colonne..." -#: mudela-score.cc:213 +#: mudela-score.cc:190 msgid "Quantifying columns..." msgstr "Quantifico le colonne..." -#. LOGOUT(NORMAL_ver) << '\n' << "NOT Settling columns..." << endl; -#. return; -#: mudela-score.cc:248 +#: mudela-score.cc:223 msgid "Settling columns..." msgstr "Sistemo le colonne..." -#: mudela-staff.cc:107 +#: mudela-staff.cc:111 #, c-format msgid "% midi copyright:" msgstr "" -#: mudela-staff.cc:108 +#: mudela-staff.cc:112 #, c-format msgid "% instrument:" msgstr "% strumento:" @@ -1093,43 +1192,52 @@ msgstr "% dal file di input: " #: version.cc:11 msgid "of" msgstr "di" -# msgid "invalid inversion pitch (not part of chord)" -# msgstr "altezza dell'inversione errata (non fa parte di un accordo)" -# -# msgid "" -# "Text_item::get_position_f(): somebody forgot to set my vertical direction, " -# "returning -20" -# msgstr "" -# "Text_item::get_position_f(): qualcuno ha dimenticato di impostare la mia" -# "direzione verticale, quindi restituisco -20" -# -# msgid "unterminated plet" -# msgstr "gruppetto non terminato" -# -# msgid "guessing dimensions for font style: `%s'" -# msgstr "indovino le dimensioni per il font style: `%s'" -# -# msgid "No beam to stop" -# msgstr "Nessun beam da terminare" -# -# msgid "left spanpoint is right spanpoint" -# msgstr "i punti di span sinistro e destro coincidono" -# -# msgid "Symtable `%s': unknown symbol: `%s'" -# msgstr "Symtable `%s': simbolo sconosciuto: `%s'" -# -# msgid "bracket" -# msgstr "parentsei" -# -# msgid "ridiculous dimension: %s, %s" -# msgstr "dimensione ridicola: %s, %s" -# -# msgid "Can't find a note head at the right to attach Tie" -# msgstr "Non trovo una testa di nota sulla destra per attaccare il Tie" -# -# msgid "never heard of dynamic scale `\\%s', assuming %s" -# msgstr "la scala dinamica `\\%s' l'ho mai sentita, assumo la %s" -# -# msgid "Symtable `%s' unknown" -# msgstr "La symtable `%s' è sconosciuta" -# + +#~ msgid "please fix me" +#~ msgstr "correggimi, per favore" + +#~ msgid "stem at %s doesn't fit in beam" +#~ msgstr "il gambo a $s non rientra nel beam" + +#~ msgid "No stem direction set. Ignoring column in clash." +#~ msgstr "Nessuna direzione del gambo è selezionata. Ignoro la colonna." + +#~ msgid "\\relative mode changed here, old value: " +#~ msgstr "\\il modo relativo è cambiato in questo punto, valore vecchio: " + +#~ msgid "ignoring zero duration added to column at %s" +#~ msgstr "ingnoro le durate nulle aggiunte alla colonna a %s" + +#~ msgid "script needs stem direction" +#~ msgstr "lo script ha bisogno di una direzione per il gambo" + +#~ msgid "unconnected column: %d" +#~ msgstr "colonna sconnessa: %d" + +#~ msgid "" +#~ "Staff_side::get_position_f(): somebody forgot to set my direction, returning " +#~ "-20" +#~ msgstr "" +#~ "taff_side::get_position_f(): qualcuno ha dimenticato di impostare lamia " +#~ "direzione, quindi restituisco -20" + +#~ msgid "have to be in Note mode for @chords" +#~ msgstr "bisogna essere in Note mode per i @chords" + +#~ msgid "" +#~ "LilyPond is the GNU Project music typesetter. This program can print\n" +#~ "beautiful sheet music from a music definition file. It can also play\n" +#~ "mechanical performances to a MIDI file. Features include multiple\n" +#~ "staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,\n" +#~ "beams, slurs, triplets, named chords, transposing, formatting scores, \n" +#~ "part extraction. It includes a nice font of musical symbols.\n" +#~ msgstr "" +#~ "LilyPond è il programma di notazione musicale del progetto\n" +#~ "GNU. Questo programma può generare delle ottime partiture musicali\n" +#~ "a partire da un file contenente la descrizione della musica. Può\n" +#~ "anche generare esecuzioni meccaniche della partitura in formato\n" +#~ "MIDI. Le caratteristiche del programma includono un versatile\n" +#~ "linguaggio di descrizione musicale, pentagrammi multipli, segni di\n" +#~ "divisione, chiavi, tasti, parole, cadenze, legature, acciaccature,\n" +#~ "terzine, segni di formattazione ed estrazione automatica delle parti. Nella\n" +#~ "distribuzione è compreso anche un font di simboli musicali.\n" diff --git a/po/lilypond.po b/po/lilypond.po index ed22766440..23a27594e6 100644 --- a/po/lilypond.po +++ b/po/lilypond.po @@ -1,12 +1,12 @@ -# lilypond.po -- GNU LilyPond's po source -# Copyright (C) 1998 Free Software Foundation, Inc. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1998-12-20 21:28+0100\n" +"POT-Creation-Date: 1999-08-15 23:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,11 +18,11 @@ msgstr "" msgid "EOF in a string" msgstr "" -#: data-file.cc:121 input.cc:86 midi-parser.cc:100 warn.cc:21 +#: data-file.cc:116 input.cc:86 midi-parser.cc:100 warn.cc:21 msgid "warning: " msgstr "" -#: dstream.cc:159 +#: dstream.cc:158 msgid "Not enough fields in Dstream init." msgstr "" @@ -59,9 +59,8 @@ msgstr "" msgid "" msgstr "" -#: lookup.cc:374 mapped-file-storage.cc:87 midi-stream.cc:77 -#: mudela-stream.cc:103 paper-stream.cc:25 parser.yy:1561 scores.cc:37 -#: simple-file-storage.cc:44 text-stream.cc:21 +#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:103 +#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:21 #, c-format msgid "can't open file: `%s'" msgstr "" @@ -74,7 +73,7 @@ msgstr "" msgid "Non fatal error: " msgstr "" -#: input.cc:105 source-file.cc:62 source-file.cc:155 +#: input.cc:105 source-file.cc:63 source-file.cc:156 msgid "position unknown" msgstr "" @@ -95,112 +94,148 @@ msgstr "" msgid "Huh? got %d, expected %d characters" msgstr "" -#: abbreviation-beam-engraver.cc:72 beam-engraver.cc:86 -msgid "unterminated beam" +#: warn.cc:33 +msgid "Programming error: " msgstr "" -#: afm.cc:114 +#: warn.cc:33 +msgid " (continuing; cross thumbs)" +msgstr "" + +#: afm.cc:129 #, c-format msgid "can't find character called `%s'" msgstr "" -#: atom.cc:30 +#: afm.cc:154 #, c-format -msgid "ridiculous dimension: %s, %s" +msgid "can't find character number %d" msgstr "" -#: beam-engraver.cc:102 cbeam-engraver.cc:122 -msgid "Stem must have Rhythmic structure." +#: all-font-metrics.cc:69 +#, c-format +msgid "Can't find font `%s', loading default font." msgstr "" -#: beam-engraver.cc:109 cbeam-engraver.cc:134 -msgid "stem doesn't fit in beam" +#: all-font-metrics.cc:74 +#, c-format +msgid "Can't find default font `%s', giving up." msgstr "" -#: beam-engraver.cc:120 cbeam-engraver.cc:145 -msgid "please fix me" +#: all-font-metrics.cc:75 +#, c-format +msgid "search path = %s" msgstr "" -#: beam-engraver.cc:121 cbeam-engraver.cc:146 -#, c-format -msgid "stem at %s doesn't fit in beam" +#: beam-engraver.cc:42 +msgid "No Beam to end" +msgstr "" + +#: beam-engraver.cc:58 +msgid "No beam to end" +msgstr "" + +#: beam-engraver.cc:87 +msgid "Already have a Beam" +msgstr "" + +#: beam-engraver.cc:149 +msgid "Unfinished beam" +msgstr "" + +#: beam-engraver.cc:174 +msgid "Stem must have Rhythmic structure." +msgstr "" + +#: beam-engraver.cc:185 +msgid "stem doesn't fit in beam" +msgstr "" + +#: beam-engraver.cc:186 +msgid "beam was started here" msgstr "" -#: beam.cc:117 +#: beam.cc:142 msgid "beam with less than two stems" msgstr "" -#: beam.cc:563 +#: beam.cc:307 msgid "weird beam shift, check your knees" msgstr "" -#: break.cc:25 +#: break-algorithm.cc:25 msgid "0 lines" msgstr "" -#: break.cc:27 +#: break-algorithm.cc:27 #, c-format msgid "1 line (of %.0f columns)" msgstr "" -#: break.cc:29 +#: break-algorithm.cc:29 #, c-format msgid "%d lines (with an average of %.1f columns)" msgstr "" -#: break.cc:159 +#: break-algorithm.cc:148 msgid "score does not have any columns" msgstr "" -#: break.cc:183 +#: break-algorithm.cc:165 #, c-format -msgid "approximated: %s" +msgid "approximated %s" msgstr "" -#: break.cc:185 +#: break-algorithm.cc:167 #, c-format -msgid "calculated exactly: %s" +msgid "calculated %s exactly" msgstr "" -#: break.cc:186 score.cc:112 +#: break-algorithm.cc:168 #, c-format -msgid "time: %.2f seconds" -msgstr "" - -#: cbeam-engraver.cc:45 -msgid "No beam to stop" +msgid "elapsed time %.2f seconds" msgstr "" -#: change-iterator.cc:21 +#: change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "" -#: clef-engraver.cc:124 -msgid "unknown clef type " +#: chord-tremolo-engraver.cc:41 chord-tremolo-engraver.cc:58 +msgid "No abbreviation beam to end" msgstr "" -#: collision.cc:63 -msgid "No stem direction set. Ignoring column in clash." +#: chord-tremolo-engraver.cc:83 +msgid "Already have an abbreviation beam" msgstr "" -#: collision.cc:76 -msgid "Too many clashing notecolumns. Ignoring them." +#: chord-tremolo-engraver.cc:124 +msgid "Unfinished abbreviation beam" msgstr "" -#: command-request.cc:220 -msgid "don't know how handle empty keys" +#: chord.cc:231 +#, c-format +msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: compressed-music-iterator.cc:25 -msgid "No one to print a tuplet start bracket" +#: chord.cc:245 +#, c-format +msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: crescendo.cc:47 +#: clef-engraver.cc:178 +msgid "unknown clef type " +msgstr "" + +#: collision.cc:95 +msgid "Too many clashing notecolumns. Ignoring them." +msgstr "" + +#: crescendo.cc:42 msgid "crescendo" msgstr "" -#: crescendo.cc:47 lookup.cc:501 +#: crescendo.cc:42 msgid "too small" msgstr "" @@ -216,186 +251,232 @@ msgstr "" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:60 +#: dynamic-engraver.cc:109 msgid "Got a dynamic already. Continuing dazed and confused" msgstr "" -#: dynamic-engraver.cc:82 +#: dynamic-engraver.cc:162 msgid "can't find (de)crescendo to end" msgstr "" -#: dynamic-engraver.cc:106 +#: dynamic-engraver.cc:216 msgid "Too many crescendi here" msgstr "" -#: dynamic-engraver.cc:165 +#: dynamic-engraver.cc:254 msgid "unended crescendo" msgstr "" -#: extender-engraver.cc:65 +#: encompass-info.cc:32 +msgid "Slur over rest?" +msgstr "" + +#: encompass-info.cc:67 stem-info.cc:140 +msgid "" +"minVerticalAlign != maxVerticalAlign: interstaff beams/slurs may be broken" +msgstr "" + +#: extender-engraver.cc:62 msgid "unterminated extender" msgstr "" -#: identifier.cc:48 +#: folded-repeat-iterator.cc:64 +msgid "No one to print a repeat brace" +msgstr "" + +#: grace-iterator.cc:43 +msgid "No Grace context available!" +msgstr "" + +#: grace-position-engraver.cc:89 +msgid "Unattached grace notes. Attaching to last musical column." +msgstr "" + +#: hyphen-engraver.cc:60 +msgid "unterminated hyphen" +msgstr "" + +#: identifier.cc:46 msgid "Wrong identifier type: " msgstr "" -#: identifier.cc:49 +#: identifier.cc:47 #, c-format msgid "%s expected" msgstr "" -#: includable-lexer.cc:45 midi-score-parser.cc:24 scores.cc:110 scores.cc:115 +#: includable-lexer.cc:47 midi-score-parser.cc:24 scores.cc:108 scores.cc:114 #, c-format msgid "can't find file: `%s'" msgstr "" -#: ineq-constrained-qp.cc:167 +#: includable-lexer.cc:48 +#, c-format +msgid "" +"\n" +"Search path is `%s'\n" +msgstr "" + +#: ineq-constrained-qp.cc:169 #, c-format msgid "Ineq_constrained_qp::solve (): Constraint off by %f" msgstr "" -#: ineq-constrained-qp.cc:222 +#: ineq-constrained-qp.cc:233 msgid "didn't converge!" msgstr "" -#: ineq-constrained-qp.cc:224 +#: ineq-constrained-qp.cc:235 msgid "Too much degeneracy. " msgstr "" -#: key-engraver.cc:133 +#: key-def.cc:31 msgid "No key name: assuming `C'" msgstr "" -#: lily-guile.cc:63 +#: key-def.cc:92 +msgid "don't know how handle empty keys" +msgstr "" + +#: lily-guile.cc:84 lily-guile.cc:107 #, c-format msgid "Can not find file `%s'" msgstr "" -#: lily-guile.cc:65 +#: lily-guile.cc:86 lily-guile.cc:109 #, c-format msgid "(Load path is `%s'" msgstr "" -#: local-key-engraver.cc:39 +#: local-key-engraver.cc:42 msgid "out of tune" msgstr "" -#: local-key-engraver.cc:39 time-signature-engraver.cc:28 +#: local-key-engraver.cc:42 time-signature-engraver.cc:28 msgid "can't find" msgstr "" -#: lookup.cc:375 +#: lookup.cc:103 #, c-format -msgid "guessing dimensions for font style: `%s'" +msgid "Can't open `%s'\n" msgstr "" -#: lookup.cc:500 -msgid "bracket" +#: lookup.cc:104 +#, c-format +msgid "Search path %s\n" +msgstr "" + +#: lookup.cc:105 +msgid "Aborting" msgstr "" -#: main.cc:81 +#: lookup.cc:434 +#, c-format +msgid "Non-matching braces in text `%s', adding braces." +msgstr "" + +#: main.cc:85 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "" -#: main.cc:82 +#: main.cc:86 msgid "Typeset music and or play MIDI from FILE or " msgstr "" -#: main.cc:48 main.cc:85 +#: main.cc:47 main.cc:89 msgid "Options:" msgstr "" -#: main.cc:88 +#: main.cc:92 msgid " -a, --about about LilyPond\n" msgstr "" -#: main.cc:54 main.cc:91 -msgid " -D, --debug enable debugging output\n" +#: main.cc:95 +msgid " -d, --debug enable debugging output\n" msgstr "" -#: main.cc:94 +#: main.cc:98 msgid "" -" -d, --dependencies write Makefile dependencies for every input file\n" +" -M, --dependencies write Makefile dependencies for every input file\n" msgstr "" -#: main.cc:57 main.cc:97 +#: main.cc:56 main.cc:101 msgid " -h, --help this help\n" msgstr "" -#: main.cc:100 +#: main.cc:104 msgid " -f, --output-format=X use output format X\n" msgstr "" -#: main.cc:60 main.cc:103 +#: main.cc:59 main.cc:107 msgid " -I, --include=DIR add DIR to search path\n" msgstr "" -#: main.cc:106 +#: main.cc:110 msgid " -i, --init=FILE use FILE as init file\n" msgstr "" -#: main.cc:109 -msgid " -M, --no-paper produce midi output only\n" +#: main.cc:113 +msgid " -m, --no-paper produce midi output only\n" msgstr "" -#: main.cc:112 +#: main.cc:116 msgid " -o, --output=FILE set FILE as default output base\n" msgstr "" -#: main.cc:115 +#: main.cc:119 msgid " -Q, --find-old-relative show all changes in relative syntax\n" msgstr "" -#: main.cc:118 +#: main.cc:122 msgid "" " -s, --safe inhibit file output naming and exporting TeX " "macros\n" msgstr "" -#: main.cc:120 +#: main.cc:124 msgid " -t, --test switch on experimental features\n" msgstr "" -#: main.cc:78 main.cc:123 +#: main.cc:77 main.cc:127 msgid " -T, --no-timestamps don't timestamp the output\n" msgstr "" -#: main.cc:126 +#: main.cc:130 msgid " -V, --ignore-version ignore mudela version\n" msgstr "" -#: main.cc:87 main.cc:129 +#: main.cc:86 main.cc:133 msgid " -w, --warranty show warranty and copyright\n" msgstr "" -#: main.cc:132 +#: main.cc:136 msgid "GNU LilyPond was compiled with the following settings:" msgstr "" -#: main.cc:160 +#: main.cc:166 msgid "GNU LilyPond is Free software, see --warranty" msgstr "" -#: main.cc:107 main.cc:163 main.cc:176 +#: main.cc:106 main.cc:169 main.cc:182 #, c-format msgid "Copyright (c) %s by" msgstr "" -#: main.cc:109 main.cc:165 main.cc:178 +#: main.cc:108 main.cc:171 main.cc:184 msgid "Han-Wen Nienhuys " msgstr "" -#: main.cc:110 main.cc:166 main.cc:179 +#: main.cc:109 main.cc:172 main.cc:185 msgid "Jan Nieuwenhuizen " msgstr "" -#: main.cc:174 +#: main.cc:180 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "" -#: main.cc:113 main.cc:182 +#: main.cc:112 main.cc:188 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" @@ -412,16 +493,21 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:364 +#: midi-item.cc:303 +#, c-format +msgid "No such instrument: `%s'" +msgstr "" + +#: midi-item.cc:357 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "" -#: midi-item.cc:411 +#: midi-item.cc:402 msgid "silly duration" msgstr "" -#: midi-item.cc:424 +#: midi-item.cc:415 msgid "silly pitch" msgstr "" @@ -429,248 +515,260 @@ msgstr "" msgid "error syncing file (disk full?)" msgstr "" -#: music-list.cc:92 -msgid "\\relative mode changed here, old value: " +#: music-output-def.cc:56 +msgid "Interpretation context with empty type" msgstr "" -#: music-output-def.cc:78 +#: music-output-def.cc:83 msgid "Can't find Score context" msgstr "" -#: musical-request.cc:97 +#: musical-request.cc:42 #, c-format msgid "transposition by %s makes accidental larger than two" msgstr "" -#: musical-request.cc:401 -#, c-format -msgid "never heard of dynamic scale `\\%s', assuming %s" -msgstr "" - -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "redeclaration of `\\%s'" msgstr "" -#: my-lily-lexer.cc:138 +#: my-lily-lexer.cc:143 #, c-format msgid "Identifier name is a keyword (`%s')" msgstr "" -#: my-lily-lexer.cc:166 +#: my-lily-lexer.cc:172 #, c-format msgid "error at EOF: %s" msgstr "" -#: my-lily-parser.cc:57 +#: my-lily-parser.cc:60 msgid "Parsing..." msgstr "" -#: my-lily-parser.cc:66 +#: my-lily-parser.cc:69 msgid "braces don't match" msgstr "" -#: my-lily-parser.cc:273 -msgid "invalid inversion pitch (not part of chord)" +#: paper-def.cc:95 +#, c-format +msgid "unknown paper variable: `%s'" +msgstr "" + +#: paper-def.cc:99 +msgid "not a real variable" msgstr "" -#: p-score.cc:172 -msgid "Can't solve this casting problem exactly; revert to Word_wrap" +#. for now; breaks -fscm output +#: paper-def.cc:251 +msgid "outputting Score, defined at: " msgstr "" -#: p-score.cc:193 -msgid "Preprocessing elements..." +#: paper-def.cc:280 +#, c-format +msgid "Paper output to %s..." msgstr "" -#: p-score.cc:197 -msgid "Calculating column positions..." +#: mudela-stream.cc:85 paper-outputter.cc:76 performance.cc:97 +msgid ", at " msgstr "" -#: paper-def.cc:59 +#: paper-outputter.cc:130 #, c-format -msgid "unknown paper variable: `%s'" +msgid "Improbable offset for object type `%s'" msgstr "" -#: paper-def.cc:63 -msgid "not a real variable" +#: paper-score.cc:131 +msgid "Can't solve this casting problem exactly; revert to Word_wrap" msgstr "" -#. for now; breaks -fscm output -#: paper-def.cc:228 -msgid "outputting Score, defined at: " +#: paper-score.cc:156 +msgid "Preprocessing elements..." msgstr "" -#: paper-def.cc:260 -#, c-format -msgid "Paper output to %s..." +#: paper-score.cc:160 +msgid "Calculating column positions..." msgstr "" -#: mudela-stream.cc:85 paper-outputter.cc:61 performance.cc:68 -msgid ", at " +#: paper-score.cc:179 +msgid " elements. " +msgstr "" + +#: paper-score.cc:182 +msgid "Line ... " +msgstr "" + +#: performance.cc:50 +msgid "Track ... " msgstr "" #. perhaps multiple text events? -#: performance.cc:54 +#: performance.cc:77 msgid "Creator: " msgstr "" -#: performance.cc:63 +#: performance.cc:92 msgid "Automatically generated" msgstr "" -#: performance.cc:76 +#: performance.cc:106 #, c-format msgid "from musical definition: %s" msgstr "" -#: performance.cc:141 +#: performance.cc:174 #, c-format msgid "MIDI output to %s..." msgstr "" -#: plet-engraver.cc:86 -msgid "unterminated plet" -msgstr "" - #: qlpsolve.cc:88 qlpsolve.cc:139 msgid "degenerate constraints" msgstr "" -#: repeated-music-iterator.cc:58 -msgid "No one to print a volta bracket" -msgstr "" - -#: request-iterator.cc:72 +#: request-chord-iterator.cc:73 #, c-format msgid "junking request: `%s'" msgstr "" -#: request-iterator.cc:75 +#: request-chord-iterator.cc:76 #, c-format msgid "Huh? Not a Request: `%s'" msgstr "" -#: score-column.cc:55 -#, c-format -msgid "ignoring zero duration added to column at %s" +#: rest-collision.cc:64 +msgid "Too many colliding rests." msgstr "" -#: score-engraver.cc:143 +#: rest-collision.cc:68 +msgid "Too many notes for rest collision." +msgstr "" + +#: score-engraver.cc:149 #, c-format msgid "Unbound spanner `%s'" msgstr "" -#: score.cc:57 +#: score.cc:56 msgid "no toplevel translator" msgstr "" -#: score.cc:60 +#: score.cc:59 msgid "Interpreting music..." msgstr "" -#: score.cc:71 +#: score.cc:70 msgid "need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:107 +#: score.cc:83 msgid "errors found, /*not processing score*/" msgstr "" -#: scores.cc:34 +#: score.cc:88 +#, c-format +msgid "time: %.2f seconds" +msgstr "" + +#: scores.cc:35 #, c-format msgid "writing dependency file: `%s'..." msgstr "" -#: scores.cc:78 +#: scores.cc:79 msgid "score contains errors; will not process it" msgstr "" -#: script.cc:61 -msgid "script needs stem direction" +#: scores.cc:109 +#, c-format +msgid "Search path: %s" msgstr "" -#: slur-engraver.cc:50 +#: script-engraver.cc:49 +#, c-format +msgid "don't know how to interpret articulation `%s'\n" +msgstr "" + +#. this shouldn't happen, but let's continue anyway. +#: single-malt-grouping-item.cc:42 +msgid "Single_malt_grouping_item: I've been drinking too much" +msgstr "" + +#: slur-engraver.cc:64 msgid "unterminated slur" msgstr "" -#: slur-engraver.cc:66 +#: slur-engraver.cc:80 #, c-format msgid "can't find both ends of %s" msgstr "" -#: slur-engraver.cc:66 +#: slur-engraver.cc:80 msgid "slur" msgstr "" -#: slur.cc:42 -msgid "Putting slur over rest." +#: slur.cc:39 +msgid "Putting slur over rest. Ignoring" msgstr "" -#: spanner.cc:44 -msgid "left spanpoint is right spanpoint\n" +#: spacing-spanner.cc:215 +#, c-format +msgid "can't find a ruling note at %s" msgstr "" -#: spanner.cc:101 +#: spacing-spanner.cc:221 #, c-format -msgid "Spanner `%s' with equal left and right spanpoints" +msgid "no minimum in measure at %s" msgstr "" -#: spring-spacer.cc:83 +#: spanner.cc:39 +msgid "left spanpoint is right spanpoint\n" +msgstr "" + +#: spanner.cc:109 #, c-format -msgid "unconnected column: %d" +msgid "Spanner `%s' with equal left and right spanpoints" msgstr "" -#: spring-spacer.cc:187 +#: spring-spacer.cc:134 msgid "I'm too fat; call Oprah" msgstr "" -#: spring-spacer.cc:345 +#: spring-spacer.cc:295 msgid "solution doesn't satisfy constraints" msgstr "" -#: spring-spacer.cc:625 +#: stem-engraver.cc:80 #, c-format -msgid "can't find a ruling note at %s" -msgstr "" - -#: spring-spacer.cc:631 -#, c-format -msgid "no minimum in measure at %s" +msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: staff-side.cc:61 -msgid "" -"Staff_side::get_position_f(): somebody forgot to set my direction, returning " -"-20" -msgstr "" - -#: stem.cc:101 +#: stem.cc:106 msgid "weird stem size; check for narrow beams" msgstr "" -#: symtable.cc:50 +#: tfm-reader.cc:108 #, c-format -msgid "Symtable `%s': unknown symbol: `%s'" +msgid "TFM header of `%s' has only %u word(s)" msgstr "" -#: symtable.cc:61 +#: tfm-reader.cc:146 #, c-format -msgid "Symtable `%s' unknown" +msgid "%s: TFM file has %u parameters, which is more than the" msgstr "" -#: text-item.cc:49 -msgid "" -"Text_item::get_position_f(): somebody forgot to set my vertical direction, " -"returning -20" +#: tfm.cc:64 +#, c-format +msgid "can't find ascii character `%d'" msgstr "" -#: tie.cc:50 -msgid "lonely tie" +#: tie-engraver.cc:155 tie-performer.cc:106 +msgid "No ties were created!" msgstr "" -#: ties-engraver.cc:78 -msgid "Can't find a note head at the right to attach Tie" +#: tie.cc:55 +msgid "lonely tie" msgstr "" #: time-description.cc:17 @@ -685,143 +783,164 @@ msgstr "" msgid "partial measure too large" msgstr "" +#: time-scaled-music-iterator.cc:25 +msgid "No one to print a tuplet start bracket" +msgstr "" + #: time-signature-engraver.cc:28 msgid "lost in time" msgstr "" -#: timing-translator.cc:31 +#: timing-translator.cc:26 msgid "conflicting timing request" msgstr "" -#: timing-translator.cc:67 +#: timing-translator.cc:62 msgid "time signature change not allowed here" msgstr "" -#: timing-translator.cc:90 +#: timing-translator.cc:83 #, c-format msgid "barcheck failed by: %s" msgstr "" -#: translator-ctors.cc:40 +#: translator-ctors.cc:39 #, c-format msgid "unknown translator `%s'" msgstr "" -#: translator-group.cc:182 +#: translator-group.cc:82 translator-group.cc:97 +#, c-format +msgid "Already contains a `%s'" +msgstr "" + +#: translator-group.cc:207 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "" -#: translator-group.cc:300 +#: translator-group.cc:341 #, c-format msgid "can't find or create `%s'" msgstr "" -#: translator-group.cc:390 +#: translator-group.cc:437 translator-group.cc:446 #, c-format msgid "can't find `%s'" msgstr "" -#: transposed-music.cc:33 -msgid "Will ignore \relative for transposed music" +#: transposed-music.cc:31 +msgid "Will ignore \\relative for transposed music" +msgstr "" + +#: unfolded-repeat-iterator.cc:145 +msgid "No one to print a volta bracket" msgstr "" -#: word-wrap.cc:68 +#: word-wrap.cc:75 msgid "ugh, this measure is too long" msgstr "" -#: word-wrap.cc:69 +#: word-wrap.cc:76 #, c-format msgid "breakpoint: %d" msgstr "" -#: word-wrap.cc:70 +#: word-wrap.cc:77 msgid "generating stupido solution" msgstr "" -#: word-wrap.cc:88 +#: word-wrap.cc:95 msgid "I don't fit; put me on Montignac" msgstr "" -#: parser.yy:340 parser.yy:343 +#: parser.yy:55 #, c-format -msgid "incorrect mudela version: %s (%s, %s)" +msgid "Oldest supported input version: %s" +msgstr "" + +#: parser.yy:313 +msgid "Cannot evaluate Scheme in safe mode" msgstr "" -#: parser.yy:480 +#: parser.yy:433 parser.yy:441 parser.yy:465 msgid "Need a translator group for a context" msgstr "" -#: parser.yy:498 +#: parser.yy:459 msgid "Wrong type for property value" msgstr "" -#: parser.yy:547 +#: parser.yy:515 msgid "More than one music block" msgstr "" -#: parser.yy:1136 parser.yy:1389 -msgid "have to be in Lyric mode for lyrics" -msgstr "" - -#: parser.yy:1337 parser.yy:1357 +#: parser.yy:946 parser.yy:1360 parser.yy:1380 #, c-format msgid "not a duration: %d" msgstr "" -#: parser.yy:1359 +#: parser.yy:948 parser.yy:1382 msgid "can't abbreviate" msgstr "" -#: parser.yy:1369 +#: parser.yy:1211 parser.yy:1219 parser.yy:1444 +msgid "have to be in Lyric mode for lyrics" +msgstr "" + +#: parser.yy:1391 msgid "have to be in Note mode for notes" msgstr "" -#: parser.yy:1395 -msgid "have to be in Chord mode for chords" +#: parser.yy:1403 +msgid "can't abbreviate tuplet" msgstr "" -#: parser.yy:1400 -msgid "have to be in Note mode for @chords" +#: parser.yy:1450 +msgid "have to be in Chord mode for chords" msgstr "" -#: lexer.ll:131 +#: lexer.ll:155 msgid "EOF found inside a comment" msgstr "" -#: lexer.ll:175 +#: lexer.ll:199 #, c-format msgid "undefined identifier: `%s'" msgstr "" #. backup rule -#: lexer.ll:180 +#: lexer.ll:204 msgid "missing end quote" msgstr "" #. backup rule -#: lexer.ll:203 lexer.ll:207 +#: lexer.ll:227 lexer.ll:231 msgid "white expected" msgstr "" -#: lexer.ll:362 +#: lexer.ll:401 #, c-format -msgid "illegal character: `%c'" +msgid "invalid character: `%c'" msgstr "" -#: lexer.ll:418 +#: lexer.ll:457 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" +#: lexer.ll:543 +#, c-format +msgid "incorrect mudela version: %s (%s, %s)" +msgstr "" + #: out/BLURB.hh:2 msgid "" -"LilyPond is the GNU Project music typesetter. This program can print\n" -"beautiful sheet music from a music definition file. It can also play\n" -"mechanical performances to a MIDI file. Features include multiple\n" -"staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,\n" -"beams, slurs, triplets, named chords, transposing, formatting scores, \n" -"part extraction. It includes a nice font of musical symbols.\n" +"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" +"\n" +"\n" msgstr "" #: out/COPERTINA.hh:2 @@ -849,161 +968,163 @@ msgid "" "individuele partijen. Een fraaie set muziektekens is inbegrepen.\n" msgstr "" -#: main.cc:43 +#: main.cc:42 #, c-format msgid "Usage: %s [OPTION]... [FILE]" msgstr "" -#: main.cc:45 +#: main.cc:44 msgid "Translate midi-file to mudela" msgstr "" -#: main.cc:51 +#: main.cc:50 msgid " -b, --no-quantify write exact durations, e.g.: a4*385/384\n" msgstr "" -#: main.cc:63 +#: main.cc:53 +msgid " -D, --debug enable debugging output\n" +msgstr "" + +#: main.cc:62 msgid " -k, --key=ACC[:MINOR] set key: ACC +sharps/-flats; :1 minor\n" msgstr "" -#: main.cc:66 +#: main.cc:65 msgid "" -" -n, --no-silly assume no plets or double dots, smallest is 32\n" +" -n, --no-silly assume no tuplets or double dots, smallest is 32\n" msgstr "" -#: main.cc:69 +#: main.cc:68 msgid " -o, --output=FILE set FILE as default output\n" msgstr "" -#: main.cc:72 -msgid " -p, --no-plets assume no plets\n" +#: main.cc:71 +msgid " -p, --no-tuplets assume no tuplets\n" msgstr "" -#: main.cc:75 +#: main.cc:74 msgid " -q, --quiet be quiet\n" msgstr "" -#: main.cc:81 +#: main.cc:80 msgid "" " -s, --smallest=N assume no shorter (reciprocal) durations than N\n" msgstr "" -#: main.cc:84 +#: main.cc:83 msgid " -v, --verbose be verbose\n" msgstr "" -#: main.cc:90 +#: main.cc:89 msgid " -x, --no-double-dots assume no double dotted notes\n" msgstr "" -#: main.cc:105 -msgid "Mi2mu, translate midi to mudela" +#: main.cc:104 +msgid "Midi2ly, translate midi to mudela" msgstr "" #: midi-parser.cc:64 msgid "zero length string encountered" msgstr "" -#: midi-score-parser.cc:45 +#: midi-score-parser.cc:44 msgid "MIDI header expected" msgstr "" -#: midi-score-parser.cc:50 +#: midi-score-parser.cc:49 msgid "Invalid header length" msgstr "" -#: midi-score-parser.cc:53 +#: midi-score-parser.cc:52 msgid "Invalid midi format" msgstr "" -#: midi-score-parser.cc:56 +#: midi-score-parser.cc:55 msgid "Invalid number of tracks" msgstr "" -#: midi-score-parser.cc:59 +#: midi-score-parser.cc:58 #, c-format msgid "can't handle %s" msgstr "" -#: midi-score-parser.cc:59 +#: midi-score-parser.cc:58 msgid "non-metrical time" msgstr "" -#: midi-score-parser.cc:95 +#: midi-score-parser.cc:94 msgid "Parsing...\n" msgstr "" -#: midi-track-parser.cc:70 +#: midi-track-parser.cc:68 #, c-format msgid "junking note-end event: channel = %d, pitch = %d" msgstr "" -#: midi-track-parser.cc:125 +#: midi-track-parser.cc:124 msgid "invalid running status" msgstr "" -#: midi-track-parser.cc:326 +#: midi-track-parser.cc:328 msgid "unimplemented MIDI meta-event" msgstr "" -#: midi-track-parser.cc:331 +#: midi-track-parser.cc:333 msgid "invalid MIDI event" msgstr "" -#: midi-track-parser.cc:346 +#: midi-track-parser.cc:348 msgid "MIDI track expected" msgstr "" -#: midi-track-parser.cc:351 +#: midi-track-parser.cc:353 msgid "invalid track length" msgstr "" -#: mudela-item.cc:107 +#: mudela-item.cc:160 #, c-format msgid "#32 in quarter: %d" msgstr "" -#: mudela-score.cc:117 +#: mudela-score.cc:108 #, c-format msgid "Lily output to %s..." msgstr "" -#: mudela-score.cc:127 mudela-score.cc:175 +#: mudela-score.cc:119 mudela-score.cc:168 msgid "track " msgstr "" -#: mudela-score.cc:160 +#: mudela-score.cc:155 msgid "Processing..." msgstr "" -#: mudela-score.cc:171 +#: mudela-score.cc:164 msgid "Creating voices..." msgstr "" -#: mudela-score.cc:184 +#: mudela-score.cc:177 msgid "NOT Filtering tempo..." msgstr "" -#: mudela-score.cc:193 +#: mudela-score.cc:186 msgid "NOT Quantifying columns..." msgstr "" -#: mudela-score.cc:197 +#: mudela-score.cc:190 msgid "Quantifying columns..." msgstr "" -#. LOGOUT(NORMAL_ver) << '\n' << "NOT Settling columns..." << endl; -#. return; -#: mudela-score.cc:232 +#: mudela-score.cc:223 msgid "Settling columns..." msgstr "" -#: mudela-staff.cc:107 +#: mudela-staff.cc:111 #, c-format msgid "% midi copyright:" msgstr "" -#: mudela-staff.cc:108 +#: mudela-staff.cc:112 #, c-format msgid "% instrument:" msgstr "" diff --git a/po/nl.po b/po/nl.po index d5c5df212a..e32dcdb374 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,26 +1,22 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. -# -#, fuzzy # nl.po -- GNU LilyPond's dutch language file -# Copyright (C) 1998 Free Software Foundation, Inc. # Jan Nieuwenhuizen # Han-Wen Nienhuys , 1998. # msgid "" msgstr "" +"POT-Creation-Date: 1999-08-15 23:58+0200\n" +"Content-Type: text/plain; charset=\n" "Date: 1998-05-26 11:26:28+0200\n" "From: \n" -"Content-Type: text/plain; charset=\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" #: data-file.cc:52 msgid "EOF in a string" msgstr "EOF in een string" -#: data-file.cc:121 input.cc:86 midi-parser.cc:100 warn.cc:21 +#: data-file.cc:116 input.cc:86 midi-parser.cc:100 warn.cc:21 msgid "warning: " msgstr "waarschuwing: " @@ -75,7 +71,7 @@ msgstr "fout: " msgid "Non fatal error: " msgstr "Niet noodlottige fout: " -#: input.cc:105 source-file.cc:64 source-file.cc:157 +#: input.cc:105 source-file.cc:63 source-file.cc:156 msgid "position unknown" msgstr "positie onbekend" @@ -96,106 +92,106 @@ msgstr "" msgid "Huh? got %d, expected %d characters" msgstr "Huh? kreeg %d, verwachtte %d tekens" -#: abbreviation-beam-engraver.cc:72 -msgid "unterminated beam" -msgstr "onafgesloten balk" +#: warn.cc:33 +msgid "Programming error: " +msgstr "Programmeer fout: " + +#: warn.cc:33 +msgid " (continuing; cross thumbs)" +msgstr " (ik ga verder; duim voor mij)" -#: afm.cc:127 +#: afm.cc:129 #, c-format msgid "can't find character called `%s'" -msgstr "" +msgstr "kan teken niet vinden, genaamd: `%s'" -#: afm.cc:151 +#: afm.cc:154 #, c-format msgid "can't find character number %d" -msgstr "" +msgstr "kan teken niet vinden met nummer %d" + +#: all-font-metrics.cc:69 +#, c-format +msgid "Can't find font `%s', loading default font." +msgstr "Kan font `%s' niet vinden, laad verval font" #: all-font-metrics.cc:74 #, c-format msgid "Can't find default font `%s', giving up." -msgstr "" +msgstr "Kan verval font `%s' niet vinden, ik geef op." #: all-font-metrics.cc:75 #, c-format msgid "search path = %s" -msgstr "" +msgstr "zoek pad = %s" -#: beam-engraver.cc:37 +#: beam-engraver.cc:42 msgid "No Beam to end" -msgstr "" +msgstr "Geen Balk te beëidigen" -#: beam-engraver.cc:53 +#: beam-engraver.cc:58 msgid "No beam to end" -msgstr "" +msgstr "Geen balk te beëindigen" -#: beam-engraver.cc:66 +#: beam-engraver.cc:87 msgid "Already have a Beam" -msgstr "" +msgstr "Heb al een Balk" -#: beam-engraver.cc:132 +#: beam-engraver.cc:149 msgid "Unfinished beam" -msgstr "" +msgstr "Onbeëindigde balk" -#: beam-engraver.cc:152 +#: beam-engraver.cc:174 msgid "Stem must have Rhythmic structure." -msgstr "" +msgstr "Stok moet Ritmische structuur hebben." -#: beam-engraver.cc:164 +#: beam-engraver.cc:185 msgid "stem doesn't fit in beam" msgstr "stok past niet in balk" -#: beam-engraver.cc:165 +#: beam-engraver.cc:186 msgid "beam was started here" -msgstr "" - -#: beam-engraver.cc:176 -msgid "please fix me" -msgstr "repareer mij alsjeblieft" +msgstr "balk is hier gestart" -#: beam-engraver.cc:177 -#, c-format -msgid "stem at %s doesn't fit in beam" -msgstr "stok op %s past niet in balk" - -#: beam.cc:117 +#: beam.cc:142 msgid "beam with less than two stems" msgstr "balk met minder dan twee stokken" -#: beam.cc:260 +#: beam.cc:307 msgid "weird beam shift, check your knees" msgstr "vreemde balk verplaatsing, controleer uw knie-en" -#: break.cc:25 +#: break-algorithm.cc:25 msgid "0 lines" msgstr "0 regels" -#: break.cc:27 +#: break-algorithm.cc:27 #, c-format msgid "1 line (of %.0f columns)" msgstr "1 regel (van %.0f kolommen)" -#: break.cc:29 +#: break-algorithm.cc:29 #, c-format msgid "%d lines (with an average of %.1f columns)" msgstr "%d regels (van gemiddeld %.1f kolommen)" -#: break.cc:148 +#: break-algorithm.cc:148 msgid "score does not have any columns" msgstr "partituur heeft geen enkele kolom" -#: break.cc:174 +#: break-algorithm.cc:165 #, c-format -msgid "approximated: %s" +msgid "approximated %s" msgstr "geschat: %s" -#: break.cc:176 +#: break-algorithm.cc:167 #, c-format -msgid "calculated exactly: %s" +msgid "calculated %s exactly" msgstr "exact berekend: %s" -#: break.cc:177 score.cc:112 +#: break-algorithm.cc:168 #, c-format -msgid "time: %.2f seconds" +msgid "elapsed time %.2f seconds" msgstr "duur: %.2f seconden" #: change-iterator.cc:22 @@ -203,41 +199,41 @@ msgstr "duur: %.2f seconden" msgid "can't change `%s' to `%s'" msgstr "kan `%s' niet in `%s' veranderen" -#: chord.cc:185 +#: chord-tremolo-engraver.cc:41 chord-tremolo-engraver.cc:58 +msgid "No abbreviation beam to end" +msgstr "" + +#: chord-tremolo-engraver.cc:83 +msgid "Already have an abbreviation beam" +msgstr "" + +#: chord-tremolo-engraver.cc:124 +msgid "Unfinished abbreviation beam" +msgstr "" + +#: chord.cc:231 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:199 +#: chord.cc:245 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: clef-engraver.cc:175 +#: clef-engraver.cc:178 msgid "unknown clef type " msgstr "onbekende sleutel" -#: collision.cc:63 -msgid "No stem direction set. Ignoring column in clash." -msgstr "Geen stokrichting gezet. Negeer kolom in botsing." - -#: collision.cc:76 +#: collision.cc:95 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Te veel botsende nootkolommen. Ik negeer ze." -#: command-request.cc:217 -msgid "don't know how handle empty keys" -msgstr "" - -#: compressed-music-iterator.cc:25 -msgid "No one to print a tuplet start bracket" -msgstr "" - -#: crescendo.cc:47 +#: crescendo.cc:42 msgid "crescendo" msgstr "" -#: crescendo.cc:47 +#: crescendo.cc:42 msgid "too small" msgstr "te klein" @@ -253,197 +249,236 @@ msgstr "" msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:91 +#: dynamic-engraver.cc:109 msgid "Got a dynamic already. Continuing dazed and confused" msgstr "" -#: dynamic-engraver.cc:125 +#: dynamic-engraver.cc:162 msgid "can't find (de)crescendo to end" msgstr "" -#: dynamic-engraver.cc:155 +#: dynamic-engraver.cc:216 msgid "Too many crescendi here" msgstr "" -#: dynamic-engraver.cc:196 +#: dynamic-engraver.cc:254 msgid "unended crescendo" msgstr "niet beeindigd crescendo" -#: encompass-info.cc:79 stem-info.cc:123 -msgid "minVerticalAlign != maxVerticalAlign: interstaff slurs may be broken" +#: encompass-info.cc:32 +msgid "Slur over rest?" msgstr "" -#: extender-engraver.cc:65 +#: encompass-info.cc:67 stem-info.cc:140 +msgid "" +"minVerticalAlign != maxVerticalAlign: interstaff beams/slurs may be broken" +msgstr "" + +#: extender-engraver.cc:62 msgid "unterminated extender" msgstr "" -#: identifier.cc:47 +#: folded-repeat-iterator.cc:64 +msgid "No one to print a repeat brace" +msgstr "" + +#: grace-iterator.cc:43 +msgid "No Grace context available!" +msgstr "" + +#: grace-position-engraver.cc:89 +msgid "Unattached grace notes. Attaching to last musical column." +msgstr "" + +#: hyphen-engraver.cc:60 +msgid "unterminated hyphen" +msgstr "onafgesloten balk" + +#: identifier.cc:46 msgid "Wrong identifier type: " msgstr "" -#: identifier.cc:48 +#: identifier.cc:47 #, c-format msgid "%s expected" msgstr "%s verwacht" -#: includable-lexer.cc:45 midi-score-parser.cc:24 scores.cc:111 scores.cc:117 +#: includable-lexer.cc:47 midi-score-parser.cc:24 scores.cc:108 scores.cc:114 #, c-format msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" +#: includable-lexer.cc:48 +#, c-format +msgid "" +"\n" +"Search path is `%s'\n" +msgstr "" + #: ineq-constrained-qp.cc:169 #, c-format msgid "Ineq_constrained_qp::solve (): Constraint off by %f" msgstr "Ineq_constrained_qp::solve (): voorwaarde zit er %f naast" -#: ineq-constrained-qp.cc:224 +#: ineq-constrained-qp.cc:233 msgid "didn't converge!" msgstr "ik convergederde niet!" -#: ineq-constrained-qp.cc:226 +#: ineq-constrained-qp.cc:235 msgid "Too much degeneracy. " msgstr "" -#: key-engraver.cc:133 +#: key-def.cc:31 msgid "No key name: assuming `C'" msgstr "" -#: lily-guile.cc:69 +#: key-def.cc:92 +msgid "don't know how handle empty keys" +msgstr "" + +#: lily-guile.cc:84 lily-guile.cc:107 #, c-format msgid "Can not find file `%s'" msgstr "" -#: lily-guile.cc:71 +#: lily-guile.cc:86 lily-guile.cc:109 #, c-format msgid "(Load path is `%s'" msgstr "" -#: local-key-engraver.cc:39 +#: local-key-engraver.cc:42 msgid "out of tune" msgstr "vals" -#: local-key-engraver.cc:39 time-signature-engraver.cc:28 +#: local-key-engraver.cc:42 time-signature-engraver.cc:28 msgid "can't find" msgstr "kan niet vinden" -#: lookup.cc:102 +#: lookup.cc:103 #, c-format msgid "Can't open `%s'\n" msgstr "" -#: lookup.cc:103 +#: lookup.cc:104 #, c-format msgid "Search path %s\n" msgstr "" -#: lookup.cc:104 +#: lookup.cc:105 msgid "Aborting" msgstr "" -#: main.cc:84 +#: lookup.cc:434 +#, c-format +msgid "Non-matching braces in text `%s', adding braces." +msgstr "" + +#: main.cc:85 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." -#: main.cc:85 +#: main.cc:86 msgid "Typeset music and or play MIDI from FILE or " msgstr "Zet muziek en of speel MIDI van FILE of " -#: main.cc:48 main.cc:88 +#: main.cc:47 main.cc:89 msgid "Options:" msgstr "Opties:" -#: main.cc:91 +#: main.cc:92 msgid " -a, --about about LilyPond\n" msgstr " -a, --about over LilyPond\n" -#: main.cc:54 main.cc:94 -msgid " -D, --debug enable debugging output\n" +#: main.cc:95 +msgid " -d, --debug enable debugging output\n" msgstr " -D, --debug toon ontluis berichten\n" -#: main.cc:97 +#: main.cc:98 msgid "" -" -d, --dependencies write Makefile dependencies for every input file\n" +" -M, --dependencies write Makefile dependencies for every input file\n" msgstr "" " -d, --dependencies schrijf Makefile afhankelijkheden voor elk\n" " invoerbestand\n" -#: main.cc:57 main.cc:100 +#: main.cc:56 main.cc:101 msgid " -h, --help this help\n" msgstr " -h, --help deze hulp\n" -#: main.cc:103 +#: main.cc:104 msgid " -f, --output-format=X use output format X\n" -msgstr "" +msgstr " -f, --output-format=X gebruik uitvoer formaat X\n" -#: main.cc:60 main.cc:106 +#: main.cc:59 main.cc:107 msgid " -I, --include=DIR add DIR to search path\n" msgstr " -I, --include=INDEX voeg INDEX toe aan zoekpad\n" -#: main.cc:109 +#: main.cc:110 msgid " -i, --init=FILE use FILE as init file\n" -msgstr " -i, --init=BESTAND gebruik BESTAND voor initialisatiebestand\n" +msgstr " -i, --init=BESTAND gebruik BESTAND als initialisatiebestand\n" -#: main.cc:112 -msgid " -M, --no-paper produce midi output only\n" +#: main.cc:113 +msgid " -m, --no-paper produce midi output only\n" msgstr " -M, --no-paper produceer alleen midi uitvoer\n" -#: main.cc:115 +#: main.cc:116 msgid " -o, --output=FILE set FILE as default output base\n" -msgstr "" +msgstr " -o, --output=BESTAND zet BESTAND als uitvoer basis\n" -#: main.cc:118 +#: main.cc:119 msgid " -Q, --find-old-relative show all changes in relative syntax\n" -msgstr "" +msgstr " -Q, --find-old-relative toon veranderingen voor relatieve mode\n" -#: main.cc:121 +#: main.cc:122 msgid "" " -s, --safe inhibit file output naming and exporting TeX " "macros\n" msgstr "" +" -s, --safe verbiedt naamgeving van uitvoer bestand en TeX " +"macro's\n" -#: main.cc:123 +#: main.cc:124 msgid " -t, --test switch on experimental features\n" msgstr " -t, --test doe experimentele kunstjes\n" -#: main.cc:78 main.cc:126 +#: main.cc:77 main.cc:127 msgid " -T, --no-timestamps don't timestamp the output\n" msgstr " -T, --no-timestamps zet geen tijdstempel in de uitvoer\n" -#: main.cc:129 +#: main.cc:130 msgid " -V, --ignore-version ignore mudela version\n" msgstr " -V, --ignore-version negeer mudela versie\n" -#: main.cc:87 main.cc:132 +#: main.cc:86 main.cc:133 msgid " -w, --warranty show warranty and copyright\n" msgstr " -w, --warranty toon garantie en copyright\n" -#: main.cc:135 +#: main.cc:136 msgid "GNU LilyPond was compiled with the following settings:" msgstr "GNU LilyPond is vertaald met de volgende instellingen:" -#: main.cc:163 +#: main.cc:166 msgid "GNU LilyPond is Free software, see --warranty" msgstr "GNU LilyPond is Vrij bedenksel, zie --warranty" -#: main.cc:107 main.cc:166 main.cc:179 +#: main.cc:106 main.cc:169 main.cc:182 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " -#: main.cc:109 main.cc:168 main.cc:181 +#: main.cc:108 main.cc:171 main.cc:184 msgid "Han-Wen Nienhuys " msgstr "" -#: main.cc:110 main.cc:169 main.cc:182 +#: main.cc:109 main.cc:172 main.cc:185 msgid "Jan Nieuwenhuizen " msgstr "" -#: main.cc:177 +#: main.cc:180 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- De Muziekzetter van het GNU Project" -#: main.cc:113 main.cc:185 +#: main.cc:112 main.cc:188 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" @@ -473,109 +508,131 @@ msgstr "" "dan naar de Free Software Foundation, Inc., 675 Mass Ave, Cambridge, \n" "MA 02139, USA.\n" -#: midi-item.cc:364 +#: midi-item.cc:303 +#, c-format +msgid "No such instrument: `%s'" +msgstr "" + +#: midi-item.cc:357 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "vreemde toonsoort: %d mollen, %d kruizen" -#: midi-item.cc:411 +#: midi-item.cc:402 msgid "silly duration" -msgstr "" +msgstr "rare duur" -#: midi-item.cc:424 +#: midi-item.cc:415 msgid "silly pitch" -msgstr "" +msgstr "rare toonhoogte" #: midi-stream.cc:29 paper-stream.cc:36 msgid "error syncing file (disk full?)" msgstr "kan file niet wegschrijven (disk vol?)" -#: music-list.cc:92 -msgid "\\relative mode changed here, old value: " +#: music-output-def.cc:56 +msgid "Interpretation context with empty type" msgstr "" -#: music-output-def.cc:79 +#: music-output-def.cc:83 msgid "Can't find Score context" msgstr "" -#: musical-request.cc:97 +#: musical-request.cc:42 #, c-format msgid "transposition by %s makes accidental larger than two" msgstr "transpositie van %s geeft tripel kruizen/mollen " -#: my-lily-lexer.cc:130 +#: my-lily-lexer.cc:137 #, c-format msgid "redeclaration of `\\%s'" msgstr "`\\%s' wordt opnieuw gedeclareerd" -#: my-lily-lexer.cc:136 +#: my-lily-lexer.cc:143 #, c-format msgid "Identifier name is a keyword (`%s')" msgstr "" -#: my-lily-lexer.cc:164 +#: my-lily-lexer.cc:172 #, c-format msgid "error at EOF: %s" msgstr "fout aan het einde van file: %s" -#: my-lily-parser.cc:58 +#: my-lily-parser.cc:60 msgid "Parsing..." msgstr "Ontleden..." -#: my-lily-parser.cc:67 +#: my-lily-parser.cc:69 msgid "braces don't match" msgstr "haakjes passen niet" -#: p-score.cc:116 -msgid "Can't solve this casting problem exactly; revert to Word_wrap" -msgstr "Kan breekprobleem niet exact oplossen; verval naar Word_wrap" - -#: p-score.cc:196 -msgid "Preprocessing elements..." -msgstr "Voorbewerken van elementen..." - -#: p-score.cc:200 -msgid "Calculating column positions..." -msgstr "Berekenen van kolomposities..." - -#: paper-def.cc:73 +#: paper-def.cc:95 #, c-format msgid "unknown paper variable: `%s'" msgstr "onbekende \\paper variabele" -#: paper-def.cc:77 +#: paper-def.cc:99 msgid "not a real variable" msgstr "variabele is geen reeal getal" #. for now; breaks -fscm output -#: paper-def.cc:240 +#: paper-def.cc:251 msgid "outputting Score, defined at: " msgstr "" -#: paper-def.cc:275 +#: paper-def.cc:280 #, c-format msgid "Paper output to %s..." msgstr "" -#: mudela-stream.cc:85 paper-outputter.cc:74 performance.cc:70 +#: mudela-stream.cc:85 paper-outputter.cc:76 performance.cc:97 msgid ", at " msgstr ", bij " +#: paper-outputter.cc:130 +#, c-format +msgid "Improbable offset for object type `%s'" +msgstr "" + +#: paper-score.cc:131 +msgid "Can't solve this casting problem exactly; revert to Word_wrap" +msgstr "Kan breekprobleem niet exact oplossen; verval naar Word_wrap" + +#: paper-score.cc:156 +msgid "Preprocessing elements..." +msgstr "Voorbewerken van elementen..." + +#: paper-score.cc:160 +msgid "Calculating column positions..." +msgstr "Berekenen van kolomposities..." + +#: paper-score.cc:179 +msgid " elements. " +msgstr "" + +#: paper-score.cc:182 +msgid "Line ... " +msgstr "" + +#: performance.cc:50 +msgid "Track ... " +msgstr "" + #. perhaps multiple text events? -#: performance.cc:55 +#: performance.cc:77 msgid "Creator: " msgstr "Schepper: " -#: performance.cc:65 +#: performance.cc:92 msgid "Automatically generated" msgstr "Automatisch gegenerederd" -#: performance.cc:78 +#: performance.cc:106 #, c-format msgid "from musical definition: %s" msgstr "van muzikale definitie: %s" -#: performance.cc:143 +#: performance.cc:174 #, c-format msgid "MIDI output to %s..." msgstr "MIDI uitvoer naar %s..." @@ -584,47 +641,51 @@ msgstr "MIDI uitvoer naar %s..." msgid "degenerate constraints" msgstr "voorwaarde is gedegenerederd" -#: repeated-music-iterator.cc:50 -msgid "No one to print a volta bracket" -msgstr "" - -#: request-iterator.cc:72 +#: request-chord-iterator.cc:73 #, c-format msgid "junking request: `%s'" msgstr "schroot verzoek: `%s'" -#: request-iterator.cc:75 +#: request-chord-iterator.cc:76 #, c-format msgid "Huh? Not a Request: `%s'" msgstr "" -#: score-column.cc:55 -#, c-format -msgid "ignoring zero duration added to column at %s" +#: rest-collision.cc:64 +msgid "Too many colliding rests." +msgstr "" + +#: rest-collision.cc:68 +msgid "Too many notes for rest collision." msgstr "" -#: score-engraver.cc:143 +#: score-engraver.cc:149 #, c-format msgid "Unbound spanner `%s'" msgstr "Vrijgezelle spanner `%s'" -#: score.cc:57 +#: score.cc:56 msgid "no toplevel translator" msgstr "" -#: score.cc:60 +#: score.cc:59 msgid "Interpreting music..." msgstr "Vertolken van muziek..." -#: score.cc:71 +#: score.cc:70 msgid "need music in a score" msgstr "zonder muziek geen partituur" #. should we? hampers debugging. -#: score.cc:107 +#: score.cc:83 msgid "errors found, /*not processing score*/" msgstr "" +#: score.cc:88 +#, c-format +msgid "time: %.2f seconds" +msgstr "duur: %.2f seconden" + #: scores.cc:35 #, c-format msgid "writing dependency file: `%s'..." @@ -634,76 +695,71 @@ msgstr "" msgid "score contains errors; will not process it" msgstr "" -#: scores.cc:112 +#: scores.cc:109 #, c-format msgid "Search path: %s" msgstr "" -#: script.cc:61 -msgid "script needs stem direction" -msgstr "schrift benodigt stokrichting" +#: script-engraver.cc:49 +#, c-format +msgid "don't know how to interpret articulation `%s'\n" +msgstr "" #. this shouldn't happen, but let's continue anyway. -#: single-malt-grouping-item.cc:40 -msgid "Single_malt_grouping_item: I've been drinking too much (fixme)" +#: single-malt-grouping-item.cc:42 +msgid "Single_malt_grouping_item: I've been drinking too much" msgstr "" -#: slur-engraver.cc:49 +#: slur-engraver.cc:64 msgid "unterminated slur" msgstr "onsterfelijke boog" -#: slur-engraver.cc:65 +#: slur-engraver.cc:80 #, c-format msgid "can't find both ends of %s" msgstr "kan uiteinden van %s niet beide vinden" -#: slur-engraver.cc:65 +#: slur-engraver.cc:80 msgid "slur" msgstr "" -#: slur.cc:41 -msgid "Putting slur over rest." +#: slur.cc:39 +msgid "Putting slur over rest. Ignoring" msgstr "" -#: spanner.cc:44 -msgid "left spanpoint is right spanpoint\n" +#: spacing-spanner.cc:215 +#, c-format +msgid "can't find a ruling note at %s" msgstr "" -#: spanner.cc:105 +#: spacing-spanner.cc:221 #, c-format -msgid "Spanner `%s' with equal left and right spanpoints" +msgid "no minimum in measure at %s" msgstr "" -#: spring-spacer.cc:85 +#: spanner.cc:39 +msgid "left spanpoint is right spanpoint\n" +msgstr "" + +#: spanner.cc:109 #, c-format -msgid "unconnected column: %d" +msgid "Spanner `%s' with equal left and right spanpoints" msgstr "" -#: spring-spacer.cc:189 +#: spring-spacer.cc:134 msgid "I'm too fat; call Oprah" msgstr "" -#: spring-spacer.cc:350 +#: spring-spacer.cc:295 msgid "solution doesn't satisfy constraints" msgstr "" -#: spring-spacer.cc:639 -#, c-format -msgid "can't find a ruling note at %s" -msgstr "" - -#: spring-spacer.cc:645 +#: stem-engraver.cc:80 #, c-format -msgid "no minimum in measure at %s" -msgstr "" - -#: staff-side.cc:61 -msgid "" -"Staff_side::get_position_f(): somebody forgot to set my direction, returning " -"-20" +msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:111 +#: stem.cc:106 msgid "weird stem size; check for narrow beams" msgstr "vreemde stoklengte; controleer op krappe balken" @@ -722,7 +778,11 @@ msgstr "" msgid "can't find ascii character `%d'" msgstr "" -#: tie.cc:50 +#: tie-engraver.cc:155 tie-performer.cc:106 +msgid "No ties were created!" +msgstr "" + +#: tie.cc:55 msgid "lonely tie" msgstr "" @@ -738,19 +798,23 @@ msgstr "" msgid "partial measure too large" msgstr "" +#: time-scaled-music-iterator.cc:25 +msgid "No one to print a tuplet start bracket" +msgstr "" + #: time-signature-engraver.cc:28 msgid "lost in time" msgstr "hoe laat is het" -#: timing-translator.cc:31 +#: timing-translator.cc:26 msgid "conflicting timing request" msgstr "" -#: timing-translator.cc:67 +#: timing-translator.cc:62 msgid "time signature change not allowed here" msgstr "maatwisseling is hier niet geoorloofd" -#: timing-translator.cc:90 +#: timing-translator.cc:83 #, c-format msgid "barcheck failed by: %s" msgstr "misplaatste maatstreep: %s" @@ -760,129 +824,139 @@ msgstr "misplaatste maatstreep: %s" msgid "unknown translator `%s'" msgstr "" -#: translator-group.cc:187 +#: translator-group.cc:82 translator-group.cc:97 +#, c-format +msgid "Already contains a `%s'" +msgstr "" + +#: translator-group.cc:207 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "" -#: translator-group.cc:314 +#: translator-group.cc:341 #, c-format msgid "can't find or create `%s'" msgstr "" -#: translator-group.cc:409 +#: translator-group.cc:437 translator-group.cc:446 #, c-format msgid "can't find `%s'" msgstr "kan niet vinden `%s'" -#: transposed-music.cc:33 -msgid "Will ignore \relative for transposed music" +#: transposed-music.cc:31 +msgid "Will ignore \\relative for transposed music" +msgstr "Zal \\relative negeren voor getransponeerde muziek" + +#: unfolded-repeat-iterator.cc:145 +msgid "No one to print a volta bracket" msgstr "" -#: word-wrap.cc:71 +#: word-wrap.cc:75 msgid "ugh, this measure is too long" msgstr "ugh, deze maat is te lang" -#: word-wrap.cc:72 +#: word-wrap.cc:76 #, c-format msgid "breakpoint: %d" msgstr "" -#: word-wrap.cc:73 +#: word-wrap.cc:77 msgid "generating stupido solution" msgstr "" -#: word-wrap.cc:91 +#: word-wrap.cc:95 msgid "I don't fit; put me on Montignac" msgstr "Ik ben te dik." -#: parser.yy:329 parser.yy:332 +#: parser.yy:55 #, c-format -msgid "incorrect mudela version: %s (%s, %s)" -msgstr "verkeerde mudela versie: %s (%s, %s)" +msgid "Oldest supported input version: %s" +msgstr "" + +#: parser.yy:313 +msgid "Cannot evaluate Scheme in safe mode" +msgstr "" -#: parser.yy:460 +#: parser.yy:433 parser.yy:441 parser.yy:465 msgid "Need a translator group for a context" msgstr "" -#: parser.yy:478 +#: parser.yy:459 msgid "Wrong type for property value" msgstr "" -#: parser.yy:529 +#: parser.yy:515 msgid "More than one music block" msgstr "" -#: parser.yy:1122 parser.yy:1396 -msgid "have to be in Lyric mode for lyrics" -msgstr "" - -#: parser.yy:1344 parser.yy:1364 +#: parser.yy:946 parser.yy:1360 parser.yy:1380 #, c-format msgid "not a duration: %d" msgstr "is geen duur: %d" -#: parser.yy:1366 +#: parser.yy:948 parser.yy:1382 msgid "can't abbreviate" msgstr "" -#: parser.yy:1376 +#: parser.yy:1211 parser.yy:1219 parser.yy:1444 +msgid "have to be in Lyric mode for lyrics" +msgstr "" + +#: parser.yy:1391 msgid "have to be in Note mode for notes" msgstr "" -#: parser.yy:1402 -msgid "have to be in Chord mode for chords" +#: parser.yy:1403 +msgid "can't abbreviate tuplet" msgstr "" -#: parser.yy:1407 -msgid "have to be in Note mode for @chords" +#: parser.yy:1450 +msgid "have to be in Chord mode for chords" msgstr "" -#: lexer.ll:131 +#: lexer.ll:155 msgid "EOF found inside a comment" msgstr "" -#: lexer.ll:175 +#: lexer.ll:199 #, c-format msgid "undefined identifier: `%s'" msgstr "" #. backup rule -#: lexer.ll:180 +#: lexer.ll:204 msgid "missing end quote" msgstr "" #. backup rule -#: lexer.ll:203 lexer.ll:207 +#: lexer.ll:227 lexer.ll:231 msgid "white expected" msgstr "" -#: lexer.ll:365 +#: lexer.ll:401 #, c-format -msgid "illegal character: `%c'" +msgid "invalid character: `%c'" msgstr "" -#: lexer.ll:421 +#: lexer.ll:457 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" +#: lexer.ll:543 +#, c-format +msgid "incorrect mudela version: %s (%s, %s)" +msgstr "verkeerde mudela versie: %s (%s, %s)" + #: out/BLURB.hh:2 msgid "" -"LilyPond is the GNU Project music typesetter. This program can print\n" -"beautiful sheet music from a music definition file. It can also play\n" -"mechanical performances to a MIDI file. Features include multiple\n" -"staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,\n" -"beams, slurs, triplets, named chords, transposing, formatting scores, \n" -"part extraction. It includes a nice font of musical symbols.\n" +"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" +"\n" +"\n" msgstr "" -"LilyPond is de muziekzetter van het GNU Project. Dit programma drukt\n" -"prachtige bladmuziek volgens een muzikaal definitie bestand. Ook kan\n" -"het een mechanische uitvoering afspelen naar een MIDI bestand.\n" -"Bijzondere kunstjes zijn verscheidene notenbalken, maatsoorten, sleutels, \n" -"toonaarden, zangteksten, krachtige invoer taal, cadensa, balken, boogjes, \n" -"triolen, accoordnamen, transponeren, partituren, en uittreksels voor \n" -"individuele partijen. Een fraaie set muziektekens is inbegrepen.\n" #: out/COPERTINA.hh:2 msgid "" @@ -909,56 +983,61 @@ msgid "" "individuele partijen. Een fraaie set muziektekens is inbegrepen.\n" msgstr "" -#: main.cc:43 +#: main.cc:42 #, c-format msgid "Usage: %s [OPTION]... [FILE]" -msgstr "" +msgstr "Gebruik: %s [OPTIE]... [BESTAND]" -#: main.cc:45 +#: main.cc:44 msgid "Translate midi-file to mudela" -msgstr "" +msgstr "Vertaal midi-bestand naar mudela" -#: main.cc:51 +#: main.cc:50 msgid " -b, --no-quantify write exact durations, e.g.: a4*385/384\n" -msgstr "" +msgstr " -b, --no-quantify schrijf exacte duren, bijv.: a4*385/384\n" + +#: main.cc:53 +msgid " -D, --debug enable debugging output\n" +msgstr " -D, --debug toon ontluis berichten\n" -#: main.cc:63 +#: main.cc:62 msgid " -k, --key=ACC[:MINOR] set key: ACC +sharps/-flats; :1 minor\n" -msgstr "" +msgstr " -k, --key=ACC[:MINEUR] zet toonsoort: ACC +kruizen/-mollen; :1 mineur\n" -#: main.cc:66 +#: main.cc:65 msgid "" -" -n, --no-silly assume no plets or double dots, smallest is 32\n" -msgstr "" +" -n, --no-silly assume no tuplets or double dots, smallest is 32\n" +msgstr " -n, --no-silly ga niet uit van tuplets of dubbel gepunteerd, " +" kortste is 32\n" -#: main.cc:69 +#: main.cc:68 msgid " -o, --output=FILE set FILE as default output\n" msgstr " -o, --output=BESTAND zet BESTAND als verval uitvoer\n" -#: main.cc:72 -msgid " -p, --no-plets assume no plets\n" -msgstr "" +#: main.cc:71 +msgid " -p, --no-tuplets assume no tuplets\n" +msgstr " -p, --no-tuplets ga uit van geen tuplets\n" -#: main.cc:75 +#: main.cc:74 msgid " -q, --quiet be quiet\n" -msgstr "" +msgstr " -q, --quiet wees stil\n" -#: main.cc:81 +#: main.cc:80 msgid "" " -s, --smallest=N assume no shorter (reciprocal) durations than N\n" -msgstr "" +msgstr " -s, --smallest=N ga niet uit van kortere (reciproke) duren dan N\n" -#: main.cc:84 +#: main.cc:83 msgid " -v, --verbose be verbose\n" -msgstr "" +msgstr " -v, --verbose wees breedsprakig\n" -#: main.cc:90 +#: main.cc:89 msgid " -x, --no-double-dots assume no double dotted notes\n" -msgstr "" +msgstr " -x, --no-double-dots ga niet uit van dubbel gepunkteerde noten\n" -#: main.cc:105 -msgid "Mi2mu, translate midi to mudela" -msgstr "" +#: main.cc:104 +msgid "Midi2ly, translate midi to mudela" +msgstr "Midi2ly, vertaal midi naar mudela" #: midi-parser.cc:64 msgid "zero length string encountered" @@ -993,77 +1072,75 @@ msgstr "" msgid "Parsing...\n" msgstr "" -#: midi-track-parser.cc:70 +#: midi-track-parser.cc:68 #, c-format msgid "junking note-end event: channel = %d, pitch = %d" msgstr "" -#: midi-track-parser.cc:125 +#: midi-track-parser.cc:124 msgid "invalid running status" msgstr "" -#: midi-track-parser.cc:326 +#: midi-track-parser.cc:328 msgid "unimplemented MIDI meta-event" msgstr "" -#: midi-track-parser.cc:331 +#: midi-track-parser.cc:333 msgid "invalid MIDI event" msgstr "" -#: midi-track-parser.cc:346 +#: midi-track-parser.cc:348 msgid "MIDI track expected" msgstr "" -#: midi-track-parser.cc:351 +#: midi-track-parser.cc:353 msgid "invalid track length" msgstr "" -#: mudela-item.cc:139 +#: mudela-item.cc:160 #, c-format msgid "#32 in quarter: %d" msgstr "" -#: mudela-score.cc:117 +#: mudela-score.cc:108 #, c-format msgid "Lily output to %s..." msgstr "" -#: mudela-score.cc:127 mudela-score.cc:191 +#: mudela-score.cc:119 mudela-score.cc:168 msgid "track " msgstr "" -#: mudela-score.cc:176 +#: mudela-score.cc:155 msgid "Processing..." msgstr "" -#: mudela-score.cc:187 +#: mudela-score.cc:164 msgid "Creating voices..." msgstr "" -#: mudela-score.cc:200 +#: mudela-score.cc:177 msgid "NOT Filtering tempo..." msgstr "" -#: mudela-score.cc:209 +#: mudela-score.cc:186 msgid "NOT Quantifying columns..." msgstr "" -#: mudela-score.cc:213 +#: mudela-score.cc:190 msgid "Quantifying columns..." msgstr "" -#. LOGOUT(NORMAL_ver) << '\n' << "NOT Settling columns..." << endl; -#. return; -#: mudela-score.cc:248 +#: mudela-score.cc:223 msgid "Settling columns..." msgstr "" -#: mudela-staff.cc:107 +#: mudela-staff.cc:111 #, c-format msgid "% midi copyright:" msgstr "" -#: mudela-staff.cc:108 +#: mudela-staff.cc:112 #, c-format msgid "% instrument:" msgstr "" @@ -1089,3 +1166,31 @@ msgstr "" #: version.cc:11 msgid "of" msgstr "van" + +#~ msgid "please fix me" +#~ msgstr "repareer mij alsjeblieft" + +#~ msgid "stem at %s doesn't fit in beam" +#~ msgstr "stok op %s past niet in balk" + +#~ msgid "No stem direction set. Ignoring column in clash." +#~ msgstr "Geen stokrichting gezet. Negeer kolom in botsing." + +#~ msgid "script needs stem direction" +#~ msgstr "schrift benodigt stokrichting" + +#~ msgid "" +#~ "LilyPond is the GNU Project music typesetter. This program can print\n" +#~ "beautiful sheet music from a music definition file. It can also play\n" +#~ "mechanical performances to a MIDI file. Features include multiple\n" +#~ "staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,\n" +#~ "beams, slurs, triplets, named chords, transposing, formatting scores, \n" +#~ "part extraction. It includes a nice font of musical symbols.\n" +#~ msgstr "" +#~ "LilyPond is de muziekzetter van het GNU Project. Dit programma drukt\n" +#~ "prachtige bladmuziek volgens een muzikaal definitie bestand. Ook kan\n" +#~ "het een mechanische uitvoering afspelen naar een MIDI bestand.\n" +#~ "Bijzondere kunstjes zijn verscheidene notenbalken, maatsoorten, sleutels, \n" +#~ "toonaarden, zangteksten, krachtige invoer taal, cadensa, balken, boogjes, \n" +#~ "triolen, accoordnamen, transponeren, partituren, en uittreksels voor \n" +#~ "individuele partijen. Een fraaie set muziektekens is inbegrepen.\n" diff --git a/stepmake/NEWS b/stepmake/NEWS index fca4a87733..a718863184 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,6 @@ +pl 80 + - use mgsmerge iso tupdate + pl 79 - empty sed script fix for aix diff --git a/stepmake/VERSION b/stepmake/VERSION index f4cf86e780..6a4517186c 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=79 +PATCH_LEVEL=80 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/stepmake/podir-targets.make b/stepmake/stepmake/podir-targets.make index bb2785d4d4..c55abf03d2 100644 --- a/stepmake/stepmake/podir-targets.make +++ b/stepmake/stepmake/podir-targets.make @@ -10,15 +10,16 @@ sed-pofile = -e 's/^\#: .*//' sed-makestuff = -e 's/[a-zA-Z_/]*make\[[0-9]*\].*//' sed-edstuff = -e 's/[ \.,adic0-9]*//' -e 's/---//' | sort -u + po-update: $(foreach i,$(CATALOGS), \ rm -f $(po-dir)/$(outdir)/$(i).po; \ - tupdate $(po-dir)/$(outdir)/$(package).po $(po-dir)/$(i).po \ - > $(po-dir)/$(outdir)/$(i).po && ) true - $(foreach i,$(CATALOGS), \ - changes=`$(MAKE) --silent -C $(po-dir) LANGUAGE=$$i po-changes $(ERROR_LOG) | sed $(sed-makestuff)`; \ + msgmerge $(po-dir)/$(i).po $(po-dir)/$(outdir)/$(package).po \ + -o $(po-dir)/$(outdir)/$(i).po && ) true + @$(foreach i,$(CATALOGS), \ + changes=`$(MAKE) --silent -C $(po-dir) LANGUAGE=$i po-changes $(ERROR_LOG) | sed $(sed-makestuff)`; \ if test "$$changes" != "" ; then \ - echo "*** Changes for language $$i; check po/$(outdir)/$$i.po ***"; \ + echo "*** Changes for language $i; check po/$(outdir)/$i.po ***"; \ echo -e "changes: \`$$changes'";\ fi && ) true -- 2.39.2