msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-15 23:40+0200\n"
+"POT-Creation-Date: 2004-07-16 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#. Bug in option parser: --output=foe is taken as an abbreviation
#. for --output-format.
-<<<<<<< lilypond.pot
#. Bug in option parser: --output=foe is taken as an abbreviation
#. for --output-format.
#. Bug in option parser: --output=foe is taken as an abbreviation
#. for --output-format.
#: lilypond-book.py:82 old-lilypond-book.py:123 main.cc:138 lily/main.cc:125
-=======
-#. Bug in option parser: --output=foe is taken as an abbreviation
-#. for --output-format.
-#: lilypond-book.py:82 old-lilypond-book.py:123 main.cc:138 lily/main.cc:125
->>>>>>> 1.39
msgid "EXT"
msgstr ""
msgid "Error parsing AFM file: `%s'"
msgstr ""
-<<<<<<< lilypond.pot
#. FIXME: broken sentence
#. FIXME: broken sentence
#: all-font-metrics.cc:100 lily/all-font-metrics.cc:95
-=======
-#. FIXME: broken sentence
-#: all-font-metrics.cc:100 lily/all-font-metrics.cc:95
->>>>>>> 1.39
#, c-format
msgid "checksum mismatch for font file: `%s'"
msgstr ""
#.
#. last->translator_id_string_ = get_change ()->change_to_id_string_;
#.
-<<<<<<< lilypond.pot
#.
#. 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:93 lily/change-iterator.cc:93
-=======
-#.
-#. 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:93 lily/change-iterator.cc:93
->>>>>>> 1.39
msgid "I'm one myself"
msgstr ""
"%s and others."
msgstr ""
-#. No version number or newline here. It confuses help2man.
-<<<<<<< lilypond.pot
#. No version number or newline here. It confuses help2man.
#. No version number or newline here. It confuses help2man.
-#: main.cc:196 lily/main.cc:181
-=======
#. No version number or newline here. It confuses help2man.
#: main.cc:196 lily/main.cc:181
->>>>>>> 1.39
#, c-format
msgid "Usage: %s [OPTIONS]... FILE..."
msgstr ""
msgid "Braces don't match"
msgstr ""
-#.
-#. music for the softenon children?
-#.
-<<<<<<< lilypond.pot
#.
#. music for the softenon children?
#.
#.
#. music for the softenon children?
#.
-#: new-fingering-engraver.cc:155 lily/new-fingering-engraver.cc:153
-=======
#.
#. music for the softenon children?
#.
#: new-fingering-engraver.cc:155 lily/new-fingering-engraver.cc:153
->>>>>>> 1.39
msgid "music for the martians."
msgstr ""
msgid "Scheme encoding: "
msgstr ""
-#. this shouldn't happen, but let's continue anyway.
-<<<<<<< lilypond.pot
#. this shouldn't happen, but let's continue anyway.
#. this shouldn't happen, but let's continue anyway.
-#: separation-item.cc:53 separation-item.cc:97 lily/separation-item.cc:53
-#: lily/separation-item.cc:97
-=======
#. this shouldn't happen, but let's continue anyway.
#: separation-item.cc:53 separation-item.cc:97 lily/separation-item.cc:53
#: lily/separation-item.cc:97
->>>>>>> 1.39
msgid "Separation_item: I've been drinking too much"
msgstr ""
#. How to shut up this warning, when Voice_devnull_engraver has
#. eaten start event?
-<<<<<<< lilypond.pot
#. How to shut up this warning, when Voice_devnull_engraver has
#. eaten start event?
#. How to shut up this warning, when Voice_devnull_engraver has
#. eaten start event?
#: slur-engraver.cc:139 lily/slur-engraver.cc:139
-=======
-#. How to shut up this warning, when Voice_devnull_engraver has
-#. eaten start event?
-#: slur-engraver.cc:139 lily/slur-engraver.cc:139
->>>>>>> 1.39
msgid "can't find start of slur"
msgstr ""
msgid "can't find ascii character: %d"
msgstr ""
-#. Not using ngettext's plural feature here, as this message is
-#. more of a programming error.
-<<<<<<< lilypond.pot
#. Not using ngettext's plural feature here, as this message is
#. more of a programming error.
#. Not using ngettext's plural feature here, as this message is
#. more of a programming error.
-#: tfm-reader.cc:108 lily/tfm-reader.cc:108
-=======
#. Not using ngettext's plural feature here, as this message is
#. more of a programming error.
#: tfm-reader.cc:108 lily/tfm-reader.cc:108
->>>>>>> 1.39
#, c-format
msgid "TFM header of `%s' has only %u word (s)"
msgstr ""
#. If there is no such symbol, we default to the numbered style.
#. (Here really with a warning!)
-<<<<<<< lilypond.pot
#. If there is no such symbol, we default to the numbered style.
#. (Here really with a warning!)
#. If there is no such symbol, we default to the numbered style.
#. (Here really with a warning!)
#: time-signature.cc:95 lily/time-signature.cc:95
-=======
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#: time-signature.cc:95 lily/time-signature.cc:95
->>>>>>> 1.39
#, c-format
msgid "time signature symbol `%s' not found; reverting to numbered style"
msgstr ""
-#.
-#. Todo: should make typecheck?
-#.
-#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
-#.
-<<<<<<< lilypond.pot
#.
#. Todo: should make typecheck?
#.
#.
#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
#.
-#: time-signature-engraver.cc:57 lily/time-signature-engraver.cc:57
-=======
#.
#. Todo: should make typecheck?
#.
#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
#.
#: time-signature-engraver.cc:57 lily/time-signature-engraver.cc:57
->>>>>>> 1.39
#, c-format
msgid "Found strange time signature %d/%d."
msgstr ""
#: lexer.ll:755 lexer.ll:756
msgid "Consider updating the input with the convert-ly script"
msgstr ""
-<<<<<<< lilypond.pot
-
-#: lily/apply-context-iterator.cc:35
-msgid "\\applycontext argument is not a procedure"
-msgstr ""
-
-#: lily/axis-group-engraver.cc:116
-msgid ""
-"Axis_group_engraver: vertical group already has a parent.\n"
-"Do you have two Axis_group_engravers?\n"
-"Killing this vertical group."
-msgstr ""
-
-#: lily/kpath.cc:129
-#, c-format
-msgid "kpathsea can not find file: `%s'"
-msgstr ""
-
-#: lily/my-lily-parser.cc:274
-#, c-format
-msgid "can't find init file: `%s'"
-msgstr ""
-
-#: lily/rest-collision.cc:157
-msgid "Too many colliding rests."
-msgstr ""
-
-#: lily/scm-option.cc:62
-#, c-format
-msgid ""
-" The function ly:set-option allows for access to some internal variables."
-msgstr ""
-
-#: lily/scm-option.cc:66
-#, c-format
-msgid "Use help as SYMBOL to get online help."
-msgstr ""
-
-#: lily/scm-option.cc:133 lily/scm-option.cc:161
-#, c-format
-msgid "No such internal option: %s"
-msgstr ""
-
-#: lily/new-lyric-combine-music-iterator.cc:230
-#, c-format
-msgid "Haven't found Voice `%s'."
-msgstr ""
-=======
#: lily/apply-context-iterator.cc:35
msgid "\\applycontext argument is not a procedure"
#, c-format
msgid "No such internal option: %s"
msgstr ""
->>>>>>> 1.39
projects / lilypond.git / commitdiff