X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=po%2Flilypond.pot;h=2d6abe8409e23814192402145c3823c68f3a90c9;hb=e8d5061834a5a658c5ffd078237e9cd660069a7d;hp=588453bec9024d540b89933cd396b942c92c9dd6;hpb=e44d2bd84c567beed2af18808bdd7bf790e25100;p=lilypond.git diff --git a/po/lilypond.pot b/po/lilypond.pot index 588453bec9..2d6abe8409 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.2\n" +"Project-Id-Version: lilypond 2.19.19\n" "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu." "lilypond.bugs\n" -"POT-Creation-Date: 2014-02-02 15:47+0000\n" +"POT-Creation-Date: 2015-04-26 11:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,18 +36,18 @@ msgstr "" msgid "Running `%s' on file `%s' to detect default page settings.\n" msgstr "" -#: book_latex.py:212 book_texinfo.py:228 +#: book_latex.py:219 book_texinfo.py:228 msgid "Unable to auto-detect default settings:\n" msgstr "" -#: book_latex.py:224 book_texinfo.py:240 +#: book_latex.py:231 book_texinfo.py:240 #, python-format msgid "" "Unable to auto-detect default settings:\n" "%s" msgstr "" -#: book_latex.py:247 +#: book_latex.py:254 msgid "cannot detect textwidth from LaTeX" msgstr "" @@ -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" @@ -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 @@ -902,12 +902,12 @@ msgid "" msgstr "" #: abc2ly.py:1395 convert-ly.py:92 etf2ly.py:1208 lilypond-book.py:231 -#: midi2ly.py:1095 musicxml2ly.py:2590 main.cc:181 +#: midi2ly.py:1095 musicxml2ly.py:2590 main.cc:183 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 +#: midi2ly.py:1062 musicxml2ly.py:2572 main.cc:162 msgid "show this help and exit" msgstr "" @@ -932,7 +932,7 @@ msgstr "" #. 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 +#: midi2ly.py:1107 musicxml2ly.py:2674 main.cc:317 #, 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:174 +#: musicxml2ly.py:2629 main.cc:176 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:183 +#: main.cc:185 msgid "show warranty and copyright" msgstr "" @@ -1074,7 +1074,7 @@ msgid "" msgstr "" #: etf2ly.py:1210 midi2ly.py:1067 midi2ly.py:1072 musicxml2ly.py:2659 -#: main.cc:166 main.cc:178 +#: main.cc:168 main.cc:180 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:167 msgid "DIR" msgstr "" @@ -1261,19 +1261,19 @@ 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 "" @@ -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 "" @@ -1673,12 +1673,12 @@ msgstr "" 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 "" @@ -1811,26 +1811,26 @@ msgstr "" msgid "cannot find line breaking that satisfies constraints" msgstr "" -#: context-property.cc:43 +#: context-property.cc:46 msgid "need symbol arguments for \\override and \\revert" msgstr "" -#: context.cc:149 +#: context.cc:143 #, c-format msgid "cannot find or create new `%s'" msgstr "" -#: context.cc:228 +#: context.cc:222 #, c-format msgid "cannot find or create `%s' called `%s'" msgstr "" -#: context.cc:425 +#: context.cc:419 #, c-format msgid "cannot find or create: `%s'" msgstr "" -#: context.cc:439 +#: context.cc:433 #, c-format msgid "cannot find or create new Bottom = \"%s\"" msgstr "" @@ -1840,20 +1840,20 @@ msgstr "" msgid "custos `%s' not found" msgstr "" -#: dispatcher.cc:89 +#: dispatcher.cc:83 msgid "Event class should be a list" msgstr "" -#: dispatcher.cc:172 +#: dispatcher.cc:166 #, c-format msgid "Junking event: %s" msgstr "" -#: dispatcher.cc:277 +#: dispatcher.cc:271 msgid "Attempting to remove nonexisting listener." msgstr "" -#: dispatcher.cc:303 +#: dispatcher.cc:297 msgid "Already listening to dispatcher, ignoring request" msgstr "" @@ -1862,14 +1862,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:119 #, c-format msgid "unterminated %s" msgstr "" @@ -1939,12 +1939,12 @@ 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 "" @@ -2000,7 +2000,7 @@ msgstr "" msgid "%d: %s" msgstr "" -#: grob.cc:488 +#: grob.cc:481 #, c-format msgid "ignored infinite %s-offset" msgstr "" @@ -2039,11 +2039,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:197 msgid "Incomplete keyAlterationOrder for key signature" msgstr "" @@ -2153,7 +2153,7 @@ msgid "" "include-string instead." msgstr "" -#: lily-parser.cc:109 +#: lily-parser.cc:107 msgid "Parsing..." msgstr "" @@ -2162,20 +2162,16 @@ msgstr "" 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:349 #, 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:105 #, c-format msgid "" "This program is free software. It is covered by the GNU General Public\n" @@ -2184,7 +2180,7 @@ msgid "" "information.\n" msgstr "" -#: main.cc:110 +#: main.cc:111 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 +2198,102 @@ msgid "" "Boston, MA 02111-1307, USA.\n" msgstr "" -#: main.cc:148 +#: main.cc:149 msgid "SYM[=VAL]" msgstr "" -#: main.cc:149 +#: main.cc:150 msgid "" "set Scheme option SYM to VAL (default: #t).\n" "Use -dhelp for help." msgstr "" -#: main.cc:153 +#: main.cc:154 msgid "EXPR" msgstr "" -#: main.cc:153 +#: main.cc:154 msgid "evaluate scheme code" msgstr "" #. Bug in option parser: --output =foe is taken as an abbreviation #. for --output-format. -#: main.cc:156 +#: main.cc:157 msgid "FORMATs" msgstr "" -#: main.cc:156 +#: main.cc:157 msgid "dump FORMAT,... Also as separate options:" msgstr "" -#: main.cc:157 +#: main.cc:158 msgid "generate PDF (default)" msgstr "" -#: main.cc:158 +#: main.cc:159 msgid "generate PNG" msgstr "" -#: main.cc:159 +#: main.cc:160 msgid "generate PostScript" msgstr "" -#: main.cc:162 +#: main.cc:161 +msgid "generate big PDF files" +msgstr "" + +#: main.cc:164 msgid "FIELD" msgstr "" -#: main.cc:162 +#: main.cc:164 msgid "" "dump header field FIELD to file\n" "named BASENAME.FIELD" msgstr "" -#: main.cc:165 +#: main.cc:167 msgid "add DIR to search path" msgstr "" -#: main.cc:166 +#: main.cc:168 msgid "use FILE as init file" msgstr "" -#: main.cc:169 +#: main.cc:171 msgid "USER, GROUP, JAIL, DIR" msgstr "" -#: main.cc:169 +#: main.cc:171 msgid "" "chroot to JAIL, become USER:GROUP\n" "and cd into DIR" msgstr "" -#: main.cc:174 +#: main.cc:176 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:180 msgid "write output to FILE (suffix will be added)" msgstr "" -#: main.cc:179 +#: main.cc:181 msgid "relocate using directory of lilypond program" msgstr "" -#: main.cc:180 +#: main.cc:182 msgid "no progress, only error messages (equivalent to loglevel=ERROR)" msgstr "" -#: main.cc:182 +#: main.cc:184 msgid "be verbose (equivalent to loglevel=DEBUG)" msgstr "" #. Do not update the copyright years here, run `make grand-replace' -#: main.cc:261 +#: main.cc:263 #, c-format msgid "" "Copyright (c) %s by\n" @@ -2301,74 +2301,74 @@ msgid "" msgstr "" #. No version number or newline here. It confuses help2man. -#: main.cc:299 +#: main.cc:301 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "" -#: main.cc:301 +#: main.cc:303 msgid "Typeset music and/or produce MIDI from FILE." msgstr "" -#: main.cc:303 +#: main.cc:305 msgid "LilyPond produces beautiful music notation." msgstr "" -#: main.cc:305 +#: main.cc:307 #, c-format msgid "For more information, see %s" msgstr "" -#: main.cc:307 +#: main.cc:309 msgid "Options:" msgstr "" -#: main.cc:374 +#: main.cc:376 #, c-format msgid "expected %d arguments with jail, found: %u" msgstr "" -#: main.cc:388 +#: main.cc:390 #, c-format msgid "no such user: %s" msgstr "" -#: main.cc:390 +#: main.cc:392 #, c-format msgid "cannot get user id from user name: %s: %s" msgstr "" -#: main.cc:405 +#: main.cc:407 #, c-format msgid "no such group: %s" msgstr "" -#: main.cc:407 +#: main.cc:409 #, c-format msgid "cannot get group id from group name: %s: %s" msgstr "" -#: main.cc:415 +#: main.cc:417 #, c-format msgid "cannot chroot to: %s: %s" msgstr "" -#: main.cc:422 +#: main.cc:424 #, c-format msgid "cannot change group id to: %d: %s" msgstr "" -#: main.cc:428 +#: main.cc:430 #, c-format msgid "cannot change user id to: %d: %s" msgstr "" -#: main.cc:434 +#: main.cc:436 #, c-format msgid "cannot change working directory to: %s: %s" msgstr "" -#: main.cc:805 +#: main.cc:825 #, c-format msgid "exception caught: %s" msgstr "" @@ -2448,7 +2448,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,16 +2456,12 @@ 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 +#: music.cc:149 #, c-format msgid "octave check failed; expected \"%s\", found: \"%s\"" msgstr "" @@ -2482,11 +2478,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 "" @@ -2514,22 +2510,22 @@ msgstr "" msgid "FreeType error: %s" msgstr "" -#: open-type-font.cc:112 +#: open-type-font.cc:116 #, c-format msgid "unsupported font format: %s" msgstr "" -#: open-type-font.cc:114 +#: open-type-font.cc:118 #, c-format msgid "error reading font file %s: %s" msgstr "" -#: open-type-font.cc:189 +#: open-type-font.cc:193 #, c-format msgid "FT_Get_Glyph_Name () Freetype error: %s" msgstr "" -#: open-type-font.cc:337 pango-font.cc:257 +#: open-type-font.cc:341 pango-font.cc:257 #, c-format msgid "FT_Get_Glyph_Name () error: %s" msgstr "" @@ -2569,16 +2565,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:230 msgid "margins do not fit with line-width, setting default values" msgstr "" -#: output-def.cc:242 +#: output-def.cc:237 msgid "" "systems run off the page due to improper paper settings, setting default " "values" @@ -2619,43 +2615,43 @@ msgstr "" 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 "" @@ -2681,17 +2677,17 @@ msgstr "" msgid "FreeType face has no PostScript font name" msgstr "" -#: paper-book.cc:214 +#: paper-book.cc:201 #, c-format msgid "program option -dprint-pages not supported by backend `%s'" msgstr "" -#: paper-book.cc:233 +#: paper-book.cc:220 #, c-format msgid "program option -dpreview not supported by backend `%s'" msgstr "" -#: paper-column-engraver.cc:263 +#: paper-column-engraver.cc:264 msgid "" "forced break was overridden by some other event, should you be using bar " "checks?" @@ -2702,12 +2698,12 @@ 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 "" @@ -2720,15 +2716,15 @@ msgstr "" msgid "Conversion of string `%s' to UTF-16be failed: %s" msgstr "" -#: percent-repeat-engraver.cc:147 +#: percent-repeat-engraver.cc:148 msgid "unterminated percent repeat" msgstr "" -#: performance.cc:54 +#: performance.cc:55 msgid "Track..." msgstr "" -#: performance.cc:82 +#: performance.cc:90 #, c-format msgid "MIDI output to `%s'..." msgstr "" @@ -2754,7 +2750,7 @@ msgstr "" msgid "no such internal option: %s" msgstr "" -#: property-iterator.cc:100 +#: property-iterator.cc:115 #, c-format msgid "not a grob name, `%s'" msgstr "" @@ -2811,76 +2807,72 @@ 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:153 msgid "cannot resolve rest collision: rest direction not set" msgstr "" -#: rest-collision.cc:161 rest-collision.cc:270 +#: rest-collision.cc:164 rest-collision.cc:273 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:160 msgid "already have music in score" msgstr "" -#: score.cc:173 +#: score.cc:161 msgid "this is the previous music" msgstr "" -#: score.cc:178 +#: score.cc:166 msgid "errors found, ignoring music expression" msgstr "" @@ -2893,7 +2885,7 @@ msgstr "" msgid " scheme encoding: " msgstr "" -#: skyline-pair.cc:160 +#: skyline-pair.cc:135 msgid "direction must not be CENTER in ly:skyline-pair::skyline" msgstr "" @@ -2919,7 +2911,7 @@ msgstr "" msgid "cannot end %s" msgstr "" -#: slur.cc:434 +#: slur.cc:436 #, c-format msgid "Ignoring grob for slur: %s. avoid-slur not set?" msgstr "" @@ -2965,13 +2957,7 @@ 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:138 #, c-format msgid "Markup depth exceeds maximal value of %d; Markup: %s" msgstr "" @@ -2988,11 +2974,11 @@ msgstr "" msgid "unterminated text spanner" msgstr "" -#: tie-engraver.cc:119 +#: tie-engraver.cc:121 msgid "unterminated tie" msgstr "" -#: tie-engraver.cc:353 +#: tie-engraver.cc:373 msgid "lonely tie" msgstr "" @@ -3001,18 +2987,11 @@ msgstr "" #. #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi. #. -#: time-signature-engraver.cc:75 +#: time-signature-engraver.cc:95 #, 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 #, c-format msgid "unknown translator: `%s'" @@ -3028,12 +3007,12 @@ msgstr "" msgid "cannot find: `%s'" msgstr "" -#: translator.cc:326 +#: translator.cc:320 #, c-format msgid "Two simultaneous %s events, junking this one" msgstr "" -#: translator.cc:327 +#: translator.cc:321 #, c-format msgid "Previous %s event here" msgstr "" @@ -3104,197 +3083,206 @@ msgstr "" msgid "giving up" msgstr "" -#: parser.yy:452 parser.yy:825 parser.yy:895 parser.yy:1105 +#: parser.yy:463 parser.yy:847 parser.yy:928 parser.yy:1150 msgid "bad expression type" msgstr "" -#: parser.yy:748 parser.yy:1312 parser.yy:1357 +#: parser.yy:759 parser.yy:1361 parser.yy:1406 msgid "not a context mod" msgstr "" -#: parser.yy:938 parser.yy:988 +#: parser.yy:954 +msgid "Missing music in \\score" +msgstr "" + +#: parser.yy:991 msgid "\\paper cannot be used in \\score, use \\layout instead" msgstr "" -#: parser.yy:974 -msgid "score expected" +#: parser.yy:1027 +msgid "Spurious expression in \\score" msgstr "" -#: parser.yy:1012 +#: parser.yy:1057 msgid "need \\paper for paper block" msgstr "" -#: parser.yy:1185 +#: parser.yy:1234 msgid "music expected" msgstr "" -#: parser.yy:1195 parser.yy:1229 +#: parser.yy:1244 parser.yy:1278 msgid "unexpected post-event" msgstr "" -#: parser.yy:1237 +#: parser.yy:1286 msgid "Ignoring non-music expression" msgstr "" -#: parser.yy:1455 +#: parser.yy:1587 msgid "not a symbol" msgstr "" -#: parser.yy:2253 parser.yy:2367 parser.yy:2380 parser.yy:2389 +#: parser.yy:2337 parser.yy:2451 parser.yy:2464 parser.yy:2473 msgid "bad grob property path" msgstr "" -#: parser.yy:2347 +#: parser.yy:2431 msgid "only \\consists and \\remove take non-string argument." msgstr "" -#: parser.yy:2408 +#: parser.yy:2492 msgid "bad context property path" msgstr "" -#: parser.yy:2509 +#: parser.yy:2593 msgid "simple string expected" msgstr "" -#: parser.yy:2527 +#: parser.yy:2611 msgid "symbol expected" msgstr "" -#: parser.yy:2659 +#: parser.yy:2747 msgid "not a rhythmic event" msgstr "" -#: parser.yy:2709 +#: parser.yy:2797 msgid "post-event expected" msgstr "" -#: parser.yy:2718 parser.yy:2723 +#: parser.yy:2806 parser.yy:2811 msgid "have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:2799 +#: parser.yy:2887 msgid "expecting string or post-event as script definition" msgstr "" -#: parser.yy:2898 +#: parser.yy:2991 msgid "not an articulation" msgstr "" -#: parser.yy:2970 parser.yy:3013 +#: parser.yy:3063 parser.yy:3106 msgid "not a duration" msgstr "" -#: parser.yy:3034 +#: parser.yy:3127 msgid "bass number expected" msgstr "" -#: parser.yy:3133 +#: parser.yy:3219 msgid "have to be in Note mode for notes" msgstr "" -#: parser.yy:3214 +#: parser.yy:3258 msgid "have to be in Chord mode for chords" msgstr "" -#: parser.yy:3229 +#: parser.yy:3301 msgid "markup outside of text script or \\lyricmode" msgstr "" -#: parser.yy:3234 +#: parser.yy:3306 msgid "unrecognized string, not in text script or \\lyricmode" msgstr "" -#: parser.yy:3386 parser.yy:3395 +#: parser.yy:3458 parser.yy:3467 msgid "not an unsigned integer" msgstr "" -#: parser.yy:3469 +#: parser.yy:3541 msgid "not a markup" msgstr "" -#: lexer.ll:193 +#: lexer.ll:192 msgid "stray UTF-8 BOM encountered" msgstr "" -#: lexer.ll:196 +#: lexer.ll:195 msgid "Skipping UTF-8 BOM" msgstr "" -#: lexer.ll:248 +#: lexer.ll:247 #, c-format msgid "Renaming input to: `%s'" msgstr "" -#: lexer.ll:265 +#: lexer.ll:264 msgid "quoted string expected after \\version" msgstr "" -#: lexer.ll:269 +#: lexer.ll:268 msgid "quoted string expected after \\sourcefilename" msgstr "" -#: lexer.ll:273 +#: lexer.ll:272 msgid "integer expected after \\sourcefileline" msgstr "" -#: lexer.ll:300 +#: lexer.ll:299 msgid "\\maininput not allowed outside init files" msgstr "" -#: lexer.ll:324 +#: lexer.ll:323 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "" -#: lexer.ll:349 +#: lexer.ll:348 msgid "string expected after \\include" msgstr "" -#: lexer.ll:359 +#: lexer.ll:358 msgid "end quote missing" msgstr "" -#: lexer.ll:714 +#: lexer.ll:713 msgid "EOF found inside a comment" msgstr "" -#: lexer.ll:719 +#: lexer.ll:718 msgid "EOF found inside string" msgstr "" -#: lexer.ll:734 +#: lexer.ll:733 msgid "Unfinished main input" msgstr "" -#: lexer.ll:805 +#: lexer.ll:804 #, c-format msgid "invalid character: `%s'" msgstr "" -#: lexer.ll:925 +#: lexer.ll:924 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" -#: lexer.ll:945 +#: lexer.ll:944 #, c-format msgid "undefined character or shorthand: %s" msgstr "" -#: lexer.ll:1236 +#: lexer.ll:1235 msgid "non-UTF-8 input" msgstr "" -#: lexer.ll:1280 +#: lexer.ll:1279 +#, c-format +msgid "Invalid version string \"%s\"" +msgstr "" + +#: lexer.ll:1284 #, c-format msgid "file too old: %s (oldest supported: %s)" msgstr "" -#: lexer.ll:1281 +#: lexer.ll:1285 msgid "consider updating the input with the convert-ly script" msgstr "" -#: lexer.ll:1287 +#: lexer.ll:1291 #, c-format msgid "program too old: %s (file requires: %s)" msgstr "" @@ -3313,24 +3301,24 @@ msgstr "" msgid "`~a' failed (~a)\n" msgstr "" -#: backend-library.scm:93 +#: backend-library.scm:94 #, 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:103 #, scheme-format msgid "Converting to ~a..." msgstr "" -#: backend-library.scm:140 +#: backend-library.scm:141 #, scheme-format msgid "Writing header field `~a' to `~a'..." msgstr "" -#: backend-library.scm:189 +#: backend-library.scm:190 #, scheme-format msgid "missing stencil expression `~S'" msgstr "" @@ -3376,61 +3364,61 @@ 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:1062 msgid "no systems found in \\score markup, does it have a \\layout block?" msgstr "" -#: define-markup-commands.scm:2856 +#: define-markup-commands.scm:2886 #, scheme-format msgid "Cannot find glyph ~a" msgstr "" -#: define-markup-commands.scm:3282 +#: define-markup-commands.scm:3362 #, scheme-format msgid "no brace found for point size ~S " msgstr "" -#: define-markup-commands.scm:3283 +#: define-markup-commands.scm:3363 #, scheme-format msgid "defaulting to ~S pt" msgstr "" -#: define-markup-commands.scm:3535 +#: define-markup-commands.scm:3615 #, scheme-format msgid "not a valid duration string: ~a" msgstr "" -#: define-markup-commands.scm:3746 +#: define-markup-commands.scm:3826 #, scheme-format msgid "not a valid duration string: ~a - ignoring" msgstr "" -#: define-music-types.scm:791 +#: define-music-types.scm:794 #, scheme-format msgid "symbol expected: ~S" msgstr "" -#: define-music-types.scm:794 +#: define-music-types.scm:797 #, scheme-format msgid "cannot find music object: ~S" msgstr "" -#: define-music-types.scm:814 +#: define-music-types.scm:817 #, scheme-format msgid "bad make-music argument: ~S" msgstr "" @@ -3449,37 +3437,37 @@ msgstr "" 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 "" @@ -3494,27 +3482,27 @@ msgstr "" msgid "Writing ~a..." msgstr "" -#: framework-ps.scm:251 +#: framework-ps.scm:281 #, scheme-format msgid "cannot embed ~S=~S" msgstr "" -#: framework-ps.scm:294 +#: framework-ps.scm:324 #, scheme-format msgid "cannot extract file matching ~a from ~a" msgstr "" -#: framework-ps.scm:312 +#: framework-ps.scm:342 #, scheme-format msgid "do not know how to embed ~S=~S" msgstr "" -#: framework-ps.scm:337 +#: framework-ps.scm:367 #, scheme-format msgid "do not know how to embed font ~s ~s ~s" msgstr "" -#: framework-ps.scm:688 +#: framework-ps.scm:729 msgid "" "\n" "The PostScript backend does not support the\n" @@ -3550,32 +3538,32 @@ msgstr "" msgid "Error in beam quanting. Expected ~S 0, found ~S." msgstr "" -#: lily-library.scm:348 +#: lily-library.scm:350 msgid "Music unsuitable for context-mod" msgstr "" -#: lily-library.scm:403 +#: lily-library.scm:405 #, scheme-format msgid "Cannot find context-def \\~a" msgstr "" -#: lily-library.scm:419 +#: lily-library.scm:421 msgid "Music unsuitable for output-def" msgstr "" -#: lily-library.scm:899 +#: lily-library.scm:921 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:1015 #, scheme-format msgid "unknown unit: ~S" msgstr "" -#: lily-library.scm:995 +#: lily-library.scm:1040 #, scheme-format msgid "no \\version statement found, please add~afor future compatibility" msgstr "" @@ -3596,42 +3584,42 @@ msgstr "" msgid "Guile 1.8\n" msgstr "" -#: lily.scm:461 +#: lily.scm:459 #, scheme-format msgid "cannot find: ~A" msgstr "" -#: lily.scm:885 +#: lily.scm:886 msgid "Success: compilation successfully completed" msgstr "" -#: lily.scm:886 +#: lily.scm:887 msgid "Compilation completed with warnings or errors" msgstr "" -#: lily.scm:947 +#: lily.scm:948 #, scheme-format msgid "job ~a terminated with signal: ~a" msgstr "" -#: lily.scm:950 +#: lily.scm:951 #, scheme-format msgid "" "logfile ~a (exit ~a):\n" "~a" msgstr "" -#: lily.scm:972 lily.scm:1061 +#: lily.scm:973 lily.scm:1062 #, scheme-format msgid "failed files: ~S" msgstr "" -#: lily.scm:1052 +#: lily.scm:1053 #, scheme-format msgid "Redirecting output to ~a..." msgstr "" -#: lily.scm:1071 ps-to-png.scm:66 +#: lily.scm:1072 ps-to-png.scm:66 #, scheme-format msgid "Invoking `~a'...\n" msgstr "" @@ -3641,12 +3629,12 @@ msgstr "" msgid "~a function cannot return ~a" msgstr "" -#: ly-syntax-constructors.scm:75 +#: ly-syntax-constructors.scm:76 #, scheme-format msgid "wrong type for argument ~a. Expecting ~a, found ~s" msgstr "" -#: ly-syntax-constructors.scm:199 +#: ly-syntax-constructors.scm:200 #, scheme-format msgid "Invalid property operation ~a" msgstr "" @@ -3690,67 +3678,77 @@ msgstr "" msgid "negative replication count; ignoring" msgstr "" -#: music-functions.scm:301 +#: music-functions.scm:310 #, scheme-format msgid "invalid tremolo repeat count: ~a" msgstr "" -#: music-functions.scm:330 +#: music-functions.scm:339 #, scheme-format msgid "unknown repeat type `~S': must be volta, unfold, percent, or tremolo" msgstr "" -#: music-functions.scm:334 +#: music-functions.scm:343 msgid "More alternatives than repeats. Junking excess alternatives" msgstr "" -#: music-functions.scm:481 +#: music-functions.scm:479 #, scheme-format msgid "bad grob property path ~a" msgstr "" -#: music-functions.scm:776 +#: music-functions.scm:778 msgid "Bad chord repetition" msgstr "" -#: music-functions.scm:878 +#: music-functions.scm:883 #, scheme-format msgid "music expected: ~S" msgstr "" -#: music-functions.scm:1234 +#: music-functions.scm:1225 #, scheme-format msgid "cannot find quoted music: `~S'" msgstr "" -#: music-functions.scm:1373 +#: music-functions.scm:1365 msgid "Add @var{octave-shift} to the octave of @var{pitch}." msgstr "" -#: music-functions.scm:1433 +#: music-functions.scm:1428 #, scheme-format msgid "Unknown octaveness type: ~S " msgstr "" -#: music-functions.scm:1434 +#: music-functions.scm:1429 msgid "Defaulting to 'any-octave." msgstr "" -#: music-functions.scm:1779 +#: music-functions.scm:1821 #, scheme-format msgid "unknown accidental style: ~S" msgstr "" -#: music-functions.scm:1997 +#: music-functions.scm:2039 msgid "Missing duration" msgstr "" -#: output-ps.scm:278 output-svg.scm:539 +#: music-functions.scm:2548 +#, scheme-format +msgid "not a symbol list: ~a" +msgstr "" + +#: music-functions.scm:2551 +#, 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 "" @@ -3769,32 +3767,32 @@ msgstr "" msgid "cannot find SVG font ~S" msgstr "" -#: paper.scm:120 +#: paper.scm:122 msgid "set-global-staff-size: not in toplevel scope" msgstr "" -#: paper.scm:320 +#: paper.scm:322 #, scheme-format msgid "This is not a \\layout {} object, ~S" msgstr "" -#: paper.scm:328 +#: paper.scm:330 #, 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:349 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 "" @@ -3803,7 +3801,7 @@ msgstr "" msgid "error in #{ ... #}" msgstr "" -#: part-combiner.scm:608 +#: part-combiner.scm:763 #, scheme-format msgid "quoted music `~a' is empty" msgstr "" @@ -3818,40 +3816,40 @@ msgstr "" msgid "assertion failed: ~S" msgstr "" -#: translation-functions.scm:388 +#: translation-functions.scm:389 #, scheme-format msgid "Negative fret for pitch ~a on string ~a" msgstr "" -#: translation-functions.scm:391 +#: translation-functions.scm:392 #, scheme-format msgid "Missing fret for pitch ~a on string ~a" msgstr "" -#: translation-functions.scm:434 +#: translation-functions.scm:435 #, scheme-format msgid "No open string for pitch ~a" msgstr "" -#: translation-functions.scm:449 translation-functions.scm:461 +#: translation-functions.scm:450 translation-functions.scm:462 #, scheme-format msgid "Requested string for pitch requires negative fret: string ~a pitch ~a" msgstr "" -#: translation-functions.scm:452 +#: translation-functions.scm:453 msgid "Ignoring string request and recalculating." msgstr "" -#: translation-functions.scm:464 +#: translation-functions.scm:465 msgid "Ignoring note in tablature." msgstr "" -#: translation-functions.scm:489 +#: translation-functions.scm:490 #, scheme-format msgid "No string for pitch ~a (given frets ~a)" msgstr "" -#: translation-functions.scm:594 +#: translation-functions.scm:595 #, scheme-format msgid "" "No label for fret ~a (on string ~a);\n"