From 6e5d53a85f4ab98c5ebf94474338619f30ff4e96 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 15 Sep 1999 23:22:50 +0200 Subject: [PATCH] patch::: 1.2.7.jcn1 pl 7.jcn1 - fixes to nl.po --- CHANGES | 3 + VERSION | 2 +- flower/getopt-long.cc | 3 +- lib/mapped-file-storage.cc | 4 +- lily/all-font-metrics.cc | 2 +- lily/collision.cc | 2 +- lily/grace-position-engraver.cc | 2 +- lily/includable-lexer.cc | 4 +- lily/lily-guile.cc | 8 +- lily/lookup.cc | 4 +- lily/main.cc | 5 +- lily/music-output-def.cc | 2 +- lily/request-chord-iterator.cc | 2 +- lily/scores.cc | 2 +- midi2ly/main.cc | 4 +- po/lilypond.po | 118 +++++-------- po/nl.po | 287 ++++++++++++-------------------- 17 files changed, 170 insertions(+), 284 deletions(-) diff --git a/CHANGES b/CHANGES index a7582d04ce..aa0865ae7c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +pl 7.jcn1 + - fixes to nl.po + pl 6.uu1 - website fixes. diff --git a/VERSION b/VERSION index 061bf0a5ce..9c751cbaaa 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=2 PATCH_LEVEL=7 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc index 6945a6a5b9..3b4e3d283d 100644 --- a/flower/getopt-long.cc +++ b/flower/getopt-long.cc @@ -148,7 +148,8 @@ Getopt_long::report (Errorcod c) case E_UNKNOWNOPTION: str += _f ("unrecognized option: `%s\'", String (argument_index_i_ - ? String ("-" + _f("%c",arg_value_ch_a_a_[array_index_i_][argument_index_i_])) + ? String ("-" + String_convert::form_str ("%c", + arg_value_ch_a_a_[array_index_i_][argument_index_i_])) : String (arg_value_ch_a_a_[array_index_i_]))); break; case E_ILLEGALARG: diff --git a/lib/mapped-file-storage.cc b/lib/mapped-file-storage.cc index eab56c6d15..609bd4f458 100644 --- a/lib/mapped-file-storage.cc +++ b/lib/mapped-file-storage.cc @@ -62,7 +62,7 @@ Mapped_file_storage::map () r = map_fd (fildes_i_, (vm_offset_t) 0, &address, TRUE, size_off_); if (r != KERN_SUCCESS) - warning (String (_ ("map_fd: ")) + mach_error_string (r)); + warning (String ("map_fd: ") + mach_error_string (r)); else data_caddr_ = (char *) address; } @@ -106,7 +106,7 @@ Mapped_file_storage::unmap () r = vm_deallocate (task_self (), (vm_address_t) data_caddr_, size_off_); if (r != KERN_SUCCESS) - warning (String (_ ("vm_deallocate: ")) + mach_error_string (r)); + warning (String ("vm_deallocate: ") + mach_error_string (r)); #else munmap (data_caddr_, size_off_); #endif diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index d372242011..339e74c8d3 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -72,6 +72,6 @@ All_font_metrics::find_font (String name) if (f) return f; String s = _f("Can't find default font `%s\', giving up.", default_font_sz_); - s += String ("\n") + _f ("search path = %s", search_path_.str ()); + s += String ("\n") + _f ("(search path: `%s)'", search_path_.str ()); error (s); } diff --git a/lily/collision.cc b/lily/collision.cc index 6da2f27f8d..c5424710cd 100644 --- a/lily/collision.cc +++ b/lily/collision.cc @@ -92,7 +92,7 @@ Collision::automatic_shift () { if (shift[i-1] == shift[i]) { - warning (_ ("Too many clashing notecolumns. Ignoring them.")); + warning (_ ("Too many clashing notecolumns. Ignoring them.")); return tups; } } diff --git a/lily/grace-position-engraver.cc b/lily/grace-position-engraver.cc index 924d57a396..843801274a 100644 --- a/lily/grace-position-engraver.cc +++ b/lily/grace-position-engraver.cc @@ -86,7 +86,7 @@ Grace_position_engraver::do_pre_move_processing () if (elt) return; - warning (_("Unattached grace notes. Attaching to last musical column.")); + warning (_("Unattached grace notes. Attaching to last musical column.")); Axis_group_element * ae = dynamic_cast (elt); if (ae) ae->remove_element (align_l_); diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index 524519623c..c913570387 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -45,7 +45,9 @@ Includable_lexer::new_input (String s, Sources * global_sources) if (!sl) { String msg = _f ("can't find file: `%s\'", s); - msg += _f ("\nSearch path is `%s'\n", global_sources->path_C_->str ().ch_C()); + msg += "\n"; + msg += _f ("(search path: `%s')", global_sources->path_C_->str ().ch_C()); + msg += "\n"; LexerError (msg.ch_C ()); return; diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 96e140707b..b28b18f695 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -79,9 +79,9 @@ read_lily_scm_file (String fn) String s = global_path.find (fn); if (s == "") { - String e = _f ("Can not find file `%s\'", fn); + String e = _f ("can't find file: `%s\'", fn); e += " "; - e += _f ("(Load path is `%s\'", global_path.str ()); + e += _f ("(load path: `%s\')", global_path.str ()); error (e); } else @@ -102,9 +102,9 @@ ly_gulp_file (SCM name) String s = global_path.find (fn); if (s == "") { - String e = _f ("Can not find file `%s\'", fn); + String e = _f ("can't find file: `%s\'", fn); e += " "; - e += _f ("(Load path is `%s\'", global_path.str ()); + e += _f ("(load path: `%s\')", global_path.str ()); error (e); } else diff --git a/lily/lookup.cc b/lily/lookup.cc index e2b81bfa6c..41c2fa6da3 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -100,8 +100,8 @@ Lookup::afm_find (String s, bool warn) const me->afm_l_ = all_fonts_global_p->find_afm (font_name_); if (!me->afm_l_) { - warning (_f("Can't open `%s'\n", font_name_)); - warning (_f("Search path %s\n", global_path.str ().ch_C())); + warning (_f("can't find font: `%s'", font_name_)); + warning (_f("(search path: `%s')", global_path.str ().ch_C())); error (_f("Aborting")); } } diff --git a/lily/main.cc b/lily/main.cc index 6cd822b265..149783ac29 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -109,6 +109,7 @@ usage () #ifdef STRING_UTILS_INLINED "STRING_UTILS_INLINED " #endif + "\n" "datadir =" DIR_DATADIR "\n" "localedir =" DIR_LOCALEDIR @@ -132,8 +133,8 @@ version () identify (); cout << '\n'; cout << _f ("" - "This is free software. It is covered by the GNU General Public License," - "and you are welcome to change it and/or distribute copies of it under" + "This is free software. It is covered by the GNU General Public License,\n" + "and you are welcome to change it and/or distribute copies of it under\n" "certain conditions. Invoke as `%s --warranty' for more information.\n", "lilypond"); cout << endl; diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index 62de2935b4..ca1a8ed8f4 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -80,7 +80,7 @@ Music_output_def::get_global_translator_p () { Translator * t = find_translator_l ("Score"); if (!t) - error (_("Can't find Score context")); + error (_ ("can't find Score context")); t = t->clone (); Global_translator *g = dynamic_cast (t); t->add_processing (); diff --git a/lily/request-chord-iterator.cc b/lily/request-chord-iterator.cc index 462cead1b4..0fa4be380d 100644 --- a/lily/request-chord-iterator.cc +++ b/lily/request-chord-iterator.cc @@ -73,7 +73,7 @@ Request_chord_iterator::do_process_and_next (Moment mom) req_l->warning (_f ("junking request: `%s\'", classname( req_l))); } else - i->car_->warning (_f ("Huh? Not a Request: `%s\'", + i->car_->warning (_f ("Huh? Not a Request: `%s\'", classname (i->car_))); } first_b_ = false; diff --git a/lily/scores.cc b/lily/scores.cc index 23f85ce5bc..d53643a9ac 100644 --- a/lily/scores.cc +++ b/lily/scores.cc @@ -106,7 +106,7 @@ do_one_file (String init_str, String file_str) if (init_str.length_i () && global_path.find (init_str).empty_b ()) { warning (_f ("can't find file: `%s\'", init_str)); - warning (_f ("Search path: %s", global_path.str ().ch_C())); + warning (_f ("(search path: `%s')", global_path.str ().ch_C())); return; } if ((file_str != "-") && global_path.find (file_str).empty_b ()) diff --git a/midi2ly/main.cc b/midi2ly/main.cc index ae4e257938..016921ed1b 100644 --- a/midi2ly/main.cc +++ b/midi2ly/main.cc @@ -50,8 +50,8 @@ version () identify (); cout << '\n'; cout << _f ("" - "This is free software. It is covered by the GNU General Public License," - "and you are welcome to change it and/or distribute copies of it under" + "This is free software. It is covered by the GNU General Public License,\n" + "and you are welcome to change it and/or distribute copies of it under\n" "certain conditions. Invoke as `%s --warranty' for more information.\n", "midi2ly"); cout << endl; diff --git a/po/lilypond.po b/po/lilypond.po index 66cadce854..f48bb143cd 100644 --- a/po/lilypond.po +++ b/po/lilypond.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-08-20 18:48+0200\n" +"POT-Creation-Date: 1999-09-15 23:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,12 +45,7 @@ msgstr "" msgid "unrecognized option: `%s'" msgstr "" -#: getopt-long.cc:151 -#, c-format -msgid "%c" -msgstr "" - -#: getopt-long.cc:155 +#: getopt-long.cc:156 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "" @@ -77,18 +72,10 @@ msgstr "" msgid "position unknown" msgstr "" -#: mapped-file-storage.cc:65 -msgid "map_fd: " -msgstr "" - #: mapped-file-storage.cc:74 msgid "can't map file" msgstr "" -#: mapped-file-storage.cc:109 -msgid "vm_deallocate: " -msgstr "" - #: simple-file-storage.cc:56 #, c-format msgid "Huh? got %d, expected %d characters" @@ -124,7 +111,7 @@ msgstr "" #: all-font-metrics.cc:75 #, c-format -msgid "search path = %s" +msgid "(search path: `%s)'" msgstr "" #: beam-engraver.cc:42 @@ -155,11 +142,11 @@ msgstr "" msgid "beam was started here" msgstr "" -#: beam.cc:142 +#: beam.cc:147 msgid "beam with less than two stems" msgstr "" -#: beam.cc:307 +#: beam.cc:312 msgid "weird beam shift, check your knees" msgstr "" @@ -228,7 +215,7 @@ msgid "unknown clef type " msgstr "" #: collision.cc:95 -msgid "Too many clashing notecolumns. Ignoring them." +msgid "Too many clashing notecolumns. Ignoring them." msgstr "" #: crescendo.cc:42 @@ -289,7 +276,7 @@ msgid "No Grace context available!" msgstr "" #: grace-position-engraver.cc:89 -msgid "Unattached grace notes. Attaching to last musical column." +msgid "Unattached grace notes. Attaching to last musical column." msgstr "" #: hyphen-engraver.cc:60 @@ -305,16 +292,15 @@ msgstr "" msgid "%s expected" msgstr "" -#: includable-lexer.cc:47 midi-score-parser.cc:24 scores.cc:108 scores.cc:114 +#: includable-lexer.cc:47 lily-guile.cc:82 lily-guile.cc:105 +#: midi-score-parser.cc:24 scores.cc:108 scores.cc:114 #, c-format msgid "can't find file: `%s'" msgstr "" -#: includable-lexer.cc:48 +#: includable-lexer.cc:49 lookup.cc:104 scores.cc:109 #, c-format -msgid "" -"\n" -"Search path is `%s'\n" +msgid "(search path: `%s')" msgstr "" #: ineq-constrained-qp.cc:169 @@ -340,12 +326,7 @@ msgstr "" #: lily-guile.cc:84 lily-guile.cc:107 #, c-format -msgid "Can not find file `%s'" -msgstr "" - -#: lily-guile.cc:86 lily-guile.cc:109 -#, c-format -msgid "(Load path is `%s'" +msgid "(load path: `%s')" msgstr "" #: local-key-engraver.cc:42 @@ -358,12 +339,7 @@ msgstr "" #: lookup.cc:103 #, c-format -msgid "Can't open `%s'\n" -msgstr "" - -#: lookup.cc:104 -#, c-format -msgid "Search path %s\n" +msgid "can't find font: `%s'" msgstr "" #: lookup.cc:105 @@ -468,29 +444,29 @@ msgstr "" msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:118 main.cc:119 +#: main.cc:119 msgid "Report bugs to" msgstr "" -#: main.cc:52 main.cc:134 +#: main.cc:52 main.cc:135 #, c-format msgid "" -"This is free software. It is covered by the GNU General Public License,and " -"you are welcome to change it and/or distribute copies of it undercertain " -"conditions. Invoke as `%s --warranty' for more information.\n" +"This is free software. It is covered by the GNU General Public License,\n" +"and you are welcome to change it and/or distribute copies of it under\n" +"certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:59 main.cc:141 main.cc:153 +#: main.cc:59 main.cc:142 main.cc:154 #, c-format msgid "Copyright (c) %s by" msgstr "" #. GNU GNU? -#: main.cc:151 +#: main.cc:152 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "" -#: main.cc:68 main.cc:159 +#: main.cc:68 main.cc:160 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" @@ -534,7 +510,7 @@ msgid "Interpretation context with empty type" msgstr "" #: music-output-def.cc:83 -msgid "Can't find Score context" +msgid "can't find Score context" msgstr "" #: musical-request.cc:42 @@ -647,7 +623,7 @@ msgstr "" #: request-chord-iterator.cc:76 #, c-format -msgid "Huh? Not a Request: `%s'" +msgid "Huh? Not a Request: `%s'" msgstr "" #: rest-collision.cc:64 @@ -694,18 +670,13 @@ msgstr "" msgid "score contains errors; will not process it" msgstr "" -#: scores.cc:109 -#, c-format -msgid "Search path: %s" -msgstr "" - #: 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 +#: single-malt-grouping-item.cc:43 msgid "Single_malt_grouping_item: I've been drinking too much" msgstr "" @@ -722,25 +693,25 @@ msgstr "" msgid "slur" msgstr "" -#: slur.cc:39 +#: slur.cc:38 msgid "Putting slur over rest. Ignoring" msgstr "" -#: spacing-spanner.cc:215 +#: spacing-spanner.cc:218 #, c-format msgid "can't find a ruling note at %s" msgstr "" -#: spacing-spanner.cc:221 +#: spacing-spanner.cc:224 #, c-format msgid "no minimum in measure at %s" msgstr "" -#: spanner.cc:39 +#: spanner.cc:41 msgid "left spanpoint is right spanpoint\n" msgstr "" -#: spanner.cc:109 +#: spanner.cc:111 #, c-format msgid "Spanner `%s' with equal left and right spanpoints" msgstr "" @@ -753,6 +724,15 @@ msgstr "" msgid "solution doesn't satisfy constraints" msgstr "" +#: spring-spacer.cc:378 +#, c-format +msgid "Improbable distance: %f point, setting to 10 mm" +msgstr "" + +#: spring-spacer.cc:383 +msgid "Negative distance. Setting to 10 mm" +msgstr "" + #: stem-engraver.cc:80 #, c-format msgid "Adding note head to incompatible stem (type = %d)" @@ -953,28 +933,6 @@ msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" -"\n" -msgstr "" - -#: out/COPERTINA.hh:2 -msgid "" -"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 delle parte. Nella\n" -"distribuzione è compreso anche un fort di simboli musicali.\n" -"\n" -msgstr "" - -#: out/FLAPTEKST.hh:2 -msgid "" -"LilyPond is een muziekzetter. Zij maakt prachtige bladmuziek\n" -"uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" -"maakt deel uit van het GNU Project.\n" msgstr "" #: main.cc:90 diff --git a/po/nl.po b/po/nl.po index 1f5dfdd10c..cc9af4ee7c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1999-08-20 18:48+0200\n" +"POT-Creation-Date: 1999-09-15 23:21+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-26 11:26:28+0200\n" "From: \n" @@ -43,12 +43,7 @@ msgstr "optie `%s' staat geen argument toe" msgid "unrecognized option: `%s'" msgstr "onbekende optie: `%s'" -#: getopt-long.cc:151 -#, c-format -msgid "%c" -msgstr "" - -#: getopt-long.cc:155 +#: getopt-long.cc:156 #, c-format msgid "invalid argument `%s' to option `%s'" msgstr "onjuist argument: `%s' voor optie `%s'" @@ -75,18 +70,10 @@ msgstr "Niet noodlottige fout: " msgid "position unknown" msgstr "positie onbekend" -#: mapped-file-storage.cc:65 -msgid "map_fd: " -msgstr "" - #: mapped-file-storage.cc:74 msgid "can't map file" msgstr "kan bestand niet inkaarten" -#: mapped-file-storage.cc:109 -msgid "vm_deallocate: " -msgstr "" - #: simple-file-storage.cc:56 #, c-format msgid "Huh? got %d, expected %d characters" @@ -122,16 +109,16 @@ msgstr "Kan verval font `%s' niet vinden, ik geef op." #: all-font-metrics.cc:75 #, c-format -msgid "search path = %s" -msgstr "zoek pad = %s" +msgid "(search path: `%s)'" +msgstr "(zoekpad: `%s')" #: beam-engraver.cc:42 msgid "No Beam to end" -msgstr "Geen Balk te beëidigen" +msgstr "geen Balk te beëidigen" #: beam-engraver.cc:58 msgid "No beam to end" -msgstr "Geen balk te beëindigen" +msgstr "geen balk te beëindigen" #: beam-engraver.cc:87 msgid "Already have a Beam" @@ -153,13 +140,13 @@ msgstr "stok past niet in balk" msgid "beam was started here" msgstr "balk is hier gestart" -#: beam.cc:142 +#: beam.cc:147 msgid "beam with less than two stems" msgstr "balk met minder dan twee stokken" -#: beam.cc:307 +#: beam.cc:312 msgid "weird beam shift, check your knees" -msgstr "vreemde balk verplaatsing, controleer uw knie-en" +msgstr "vreemde balk verplaatsing, controleer balken" #: break-algorithm.cc:25 msgid "0 lines" @@ -201,33 +188,33 @@ msgstr "kan `%s' niet in `%s' veranderen" #: chord-tremolo-engraver.cc:41 chord-tremolo-engraver.cc:58 msgid "No abbreviation beam to end" -msgstr "" +msgstr "Geen tremolo balk te beëindigen" #: chord-tremolo-engraver.cc:83 msgid "Already have an abbreviation beam" -msgstr "" +msgstr "Heb al een tremolo balk" #: chord-tremolo-engraver.cc:124 msgid "Unfinished abbreviation beam" -msgstr "" +msgstr "Onbeëindigde tremolo balk" #: chord.cc:231 #, c-format msgid "invalid subtraction: not part of chord: %s" -msgstr "" +msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" #: chord.cc:245 #, c-format msgid "invalid inversion pitch: not part of chord: %s" -msgstr "" +msgstr "ongeldige inversie toon: maakt geen deel uit van accoord: %s" #: clef-engraver.cc:178 msgid "unknown clef type " -msgstr "onbekende sleutel" +msgstr "onbekend type sleutel " #: collision.cc:95 -msgid "Too many clashing notecolumns. Ignoring them." -msgstr "Te veel botsende nootkolommen. Ik negeer ze." +msgid "Too many clashing notecolumns. Ignoring them." +msgstr "Te veel botsende nootkolommen. Negeer ze." #: crescendo.cc:42 msgid "crescendo" @@ -243,7 +230,7 @@ msgstr "Drijvende komma uitzondering" #: debug.cc:139 msgid "can't set mem-checking" -msgstr "" +msgstr "kan geheugen controle niet zetten" #: dimensions.cc:13 msgid "NaN" @@ -251,15 +238,15 @@ msgstr "NaN" #: dynamic-engraver.cc:109 msgid "Got a dynamic already. Continuing dazed and confused" -msgstr "" +msgstr "Heb al een dynamiek. Ga verder, verstrooid en verward" #: dynamic-engraver.cc:162 msgid "can't find (de)crescendo to end" -msgstr "" +msgstr "kan te beëindigen (de)crescendo niet vinden" #: dynamic-engraver.cc:216 msgid "Too many crescendi here" -msgstr "" +msgstr "Te veel cescendi hier" #: dynamic-engraver.cc:254 msgid "unended crescendo" @@ -267,28 +254,30 @@ msgstr "niet beeindigd crescendo" #: encompass-info.cc:32 msgid "Slur over rest?" -msgstr "" +msgstr "Boogje over rust?" #: encompass-info.cc:67 stem-info.cc:140 msgid "" "minVerticalAlign != maxVerticalAlign: interstaff beams/slurs may be broken" msgstr "" +"minVerticalAlign != maxVerticalAlign: balken/boogjes tussen notenbalken " +"kunnen breken" #: extender-engraver.cc:62 msgid "unterminated extender" -msgstr "" +msgstr "onbeëindigde extender" #: folded-repeat-iterator.cc:64 msgid "No one to print a repeat brace" -msgstr "" +msgstr "Niemand om een herhalings haak af te drukken" #: grace-iterator.cc:43 msgid "No Grace context available!" -msgstr "" +msgstr "Geen Grace context voor handen" #: grace-position-engraver.cc:89 -msgid "Unattached grace notes. Attaching to last musical column." -msgstr "" +msgid "Unattached grace notes. Attaching to last musical column." +msgstr "Losse grace noten. Maak ze vast aan vorige muziekale kolom." #: hyphen-engraver.cc:60 msgid "unterminated hyphen" @@ -296,24 +285,22 @@ msgstr "onafgesloten balk" #: identifier.cc:46 msgid "Wrong identifier type: " -msgstr "" +msgstr "Verkeerd type identifier: " #: identifier.cc:47 #, c-format msgid "%s expected" msgstr "%s verwacht" -#: includable-lexer.cc:47 midi-score-parser.cc:24 scores.cc:108 scores.cc:114 +#: includable-lexer.cc:47 lily-guile.cc:82 lily-guile.cc:105 +#: 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 "" +#: includable-lexer.cc:49 lookup.cc:104 scores.cc:109 +msgid "(search path: `%s')" +msgstr "(zoekpad: `%s')" #: ineq-constrained-qp.cc:169 #, c-format @@ -322,29 +309,24 @@ msgstr "Ineq_constrained_qp::solve (): voorwaarde zit er %f naast" #: ineq-constrained-qp.cc:233 msgid "didn't converge!" -msgstr "ik convergederde niet!" +msgstr "convergeerde niet!" #: ineq-constrained-qp.cc:235 msgid "Too much degeneracy. " -msgstr "" +msgstr "Te veel degenaratie. " #: key-def.cc:31 msgid "No key name: assuming `C'" -msgstr "" +msgstr "Geen toonsoort: ga uit van `C'" #: key-def.cc:92 msgid "don't know how handle empty keys" -msgstr "" +msgstr "weet niet hoe lege toonsoorten te behandelen" #: lily-guile.cc:84 lily-guile.cc:107 #, c-format -msgid "Can not find file `%s'" -msgstr "" - -#: lily-guile.cc:86 lily-guile.cc:109 -#, c-format -msgid "(Load path is `%s'" -msgstr "" +msgid "(load path: `%s')" +msgstr "(zoekpad: `%s')" #: local-key-engraver.cc:42 msgid "out of tune" @@ -355,23 +337,17 @@ msgid "can't find" msgstr "kan niet vinden" #: lookup.cc:103 -#, c-format -msgid "Can't open `%s'\n" -msgstr "" - -#: lookup.cc:104 -#, c-format -msgid "Search path %s\n" -msgstr "" +msgid "can't find font: `%s'" +msgstr "kan font niet vinden: `%s'\n" #: lookup.cc:105 msgid "Aborting" -msgstr "" +msgstr "Breek af" #: lookup.cc:436 #, c-format msgid "Non-matching braces in text `%s', adding braces." -msgstr "" +msgstr "Ongepaarde haakjes in tekst `%s', voeg haakje toe." #: main.cc:68 msgid "BASENAME" @@ -391,7 +367,7 @@ msgstr "deze hulp" #: main.cc:71 msgid "switch on experimental features" -msgstr "doe experimentele kunstjes" +msgstr "zet experimentele kunstjes aan" #: main.cc:72 main.cc:91 msgid "enable debugging output" @@ -466,29 +442,33 @@ msgstr "Opties:" msgid "This binary was compiled with the following options:" msgstr "Dit programma is vertaald met de volgende instellingen:" -#: main.cc:118 main.cc:119 +#: main.cc:119 msgid "Report bugs to" msgstr "Rapporteer bugs naar" -#: main.cc:52 main.cc:134 +#: main.cc:52 main.cc:135 #, c-format msgid "" -"This is free software. It is covered by the GNU General Public License,and " -"you are welcome to change it and/or distribute copies of it undercertain " -"conditions. Invoke as `%s --warranty' for more information.\n" +"This is free software. It is covered by the GNU General Public License,\n" +"and you are welcome to change it and/or distribute copies of it under\n" +"certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" +"Dit is vrije programmatuur. Het valt onder de GNU Algemene Openbare\n" +"Licentie, en u wordt uitgenodigd het te veranderen en/of te verspreiden\n" +"onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n" +"informatie.\n" -#: main.cc:59 main.cc:141 main.cc:153 +#: main.cc:59 main.cc:142 main.cc:154 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " #. GNU GNU? -#: main.cc:151 +#: main.cc:152 msgid "GNU LilyPond -- The GNU Project music typesetter" msgstr "GNU LilyPond -- De Muziekzetter van het GNU Project" -#: main.cc:68 main.cc:159 +#: main.cc:68 main.cc:160 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" @@ -504,7 +484,7 @@ msgid "" "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n" "USA.\n" msgstr "" -" Dit programma is vrij bedenksel; u mag het verspreiden en/of\n" +" Dit programma is vrije programmatuur; u kunt het verspreiden en/of\n" "veranderen onder de voorwaarden van de GNU Algemene Openbare Licentie\n" "versie 2, zoals gepubliceerd door de Free Software Foundation.\n" "\n" @@ -513,15 +493,15 @@ msgstr "" "het UITBATEN of als zijnde GESCHIKT VOOR EEN BEPAALD DOEL. Zie de GNU\n" "Algemene Openbare Licentie voor details.\n" "\n" -" Als het goed is, heeft u bij dit programma een copie (zie het bestand\n" -"COPYING) ontvangen van de GNU Algemene Openbare Licentie; zoniet, schrijf\n" -"dan naar de Free Software Foundation, Inc., 675 Mass Ave, Cambridge, \n" -"MA 02139, USA.\n" +" Als het goed is, heeft u bij dit programma een exemplaar (zie het\n" +"bestand COPYING) ontvangen van de GNU Algemene Openbare Licentie;\n" +"zoniet, schrijf dan naar de Free Software Foundation, Inc.,\n" +"675 Mass Ave, Cambridge, MA 02139, USA.\n" #: midi-item.cc:303 #, c-format msgid "No such instrument: `%s'" -msgstr "" +msgstr "Geen zulks instrument: `%s'" #: midi-item.cc:357 #, c-format @@ -538,15 +518,15 @@ msgstr "rare toonhoogte" #: midi-stream.cc:29 paper-stream.cc:36 msgid "error syncing file (disk full?)" -msgstr "kan file niet wegschrijven (disk vol?)" +msgstr "fout by synchroniseren van bestand (disk vol?)" #: music-output-def.cc:56 msgid "Interpretation context with empty type" -msgstr "" +msgstr "Vertaal context met leeg type" #: music-output-def.cc:83 -msgid "Can't find Score context" -msgstr "" +msgid "can't find Score context" +msgstr "kan Score context niet vinden" #: musical-request.cc:42 #, c-format @@ -561,12 +541,12 @@ msgstr "`\\%s' wordt opnieuw gedeclareerd" #: my-lily-lexer.cc:143 #, c-format msgid "Identifier name is a keyword (`%s')" -msgstr "" +msgstr "Identifier naam is een sleutelwoord (`%s')" #: my-lily-lexer.cc:172 #, c-format msgid "error at EOF: %s" -msgstr "fout aan het einde van file: %s" +msgstr "fout bij EOF: %s" #: my-lily-parser.cc:60 msgid "Parsing..." @@ -574,26 +554,26 @@ msgstr "Ontleden..." #: my-lily-parser.cc:69 msgid "braces don't match" -msgstr "haakjes passen niet" +msgstr "haakjes paren niet" #: paper-def.cc:95 #, c-format msgid "unknown paper variable: `%s'" -msgstr "onbekende \\paper variabele" +msgstr "onbekende papier varanderlijke: `%s'" #: paper-def.cc:99 msgid "not a real variable" -msgstr "variabele is geen reeal getal" +msgstr "niet een reële veranderlijke" #. for now; breaks -fscm output #: paper-def.cc:251 msgid "outputting Score, defined at: " -msgstr "" +msgstr "uitvoer Score, gedefinieerd op: " #: paper-def.cc:280 #, c-format msgid "Paper output to %s..." -msgstr "" +msgstr "Papier uitvoer naar %s..." #: mudela-stream.cc:85 paper-outputter.cc:76 performance.cc:97 msgid ", at " @@ -602,7 +582,7 @@ msgstr ", bij " #: paper-outputter.cc:130 #, c-format msgid "Improbable offset for object type `%s'" -msgstr "" +msgstr "Onwaarschijnlijke verschuiving voor object type `%s'" #: paper-score.cc:131 msgid "Can't solve this casting problem exactly; revert to Word_wrap" @@ -618,15 +598,15 @@ msgstr "Berekenen van kolomposities..." #: paper-score.cc:179 msgid " elements. " -msgstr "" +msgstr " elementen. " #: paper-score.cc:182 msgid "Line ... " -msgstr "" +msgstr "Regel ..." #: performance.cc:50 msgid "Track ... " -msgstr "" +msgstr "Spoor ... " #. perhaps multiple text events? #: performance.cc:77 @@ -658,16 +638,16 @@ msgstr "schroot verzoek: `%s'" #: request-chord-iterator.cc:76 #, c-format -msgid "Huh? Not a Request: `%s'" -msgstr "" +msgid "Huh? Not a Request: `%s'" +msgstr "Huh? Geen Request: `%s'" #: rest-collision.cc:64 msgid "Too many colliding rests." -msgstr "" +msgstr "Te veer botsende rusten." #: rest-collision.cc:68 msgid "Too many notes for rest collision." -msgstr "" +msgstr "Te veel noten voor bosting met rusten." #: score-engraver.cc:149 #, c-format @@ -676,7 +656,7 @@ msgstr "Vrijgezelle spanner `%s'" #: score.cc:56 msgid "no toplevel translator" -msgstr "" +msgstr "geen hoogste niveau vertaler" #: score.cc:59 msgid "Interpreting music..." @@ -689,7 +669,7 @@ msgstr "zonder muziek geen partituur" #. should we? hampers debugging. #: score.cc:83 msgid "errors found, /*not processing score*/" -msgstr "" +msgstr "fouten gevonden, /*verwerk partituur niet */" #: score.cc:88 #, c-format @@ -699,16 +679,11 @@ msgstr "duur: %.2f seconden" #: scores.cc:35 #, c-format msgid "writing dependency file: `%s'..." -msgstr "" +msgstr "schijven van afhankelijkheden bestand: `%s'..." #: scores.cc:79 msgid "score contains errors; will not process it" -msgstr "" - -#: scores.cc:109 -#, c-format -msgid "Search path: %s" -msgstr "" +msgstr "partituur bevat fouten; zal hem niet verwerken" #: script-engraver.cc:49 #, c-format @@ -716,13 +691,13 @@ 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 +#: single-malt-grouping-item.cc:43 msgid "Single_malt_grouping_item: I've been drinking too much" msgstr "" #: slur-engraver.cc:64 msgid "unterminated slur" -msgstr "onsterfelijke boog" +msgstr "onbeëindigde boog" #: slur-engraver.cc:80 #, c-format @@ -731,27 +706,27 @@ msgstr "kan uiteinden van %s niet beide vinden" #: slur-engraver.cc:80 msgid "slur" -msgstr "" +msgstr "boog" -#: slur.cc:39 +#: slur.cc:38 msgid "Putting slur over rest. Ignoring" msgstr "" -#: spacing-spanner.cc:215 +#: spacing-spanner.cc:218 #, c-format msgid "can't find a ruling note at %s" msgstr "" -#: spacing-spanner.cc:221 +#: spacing-spanner.cc:224 #, c-format msgid "no minimum in measure at %s" msgstr "" -#: spanner.cc:39 +#: spanner.cc:41 msgid "left spanpoint is right spanpoint\n" msgstr "" -#: spanner.cc:109 +#: spanner.cc:111 #, c-format msgid "Spanner `%s' with equal left and right spanpoints" msgstr "" @@ -764,6 +739,15 @@ msgstr "" msgid "solution doesn't satisfy constraints" msgstr "" +#: spring-spacer.cc:378 +#, c-format +msgid "Improbable distance: %f point, setting to 10 mm" +msgstr "" + +#: spring-spacer.cc:383 +msgid "Negative distance. Setting to 10 mm" +msgstr "" + #: stem-engraver.cc:80 #, c-format msgid "Adding note head to incompatible stem (type = %d)" @@ -964,33 +948,10 @@ msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" -"\n" msgstr "" "LilyPond is een muziekzetter. Zij maakt prachtige bladmuziek\n" "uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" "maakt deel uit van het GNU Project.\n" -"\n" - -#: out/COPERTINA.hh:2 -msgid "" -"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 delle parte. Nella\n" -"distribuzione è compreso anche un fort di simboli musicali.\n" -"\n" -msgstr "" - -#: out/FLAPTEKST.hh:2 -msgid "" -"LilyPond is een muziekzetter. Zij maakt prachtige bladmuziek\n" -"uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" -"maakt deel uit van het GNU Project.\n" -msgstr "" #: main.cc:90 msgid "write exact durations, e.g.: a4*385/384" @@ -1168,43 +1129,3 @@ msgstr "" #, c-format msgid "% from input file: " msgstr "" - -#~ msgid "this help " -#~ msgstr "deze hulp" - -#~ msgid "GNU LilyPond is Free Software, see --warranty" -#~ msgstr "GNU LilyPond is Vrij bedenksel, zie --warranty" - -#~ msgid "Midi2ly, translate midi to mudela" -#~ msgstr "Midi2ly, vertaal midi naar mudela" - -#~ msgid "of" -#~ msgstr "van" - -#~ msgid "please fix me" -#~ msgstr "repareer mij alsjeblieft" - -#~ 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" -- 2.39.2