From fb1afe411d7ef4d5c8853c936adf894e3edbf833 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 6 Mar 2001 12:40:05 +0100 Subject: [PATCH] patch::: 1.3.135.jcn3 1.3.135.jcn3 ============ * Internationalised ly2dvi.py (thanks to GNU Solfege), and nl.po update. * Coriolan fixes. --- CHANGES | 7 + VERSION | 2 +- buildscripts/gettext.py | 329 ++++++++++++++++++++++++++++++ input/bugs/script-dir.ly | 5 + lily/lexer.ll | 2 +- make/substitute.make | 1 + mutopia/Coriolan/bassi.ly | 22 ++ mutopia/Coriolan/violino-1.ly | 2 +- mutopia/Coriolan/violino-2.ly | 2 +- po/de.po | 210 ++++++++++++------- po/fr.po | 199 ++++++++++++------ po/it.po | 206 +++++++++++++------ po/ja.po | 210 ++++++++++++------- po/lilypond.pot | 177 +++++++++++----- po/nl.po | 183 +++++++++++------ po/ru.po | 201 ++++++++++++------ scripts/GNUmakefile | 2 +- scripts/ly2dvi.py | 148 ++++++++------ stepmake/stepmake/po-targets.make | 2 +- 19 files changed, 1389 insertions(+), 521 deletions(-) create mode 100644 buildscripts/gettext.py create mode 100644 input/bugs/script-dir.ly diff --git a/CHANGES b/CHANGES index 8686297cff..0e5a9f2ca1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +1.3.135.jcn3 +============ + +* Internationalised ly2dvi.py (thanks to GNU Solfege), and nl.po update. + +* Coriolan fixes. + 1.3.135.jcn2 ============ diff --git a/VERSION b/VERSION index b1cf5063dc..94869f2809 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=135 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/buildscripts/gettext.py b/buildscripts/gettext.py new file mode 100644 index 0000000000..e34cc77a2e --- /dev/null +++ b/buildscripts/gettext.py @@ -0,0 +1,329 @@ +"""This module allows python programs to use GNU gettext message catalogs. + +Author: James Henstridge +(This is loosely based on gettext.pl in the GNU gettext distribution) + +The best way to use it is like so: + import gettext + gettext.bindtextdomain(PACKAGE, LOCALEDIR) + gettext.textdomain(PACKAGE) + _ = gettext.gettext + print _('Hello World') + +where PACKAGE is the domain for this package, and LOCALEDIR is usually +'$prefix/share/locale' where $prefix is the install prefix. + +If you have more than one catalog to use, you can directly create catalog +objects. These objects are created as so: + import gettext + cat = gettext.Catalog(PACKAGE, localedir=LOCALEDIR) + _ = cat.gettext + print _('Hello World') + +The catalog object can also be accessed as a dictionary (ie cat['hello']). + +There are also some experimental features. You can add to the catalog, just +as you would with a normal dictionary. When you are finished, you can call +its save method, which will create a new .mo file containing all the +translations: + import gettext + cat = Catalog() + cat['Hello'] = 'konichiwa' + cat.save('./tmp.mo') + +Once you have written an internationalized program, you can create a .po file +for it with "xgettext --keyword=_ fillename ...". Then do the translation and +compile it into a .mo file, ready for use with this module. Note that you +will have to use C style strings (ie. use double quotes) for proper string +extraction. +""" +import os, string + +prefix = '/usr/local' +localedir = prefix + '/share/locale' + +def _expandLang(str): + langs = [str] + # remove charset ... + if '.' in str: + langs.append(string.split(str, '.')[0]) + # also add 2 character language code ... + if len(str) > 2: + langs.append(str[:2]) + return langs + +lang = [] +for env in 'LANGUAGE', 'LC_ALL', 'LC_MESSAGES', 'LANG': + if os.environ.has_key(env): + lang = string.split(os.environ[env], ':') + lang = map(_expandLang, lang) + lang = reduce(lambda a, b: a + b, lang) + break +if 'C' not in lang: + lang.append('C') + +# remove duplicates +i = 0 +while i < len(lang): + j = i + 1 + while j < len(lang): + if lang[i] == lang[j]: + del lang[j] + else: + j = j + 1 + i = i + 1 +del i, j + +if os.environ.has_key('PY_XGETTEXT'): + xgettext = os.environ['PY_XGETTEXT'] +else: + xgettext = None + +del os, string + +error = 'gettext.error' + +def _lsbStrToInt(str): + return ord(str[0]) + \ + (ord(str[1]) << 8) + \ + (ord(str[2]) << 16) + \ + (ord(str[3]) << 24) +def _msbStrToInt(str): + return (ord(str[0]) << 24) + \ + (ord(str[1]) << 16) + \ + (ord(str[2]) << 8) + \ + ord(str[3]) +def _intToLsbStr(int): + return chr(int & 0xff) + \ + chr((int >> 8) & 0xff) + \ + chr((int >> 16) & 0xff) + \ + chr((int >> 24) & 0xff) + +def _getpos(levels = 0): + """Returns the position in the code where the function was called. + The function uses some knowledge about python stack frames.""" + import sys + # get access to the stack frame by generating an exception. + try: + raise RuntimeError + except RuntimeError: + frame = sys.exc_traceback.tb_frame + frame = frame.f_back # caller's frame + while levels > 0: + frame = frame.f_back + levels = levels - 1 + return (frame.f_globals['__name__'], + frame.f_code.co_name, + frame.f_lineno) + +class Catalog: + def __init__(self, domain=None, localedir=localedir): + self.domain = domain + self.localedir = localedir + self.cat = {} + if not domain: return + for self.lang in lang: + if self.lang == 'C': + return + catalog = "%s//%s/LC_MESSAGES/%s.mo" % ( + localedir, self.lang, domain) + try: + f = open(catalog, "rb") + buffer = f.read() + del f + break + except IOError: + pass + else: + return # assume C locale + + strToInt = _lsbStrToInt + if strToInt(buffer[:4]) != 0x950412de: + # catalog is encoded with MSB offsets. + strToInt = _msbStrToInt + if strToInt(buffer[:4]) != 0x950412de: + # magic number doesn't match + raise error, 'Bad magic number in %s' % (catalog,) + + self.revision = strToInt(buffer[4:8]) + nstrings = strToInt(buffer[8:12]) + origTabOffset = strToInt(buffer[12:16]) + transTabOffset = strToInt(buffer[16:20]) + for i in range(nstrings): + origLength = strToInt(buffer[origTabOffset: + origTabOffset+4]) + origOffset = strToInt(buffer[origTabOffset+4: + origTabOffset+8]) + origTabOffset = origTabOffset + 8 + origStr = buffer[origOffset:origOffset+origLength] + + transLength = strToInt(buffer[transTabOffset: + transTabOffset+4]) + transOffset = strToInt(buffer[transTabOffset+4: + transTabOffset+8]) + transTabOffset = transTabOffset + 8 + transStr = buffer[transOffset:transOffset+transLength] + + self.cat[origStr] = transStr + + def gettext(self, string): + """Get the translation of a given string""" + if self.cat.has_key(string): + return self.cat[string] + else: + return string + # allow catalog access as cat(str) and cat[str] and cat.gettext(str) + __getitem__ = gettext + __call__ = gettext + + # this is experimental code for producing mo files from Catalog objects + def __setitem__(self, string, trans): + """Set the translation of a given string""" + self.cat[string] = trans + def save(self, file): + """Create a .mo file from a Catalog object""" + try: + f = open(file, "wb") + except IOError: + raise error, "can't open " + file + " for writing" + f.write(_intToLsbStr(0x950412de)) # magic number + f.write(_intToLsbStr(0)) # revision + f.write(_intToLsbStr(len(self.cat))) # nstrings + + oIndex = []; oData = '' + tIndex = []; tData = '' + for orig, trans in self.cat.items(): + oIndex.append((len(orig), len(oData))) + oData = oData + orig + '\0' + tIndex.append((len(trans), len(tData))) + tData = tData + trans + '\0' + oIndexOfs = 20 + tIndexOfs = oIndexOfs + 8 * len(oIndex) + oDataOfs = tIndexOfs + 8 * len(tIndex) + tDataOfs = oDataOfs + len(oData) + f.write(_intToLsbStr(oIndexOfs)) + f.write(_intToLsbStr(tIndexOfs)) + for length, offset in oIndex: + f.write(_intToLsbStr(length)) + f.write(_intToLsbStr(offset + oDataOfs)) + for length, offset in tIndex: + f.write(_intToLsbStr(length)) + f.write(_intToLsbStr(offset + tDataOfs)) + f.write(oData) + f.write(tData) + +_cat = None +_cats = {} + +if xgettext: + class Catalog: + def __init__(self, domain, localedir): + self.domain = domain + self.localedir = localedir + self._strings = {} + def gettext(self, string): + # there is always one level of redirection for calls + # to this function + pos = _getpos(2) # get this function's caller + if self._strings.has_key(string): + if pos not in self._strings[string]: + self._strings[string].append(pos) + else: + self._strings[string] = [pos] + return string + __getitem__ = gettext + __call__ = gettext + def __setitem__(self, item, data): + pass + def save(self, file): + pass + def output(self, fp): + import string + fp.write('# POT file for domain %s\n' % (self.domain,)) + for str in self._strings.keys(): + pos = map(lambda x: "%s(%s):%d" % x, + self._strings[str]) + pos.sort() + length = 80 + for p in pos: + if length + len(p) > 74: + fp.write('\n#:') + length = 2 + fp.write(' ') + fp.write(p) + length = length + 1 + len(p) + fp.write('\n') + if '\n' in str: + fp.write('msgid ""\n') + lines = string.split(str, '\n') + lines = map(lambda x: + '"%s\\n"\n' % (x,), + lines[:-1]) + \ + ['"%s"\n' % (lines[-1],)] + fp.writelines(lines) + else: + fp.write('msgid "%s"\n' % (str,)) + fp.write('msgstr ""\n') + + import sys + if hasattr(sys, 'exitfunc'): + _exitchain = sys.exitfunc + else: + _exitchain = None + def exitfunc(dir=xgettext, _exitchain=_exitchain): + # actually output all the .pot files. + import os + for file in _cats.keys(): + fp = open(os.path.join(dir, file + '.pot'), 'w') + cat = _cats[file] + cat.output(fp) + fp.close() + if _exitchain: _exitchain() + sys.exitfunc = exitfunc + del sys, exitfunc, _exitchain, xgettext + +def bindtextdomain(domain, localedir=localedir): + global _cat + if not _cats.has_key(domain): + _cats[domain] = Catalog(domain, localedir) + if not _cat: _cat = _cats[domain] + +def textdomain(domain): + global _cat + if not _cats.has_key(domain): + _cats[domain] = Catalog(domain) + _cat = _cats[domain] + +def gettext(string): + if _cat == None: raise error, "No catalog loaded" + return _cat.gettext(string) + +_ = gettext + +def dgettext(domain, string): + if domain is None: + return gettext(string) + if not _cats.has_key(domain): + raise error, "Domain '" + domain + "' not loaded" + return _cats[domain].gettext(string) + +def test(): + import sys + global localedir + if len(sys.argv) not in (2, 3): + print "Usage: %s DOMAIN [LOCALEDIR]" % (sys.argv[0],) + sys.exit(1) + domain = sys.argv[1] + if len(sys.argv) == 3: + bindtextdomain(domain, sys.argv[2]) + textdomain(domain) + info = gettext('') # this is where special info is often stored + if info: + print "Info for domain %s, lang %s." % (domain, _cat.lang) + print info + else: + print "No info given in mo file." + +if __name__ == '__main__': + test() + diff --git a/input/bugs/script-dir.ly b/input/bugs/script-dir.ly new file mode 100644 index 0000000000..d8d35df388 --- /dev/null +++ b/input/bugs/script-dir.ly @@ -0,0 +1,5 @@ +\score { + \context Voice \notes\relative c'' { + a-. c-. + } +} diff --git a/lily/lexer.ll b/lily/lexer.ll index 3381498155..c86168a224 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -332,7 +332,7 @@ HYPHEN -- char c = s[s.length_i () - 1]; if (c == '{' || c == '}') // brace open is for not confusing dumb tools. here_input ().warning ( - "Brace found at end of lyric. Did you forget a space?"); + _("Brace found at end of lyric. Did you forget a space?")); yylval.scm = ly_str02scm (s.ch_C ()); DEBUG_OUT << "lyric : `" << s << "'\n"; diff --git a/make/substitute.make b/make/substitute.make index 195cc117d3..daae40c8fe 100644 --- a/make/substitute.make +++ b/make/substitute.make @@ -11,6 +11,7 @@ ATVARIABLES = \ GUILE\ date\ datadir\ + localedir\ PACKAGE\ package\ PATHSEP\ diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly index a676500b7f..9dbd9eda37 100644 --- a/mutopia/Coriolan/bassi.ly +++ b/mutopia/Coriolan/bassi.ly @@ -3,6 +3,7 @@ \include "violoncello.ly" \include "contrabasso.ly" +%{ bassiGroup = \context PianoStaff = bassi_group \notes < \staffCombinePianoStaffProperties \context Staff=oneBassi { @@ -32,3 +33,24 @@ bassiGroup = \context PianoStaff = bassi_group \notes < \context Voice=oneBassi \violoncello \context Voice=twoBassi \contrabasso > +%} + +bassiGroup = \context PianoStaff = bassi_group \notes < + \context Staff=violoncelloStaff < + \property Staff.midiInstrument = #"cello" + \property Staff.instrument = #"Violoncello " + \property Staff.instr = #"Vc. " + \clef "bass"; + \global + \violoncello + > + \context Staff=contrabassoStaff < + \property Staff.midiInstrument = #"contrabass" + \property Staff.instrument = #"Contrabasso " + \property Staff.instr = #"Cb. " + \property Staff.transposing = #-12 + \clef "bass"; + \global + \contrabasso + > +> diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index 0932b1a822..97ba5f5bcf 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -449,7 +449,7 @@ violinoI = \notes \relative c { violinoIStaff = \context Staff = violino1 < \property Staff.midiInstrument = #"violin" \property Staff.instrument = #"Violino I " - \property Staff.instr = #"Vl. I " + \property Staff.instr = #"Vl. I " \notes< \global \context Voice=violinoi diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index f1494f5fc2..e075b63aac 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -445,7 +445,7 @@ violinoIIStaff = \context Staff = violino2 < % eerste en tweede viool ;-) \property Staff.midiInstrument = #"violin" \property Staff.instrument = #"Violino II " - \property Staff.instr = #"Vl. II " + \property Staff.instr = #"Vl. II " \notes< \global \context Voice=violinoii diff --git a/po/de.po b/po/de.po index ef69888cff..1b3186d567 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Lilypond 1.2.8\n" -"POT-Creation-Date: 2001-02-27 21:26+0100\n" +"POT-Creation-Date: 2001-03-06 12:36+0100\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -13,14 +13,122 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: ENCODING\n" -#: data-file.cc:54 -msgid "EOF in a string" -msgstr "Dateiende in Zeichenkette" +#: ly2dvi.py:67 main.cc:95 main.cc:109 +msgid "this help" +msgstr "Diese Hilfe" + +#: ly2dvi.py:68 +msgid "change global setting KEY to VAL" +msgstr "" + +#: ly2dvi.py:69 +#, fuzzy +msgid "generate PostScript output" +msgstr "Degenerierte Zwangsbedingungen" + +#: ly2dvi.py:70 +msgid "keep all output, and name the directory ly2dvi.dir" +msgstr "" + +#: ly2dvi.py:71 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:72 main.cc:104 main.cc:119 +msgid "print version number" +msgstr "Zeige die Versionsnummer" -#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 +#: ly2dvi.py:73 main.cc:106 main.cc:121 +msgid "show warranty and copyright" +msgstr "Zeige Garantie und Urheberrechte" + +#: ly2dvi.py:74 +msgid "dump all final output into DIR" +msgstr "" + +#: ly2dvi.py:75 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" + +#: ly2dvi.py:101 +#, fuzzy +msgid "Exiting ... " +msgstr "Linie ... " + +#: ly2dvi.py:120 +#, fuzzy, c-format +msgid "Reading `%s'" +msgstr "Uralt-Bitte: `%s'" + +#: ly2dvi.py:124 mapped-file-storage.cc:87 mudela-stream.cc:111 +#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "Kann die Datei %s nicht öffnen" + +#: ly2dvi.py:187 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]" + +#: ly2dvi.py:189 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: ly2dvi.py:191 main.cc:119 main.cc:151 +msgid "Options:" +msgstr "Optionen:" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:195 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "Warnung: " +#: ly2dvi.py:196 +msgid "all output is written in the CURRENT directory" +msgstr "" + +#: ly2dvi.py:198 main.cc:123 main.cc:174 +#, fuzzy, c-format +msgid "Report bugs to %s" +msgstr "Melde Fehler an" + +#: ly2dvi.py:230 +#, fuzzy, c-format +msgid "Invoking `%s'" +msgstr "Uralt-Bitte: `%s'" + +#: input.cc:90 ly2dvi.py:234 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "Fehler: " + +#: ly2dvi.py:234 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:236 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:277 +#, c-format +msgid "Analyzing `%s'" +msgstr "" + +#: ly2dvi.py:539 scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "Ausgabe auf Papier auf %s..." + +#: ly2dvi.py:540 +#, c-format +msgid "%s file left in `%s'" +msgstr "" + +#: data-file.cc:54 +msgid "EOF in a string" +msgstr "Dateiende in Zeichenkette" + #: dstream.cc:186 #, fuzzy msgid "not enough fields in Dstream init" @@ -46,10 +154,6 @@ msgstr "Unbekannte Option: `%s'" msgid "invalid argument `%s' to option `%s'" msgstr "Argument `%s' für Optione '%s' ist nicht erlaubt" -#: input.cc:90 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "Fehler: " - #: input.cc:96 #, fuzzy msgid "non fatal error: " @@ -63,12 +167,6 @@ msgstr "Position unbekannt" msgid "can't map file" msgstr "Kann die Datei nicht mappen" -#: mapped-file-storage.cc:87 mudela-stream.cc:111 paper-stream.cc:40 -#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 -#, c-format -msgid "can't open file: `%s'" -msgstr "Kann die Datei %s nicht öffnen" - #: simple-file-storage.cc:56 #, fuzzy, c-format msgid "Huh? Got %d, expected %d characters" @@ -322,7 +420,7 @@ msgstr "" msgid "can't find file: `%s'" msgstr "Kann Datei `%s' nicht finden" -#: key-engraver.cc:103 key-performer.cc:72 +#: key-engraver.cc:103 key-performer.cc:77 msgid "FIXME: key change merge" msgstr "" @@ -362,10 +460,6 @@ msgstr "EXT" msgid "use output format EXT (scm, ps, tex or as)" msgstr "Benutze das Ausgabeformat EXT" -#: main.cc:95 main.cc:109 -msgid "this help" -msgstr "Diese Hilfe" - #: main.cc:110 #, fuzzy msgid "FIELD" @@ -391,10 +485,6 @@ msgstr "DATEI" msgid "use FILE as init file" msgstr "Verwende FILE als Initialisierungsdatei" -#: main.cc:113 -msgid "write Makefile dependencies for every input file" -msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" - #: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" @@ -422,19 +512,11 @@ msgstr "Unterdr msgid "don't timestamp the output" msgstr "Keine Datumsangabe auf der Ausgabe" -#: main.cc:104 main.cc:119 -msgid "print version number" -msgstr "Zeige die Versionsnummer" - #: main.cc:120 #, fuzzy msgid "verbose" msgstr "Sei geschwätzig" -#: main.cc:106 main.cc:121 -msgid "show warranty and copyright" -msgstr "Zeige Garantie und Urheberrechte" - #: main.cc:122 msgid "write midi ouput in formatted ascii" msgstr "" @@ -462,19 +544,10 @@ msgstr "" "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n" "lilyPond ist Teil des GNU-Projekts\n" -#: main.cc:119 main.cc:151 -msgid "Options:" -msgstr "Optionen:" - #: main.cc:155 msgid "This binary was compiled with the following options:" msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:" -#: main.cc:123 main.cc:174 -#, fuzzy, c-format -msgid "Report bugs to %s" -msgstr "Melde Fehler an" - #: main.cc:55 main.cc:182 #, c-format msgid "" @@ -533,16 +606,11 @@ msgstr "" msgid "no such instrument: `%s'" msgstr "Kein solches instrument: `%s'" -#: midi-item.cc:367 -#, c-format -msgid "unconventional key: flats: %d, sharps: %d" -msgstr "Ungewöhnliche Tonart: Bes: %d, Kreuze: %d" - -#: midi-item.cc:414 +#: midi-item.cc:402 msgid "silly duration" msgstr "Unsinnige Dauer" -#: midi-item.cc:427 +#: midi-item.cc:415 msgid "silly pitch" msgstr "unsinnige Tonhöhe" @@ -601,7 +669,7 @@ msgstr "Ausgabe auf Papier auf %s..." msgid ", at " msgstr ", bei " -#: paper-outputter.cc:240 +#: paper-outputter.cc:245 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." @@ -610,7 +678,7 @@ msgstr "Schreibe Datei mit Abh msgid "Preprocessing elements..." msgstr "Verarbeite Element vor..." -#: paper-score.cc:112 +#: paper-score.cc:113 #, fuzzy msgid "Outputting Score, defined at: " msgstr "Gebe Partitur aus, definiert bei: " @@ -649,12 +717,12 @@ msgstr "St msgid "Creator: " msgstr "Erstellt von: " -#: performance.cc:111 +#: performance.cc:116 #, c-format msgid "from musical definition: %s" msgstr "von der musiaklischen Definition: %s" -#: performance.cc:166 +#: performance.cc:171 #, c-format msgid "MIDI output to %s..." msgstr "MIDI-Ausgabe nach %s..." @@ -726,11 +794,6 @@ msgstr "verstrichene Zeit %.2f Sekunden" msgid "unbound spanner `%s'" msgstr "Unbeschränkter Abstand `%s'" -#: scores.cc:44 -#, fuzzy, c-format -msgid "dependencies output to %s..." -msgstr "Ausgabe auf Papier auf %s..." - #: scores.cc:106 #, fuzzy msgid "Score contains errors; will not process it" @@ -990,6 +1053,10 @@ msgstr "Erwarte Wei msgid "Can't evaluate Scheme in safe mode" msgstr "Kann Scheme nicht interpretieren, wenn ich im sicheren Modus bin" +#: lexer.ll:335 +msgid "Brace found at end of lyric. Did you forget a space?" +msgstr "" + #: lexer.ll:439 #, c-format msgid "invalid character: `%c'" @@ -1225,6 +1292,21 @@ msgstr "% Automatisch generiert" msgid "% from input file: " msgstr "% aus Eingabedatei: " +#, fuzzy +#~ msgid "Dependency file left in `%s'" +#~ msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." + +#, fuzzy +#~ msgid "Report bugs to bug-gnu-music@gnu.org" +#~ msgstr "Melde Fehler an" + +#, fuzzy +#~ msgid "Usage: ly2dvi [OPTION]... FILE\n" +#~ msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]" + +#~ msgid "unconventional key: flats: %d, sharps: %d" +#~ msgstr "Ungewöhnliche Tonart: Bes: %d, Kreuze: %d" + #, fuzzy #~ msgid "not a forced distance; cross-staff spanners may be broken" #~ msgstr "" @@ -1244,10 +1326,6 @@ msgstr "% aus Eingabedatei: " #~ msgid "Automatically generated" #~ msgstr "Automatisch generiert" -#, fuzzy -#~ msgid "Writing dependency file: `%s'..." -#~ msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." - #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "Falsche Type für Besitz-Wert" @@ -1269,10 +1347,6 @@ msgstr "% aus Eingabedatei: " #~ msgid "Huh? Not a Request: `%s'" #~ msgstr "Wie? Keine Anforderung: `%s'" -#, fuzzy -#~ msgid "Junking music: `%s'" -#~ msgstr "Uralt-Bitte: `%s'" - #~ msgid "conflicting timing request" #~ msgstr "Widersprechende Zeitangaben" @@ -1398,12 +1472,6 @@ msgstr "% aus Eingabedatei: " #~ msgid " elements. " #~ msgstr " Elemente. " -#~ msgid "Line ... " -#~ msgstr "Linie ... " - -#~ msgid "degenerate constraints" -#~ msgstr "Degenerierte Zwangsbedingungen" - #~ msgid "time: %.2f seconds" #~ msgstr "Zeit: %.2f Sekunden" diff --git a/po/fr.po b/po/fr.po index 9e1073e11d..421acc6ad0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,21 +6,128 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2001-02-27 21:26+0100\n" +"POT-Creation-Date: 2001-03-06 12:36+0100\n" "PO-Revision-Date: 1999-12-28 00:32 +1\n" "Last-Translator: Laurent Martelli \n" "Language-Team: \n" "MIME-Version: 1.0\n" -#: data-file.cc:54 +#: ly2dvi.py:67 main.cc:95 main.cc:109 +msgid "this help" +msgstr "cette aide" + +#: ly2dvi.py:68 +msgid "change global setting KEY to VAL" +msgstr "" + +#: ly2dvi.py:69 +msgid "generate PostScript output" +msgstr "" + +#: ly2dvi.py:70 +msgid "keep all output, and name the directory ly2dvi.dir" +msgstr "" + +#: ly2dvi.py:71 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:72 main.cc:104 main.cc:119 +msgid "print version number" +msgstr "afficher le numéro de version" + +#: ly2dvi.py:73 main.cc:106 main.cc:121 +msgid "show warranty and copyright" +msgstr "" + +#: ly2dvi.py:74 +msgid "dump all final output into DIR" +msgstr "" + +#: ly2dvi.py:75 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "" + +#: ly2dvi.py:101 #, fuzzy -msgid "EOF in a string" -msgstr "EOF dans une chaîne" +msgid "Exiting ... " +msgstr "Ligne ..." -#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 +#: ly2dvi.py:120 +#, c-format +msgid "Reading `%s'" +msgstr "" + +#: ly2dvi.py:124 mapped-file-storage.cc:87 mudela-stream.cc:111 +#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "impossible d'ouvrir le fichier: `%s'" + +#: ly2dvi.py:187 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "Usage: %s [OPTION... [FICHIER]" + +#: ly2dvi.py:189 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: ly2dvi.py:191 main.cc:119 main.cc:151 +msgid "Options:" +msgstr "Options: " + +#: data-file.cc:118 input.cc:85 ly2dvi.py:195 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "avertissement: " +#: ly2dvi.py:196 +msgid "all output is written in the CURRENT directory" +msgstr "" + +#: ly2dvi.py:198 main.cc:123 main.cc:174 +#, fuzzy, c-format +msgid "Report bugs to %s" +msgstr "Rapporter les bugs à" + +#: ly2dvi.py:230 +#, c-format +msgid "Invoking `%s'" +msgstr "" + +#: input.cc:90 ly2dvi.py:234 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "erreur: " + +#: ly2dvi.py:234 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:236 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:277 +#, c-format +msgid "Analyzing `%s'" +msgstr "" + +#: ly2dvi.py:539 scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "Sortie papier vers %s..." + +#: ly2dvi.py:540 +#, c-format +msgid "%s file left in `%s'" +msgstr "" + +#: data-file.cc:54 +#, fuzzy +msgid "EOF in a string" +msgstr "EOF dans une chaîne" + #: dstream.cc:186 #, fuzzy msgid "not enough fields in Dstream init" @@ -46,10 +153,6 @@ msgstr "option non reconnue: `%s'" msgid "invalid argument `%s' to option `%s'" msgstr "argument `%s' invalide pour l'option `%s'" -#: input.cc:90 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "erreur: " - #: input.cc:96 #, fuzzy msgid "non fatal error: " @@ -63,12 +166,6 @@ msgstr "position inconnue" msgid "can't map file" msgstr "impossible de mapper le fichier" -#: mapped-file-storage.cc:87 mudela-stream.cc:111 paper-stream.cc:40 -#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 -#, c-format -msgid "can't open file: `%s'" -msgstr "impossible d'ouvrir le fichier: `%s'" - #: simple-file-storage.cc:56 #, fuzzy, c-format msgid "Huh? Got %d, expected %d characters" @@ -318,7 +415,7 @@ msgstr "" msgid "can't find file: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: key-engraver.cc:103 key-performer.cc:72 +#: key-engraver.cc:103 key-performer.cc:77 msgid "FIXME: key change merge" msgstr "" @@ -357,10 +454,6 @@ msgstr "" msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:95 main.cc:109 -msgid "this help" -msgstr "cette aide" - #: main.cc:110 #, fuzzy msgid "FIELD" @@ -388,10 +481,6 @@ msgstr "FICHIER" msgid "use FILE as init file" msgstr "utilise FICHIER comme fichier d'initialisation" -#: main.cc:113 -msgid "write Makefile dependencies for every input file" -msgstr "" - #: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" @@ -417,18 +506,10 @@ msgstr "" msgid "don't timestamp the output" msgstr "" -#: main.cc:104 main.cc:119 -msgid "print version number" -msgstr "afficher le numéro de version" - #: main.cc:120 msgid "verbose" msgstr "" -#: main.cc:106 main.cc:121 -msgid "show warranty and copyright" -msgstr "" - #: main.cc:122 msgid "write midi ouput in formatted ascii" msgstr "" @@ -456,20 +537,11 @@ msgstr "" "paritions à partir de description de gaut niveau en entrée. Lilypond\n" "fait partie du projet GNU.\n" -#: main.cc:119 main.cc:151 -msgid "Options:" -msgstr "Options: " - #: main.cc:155 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "Cet exécutable a été compilé avec les options suivantes:" -#: main.cc:123 main.cc:174 -#, fuzzy, c-format -msgid "Report bugs to %s" -msgstr "Rapporter les bugs à" - #: main.cc:55 main.cc:182 #, c-format msgid "" @@ -510,16 +582,11 @@ msgstr "" msgid "no such instrument: `%s'" msgstr "Pas d'instrument tel: `%s'" -#: midi-item.cc:367 -#, c-format -msgid "unconventional key: flats: %d, sharps: %d" -msgstr "" - -#: midi-item.cc:414 +#: midi-item.cc:402 msgid "silly duration" msgstr "" -#: midi-item.cc:427 +#: midi-item.cc:415 msgid "silly pitch" msgstr "" @@ -577,7 +644,7 @@ msgstr "Sortie papier vers %s..." msgid ", at " msgstr ", à " -#: paper-outputter.cc:240 +#: paper-outputter.cc:245 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "impossible d'ouvrir le fichier: `%s'" @@ -586,7 +653,7 @@ msgstr "impossible d'ouvrir le fichier: `%s'" msgid "Preprocessing elements..." msgstr "" -#: paper-score.cc:112 +#: paper-score.cc:113 msgid "Outputting Score, defined at: " msgstr "" @@ -625,12 +692,12 @@ msgstr "Piste ... " msgid "Creator: " msgstr "Auteur: " -#: performance.cc:111 +#: performance.cc:116 #, c-format msgid "from musical definition: %s" msgstr "" -#: performance.cc:166 +#: performance.cc:171 #, c-format msgid "MIDI output to %s..." msgstr "" @@ -698,11 +765,6 @@ msgstr "temps ecoul msgid "unbound spanner `%s'" msgstr "traducteur inconnu `%s'" -#: scores.cc:44 -#, fuzzy, c-format -msgid "dependencies output to %s..." -msgstr "Sortie papier vers %s..." - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" @@ -955,6 +1017,10 @@ msgstr "blanche attendue" msgid "Can't evaluate Scheme in safe mode" msgstr "" +#: lexer.ll:335 +msgid "Brace found at end of lyric. Did you forget a space?" +msgstr "" + #: lexer.ll:439 #, fuzzy, c-format msgid "invalid character: `%c'" @@ -1187,6 +1253,18 @@ msgstr "% G msgid "% from input file: " msgstr "% dal file di input: " +#, fuzzy +#~ msgid "Dependency file left in `%s'" +#~ msgstr "impossible d'ouvrir le fichier: `%s'" + +#, fuzzy +#~ msgid "Report bugs to bug-gnu-music@gnu.org" +#~ msgstr "Rapporter les bugs à" + +#, fuzzy +#~ msgid "Usage: ly2dvi [OPTION]... FILE\n" +#~ msgstr "Usage: %s [OPTION... [FICHIER]" + #, fuzzy #~ msgid "wrong identifier type, expected: `%s'" #~ msgstr "Mauvais type d'indentifiant: " @@ -1194,10 +1272,6 @@ msgstr "% dal file di input: " #~ msgid "Automatically generated" #~ msgstr "Généré automatiquement" -#, fuzzy -#~ msgid "Writing dependency file: `%s'..." -#~ msgstr "impossible d'ouvrir le fichier: `%s'" - #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "Mauvais type pour la valeur de la propriété" @@ -1290,9 +1364,6 @@ msgstr "% dal file di input: " #~ msgid " elements. " #~ msgstr " éléments. " -#~ msgid "Line ... " -#~ msgstr "Ligne ..." - #~ msgid "time: %.2f seconds" #~ msgstr "durée: %.2f secondes" diff --git a/po/it.po b/po/it.po index efccc58a17..d13607c909 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2001-02-27 21:26+0100\n" +"POT-Creation-Date: 2001-03-06 12:36+0100\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -13,14 +13,125 @@ msgstr "" "--output-dir=../po/out --add-comments --keyword=_ --keyword=_f\n" "Files: bow.cc int.cc\n" -#: data-file.cc:54 -msgid "EOF in a string" -msgstr "EOF in una corda" +#: ly2dvi.py:67 main.cc:95 main.cc:109 +msgid "this help" +msgstr "" + +#: ly2dvi.py:68 +msgid "change global setting KEY to VAL" +msgstr "" + +#: ly2dvi.py:69 +#, fuzzy +msgid "generate PostScript output" +msgstr "vincoli degenerati" + +#: ly2dvi.py:70 +msgid "keep all output, and name the directory ly2dvi.dir" +msgstr "" + +#: ly2dvi.py:71 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:72 main.cc:104 main.cc:119 +msgid "print version number" +msgstr "" + +#: ly2dvi.py:73 main.cc:106 main.cc:121 +#, fuzzy +msgid "show warranty and copyright" +msgstr " -w, --warranty mostra la garanzia e il copyright\n" + +#: ly2dvi.py:74 +msgid "dump all final output into DIR" +msgstr "" + +#: ly2dvi.py:75 main.cc:113 +#, fuzzy +msgid "write Makefile dependencies for every input file" +msgstr "" +" -d, --dependencies scrive le dependenze del Makefile per ogni file di " +"input\n" + +#: ly2dvi.py:101 +msgid "Exiting ... " +msgstr "" + +#: ly2dvi.py:120 +#, c-format +msgid "Reading `%s'" +msgstr "" + +#: ly2dvi.py:124 mapped-file-storage.cc:87 mudela-stream.cc:111 +#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "non posso aprire il file: `%s'" + +#: ly2dvi.py:187 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "Uso: %s [OPZIONE... [FILE]" + +#: ly2dvi.py:189 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: ly2dvi.py:191 main.cc:119 main.cc:151 +msgid "Options:" +msgstr "Opzioni: " -#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 +#: data-file.cc:118 input.cc:85 ly2dvi.py:195 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "attenzione: " +#: ly2dvi.py:196 +msgid "all output is written in the CURRENT directory" +msgstr "" + +#: ly2dvi.py:198 main.cc:123 main.cc:174 +#, c-format +msgid "Report bugs to %s" +msgstr "" + +#: ly2dvi.py:230 +#, c-format +msgid "Invoking `%s'" +msgstr "" + +#: input.cc:90 ly2dvi.py:234 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "errore: " + +#: ly2dvi.py:234 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:236 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:277 +#, c-format +msgid "Analyzing `%s'" +msgstr "" + +#: ly2dvi.py:539 scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "L'output stampato è inviato a %s..." + +#: ly2dvi.py:540 +#, c-format +msgid "%s file left in `%s'" +msgstr "" + +#: data-file.cc:54 +msgid "EOF in a string" +msgstr "EOF in una corda" + #: dstream.cc:186 #, fuzzy msgid "not enough fields in Dstream init" @@ -46,10 +157,6 @@ msgstr "opzione non riconosciuta: `%s'" msgid "invalid argument `%s' to option `%s'" msgstr "argomento `%s' non valido per l'opzione `%s'" -#: input.cc:90 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "errore: " - #: input.cc:96 #, fuzzy msgid "non fatal error: " @@ -63,12 +170,6 @@ msgstr "posizione sconosciuta" msgid "can't map file" msgstr "non posso mappare il documento" -#: mapped-file-storage.cc:87 mudela-stream.cc:111 paper-stream.cc:40 -#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 -#, c-format -msgid "can't open file: `%s'" -msgstr "non posso aprire il file: `%s'" - #: simple-file-storage.cc:56 #, fuzzy, c-format msgid "Huh? Got %d, expected %d characters" @@ -316,7 +417,7 @@ msgstr "" msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" -#: key-engraver.cc:103 key-performer.cc:72 +#: key-engraver.cc:103 key-performer.cc:77 msgid "FIXME: key change merge" msgstr "" @@ -355,10 +456,6 @@ msgstr "" msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:95 main.cc:109 -msgid "this help" -msgstr "" - #: main.cc:110 msgid "FIELD" msgstr "" @@ -385,13 +482,6 @@ msgstr "" msgid "use FILE as init file" msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" -#: main.cc:113 -#, fuzzy -msgid "write Makefile dependencies for every input file" -msgstr "" -" -d, --dependencies scrive le dependenze del Makefile per ogni file di " -"input\n" - #: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" @@ -422,19 +512,10 @@ msgid "don't timestamp the output" msgstr "" " -T, --no-timestamps non inserisce marcatori temporali nell'output\n" -#: main.cc:104 main.cc:119 -msgid "print version number" -msgstr "" - #: main.cc:120 msgid "verbose" msgstr "" -#: main.cc:106 main.cc:121 -#, fuzzy -msgid "show warranty and copyright" -msgstr " -w, --warranty mostra la garanzia e il copyright\n" - #: main.cc:122 msgid "write midi ouput in formatted ascii" msgstr "" @@ -459,20 +540,11 @@ msgid "" "the GNU Project.\n" msgstr "" -#: main.cc:119 main.cc:151 -msgid "Options:" -msgstr "Opzioni: " - #: main.cc:155 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:123 main.cc:174 -#, c-format -msgid "Report bugs to %s" -msgstr "" - #: main.cc:55 main.cc:182 #, c-format msgid "" @@ -528,16 +600,11 @@ msgstr "" msgid "no such instrument: `%s'" msgstr "% strumento:" -#: midi-item.cc:367 -#, c-format -msgid "unconventional key: flats: %d, sharps: %d" -msgstr "armatura non convenzionale: %d bemolli e %d diesis" - -#: midi-item.cc:414 +#: midi-item.cc:402 msgid "silly duration" msgstr "indicazione durata priva di senso" -#: midi-item.cc:427 +#: midi-item.cc:415 msgid "silly pitch" msgstr "indicazione altezza priva di senso" @@ -596,7 +663,7 @@ msgstr "L'output stampato msgid ", at " msgstr ", a " -#: paper-outputter.cc:240 +#: paper-outputter.cc:245 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "scrivo il file delle dipendenze: `%s'..." @@ -605,7 +672,7 @@ msgstr "scrivo il file delle dipendenze: `%s'..." msgid "Preprocessing elements..." msgstr "Pre-elaborazione..." -#: paper-score.cc:112 +#: paper-score.cc:113 #, fuzzy msgid "Outputting Score, defined at: " msgstr "emetto lo Score, definito a: " @@ -645,12 +712,12 @@ msgstr "traccia " msgid "Creator: " msgstr "Autore: " -#: performance.cc:111 +#: performance.cc:116 #, c-format msgid "from musical definition: %s" msgstr "della definizione musicale: %s" -#: performance.cc:166 +#: performance.cc:171 #, c-format msgid "MIDI output to %s..." msgstr "L'output MIDI è inviato a %s..." @@ -721,11 +788,6 @@ msgstr "durata: %.2f secondi" msgid "unbound spanner `%s'" msgstr "Spanner non legato `%s'" -#: scores.cc:44 -#, fuzzy, c-format -msgid "dependencies output to %s..." -msgstr "L'output stampato è inviato a %s..." - #: scores.cc:106 #, fuzzy msgid "Score contains errors; will not process it" @@ -982,6 +1044,10 @@ msgstr "aspettavo uno spazio bianco" msgid "Can't evaluate Scheme in safe mode" msgstr "" +#: lexer.ll:335 +msgid "Brace found at end of lyric. Did you forget a space?" +msgstr "" + #: lexer.ll:439 #, fuzzy, c-format msgid "invalid character: `%c'" @@ -1223,6 +1289,17 @@ msgstr "% Generato automaticamente" msgid "% from input file: " msgstr "% dal file di input: " +#, fuzzy +#~ msgid "Dependency file left in `%s'" +#~ msgstr "scrivo il file delle dipendenze: `%s'..." + +#, fuzzy +#~ msgid "Usage: ly2dvi [OPTION]... FILE\n" +#~ msgstr "Uso: %s [OPZIONE... [FILE]" + +#~ msgid "unconventional key: flats: %d, sharps: %d" +#~ msgstr "armatura non convenzionale: %d bemolli e %d diesis" + #, fuzzy #~ msgid "wrong identifier type, expected: `%s'" #~ msgstr "Tipo di identificatore sbagliato: " @@ -1240,10 +1317,6 @@ msgstr "% dal file di input: " #~ msgid "Automatically generated" #~ msgstr "Generato automaticamente" -#, fuzzy -#~ msgid "Writing dependency file: `%s'..." -#~ msgstr "scrivo il file delle dipendenze: `%s'..." - #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "Tipo sbagliato per il valore di una proprietà" @@ -1347,9 +1420,6 @@ msgstr "% dal file di input: " #~ "Non posso risolvere esattamente questo problema di conversione; ritorno al " #~ "Word_wrap" -#~ msgid "degenerate constraints" -#~ msgstr "vincoli degenerati" - #~ msgid "time: %.2f seconds" #~ msgstr "durata: %.2f secondi" diff --git a/po/ja.po b/po/ja.po index 9bc039b338..bc8ddbec49 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.2.17\n" -"POT-Creation-Date: 2001-02-27 21:26+0100\n" +"POT-Creation-Date: 2001-03-06 12:36+0100\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -13,14 +13,122 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: data-file.cc:54 -msgid "EOF in a string" -msgstr "ʸ»úÎóÃæ¤Ë EOF ¤¬¤¢¤ê¤Þ¤¹" +#: ly2dvi.py:67 main.cc:95 main.cc:109 +msgid "this help" +msgstr "¤³¤Î¥Ø¥ë¥×" + +#: ly2dvi.py:68 +msgid "change global setting KEY to VAL" +msgstr "" + +#: ly2dvi.py:69 +#, fuzzy +msgid "generate PostScript output" +msgstr "À©¸Â¤ò´ËÏÂ" + +#: ly2dvi.py:70 +msgid "keep all output, and name the directory ly2dvi.dir" +msgstr "" + +#: ly2dvi.py:71 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:72 main.cc:104 main.cc:119 +msgid "print version number" +msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" -#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 +#: ly2dvi.py:73 main.cc:106 main.cc:121 +msgid "show warranty and copyright" +msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" + +#: ly2dvi.py:74 +msgid "dump all final output into DIR" +msgstr "" + +#: ly2dvi.py:75 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" + +#: ly2dvi.py:101 +#, fuzzy +msgid "Exiting ... " +msgstr "¹Ô ..." + +#: ly2dvi.py:120 +#, fuzzy, c-format +msgid "Reading `%s'" +msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" + +#: ly2dvi.py:124 mapped-file-storage.cc:87 mudela-stream.cc:111 +#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, fuzzy, c-format +msgid "can't open file: `%s'" +msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" + +#: ly2dvi.py:187 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" + +#: ly2dvi.py:189 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: ly2dvi.py:191 main.cc:119 main.cc:151 +msgid "Options:" +msgstr "¥ª¥×¥·¥ç¥ó:" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:195 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "·Ù¹ð: " +#: ly2dvi.py:196 +msgid "all output is written in the CURRENT directory" +msgstr "" + +#: ly2dvi.py:198 main.cc:123 main.cc:174 +#, c-format +msgid "Report bugs to %s" +msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" + +#: ly2dvi.py:230 +#, fuzzy, c-format +msgid "Invoking `%s'" +msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" + +#: input.cc:90 ly2dvi.py:234 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "¥¨¥é¡¼: " + +#: ly2dvi.py:234 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:236 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:277 +#, c-format +msgid "Analyzing `%s'" +msgstr "" + +#: ly2dvi.py:539 scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "%s ¤Ø paper ½ÐÎÏ..." + +#: ly2dvi.py:540 +#, c-format +msgid "%s file left in `%s'" +msgstr "" + +#: data-file.cc:54 +msgid "EOF in a string" +msgstr "ʸ»úÎóÃæ¤Ë EOF ¤¬¤¢¤ê¤Þ¤¹" + #: dstream.cc:186 msgid "not enough fields in Dstream init" msgstr "Dstream ½é´ü²½»þ¤Î¥Õ¥£¡¼¥ë¥É¤¬ÉÔ½½Ê¬" @@ -45,10 +153,6 @@ msgstr "ǧ msgid "invalid argument `%s' to option `%s'" msgstr "¥ª¥×¥·¥ç¥ó `%2$s' ¤ËÂФ¹¤ë̵¸ú¤Ê°ú¿ô `%1$s'" -#: input.cc:90 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "¥¨¥é¡¼: " - #: input.cc:96 #, fuzzy msgid "non fatal error: " @@ -63,12 +167,6 @@ msgstr " msgid "can't map file" msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó" -#: mapped-file-storage.cc:87 mudela-stream.cc:111 paper-stream.cc:40 -#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 -#, fuzzy, c-format -msgid "can't open file: `%s'" -msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" - #: simple-file-storage.cc:56 #, c-format msgid "Huh? Got %d, expected %d characters" @@ -315,7 +413,7 @@ msgstr " msgid "can't find file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: key-engraver.cc:103 key-performer.cc:72 +#: key-engraver.cc:103 key-performer.cc:77 msgid "FIXME: key change merge" msgstr "FIXME: ¥­¡¼Êѹ¹¤Î¥Þ¡¼¥¸" @@ -355,10 +453,6 @@ msgstr "EXT" msgid "use output format EXT (scm, ps, tex or as)" msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦" -#: main.cc:95 main.cc:109 -msgid "this help" -msgstr "¤³¤Î¥Ø¥ë¥×" - #: main.cc:110 #, fuzzy msgid "FIELD" @@ -384,10 +478,6 @@ msgstr "FILE" msgid "use FILE as init file" msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: main.cc:113 -msgid "write Makefile dependencies for every input file" -msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" - #: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" @@ -414,19 +504,11 @@ msgstr "̾ msgid "don't timestamp the output" msgstr "½ÐÎϤ˥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤" -#: main.cc:104 main.cc:119 -msgid "print version number" -msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" - #: main.cc:120 #, fuzzy msgid "verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: main.cc:106 main.cc:121 -msgid "show warranty and copyright" -msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" - #: main.cc:122 msgid "write midi ouput in formatted ascii" msgstr "" @@ -453,19 +535,10 @@ msgstr "" "Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU " "¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤¹¡£\n" -#: main.cc:119 main.cc:151 -msgid "Options:" -msgstr "¥ª¥×¥·¥ç¥ó:" - #: main.cc:155 msgid "This binary was compiled with the following options:" msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿" -#: main.cc:123 main.cc:174 -#, c-format -msgid "Report bugs to %s" -msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" - #: main.cc:55 main.cc:182 #, c-format msgid "" @@ -544,16 +617,11 @@ msgstr "" msgid "no such instrument: `%s'" msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" -#: midi-item.cc:367 -#, c-format -msgid "unconventional key: flats: %d, sharps: %d" -msgstr "´·½¬¤Ë¹ç¤ï¤Ê¤¤¥­¡¼¤Ç¤¹: ¥Õ¥é¥Ã¥È: %d ¸Ä, ¥·¥ã¡¼¥× %d ¸Ä" - -#: midi-item.cc:414 +#: midi-item.cc:402 msgid "silly duration" msgstr "Çϼ¯¤²¤¿²»Ä¹" -#: midi-item.cc:427 +#: midi-item.cc:415 msgid "silly pitch" msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á" @@ -611,7 +679,7 @@ msgstr "%s msgid ", at " msgstr ", at " -#: paper-outputter.cc:240 +#: paper-outputter.cc:245 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." @@ -620,7 +688,7 @@ msgstr " msgid "Preprocessing elements..." msgstr "Í×ÁǤòÁ°½èÍýÃæ..." -#: paper-score.cc:112 +#: paper-score.cc:113 msgid "Outputting Score, defined at: " msgstr "ÉèÌ̤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤³¤ÇÄêµÁ: " @@ -657,12 +725,12 @@ msgstr " msgid "Creator: " msgstr "ºî¶Ê¼Ô: " -#: performance.cc:111 +#: performance.cc:116 #, c-format msgid "from musical definition: %s" msgstr "²»³ÚŪÄêµÁ¤è¤ê: %s" -#: performance.cc:166 +#: performance.cc:171 #, c-format msgid "MIDI output to %s..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" @@ -730,11 +798,6 @@ msgstr " msgid "unbound spanner `%s'" msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" -#: scores.cc:44 -#, fuzzy, c-format -msgid "dependencies output to %s..." -msgstr "%s ¤Ø paper ½ÐÎÏ..." - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- ½èÍý¤·¤Þ¤»¤ó" @@ -984,6 +1047,10 @@ msgstr " msgid "Can't evaluate Scheme in safe mode" msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó" +#: lexer.ll:335 +msgid "Brace found at end of lyric. Did you forget a space?" +msgstr "" + #: lexer.ll:439 #, c-format msgid "invalid character: `%c'" @@ -1210,6 +1277,21 @@ msgstr "% Automatically generated" msgid "% from input file: " msgstr "% from input file: " +#, fuzzy +#~ msgid "Dependency file left in `%s'" +#~ msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." + +#, fuzzy +#~ msgid "Report bugs to bug-gnu-music@gnu.org" +#~ msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" + +#, fuzzy +#~ msgid "Usage: ly2dvi [OPTION]... FILE\n" +#~ msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" + +#~ msgid "unconventional key: flats: %d, sharps: %d" +#~ msgstr "´·½¬¤Ë¹ç¤ï¤Ê¤¤¥­¡¼¤Ç¤¹: ¥Õ¥é¥Ã¥È: %d ¸Ä, ¥·¥ã¡¼¥× %d ¸Ä" + #, fuzzy #~ msgid "not a forced distance; cross-staff spanners may be broken" #~ msgstr "" @@ -1227,10 +1309,6 @@ msgstr "% from input file: " #~ msgid "Automatically generated" #~ msgstr "¼«Æ°À¸À®¤µ¤ì¤¿" -#, fuzzy -#~ msgid "Writing dependency file: `%s'..." -#~ msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." - #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" @@ -1254,10 +1332,6 @@ msgstr "% from input file: " #~ msgid "Must stop before this music ends" #~ msgstr "¤³¤Î³Ú¶Ê¤Î½ª¤ï¤ê¤Þ¤Ç¤Ë»ß¤á¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#, fuzzy -#~ msgid "Junking music: `%s'" -#~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" - #~ msgid "conflicting timing request" #~ msgstr "Çï»Ò¤ÎÍ׵᤬¶¥¹ç¤·¤Þ¤¹" @@ -1389,12 +1463,6 @@ msgstr "% from input file: " #~ msgid "%s elements" #~ msgstr "%s ¸Ä¤ÎÍ×ÁÇ" -#~ msgid "Line ... " -#~ msgstr "¹Ô ..." - -#~ msgid "degenerate constraints" -#~ msgstr "À©¸Â¤ò´ËÏÂ" - #~ msgid "no toplevel translator" #~ msgstr "ºÇ¾å°Ì¤Î¥È¥é¥ó¥¹¥ì¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó" diff --git a/po/lilypond.pot b/po/lilypond.pot index 52ed8d32de..574def1b3b 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-02-27 21:26+0100\n" +"POT-Creation-Date: 2001-03-06 12:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,14 +14,120 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: data-file.cc:54 -msgid "EOF in a string" +#: ly2dvi.py:67 main.cc:95 main.cc:109 +msgid "this help" +msgstr "" + +#: ly2dvi.py:68 +msgid "change global setting KEY to VAL" +msgstr "" + +#: ly2dvi.py:69 +msgid "generate PostScript output" +msgstr "" + +#: ly2dvi.py:70 +msgid "keep all output, and name the directory ly2dvi.dir" +msgstr "" + +#: ly2dvi.py:71 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:72 main.cc:104 main.cc:119 +msgid "print version number" +msgstr "" + +#: ly2dvi.py:73 main.cc:106 main.cc:121 +msgid "show warranty and copyright" +msgstr "" + +#: ly2dvi.py:74 +msgid "dump all final output into DIR" +msgstr "" + +#: ly2dvi.py:75 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "" + +#: ly2dvi.py:101 +msgid "Exiting ... " +msgstr "" + +#: ly2dvi.py:120 +#, c-format +msgid "Reading `%s'" msgstr "" -#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 +#: ly2dvi.py:124 mapped-file-storage.cc:87 mudela-stream.cc:111 +#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "" + +#: ly2dvi.py:187 +#, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "" + +#: ly2dvi.py:189 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: ly2dvi.py:191 main.cc:119 main.cc:151 +msgid "Options:" +msgstr "" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:195 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "" +#: ly2dvi.py:196 +msgid "all output is written in the CURRENT directory" +msgstr "" + +#: ly2dvi.py:198 main.cc:123 main.cc:174 +#, c-format +msgid "Report bugs to %s" +msgstr "" + +#: ly2dvi.py:230 +#, c-format +msgid "Invoking `%s'" +msgstr "" + +#: input.cc:90 ly2dvi.py:234 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "" + +#: ly2dvi.py:234 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:236 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:277 +#, c-format +msgid "Analyzing `%s'" +msgstr "" + +#: ly2dvi.py:539 scores.cc:44 +#, c-format +msgid "dependencies output to %s..." +msgstr "" + +#: ly2dvi.py:540 +#, c-format +msgid "%s file left in `%s'" +msgstr "" + +#: data-file.cc:54 +msgid "EOF in a string" +msgstr "" + #: dstream.cc:186 msgid "not enough fields in Dstream init" msgstr "" @@ -46,10 +152,6 @@ msgstr "" msgid "invalid argument `%s' to option `%s'" msgstr "" -#: input.cc:90 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "" - #: input.cc:96 msgid "non fatal error: " msgstr "" @@ -62,12 +164,6 @@ msgstr "" msgid "can't map file" msgstr "" -#: mapped-file-storage.cc:87 mudela-stream.cc:111 paper-stream.cc:40 -#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 -#, c-format -msgid "can't open file: `%s'" -msgstr "" - #: simple-file-storage.cc:56 #, c-format msgid "Huh? Got %d, expected %d characters" @@ -300,7 +396,7 @@ msgstr "" msgid "can't find file: `%s'" msgstr "" -#: key-engraver.cc:103 key-performer.cc:72 +#: key-engraver.cc:103 key-performer.cc:77 msgid "FIXME: key change merge" msgstr "" @@ -339,10 +435,6 @@ msgstr "" msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:95 main.cc:109 -msgid "this help" -msgstr "" - #: main.cc:110 msgid "FIELD" msgstr "" @@ -367,10 +459,6 @@ msgstr "" msgid "use FILE as init file" msgstr "" -#: main.cc:113 -msgid "write Makefile dependencies for every input file" -msgstr "" - #: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" @@ -395,18 +483,10 @@ msgstr "" msgid "don't timestamp the output" msgstr "" -#: main.cc:104 main.cc:119 -msgid "print version number" -msgstr "" - #: main.cc:120 msgid "verbose" msgstr "" -#: main.cc:106 main.cc:121 -msgid "show warranty and copyright" -msgstr "" - #: main.cc:122 msgid "write midi ouput in formatted ascii" msgstr "" @@ -430,19 +510,10 @@ msgid "" "the GNU Project.\n" msgstr "" -#: main.cc:119 main.cc:151 -msgid "Options:" -msgstr "" - #: main.cc:155 msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:123 main.cc:174 -#, c-format -msgid "Report bugs to %s" -msgstr "" - #: main.cc:55 main.cc:182 #, c-format msgid "" @@ -482,16 +553,11 @@ msgstr "" msgid "no such instrument: `%s'" msgstr "" -#: midi-item.cc:367 -#, c-format -msgid "unconventional key: flats: %d, sharps: %d" -msgstr "" - -#: midi-item.cc:414 +#: midi-item.cc:402 msgid "silly duration" msgstr "" -#: midi-item.cc:427 +#: midi-item.cc:415 msgid "silly pitch" msgstr "" @@ -549,7 +615,7 @@ msgstr "" msgid ", at " msgstr "" -#: paper-outputter.cc:240 +#: paper-outputter.cc:245 #, c-format msgid "writing header field %s to %s..." msgstr "" @@ -558,7 +624,7 @@ msgstr "" msgid "Preprocessing elements..." msgstr "" -#: paper-score.cc:112 +#: paper-score.cc:113 msgid "Outputting Score, defined at: " msgstr "" @@ -595,12 +661,12 @@ msgstr "" msgid "Creator: " msgstr "" -#: performance.cc:111 +#: performance.cc:116 #, c-format msgid "from musical definition: %s" msgstr "" -#: performance.cc:166 +#: performance.cc:171 #, c-format msgid "MIDI output to %s..." msgstr "" @@ -666,11 +732,6 @@ msgstr "" msgid "unbound spanner `%s'" msgstr "" -#: scores.cc:44 -#, c-format -msgid "dependencies output to %s..." -msgstr "" - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" @@ -914,6 +975,10 @@ msgstr "" msgid "Can't evaluate Scheme in safe mode" msgstr "" +#: lexer.ll:335 +msgid "Brace found at end of lyric. Did you forget a space?" +msgstr "" + #: lexer.ll:439 #, c-format msgid "invalid character: `%c'" diff --git a/po/nl.po b/po/nl.po index e660605c45..694e372797 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.59\n" -"POT-Creation-Date: 2001-02-27 21:26+0100\n" +"POT-Creation-Date: 2001-03-06 12:36+0100\n" "PO-Revision-Date: 2000-06-09 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -24,14 +24,122 @@ msgstr "" "--add-comments --keyword=_\n" "Files: bow.cc int.cc\n" -#: data-file.cc:54 -msgid "EOF in a string" -msgstr "EOF in een string" +#: ly2dvi.py:67 main.cc:95 main.cc:109 +msgid "this help" +msgstr "deze hulp" + +#: ly2dvi.py:68 +msgid "change global setting KEY to VAL" +msgstr "verander globale instelling SLEUTEL in WAARDE" + +#: ly2dvi.py:69 +msgid "generate PostScript output" +msgstr "genereer PostScipt uitvoer" + +#: ly2dvi.py:70 +msgid "keep all output, and name the directory ly2dvi.dir" +msgstr "bewaar alle uitvoer, en noem de directory ly2dvi.dir" + +#: ly2dvi.py:71 +msgid "don't run LilyPond" +msgstr "draai LilyPond niet" + +#: ly2dvi.py:72 main.cc:104 main.cc:119 +msgid "print version number" +msgstr "druk versienummer af" -#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 +#: ly2dvi.py:73 main.cc:106 main.cc:121 +msgid "show warranty and copyright" +msgstr "toon garantie en auteursrechten" + +#: ly2dvi.py:74 +msgid "dump all final output into DIR" +msgstr "dump alle uiteindelijke uivoer in DIR" + +#: ly2dvi.py:75 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" + +#: ly2dvi.py:101 +msgid "Exiting ... " +msgstr "Beëidigen ..." + +#: ly2dvi.py:120 +#, c-format +msgid "Reading `%s'" +msgstr "Inlezen `%s'" + +#: ly2dvi.py:124 mapped-file-storage.cc:87 mudela-stream.cc:111 +#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "kan bestand niet openen: `%s'" + +#: ly2dvi.py:187 +#, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "Gebruik: %s [OPTIE]... BESTAND" + +#: ly2dvi.py:189 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "Genereer .dvi met LaTeX voor LilyPond" + +#: ly2dvi.py:191 main.cc:119 main.cc:151 +msgid "Options:" +msgstr "Opties:" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:195 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "waarschuwing: " +#: ly2dvi.py:196 +msgid "all output is written in the CURRENT directory" +msgstr "alle uitvoer wordt naar HUIDIGE directory geschreven" + +#: ly2dvi.py:198 main.cc:123 main.cc:174 +#, c-format +msgid "Report bugs to %s" +msgstr "" +"Meld luizen in het programma aan %s;\n" +"meld onjuistheden in de vertaling aan of " + +#: ly2dvi.py:230 +#, c-format +msgid "Invoking `%s'" +msgstr "Uitvoeren `%s'" + +#: input.cc:90 ly2dvi.py:234 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "fout: " + +#: ly2dvi.py:234 +#, c-format +msgid "command exited with value %d" +msgstr "opdracht eindigde met waarde %d" + +#: ly2dvi.py:236 +msgid "(ignored)" +msgstr "(genegeerd)" + +#: ly2dvi.py:277 +#, c-format +msgid "Analyzing `%s'" +msgstr "Analyseren `%s'" + +#: ly2dvi.py:539 scores.cc:44 +#, c-format +msgid "dependencies output to %s..." +msgstr "afhankelijkheden uitvoer naar %s..." + +#: ly2dvi.py:540 +#, c-format +msgid "%s file left in `%s'" +msgstr "%s bestand achtergelaten in `%s'" + +#: data-file.cc:54 +msgid "EOF in a string" +msgstr "EOF in een string" + #: dstream.cc:186 msgid "not enough fields in Dstream init" msgstr "onvoldoende velden in Dstream init" @@ -56,10 +164,6 @@ msgstr "onbekende optie: `%s'" msgid "invalid argument `%s' to option `%s'" msgstr "onjuist argument: `%s' voor optie `%s'" -#: input.cc:90 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "fout: " - #: input.cc:96 msgid "non fatal error: " msgstr "niet noodlottige fout: " @@ -72,12 +176,6 @@ msgstr "positie onbekend" msgid "can't map file" msgstr "kan bestand niet inkaarten" -#: mapped-file-storage.cc:87 mudela-stream.cc:111 paper-stream.cc:40 -#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 -#, c-format -msgid "can't open file: `%s'" -msgstr "kan bestand niet openen: `%s'" - #: simple-file-storage.cc:56 #, c-format msgid "Huh? Got %d, expected %d characters" @@ -314,7 +412,7 @@ msgstr "" msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" -#: key-engraver.cc:103 key-performer.cc:72 +#: key-engraver.cc:103 key-performer.cc:77 msgid "FIXME: key change merge" msgstr "MAAKME: toonsoort sleutel samenvoeging" @@ -353,10 +451,6 @@ msgstr "EXT" msgid "use output format EXT (scm, ps, tex or as)" msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)" -#: main.cc:95 main.cc:109 -msgid "this help" -msgstr "deze hulp" - #: main.cc:110 msgid "FIELD" msgstr "VELD" @@ -381,10 +475,6 @@ msgstr "BESTAND" msgid "use FILE as init file" msgstr "gebruik BESTAND als initialisatiebestand" -#: main.cc:113 -msgid "write Makefile dependencies for every input file" -msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" - #: main.cc:114 msgid "prepend DIR to dependencies" msgstr "voeg DIR voor aan afhankelijkheden" @@ -409,18 +499,10 @@ msgstr "verbied naamgeving van uitvoer bestand en exportering" msgid "don't timestamp the output" msgstr "geen tijdsstempel in de uitvoer" -#: main.cc:104 main.cc:119 -msgid "print version number" -msgstr "druk versienummer af" - #: main.cc:120 msgid "verbose" msgstr "breedsprakig" -#: main.cc:106 main.cc:121 -msgid "show warranty and copyright" -msgstr "toon garantie en auteursrechten" - #: main.cc:122 msgid "write midi ouput in formatted ascii" msgstr "schrijf midi uitvoer in geformatteerd ascii" @@ -447,21 +529,10 @@ msgstr "" "uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" "maakt deel uit van het GNU Project.\n" -#: main.cc:119 main.cc:151 -msgid "Options:" -msgstr "Opties:" - #: main.cc:155 msgid "This binary was compiled with the following options:" msgstr "Dit programma is gecompileerd met de volgende instellingen:" -#: main.cc:123 main.cc:174 -#, c-format -msgid "Report bugs to %s" -msgstr "" -"Meld luizen in het programma aan %s;\n" -"meld onjuistheden in de vertaling aan of " - #: main.cc:55 main.cc:182 #, c-format msgid "" @@ -518,16 +589,11 @@ msgstr "" msgid "no such instrument: `%s'" msgstr "geen dergelijk instrument: `%s'" -#: midi-item.cc:367 -#, c-format -msgid "unconventional key: flats: %d, sharps: %d" -msgstr "vreemde toonsoort: %d mollen, %d kruizen" - -#: midi-item.cc:414 +#: midi-item.cc:402 msgid "silly duration" msgstr "rare duur" -#: midi-item.cc:427 +#: midi-item.cc:415 msgid "silly pitch" msgstr "rare toonhoogte" @@ -585,7 +651,7 @@ msgstr "papier uitvoer naar %s..." msgid ", at " msgstr ", bij " -#: paper-outputter.cc:240 +#: paper-outputter.cc:245 #, c-format msgid "writing header field %s to %s..." msgstr "Schijven van kop veld %s naar bestand %s..." @@ -594,7 +660,7 @@ msgstr "Schijven van kop veld %s naar bestand %s..." msgid "Preprocessing elements..." msgstr "Voorbewerken van elementen..." -#: paper-score.cc:112 +#: paper-score.cc:113 msgid "Outputting Score, defined at: " msgstr "Uitvoer van Score, gedefinieerd op: " @@ -631,12 +697,12 @@ msgstr "Spoor ... " msgid "Creator: " msgstr "Schepper: " -#: performance.cc:111 +#: performance.cc:116 #, c-format msgid "from musical definition: %s" msgstr "van muzikale definitie: %s" -#: performance.cc:166 +#: performance.cc:171 #, c-format msgid "MIDI output to %s..." msgstr "MIDI uitvoer naar %s..." @@ -704,11 +770,6 @@ msgstr "duur: %.2f seconden" msgid "unbound spanner `%s'" msgstr "ongebonden spanner `%s'" -#: scores.cc:44 -#, c-format -msgid "dependencies output to %s..." -msgstr "afhankelijkheden uitvoer naar %s..." - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "Partituur bevat fouten; zal hem niet verwerken" @@ -955,6 +1016,10 @@ msgstr "wit verwacht" msgid "Can't evaluate Scheme in safe mode" msgstr "Kan Scheme niet evalueren in veilige modus" +#: lexer.ll:335 +msgid "Brace found at end of lyric. Did you forget a space?" +msgstr "Accolade gevonden aan het eind van liedtektst. Een spatie vergeten?" + #: lexer.ll:439 #, c-format msgid "invalid character: `%c'" diff --git a/po/ru.po b/po/ru.po index 1356b83cd7..c3e560a74d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-02-27 21:26+0100\n" +"POT-Creation-Date: 2001-03-06 12:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -14,14 +14,120 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: ENCODING\n" -#: data-file.cc:54 -msgid "EOF in a string" -msgstr "EOF × ÓÔÒÏËÅ" +#: ly2dvi.py:67 main.cc:95 main.cc:109 +msgid "this help" +msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" + +#: ly2dvi.py:68 +msgid "change global setting KEY to VAL" +msgstr "" + +#: ly2dvi.py:69 +msgid "generate PostScript output" +msgstr "" + +#: ly2dvi.py:70 +msgid "keep all output, and name the directory ly2dvi.dir" +msgstr "" + +#: ly2dvi.py:71 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:72 main.cc:104 main.cc:119 +msgid "print version number" +msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" + +#: ly2dvi.py:73 main.cc:106 main.cc:121 +msgid "show warranty and copyright" +msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" + +#: ly2dvi.py:74 +msgid "dump all final output into DIR" +msgstr "" + +#: ly2dvi.py:75 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" + +#: ly2dvi.py:101 +msgid "Exiting ... " +msgstr "" + +#: ly2dvi.py:120 +#, fuzzy, c-format +msgid "Reading `%s'" +msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" + +#: ly2dvi.py:124 mapped-file-storage.cc:87 mudela-stream.cc:111 +#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" + +#: ly2dvi.py:187 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]" + +#: ly2dvi.py:189 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" -#: data-file.cc:118 input.cc:85 midi-parser.cc:100 warn.cc:23 +#: ly2dvi.py:191 main.cc:119 main.cc:151 +msgid "Options:" +msgstr "ïÐÃÉÉ:" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:195 midi-parser.cc:100 warn.cc:23 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " +#: ly2dvi.py:196 +msgid "all output is written in the CURRENT directory" +msgstr "" + +#: ly2dvi.py:198 main.cc:123 main.cc:174 +#, c-format +msgid "Report bugs to %s" +msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" + +#: ly2dvi.py:230 +#, fuzzy, c-format +msgid "Invoking `%s'" +msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" + +#: input.cc:90 ly2dvi.py:234 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "ÏÛÉÂËÁ: " + +#: ly2dvi.py:234 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:236 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:277 +#, c-format +msgid "Analyzing `%s'" +msgstr "" + +#: ly2dvi.py:539 scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." + +#: ly2dvi.py:540 +#, c-format +msgid "%s file left in `%s'" +msgstr "" + +#: data-file.cc:54 +msgid "EOF in a string" +msgstr "EOF × ÓÔÒÏËÅ" + #: dstream.cc:186 msgid "not enough fields in Dstream init" msgstr "ÎÅ ÄÏÓÔÁÔÏÞÎÏ ÐÏÌÅÊ × Dstream init" @@ -46,10 +152,6 @@ msgstr " msgid "invalid argument `%s' to option `%s'" msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ ÏÐÃÉÉ `%s'" -#: input.cc:90 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "ÏÛÉÂËÁ: " - #: input.cc:96 msgid "non fatal error: " msgstr "ÎÅ ÓÍÅÒÔÅÌØÎÁÑ ÏÛÉÂËÁ: " @@ -62,12 +164,6 @@ msgstr " msgid "can't map file" msgstr "ÎÅ ÍÏÇÕ ÏÔÏÂÒÁÚÉÔØ ÆÁÊÌ × ÐÁÍÑÔØ" -#: mapped-file-storage.cc:87 mudela-stream.cc:111 paper-stream.cc:40 -#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 -#, c-format -msgid "can't open file: `%s'" -msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" - #: simple-file-storage.cc:56 #, c-format msgid "Huh? Got %d, expected %d characters" @@ -302,7 +398,7 @@ msgstr " msgid "can't find file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" -#: key-engraver.cc:103 key-performer.cc:72 +#: key-engraver.cc:103 key-performer.cc:77 msgid "FIXME: key change merge" msgstr "éóðòá÷øíåîñ: ÓÌÉÑÎÉÅ ÓÍÅÎÙ ËÌÀÞÁ" @@ -342,10 +438,6 @@ msgstr " msgid "use output format EXT (scm, ps, tex or as)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû" -#: main.cc:95 main.cc:109 -msgid "this help" -msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" - #: main.cc:110 #, fuzzy msgid "FIELD" @@ -371,10 +463,6 @@ msgstr " msgid "use FILE as init file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ" -#: main.cc:113 -msgid "write Makefile dependencies for every input file" -msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" - #: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" @@ -401,19 +489,11 @@ msgstr " msgid "don't timestamp the output" msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ" -#: main.cc:104 main.cc:119 -msgid "print version number" -msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" - #: main.cc:120 #, fuzzy msgid "verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: main.cc:106 main.cc:121 -msgid "show warranty and copyright" -msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" - #: main.cc:122 msgid "write midi ouput in formatted ascii" msgstr "" @@ -440,19 +520,10 @@ msgstr "" "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n" "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n" -#: main.cc:119 main.cc:151 -msgid "Options:" -msgstr "ïÐÃÉÉ:" - #: main.cc:155 msgid "This binary was compiled with the following options:" msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:" -#: main.cc:123 main.cc:174 -#, c-format -msgid "Report bugs to %s" -msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" - #: main.cc:55 main.cc:182 #, c-format msgid "" @@ -497,16 +568,11 @@ msgstr "" msgid "no such instrument: `%s'" msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" -#: midi-item.cc:367 -#, c-format -msgid "unconventional key: flats: %d, sharps: %d" -msgstr "ÎÅÓÔÁÎÄÁÒÔÎÙÊ ËÌÀÞ: ÂÅÍÏÌÉ: %d, ÄÉÅÚÙ: %d" - -#: midi-item.cc:414 +#: midi-item.cc:402 msgid "silly duration" msgstr "ÇÌÕÐÁÑ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: midi-item.cc:427 +#: midi-item.cc:415 msgid "silly pitch" msgstr "ÇÌÕÐÙÊ ÔÏÎ" @@ -564,7 +630,7 @@ msgstr "\" msgid ", at " msgstr ", ×" -#: paper-outputter.cc:240 +#: paper-outputter.cc:245 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." @@ -573,7 +639,7 @@ msgstr " msgid "Preprocessing elements..." msgstr "ðÒÅÄ×ÁÒÉÔÅÌØÎÏ ÏÂÒÁÂÁÔÙ×ÁÀ ÜÌÅÍÅÎÔÙ..." -#: paper-score.cc:112 +#: paper-score.cc:113 msgid "Outputting Score, defined at: " msgstr "" @@ -610,12 +676,12 @@ msgstr " msgid "Creator: " msgstr "óÏÚÄÁÔÅÌØ: " -#: performance.cc:111 +#: performance.cc:116 #, c-format msgid "from musical definition: %s" msgstr "ÉÚ ÍÕÚÙËÁÌØÎÏÊ ÎÏÔÁÃÉÉ %s" -#: performance.cc:166 +#: performance.cc:171 #, c-format msgid "MIDI output to %s..." msgstr "×Ù×ÏÄ MIDI × %s..." @@ -683,11 +749,6 @@ msgstr " msgid "unbound spanner `%s'" msgstr "" -#: scores.cc:44 -#, fuzzy, c-format -msgid "dependencies output to %s..." -msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" @@ -937,6 +998,10 @@ msgstr " msgid "Can't evaluate Scheme in safe mode" msgstr "îÅ ÍÏÇÕ ×ÙÐÏÌÎÑÔØ ËÏÄ ÓÈÅÍÙ × ÂÅÚÏÐÁÓÎÏÍ ÒÅÖÉÍÅ" +#: lexer.ll:335 +msgid "Brace found at end of lyric. Did you forget a space?" +msgstr "" + #: lexer.ll:439 #, c-format msgid "invalid character: `%c'" @@ -1162,6 +1227,21 @@ msgstr "% msgid "% from input file: " msgstr "% ÉÚ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ: " +#, fuzzy +#~ msgid "Dependency file left in `%s'" +#~ msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." + +#, fuzzy +#~ msgid "Report bugs to bug-gnu-music@gnu.org" +#~ msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" + +#, fuzzy +#~ msgid "Usage: ly2dvi [OPTION]... FILE\n" +#~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]" + +#~ msgid "unconventional key: flats: %d, sharps: %d" +#~ msgstr "ÎÅÓÔÁÎÄÁÒÔÎÙÊ ËÌÀÞ: ÂÅÍÏÌÉ: %d, ÄÉÅÚÙ: %d" + #, fuzzy #~ msgid "not a forced distance; cross-staff spanners may be broken" #~ msgstr "" @@ -1179,10 +1259,6 @@ msgstr "% #~ msgid "Automatically generated" #~ msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ" -#, fuzzy -#~ msgid "Writing dependency file: `%s'..." -#~ msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." - #~ msgid "Wrong type for property" #~ msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ ÄÌÑ Ó×ÏÊÓÔ×Á" @@ -1201,9 +1277,6 @@ msgstr "% #~ msgid "Huh? Not a Request: `%s'" #~ msgstr "á? îå úÁÐÒÏÓ: `%s'" -#~ msgid "Junking music: `%s'" -#~ msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" - #~ msgid "can't find both ends of %s" #~ msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÏÂÁ ËÏÎÃÁ Õ %s" diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile index 93fed5a485..f3e53ff511 100644 --- a/scripts/GNUmakefile +++ b/scripts/GNUmakefile @@ -2,7 +2,7 @@ depth = .. SEXECUTABLES=convert-ly lilypond-book ly2dvi abc2ly as2text etf2ly musedata2ly pmx2ly -STEPMAKE_TEMPLATES=script help2man +STEPMAKE_TEMPLATES=script help2man po HELP2MAN_EXECS = $(SEXECUTABLES) include $(depth)/make/stepmake.make diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 42cf6cb29e..042cf07ba4 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -1,9 +1,12 @@ #!@PYTHON@ # run lily, setup LaTeX input. -""" TODO: --dependencies +# Note: gettext work best if we use ' for docstrings and " +# for gettextable strings -""" +''' TODO: --dependencies + +''' import os @@ -16,6 +19,11 @@ import __main__ import operator import tempfile +import gettext +gettext.bindtextdomain ('lilypond', '@localedir@') +gettext.textdomain('lilypond') +_ = gettext.gettext + layout_fields = ['title', 'subtitle', 'subsubtitle', 'footer', 'head', 'composer', 'arranger', 'instrument', 'opus', 'piece', 'metre', @@ -56,42 +64,48 @@ if program_version == '@' + 'TOPLEVEL_VERSION' + '@': postscript_p = 0 option_definitions = [ - ('', 'h', 'help', 'print help'), - ('KEY=VAL', 's', 'set', 'change global setting KEY to VAL'), - ('', 'P', 'postscript', 'Generate PostScript output'), - ('', 'k', 'keep', 'Keep all output, and name the directory ly2dvi.dir'), - ('', '', 'no-lily', 'Don\'t run lilypond'), - ('', 'v', 'version', "Print version and copyright info"), - ('DIR', '', 'outdir', 'Dump all final output into DIR'), - ('', 'd', 'dependencies', 'Dump all final output into DIR'), + ('', 'h', 'help', _ ("this help")), + ('KEY=VAL', 's', 'set', _ ("change global setting KEY to VAL")), + ('', 'P', 'postscript', _ ("generate PostScript output")), + ('', 'k', 'keep', _ ("keep all output, and name the directory ly2dvi.dir")), + ('', '', 'no-lily', _ ("don't run LilyPond")), + ('', 'v', 'version', _ ("print version number")), + ('', 'w', 'warranty', _ ("show warranty and copyright")), + ('DIR', '', 'outdir', _ ("dump all final output into DIR")), + ('', 'd', 'dependencies', _ ("write Makefile dependencies for every input file")), ] - - -def identify(): +def identify (): sys.stdout.write ('ly2dvi (GNU LilyPond) %s\n' % program_version) -def print_version (): - identify() - sys.stdout.write (r"""Copyright 1998--1999 +def warranty (): + identify () + sys.stdout.write ('\n') + sys.stdout.write (_ ('Copyright (c) %s by' % ' 1998-2001')) + sys.stdout.write ('\n') + sys.stdout.write (' Han-Wen Nienhuys') + sys.stdout.write ('\n') + sys.stdout.write (_ (r''' Distributed under terms of the GNU General Public License. It comes with -NO WARRANTY.""") +NO WARRANTY.''')) + sys.stdout.write ('\n') def progress (s): - """Make the progress messages stand out between lilypond stuff""" + '''Make the progress messages stand out between lilypond stuff''' + # Why should they have to stand out? Blend in would be nice too. sys.stderr.write ('*** ' + s+ '\n') def error (s): sys.stderr.write (s) - raise 'Exiting ... ' + raise _ ("Exiting ... ") def find_file (name): - """ + ''' Search the include path for NAME. If found, return the (CONTENTS, PATH) of the file. - """ + ''' f = None nm = '' @@ -104,17 +118,19 @@ def find_file (name): except IOError: pass if f: - sys.stderr.write ("Reading `%s'\n" % nm) + sys.stderr.write (_ ("Reading `%s'") % nm) + sys.stderr.write ('\n'); return (f.read (), nm) else: - error ("File not found `%s'\n" % name) + error (_ ("can't open file: `%s'" % name)) + sys.stderr.write ('\n'); return ('', '') def getopt_args (opts): - "Construct arguments (LONG, SHORT) for getopt from list of options." + '''Construct arguments (LONG, SHORT) for getopt from list of options.''' short = '' long = [] for o in opts: @@ -130,7 +146,7 @@ def getopt_args (opts): return (short, long) def option_help_str (o): - "Transform one option description (4-tuple ) into neatly formatted string" + '''Transform one option description (4-tuple ) into neatly formatted string''' sh = ' ' if o[1]: sh = '-%s' % o[1] @@ -152,7 +168,7 @@ def option_help_str (o): def options_help_str (opts): - "Convert a list of options into a neatly formatted string" + '''Convert a list of options into a neatly formatted string''' w = 0 strs =[] helps = [] @@ -168,22 +184,20 @@ def options_help_str (opts): str = str + '%s%s%s\n' % (s[0], ' ' * (w - len(s[0]) + 3), s[1]) return str -def help(): - sys.stdout.write("""Usage: lyvi [options] FILE\n -Generate .dvi with LaTeX for lilypond -Options: -""") +def help (): + sys.stdout.write (_ ("Usage: %s [OPTION]... FILE") % 'ly2dvi') + sys.stdout.write ('\n\n') + sys.stdout.write (_ ("Generate .dvi with LaTeX for LilyPond")) + sys.stdout.write ('\n\n') + sys.stdout.write (_ ("Options:")) + sys.stdout.write ('\n') sys.stdout.write (options_help_str (option_definitions)) - sys.stdout.write (r"""Warning all output is written in the CURRENT directory - - - -Report bugs to bug-gnu-music@gnu.org. - -Written by -Han-Wen Nienhuys -""") - + sys.stdout.write ('\n\n') + sys.stdout.write (_ ("warning: ")) + sys.stdout.write (_ ("all output is written in the CURRENT directory")) + sys.stdout.write ('\n\n') + sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org') + sys.stdout.write ('\n') sys.exit (0) @@ -210,16 +224,17 @@ def setup_temp (): os.environ['TFMFONTS'] = original_dir + fp os.chdir (temp_dir) - progress ('Temp directory is `%s\'\n' % temp_dir) + progress (_ ('Temp directory is `%s\'\n') % temp_dir) def system (cmd, ignore_error = 0): - sys.stderr.write ("invoking `%s\'\n" % cmd) + sys.stderr.write (_ ("Invoking `%s\'") % cmd) + sys.stderr.write ('\n') st = os.system (cmd) if st: - msg = ('Error command exited with value %d' % st) + msg = ( _ ("error: ") + _ ("command exited with value %d") % st) if ignore_error: - sys.stderr.write (msg + ' (ignored)\n') + sys.stderr.write (msg + ' ' + _ ("(ignored)") + ' ') else: error (msg) @@ -227,7 +242,7 @@ def system (cmd, ignore_error = 0): def cleanup_temp (): if not keep_temp_dir: - progress ('Cleaning up `%s\'' % temp_dir) + progress (_ ('Cleaning up `%s\'') % temp_dir) system ('rm -rf %s' % temp_dir) @@ -257,10 +272,10 @@ def set_setting (dict, key, val): def analyse_lilypond_output (filename, extra): - """Grep FILENAME for interesting stuff, and - put relevant info into EXTRA.""" + '''Grep FILENAME for interesting stuff, and + put relevant info into EXTRA.''' filename = filename+'.tex' - progress ("Analyzing `%s'" % filename) + progress (_ ("Analyzing `%s'") % filename) s = open (filename).read () # search only the first 10k @@ -308,7 +323,7 @@ def find_tex_files (files, extra): def one_latex_definition (defn, first): s = '' for (k,v) in defn[1].items (): - s = r"""\def\the%s{%s}""" % (k,open (v).read ()) + s = r'''\def\the%s{%s}''' % (k,open (v).read ()) if first: s = s + '\\def\\mustmakelilypondtitle{}\n' @@ -325,9 +340,9 @@ ly_paper_to_latexpaper = { } def global_latex_definition (tfiles, extra): - """construct preamble from EXTRA, + '''construct preamble from EXTRA, dump lily output files after that, and return result. - """ + ''' s = "" @@ -358,16 +373,16 @@ def global_latex_definition (tfiles, extra): s = s + '\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s}\n' % (extra['linewidth'][0], textheight, orientation) - s= s + r""" + s= s + r''' \usepackage[latin1]{inputenc} \input{titledefs} \makeatletter \renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%% -""" +''' if extra['pagenumber'] and extra['pagenumber'][-1]: - s = s + r""" + s = s + r''' \renewcommand{\@oddhead}{\parbox{\textwidth}%% - {\mbox{}\small\theheader\hfill\textbf{\thepage}}}%%""" + {\mbox{}\small\theheader\hfill\textbf{\thepage}}}%%''' else: s = s + '\\pagestyle{empty}' @@ -384,8 +399,8 @@ def global_latex_definition (tfiles, extra): def do_files (fs, extra): - """process the list of filenames in FS, using standard settings in EXTRA. - """ + '''process the list of filenames in FS, using standard settings in EXTRA. + ''' if not no_lily: run_lilypond (fs) @@ -402,7 +417,7 @@ def do_files (fs, extra): return latex_file + '.dvi' def generate_postscript (dvi_name, extra): - """Run dvips on DVI_NAME, optionally doing -t landscape""" + '''Run dvips on DVI_NAME, optionally doing -t landscape''' opts = '' if extra['papersizename']: @@ -436,7 +451,12 @@ def generate_dependency_file (depfile, outname): df.close (); (sh, long) = getopt_args (__main__.option_definitions) -(options, files) = getopt.getopt(sys.argv[1:], sh, long) +try: + (options, files) = getopt.getopt(sys.argv[1:], sh, long) +except: + help () + sys.exit (2) + for opt in options: o = opt[0] a = opt[1] @@ -462,6 +482,10 @@ for opt in options: track_dependencies_p = 1 elif o == '--version' or o == '-v': identify () + sys.exit (0) + elif o == '--warranty' or o == '-w': + warranty () + sys.exit (0) include_path = map (os.path.abspath, include_path) @@ -513,8 +537,8 @@ if files: cleanup_temp () # most insteresting info last - progress ("Dependency file left in `%s'" % depfile) - progress ("%s file left in `%s'" % (type, dest)) + progress (_ ("dependencies output to %s...") % depfile) + progress (_ ("%s file left in `%s'") % (type, dest)) diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make index 071089bd63..796abf81f9 100644 --- a/stepmake/stepmake/po-targets.make +++ b/stepmake/stepmake/po-targets.make @@ -17,7 +17,7 @@ localpo: else po: localpo $(LOOP) -ALL_PO_SOURCES = $(ALL_C_SOURCES) $(ALL_CC_SOURCES) $(wildcard $(outdir)/*.hh) $(wildcard $(outdir)/*.cc) +ALL_PO_SOURCES = $(ALL_C_SOURCES) $(ALL_CC_SOURCES) $(PYTHON_SCRIPTS_IN) $(wildcard $(outdir)/*.hh) $(wildcard $(outdir)/*.cc) localpo: ifneq ($(strip $(ALL_PO_SOURCES)),) @echo $(ALL_PO_SOURCES) -- 2.39.2