From 8efa36a18316fb8771ab4550a4b771f265cc1949 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 17 Apr 2005 09:46:36 +0000 Subject: [PATCH] * SConstruct: Require pkg-config. * SConstruct (test_lib): New function. Update pkg-config and some other requirements. --- ChangeLog | 2 + SConstruct | 2 + po/lilypond.pot | 565 ++++++++++++++++++++++++++---------------------- 3 files changed, 312 insertions(+), 257 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c8708dd50..eff4abf938 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-04-17 Jan Nieuwenhuizen + * SConstruct: Require pkg-config. + * stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too. * lily/*: s/ifdef HAVE_*/if have/. diff --git a/SConstruct b/SConstruct index a432db898c..fb52df0540 100644 --- a/SConstruct +++ b/SConstruct @@ -392,6 +392,8 @@ def configure (target, source, env): #this could happen after flower... env.ParseConfig ('guile-config compile') + test_program (required, 'pkg-config', '0.9.0', + 'pkg-config library compile manager', 'pkg-config') if test_lib (required, 'freetype2', '0.0', 'Development files for FreeType 2 font engine'): conf.env['DEFINES']['HAVE_FREETYPE2'] = '1' diff --git a/po/lilypond.pot b/po/lilypond.pot index 0660a2e024..86cf039c18 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-04-16 16:50+0200\n" +"POT-Creation-Date: 2005-04-17 11:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,7 +36,7 @@ msgid "lilylib module" msgstr "" #: lilylib.py:65 lilypond-book.py:89 midi2ly.py:100 mup2ly.py:75 ps2png.py:41 -#: main.cc:145 +#: main.cc:145 lily/main.cc:145 msgid "print this help" msgstr "" @@ -53,12 +53,13 @@ msgstr "" msgid "It comes with NO WARRANTY." msgstr "" -#: lilylib.py:125 warn.cc:44 input.cc:79 +#: lilylib.py:125 warn.cc:44 input.cc:79 lily/input.cc:79 #, c-format, python-format msgid "warning: %s" msgstr "" -#: lilylib.py:128 warn.cc:50 input.cc:85 input.cc:93 +#: lilylib.py:128 warn.cc:50 input.cc:85 input.cc:93 lily/input.cc:85 +#: lily/input.cc:93 #, c-format, python-format msgid "error: %s" msgstr "" @@ -74,12 +75,13 @@ msgid "Usage: %s [OPTIONS]... FILE" msgstr "" #: lilylib.py:204 convert-ly.py:57 midi2ly.py:227 mup2ly.py:223 main.cc:211 +#: lily/main.cc:211 #, c-format msgid "Options:" msgstr "" #: lilylib.py:208 convert-ly.py:68 lilypond-pdfpc-helper.py:28 midi2ly.py:231 -#: mup2ly.py:227 main.cc:215 +#: mup2ly.py:227 main.cc:215 lily/main.cc:215 #, c-format, python-format msgid "Report bugs to %s." msgstr "" @@ -170,7 +172,7 @@ msgid "" " -v, --version print program version" msgstr "" -#: convert-ly.py:75 lilypond-pdfpc-helper.py:34 main.cc:98 +#: convert-ly.py:75 lilypond-pdfpc-helper.py:34 main.cc:98 lily/main.cc:98 #, c-format, python-format msgid "" "This program is free software. It is covered by the GNU General Public\n" @@ -205,7 +207,7 @@ msgstr "" msgid "%s: error while converting" msgstr "" -#: convert-ly.py:2509 score-engraver.cc:111 +#: convert-ly.py:2509 score-engraver.cc:111 lily/score-engraver.cc:111 msgid "Aborting" msgstr "" @@ -252,7 +254,7 @@ msgstr "" msgid "pipe snippets through FILTER [convert-ly -n -]" msgstr "" -#: lilypond-book.py:90 lilypond-book.py:92 main.cc:147 +#: lilypond-book.py:90 lilypond-book.py:92 main.cc:147 lily/main.cc:147 msgid "DIR" msgstr "" @@ -272,7 +274,8 @@ msgstr "" msgid "process ly_files using COMMAND FILE..." msgstr "" -#: lilypond-book.py:96 midi2ly.py:102 main.cc:148 main.cc:149 +#: lilypond-book.py:96 midi2ly.py:102 main.cc:148 main.cc:149 lily/main.cc:148 +#: lily/main.cc:149 msgid "FILE" msgstr "" @@ -281,6 +284,7 @@ msgid "extract all PS snippet fonts into FILE" msgstr "" #: lilypond-book.py:99 midi2ly.py:105 mup2ly.py:78 ps2png.py:42 main.cc:155 +#: lily/main.cc:155 msgid "be verbose" msgstr "" @@ -289,6 +293,7 @@ msgid "print version information" msgstr "" #: lilypond-book.py:103 midi2ly.py:107 mup2ly.py:80 main.cc:156 +#: lily/main.cc:156 msgid "show warranty and copyright" msgstr "" @@ -441,7 +446,7 @@ msgstr "" msgid "allow tuplet durations DUR*NUM/DEN" msgstr "" -#: midi2ly.py:106 mup2ly.py:79 main.cc:154 +#: midi2ly.py:106 mup2ly.py:79 main.cc:154 lily/main.cc:154 msgid "print version number" msgstr "" @@ -556,7 +561,7 @@ msgstr "" msgid "invalid argument `%s' to option `%s'" msgstr "" -#: warn.cc:64 grob.cc:632 +#: warn.cc:64 grob.cc:632 lily/grob.cc:632 #, c-format msgid "programming error: %s" msgstr "" @@ -593,147 +598,155 @@ msgstr "" msgid "aborting" msgstr "" -#: accidental-engraver.cc:235 +#: accidental-engraver.cc:235 lily/accidental-engraver.cc:235 #, c-format msgid "accidental typesetting list must begin with context-name: %s" msgstr "" -#: accidental-engraver.cc:263 +#: accidental-engraver.cc:263 lily/accidental-engraver.cc:263 #, c-format msgid "ignoring unknown accidental: %s" msgstr "" -#: accidental-engraver.cc:279 +#: accidental-engraver.cc:279 lily/accidental-engraver.cc:279 #, c-format msgid "pair or context-name expected for accidental rule, found %s" msgstr "" -#: accidental.cc:233 key-signature-interface.cc:127 +#: accidental.cc:233 key-signature-interface.cc:127 lily/accidental.cc:233 +#: lily/key-signature-interface.cc:127 #, c-format msgid "accidental `%s' not found" msgstr "" -#: afm.cc:142 +#: afm.cc:142 lily/afm.cc:142 #, c-format msgid "parsing AFM file: `%s'" msgstr "" #. FIXME: broken sentence -#: all-font-metrics.cc:176 +#. FIXME: broken sentence +#: all-font-metrics.cc:176 lily/all-font-metrics.cc:176 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:178 +#: all-font-metrics.cc:178 lily/all-font-metrics.cc:178 #, c-format msgid "does not match: `%s'" msgstr "" -#: all-font-metrics.cc:184 +#: all-font-metrics.cc:184 lily/all-font-metrics.cc:184 msgid "Rebuild all .afm files, and remove all .pk and .tfm files." msgstr "" -#: all-font-metrics.cc:186 +#: all-font-metrics.cc:186 lily/all-font-metrics.cc:186 msgid "Rerun with -V to show font paths." msgstr "" -#: all-font-metrics.cc:188 +#: all-font-metrics.cc:188 lily/all-font-metrics.cc:188 msgid "A script for removing font-files is delivered with the source-code:" msgstr "" -#: all-font-metrics.cc:297 +#: all-font-metrics.cc:297 lily/all-font-metrics.cc:297 #, c-format msgid "can't find font: `%s'" msgstr "" -#: all-font-metrics.cc:298 +#: all-font-metrics.cc:298 lily/all-font-metrics.cc:298 msgid "loading default font" msgstr "" -#: all-font-metrics.cc:313 +#: all-font-metrics.cc:313 lily/all-font-metrics.cc:313 #, c-format msgid "can't find default font: `%s'" msgstr "" #: all-font-metrics.cc:314 includable-lexer.cc:59 lily-parser-scheme.cc:70 +#: lily/all-font-metrics.cc:314 lily/includable-lexer.cc:59 +#: lily/lily-parser-scheme.cc:70 #, c-format msgid "(search path: `%s')" msgstr "" -#: all-font-metrics.cc:315 volta-engraver.cc:142 +#: all-font-metrics.cc:315 volta-engraver.cc:142 lily/all-font-metrics.cc:315 +#: lily/volta-engraver.cc:142 msgid "giving up" msgstr "" -#: apply-context-iterator.cc:33 +#: apply-context-iterator.cc:33 lily/apply-context-iterator.cc:33 msgid "\\applycontext argument is not a procedure" msgstr "" #: auto-change-iterator.cc:62 change-iterator.cc:60 +#: lily/auto-change-iterator.cc:62 lily/change-iterator.cc:60 #, c-format msgid "can't change, already in translator: %s" msgstr "" -#: axis-group-engraver.cc:112 +#: axis-group-engraver.cc:112 lily/axis-group-engraver.cc:112 msgid "Axis_group_engraver: vertical group already has a parent" msgstr "" -#: axis-group-engraver.cc:113 +#: axis-group-engraver.cc:113 lily/axis-group-engraver.cc:113 msgid "are there two Axis_group_engravers?" msgstr "" -#: axis-group-engraver.cc:114 +#: axis-group-engraver.cc:114 lily/axis-group-engraver.cc:114 msgid "removing this vertical group" msgstr "" -#: bar-check-iterator.cc:70 +#: bar-check-iterator.cc:70 lily/bar-check-iterator.cc:70 #, c-format msgid "barcheck failed at: %s" msgstr "" -#: beam-engraver.cc:136 +#: beam-engraver.cc:136 lily/beam-engraver.cc:136 msgid "already have a beam" msgstr "" -#: beam-engraver.cc:205 +#: beam-engraver.cc:205 lily/beam-engraver.cc:205 msgid "unterminated beam" msgstr "" #: beam-engraver.cc:238 chord-tremolo-engraver.cc:165 +#: lily/beam-engraver.cc:238 lily/chord-tremolo-engraver.cc:165 msgid "stem must have Rhythmic structure" msgstr "" -#: beam-engraver.cc:251 +#: beam-engraver.cc:251 lily/beam-engraver.cc:251 msgid "stem doesn't fit in beam" msgstr "" -#: beam-engraver.cc:252 +#: beam-engraver.cc:252 lily/beam-engraver.cc:252 msgid "beam was started here" msgstr "" -#: beam.cc:142 +#: beam.cc:142 lily/beam.cc:142 msgid "beam has less than two visible stems" msgstr "" -#: beam.cc:147 +#: beam.cc:147 lily/beam.cc:147 msgid "removing beam with less than two stems" msgstr "" -#: beam.cc:988 +#: beam.cc:988 lily/beam.cc:988 msgid "no viable initial configuration found: may not find good beam slope" msgstr "" -#: break-align-interface.cc:205 +#: break-align-interface.cc:205 lily/break-align-interface.cc:205 #, c-format msgid "No spacing entry from %s to `%s'" msgstr "" -#: change-iterator.cc:22 +#: change-iterator.cc:22 lily/change-iterator.cc:22 #, c-format msgid "can't change `%s' to `%s'" msgstr "" #. FIXME: constant error message. -#: change-iterator.cc:81 +#. FIXME: constant error message. +#: change-iterator.cc:81 lily/change-iterator.cc:81 msgid "can't find context to switch to" msgstr "" @@ -742,340 +755,353 @@ msgstr "" #. #. last->translator_id_string () = get_change #. ()->change_to_id_string (); -#: change-iterator.cc:90 +#. 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:90 lily/change-iterator.cc:90 #, c-format msgid "not changing to same context type: %s" msgstr "" #. FIXME: uncomprehensable message -#: change-iterator.cc:94 +#. FIXME: uncomprehensable message +#: change-iterator.cc:94 lily/change-iterator.cc:94 msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:94 +#: chord-tremolo-engraver.cc:94 lily/chord-tremolo-engraver.cc:94 #, c-format msgid "expect 2 elements for chord tremolo, found %d" msgstr "" -#: chord-tremolo-engraver.cc:131 +#: chord-tremolo-engraver.cc:131 lily/chord-tremolo-engraver.cc:131 msgid "unterminated chord tremolo" msgstr "" -#: chord-tremolo-iterator.cc:64 +#: chord-tremolo-iterator.cc:64 lily/chord-tremolo-iterator.cc:64 msgid "no one to print a tremolos" msgstr "" -#: clef.cc:57 +#: clef.cc:57 lily/clef.cc:57 #, c-format msgid "clef `%s' not found" msgstr "" -#: cluster.cc:118 +#: cluster.cc:118 lily/cluster.cc:118 #, c-format msgid "unknown cluster style `%s'" msgstr "" -#: cluster.cc:144 +#: cluster.cc:144 lily/cluster.cc:144 msgid "junking empty cluster" msgstr "" -#: coherent-ligature-engraver.cc:84 +#: coherent-ligature-engraver.cc:84 lily/coherent-ligature-engraver.cc:84 #, c-format msgid "gotcha: ptr=%ul" msgstr "" -#: coherent-ligature-engraver.cc:93 +#: coherent-ligature-engraver.cc:93 lily/coherent-ligature-engraver.cc:93 msgid "distance undefined, assuming 0.1" msgstr "" -#: coherent-ligature-engraver.cc:96 +#: coherent-ligature-engraver.cc:96 lily/coherent-ligature-engraver.cc:96 #, c-format msgid "distance=%f" msgstr "" -#: coherent-ligature-engraver.cc:139 +#: coherent-ligature-engraver.cc:139 lily/coherent-ligature-engraver.cc:139 #, c-format msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul" msgstr "" -#: context-def.cc:111 +#: context-def.cc:111 lily/context-def.cc:111 #, c-format msgid "program has no such type: `%s'" msgstr "" -#: context-def.cc:285 +#: context-def.cc:285 lily/context-def.cc:285 #, c-format msgid "can't find: `%s'" msgstr "" -#: context-property.cc:111 +#: context-property.cc:111 lily/context-property.cc:111 msgid "need symbol arguments for \\override and \\revert" msgstr "" -#: context.cc:146 +#: context.cc:146 lily/context.cc:146 #, c-format msgid "can't find or create new `%s'" msgstr "" -#: context.cc:210 +#: context.cc:210 lily/context.cc:210 #, c-format msgid "can't find or create `%s' called `%s'" msgstr "" -#: context.cc:301 +#: context.cc:301 lily/context.cc:301 #, c-format msgid "can't find or create: `%s'" msgstr "" -#: custos.cc:83 +#: custos.cc:83 lily/custos.cc:83 #, c-format msgid "custos `%s' not found" msgstr "" #: dynamic-engraver.cc:171 span-dynamic-performer.cc:83 +#: lily/dynamic-engraver.cc:171 lily/span-dynamic-performer.cc:83 msgid "can't find start of (de)crescendo" msgstr "" -#: dynamic-engraver.cc:180 +#: dynamic-engraver.cc:180 lily/dynamic-engraver.cc:180 msgid "already have a decrescendo" msgstr "" -#: dynamic-engraver.cc:182 +#: dynamic-engraver.cc:182 lily/dynamic-engraver.cc:182 msgid "already have a crescendo" msgstr "" -#: dynamic-engraver.cc:185 +#: dynamic-engraver.cc:185 lily/dynamic-engraver.cc:185 msgid "cresc starts here" msgstr "" -#: dynamic-engraver.cc:304 +#: dynamic-engraver.cc:304 lily/dynamic-engraver.cc:304 msgid "unterminated (de)crescendo" msgstr "" #: event-chord-iterator.cc:55 output-property-music-iterator.cc:29 +#: lily/event-chord-iterator.cc:55 lily/output-property-music-iterator.cc:29 #, c-format msgid "junking event: `%s'" msgstr "" #: extender-engraver.cc:139 extender-engraver.cc:148 +#: lily/extender-engraver.cc:139 lily/extender-engraver.cc:148 msgid "unterminated extender" msgstr "" -#: folded-repeat-iterator.cc:64 +#: folded-repeat-iterator.cc:64 lily/folded-repeat-iterator.cc:64 msgid "no one to print a repeat brace" msgstr "" -#: font-config.cc:23 +#: font-config.cc:23 lily/font-config.cc:23 msgid "Initializing FontConfig..." msgstr "" -#: font-config.cc:26 +#: font-config.cc:26 lily/font-config.cc:26 msgid "initializing FontConfig" msgstr "" -#: font-config.cc:47 +#: font-config.cc:47 lily/font-config.cc:47 #, c-format msgid "adding lilypond directory: %s" msgstr "" -#: font-config.cc:49 +#: font-config.cc:49 lily/font-config.cc:49 #, c-format msgid "adding font directory: %s" msgstr "" -#: general-scheme.cc:172 +#: general-scheme.cc:172 lily/general-scheme.cc:172 msgid "infinity or NaN encountered while converting Real number" msgstr "" -#: general-scheme.cc:173 +#: general-scheme.cc:173 lily/general-scheme.cc:173 msgid "setting to zero" msgstr "" -#: glissando-engraver.cc:97 +#: glissando-engraver.cc:97 lily/glissando-engraver.cc:97 msgid "unterminated glissando" msgstr "" #: global-context-scheme.cc:50 global-context-scheme.cc:77 +#: lily/global-context-scheme.cc:50 lily/global-context-scheme.cc:77 msgid "no music found in score" msgstr "" -#: global-context-scheme.cc:67 +#: global-context-scheme.cc:67 lily/global-context-scheme.cc:67 msgid "Interpreting music... " msgstr "" -#: global-context-scheme.cc:88 +#: global-context-scheme.cc:88 lily/global-context-scheme.cc:88 #, c-format msgid "elapsed time: %.2f seconds" msgstr "" -#: global-context.cc:160 +#: global-context.cc:160 lily/global-context.cc:160 #, c-format msgid "can't find `%s' context" msgstr "" -#: gourlay-breaking.cc:199 +#: gourlay-breaking.cc:199 lily/gourlay-breaking.cc:199 #, c-format msgid "Optimal demerits: %f" msgstr "" -#: gourlay-breaking.cc:204 +#: gourlay-breaking.cc:204 lily/gourlay-breaking.cc:204 msgid "no feasible line breaking found" msgstr "" -#: gourlay-breaking.cc:212 +#: gourlay-breaking.cc:212 lily/gourlay-breaking.cc:212 msgid "can't find line breaking that satisfies constraints" msgstr "" -#: gregorian-ligature-engraver.cc:59 +#: gregorian-ligature-engraver.cc:59 lily/gregorian-ligature-engraver.cc:59 #, c-format msgid "\\%s ignored" msgstr "" -#: gregorian-ligature-engraver.cc:64 +#: gregorian-ligature-engraver.cc:64 lily/gregorian-ligature-engraver.cc:64 #, c-format msgid "implied \\%s added" msgstr "" -#: gregorian-ligature-engraver.cc:213 +#: gregorian-ligature-engraver.cc:213 lily/gregorian-ligature-engraver.cc:213 msgid "Cannot apply `\\~' on first head of ligature; ignoring `\\~'" msgstr "" -#: gregorian-ligature-engraver.cc:227 +#: gregorian-ligature-engraver.cc:227 lily/gregorian-ligature-engraver.cc:227 msgid "can't apply `\\~' on heads with identical pitch; ignoring `\\~'" msgstr "" -#: grob-interface.cc:45 +#: grob-interface.cc:45 lily/grob-interface.cc:45 #, c-format msgid "Unknown interface `%s'" msgstr "" -#: grob-interface.cc:56 +#: grob-interface.cc:56 lily/grob-interface.cc:56 #, c-format msgid "Grob `%s' has no interface for property `%s'" msgstr "" -#: hairpin.cc:131 +#: hairpin.cc:131 lily/hairpin.cc:131 msgid "decrescendo too small" msgstr "" -#: hairpin.cc:132 +#: hairpin.cc:132 lily/hairpin.cc:132 msgid "crescendo too small" msgstr "" -#: horizontal-bracket-engraver.cc:55 +#: horizontal-bracket-engraver.cc:55 lily/horizontal-bracket-engraver.cc:55 msgid "don't have that many brackets" msgstr "" -#: horizontal-bracket-engraver.cc:64 +#: horizontal-bracket-engraver.cc:64 lily/horizontal-bracket-engraver.cc:64 msgid "conflicting note group events" msgstr "" -#: hyphen-engraver.cc:89 +#: hyphen-engraver.cc:89 lily/hyphen-engraver.cc:89 msgid "removing unterminated hyphen" msgstr "" -#: hyphen-engraver.cc:102 +#: hyphen-engraver.cc:102 lily/hyphen-engraver.cc:102 msgid "unterminated hyphen; removing" msgstr "" -#: includable-lexer.cc:50 +#: includable-lexer.cc:50 lily/includable-lexer.cc:50 msgid "include files are not allowed in safe mode" msgstr "" #: includable-lexer.cc:57 lily-guile.cc:90 lily-parser-scheme.cc:77 +#: lily/includable-lexer.cc:57 lily/lily-guile.cc:90 +#: lily/lily-parser-scheme.cc:77 #, c-format msgid "can't find file: `%s'" msgstr "" -#: input.cc:101 source-file.cc:144 source-file.cc:266 +#: input.cc:101 source-file.cc:144 source-file.cc:266 lily/input.cc:101 +#: lily/source-file.cc:144 lily/source-file.cc:266 msgid "position unknown" msgstr "" -#: ligature-engraver.cc:152 +#: ligature-engraver.cc:152 lily/ligature-engraver.cc:152 msgid "can't find start of ligature" msgstr "" -#: ligature-engraver.cc:158 +#: ligature-engraver.cc:158 lily/ligature-engraver.cc:158 msgid "no right bound" msgstr "" -#: ligature-engraver.cc:184 +#: ligature-engraver.cc:184 lily/ligature-engraver.cc:184 msgid "already have a ligature" msgstr "" -#: ligature-engraver.cc:200 +#: ligature-engraver.cc:200 lily/ligature-engraver.cc:200 msgid "no left bound" msgstr "" -#: ligature-engraver.cc:256 +#: ligature-engraver.cc:256 lily/ligature-engraver.cc:256 msgid "unterminated ligature" msgstr "" -#: ligature-engraver.cc:280 +#: ligature-engraver.cc:280 lily/ligature-engraver.cc:280 msgid "ignoring rest: ligature may not contain rest" msgstr "" -#: ligature-engraver.cc:281 +#: ligature-engraver.cc:281 lily/ligature-engraver.cc:281 msgid "ligature was started here" msgstr "" -#: lily-guile.cc:92 +#: lily-guile.cc:92 lily/lily-guile.cc:92 #, c-format msgid "(load path: `%s')" msgstr "" -#: lily-guile.cc:484 +#: lily-guile.cc:484 lily/lily-guile.cc:484 #, c-format msgid "can't find property type-check for `%s' (%s)." msgstr "" -#: lily-guile.cc:487 +#: lily-guile.cc:487 lily/lily-guile.cc:487 msgid "perhaps a typing error?" msgstr "" -#: lily-guile.cc:493 +#: lily-guile.cc:493 lily/lily-guile.cc:493 msgid "doing assignment anyway" msgstr "" -#: lily-guile.cc:505 +#: lily-guile.cc:505 lily/lily-guile.cc:505 #, c-format msgid "type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" -#: lily-lexer.cc:210 +#: lily-lexer.cc:210 lily/lily-lexer.cc:210 #, c-format msgid "identifier name is a keyword: `%s'" msgstr "" -#: lily-lexer.cc:225 +#: lily-lexer.cc:225 lily/lily-lexer.cc:225 #, c-format msgid "error at EOF: %s" msgstr "" -#: lily-parser-scheme.cc:30 +#: lily-parser-scheme.cc:30 lily/lily-parser-scheme.cc:30 #, c-format msgid "deprecated function called: %s" msgstr "" -#: lily-parser-scheme.cc:69 +#: lily-parser-scheme.cc:69 lily/lily-parser-scheme.cc:69 #, c-format msgid "can't find init file: `%s'" msgstr "" -#: lily-parser-scheme.cc:87 +#: lily-parser-scheme.cc:87 lily/lily-parser-scheme.cc:87 #, c-format msgid "Processing `%s'" msgstr "" -#: lily-parser.cc:101 +#: lily-parser.cc:101 lily/lily-parser.cc:101 msgid "Parsing..." msgstr "" -#: lily-parser.cc:119 +#: lily-parser.cc:119 lily/lily-parser.cc:119 msgid "braces don't match" msgstr "" -#: main.cc:104 +#: main.cc:104 lily/main.cc:104 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -1092,21 +1118,21 @@ msgid "" "Boston, MA 02111-1307, USA.\n" msgstr "" -#: main.cc:135 +#: main.cc:135 lily/main.cc:135 msgid "BACK" msgstr "" -#: main.cc:135 +#: main.cc:135 lily/main.cc:135 msgid "" "use backend BACK (gnome, ps [default],\n" " scm, svg, tex, texstr)" msgstr "" -#: main.cc:136 +#: main.cc:136 lily/main.cc:136 msgid "EXPR" msgstr "" -#: main.cc:136 +#: main.cc:136 lily/main.cc:136 msgid "" "set scheme option, for help use\n" " -e '(ly:option-usage)'" @@ -1114,77 +1140,79 @@ msgstr "" #. Bug in option parser: --output =foe is taken as an abbreviation #. for --output-format. -#: main.cc:139 +#. Bug in option parser: --output =foe is taken as an abbreviation +#. for --output-format. +#: main.cc:139 lily/main.cc:139 msgid "FORMATs" msgstr "" -#: main.cc:139 +#: main.cc:139 lily/main.cc:139 msgid "dump FORMAT,... Also as separate options:" msgstr "" -#: main.cc:140 +#: main.cc:140 lily/main.cc:140 msgid "generate DVI (tex backend only)" msgstr "" -#: main.cc:141 +#: main.cc:141 lily/main.cc:141 msgid "generate PDF (default)" msgstr "" -#: main.cc:142 +#: main.cc:142 lily/main.cc:142 msgid "generate PNG" msgstr "" -#: main.cc:143 +#: main.cc:143 lily/main.cc:143 msgid "generate PostScript" msgstr "" -#: main.cc:144 +#: main.cc:144 lily/main.cc:144 msgid "generate TeX (tex backend only)" msgstr "" -#: main.cc:146 +#: main.cc:146 lily/main.cc:146 msgid "FIELD" msgstr "" -#: main.cc:146 +#: main.cc:146 lily/main.cc:146 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:147 +#: main.cc:147 lily/main.cc:147 msgid "add DIR to search path" msgstr "" -#: main.cc:148 +#: main.cc:148 lily/main.cc:148 msgid "use FILE as init file" msgstr "" -#: main.cc:149 +#: main.cc:149 lily/main.cc:149 msgid "write output to FILE (suffix will be added)" msgstr "" -#: main.cc:150 +#: main.cc:150 lily/main.cc:150 msgid "USER,GROUP,JAIL,DIR" msgstr "" -#: main.cc:150 +#: main.cc:150 lily/main.cc:150 msgid "" "chroot to JAIL, become USER:GROUP\n" " and cd into DIR" msgstr "" -#: main.cc:151 +#: main.cc:151 lily/main.cc:151 msgid "do not generate printed output" msgstr "" -#: main.cc:152 +#: main.cc:152 lily/main.cc:152 msgid "generate a preview of the first system" msgstr "" -#: main.cc:153 +#: main.cc:153 lily/main.cc:153 msgid "run in safe mode" msgstr "" -#: main.cc:177 +#: main.cc:177 lily/main.cc:177 #, c-format msgid "" "Copyright (c) %s by\n" @@ -1192,111 +1220,113 @@ msgid "" msgstr "" #. No version number or newline here. It confuses help2man. -#: main.cc:203 +#. No version number or newline here. It confuses help2man. +#: main.cc:203 lily/main.cc:203 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "" -#: main.cc:205 +#: main.cc:205 lily/main.cc:205 #, c-format msgid "Typeset music and/or produce MIDI from FILE." msgstr "" -#: main.cc:207 +#: main.cc:207 lily/main.cc:207 #, c-format msgid "LilyPond produces beautiful music notation." msgstr "" -#: main.cc:209 +#: main.cc:209 lily/main.cc:209 #, c-format msgid "For more information, see %s" msgstr "" -#: main.cc:299 +#: main.cc:299 lily/main.cc:299 #, c-format msgid "expected %d arguments with jail, found: %d" msgstr "" -#: main.cc:313 +#: main.cc:313 lily/main.cc:313 #, c-format msgid "no such user: %s" msgstr "" -#: main.cc:315 +#: main.cc:315 lily/main.cc:315 #, c-format msgid "can't get user id from user name: %s: %s" msgstr "" -#: main.cc:330 +#: main.cc:330 lily/main.cc:330 #, c-format msgid "no such group: %s" msgstr "" -#: main.cc:332 +#: main.cc:332 lily/main.cc:332 #, c-format msgid "can't get group id from group name: %s: %s" msgstr "" -#: main.cc:340 +#: main.cc:340 lily/main.cc:340 #, c-format msgid "can't chroot to: %s: %s" msgstr "" -#: main.cc:347 +#: main.cc:347 lily/main.cc:347 #, c-format msgid "can't change group id to: %d: %s" msgstr "" -#: main.cc:353 +#: main.cc:353 lily/main.cc:353 #, c-format msgid "can't change user id to: %d: %s" msgstr "" -#: main.cc:359 +#: main.cc:359 lily/main.cc:359 #, c-format msgid "can't change working directory to: %s: %s" msgstr "" #. FIXME: constant error message. -#: mark-engraver.cc:123 +#. FIXME: constant error message. +#: mark-engraver.cc:123 lily/mark-engraver.cc:123 msgid "rehearsalMark must have integer value" msgstr "" -#: mark-engraver.cc:129 +#: mark-engraver.cc:129 lily/mark-engraver.cc:129 msgid "mark label must be a markup object" msgstr "" -#: mensural-ligature-engraver.cc:74 +#: mensural-ligature-engraver.cc:74 lily/mensural-ligature-engraver.cc:74 msgid "ligature with less than 2 heads -> skipping" msgstr "" -#: mensural-ligature-engraver.cc:101 +#: mensural-ligature-engraver.cc:101 lily/mensural-ligature-engraver.cc:101 msgid "cannot determine pitch of ligature primitive -> skipping" msgstr "" -#: mensural-ligature-engraver.cc:115 +#: mensural-ligature-engraver.cc:115 lily/mensural-ligature-engraver.cc:115 msgid "single note ligature - skipping" msgstr "" -#: mensural-ligature-engraver.cc:127 +#: mensural-ligature-engraver.cc:127 lily/mensural-ligature-engraver.cc:127 msgid "prime interval within ligature -> skipping" msgstr "" -#: mensural-ligature-engraver.cc:139 +#: mensural-ligature-engraver.cc:139 lily/mensural-ligature-engraver.cc:139 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping" msgstr "" -#: mensural-ligature-engraver.cc:187 +#: mensural-ligature-engraver.cc:187 lily/mensural-ligature-engraver.cc:187 msgid "semibrevis must be followed by another one -> skipping" msgstr "" -#: mensural-ligature-engraver.cc:198 +#: mensural-ligature-engraver.cc:198 lily/mensural-ligature-engraver.cc:198 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:225 +#: mensural-ligature-engraver.cc:225 lily/mensural-ligature-engraver.cc:225 msgid "" "invalid ligatura ending:\n" "when the last note is a descending brevis,\n" @@ -1304,407 +1334,420 @@ msgid "" "or the ligatura must be LB or SSB" msgstr "" -#: mensural-ligature-engraver.cc:345 +#: mensural-ligature-engraver.cc:345 lily/mensural-ligature-engraver.cc:345 msgid "unexpected case fall-through" msgstr "" -#: mensural-ligature.cc:131 +#: mensural-ligature.cc:131 lily/mensural-ligature.cc:131 msgid "Mensural_ligature: unexpected case fall-through" msgstr "" -#: mensural-ligature.cc:183 +#: mensural-ligature.cc:183 lily/mensural-ligature.cc:183 msgid "Mensural_ligature: (join_right == 0)" msgstr "" -#: midi-item.cc:150 +#: midi-item.cc:150 lily/midi-item.cc:150 #, c-format msgid "no such MIDI instrument: `%s'" msgstr "" -#: midi-item.cc:254 +#: midi-item.cc:254 lily/midi-item.cc:254 msgid "silly pitch" msgstr "" -#: midi-item.cc:270 +#: midi-item.cc:270 lily/midi-item.cc:270 #, c-format msgid "experimental: temporarily fine tuning (of %d cents) a channel." msgstr "" -#: midi-stream.cc:27 +#: midi-stream.cc:27 lily/midi-stream.cc:27 #, c-format msgid "can't open for write: %s: %s" msgstr "" -#: midi-stream.cc:44 +#: midi-stream.cc:44 lily/midi-stream.cc:44 #, c-format msgid "can't write to file: `%s'" msgstr "" -#: music.cc:176 +#: music.cc:176 lily/music.cc:176 #, c-format msgid "octave check failed; expected %s, found: %s" msgstr "" -#: music.cc:239 +#: music.cc:239 lily/music.cc:239 #, c-format msgid "transposition by %s makes alteration larger than double" msgstr "" -#: new-fingering-engraver.cc:84 +#: new-fingering-engraver.cc:84 lily/new-fingering-engraver.cc:84 msgid "can't add text scripts to individual note heads" msgstr "" #. #. music for the softenon children? #. -#: new-fingering-engraver.cc:158 +#. +#. music for the softenon children? +#. +#: new-fingering-engraver.cc:158 lily/new-fingering-engraver.cc:158 msgid "music for the martians." msgstr "" -#: new-fingering-engraver.cc:266 +#: new-fingering-engraver.cc:266 lily/new-fingering-engraver.cc:266 msgid "no placement found for fingerings" msgstr "" -#: new-fingering-engraver.cc:267 +#: new-fingering-engraver.cc:267 lily/new-fingering-engraver.cc:267 msgid "placing below" msgstr "" #: new-lyric-combine-music-iterator.cc:240 +#: lily/new-lyric-combine-music-iterator.cc:240 #, c-format msgid "cannot find Voice `%s'" msgstr "" -#: note-collision.cc:404 +#: note-collision.cc:404 lily/note-collision.cc:404 msgid "ignoring too many clashing note columns" msgstr "" -#: note-column.cc:115 +#: note-column.cc:115 lily/note-column.cc:115 msgid "can't have note heads and rests together on a stem" msgstr "" -#: note-head.cc:66 +#: note-head.cc:66 lily/note-head.cc:66 #, c-format msgid "note head `%s' not found" msgstr "" -#: open-type-font.cc:29 +#: open-type-font.cc:29 lily/open-type-font.cc:29 #, c-format msgid "can't allocate %d bytes" msgstr "" -#: open-type-font.cc:33 +#: open-type-font.cc:33 lily/open-type-font.cc:33 #, c-format msgid "can't load font table: %s" msgstr "" -#: open-type-font.cc:84 +#: open-type-font.cc:84 lily/open-type-font.cc:84 #, c-format msgid "unsupported font format: %s" msgstr "" -#: open-type-font.cc:86 +#: open-type-font.cc:86 lily/open-type-font.cc:86 #, c-format msgid "unknown error: %d reading font file: %s" msgstr "" -#: open-type-font.cc:140 +#: open-type-font.cc:140 lily/open-type-font.cc:140 #, c-format msgid "FT_Get_Glyph_Name() returned error: %d" msgstr "" -#: pango-font.cc:130 +#: pango-font.cc:130 lily/pango-font.cc:130 #, c-format msgid "no PostScript font name for font `%s'" msgstr "" -#: pango-font.cc:177 +#: pango-font.cc:177 lily/pango-font.cc:177 msgid "FreeType face has no PostScript font name" msgstr "" -#: paper-outputter-scheme.cc:26 +#: paper-outputter-scheme.cc:26 lily/paper-outputter-scheme.cc:26 #, c-format msgid "Layout output to `%s'..." msgstr "" -#: paper-score.cc:66 +#: paper-score.cc:66 lily/paper-score.cc:66 #, c-format msgid "Element count %d (spanners %d) " msgstr "" -#: paper-score.cc:70 +#: paper-score.cc:70 lily/paper-score.cc:70 msgid "Preprocessing graphical objects..." msgstr "" -#: parse-scm.cc:81 +#: parse-scm.cc:81 lily/parse-scm.cc:81 msgid "GUILE signaled an error for the expression beginning here" msgstr "" -#: percent-repeat-engraver.cc:100 +#: percent-repeat-engraver.cc:100 lily/percent-repeat-engraver.cc:100 #, c-format msgid "can't handle a percent repeat of length: %s" msgstr "" -#: percent-repeat-engraver.cc:158 +#: percent-repeat-engraver.cc:158 lily/percent-repeat-engraver.cc:158 msgid "unterminated percent repeat" msgstr "" -#: percent-repeat-iterator.cc:51 +#: percent-repeat-iterator.cc:51 lily/percent-repeat-iterator.cc:51 msgid "no one to print a percent" msgstr "" -#: performance.cc:47 +#: performance.cc:47 lily/performance.cc:47 msgid "Track..." msgstr "" -#: performance.cc:71 +#: performance.cc:71 lily/performance.cc:71 msgid "MIDI channel wrapped around" msgstr "" -#: performance.cc:72 +#: performance.cc:72 lily/performance.cc:72 msgid "remapping modulo 16" msgstr "" -#: performance.cc:91 +#: performance.cc:91 lily/performance.cc:91 msgid "Creator: " msgstr "" -#: performance.cc:111 +#: performance.cc:111 lily/performance.cc:111 msgid "at " msgstr "" -#: performance.cc:164 +#: performance.cc:164 lily/performance.cc:164 #, c-format msgid "MIDI output to `%s'..." msgstr "" -#: phrasing-slur-engraver.cc:115 +#: phrasing-slur-engraver.cc:115 lily/phrasing-slur-engraver.cc:115 msgid "unterminated phrasing slur" msgstr "" -#: piano-pedal-engraver.cc:224 +#: piano-pedal-engraver.cc:224 lily/piano-pedal-engraver.cc:224 #, c-format msgid "expect 3 strings for piano pedals, found: %d" msgstr "" #: piano-pedal-engraver.cc:240 piano-pedal-engraver.cc:255 -#: piano-pedal-performer.cc:80 +#: piano-pedal-performer.cc:80 lily/piano-pedal-engraver.cc:240 +#: lily/piano-pedal-engraver.cc:255 lily/piano-pedal-performer.cc:80 #, c-format msgid "can't find start of piano pedal: `%s'" msgstr "" -#: piano-pedal-engraver.cc:305 +#: piano-pedal-engraver.cc:305 lily/piano-pedal-engraver.cc:305 #, c-format msgid "can't find start of piano pedal bracket: `%s'" msgstr "" -#: property-iterator.cc:90 +#: property-iterator.cc:90 lily/property-iterator.cc:90 #, c-format msgid "not a grob name, `%s'" msgstr "" -#: quote-iterator.cc:254 +#: quote-iterator.cc:254 lily/quote-iterator.cc:254 #, c-format msgid "in quotation: junking event %s" msgstr "" -#: relative-octave-check.cc:38 +#: relative-octave-check.cc:38 lily/relative-octave-check.cc:38 msgid "Failed octave check, got: " msgstr "" -#: rest-collision.cc:147 +#: rest-collision.cc:147 lily/rest-collision.cc:147 msgid "rest direction not set. Cannot resolve collision." msgstr "" -#: rest-collision.cc:162 rest-collision.cc:208 +#: rest-collision.cc:162 rest-collision.cc:208 lily/rest-collision.cc:162 +#: lily/rest-collision.cc:208 msgid "too many colliding rests" msgstr "" -#: rest.cc:140 +#: rest.cc:140 lily/rest.cc:140 #, c-format msgid "rest `%s' not found" msgstr "" -#: scm-option.cc:54 +#: scm-option.cc:54 lily/scm-option.cc:54 #, c-format msgid "lilypond -e EXPR means:" msgstr "" -#: scm-option.cc:56 +#: scm-option.cc:56 lily/scm-option.cc:56 #, c-format msgid " Evalute the Scheme EXPR before parsing any .ly files." msgstr "" -#: scm-option.cc:58 +#: scm-option.cc:58 lily/scm-option.cc:58 #, c-format msgid "" " Multiple -e options may be given, they will be evaluated sequentially." msgstr "" -#: scm-option.cc:60 +#: scm-option.cc:60 lily/scm-option.cc:60 #, c-format msgid "" " The function ly:set-option allows for access to some internal variables." msgstr "" -#: scm-option.cc:62 +#: scm-option.cc:62 lily/scm-option.cc:62 #, c-format msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\"" msgstr "" -#: scm-option.cc:64 +#: scm-option.cc:64 lily/scm-option.cc:64 #, c-format msgid "Use help as SYMBOL to get online help." msgstr "" -#: scm-option.cc:135 scm-option.cc:175 +#: scm-option.cc:135 scm-option.cc:175 lily/scm-option.cc:135 +#: lily/scm-option.cc:175 #, c-format msgid "no such internal option: %s" msgstr "" -#: score-engraver.cc:105 +#: score-engraver.cc:105 lily/score-engraver.cc:105 #, c-format msgid "cannot find `%s'" msgstr "" -#: score-engraver.cc:107 +#: score-engraver.cc:107 lily/score-engraver.cc:107 msgid "Music font has not been installed properly." msgstr "" -#: score-engraver.cc:109 +#: score-engraver.cc:109 lily/score-engraver.cc:109 #, c-format msgid "Search path `%s'" msgstr "" -#: score.cc:213 +#: score.cc:213 lily/score.cc:213 msgid "already have music in score" msgstr "" -#: score.cc:214 +#: score.cc:214 lily/score.cc:214 msgid "this is the previous music" msgstr "" -#: score.cc:219 +#: score.cc:219 lily/score.cc:219 msgid "errors found, ignoring music expression" msgstr "" #. FIXME: -#: script-engraver.cc:100 +#. FIXME: +#: script-engraver.cc:100 lily/script-engraver.cc:100 msgid "don't know how to interpret articulation: " msgstr "" -#: script-engraver.cc:101 +#: script-engraver.cc:101 lily/script-engraver.cc:101 msgid "scheme encoding: " msgstr "" #. this shouldn't happen, but let's continue anyway. -#: separation-item.cc:52 separation-item.cc:96 +#. this shouldn't happen, but let's continue anyway. +#: separation-item.cc:52 separation-item.cc:96 lily/separation-item.cc:52 +#: lily/separation-item.cc:96 msgid "Separation_item: I've been drinking too much" msgstr "" -#: simple-spacer.cc:410 +#: simple-spacer.cc:410 lily/simple-spacer.cc:410 #, c-format msgid "No spring between column %d and next one" msgstr "" -#: slur-engraver.cc:113 +#: slur-engraver.cc:113 lily/slur-engraver.cc:113 msgid "unterminated slur" msgstr "" -#: slur-engraver.cc:122 +#: slur-engraver.cc:122 lily/slur-engraver.cc:122 msgid "can't end slur" msgstr "" -#: source-file.cc:55 +#: source-file.cc:55 lily/source-file.cc:55 #, c-format msgid "can't open file: `%s'" msgstr "" -#: source-file.cc:68 +#: source-file.cc:68 lily/source-file.cc:68 #, c-format msgid "expected to read %d characters, got %d" msgstr "" -#: spacing-spanner.cc:377 +#: spacing-spanner.cc:377 lily/spacing-spanner.cc:377 #, c-format msgid "Global shortest duration is %s" msgstr "" -#: stem-engraver.cc:88 +#: stem-engraver.cc:88 lily/stem-engraver.cc:88 msgid "tremolo duration is too long" msgstr "" #. FIXME: -#: stem-engraver.cc:125 +#. FIXME: +#: stem-engraver.cc:125 lily/stem-engraver.cc:125 #, c-format msgid "adding note head to incompatible stem (type = %d)" msgstr "" -#: stem-engraver.cc:126 +#: stem-engraver.cc:126 lily/stem-engraver.cc:126 msgid "maybe input should specify polyphonic voices" msgstr "" -#: stem.cc:124 +#: stem.cc:124 lily/stem.cc:124 msgid "weird stem size, check for narrow beams" msgstr "" -#: stem.cc:577 +#: stem.cc:577 lily/stem.cc:577 #, c-format msgid "flag `%s' not found" msgstr "" -#: stem.cc:588 +#: stem.cc:588 lily/stem.cc:588 #, c-format msgid "flag stroke `%s' not found" msgstr "" -#: system.cc:145 +#: system.cc:145 lily/system.cc:145 #, c-format msgid "Element count %d." msgstr "" -#: system.cc:224 +#: system.cc:224 lily/system.cc:224 #, c-format msgid "Grob count %d" msgstr "" -#: system.cc:240 +#: system.cc:240 lily/system.cc:240 msgid "Calculating line breaks..." msgstr "" -#: text-spanner-engraver.cc:61 +#: text-spanner-engraver.cc:61 lily/text-spanner-engraver.cc:61 msgid "can't find start of text spanner" msgstr "" -#: text-spanner-engraver.cc:75 +#: text-spanner-engraver.cc:75 lily/text-spanner-engraver.cc:75 msgid "already have a text spanner" msgstr "" -#: text-spanner-engraver.cc:136 +#: text-spanner-engraver.cc:136 lily/text-spanner-engraver.cc:136 msgid "unterminated text spanner" msgstr "" #. Not using ngettext's plural feature here, as this message is #. more of a programming error. -#: tfm-reader.cc:106 +#. Not using ngettext's plural feature here, as this message is +#. more of a programming error. +#: tfm-reader.cc:106 lily/tfm-reader.cc:106 #, c-format msgid "TFM header of `%s' has only %u word (s)" msgstr "" -#: tfm-reader.cc:139 +#: tfm-reader.cc:139 lily/tfm-reader.cc:139 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:70 +#: tfm.cc:70 lily/tfm.cc:70 #, c-format msgid "can't find ascii character: %d" msgstr "" -#: tie-engraver.cc:194 +#: tie-engraver.cc:194 lily/tie-engraver.cc:194 msgid "lonely tie" msgstr "" -#: time-scaled-music-iterator.cc:22 +#: time-scaled-music-iterator.cc:22 lily/time-scaled-music-iterator.cc:22 msgid "no one to print a tuplet start bracket" msgstr "" @@ -1713,73 +1756,81 @@ msgstr "" #. #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi. #. -#: time-signature-engraver.cc:54 +#. +#. Todo: should make typecheck? +#. +#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi. +#. +#: time-signature-engraver.cc:54 lily/time-signature-engraver.cc:54 #, 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:83 +#. If there is no such symbol, we default to the numbered style. +#. (Here really with a warning!) +#: time-signature.cc:83 lily/time-signature.cc:83 #, c-format msgid "time signature symbol `%s' not found; reverting to numbered style" msgstr "" -#: translator-ctors.cc:52 +#: translator-ctors.cc:52 lily/translator-ctors.cc:52 #, c-format msgid "unknown translator: `%s'" msgstr "" -#: trill-spanner-engraver.cc:68 +#: trill-spanner-engraver.cc:68 lily/trill-spanner-engraver.cc:68 msgid "can't find start of trill spanner" msgstr "" -#: trill-spanner-engraver.cc:82 +#: trill-spanner-engraver.cc:82 lily/trill-spanner-engraver.cc:82 msgid "already have a trill spanner" msgstr "" -#: trill-spanner-engraver.cc:142 +#: trill-spanner-engraver.cc:142 lily/trill-spanner-engraver.cc:142 msgid "unterminated trill spanner" msgstr "" -#: tuplet-bracket.cc:438 +#: tuplet-bracket.cc:438 lily/tuplet-bracket.cc:438 msgid "removing tuplet bracket across linebreak" msgstr "" -#: vaticana-ligature-engraver.cc:341 +#: vaticana-ligature-engraver.cc:341 lily/vaticana-ligature-engraver.cc:341 #, c-format msgid "" "ignored prefix (es) `%s' of this head according to restrictions of the " "selected ligature style" msgstr "" -#: vaticana-ligature-engraver.cc:568 +#: vaticana-ligature-engraver.cc:568 lily/vaticana-ligature-engraver.cc:568 #, c-format msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul" msgstr "" -#: vaticana-ligature.cc:87 +#: vaticana-ligature.cc:87 lily/vaticana-ligature.cc:87 msgid "flexa-height undefined; assuming 0" msgstr "" -#: vaticana-ligature.cc:93 +#: vaticana-ligature.cc:93 lily/vaticana-ligature.cc:93 msgid "ascending vaticana style flexa" msgstr "" -#: vaticana-ligature.cc:182 +#: vaticana-ligature.cc:182 lily/vaticana-ligature.cc:182 msgid "Vaticana_ligature: zero join (delta_pitch == 0)" msgstr "" #. fixme: be more verbose. -#: volta-engraver.cc:127 +#. fixme: be more verbose. +#: volta-engraver.cc:127 lily/volta-engraver.cc:127 msgid "can't end volta spanner" msgstr "" -#: volta-engraver.cc:137 +#: volta-engraver.cc:137 lily/volta-engraver.cc:137 msgid "already have a volta spanner, ending that one prematurely" msgstr "" -#: volta-engraver.cc:141 +#: volta-engraver.cc:141 lily/volta-engraver.cc:141 msgid "also already have an ended spanner" msgstr "" -- 2.39.5