X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=po%2Flilypond.pot;h=0309639d0cf24f579c0bc4dc8b0d0ed6f9ce5e3b;hb=8eed539b0de1e13bd22ff02599ba0aa9135fb6d3;hp=bf9cf6c87be655c1437883b4c69d94f53a1c8a67;hpb=ec074a41f03cf4cd3b914daa1359dd6e0fb2012d;p=lilypond.git diff --git a/po/lilypond.pot b/po/lilypond.pot index bf9cf6c87b..0309639d0c 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lilypond 2.19.16\n" +"Project-Id-Version: lilypond 2.19.39\n" "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu." "lilypond.bugs\n" -"POT-Creation-Date: 2015-02-28 14:31+0000\n" +"POT-Creation-Date: 2016-03-27 15:42+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" @@ -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 @@ -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:1044 #, 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:183 +#: abc2ly.py:1398 convert-ly.py:92 etf2ly.py:1208 lilypond-book.py:231 +#: midi2ly.py:1095 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:162 +#: abc2ly.py:1401 convert-ly.py:96 etf2ly.py:1204 lilypond-book.py:140 +#: midi2ly.py:1062 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:1071 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:317 +#: abc2ly.py:1416 convert-ly.py:157 etf2ly.py:1218 lilypond-book.py:258 +#: midi2ly.py:1107 musicxml2ly.py:2674 main.cc:318 #, c-format, python-format msgid "Report bugs via %s" msgstr "" @@ -983,7 +983,7 @@ msgid "" msgstr "" #: convert-ly.py:111 lilypond-book.py:163 lilypond-book.py:181 -#: musicxml2ly.py:2629 main.cc:176 +#: musicxml2ly.py:2629 main.cc:177 msgid "LOGLEVEL" msgstr "" @@ -1015,7 +1015,7 @@ 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:185 +#: 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." @@ -1074,7 +1074,7 @@ msgid "" msgstr "" #: etf2ly.py:1210 midi2ly.py:1067 midi2ly.py:1072 musicxml2ly.py:2659 -#: main.cc:168 main.cc:180 +#: 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:167 +#: 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 @@ -1668,7 +1668,7 @@ 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 "" @@ -1682,7 +1682,7 @@ msgstr "" 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 "" @@ -1747,11 +1742,11 @@ 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,22 +1756,24 @@ 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 "" @@ -1812,7 +1809,7 @@ msgid "cannot find line breaking that satisfies constraints" msgstr "" #: context-property.cc:46 -msgid "need symbol arguments for \\override and \\revert" +msgid "need symbol argument for \\override and \\revert" msgstr "" #: context.cc:143 @@ -1825,12 +1822,12 @@ msgstr "" msgid "cannot find or create `%s' called `%s'" msgstr "" -#: context.cc:419 +#: context.cc:453 #, c-format msgid "cannot find or create: `%s'" msgstr "" -#: context.cc:433 +#: context.cc:467 #, c-format msgid "cannot find or create new Bottom = \"%s\"" msgstr "" @@ -1840,20 +1837,20 @@ msgstr "" msgid "custos `%s' not found" msgstr "" -#: dispatcher.cc:83 +#: dispatcher.cc:82 msgid "Event class should be a list" msgstr "" -#: dispatcher.cc:166 +#: dispatcher.cc:165 #, c-format msgid "Junking event: %s" msgstr "" -#: dispatcher.cc:271 +#: dispatcher.cc:279 msgid "Attempting to remove nonexisting listener." msgstr "" -#: dispatcher.cc:297 +#: 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:169 #, c-format msgid "" "unknown crescendo style: %s\n" "defaulting to hairpin." msgstr "" -#: dynamic-engraver.cc:233 slur-proto-engraver.cc:119 +#: dynamic-engraver.cc:234 slur-proto-engraver.cc:159 #, c-format msgid "unterminated %s" msgstr "" @@ -1897,22 +1894,22 @@ msgstr "" 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 "" @@ -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:481 +#: grob.cc:486 #, c-format msgid "ignored infinite %s-offset" msgstr "" @@ -2029,7 +2036,7 @@ msgstr "" 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:177 source-file.cc:192 +#: input.cc:138 source-file.cc:180 source-file.cc:195 msgid "position unknown" msgstr "" -#: key-engraver.cc:198 +#: key-engraver.cc:197 msgid "Incomplete keyAlterationOrder for key signature" 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,23 +2161,23 @@ 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:107 +#: 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 "" @@ -2166,12 +2186,12 @@ msgstr "" msgid "argument of \\lyricsto should contain Lyrics context" msgstr "" -#: lyric-combine-music-iterator.cc:349 +#: lyric-combine-music-iterator.cc:344 #, c-format msgid "cannot find %s `%s'" msgstr "" -#: main.cc:105 +#: main.cc:106 #, c-format msgid "" "This program is free software. It is covered by the GNU General Public\n" @@ -2180,7 +2200,7 @@ msgid "" "information.\n" msgstr "" -#: main.cc:111 +#: 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" @@ -2198,102 +2218,102 @@ msgid "" "Boston, MA 02111-1307, USA.\n" msgstr "" -#: main.cc:149 +#: main.cc:150 msgid "SYM[=VAL]" msgstr "" -#: main.cc:150 +#: main.cc:151 msgid "" "set Scheme option SYM to VAL (default: #t).\n" "Use -dhelp for help." msgstr "" -#: main.cc:154 +#: main.cc:155 msgid "EXPR" msgstr "" -#: main.cc:154 +#: main.cc:155 msgid "evaluate scheme code" msgstr "" #. Bug in option parser: --output =foe is taken as an abbreviation #. for --output-format. -#: main.cc:157 +#: main.cc:158 msgid "FORMATs" msgstr "" -#: main.cc:157 +#: main.cc:158 msgid "dump FORMAT,... Also as separate options:" msgstr "" -#: main.cc:158 +#: main.cc:159 msgid "generate PDF (default)" msgstr "" -#: main.cc:159 +#: main.cc:160 msgid "generate PNG" msgstr "" -#: main.cc:160 +#: main.cc:161 msgid "generate PostScript" msgstr "" -#: main.cc:161 +#: main.cc:162 msgid "generate big PDF files" msgstr "" -#: main.cc:164 +#: main.cc:165 msgid "FIELD" msgstr "" -#: main.cc:164 +#: main.cc:165 msgid "" "dump header field FIELD to file\n" "named BASENAME.FIELD" msgstr "" -#: main.cc:167 +#: main.cc:168 msgid "add DIR to search path" msgstr "" -#: main.cc:168 +#: main.cc:169 msgid "use FILE as init file" msgstr "" -#: main.cc:171 +#: main.cc:172 msgid "USER, GROUP, JAIL, DIR" msgstr "" -#: main.cc:171 +#: main.cc:172 msgid "" "chroot to JAIL, become USER:GROUP\n" "and cd into DIR" msgstr "" -#: main.cc:176 +#: 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:180 +#: main.cc:181 msgid "write output to FILE (suffix will be added)" msgstr "" -#: main.cc:181 +#: main.cc:182 msgid "relocate using directory of lilypond program" msgstr "" -#: main.cc:182 +#: main.cc:183 msgid "no progress, only error messages (equivalent to loglevel=ERROR)" msgstr "" -#: main.cc:184 +#: main.cc:185 msgid "be verbose (equivalent to loglevel=DEBUG)" msgstr "" #. Do not update the copyright years here, run `make grand-replace' -#: main.cc:263 +#: main.cc:264 #, c-format msgid "" "Copyright (c) %s by\n" @@ -2301,84 +2321,84 @@ msgid "" msgstr "" #. No version number or newline here. It confuses help2man. -#: main.cc:301 +#: main.cc:302 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "" -#: main.cc:303 +#: main.cc:304 msgid "Typeset music and/or produce MIDI from FILE." msgstr "" -#: main.cc:305 +#: main.cc:306 msgid "LilyPond produces beautiful music notation." msgstr "" -#: main.cc:307 +#: main.cc:308 #, c-format msgid "For more information, see %s" msgstr "" -#: main.cc:309 +#: main.cc:310 msgid "Options:" msgstr "" -#: main.cc:376 +#: main.cc:377 #, c-format msgid "expected %d arguments with jail, found: %u" msgstr "" -#: main.cc:390 +#: main.cc:391 #, c-format msgid "no such user: %s" msgstr "" -#: main.cc:392 +#: main.cc:393 #, c-format msgid "cannot get user id from user name: %s: %s" msgstr "" -#: main.cc:407 +#: main.cc:408 #, c-format msgid "no such group: %s" msgstr "" -#: main.cc:409 +#: main.cc:410 #, c-format msgid "cannot get group id from group name: %s: %s" msgstr "" -#: main.cc:417 +#: main.cc:418 #, c-format msgid "cannot chroot to: %s: %s" msgstr "" -#: main.cc:424 +#: main.cc:425 #, c-format msgid "cannot change group id to: %d: %s" msgstr "" -#: main.cc:430 +#: main.cc:431 #, c-format msgid "cannot change user id to: %d: %s" msgstr "" -#: main.cc:436 +#: main.cc:437 #, c-format msgid "cannot change working directory to: %s: %s" msgstr "" -#: main.cc:825 +#: main.cc:826 #, c-format msgid "exception caught: %s" msgstr "" #. FIXME: constant error message. -#: mark-engraver.cc:156 +#: mark-engraver.cc:150 msgid "rehearsalMark must have integer value" msgstr "" -#: mark-engraver.cc:162 +#: mark-engraver.cc:156 msgid "mark label must be a markup object" msgstr "" @@ -2424,7 +2444,7 @@ msgstr "" 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:153 #, c-format msgid "ignoring out-of-range value change for MIDI property `%s'" msgstr "" @@ -2461,7 +2481,7 @@ msgid "" "usable-duration-logs must be a non-empty list. Falling back to whole rests." msgstr "" -#: music.cc:149 +#: music.cc:150 #, c-format msgid "octave check failed; expected \"%s\", found: \"%s\"" msgstr "" @@ -2478,7 +2498,7 @@ msgstr "" msgid "placing below" msgstr "" -#: note-collision.cc:510 +#: note-collision.cc:512 msgid "this Voice needs a \\voiceXx or \\shiftXx setting" msgstr "" @@ -2495,37 +2515,37 @@ msgstr "" 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 "" @@ -2565,16 +2585,16 @@ msgstr "" msgid "best score for this sys-count: %f" msgstr "" -#: optimal-page-breaking.cc:216 page-turn-page-breaking.cc:248 +#: optimal-page-breaking.cc:216 page-turn-page-breaking.cc:249 #: paper-score.cc:156 msgid "Drawing systems..." msgstr "" -#: output-def.cc:230 +#: output-def.cc:229 msgid "margins do not fit with line-width, setting default values" msgstr "" -#: output-def.cc:237 +#: output-def.cc:236 msgid "" "systems run off the page due to improper paper settings, setting default " "values" @@ -2597,92 +2617,92 @@ 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:201 +#: paper-book.cc:200 #, c-format msgid "program option -dprint-pages not supported by backend `%s'" msgstr "" -#: paper-book.cc:220 +#: paper-book.cc:219 #, c-format msgid "program option -dpreview not supported by backend `%s'" msgstr "" @@ -2707,7 +2727,7 @@ msgstr "" msgid "Preprocessing graphical objects..." msgstr "" -#: parse-scm.cc:128 +#: parse-scm.cc:124 msgid "GUILE signaled an error for the expression beginning here" msgstr "" @@ -2720,11 +2740,11 @@ 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 "" @@ -2750,7 +2770,7 @@ msgstr "" msgid "no such internal option: %s" msgstr "" -#: property-iterator.cc:115 +#: property-iterator.cc:66 #, c-format msgid "not a grob name, `%s'" msgstr "" @@ -2759,25 +2779,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 "" @@ -2807,37 +2827,37 @@ 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.cc:153 +#: rest-collision.cc:154 msgid "cannot resolve rest collision: rest direction not set" msgstr "" -#: rest-collision.cc:164 rest-collision.cc:273 +#: rest-collision.cc:165 rest-collision.cc:274 msgid "too many colliding rests" msgstr "" @@ -2846,33 +2866,33 @@ msgstr "" msgid "rest `%s' not found" msgstr "" -#: score-engraver.cc:79 +#: score-engraver.cc:77 #, c-format msgid "cannot find `%s'" msgstr "" -#: score-engraver.cc:81 +#: score-engraver.cc:79 msgid "Music font has not been installed properly." msgstr "" -#: score-engraver.cc:83 +#: score-engraver.cc:81 #, c-format msgid "Search path `%s'" msgstr "" -#: score-engraver.cc:85 +#: score-engraver.cc:83 msgid "Aborting" msgstr "" -#: score.cc:160 +#: score.cc:161 msgid "already have music in score" msgstr "" -#: score.cc:161 +#: score.cc:163 msgid "this is the previous music" msgstr "" -#: score.cc:166 +#: score.cc:169 msgid "errors found, ignoring music expression" msgstr "" @@ -2889,29 +2909,29 @@ msgstr "" 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 "" @@ -2946,18 +2966,18 @@ 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:138 +#: text-interface.cc:139 #, c-format msgid "Markup depth exceeds maximal value of %d; Markup: %s" msgstr "" @@ -2970,7 +2990,7 @@ msgstr "" msgid "already have a text spanner" msgstr "" -#: text-spanner-engraver.cc:130 +#: text-spanner-engraver.cc:132 msgid "unterminated text spanner" msgstr "" @@ -2978,7 +2998,7 @@ msgstr "" msgid "unterminated tie" msgstr "" -#: tie-engraver.cc:373 +#: tie-engraver.cc:377 msgid "lonely tie" msgstr "" @@ -2992,7 +3012,7 @@ msgstr "" msgid "strange time signature found: %d/%d" msgstr "" -#: translator-ctors.cc:65 +#: translator-ctors.cc:70 #, c-format msgid "unknown translator: `%s'" msgstr "" @@ -3002,17 +3022,17 @@ 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:320 +#: translator.cc:310 #, c-format msgid "Two simultaneous %s events, junking this one" msgstr "" -#: translator.cc:321 +#: translator.cc:311 #, c-format msgid "Previous %s event here" msgstr "" @@ -3083,206 +3103,210 @@ msgstr "" msgid "giving up" msgstr "" -#: parser.yy:463 parser.yy:847 parser.yy:928 parser.yy:1150 +#: parser.yy:480 parser.yy:963 parser.yy:1044 parser.yy:1264 msgid "bad expression type" msgstr "" -#: parser.yy:759 parser.yy:1361 parser.yy:1406 +#: parser.yy:875 parser.yy:1474 parser.yy:1519 msgid "not a context mod" msgstr "" -#: parser.yy:954 +#: parser.yy:1070 msgid "Missing music in \\score" msgstr "" -#: parser.yy:991 +#: parser.yy:1107 msgid "\\paper cannot be used in \\score, use \\layout instead" msgstr "" -#: parser.yy:1027 +#: parser.yy:1142 msgid "Spurious expression in \\score" msgstr "" -#: parser.yy:1057 +#: parser.yy:1172 msgid "need \\paper for paper block" msgstr "" -#: parser.yy:1234 +#: parser.yy:1347 msgid "music expected" msgstr "" -#: parser.yy:1244 parser.yy:1278 +#: parser.yy:1357 parser.yy:1391 msgid "unexpected post-event" msgstr "" -#: parser.yy:1286 +#: parser.yy:1399 msgid "Ignoring non-music expression" msgstr "" -#: parser.yy:1587 -msgid "not a symbol" +#: parser.yy:1715 +msgid "not a key" msgstr "" -#: parser.yy:2337 parser.yy:2451 parser.yy:2464 parser.yy:2473 +#: parser.yy:2588 parser.yy:2706 parser.yy:2719 parser.yy:2728 msgid "bad grob property path" msgstr "" -#: parser.yy:2431 +#: parser.yy:2686 msgid "only \\consists and \\remove take non-string argument." msgstr "" -#: parser.yy:2492 +#: parser.yy:2747 msgid "bad context property path" msgstr "" -#: parser.yy:2593 +#: parser.yy:2832 +msgid "markup expected" +msgstr "" + +#: parser.yy:2844 msgid "simple string expected" msgstr "" -#: parser.yy:2611 +#: parser.yy:2861 msgid "symbol expected" msgstr "" -#: parser.yy:2747 +#: parser.yy:2997 msgid "not a rhythmic event" msgstr "" -#: parser.yy:2797 +#: parser.yy:3047 msgid "post-event expected" msgstr "" -#: parser.yy:2806 parser.yy:2811 +#: parser.yy:3056 parser.yy:3061 msgid "have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:2887 +#: parser.yy:3137 msgid "expecting string or post-event as script definition" msgstr "" -#: parser.yy:2991 +#: parser.yy:3241 msgid "not an articulation" msgstr "" -#: parser.yy:3063 parser.yy:3106 +#: parser.yy:3307 parser.yy:3359 msgid "not a duration" msgstr "" -#: parser.yy:3127 +#: parser.yy:3380 msgid "bass number expected" msgstr "" -#: parser.yy:3219 +#: parser.yy:3472 msgid "have to be in Note mode for notes" msgstr "" -#: parser.yy:3258 +#: parser.yy:3511 msgid "have to be in Chord mode for chords" msgstr "" -#: parser.yy:3301 +#: parser.yy:3554 msgid "markup outside of text script or \\lyricmode" msgstr "" -#: parser.yy:3306 +#: parser.yy:3559 msgid "unrecognized string, not in text script or \\lyricmode" msgstr "" -#: parser.yy:3458 parser.yy:3467 +#: parser.yy:3711 parser.yy:3720 msgid "not an unsigned integer" msgstr "" -#: parser.yy:3541 +#: parser.yy:3807 msgid "not a markup" msgstr "" -#: lexer.ll:192 +#: lexer.ll:193 msgid "stray UTF-8 BOM encountered" msgstr "" -#: lexer.ll:195 +#: lexer.ll:196 msgid "Skipping UTF-8 BOM" msgstr "" -#: lexer.ll:247 +#: lexer.ll:248 #, c-format msgid "Renaming input to: `%s'" msgstr "" -#: lexer.ll:264 +#: lexer.ll:265 msgid "quoted string expected after \\version" msgstr "" -#: lexer.ll:268 +#: lexer.ll:269 msgid "quoted string expected after \\sourcefilename" msgstr "" -#: lexer.ll:272 +#: lexer.ll:273 msgid "integer expected after \\sourcefileline" msgstr "" -#: lexer.ll:299 +#: lexer.ll:300 msgid "\\maininput not allowed outside init files" msgstr "" -#: lexer.ll:323 +#: lexer.ll:324 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "" -#: lexer.ll:348 +#: lexer.ll:349 msgid "string expected after \\include" msgstr "" -#: lexer.ll:358 +#: lexer.ll:359 msgid "end quote missing" msgstr "" -#: lexer.ll:713 +#: lexer.ll:714 msgid "EOF found inside a comment" msgstr "" -#: lexer.ll:718 +#: lexer.ll:719 msgid "EOF found inside string" msgstr "" -#: lexer.ll:733 +#: lexer.ll:734 msgid "Unfinished main input" msgstr "" -#: lexer.ll:804 +#: lexer.ll:805 #, c-format msgid "invalid character: `%s'" msgstr "" -#: lexer.ll:924 +#: lexer.ll:925 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" -#: lexer.ll:944 +#: lexer.ll:945 #, c-format msgid "undefined character or shorthand: %s" msgstr "" -#: lexer.ll:1235 +#: lexer.ll:1236 msgid "non-UTF-8 input" msgstr "" -#: lexer.ll:1279 +#: lexer.ll:1280 #, c-format msgid "Invalid version string \"%s\"" msgstr "" -#: lexer.ll:1284 +#: lexer.ll:1285 #, c-format msgid "file too old: %s (oldest supported: %s)" msgstr "" -#: lexer.ll:1285 +#: lexer.ll:1286 msgid "consider updating the input with the convert-ly script" msgstr "" -#: lexer.ll:1291 +#: lexer.ll:1292 #, c-format msgid "program too old: %s (file requires: %s)" msgstr "" @@ -3301,24 +3325,34 @@ msgstr "" msgid "`~a' failed (~a)\n" msgstr "" -#: backend-library.scm:94 +#: 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:103 +#: backend-library.scm:118 #, scheme-format msgid "Converting to ~a..." msgstr "" -#: backend-library.scm:141 +#: 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:190 +#: backend-library.scm:268 #, scheme-format msgid "missing stencil expression `~S'" msgstr "" @@ -3353,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 "" @@ -3379,60 +3413,60 @@ msgstr "" msgid "Undefined parent event class `~S'" msgstr "" -#: define-markup-commands.scm:1062 +#: define-markup-commands.scm:1272 msgid "no systems found in \\score markup, does it have a \\layout block?" msgstr "" -#: define-markup-commands.scm:2886 +#: define-markup-commands.scm:3122 #, scheme-format msgid "Cannot find glyph ~a" msgstr "" -#: define-markup-commands.scm:3362 +#: define-markup-commands.scm:3598 #, scheme-format msgid "no brace found for point size ~S " msgstr "" -#: define-markup-commands.scm:3363 +#: define-markup-commands.scm:3599 #, scheme-format msgid "defaulting to ~S pt" msgstr "" -#: define-markup-commands.scm:3615 +#: define-markup-commands.scm:3857 #, scheme-format msgid "not a valid duration string: ~a" msgstr "" -#: define-markup-commands.scm:3826 +#: define-markup-commands.scm:4070 #, scheme-format msgid "not a valid duration string: ~a - ignoring" msgstr "" -#: define-music-types.scm:797 +#: define-music-types.scm:798 #, scheme-format msgid "symbol expected: ~S" msgstr "" -#: define-music-types.scm:800 +#: define-music-types.scm:801 #, scheme-format msgid "cannot find music object: ~S" msgstr "" -#: define-music-types.scm:820 +#: 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 "" @@ -3472,37 +3506,37 @@ msgstr "" 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:281 +#: framework-ps.scm:286 #, scheme-format msgid "cannot embed ~S=~S" msgstr "" -#: framework-ps.scm:324 +#: framework-ps.scm:329 #, scheme-format msgid "cannot extract file matching ~a from ~a" msgstr "" -#: framework-ps.scm:342 +#: framework-ps.scm:347 #, scheme-format msgid "do not know how to embed ~S=~S" msgstr "" -#: framework-ps.scm:367 +#: framework-ps.scm:372 #, scheme-format msgid "do not know how to embed font ~s ~s ~s" msgstr "" -#: framework-ps.scm:729 +#: framework-ps.scm:751 msgid "" "\n" "The PostScript backend does not support the\n" @@ -3510,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" @@ -3538,107 +3572,102 @@ msgstr "" msgid "Error in beam quanting. Expected ~S 0, found ~S." msgstr "" -#: lily-library.scm:350 +#: lily-library.scm:333 msgid "Music unsuitable for context-mod" msgstr "" -#: lily-library.scm:405 +#: lily-library.scm:388 #, scheme-format msgid "Cannot find context-def \\~a" msgstr "" -#: lily-library.scm:421 +#: lily-library.scm:404 msgid "Music unsuitable for output-def" msgstr "" -#: lily-library.scm:921 +#: 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:1015 +#: lily-library.scm:1014 #, scheme-format msgid "unknown unit: ~S" msgstr "" -#: lily-library.scm:1040 +#: lily-library.scm:1039 #, scheme-format msgid "no \\version statement found, please add~afor future compatibility" msgstr "" -#: lily.scm:75 +#: lily.scm:93 msgid "call-after-session used after session start" msgstr "" -#: lily.scm:93 +#: lily.scm:111 msgid "define-session used after session start" msgstr "" -#: lily.scm:399 +#: lily.scm:420 msgid "Using (ice-9 curried-definitions) module\n" msgstr "" -#: lily.scm:402 +#: lily.scm:423 msgid "Guile 1.8\n" msgstr "" -#: lily.scm:459 +#: lily.scm:480 #, scheme-format msgid "cannot find: ~A" msgstr "" -#: lily.scm:886 +#: lily.scm:910 msgid "Success: compilation successfully completed" msgstr "" -#: lily.scm:887 +#: lily.scm:911 msgid "Compilation completed with warnings or errors" msgstr "" -#: lily.scm:948 +#: lily.scm:972 #, scheme-format msgid "job ~a terminated with signal: ~a" msgstr "" -#: lily.scm:951 +#: lily.scm:975 #, scheme-format msgid "" "logfile ~a (exit ~a):\n" "~a" msgstr "" -#: lily.scm:973 lily.scm:1062 +#: lily.scm:997 lily.scm:1086 #, scheme-format msgid "failed files: ~S" msgstr "" -#: lily.scm:1053 +#: lily.scm:1077 #, scheme-format msgid "Redirecting output to ~a..." msgstr "" -#: lily.scm:1072 ps-to-png.scm:66 +#: lily.scm:1096 #, 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:76 +#: ly-syntax-constructors.scm:60 #, scheme-format msgid "wrong type for argument ~a. Expecting ~a, found ~s" msgstr "" -#: ly-syntax-constructors.scm:200 -#, scheme-format -msgid "Invalid property operation ~a" -msgstr "" - #: markup-macros.scm:331 #, scheme-format msgid "Wrong number of arguments. Expect: ~A, found ~A: ~S" @@ -3678,77 +3707,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:480 +#: music-functions.scm:487 #, scheme-format msgid "bad grob property path ~a" msgstr "" -#: music-functions.scm:779 +#: 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:884 +#: music-functions.scm:947 #, scheme-format msgid "music expected: ~S" msgstr "" -#: music-functions.scm:1226 +#: music-functions.scm:1297 #, scheme-format msgid "cannot find quoted music: `~S'" msgstr "" -#: music-functions.scm:1366 +#: music-functions.scm:1434 msgid "Add @var{octave-shift} to the octave of @var{pitch}." msgstr "" -#: music-functions.scm:1429 +#: music-functions.scm:1497 #, scheme-format msgid "Unknown octaveness type: ~S " msgstr "" -#: music-functions.scm:1430 +#: music-functions.scm:1498 msgid "Defaulting to 'any-octave." msgstr "" -#: music-functions.scm:1822 +#: music-functions.scm:1872 #, scheme-format msgid "unknown accidental style: ~S" msgstr "" -#: music-functions.scm:2040 +#: music-functions.scm:2097 msgid "Missing duration" msgstr "" -#: music-functions.scm:2549 +#: music-functions.scm:2633 #, scheme-format msgid "not a symbol list: ~a" msgstr "" -#: music-functions.scm:2552 +#: music-functions.scm:2636 #, scheme-format msgid "conflicting tag group ~a" msgstr "" -#: output-ps.scm:290 output-svg.scm:539 +#: output-ps.scm:286 output-svg.scm:535 #, scheme-format msgid "unknown line-cap-style: ~S" msgstr "" -#: output-ps.scm:295 output-svg.scm:545 +#: output-ps.scm:291 output-svg.scm:541 #, scheme-format msgid "unknown line-join-style: ~S" msgstr "" @@ -3767,23 +3806,23 @@ msgstr "" msgid "cannot find SVG font ~S" msgstr "" -#: paper.scm:122 +#: paper.scm:121 msgid "set-global-staff-size: not in toplevel scope" msgstr "" -#: paper.scm:322 +#: paper.scm:321 #, scheme-format msgid "This is not a \\layout {} object, ~S" msgstr "" -#: paper.scm:330 +#: 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:349 +#: paper.scm:348 msgid "Must use #(set-paper-size .. ) within \\paper { ... }" msgstr "" @@ -3797,18 +3836,23 @@ msgstr "" msgid "supported clefs: ~a" msgstr "" -#: parser-ly-from-scheme.scm:74 +#: parser-ly-from-scheme.scm:73 msgid "error in #{ ... #}" msgstr "" -#: part-combiner.scm:748 +#: 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 @@ -3816,40 +3860,40 @@ msgstr "" msgid "assertion failed: ~S" msgstr "" -#: translation-functions.scm:389 +#: translation-functions.scm:379 #, scheme-format msgid "Negative fret for pitch ~a on string ~a" msgstr "" -#: translation-functions.scm:392 +#: translation-functions.scm:384 #, scheme-format msgid "Missing fret for pitch ~a on string ~a" msgstr "" -#: translation-functions.scm:435 +#: translation-functions.scm:427 #, scheme-format msgid "No open string for pitch ~a" msgstr "" -#: translation-functions.scm:450 translation-functions.scm:462 +#: 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:453 +#: translation-functions.scm:445 msgid "Ignoring string request and recalculating." msgstr "" -#: translation-functions.scm:465 +#: translation-functions.scm:457 msgid "Ignoring note in tablature." msgstr "" -#: translation-functions.scm:490 +#: translation-functions.scm:482 #, scheme-format msgid "No string for pitch ~a (given frets ~a)" msgstr "" -#: translation-functions.scm:595 +#: translation-functions.scm:598 #, scheme-format msgid "" "No label for fret ~a (on string ~a);\n"