X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=po%2Flilypond.pot;h=d10065e32df2bebc3c2d27922e1f8b63af2c7d09;hb=a447227710cb9b6c9fe61342a90e8cc85c022136;hp=68ea17ecc6b847f7772dfe4c5abfb84efa761a16;hpb=164c1ba09dba587ab21250c12aa870661774959b;p=lilypond.git diff --git a/po/lilypond.pot b/po/lilypond.pot index 68ea17ecc6..d10065e32d 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -1,15 +1,15 @@ # Translation of LilyPond -# Copyright (C) 1998--2014 Han-Wen Nienhuys, Jan Nieuwenhuizen. +# Copyright (C) 1998--2015 Han-Wen Nienhuys, Jan Nieuwenhuizen. # This file is distributed under the same license as the LilyPond package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lilypond 2.19.7\n" +"Project-Id-Version: lilypond 2.19.43\n" "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu." "lilypond.bugs\n" -"POT-Creation-Date: 2014-05-25 15:41+0100\n" +"POT-Creation-Date: 2016-06-08 13:09+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,11 +36,11 @@ msgstr "" msgid "Running `%s' on file `%s' to detect default page settings.\n" msgstr "" -#: book_latex.py:219 book_texinfo.py:228 +#: book_latex.py:219 book_texinfo.py:230 msgid "Unable to auto-detect default settings:\n" msgstr "" -#: book_latex.py:231 book_texinfo.py:240 +#: book_latex.py:231 book_texinfo.py:242 #, python-format msgid "" "Unable to auto-detect default settings:\n" @@ -81,38 +81,38 @@ msgstr "" msgid "Missing files: %s" msgstr "" -#: book_snippets.py:651 +#: book_snippets.py:661 #, python-format msgid "Could not overwrite file %s" msgstr "" -#: book_snippets.py:738 +#: book_snippets.py:748 #, python-format msgid "Running through filter `%s'" msgstr "" -#: book_snippets.py:759 +#: book_snippets.py:769 #, python-format msgid "`%s' failed (%d)" msgstr "" -#: book_snippets.py:760 +#: book_snippets.py:770 msgid "The error log is as follows:" msgstr "" -#: book_snippets.py:880 +#: book_snippets.py:890 #, python-format msgid "Converting MusicXML file `%s'...\n" msgstr "" -#: book_snippets.py:907 +#: book_snippets.py:917 #, python-format msgid "" "%s: duplicate filename but different contents of original file,\n" "printing diff against existing file." msgstr "" -#: book_snippets.py:920 +#: book_snippets.py:930 #, python-format msgid "" "%s: duplicate filename but different contents of converted lilypond file,\n" @@ -122,7 +122,7 @@ msgstr "" #. Work around a texi2pdf bug: if LANG=C is not given, a broken regexp is #. used to detect relative/absolute paths, so the absolute path is not #. detected as such and this command fails: -#: book_texinfo.py:206 +#: book_texinfo.py:208 #, python-format msgid "Running texi2pdf on file %s to detect default page settings.\n" msgstr "" @@ -161,7 +161,7 @@ msgstr "" #: convertrules.py:82 convertrules.py:1856 convertrules.py:2032 #: convertrules.py:2175 convertrules.py:2506 convertrules.py:2801 -#: convertrules.py:3151 convertrules.py:3385 convertrules.py:3697 +#: convertrules.py:3151 convertrules.py:3388 convertrules.py:3700 msgid "bump version for release" msgstr "" @@ -545,7 +545,7 @@ msgstr "" #: convertrules.py:2820 msgid "" "oldaddlyrics is no longer supported. \n" -" Use addlyrics or lyrsicsto instead.\n" +" Use addlyrics or lyricsto instead.\n" msgstr "" #: convertrules.py:2826 @@ -570,7 +570,7 @@ msgid "\\bar \".\" now produces a thick barline.\n" msgstr "" #: convertrules.py:2849 -msgid "Dash parameters for slurs and ties are now in 'dash-details.\n" +msgid "Dash parameters for slurs and ties are now in 'dash-definition.\n" msgstr "" #: convertrules.py:2854 @@ -771,15 +771,15 @@ msgid "" "handled.\n" msgstr "" -#: convertrules.py:3369 +#: convertrules.py:3372 msgid "beamExceptions controls whole-measure beaming." msgstr "" -#: convertrules.py:3606 +#: convertrules.py:3609 msgid "Flag.transparent and Flag.color inherit from Stem" msgstr "" -#: convertrules.py:3672 +#: convertrules.py:3675 msgid "" "Staff-padding now controls the distance to the baseline, not the nearest " "point." @@ -839,91 +839,91 @@ msgstr "" msgid "Language does not support microtones contained in the piece" msgstr "" -#: musicexp.py:491 +#: musicexp.py:497 msgid "Tuplet brackets of curved shape are not correctly implemented" msgstr "" -#: musicexp.py:677 +#: musicexp.py:683 #, python-format msgid "unable to set the music %(music)s for the repeat %(repeat)s" msgstr "" -#: musicexp.py:686 +#: musicexp.py:692 msgid "encountered repeat without body" msgstr "" #. no self.elements! -#: musicexp.py:856 +#: musicexp.py:862 #, python-format msgid "Grace note with no following music: %s" msgstr "" -#: musicexp.py:1018 +#: musicexp.py:1024 #, python-format msgid "Invalid octave shift size found: %s. Using no shift." msgstr "" -#: musicexp.py:1476 +#: musicexp.py:1482 #, python-format msgid "Unable to convert alteration %s to a lilypond expression" msgstr "" #. TODO: Handle pieces without a time signature! -#: musicxml.py:361 +#: musicxml.py:362 msgid "Senza-misura time signatures are not yet supported!" msgstr "" -#: musicxml.py:379 +#: musicxml.py:380 msgid "Unable to interpret time signature! Falling back to 4/4." msgstr "" -#: musicxml.py:435 +#: musicxml.py:436 #, python-format msgid "" "Key alteration octave given for a non-existing alteration nr. %s, available " "numbers: %s!" msgstr "" -#: musicxml.py:523 +#: musicxml.py:524 #, python-format msgid "Unable to find instrument for ID=%s\n" msgstr "" -#: abc2ly.py:1386 convert-ly.py:85 lilypond-book.py:122 midi2ly.py:1044 +#: abc2ly.py:1389 convert-ly.py:85 lilypond-book.py:122 midi2ly.py:1046 #, python-format msgid "%s [OPTION]... FILE" msgstr "" -#: abc2ly.py:1387 +#: abc2ly.py:1390 #, python-format msgid "" "abc2ly converts ABC music files (see\n" "%s) to LilyPond input.\n" msgstr "" -#: abc2ly.py:1395 convert-ly.py:92 etf2ly.py:1208 lilypond-book.py:231 -#: midi2ly.py:1095 musicxml2ly.py:2590 main.cc:181 +#: abc2ly.py:1398 convert-ly.py:92 etf2ly.py:1208 lilypond-book.py:231 +#: midi2ly.py:1097 musicxml2ly.py:2590 main.cc:184 msgid "show version number and exit" msgstr "" -#: abc2ly.py:1398 convert-ly.py:96 etf2ly.py:1204 lilypond-book.py:140 -#: midi2ly.py:1062 musicxml2ly.py:2572 main.cc:160 +#: abc2ly.py:1401 convert-ly.py:96 etf2ly.py:1204 lilypond-book.py:140 +#: midi2ly.py:1064 musicxml2ly.py:2572 main.cc:163 msgid "show this help and exit" msgstr "" -#: abc2ly.py:1401 etf2ly.py:1209 midi2ly.py:1071 +#: abc2ly.py:1404 etf2ly.py:1209 midi2ly.py:1073 msgid "write output to FILE" msgstr "" -#: abc2ly.py:1404 +#: abc2ly.py:1407 msgid "be strict about success" msgstr "" -#: abc2ly.py:1407 +#: abc2ly.py:1410 msgid "preserve ABC's notion of beams" msgstr "" -#: abc2ly.py:1410 +#: abc2ly.py:1413 msgid "suppress progress messages" msgstr "" @@ -931,8 +931,8 @@ msgstr "" #. "Report bugs in English via %s", #. or if there is a LilyPond users list or forum in your language #. "Report bugs in English via %s or in YOUR_LANG via URI" -#: abc2ly.py:1413 convert-ly.py:157 etf2ly.py:1218 lilypond-book.py:258 -#: midi2ly.py:1107 musicxml2ly.py:2674 main.cc:315 +#: abc2ly.py:1416 convert-ly.py:157 etf2ly.py:1218 lilypond-book.py:258 +#: midi2ly.py:1109 musicxml2ly.py:2674 main.cc:318 #, c-format, python-format msgid "Report bugs via %s" msgstr "" @@ -951,16 +951,16 @@ msgstr "" msgid "Examples:" msgstr "" -#: convert-ly.py:79 etf2ly.py:1191 lilypond-book.py:115 midi2ly.py:81 +#: convert-ly.py:79 etf2ly.py:1191 lilypond-book.py:115 midi2ly.py:80 #, python-format msgid "Copyright (c) %s by" msgstr "" -#: convert-ly.py:81 etf2ly.py:1193 lilypond-book.py:117 midi2ly.py:83 +#: convert-ly.py:81 etf2ly.py:1193 lilypond-book.py:117 midi2ly.py:82 msgid "Distributed under terms of the GNU General Public License." msgstr "" -#: convert-ly.py:82 etf2ly.py:1194 lilypond-book.py:118 midi2ly.py:84 +#: convert-ly.py:82 etf2ly.py:1194 lilypond-book.py:118 midi2ly.py:83 msgid "It comes with NO WARRANTY." msgstr "" @@ -983,7 +983,7 @@ msgid "" msgstr "" #: convert-ly.py:111 lilypond-book.py:163 lilypond-book.py:181 -#: musicxml2ly.py:2629 main.cc:174 +#: musicxml2ly.py:2629 main.cc:177 msgid "LOGLEVEL" msgstr "" @@ -1014,8 +1014,8 @@ msgstr "" msgid "make a numbered backup [default: filename.ext~]" msgstr "" -#: convert-ly.py:152 etf2ly.py:1212 lilypond-book.py:234 midi2ly.py:1096 -#: main.cc:183 +#: convert-ly.py:152 etf2ly.py:1212 lilypond-book.py:234 midi2ly.py:1098 +#: main.cc:186 msgid "show warranty and copyright" msgstr "" @@ -1036,17 +1036,17 @@ msgstr "" msgid "Processing `%s'... " msgstr "" -#: convert-ly.py:368 +#: convert-ly.py:366 #, python-format msgid "%s: Unable to open file" msgstr "" -#: convert-ly.py:374 +#: convert-ly.py:372 #, python-format msgid "%s: Unable to determine version. Skipping" msgstr "" -#: convert-ly.py:380 +#: convert-ly.py:378 #, python-format msgid "" "%s: Invalid version string `%s' \n" @@ -1054,7 +1054,7 @@ msgid "" "`2.8.12'" msgstr "" -#: convert-ly.py:386 +#: convert-ly.py:384 #, python-format msgid "There was %d error." msgid_plural "There were %d errors." @@ -1073,8 +1073,8 @@ msgid "" "file.\n" msgstr "" -#: etf2ly.py:1210 midi2ly.py:1067 midi2ly.py:1072 musicxml2ly.py:2659 -#: main.cc:166 main.cc:178 +#: etf2ly.py:1210 midi2ly.py:1069 midi2ly.py:1074 musicxml2ly.py:2659 +#: main.cc:169 main.cc:181 msgid "FILE" msgstr "" @@ -1114,7 +1114,7 @@ msgid "add DIR to include path" msgstr "" #: lilypond-book.py:143 lilypond-book.py:150 lilypond-book.py:169 -#: lilypond-book.py:187 lilypond-book.py:208 lilypond-book.py:214 main.cc:165 +#: lilypond-book.py:187 lilypond-book.py:208 lilypond-book.py:214 main.cc:168 msgid "DIR" msgstr "" @@ -1128,7 +1128,7 @@ msgstr "" #: lilypond-book.py:157 msgid "" -"pad left side of music to align music inspite of uneven bar numbers (in mm)" +"pad left side of music to align music in spite of uneven bar numbers (in mm)" msgstr "" #: lilypond-book.py:162 @@ -1180,7 +1180,7 @@ msgstr "" msgid "write snippet output files with the same base name as their source file" msgstr "" -#: lilypond-book.py:223 midi2ly.py:1090 musicxml2ly.py:2596 +#: lilypond-book.py:223 midi2ly.py:1092 musicxml2ly.py:2596 msgid "be verbose" msgstr "" @@ -1261,114 +1261,114 @@ msgstr "" msgid "Removing `%s'" msgstr "" -#: lilypond-book.py:714 +#: lilypond-book.py:727 #, python-format msgid "Setting LilyPond's loglevel to %s" msgstr "" -#: lilypond-book.py:718 +#: lilypond-book.py:731 #, python-format msgid "" "Setting LilyPond's loglevel to %s (from environment variable " "LILYPOND_LOGLEVEL)" msgstr "" -#: lilypond-book.py:721 +#: lilypond-book.py:734 msgid "" "Setting LilyPond's output to --verbose, implied by lilypond-book's setting" msgstr "" -#: midi2ly.py:90 +#: midi2ly.py:89 msgid "warning: " msgstr "" -#: midi2ly.py:93 midi2ly.py:1124 +#: midi2ly.py:92 midi2ly.py:1126 msgid "error: " msgstr "" -#: midi2ly.py:94 +#: midi2ly.py:93 msgid "Exiting... " msgstr "" -#: midi2ly.py:835 +#: midi2ly.py:834 msgid "found more than 5 voices on a staff, expect bad output" msgstr "" -#: midi2ly.py:1032 +#: midi2ly.py:1034 #, python-format msgid "%s output to `%s'..." msgstr "" -#: midi2ly.py:1045 +#: midi2ly.py:1047 #, python-format msgid "Convert %s to LilyPond input.\n" msgstr "" -#: midi2ly.py:1050 +#: midi2ly.py:1052 msgid "print absolute pitches" msgstr "" -#: midi2ly.py:1052 midi2ly.py:1080 +#: midi2ly.py:1054 midi2ly.py:1082 msgid "DUR" msgstr "" -#: midi2ly.py:1053 +#: midi2ly.py:1055 msgid "quantise note durations on DUR" msgstr "" -#: midi2ly.py:1056 +#: midi2ly.py:1058 msgid "debug printing" msgstr "" -#: midi2ly.py:1059 +#: midi2ly.py:1061 msgid "print explicit durations" msgstr "" -#: midi2ly.py:1064 +#: midi2ly.py:1066 msgid "prepend FILE to output" msgstr "" -#: midi2ly.py:1068 +#: midi2ly.py:1070 msgid "set key: ALT=+sharps|-flats; MINOR=1" msgstr "" -#: midi2ly.py:1069 +#: midi2ly.py:1071 msgid "ALT[:MINOR]" msgstr "" -#: midi2ly.py:1074 +#: midi2ly.py:1076 msgid "preview of first 4 bars" msgstr "" -#: midi2ly.py:1078 +#: midi2ly.py:1080 msgid "suppress progress messages and warnings about excess voices" msgstr "" -#: midi2ly.py:1079 +#: midi2ly.py:1081 msgid "quantise note starts on DUR" msgstr "" -#: midi2ly.py:1083 +#: midi2ly.py:1085 msgid "use s instead of r for rests" msgstr "" -#: midi2ly.py:1085 +#: midi2ly.py:1087 msgid "DUR*NUM/DEN" msgstr "" -#: midi2ly.py:1088 +#: midi2ly.py:1090 msgid "allow tuplet durations DUR*NUM/DEN" msgstr "" -#: midi2ly.py:1098 +#: midi2ly.py:1100 msgid "treat every text as a lyric" msgstr "" -#: midi2ly.py:1101 +#: midi2ly.py:1103 msgid "Examples" msgstr "" -#: midi2ly.py:1125 +#: midi2ly.py:1127 msgid "no files specified on command line." msgstr "" @@ -1497,7 +1497,7 @@ msgstr "" #: musicxml2ly.py:2576 msgid "" -"Copyright (c) 2005--2014 by\n" +"Copyright (c) 2005--2015 by\n" " Han-Wen Nienhuys ,\n" " Jan Nieuwenhuizen and\n" " Reinhold Kainhofer \n" @@ -1585,15 +1585,15 @@ msgstr "" msgid "Unable to find input file %s" msgstr "" -#: website_post.py:125 +#: website_post.py:129 msgid "English" msgstr "" -#: website_post.py:128 +#: website_post.py:132 msgid "Other languages" msgstr "" -#: website_post.py:129 +#: website_post.py:133 #, python-format msgid "About automatic language selection." msgstr "" @@ -1668,21 +1668,21 @@ msgstr "" msgid "accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:210 +#: accidental-engraver.cc:207 #, c-format msgid "procedure or context-name expected for accidental rule, found %s" msgstr "" -#: accidental.cc:170 +#: accidental.cc:141 #, c-format msgid "Could not find glyph-name for alteration %s" msgstr "" -#: accidental.cc:186 +#: accidental.cc:157 msgid "natural alteration glyph not found" msgstr "" -#: all-font-metrics.cc:149 +#: all-font-metrics.cc:161 #, c-format msgid "cannot find font: `%s'" msgstr "" @@ -1695,11 +1695,6 @@ msgstr "" msgid "no heads for arpeggio found?" msgstr "" -#: auto-change-iterator.cc:74 change-iterator.cc:72 -#, c-format -msgid "cannot change, already in translator: %s" -msgstr "" - #: axis-group-engraver.cc:149 msgid "Axis_group_engraver: vertical group already has a parent" msgstr "" @@ -1712,12 +1707,12 @@ msgstr "" msgid "removing this vertical group" msgstr "" -#: axis-group-interface.cc:714 +#: axis-group-interface.cc:716 #, c-format msgid "\"%s\" is not a valid outside-staff-placement-directive" msgstr "" -#: axis-group-interface.cc:786 +#: axis-group-interface.cc:788 msgid "an outside-staff object should have a direction, defaulting to up" msgstr "" @@ -1726,32 +1721,32 @@ msgstr "" msgid "barcheck failed at: %s" msgstr "" -#: beam-engraver.cc:148 +#: beam-engraver.cc:147 msgid "already have a beam" msgstr "" -#: beam-engraver.cc:235 +#: beam-engraver.cc:234 msgid "unterminated beam" msgstr "" -#: beam-engraver.cc:282 chord-tremolo-engraver.cc:149 +#: beam-engraver.cc:281 chord-tremolo-engraver.cc:148 msgid "stem must have Rhythmic structure" msgstr "" -#: beam-engraver.cc:293 +#: beam-engraver.cc:292 msgid "stem does not fit in beam" msgstr "" -#: beam-engraver.cc:294 +#: beam-engraver.cc:293 msgid "beam was started here" msgstr "" #. We are completely screwed. -#: beam-quanting.cc:839 +#: beam-quanting.cc:850 msgid "no viable initial configuration found: may not find good beam slope" msgstr "" -#: beam.cc:181 +#: beam.cc:183 msgid "removing beam with no stems" msgstr "" @@ -1761,30 +1756,32 @@ msgid "cannot change `%s' to `%s'" msgstr "" #. FIXME: constant error message. -#: change-iterator.cc:93 +#: change-iterator.cc:67 msgid "cannot find context to switch to" msgstr "" +#. No enclosing context was found because the iterator's immediate +#. context is the kind that was sought. #. We could change the current translator's id, but that would make #. errors hard to catch. #. #. last->translator_id_string () = get_change #. ()->change_to_id_string (); -#: change-iterator.cc:102 +#: change-iterator.cc:78 #, c-format msgid "not changing to same context type: %s" msgstr "" -#. FIXME: uncomprehensable message -#: change-iterator.cc:106 +#. FIXME: incomprehensible message +#: change-iterator.cc:82 msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:88 +#: chord-tremolo-engraver.cc:87 msgid "No tremolo to end" msgstr "" -#: chord-tremolo-engraver.cc:109 +#: chord-tremolo-engraver.cc:108 msgid "unterminated chord tremolo" msgstr "" @@ -1811,26 +1808,26 @@ msgstr "" msgid "cannot find line breaking that satisfies constraints" msgstr "" -#: context-property.cc:43 -msgid "need symbol arguments for \\override and \\revert" +#: context-property.cc:46 +msgid "need symbol argument for \\override and \\revert" msgstr "" -#: context.cc:149 +#: context.cc:147 #, c-format msgid "cannot find or create new `%s'" msgstr "" -#: context.cc:228 +#: context.cc:226 #, c-format msgid "cannot find or create `%s' called `%s'" msgstr "" -#: context.cc:425 +#: context.cc:457 #, c-format msgid "cannot find or create: `%s'" msgstr "" -#: context.cc:439 +#: context.cc:471 #, c-format msgid "cannot find or create new Bottom = \"%s\"" msgstr "" @@ -1840,20 +1837,20 @@ msgstr "" msgid "custos `%s' not found" msgstr "" -#: dispatcher.cc:89 +#: dispatcher.cc:82 msgid "Event class should be a list" msgstr "" -#: dispatcher.cc:172 +#: dispatcher.cc:165 #, c-format msgid "Junking event: %s" msgstr "" -#: dispatcher.cc:277 +#: dispatcher.cc:279 msgid "Attempting to remove nonexisting listener." msgstr "" -#: dispatcher.cc:303 +#: dispatcher.cc:305 msgid "Already listening to dispatcher, ignoring request" msgstr "" @@ -1862,14 +1859,14 @@ msgstr "" msgid "dot `%s' not found" msgstr "" -#: dynamic-engraver.cc:168 +#: dynamic-engraver.cc:166 #, c-format msgid "" "unknown crescendo style: %s\n" "defaulting to hairpin." msgstr "" -#: dynamic-engraver.cc:233 slur-proto-engraver.cc:119 +#: dynamic-engraver.cc:231 slur-proto-engraver.cc:159 #, c-format msgid "unterminated %s" msgstr "" @@ -1881,38 +1878,38 @@ msgstr "" msgid "(De)crescendo with unspecified starting volume in MIDI." msgstr "" -#: episema-engraver.cc:75 +#: episema-engraver.cc:74 msgid "already have an episema" msgstr "" -#: episema-engraver.cc:88 +#: episema-engraver.cc:87 msgid "cannot find start of episema" msgstr "" -#: episema-engraver.cc:137 +#: episema-engraver.cc:136 msgid "unterminated episema" msgstr "" -#: extender-engraver.cc:169 extender-engraver.cc:178 +#: extender-engraver.cc:167 extender-engraver.cc:176 msgid "unterminated extender" msgstr "" -#: flag.cc:134 +#: flag.cc:133 #, c-format msgid "flag `%s' not found" msgstr "" -#: flag.cc:154 +#: flag.cc:153 #, c-format msgid "flag stroke `%s' not found" msgstr "" -#: font-config-scheme.cc:151 font-config.cc:53 +#: font-config-scheme.cc:151 font-config.cc:82 #, c-format msgid "failed adding font directory: %s" msgstr "" -#: font-config-scheme.cc:153 font-config.cc:55 +#: font-config-scheme.cc:153 font-config.cc:84 #, c-format msgid "Adding font directory: %s" msgstr "" @@ -1931,7 +1928,17 @@ msgstr "" msgid "Initializing FontConfig..." msgstr "" -#: font-config.cc:58 +#: font-config.cc:70 +#, c-format +msgid "failed to add fontconfig configuration file `%s'" +msgstr "" + +#: font-config.cc:73 +#, c-format +msgid "Adding fontconfig configuration file: %s" +msgstr "" + +#: font-config.cc:86 msgid "Building font database..." msgstr "" @@ -1939,16 +1946,16 @@ msgstr "" msgid "Must be footnote-event." msgstr "" -#: general-scheme.cc:390 +#: general-scheme.cc:403 #, c-format msgid "failed redirecting stderr to `%s'" msgstr "" -#: general-scheme.cc:469 output-ps.scm:48 +#: general-scheme.cc:482 output-ps.scm:48 msgid "Found infinity or nan in output. Substituting 0.0" msgstr "" -#: glissando-engraver.cc:158 +#: glissando-engraver.cc:157 msgid "unterminated glissando" msgstr "" @@ -1995,12 +2002,12 @@ msgstr "" msgid "Grob `%s' has no interface for property `%s'" msgstr "" -#: grob-property.cc:35 +#: grob-property.cc:32 #, c-format msgid "%d: %s" msgstr "" -#: grob.cc:488 +#: grob.cc:486 #, c-format msgid "ignored infinite %s-offset" msgstr "" @@ -2013,23 +2020,23 @@ msgstr "" msgid "decrescendo too small" msgstr "" -#: horizontal-bracket-engraver.cc:62 +#: horizontal-bracket-engraver.cc:61 msgid "do not have that many brackets" msgstr "" -#: horizontal-bracket-engraver.cc:71 +#: horizontal-bracket-engraver.cc:70 msgid "conflicting note group events" msgstr "" -#: hyphen-engraver.cc:104 +#: hyphen-engraver.cc:103 msgid "removing unterminated hyphen" msgstr "" -#: hyphen-engraver.cc:118 +#: hyphen-engraver.cc:117 msgid "unterminated hyphen; removing" msgstr "" -#: includable-lexer.cc:71 lily-guile.cc:91 lily-parser-scheme.cc:108 +#: includable-lexer.cc:71 lily-guile.cc:92 lily-parser-scheme.cc:108 #, c-format msgid "cannot find file: `%s'" msgstr "" @@ -2039,11 +2046,11 @@ msgstr "" msgid "(search path: `%s')" msgstr "" -#: input.cc:138 source-file.cc:178 source-file.cc:193 +#: input.cc:138 source-file.cc:180 source-file.cc:195 msgid "position unknown" msgstr "" -#: key-engraver.cc:198 +#: key-engraver.cc:196 msgid "Incomplete keyAlterationOrder for key signature" msgstr "" @@ -2056,11 +2063,11 @@ msgstr "" msgid "alteration not found" msgstr "" -#: ligature-bracket-engraver.cc:72 ligature-engraver.cc:109 +#: ligature-bracket-engraver.cc:71 ligature-engraver.cc:109 msgid "cannot find start of ligature" msgstr "" -#: ligature-bracket-engraver.cc:85 ligature-engraver.cc:136 +#: ligature-bracket-engraver.cc:84 ligature-engraver.cc:136 msgid "already have a ligature" msgstr "" @@ -2084,21 +2091,21 @@ msgstr "" msgid "ligature was started here" msgstr "" -#: lily-guile.cc:93 +#: lily-guile.cc:94 #, c-format msgid "(load path: `%s')" msgstr "" -#: lily-guile.cc:412 +#: lily-guile.cc:413 #, c-format msgid "cannot find property type-check for `%s' (%s)." msgstr "" -#: lily-guile.cc:415 +#: lily-guile.cc:416 msgid "perhaps a typing error?" msgstr "" -#: lily-guile.cc:422 +#: lily-guile.cc:423 msgid "skipping assignment" msgstr "" @@ -2107,20 +2114,33 @@ msgstr "" msgid "type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" -#: lily-lexer.cc:249 +#. Uh oh. unsmob delivered 0, yet +#. unsmob delivers true. This means that unsmob is a +#. matching check from a base class of T, but var is of an +#. incompatible derived type. +#: lily-guile.cc:462 +msgid "Wrong kind of " +msgstr "" + +#: lily-lexer.cc:251 msgid "include files are not allowed in safe mode" msgstr "" -#: lily-lexer.cc:276 +#: lily-lexer.cc:278 #, c-format msgid "identifier name is a keyword: `%s'" msgstr "" -#: lily-lexer.cc:297 lily-lexer.cc:310 +#: lily-lexer.cc:301 lily-lexer.cc:314 #, c-format msgid "%s:EOF" msgstr "" +#: lily-modules.cc:81 +#, c-format +msgid "Uninitialized variable `%s' in module (%s)" +msgstr "" + #: lily-parser-scheme.cc:80 #, c-format msgid "Changing working directory to: `%s'" @@ -2141,41 +2161,37 @@ msgstr "" msgid "Processing `%s'" msgstr "" -#: lily-parser-scheme.cc:209 +#: lily-parser-scheme.cc:210 msgid "" "ly:parser-parse-string is only valid with a new parser. Use ly:parser-" "include-string instead." msgstr "" -#: lily-parser-scheme.cc:240 +#: lily-parser-scheme.cc:241 msgid "" "ly:parse-string-expression is only valid with a new parser. Use ly:parser-" "include-string instead." msgstr "" -#: lily-parser.cc:109 +#: lily-parser.cc:106 msgid "Parsing..." msgstr "" -#: lookup.cc:181 +#: lookup.cc:177 #, c-format msgid "Not drawing a box with negative dimension, %.2f by %.2f." msgstr "" -#: lyric-combine-music-iterator.cc:199 +#: lyric-combine-music-iterator.cc:204 msgid "argument of \\lyricsto should contain Lyrics context" msgstr "" -#: lyric-combine-music-iterator.cc:337 +#: lyric-combine-music-iterator.cc:344 #, c-format -msgid "cannot find Voice `%s'" +msgid "cannot find %s `%s'" msgstr "" -#: lyric-engraver.cc:186 -msgid "Lyric syllable does not have note. Use \\lyricsto or associatedVoice." -msgstr "" - -#: main.cc:104 +#: main.cc:106 #, c-format msgid "" "This program is free software. It is covered by the GNU General Public\n" @@ -2184,7 +2200,7 @@ msgid "" "information.\n" msgstr "" -#: main.cc:110 +#: main.cc:112 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License as \n" @@ -2202,98 +2218,102 @@ msgid "" "Boston, MA 02111-1307, USA.\n" msgstr "" -#: main.cc:148 +#: main.cc:150 msgid "SYM[=VAL]" msgstr "" -#: main.cc:149 +#: main.cc:151 msgid "" "set Scheme option SYM to VAL (default: #t).\n" "Use -dhelp for help." msgstr "" -#: main.cc:153 +#: main.cc:155 msgid "EXPR" msgstr "" -#: main.cc:153 +#: main.cc:155 msgid "evaluate scheme code" msgstr "" #. Bug in option parser: --output =foe is taken as an abbreviation #. for --output-format. -#: main.cc:156 +#: main.cc:158 msgid "FORMATs" msgstr "" -#: main.cc:156 +#: main.cc:158 msgid "dump FORMAT,... Also as separate options:" msgstr "" -#: main.cc:157 +#: main.cc:159 msgid "generate PDF (default)" msgstr "" -#: main.cc:158 +#: main.cc:160 msgid "generate PNG" msgstr "" -#: main.cc:159 +#: main.cc:161 msgid "generate PostScript" msgstr "" #: main.cc:162 +msgid "generate big PDF files" +msgstr "" + +#: main.cc:165 msgid "FIELD" msgstr "" -#: main.cc:162 +#: main.cc:165 msgid "" "dump header field FIELD to file\n" "named BASENAME.FIELD" msgstr "" -#: main.cc:165 +#: main.cc:168 msgid "add DIR to search path" msgstr "" -#: main.cc:166 +#: main.cc:169 msgid "use FILE as init file" msgstr "" -#: main.cc:169 +#: main.cc:172 msgid "USER, GROUP, JAIL, DIR" msgstr "" -#: main.cc:169 +#: main.cc:172 msgid "" "chroot to JAIL, become USER:GROUP\n" "and cd into DIR" msgstr "" -#: main.cc:174 +#: main.cc:177 msgid "" "print log messages according to LOGLEVEL. Possible values are:\n" "NONE, ERROR, WARNING, BASIC, PROGRESS, INFO (default) and DEBUG." msgstr "" -#: main.cc:178 +#: main.cc:181 msgid "write output to FILE (suffix will be added)" msgstr "" -#: main.cc:179 +#: main.cc:182 msgid "relocate using directory of lilypond program" msgstr "" -#: main.cc:180 +#: main.cc:183 msgid "no progress, only error messages (equivalent to loglevel=ERROR)" msgstr "" -#: main.cc:182 +#: main.cc:185 msgid "be verbose (equivalent to loglevel=DEBUG)" msgstr "" #. Do not update the copyright years here, run `make grand-replace' -#: main.cc:261 +#: main.cc:264 #, c-format msgid "" "Copyright (c) %s by\n" @@ -2301,118 +2321,118 @@ msgid "" msgstr "" #. No version number or newline here. It confuses help2man. -#: main.cc:299 +#: main.cc:302 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "" -#: main.cc:301 +#: main.cc:304 msgid "Typeset music and/or produce MIDI from FILE." msgstr "" -#: main.cc:303 +#: main.cc:306 msgid "LilyPond produces beautiful music notation." msgstr "" -#: main.cc:305 +#: main.cc:308 #, c-format msgid "For more information, see %s" msgstr "" -#: main.cc:307 +#: main.cc:310 msgid "Options:" msgstr "" -#: main.cc:374 +#: main.cc:377 #, c-format msgid "expected %d arguments with jail, found: %u" msgstr "" -#: main.cc:388 +#: main.cc:391 #, c-format msgid "no such user: %s" msgstr "" -#: main.cc:390 +#: main.cc:393 #, c-format msgid "cannot get user id from user name: %s: %s" msgstr "" -#: main.cc:405 +#: main.cc:408 #, c-format msgid "no such group: %s" msgstr "" -#: main.cc:407 +#: main.cc:410 #, c-format msgid "cannot get group id from group name: %s: %s" msgstr "" -#: main.cc:415 +#: main.cc:418 #, c-format msgid "cannot chroot to: %s: %s" msgstr "" -#: main.cc:422 +#: main.cc:425 #, c-format msgid "cannot change group id to: %d: %s" msgstr "" -#: main.cc:428 +#: main.cc:431 #, c-format msgid "cannot change user id to: %d: %s" msgstr "" -#: main.cc:434 +#: main.cc:437 #, c-format msgid "cannot change working directory to: %s: %s" msgstr "" -#: main.cc:805 +#: main.cc:826 #, c-format msgid "exception caught: %s" msgstr "" #. FIXME: constant error message. -#: mark-engraver.cc:156 +#: mark-engraver.cc:149 msgid "rehearsalMark must have integer value" msgstr "" -#: mark-engraver.cc:162 +#: mark-engraver.cc:155 msgid "mark label must be a markup object" msgstr "" -#: mensural-ligature-engraver.cc:100 +#: mensural-ligature-engraver.cc:93 msgid "ligature with less than 2 heads -> skipping" msgstr "" -#: mensural-ligature-engraver.cc:127 +#: mensural-ligature-engraver.cc:120 msgid "cannot determine pitch of ligature primitive -> skipping" msgstr "" -#: mensural-ligature-engraver.cc:141 +#: mensural-ligature-engraver.cc:134 msgid "single note ligature - skipping" msgstr "" -#: mensural-ligature-engraver.cc:152 +#: mensural-ligature-engraver.cc:145 msgid "prime interval within ligature -> skipping" msgstr "" -#: mensural-ligature-engraver.cc:163 +#: mensural-ligature-engraver.cc:156 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping" msgstr "" -#: mensural-ligature-engraver.cc:206 +#: mensural-ligature-engraver.cc:199 msgid "semibrevis must be followed by another one -> skipping" msgstr "" -#: mensural-ligature-engraver.cc:216 +#: mensural-ligature-engraver.cc:209 msgid "" "semibreves can only appear at the beginning of a ligature,\n" "and there may be only zero or two of them" msgstr "" -#: mensural-ligature-engraver.cc:236 +#: mensural-ligature-engraver.cc:229 msgid "" "invalid ligatura ending:\n" "when the last note is a descending brevis,\n" @@ -2420,11 +2440,11 @@ msgid "" "or the ligatura must be LB or SSB" msgstr "" -#: mensural-ligature-engraver.cc:396 +#: mensural-ligature-engraver.cc:389 msgid "unexpected case fall-through" msgstr "" -#: midi-control-function-performer.cc:109 staff-performer.cc:152 +#: midi-control-function-performer.cc:107 staff-performer.cc:159 #, c-format msgid "ignoring out-of-range value change for MIDI property `%s'" msgstr "" @@ -2448,7 +2468,7 @@ msgstr "" msgid "cannot write to file: `%s'" msgstr "" -#: minimal-page-breaking.cc:40 paper-score.cc:122 +#: minimal-page-breaking.cc:40 paper-score.cc:116 msgid "Calculating line breaks..." msgstr "" @@ -2456,15 +2476,11 @@ msgstr "" msgid "Calculating page breaks..." msgstr "" -#: multi-measure-rest.cc:154 +#: multi-measure-rest.cc:152 msgid "" "usable-duration-logs must be a non-empty list. Falling back to whole rests." msgstr "" -#: multi-measure-rest.cc:364 -msgid "Using naive multi measure rest spacing." -msgstr "" - #: music.cc:150 #, c-format msgid "octave check failed; expected \"%s\", found: \"%s\"" @@ -2482,11 +2498,11 @@ msgstr "" msgid "placing below" msgstr "" -#: note-collision.cc:497 -msgid "ignoring too many clashing note columns" +#: note-collision.cc:512 +msgid "this Voice needs a \\voiceXx or \\shiftXx setting" msgstr "" -#: note-column.cc:147 +#: note-column.cc:150 msgid "cannot have note heads and rests together on a stem" msgstr "" @@ -2495,41 +2511,41 @@ msgstr "" msgid "none of note heads `%s' or `%s' found" msgstr "" -#: note-heads-engraver.cc:76 +#: note-heads-engraver.cc:75 msgid "NoteEvent without pitch" msgstr "" -#: open-type-font.cc:46 +#: open-type-font.cc:45 #, c-format msgid "cannot allocate %lu bytes" msgstr "" -#: open-type-font.cc:50 +#: open-type-font.cc:49 #, c-format msgid "cannot load font table: %s" msgstr "" -#: open-type-font.cc:55 +#: open-type-font.cc:54 #, c-format msgid "FreeType error: %s" msgstr "" -#: open-type-font.cc:112 +#: open-type-font.cc:115 #, c-format msgid "unsupported font format: %s" msgstr "" -#: open-type-font.cc:114 +#: open-type-font.cc:117 #, c-format msgid "error reading font file %s: %s" msgstr "" -#: open-type-font.cc:189 +#: open-type-font.cc:192 #, c-format msgid "FT_Get_Glyph_Name () Freetype error: %s" msgstr "" -#: open-type-font.cc:337 pango-font.cc:257 +#: open-type-font.cc:340 pango-font.cc:258 #, c-format msgid "FT_Get_Glyph_Name () error: %s" msgstr "" @@ -2569,16 +2585,16 @@ msgstr "" msgid "best score for this sys-count: %f" msgstr "" -#: optimal-page-breaking.cc:216 page-turn-page-breaking.cc:248 -#: paper-score.cc:162 +#: optimal-page-breaking.cc:216 page-turn-page-breaking.cc:249 +#: paper-score.cc:156 msgid "Drawing systems..." msgstr "" -#: output-def.cc:235 +#: output-def.cc:229 msgid "margins do not fit with line-width, setting default values" msgstr "" -#: output-def.cc:242 +#: output-def.cc:236 msgid "" "systems run off the page due to improper paper settings, setting default " "values" @@ -2601,97 +2617,97 @@ msgstr "" msgid "page %d has been compressed" msgstr "" -#: page-layout-problem.cc:402 +#: page-layout-problem.cc:400 msgid "" "A page layout problem has been initiated that cannot accommodate footnotes." msgstr "" -#: page-layout-problem.cc:731 +#: page-layout-problem.cc:729 msgid "ragged-bottom was specified, but page must be compressed" msgstr "" -#: page-layout-problem.cc:734 +#: page-layout-problem.cc:732 #, c-format msgid "compressing over-full page by %.1f staff-spaces" msgstr "" -#: page-layout-problem.cc:1199 +#: page-layout-problem.cc:1197 msgid "staff-affinities should only decrease" msgstr "" -#: page-turn-page-breaking.cc:168 +#: page-turn-page-breaking.cc:169 #, c-format msgid "page-turn-page-breaking: breaking from %d to %d" msgstr "" -#: page-turn-page-breaking.cc:217 +#: page-turn-page-breaking.cc:218 msgid "" "cannot fit the first page turn onto a single page. Consider setting first-" "page-number to an even number." msgstr "" -#: page-turn-page-breaking.cc:230 +#: page-turn-page-breaking.cc:231 #, c-format msgid "Calculating page and line breaks (%d possible page breaks)..." msgstr "" -#: page-turn-page-breaking.cc:300 +#: page-turn-page-breaking.cc:301 #, c-format msgid "break starting at page %d" msgstr "" -#: page-turn-page-breaking.cc:301 +#: page-turn-page-breaking.cc:302 #, c-format msgid "\tdemerits: %f" msgstr "" -#: page-turn-page-breaking.cc:302 +#: page-turn-page-breaking.cc:303 #, c-format msgid "\tsystem count: %d" msgstr "" -#: page-turn-page-breaking.cc:303 +#: page-turn-page-breaking.cc:304 #, c-format msgid "\tpage count: %d" msgstr "" -#: page-turn-page-breaking.cc:304 +#: page-turn-page-breaking.cc:305 #, c-format msgid "\tprevious break: %d" msgstr "" -#: pango-font.cc:246 +#: pango-font.cc:247 #, c-format msgid "no glyph for character U+%0X in font `%s'" msgstr "" -#: pango-font.cc:273 +#: pango-font.cc:274 #, c-format msgid "" "Glyph has no name, but font supports glyph naming.\n" "Skipping glyph U+%0X, file %s" msgstr "" -#: pango-font.cc:323 +#: pango-font.cc:324 #, c-format msgid "no PostScript font name for font `%s'" msgstr "" -#: pango-font.cc:373 +#: pango-font.cc:374 msgid "FreeType face has no PostScript font name" msgstr "" -#: paper-book.cc:214 +#: paper-book.cc:200 #, c-format msgid "program option -dprint-pages not supported by backend `%s'" msgstr "" -#: paper-book.cc:233 +#: paper-book.cc:219 #, c-format msgid "program option -dpreview not supported by backend `%s'" msgstr "" -#: paper-column-engraver.cc:263 +#: paper-column-engraver.cc:261 msgid "" "forced break was overridden by some other event, should you be using bar " "checks?" @@ -2702,16 +2718,16 @@ msgstr "" msgid "Layout output to `%s'..." msgstr "" -#: paper-score.cc:134 +#: paper-score.cc:128 #, c-format msgid "Element count %d (spanners %d) " msgstr "" -#: paper-score.cc:138 +#: paper-score.cc:132 msgid "Preprocessing graphical objects..." msgstr "" -#: parse-scm.cc:128 +#: parse-scm.cc:124 msgid "GUILE signaled an error for the expression beginning here" msgstr "" @@ -2724,27 +2740,36 @@ msgstr "" msgid "unterminated percent repeat" msgstr "" -#: performance.cc:55 +#: performance.cc:76 msgid "Track..." msgstr "" -#: performance.cc:90 +#: performance.cc:126 #, c-format msgid "MIDI output to `%s'..." msgstr "" -#: piano-pedal-engraver.cc:279 +#: pfb-scheme.cc:49 ttf.cc:512 ttf.cc:562 +msgid "font index must be non-negative, using index 0" +msgstr "" + +#: pfb-scheme.cc:64 ttf.cc:480 ttf.cc:528 +#, c-format +msgid "font index %d too large for font `%s', using index 0" +msgstr "" + +#: piano-pedal-engraver.cc:276 #, c-format msgid "expect 3 strings for piano pedals, found: %ld" msgstr "" -#: piano-pedal-engraver.cc:294 piano-pedal-engraver.cc:305 +#: piano-pedal-engraver.cc:291 piano-pedal-engraver.cc:302 #: piano-pedal-performer.cc:104 #, c-format msgid "cannot find start of piano pedal: `%s'" msgstr "" -#: piano-pedal-engraver.cc:340 +#: piano-pedal-engraver.cc:337 #, c-format msgid "cannot find start of piano pedal bracket: `%s'" msgstr "" @@ -2754,7 +2779,7 @@ msgstr "" msgid "no such internal option: %s" msgstr "" -#: property-iterator.cc:100 +#: property-iterator.cc:66 #, c-format msgid "not a grob name, `%s'" msgstr "" @@ -2763,25 +2788,25 @@ msgstr "" msgid "Failed octave check, got: " msgstr "" -#: relocate.cc:52 +#: relocate.cc:56 #, c-format msgid "Setting %s to %s" msgstr "" #. this warning should only be printed in debug mode! -#: relocate.cc:73 +#: relocate.cc:77 #, c-format msgid "no such file: %s for %s" msgstr "" #. this warning should only be printed in debug mode! #. this warning should only be printed in debug mode -#: relocate.cc:84 relocate.cc:102 +#: relocate.cc:88 relocate.cc:106 #, c-format msgid "no such directory: %s for %s" msgstr "" -#: relocate.cc:93 +#: relocate.cc:97 #, c-format msgid "%s=%s (prepend)\n" msgstr "" @@ -2811,115 +2836,111 @@ msgstr "" msgid "Relocation : from cwd: argv0=%s\n" msgstr "" -#: relocate.cc:194 +#: relocate.cc:196 #, c-format msgid "" "Relocation: from PATH=%s\n" "argv0=%s\n" msgstr "" -#: relocate.cc:220 +#: relocate.cc:222 msgid "LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR" msgstr "" -#: relocate.cc:345 +#: relocate.cc:347 #, c-format msgid "Relocation file: %s" msgstr "" -#: relocate.cc:349 source-file.cc:65 +#: relocate.cc:351 source-file.cc:65 #, c-format msgid "cannot open file: `%s'" msgstr "" -#: relocate.cc:379 +#: relocate.cc:381 #, c-format msgid "Unknown relocation command %s" msgstr "" -#: rest-collision-engraver.cc:70 -msgid "rhythmic head is not part of a rhythmic column" -msgstr "" - -#: rest-collision.cc:150 +#: rest-collision.cc:154 msgid "cannot resolve rest collision: rest direction not set" msgstr "" -#: rest-collision.cc:161 rest-collision.cc:270 +#: rest-collision.cc:165 rest-collision.cc:274 msgid "too many colliding rests" msgstr "" -#: rest.cc:240 +#: rest.cc:239 #, c-format msgid "rest `%s' not found" msgstr "" -#: score-engraver.cc:78 +#: score-engraver.cc:79 #, c-format msgid "cannot find `%s'" msgstr "" -#: score-engraver.cc:80 +#: score-engraver.cc:81 msgid "Music font has not been installed properly." msgstr "" -#: score-engraver.cc:82 +#: score-engraver.cc:83 #, c-format msgid "Search path `%s'" msgstr "" -#: score-engraver.cc:84 +#: score-engraver.cc:85 msgid "Aborting" msgstr "" -#: score.cc:172 +#: score.cc:161 msgid "already have music in score" msgstr "" -#: score.cc:173 +#: score.cc:163 msgid "this is the previous music" msgstr "" -#: score.cc:178 +#: score.cc:169 msgid "errors found, ignoring music expression" msgstr "" #. FIXME: -#: script-engraver.cc:115 +#: script-engraver.cc:114 msgid "do not know how to interpret articulation:" msgstr "" -#: script-engraver.cc:116 +#: script-engraver.cc:115 msgid " scheme encoding: " msgstr "" -#: skyline-pair.cc:160 +#: skyline-pair.cc:135 msgid "direction must not be CENTER in ly:skyline-pair::skyline" msgstr "" -#: slur-proto-engraver.cc:51 +#: slur-proto-engraver.cc:60 #, c-format msgid "direction of %s invalid: %d" msgstr "" #. We already have an old slur, so give a warning #. and completely ignore the new slur. -#: slur-proto-engraver.cc:166 +#: slur-proto-engraver.cc:213 #, c-format msgid "already have %s" msgstr "" -#: slur-proto-engraver.cc:183 +#: slur-proto-engraver.cc:230 #, c-format msgid "%s without a cause" msgstr "" -#: slur-proto-engraver.cc:244 +#: slur-proto-engraver.cc:297 #, c-format msgid "cannot end %s" msgstr "" -#: slur.cc:434 +#: slur.cc:431 #, c-format msgid "Ignoring grob for slur: %s. avoid-slur not set?" msgstr "" @@ -2929,11 +2950,11 @@ msgstr "" msgid "expected to read %d characters, got %d" msgstr "" -#: staff-performer.cc:301 +#: staff-performer.cc:307 msgid "MIDI channel wrapped around" msgstr "" -#: staff-performer.cc:302 +#: staff-performer.cc:308 msgid "remapping modulo 16" msgstr "" @@ -2954,45 +2975,39 @@ msgstr "" msgid "weird stem size, check for narrow beams" msgstr "" -#: system.cc:201 +#: system.cc:195 #, c-format msgid "Element count %d" msgstr "" -#: system.cc:512 +#: system.cc:506 #, c-format msgid "Grob count %d" msgstr "" #. TODO: Also print the arguments of the markup! -#: text-interface.cc:129 -#, c-format -msgid "Cyclic markup detected: %s" -msgstr "" - -#. TODO: Also print the arguments of the markup! -#: text-interface.cc:142 +#: text-interface.cc:139 #, c-format msgid "Markup depth exceeds maximal value of %d; Markup: %s" msgstr "" -#: text-spanner-engraver.cc:72 +#: text-spanner-engraver.cc:71 msgid "cannot find start of text spanner" msgstr "" -#: text-spanner-engraver.cc:85 +#: text-spanner-engraver.cc:84 msgid "already have a text spanner" msgstr "" -#: text-spanner-engraver.cc:130 +#: text-spanner-engraver.cc:131 msgid "unterminated text spanner" msgstr "" -#: tie-engraver.cc:119 +#: tie-engraver.cc:120 msgid "unterminated tie" msgstr "" -#: tie-engraver.cc:353 +#: tie-engraver.cc:376 msgid "lonely tie" msgstr "" @@ -3001,19 +3016,12 @@ msgstr "" #. #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi. #. -#: time-signature-engraver.cc:75 +#: time-signature-engraver.cc:94 #, c-format msgid "strange time signature found: %d/%d" msgstr "" -#. If there is no such symbol, we default to the numbered style. -#. (Here really with a warning!) -#: time-signature.cc:89 -#, c-format -msgid "time signature symbol `%s' not found; reverting to numbered style" -msgstr "" - -#: translator-ctors.cc:65 +#: translator-ctors.cc:70 #, c-format msgid "unknown translator: `%s'" msgstr "" @@ -3023,54 +3031,45 @@ msgstr "" msgid "fatal error. Couldn't find type: %s" msgstr "" -#: translator-group.cc:188 +#: translator-group.cc:185 #, c-format msgid "cannot find: `%s'" msgstr "" -#: translator.cc:326 +#: translator.cc:305 #, c-format msgid "Two simultaneous %s events, junking this one" msgstr "" -#: translator.cc:327 +#: translator.cc:306 #, c-format msgid "Previous %s event here" msgstr "" -#: ttf.cc:480 ttf.cc:528 -#, c-format -msgid "font index %d too large for font `%s', using index 0" -msgstr "" - -#: ttf.cc:512 ttf.cc:562 -msgid "font index must be non-negative, using index 0" -msgstr "" - -#: tuplet-engraver.cc:110 +#: tuplet-engraver.cc:109 msgid "No tuplet to end" msgstr "" -#: vaticana-ligature-engraver.cc:400 +#: vaticana-ligature-engraver.cc:384 #, c-format msgid "" "ignored prefix(es) `%s' of this head according to restrictions of the " "selected ligature style" msgstr "" -#: vaticana-ligature-engraver.cc:466 +#: vaticana-ligature-engraver.cc:450 msgid "" "Ambiguous use of dots in ligature: there are multiple dotted notes with the " "same pitch. The ligature should be split." msgstr "" -#: vaticana-ligature-engraver.cc:524 +#: vaticana-ligature-engraver.cc:508 msgid "" "This ligature has a dotted head followed by a non-dotted head. The ligature " "should be split after the last dotted head before this head." msgstr "" -#: vaticana-ligature-engraver.cc:736 +#: vaticana-ligature-engraver.cc:720 #, c-format msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul" msgstr "" @@ -3083,7 +3082,7 @@ msgstr "" msgid "ascending vaticana style flexa" msgstr "" -#: vertical-align-engraver.cc:95 +#: vertical-align-engraver.cc:100 msgid "Ignoring Vertical_align_engraver in VerticalAxisGroup" msgstr "" @@ -3104,115 +3103,119 @@ msgstr "" msgid "giving up" msgstr "" -#: parser.yy:463 parser.yy:847 parser.yy:928 parser.yy:1150 +#: parser.yy:480 parser.yy:971 parser.yy:1052 parser.yy:1272 msgid "bad expression type" msgstr "" -#: parser.yy:759 parser.yy:1357 parser.yy:1402 +#: parser.yy:883 parser.yy:1482 parser.yy:1527 msgid "not a context mod" msgstr "" -#: parser.yy:954 +#: parser.yy:1078 msgid "Missing music in \\score" msgstr "" -#: parser.yy:991 +#: parser.yy:1115 msgid "\\paper cannot be used in \\score, use \\layout instead" msgstr "" -#: parser.yy:1027 +#: parser.yy:1150 msgid "Spurious expression in \\score" msgstr "" -#: parser.yy:1057 +#: parser.yy:1180 msgid "need \\paper for paper block" msgstr "" -#: parser.yy:1230 +#: parser.yy:1355 msgid "music expected" msgstr "" -#: parser.yy:1240 parser.yy:1274 +#: parser.yy:1365 parser.yy:1399 msgid "unexpected post-event" msgstr "" -#: parser.yy:1282 +#: parser.yy:1407 msgid "Ignoring non-music expression" msgstr "" -#: parser.yy:1500 -msgid "not a symbol" +#: parser.yy:1723 parser.yy:1742 +msgid "not a key" msgstr "" -#: parser.yy:2295 parser.yy:2409 parser.yy:2422 parser.yy:2431 +#: parser.yy:2611 parser.yy:2729 parser.yy:2742 parser.yy:2751 msgid "bad grob property path" msgstr "" -#: parser.yy:2389 +#: parser.yy:2709 msgid "only \\consists and \\remove take non-string argument." msgstr "" -#: parser.yy:2450 +#: parser.yy:2770 msgid "bad context property path" msgstr "" -#: parser.yy:2551 +#: parser.yy:2855 +msgid "markup expected" +msgstr "" + +#: parser.yy:2867 msgid "simple string expected" msgstr "" -#: parser.yy:2569 +#: parser.yy:2884 msgid "symbol expected" msgstr "" -#: parser.yy:2705 +#: parser.yy:3028 msgid "not a rhythmic event" msgstr "" -#: parser.yy:2755 +#: parser.yy:3078 msgid "post-event expected" msgstr "" -#: parser.yy:2764 parser.yy:2769 +#: parser.yy:3087 parser.yy:3092 msgid "have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:2845 +#: parser.yy:3168 msgid "expecting string or post-event as script definition" msgstr "" -#: parser.yy:2944 +#: parser.yy:3272 msgid "not an articulation" msgstr "" -#: parser.yy:3016 parser.yy:3059 +#: parser.yy:3338 parser.yy:3390 msgid "not a duration" msgstr "" -#: parser.yy:3080 +#: parser.yy:3411 msgid "bass number expected" msgstr "" -#: parser.yy:3172 +#: parser.yy:3503 msgid "have to be in Note mode for notes" msgstr "" -#: parser.yy:3211 +#: parser.yy:3542 msgid "have to be in Chord mode for chords" msgstr "" -#: parser.yy:3254 +#: parser.yy:3585 msgid "markup outside of text script or \\lyricmode" msgstr "" -#: parser.yy:3259 +#: parser.yy:3590 msgid "unrecognized string, not in text script or \\lyricmode" msgstr "" -#: parser.yy:3411 parser.yy:3420 +#: parser.yy:3742 parser.yy:3751 msgid "not an unsigned integer" msgstr "" -#: parser.yy:3494 +#: parser.yy:3838 msgid "not a markup" msgstr "" @@ -3291,14 +3294,19 @@ msgstr "" #: lexer.ll:1280 #, c-format +msgid "Invalid version string \"%s\"" +msgstr "" + +#: lexer.ll:1285 +#, c-format msgid "file too old: %s (oldest supported: %s)" msgstr "" -#: lexer.ll:1281 +#: lexer.ll:1286 msgid "consider updating the input with the convert-ly script" msgstr "" -#: lexer.ll:1287 +#: lexer.ll:1292 #, c-format msgid "program too old: %s (file requires: %s)" msgstr "" @@ -3317,24 +3325,34 @@ msgstr "" msgid "`~a' failed (~a)\n" msgstr "" -#: backend-library.scm:93 +#: backend-library.scm:108 #, scheme-format msgid "Converting to `~a'...\n" msgstr "" #. Do not try to guess the name of the png file, #. GS produces PNG files like BASE-page%d.png. -#: backend-library.scm:102 +#: backend-library.scm:118 #, scheme-format msgid "Converting to ~a..." msgstr "" -#: backend-library.scm:140 +#: backend-library.scm:134 +#, scheme-format +msgid "Copying to `~a'...\n" +msgstr "" + +#: backend-library.scm:200 +#, scheme-format +msgid "Deleting `~a'...\n" +msgstr "" + +#: backend-library.scm:219 #, scheme-format msgid "Writing header field `~a' to `~a'..." msgstr "" -#: backend-library.scm:189 +#: backend-library.scm:268 #, scheme-format msgid "missing stencil expression `~S'" msgstr "" @@ -3369,7 +3387,7 @@ msgstr "" msgid "No span bar glyph defined for bar glyph '~a'; ignoring." msgstr "" -#: chord-entry.scm:52 +#: chord-entry.scm:55 #, scheme-format msgid "Spurious garbage following chord: ~A" msgstr "" @@ -3380,150 +3398,145 @@ msgstr "" msgid "symbol ~S redefined" msgstr "" -#: define-event-classes.scm:73 +#: define-event-classes.scm:74 #, scheme-format msgid "unknown parent class `~a'" msgstr "" -#: define-event-classes.scm:107 +#: define-event-classes.scm:108 #, scheme-format msgid "Cannot redefine event class `~S'" msgstr "" -#: define-event-classes.scm:109 +#: define-event-classes.scm:110 #, scheme-format msgid "Undefined parent event class `~S'" msgstr "" -#: define-markup-commands.scm:1037 +#: define-markup-commands.scm:1272 msgid "no systems found in \\score markup, does it have a \\layout block?" msgstr "" -#: define-markup-commands.scm:2907 +#: define-markup-commands.scm:3122 #, scheme-format msgid "Cannot find glyph ~a" msgstr "" -#: define-markup-commands.scm:3333 +#: define-markup-commands.scm:3598 #, scheme-format msgid "no brace found for point size ~S " msgstr "" -#: define-markup-commands.scm:3334 +#: define-markup-commands.scm:3599 #, scheme-format msgid "defaulting to ~S pt" msgstr "" -#: define-markup-commands.scm:3586 +#: define-markup-commands.scm:3857 #, scheme-format msgid "not a valid duration string: ~a" msgstr "" -#: define-markup-commands.scm:3797 +#: define-markup-commands.scm:4070 #, scheme-format msgid "not a valid duration string: ~a - ignoring" msgstr "" -#: define-music-callbacks.scm:114 -#, scheme-format -msgid "\\time in mid-measure at ~A" -msgstr "" - -#: define-music-types.scm:791 +#: define-music-types.scm:798 #, scheme-format msgid "symbol expected: ~S" msgstr "" -#: define-music-types.scm:794 +#: define-music-types.scm:801 #, scheme-format msgid "cannot find music object: ~S" msgstr "" -#: define-music-types.scm:814 +#: define-music-types.scm:821 #, scheme-format msgid "bad make-music argument: ~S" msgstr "" -#: define-note-names.scm:972 +#: define-note-names.scm:1107 msgid "Select note names language." msgstr "" -#: define-note-names.scm:978 +#: define-note-names.scm:1113 #, scheme-format msgid "Using `~a' note names..." msgstr "" -#: define-note-names.scm:981 +#: define-note-names.scm:1116 #, scheme-format msgid "Could not find language `~a'. Ignoring." msgstr "" -#: document-backend.scm:132 +#: document-backend.scm:135 #, scheme-format msgid "pair expected in doc ~s" msgstr "" -#: document-backend.scm:189 +#: document-backend.scm:202 #, scheme-format msgid "cannot find interface for property: ~S" msgstr "" -#: document-backend.scm:199 +#: document-backend.scm:212 #, scheme-format msgid "unknown Grob interface: ~S" msgstr "" -#: documentation-lib.scm:59 +#: documentation-lib.scm:62 #, scheme-format msgid "Processing ~S..." msgstr "" -#: documentation-lib.scm:176 +#: documentation-lib.scm:178 #, scheme-format msgid "Writing ~S..." msgstr "" -#: documentation-lib.scm:188 +#: documentation-lib.scm:190 #, scheme-format msgid "cannot find description for property `~S' (~S)" msgstr "" -#: documentation-lib.scm:209 +#: documentation-lib.scm:211 #, scheme-format msgid "cannot find description for property ~S (~S)" msgstr "" -#: flag-styles.scm:162 +#: flag-styles.scm:155 #, scheme-format msgid "flag stroke `~a' or `~a' not found" msgstr "" -#: framework-eps.scm:108 +#: framework-eps.scm:112 #, scheme-format msgid "Writing ~a..." msgstr "" -#: framework-ps.scm:251 +#: framework-ps.scm:286 #, scheme-format msgid "cannot embed ~S=~S" msgstr "" -#: framework-ps.scm:294 +#: framework-ps.scm:329 #, scheme-format msgid "cannot extract file matching ~a from ~a" msgstr "" -#: framework-ps.scm:312 +#: framework-ps.scm:353 #, scheme-format msgid "do not know how to embed ~S=~S" msgstr "" -#: framework-ps.scm:337 +#: framework-ps.scm:378 #, scheme-format msgid "do not know how to embed font ~s ~s ~s" msgstr "" -#: framework-ps.scm:688 +#: framework-ps.scm:760 msgid "" "\n" "The PostScript backend does not support the\n" @@ -3531,7 +3544,7 @@ msgid "" "\n" " lilypond -dbackend=eps FILE\n" "\n" -"If have cut & pasted a lilypond fragment from a webpage, be sure\n" +"If you have cut & pasted a lilypond fragment from a webpage, be sure\n" "to only remove anything before\n" "\n" " %% ****************************************************************\n" @@ -3559,107 +3572,106 @@ msgstr "" msgid "Error in beam quanting. Expected ~S 0, found ~S." msgstr "" -#: lily-library.scm:348 +#: lily-library.scm:333 msgid "Music unsuitable for context-mod" msgstr "" -#: lily-library.scm:403 +#: lily-library.scm:388 #, scheme-format msgid "Cannot find context-def \\~a" msgstr "" -#: lily-library.scm:419 +#: lily-library.scm:404 msgid "Music unsuitable for output-def" msgstr "" -#: lily-library.scm:899 +#: lily-library.scm:920 msgid "" "Find the index between @var{start} and @var{end} (an integer)\n" "which produces the closest match to @var{target-val} if\n" "applied to function @var{getter}." msgstr "" -#: lily-library.scm:970 +#: lily-library.scm:1014 #, scheme-format msgid "unknown unit: ~S" msgstr "" -#: lily-library.scm:995 +#: lily-library.scm:1039 #, scheme-format msgid "no \\version statement found, please add~afor future compatibility" msgstr "" -#: lily.scm:75 +#: lily.scm:94 msgid "call-after-session used after session start" msgstr "" -#: lily.scm:93 +#: lily.scm:112 msgid "define-session used after session start" msgstr "" -#: lily.scm:399 +#: lily.scm:122 +msgid "define-session-public used after session start" +msgstr "" + +#: lily.scm:434 msgid "Using (ice-9 curried-definitions) module\n" msgstr "" -#: lily.scm:402 +#: lily.scm:437 msgid "Guile 1.8\n" msgstr "" -#: lily.scm:461 +#: lily.scm:494 #, scheme-format msgid "cannot find: ~A" msgstr "" -#: lily.scm:885 +#: lily.scm:924 msgid "Success: compilation successfully completed" msgstr "" -#: lily.scm:886 +#: lily.scm:925 msgid "Compilation completed with warnings or errors" msgstr "" -#: lily.scm:947 +#: lily.scm:986 #, scheme-format msgid "job ~a terminated with signal: ~a" msgstr "" -#: lily.scm:950 +#: lily.scm:989 #, scheme-format msgid "" "logfile ~a (exit ~a):\n" "~a" msgstr "" -#: lily.scm:972 lily.scm:1061 +#: lily.scm:1011 lily.scm:1100 #, scheme-format msgid "failed files: ~S" msgstr "" -#: lily.scm:1052 +#: lily.scm:1091 #, scheme-format msgid "Redirecting output to ~a..." msgstr "" -#: lily.scm:1071 ps-to-png.scm:66 +#: lily.scm:1110 #, scheme-format msgid "Invoking `~a'...\n" msgstr "" -#: ly-syntax-constructors.scm:66 +#: ly-syntax-constructors.scm:27 #, scheme-format msgid "~a function cannot return ~a" msgstr "" -#: ly-syntax-constructors.scm:75 +#: ly-syntax-constructors.scm:60 #, scheme-format msgid "wrong type for argument ~a. Expecting ~a, found ~s" msgstr "" -#: ly-syntax-constructors.scm:199 -#, scheme-format -msgid "Invalid property operation ~a" -msgstr "" - #: markup-macros.scm:331 #, scheme-format msgid "Wrong number of arguments. Expect: ~A, found ~A: ~S" @@ -3699,67 +3711,87 @@ msgstr "" msgid "negative replication count; ignoring" msgstr "" -#: music-functions.scm:311 +#: music-functions.scm:319 #, scheme-format msgid "invalid tremolo repeat count: ~a" msgstr "" -#: music-functions.scm:340 +#: music-functions.scm:348 #, scheme-format msgid "unknown repeat type `~S': must be volta, unfold, percent, or tremolo" msgstr "" -#: music-functions.scm:344 +#: music-functions.scm:352 msgid "More alternatives than repeats. Junking excess alternatives" msgstr "" -#: music-functions.scm:491 +#: music-functions.scm:487 #, scheme-format msgid "bad grob property path ~a" msgstr "" -#: music-functions.scm:786 +#: music-functions.scm:511 +#, scheme-format +msgid "bad context property ~a" +msgstr "" + +#: music-functions.scm:534 +#, scheme-format +msgid "bad music property ~a" +msgstr "" + +#: music-functions.scm:842 msgid "Bad chord repetition" msgstr "" -#: music-functions.scm:888 +#: music-functions.scm:947 #, scheme-format msgid "music expected: ~S" msgstr "" -#: music-functions.scm:1244 +#: music-functions.scm:1297 #, scheme-format msgid "cannot find quoted music: `~S'" msgstr "" -#: music-functions.scm:1383 +#: music-functions.scm:1434 msgid "Add @var{octave-shift} to the octave of @var{pitch}." msgstr "" -#: music-functions.scm:1446 +#: music-functions.scm:1497 #, scheme-format msgid "Unknown octaveness type: ~S " msgstr "" -#: music-functions.scm:1447 +#: music-functions.scm:1498 msgid "Defaulting to 'any-octave." msgstr "" -#: music-functions.scm:1833 +#: music-functions.scm:1872 #, scheme-format msgid "unknown accidental style: ~S" msgstr "" -#: music-functions.scm:2051 +#: music-functions.scm:2097 msgid "Missing duration" msgstr "" -#: output-ps.scm:278 output-svg.scm:539 +#: music-functions.scm:2633 +#, scheme-format +msgid "not a symbol list: ~a" +msgstr "" + +#: music-functions.scm:2636 +#, scheme-format +msgid "conflicting tag group ~a" +msgstr "" + +#: output-ps.scm:290 output-svg.scm:539 #, scheme-format msgid "unknown line-cap-style: ~S" msgstr "" -#: output-ps.scm:283 output-svg.scm:545 +#: output-ps.scm:295 output-svg.scm:545 #, scheme-format msgid "unknown line-join-style: ~S" msgstr "" @@ -3778,48 +3810,53 @@ msgstr "" msgid "cannot find SVG font ~S" msgstr "" -#: paper.scm:120 +#: paper.scm:121 msgid "set-global-staff-size: not in toplevel scope" msgstr "" -#: paper.scm:320 +#: paper.scm:321 #, scheme-format msgid "This is not a \\layout {} object, ~S" msgstr "" -#: paper.scm:328 +#: paper.scm:329 #, scheme-format msgid "Unknown paper size: ~a" msgstr "" #. TODO: should raise (generic) exception with throw, and catch #. that in parse-scm.cc -#: paper.scm:347 +#: paper.scm:348 msgid "Must use #(set-paper-size .. ) within \\paper { ... }" msgstr "" -#: parser-clef.scm:176 +#: parser-clef.scm:154 #, scheme-format msgid "unknown clef type `~a'" msgstr "" -#: parser-clef.scm:177 +#: parser-clef.scm:155 #, scheme-format msgid "supported clefs: ~a" msgstr "" -#: parser-ly-from-scheme.scm:74 +#: parser-ly-from-scheme.scm:73 msgid "error in #{ ... #}" msgstr "" -#: part-combiner.scm:608 +#: part-combiner.scm:931 #, scheme-format msgid "quoted music `~a' is empty" msgstr "" -#: ps-to-png.scm:70 +#: ps-to-png.scm:72 ps-to-png.scm:75 +#, scheme-format +msgid "Copying `~a' to `~a'..." +msgstr "" + +#: ps-to-png.scm:77 ps-to-png.scm:79 #, scheme-format -msgid "~a exited with status: ~S" +msgid "Deleting `~a'..." msgstr "" #: to-xml.scm:190 @@ -3827,40 +3864,40 @@ msgstr "" msgid "assertion failed: ~S" msgstr "" -#: translation-functions.scm:388 +#: translation-functions.scm:379 #, scheme-format msgid "Negative fret for pitch ~a on string ~a" msgstr "" -#: translation-functions.scm:391 +#: translation-functions.scm:384 #, scheme-format msgid "Missing fret for pitch ~a on string ~a" msgstr "" -#: translation-functions.scm:434 +#: translation-functions.scm:427 #, scheme-format msgid "No open string for pitch ~a" msgstr "" -#: translation-functions.scm:449 translation-functions.scm:461 +#: translation-functions.scm:442 translation-functions.scm:454 #, scheme-format msgid "Requested string for pitch requires negative fret: string ~a pitch ~a" msgstr "" -#: translation-functions.scm:452 +#: translation-functions.scm:445 msgid "Ignoring string request and recalculating." msgstr "" -#: translation-functions.scm:464 +#: translation-functions.scm:457 msgid "Ignoring note in tablature." msgstr "" -#: translation-functions.scm:489 +#: translation-functions.scm:482 #, scheme-format msgid "No string for pitch ~a (given frets ~a)" msgstr "" -#: translation-functions.scm:594 +#: translation-functions.scm:598 #, scheme-format msgid "" "No label for fret ~a (on string ~a);\n"