Update.

NEWS

@@ -16,6 +16,9 @@ Changes in version 1.75b:
   In addition, they provide a means for yyerror to remain pure, and
   to access to the current location.
 
+  #defining yyerror to steal internal variables is strongly
+  discouraged.  It is not guaranteed to work for ever.
+
 * #line
   Bison now recognizes #line in its input, and forwards them.
 

TODO

@@ -17,8 +17,8 @@ Write a first documentation for C++ output.
 
 
 * Documentation
-Before releasing, make sure the documentation refers to the current
+Before releasing, make sure the documentation ("Understanding your
-`output' format.
+parser") refers to the current `output' format.
 
 
 * GLR & C++
@@ -52,10 +52,40 @@ DeRemer and Penello: they already provide the algorithm.
 
 * Extensions
 
-** yyerror, yysymprint interface
+** %destructor
+I think we should document it as experimental, and allow its use in
+the next releases.  But we also need to port it to GLR.  What about
+lalr1.cc?  Well, read what Hans reported, maybe we don't want
+%detructor.  On the other hand, there is no reason not to provide it:
+users can avoid its use.
+
+** $foo
+Have a look at the Lemon parser generator: instead of $1, $2 etc. they
+can name the values.  This is much more pleasant.  For instance:
+
+       exp (res): exp (a) '+' exp (b) { $res = $a + $b; };
+
+I love this.  I have been bitten too often by the removal of the
+symbol, and forgetting to shift all the $n to $n-1.  If you are
+unlucky, it compiles...
+
+** $-1
+We should find a means to provide an access to values deep in the
+stack.  For instance, instead of
+
+	baz: qux { $$ = $<foo>-1 + $<bar>0 + $1; }
+
+we should be able to have:
+
+  foo($foo) bar($bar) baz($bar): qux($qux) { $baz = $foo + $bar + $qux; }
+
+Or something like this.
+
+
+** yysymprint interface
 It should be improved, in particular when using Bison features such as
-locations, and YYPARSE_PARAMS.  For the time being, it is recommended
+locations, and YYPARSE_PARAMS.  For the time being, it is almost
-to #define yyerror and yyprint to steal internal variables...
+recommended to yyprint to steal internal variables...
 
 ** Several %unions
 I think this is a pleasant (but useless currently) feature, but in the

po/de.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.50\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-10-07 10:50:39+0200\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -94,6 +94,11 @@ msgstr[1] "erwartete %d Schiebe/Reduziere-Konflikte"
 msgid "cannot open file `%s'"
 msgstr "kann Datei »%s« nicht öffnen"
 
+#: src/files.c:130
+#, fuzzy
+msgid "I/O error"
+msgstr "als Fehler betrachtet"
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "kann Datei nicht schließen"
@@ -314,50 +319,50 @@ msgstr " auf der rechten Seite:"
 msgid "Rules never reduced"
 msgstr "niemals reduzierte Regeln"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "mehr als eine %s-Deklaration"
 
-#: src/reader.c:141
+#: src/reader.c:132
-#, c-format
+#, fuzzy, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr "Rückgabetyp-Konflikt in merge-Funktion %s: »%s« und »%s«"
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "Regel für %s vorhanden, welches aber ein Token ist"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "Typkonflikt (»%s« »%s«) bei Default-Aktion"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal mit Typ und keine Aktion"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, fuzzy, c-format
 msgid "only one %s allowed per rule"
 msgstr "nur ein %%dprec pro Regel erlaubt"
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, fuzzy, c-format
 msgid "%s affects only GLR parsers"
 msgstr "%%dprec betrifft nur GLR-Parser"
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, fuzzy, c-format
 msgid "%s must be followed by positive number"
 msgstr "%%dprec muss von positiver Zahl gefolgt sein"
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "zu viele Symbole (Token plus Nicht-Terminale); Maximum %d"
@@ -412,60 +417,50 @@ msgstr[1] "%d nutzlose Regeln"
 msgid "start symbol %s does not derive any sentence"
 msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
-#, c-format
+#, fuzzy, c-format
-msgid ": invalid character: `%c'\n"
+msgid "unexpected end of file in `%s ... %s'"
-msgstr ": ungültiges Zeichen: »%c«\n"
-
-#: scan-gram.l:247
-msgid ": unexpected end of file in a comment\n"
-msgstr ": Datei endet unerwartet innerhalb eines Kommentars\n"
-
-#: scan-gram.l:276 scan-gram.l:415
-msgid ": unexpected end of file in a string\n"
 msgstr ": Datei endet unerwartet innerhalb einer Zeichenkette\n"
 
-#: scan-gram.l:314 scan-gram.l:386
+#: scan-gram.l:267
-msgid ": unexpected end of file in a character\n"
+#, fuzzy, c-format
-msgstr ": Datei endet unerwartet innerhalb eines Zeichens\n"
+msgid "invalid directive: %s"
+msgstr "ungültige Eingabe: %s"
 
-#: scan-gram.l:335
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
 #, c-format
-msgid ": invalid escape: %s\n"
+msgid "integer out of range: %s"
+msgstr ""
+
+#: scan-gram.l:332
+#, fuzzy, c-format
+msgid "invalid character: %s"
+msgstr ": ungültiges Zeichen: »%c«\n"
+
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
+#, fuzzy, c-format
+msgid "invalid escape sequence: %s"
 msgstr ": unzulässiges Fluchtzeichen: %s\n"
 
-#: scan-gram.l:356
+#: scan-gram.l:516
-#, c-format
+#, fuzzy, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "unrecognized escape sequence: %s"
 msgstr ": unbekannt Fluchtzeichen: %s\n"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-msgid ": unexpected end of file in a braced code\n"
-msgstr ": Datei endet unerwartet innerhalb geklammerten Programmtexts\n"
-
-#: scan-gram.l:506
-msgid ": unexpected end of file in a prologue\n"
-msgstr ": Datei endet unerwartet innerhalb eines Prologs\n"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ von »%s« hat keinen deklarierten Typ"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "unzulässiger Wert: %s%d"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d von »%s« hat keinen deklarierten Typ"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s ist unzulässig"
+msgstr "unzulässiger Wert: %s%d"
 
 #: src/state.c:145
 #, c-format
@@ -607,7 +602,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr "Gesammelte Durchläufe = %u\n"
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr "Konnte Statistik-Datei nicht lesen."
 
@@ -615,11 +610,11 @@ msgstr "Konnte Statistik-Datei nicht lesen."
 msgid "Bad stats file size.\n"
 msgstr "Ungültige Statistik-Datei-Größe.\n"
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr "Konnte Statistik-Datei nicht schreiben."
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr "Konnte Statistik-Datei nicht zum Schreiben öffnen."
 
@@ -727,6 +722,21 @@ msgstr " ZUSAMMEN              :"
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "Zeit in %s: %ld.%06ld (%ld%%)\n"
 
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr ": Datei endet unerwartet innerhalb eines Kommentars\n"
+
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr ": Datei endet unerwartet innerhalb eines Zeichens\n"
+
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr ": Datei endet unerwartet innerhalb geklammerten Programmtexts\n"
+
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr ": Datei endet unerwartet innerhalb eines Prologs\n"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s ist unzulässig"
+
 #~ msgid "%s: no grammar file given\n"
 #~ msgstr "%s: keine Grammatik-Datei angegeben\n"
 
@@ -834,9 +844,6 @@ msgstr "Zeit in %s: %ld.%06ld (%ld%%)\n"
 #~ msgid "shift"
 #~ msgstr "durch Schieben gelöst"
 
-#~ msgid "an error"
-#~ msgstr "als Fehler betrachtet"
-
 #~ msgid "%s contains "
 #~ msgstr "%s enthält "
 
@@ -980,9 +987,6 @@ msgstr "Zeit in %s: %ld.%06ld (%ld%%)\n"
 #~ msgid "two actions at end of one rule"
 #~ msgstr "Zwei Aktionen am Ende einer Regel"
 
-#~ msgid "invalid input: %s"
-#~ msgstr "ungültige Eingabe: %s"
-
 #~ msgid "maximum table size (%d) exceeded"
 #~ msgstr "maximale Tabellengröße (%d) überschritten"
 

po/es.po

@@ -29,7 +29,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.49a\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-05-02 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -151,6 +151,11 @@ msgstr[1] "esperados: %d conflictos desplazamiento/reducci
 msgid "cannot open file `%s'"
 msgstr "no se puede abrir el fichero `%s'"
 
+#: src/files.c:130
+#, fuzzy
+msgid "I/O error"
+msgstr "un error"
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "no se puede cerrar el fichero"
@@ -366,50 +371,50 @@ msgstr " en la derecha:"
 msgid "Rules never reduced"
 msgstr "%d regla que nunca se ha reducido\n"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "múltiples declaraciones de %s"
 
-#: src/reader.c:141
+#: src/reader.c:132
 #, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "se ha dado una regla para %s, que es un terminal"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regla vacía para un no terminal con tipo y no hay ninguna acción"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, c-format
 msgid "only one %s allowed per rule"
 msgstr ""
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, c-format
 msgid "%s affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, c-format
 msgid "%s must be followed by positive number"
 msgstr ""
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "no hay reglas en la gramática de entrada"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %d"
@@ -469,65 +474,50 @@ msgstr[1] "%d reglas sin uso"
 msgid "start symbol %s does not derive any sentence"
 msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
+#, fuzzy, c-format
+msgid "unexpected end of file in `%s ... %s'"
+msgstr "fin de fichero inesperado"
+
+#: scan-gram.l:267
+#, fuzzy, c-format
+msgid "invalid directive: %s"
+msgstr "entrada no válida: %s"
+
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
 #, c-format
-msgid ": invalid character: `%c'\n"
+msgid "integer out of range: %s"
 msgstr ""
 
-#: scan-gram.l:247
+#: scan-gram.l:332
-#, fuzzy
-msgid ": unexpected end of file in a comment\n"
-msgstr "fin de fichero inesperado"
-
-#: scan-gram.l:276 scan-gram.l:415
-#, fuzzy
-msgid ": unexpected end of file in a string\n"
-msgstr "fin de fichero inesperado"
-
-#: scan-gram.l:314 scan-gram.l:386
-#, fuzzy
-msgid ": unexpected end of file in a character\n"
-msgstr "fin de fichero inesperado"
-
-#: scan-gram.l:335
 #, fuzzy, c-format
-msgid ": invalid escape: %s\n"
+msgid "invalid character: %s"
 msgstr "valor no válido: %s%d"
 
-#: scan-gram.l:356
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
 #, fuzzy, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "invalid escape sequence: %s"
+msgstr "valor no válido: %s%d"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr "no reconocido: %s"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-#, fuzzy
-msgid ": unexpected end of file in a braced code\n"
-msgstr "fin de fichero inesperado"
-
-#: scan-gram.l:506
-#, fuzzy
-msgid ": unexpected end of file in a prologue\n"
-msgstr "fin de fichero inesperado"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' no tiene tipo declarado"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "valor no válido: %s%d"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d de `%s' no tiene tipo declarado"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s no es válido"
+msgstr "valor no válido: %s%d"
 
 #: src/state.c:145
 #, c-format
@@ -669,7 +659,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr ""
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr ""
 
@@ -677,11 +667,11 @@ msgstr ""
 msgid "Bad stats file size.\n"
 msgstr ""
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr ""
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr ""
 
@@ -811,15 +801,31 @@ msgstr ""
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr "fin de fichero inesperado"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr "fin de fichero inesperado"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr "fin de fichero inesperado"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr "fin de fichero inesperado"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s no es válido"
+
 #~ msgid "reduce"
 #~ msgstr "reduce"
 
 #~ msgid "shift"
 #~ msgstr "desplaza"
 
-#~ msgid "an error"
-#~ msgstr "un error"
-
 #~ msgid "%s contains "
 #~ msgstr "%s contiene "
 
@@ -996,9 +1002,6 @@ msgstr ""
 #~ msgid "two actions at end of one rule"
 #~ msgstr "dos acciones al final de una regla"
 
-#~ msgid "invalid input: %s"
-#~ msgstr "entrada no válida: %s"
-
 # Únicamente cambio la posición del adjetivo `máximo'. En vez de después
 # de `tabla', después de `tamaño' - cll
 # en inglés era así, pero quizás en español sea mejor como dices

po/et.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.50\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-10-07 09:28+03:00\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -90,6 +90,10 @@ msgstr[1] "eeldasime %d nihutamine/redutseerimine konflikti"
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"
 
+#: src/files.c:130
+msgid "I/O error"
+msgstr ""
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"
@@ -303,50 +307,50 @@ msgstr " paremal:"
 msgid "Rules never reduced"
 msgstr "Mitteredutseeruvad reeglid"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "korduvad %s deklaratsioonid"
 
-#: src/reader.c:141
+#: src/reader.c:132
-#, c-format
+#, fuzzy, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr "tulemuse tüübikonflikt mestimise funktsioonis %s: `%s' versus `%s'"
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s jaoks on antud reegel, aga see on märk"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, fuzzy, c-format
 msgid "only one %s allowed per rule"
 msgstr "reeglis on lubatud ainult üks %%dprec"
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, fuzzy, c-format
 msgid "%s affects only GLR parsers"
 msgstr "%%dprec puudutab ainult GLR parsereid"
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, fuzzy, c-format
 msgid "%s must be followed by positive number"
 msgstr "%%dprec järel peab olema positiivne number"
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
@@ -401,60 +405,50 @@ msgstr[1] "%d kasutamata reeglit"
 msgid "start symbol %s does not derive any sentence"
 msgstr "stardisümbolist %s ei tuletata ühtegi lauset"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
-#, c-format
+#, fuzzy, c-format
-msgid ": invalid character: `%c'\n"
+msgid "unexpected end of file in `%s ... %s'"
-msgstr ": vigane sümbol: `%c'\n"
-
-#: scan-gram.l:247
-msgid ": unexpected end of file in a comment\n"
-msgstr ": ootamatu faililõpp kommentaaris\n"
-
-#: scan-gram.l:276 scan-gram.l:415
-msgid ": unexpected end of file in a string\n"
 msgstr ": ootamatu faililõpp sõnes\n"
 
-#: scan-gram.l:314 scan-gram.l:386
+#: scan-gram.l:267
-msgid ": unexpected end of file in a character\n"
+#, fuzzy, c-format
-msgstr ": ootamatu faililõpp sümbolis\n"
+msgid "invalid directive: %s"
-
-#: scan-gram.l:335
-#, c-format
-msgid ": invalid escape: %s\n"
 msgstr ": vigane paojada: %s\n"
 
-#: scan-gram.l:356
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
 #, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "integer out of range: %s"
+msgstr ""
+
+#: scan-gram.l:332
+#, fuzzy, c-format
+msgid "invalid character: %s"
+msgstr ": vigane sümbol: `%c'\n"
+
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
+#, fuzzy, c-format
+msgid "invalid escape sequence: %s"
+msgstr ": vigane paojada: %s\n"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr ": tundmatu paojada: %s\n"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-msgid ": unexpected end of file in a braced code\n"
-msgstr ": ootamatu faililõpp sulgude vahelises koodis\n"
-
-#: scan-gram.l:506
-msgid ": unexpected end of file in a prologue\n"
-msgstr ": ootamatu faililõpp proloogis\n"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' $$ ei oma deklareeritud tüüpi"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "vigane väärtus: %s%d"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d `%s' ei oma deklareeritud tüüpi"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s on vigane"
+msgstr "vigane väärtus: %s%d"
 
 #: src/state.c:145
 #, c-format
@@ -596,7 +590,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr "Salvestatud läbimisi = %u\n"
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr "Statistika faili ei saa lugeda."
 
@@ -604,11 +598,11 @@ msgstr "Statistika faili ei saa lugeda."
 msgid "Bad stats file size.\n"
 msgstr "Vigane statistika faili suurus.\n"
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr "Statistika faili ei saa kirjutada."
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr "Statistika faili ei saa kirjutamiseks avada."
 
@@ -716,6 +710,21 @@ msgstr " KOKKU                 :"
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "aeg %s: %ld.%06ld (%ld%%)\n"
 
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr ": ootamatu faililõpp kommentaaris\n"
+
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr ": ootamatu faililõpp sümbolis\n"
+
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr ": ootamatu faililõpp sulgude vahelises koodis\n"
+
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr ": ootamatu faililõpp proloogis\n"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s on vigane"
+
 #~ msgid "%s: no grammar file given\n"
 #~ msgstr "%s: puudub grammatikafail\n"
 

po/fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.50\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-10-06 12:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -91,6 +91,11 @@ msgstr[1] "attendait %d conflits par d
 msgid "cannot open file `%s'"
 msgstr "ne peut ouvrir le fichier « %s »"
 
+#: src/files.c:130
+#, fuzzy
+msgid "I/O error"
+msgstr "une erreur"
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "ne peut fermer le fichier"
@@ -309,51 +314,51 @@ msgstr "
 msgid "Rules never reduced"
 msgstr "Règles jamais réduites"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "déclarations multiples de %s"
 
-#: src/reader.c:141
+#: src/reader.c:132
-#, c-format
+#, fuzzy, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 "conflit dans le type résultant de la fonction de fusion %s: « %s » vs « %s »"
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "conflit de type (« %s » « %s ») pour l'action par défaut"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "règle vide pour une catégorie typée et aucune action"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, fuzzy, c-format
 msgid "only one %s allowed per rule"
 msgstr "seul un %%dprec est permis par règle"
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, fuzzy, c-format
 msgid "%s affects only GLR parsers"
 msgstr "%%dprec affecte seulement les analyseurs GLR"
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, fuzzy, c-format
 msgid "%s must be followed by positive number"
 msgstr "%%dprec doit être suivi d'un nombre positif"
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"
@@ -409,60 +414,50 @@ msgid "start symbol %s does not derive any sentence"
 msgstr ""
 "symbole de départ %s peut permettre la dérivation de n'importe quelle phrase"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
-#, c-format
+#, fuzzy, c-format
-msgid ": invalid character: `%c'\n"
+msgid "unexpected end of file in `%s ... %s'"
-msgstr ": caractère invalide: `%c'\n"
-
-#: scan-gram.l:247
-msgid ": unexpected end of file in a comment\n"
-msgstr ": fin de fichier inattendue dans un commentaire\n"
-
-#: scan-gram.l:276 scan-gram.l:415
-msgid ": unexpected end of file in a string\n"
 msgstr ": fin de fichier inattendue dans une chaîne\n"
 
-#: scan-gram.l:314 scan-gram.l:386
+#: scan-gram.l:267
-msgid ": unexpected end of file in a character\n"
+#, fuzzy, c-format
-msgstr ": fin de fichier inattendue dans un caractère\n"
+msgid "invalid directive: %s"
+msgstr "entrée non valide: %s"
 
-#: scan-gram.l:335
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
 #, c-format
-msgid ": invalid escape: %s\n"
+msgid "integer out of range: %s"
+msgstr ""
+
+#: scan-gram.l:332
+#, fuzzy, c-format
+msgid "invalid character: %s"
+msgstr ": caractère invalide: `%c'\n"
+
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
+#, fuzzy, c-format
+msgid "invalid escape sequence: %s"
 msgstr ": séquence d'échappement invalide: %s\n"
 
-#: scan-gram.l:356
+#: scan-gram.l:516
-#, c-format
+#, fuzzy, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "unrecognized escape sequence: %s"
 msgstr ": séquence d'échappement non reconnue: %s\n"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-msgid ": unexpected end of file in a braced code\n"
-msgstr ": fin de fichier inattendue dans du code entre accolades\n"
-
-#: scan-gram.l:506
-msgid ": unexpected end of file in a prologue\n"
-msgstr ": fin de fichier inattendue dans un prologue\n"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de « %s » n'a pas son type déclaré"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "valeur invalide: %s%d"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d de « %s » n'a pas de type déclaré"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s n'est pas valide"
+msgstr "valeur invalide: %s%d"
 
 #: src/state.c:145
 #, c-format
@@ -604,7 +599,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr "Exécutions accumulées = %u\n"
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr "Ne peut lire le fichier de stats."
 
@@ -612,11 +607,11 @@ msgstr "Ne peut lire le fichier de stats."
 msgid "Bad stats file size.\n"
 msgstr "Taille erronée du fichier de stats.\n"
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr "Ne peut écrire le fichier de stats."
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr "Ne ouvrir en écriture le fichier de stats."
 
@@ -724,6 +719,21 @@ msgstr " TOTAL                 :"
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "temps dans %s: %ld.%06ld (%ld%%)\n"
 
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr ": fin de fichier inattendue dans un commentaire\n"
+
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr ": fin de fichier inattendue dans un caractère\n"
+
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr ": fin de fichier inattendue dans du code entre accolades\n"
+
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr ": fin de fichier inattendue dans un prologue\n"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s n'est pas valide"
+
 #~ msgid "%s: no grammar file given\n"
 #~ msgstr "%s: grammaire manquante\n"
 
@@ -844,9 +854,6 @@ msgstr "temps dans %s: %ld.%06ld (%ld%%)\n"
 #~ msgid "shift"
 #~ msgstr "décalage"
 
-#~ msgid "an error"
-#~ msgstr "une erreur"
-
 #~ msgid "%s contains "
 #~ msgstr "%s contient "
 
@@ -989,9 +996,6 @@ msgstr "temps dans %s: %ld.%06ld (%ld%%)\n"
 #~ msgid "two actions at end of one rule"
 #~ msgstr "deux actions à la fin d'une même règle"
 
-#~ msgid "invalid input: %s"
-#~ msgstr "entrée non valide: %s"
-
 #~ msgid "maximum table size (%d) exceeded"
 #~ msgstr "taille maximale de la table (%d) dépassée"
 

po/hr.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.34a\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-04-10 22:20+01\n"
 "Last-Translator: Denis Lackovic <delacko@fly.srk.fer.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -92,6 +92,11 @@ msgstr[1] "o
 msgid "cannot open file `%s'"
 msgstr "ne mogu otvoriti datoteku `%s'"
 
+#: src/files.c:130
+#, fuzzy
+msgid "I/O error"
+msgstr "gre¹ka"
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "ne mogu zatvoriti datoteku"
@@ -304,50 +309,50 @@ msgstr "s desna:"
 msgid "Rules never reduced"
 msgstr "%d pravilo nije nikad reducirano\n"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "vi¹estruke %s deklaracije"
 
-#: src/reader.c:141
+#: src/reader.c:132
 #, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "pravilo dato za %s, a to je znak"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "sudar tipova (`%s' `%s') na deaultnoj akciji"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "prazno pravilo za nezavr¹ni znak, i nema akcije"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, c-format
 msgid "only one %s allowed per rule"
 msgstr ""
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, c-format
 msgid "%s affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, c-format
 msgid "%s must be followed by positive number"
 msgstr ""
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "nema pravila u ulaznoj gramatici"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "previ¹e simbola (znakovi plus nezavr¹ni znakovi); maksimalno %d"
@@ -407,65 +412,50 @@ msgstr[1] "%d beskorisnih pravila"
 msgid "start symbol %s does not derive any sentence"
 msgstr "Poèetni simbol %s ne daje niti jednu reèenicu"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
-#, c-format
-msgid ": invalid character: `%c'\n"
-msgstr ""
-
-#: scan-gram.l:247
-#, fuzzy
-msgid ": unexpected end of file in a comment\n"
-msgstr "neoèekivan kraj datoteke"
-
-#: scan-gram.l:276 scan-gram.l:415
-#, fuzzy
-msgid ": unexpected end of file in a string\n"
-msgstr "neoèekivan kraj datoteke"
-
-#: scan-gram.l:314 scan-gram.l:386
-#, fuzzy
-msgid ": unexpected end of file in a character\n"
-msgstr "neoèekivan kraj datoteke"
-
-#: scan-gram.l:335
 #, fuzzy, c-format
-msgid ": invalid escape: %s\n"
+msgid "unexpected end of file in `%s ... %s'"
+msgstr "neoèekivan kraj datoteke"
+
+#: scan-gram.l:267
+#, fuzzy, c-format
+msgid "invalid directive: %s"
 msgstr "nedozvoljeni ulaz: %s"
 
-#: scan-gram.l:356
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
+#, c-format
+msgid "integer out of range: %s"
+msgstr ""
+
+#: scan-gram.l:332
 #, fuzzy, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "invalid character: %s"
+msgstr "nedozvoljeni ulaz: %s"
+
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
+#, fuzzy, c-format
+msgid "invalid escape sequence: %s"
+msgstr "nedozvoljeni ulaz: %s"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr "neprepoznati: %s"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-#, fuzzy
-msgid ": unexpected end of file in a braced code\n"
-msgstr "neoèekivan kraj datoteke"
-
-#: scan-gram.l:506
-#, fuzzy
-msgid ": unexpected end of file in a prologue\n"
-msgstr "neoèekivan kraj datoteke"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ od `%s' nema deklarirani tip"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "nedozvoljena $ vrijednost"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d od `%s' nema deklarirani tip"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s je nedozvoljeno"
+msgstr "nedozvoljena $ vrijednost"
 
 #: src/state.c:145
 #, c-format
@@ -603,7 +593,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr ""
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr ""
 
@@ -611,11 +601,11 @@ msgstr ""
 msgid "Bad stats file size.\n"
 msgstr ""
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr ""
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr ""
 
@@ -721,15 +711,31 @@ msgstr ""
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr "neoèekivan kraj datoteke"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr "neoèekivan kraj datoteke"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr "neoèekivan kraj datoteke"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr "neoèekivan kraj datoteke"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s je nedozvoljeno"
+
 #~ msgid "reduce"
 #~ msgstr "reduciraj"
 
 #~ msgid "shift"
 #~ msgstr "pomakni"
 
-#~ msgid "an error"
-#~ msgstr "gre¹ka"
-
 #~ msgid "%s contains "
 #~ msgstr "%s sadr¾i"
 

po/id.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.50\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-10-08 17:53+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -93,6 +93,10 @@ msgstr[1] "mengharapkan %d shift/reduce konflik"
 msgid "cannot open file `%s'"
 msgstr "tidak dapat membuka file `%s'"
 
+#: src/files.c:130
+msgid "I/O error"
+msgstr ""
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "tidak dapat menutup file"
@@ -307,50 +311,50 @@ msgstr " di kanan:"
 msgid "Rules never reduced"
 msgstr "Aturan tidak pernah dikurangi"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "deklarasi ganda %s"
 
-#: src/reader.c:141
+#: src/reader.c:132
-#, c-format
+#, fuzzy, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr "tipe hasil bentrok pada fungsi merge %s: `%s' vs `%s'"
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "aturan diberikan untuk %s, yang merupakan sebuah token"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "bentrokan tipe (`%s' `%s') pada aksi baku"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "aturan kosong untuk nonterminal typed, dan tidak ada aksi"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, fuzzy, c-format
 msgid "only one %s allowed per rule"
 msgstr "hanya satu %%dprec yang dibolehkan untuk satu aturan"
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, fuzzy, c-format
 msgid "%s affects only GLR parsers"
 msgstr "%%dprec hanya mempengaruhi parser GLR"
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, fuzzy, c-format
 msgid "%s must be followed by positive number"
 msgstr "%%dprec harus diikuti oleh angka positif"
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "tidak ada aturan dalam grammar input"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "terlalu banyak simbol (token dan nonterminal); maksimum %d"
@@ -405,60 +409,50 @@ msgstr[1] "aturan tidak berguna %d"
 msgid "start symbol %s does not derive any sentence"
 msgstr "simbol awal %s tidak melahirkan kalimat"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
-#, c-format
+#, fuzzy, c-format
-msgid ": invalid character: `%c'\n"
+msgid "unexpected end of file in `%s ... %s'"
-msgstr ": karakter tidak valid: `%c'\n"
-
-#: scan-gram.l:247
-msgid ": unexpected end of file in a comment\n"
-msgstr ": akhir file tidak diharapkan dalam komentar\n"
-
-#: scan-gram.l:276 scan-gram.l:415
-msgid ": unexpected end of file in a string\n"
 msgstr ": akhir file tidak diharapkan dalam string\n"
 
-#: scan-gram.l:314 scan-gram.l:386
+#: scan-gram.l:267
-msgid ": unexpected end of file in a character\n"
+#, fuzzy, c-format
-msgstr ": akhir file tidak diharapkan dalam karakter\n"
+msgid "invalid directive: %s"
-
-#: scan-gram.l:335
-#, c-format
-msgid ": invalid escape: %s\n"
 msgstr ": escape tidak valid: %s\n"
 
-#: scan-gram.l:356
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
 #, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "integer out of range: %s"
+msgstr ""
+
+#: scan-gram.l:332
+#, fuzzy, c-format
+msgid "invalid character: %s"
+msgstr ": karakter tidak valid: `%c'\n"
+
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
+#, fuzzy, c-format
+msgid "invalid escape sequence: %s"
+msgstr ": escape tidak valid: %s\n"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr ": escape tidak dikenal: %s\n"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-msgid ": unexpected end of file in a braced code\n"
-msgstr ": akhir file tidak diharapkan dalam kode braced\n"
-
-#: scan-gram.l:506
-msgid ": unexpected end of file in a prologue\n"
-msgstr ": akhir file tidak diharapkan dalam prolog\n"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ dari `%s' tidak memiliki tipe yang terdeklarasi"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "nilai tidak valid: %s%d"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d dari `%s' tidak memiliki tipe terdeklarasi"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s tidak valid"
+msgstr "nilai tidak valid: %s%d"
 
 #: src/state.c:145
 #, c-format
@@ -600,7 +594,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr "Run terakumulasi = %u\n"
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr "Tidak dapat membaca file stat."
 
@@ -608,11 +602,11 @@ msgstr "Tidak dapat membaca file stat."
 msgid "Bad stats file size.\n"
 msgstr "Ukuran file stat buruk.\n"
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr "Tidak dapat menulis file stat."
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr "Tidak dapat membuka file stat untuk ditulisi."
 
@@ -720,6 +714,21 @@ msgstr " TOTAL                 :"
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "waktu dalam %s: %ld.%06ld (%ld%%)\n"
 
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr ": akhir file tidak diharapkan dalam komentar\n"
+
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr ": akhir file tidak diharapkan dalam karakter\n"
+
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr ": akhir file tidak diharapkan dalam kode braced\n"
+
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr ": akhir file tidak diharapkan dalam prolog\n"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s tidak valid"
+
 #~ msgid "%s: no grammar file given\n"
 #~ msgstr "%s: tidak diberikan file grammar\n"
 

po/it.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.50\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-10-17 14:37+0100\n"
 "Last-Translator: Paolo Bonzini <bonzini@gnu.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -90,6 +90,10 @@ msgstr[1] "attesi %d conflitti shift/riduzione"
 msgid "cannot open file `%s'"
 msgstr "impossibile aprire il file `%s'"
 
+#: src/files.c:130
+msgid "I/O error"
+msgstr ""
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "impossibile chiudere il file `%s'"
@@ -305,51 +309,51 @@ msgstr " nel secondo membro:"
 msgid "Rules never reduced"
 msgstr "Regole mai ridotte"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "dichiarazioni multiple per %s"
 
-#: src/reader.c:141
+#: src/reader.c:132
-#, c-format
+#, fuzzy, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 "conflitto nei tipi del risultato della funzione di merge %s: `%s' e `%s'"
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "fornita una regola per il token %s"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "conflitto di tipo (`%s' e `%s') nell'azione di default"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regola vuota e nessuna azione per un nonterminale con tipo"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, fuzzy, c-format
 msgid "only one %s allowed per rule"
 msgstr "solo un %%dprec è permesso in una regola"
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, fuzzy, c-format
 msgid "%s affects only GLR parsers"
 msgstr "%%dprec considerato solo nei parser GLR"
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, fuzzy, c-format
 msgid "%s must be followed by positive number"
 msgstr "%%dprec deve essere seguito da un intero positivo"
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "nessuna regola nella grammatica di input"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "troppi simboli (token e nonterminali); il massimo è %d"
@@ -404,60 +408,50 @@ msgstr[1] "%d regole inutili"
 msgid "start symbol %s does not derive any sentence"
 msgstr "dal simbolo iniziale %s non deriva alcuna frase"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
-#, c-format
+#, fuzzy, c-format
-msgid ": invalid character: `%c'\n"
+msgid "unexpected end of file in `%s ... %s'"
-msgstr ": carattere non valido: `%c'\n"
-
-#: scan-gram.l:247
-msgid ": unexpected end of file in a comment\n"
-msgstr ": fine del file inattesa in un commento\n"
-
-#: scan-gram.l:276 scan-gram.l:415
-msgid ": unexpected end of file in a string\n"
 msgstr ": fine del file inattesa in una stringa\n"
 
-#: scan-gram.l:314 scan-gram.l:386
+#: scan-gram.l:267
-msgid ": unexpected end of file in a character\n"
+#, fuzzy, c-format
-msgstr ": fine del file inattesa in un carattere\n"
+msgid "invalid directive: %s"
-
-#: scan-gram.l:335
-#, c-format
-msgid ": invalid escape: %s\n"
 msgstr ": escape non valido: %s\n"
 
-#: scan-gram.l:356
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
 #, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "integer out of range: %s"
+msgstr ""
+
+#: scan-gram.l:332
+#, fuzzy, c-format
+msgid "invalid character: %s"
+msgstr ": carattere non valido: `%c'\n"
+
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
+#, fuzzy, c-format
+msgid "invalid escape sequence: %s"
+msgstr ": escape non valido: %s\n"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr ": escape non riconosciuto: %s\n"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-msgid ": unexpected end of file in a braced code\n"
-msgstr ": fine del file inattesa in codice (tra parentesi graffe)\n"
-
-#: scan-gram.l:506
-msgid ": unexpected end of file in a prologue\n"
-msgstr ": fine del file inattesa nel prologo\n"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "Manca una dichiarazione di tipo per $$ di `%s'"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "valore non valido: %s%d"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "Manca una dichiarazione di tipo per $%d di `%s'"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s non è valido"
+msgstr "valore non valido: %s%d"
 
 #: src/state.c:145
 #, c-format
@@ -597,7 +591,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr "Esecuzioni accumulate = %u\n"
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr "Impossibile leggere il file delle statistiche."
 
@@ -605,11 +599,11 @@ msgstr "Impossibile leggere il file delle statistiche."
 msgid "Bad stats file size.\n"
 msgstr "Dimensione errata del file delle statistiche.\n"
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr "Impossibile scrivere il file delle statistiche."
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr "Impossibile aprire in scrittura il file delle statistiche."
 
@@ -717,6 +711,21 @@ msgstr " TOTALE                :"
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "tempo in %s: %ld.%06ld (%ld%%)\n"
 
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr ": fine del file inattesa in un commento\n"
+
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr ": fine del file inattesa in un carattere\n"
+
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr ": fine del file inattesa in codice (tra parentesi graffe)\n"
+
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr ": fine del file inattesa nel prologo\n"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s non è valido"
+
 #~ msgid "%s: no grammar file given\n"
 #~ msgstr "%s: nessun file grammatica specificato\n"
 

po/ja.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2001-12-10 15:59+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -87,6 +87,11 @@ msgstr[0] "
 msgid "cannot open file `%s'"
 msgstr "ファイル `%s' を開けません"
 
+#: src/files.c:130
+#, fuzzy
+msgid "I/O error"
+msgstr "エラー"
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "ファイルを閉じることができません"
@@ -301,50 +306,50 @@ msgstr "
 msgid "Rules never reduced"
 msgstr "%d 個の規則は決して還元されません\n"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "%s が複数個宣言されました"
 
-#: src/reader.c:141
+#: src/reader.c:132
 #, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s に規則が与えられ、それはトークンとなります"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "初期状態の動作では型 (`%s' `%s') が衝突します"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "空の型付き非終端アイテム用規則であり、動作が起りません"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, c-format
 msgid "only one %s allowed per rule"
 msgstr ""
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, c-format
 msgid "%s affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, c-format
 msgid "%s must be followed by positive number"
 msgstr ""
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "入力した文法に規則が定義されていません"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "シンボルが多すぎます (トークン + 非終端アイテム) -- 最大 %d"
@@ -401,65 +406,50 @@ msgstr[0] "%d
 msgid "start symbol %s does not derive any sentence"
 msgstr "開始シンボル %s はどの文にも由来しません"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
-#, c-format
-msgid ": invalid character: `%c'\n"
-msgstr ""
-
-#: scan-gram.l:247
-#, fuzzy
-msgid ": unexpected end of file in a comment\n"
-msgstr "予期しないファイルの終端です"
-
-#: scan-gram.l:276 scan-gram.l:415
-#, fuzzy
-msgid ": unexpected end of file in a string\n"
-msgstr "予期しないファイルの終端です"
-
-#: scan-gram.l:314 scan-gram.l:386
-#, fuzzy
-msgid ": unexpected end of file in a character\n"
-msgstr "予期しないファイルの終端です"
-
-#: scan-gram.l:335
 #, fuzzy, c-format
-msgid ": invalid escape: %s\n"
+msgid "unexpected end of file in `%s ... %s'"
+msgstr "予期しないファイルの終端です"
+
+#: scan-gram.l:267
+#, fuzzy, c-format
+msgid "invalid directive: %s"
 msgstr "不適切な入力: %s"
 
-#: scan-gram.l:356
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
+#, c-format
+msgid "integer out of range: %s"
+msgstr ""
+
+#: scan-gram.l:332
 #, fuzzy, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "invalid character: %s"
+msgstr "不適切な入力: %s"
+
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
+#, fuzzy, c-format
+msgid "invalid escape sequence: %s"
+msgstr "不適切な入力: %s"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr "認識できない: %s"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-#, fuzzy
-msgid ": unexpected end of file in a braced code\n"
-msgstr "予期しないファイルの終端です"
-
-#: scan-gram.l:506
-#, fuzzy
-msgid ": unexpected end of file in a prologue\n"
-msgstr "予期しないファイルの終端です"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' の $$ に宣言のない型があります"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "不適切な $ の値"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d 個の `%s' が宣言された型を持っていません"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s は不適切です"
+msgstr "不適切な $ の値"
 
 #: src/state.c:145
 #, c-format
@@ -599,7 +589,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr ""
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr ""
 
@@ -607,11 +597,11 @@ msgstr ""
 msgid "Bad stats file size.\n"
 msgstr ""
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr ""
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr ""
 
@@ -717,15 +707,31 @@ msgstr ""
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr "予期しないファイルの終端です"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr "予期しないファイルの終端です"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr "予期しないファイルの終端です"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr "予期しないファイルの終端です"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s は不適切です"
+
 #~ msgid "reduce"
 #~ msgstr "還元"
 
 #~ msgid "shift"
 #~ msgstr "シフト"
 
-#~ msgid "an error"
-#~ msgstr "エラー"
-
 #~ msgid "%s contains "
 #~ msgstr "%s の中身は"
 

po/nl.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.34a\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-03-20 12:54+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@pandora.be>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -94,6 +94,11 @@ msgstr[1] "%d shift/reductie conflicten werden verwacht\n"
 msgid "cannot open file `%s'"
 msgstr "kan bestand `%s' niet openen"
 
+#: src/files.c:130
+#, fuzzy
+msgid "I/O error"
+msgstr "een fout"
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "kan bestand niet sluiten"
@@ -315,50 +320,50 @@ msgstr " rechts:"
 msgid "Rules never reduced"
 msgstr "%d regel wordt nooit gereduceerd\n"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "meerdere %s declaraties"
 
-#: src/reader.c:141
+#: src/reader.c:132
 #, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel opgegeven voor token (%s)"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "type-conflict (`%s' `%s') bij standaardaktie"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor niet-eindsymbool met type, en geen actie"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, c-format
 msgid "only one %s allowed per rule"
 msgstr ""
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, c-format
 msgid "%s affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, c-format
 msgid "%s must be followed by positive number"
 msgstr ""
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "invoergrammatica bevat geen regels"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "teveel symbolen (tokens plus niet-eindsymbolen); het maximum is %d"
@@ -419,65 +424,50 @@ msgstr[1] "%d nutteloze regels"
 msgid "start symbol %s does not derive any sentence"
 msgstr "Startsymbool %s wordt vanuit geen enkele zin bereikt"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
-#, c-format
-msgid ": invalid character: `%c'\n"
-msgstr ""
-
-#: scan-gram.l:247
-#, fuzzy
-msgid ": unexpected end of file in a comment\n"
-msgstr "onverwacht einde van bestand"
-
-#: scan-gram.l:276 scan-gram.l:415
-#, fuzzy
-msgid ": unexpected end of file in a string\n"
-msgstr "onverwacht einde van bestand"
-
-#: scan-gram.l:314 scan-gram.l:386
-#, fuzzy
-msgid ": unexpected end of file in a character\n"
-msgstr "onverwacht einde van bestand"
-
-#: scan-gram.l:335
 #, fuzzy, c-format
-msgid ": invalid escape: %s\n"
+msgid "unexpected end of file in `%s ... %s'"
+msgstr "onverwacht einde van bestand"
+
+#: scan-gram.l:267
+#, fuzzy, c-format
+msgid "invalid directive: %s"
 msgstr "ongeldige invoer: %s"
 
-#: scan-gram.l:356
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
+#, c-format
+msgid "integer out of range: %s"
+msgstr ""
+
+#: scan-gram.l:332
 #, fuzzy, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "invalid character: %s"
+msgstr "ongeldige invoer: %s"
+
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
+#, fuzzy, c-format
+msgid "invalid escape sequence: %s"
+msgstr "ongeldige invoer: %s"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr "onbekend: %s"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-#, fuzzy
-msgid ": unexpected end of file in a braced code\n"
-msgstr "onverwacht einde van bestand"
-
-#: scan-gram.l:506
-#, fuzzy
-msgid ": unexpected end of file in a prologue\n"
-msgstr "onverwacht einde van bestand"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ van `%s' heeft geen gedeclareerd type"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "ongeldige $-waarde"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d van `%s' heeft geen gedeclareerd type"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s is ongeldig"
+msgstr "ongeldige $-waarde"
 
 #: src/state.c:145
 #, c-format
@@ -617,7 +607,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr ""
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr ""
 
@@ -625,11 +615,11 @@ msgstr ""
 msgid "Bad stats file size.\n"
 msgstr ""
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr ""
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr ""
 
@@ -735,15 +725,31 @@ msgstr ""
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr "onverwacht einde van bestand"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr "onverwacht einde van bestand"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr "onverwacht einde van bestand"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr "onverwacht einde van bestand"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s is ongeldig"
+
 #~ msgid "reduce"
 #~ msgstr "reductie"
 
 #~ msgid "shift"
 #~ msgstr "shift"
 
-#~ msgid "an error"
-#~ msgstr "een fout"
-
 #~ msgid "%s contains "
 #~ msgstr "%s bevat"
 

po/pt_BR.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.50\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-10-07 00:30-0300\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -90,6 +90,10 @@ msgstr[1] "esperados: %d conflitos de deslocamento/redu
 msgid "cannot open file `%s'"
 msgstr "impossível abrir o arquivo `%s'"
 
+#: src/files.c:130
+msgid "I/O error"
+msgstr ""
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "impossível fechar o arquivo"
@@ -308,50 +312,50 @@ msgstr "
 msgid "Rules never reduced"
 msgstr "Regras nunca reduzidas"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "declarações de %s múltiplas"
 
-#: src/reader.c:141
+#: src/reader.c:132
-#, c-format
+#, fuzzy, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr "tipo de resultado conflita na fução de mescla %s: `%s' vs. `%s'"
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regra fornecida para %s, que é um token"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "os tipos (`%s' `%s') não concordam na ação padrão"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regra vazia para um não-terminal com tipo, e não há ações"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, fuzzy, c-format
 msgid "only one %s allowed per rule"
 msgstr "apenas um %%dprec é permitido por regra"
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, fuzzy, c-format
 msgid "%s affects only GLR parsers"
 msgstr "%%dprec afeta apenas analisadores GLR"
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, fuzzy, c-format
 msgid "%s must be followed by positive number"
 msgstr "%%dprec deve ser seguido por um número positivo"
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "não há regras na gramática de entrada"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "muitos símbolos (terminais e não-terminais); máximo %d"
@@ -406,60 +410,50 @@ msgstr[1] "%d regras in
 msgid "start symbol %s does not derive any sentence"
 msgstr "símbolo de início %s não deriva nenhuma sentença"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
-#, c-format
+#, fuzzy, c-format
-msgid ": invalid character: `%c'\n"
+msgid "unexpected end of file in `%s ... %s'"
-msgstr ": caractere inválido: `%c'\n"
-
-#: scan-gram.l:247
-msgid ": unexpected end of file in a comment\n"
-msgstr ": fim de arquivo inesperado em um comentário\n"
-
-#: scan-gram.l:276 scan-gram.l:415
-msgid ": unexpected end of file in a string\n"
 msgstr ": fim de arquivo inesperado em uma string\n"
 
-#: scan-gram.l:314 scan-gram.l:386
+#: scan-gram.l:267
-msgid ": unexpected end of file in a character\n"
+#, fuzzy, c-format
-msgstr ": fim de arquivo inesperado em um caractere\n"
+msgid "invalid directive: %s"
-
-#: scan-gram.l:335
-#, c-format
-msgid ": invalid escape: %s\n"
 msgstr ": escape inválido: %s\n"
 
-#: scan-gram.l:356
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
 #, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "integer out of range: %s"
+msgstr ""
+
+#: scan-gram.l:332
+#, fuzzy, c-format
+msgid "invalid character: %s"
+msgstr ": caractere inválido: `%c'\n"
+
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
+#, fuzzy, c-format
+msgid "invalid escape sequence: %s"
+msgstr ": escape inválido: %s\n"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr ": escape não reconhecido: %s\n"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-msgid ": unexpected end of file in a braced code\n"
-msgstr ": fim de arquivo inesperado em código entre chaves\n"
-
-#: scan-gram.l:506
-msgid ": unexpected end of file in a prologue\n"
-msgstr ": fim de arquivo inesperado em um prólogo\n"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' não tem tipo declarado"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "valor inválido: %s%d"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d de `%s' não tem tipo declarado"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s é inválido"
+msgstr "valor inválido: %s%d"
 
 #: src/state.c:145
 #, c-format
@@ -599,7 +593,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr "Execuções acumuladas = %u\n"
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr "Impossível ler o arquivo de estatísticas."
 
@@ -607,11 +601,11 @@ msgstr "Imposs
 msgid "Bad stats file size.\n"
 msgstr "Tamanho do arquivo de estatísticas com erro.\n"
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr "Impossível de escrever no arquivo de estatísticas."
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr "Impossível abrir arquivo de estatísticas para escrita."
 
@@ -719,6 +713,21 @@ msgstr " TOTAL                 :"
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "tempo em  %s: %ld.%06ld (%ld%%)\n"
 
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr ": fim de arquivo inesperado em um comentário\n"
+
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr ": fim de arquivo inesperado em um caractere\n"
+
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr ": fim de arquivo inesperado em código entre chaves\n"
+
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr ": fim de arquivo inesperado em um prólogo\n"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s é inválido"
+
 #~ msgid "%s: no grammar file given\n"
 #~ msgstr "%s: nenhum arquivo de gramática foi especificado\n"
 

po/ru.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.49a\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-07-20 13:23+0400\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -97,6 +97,11 @@ msgstr[2] "
 msgid "cannot open file `%s'"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"
 
+#: src/files.c:130
+#, fuzzy
+msgid "I/O error"
+msgstr "ÏÛÉÂËÁ"
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"
@@ -312,51 +317,51 @@ msgstr "
 msgid "Rules never reduced"
 msgstr "%d ÐÒÁ×ÉÌÏ ÎÅ Ó×ÅÄÅÎÏ\n"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 
-#: src/reader.c:141
+#: src/reader.c:132
 #, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, c-format
 msgid "only one %s allowed per rule"
 msgstr ""
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, c-format
 msgid "%s affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, c-format
 msgid "%s must be followed by positive number"
 msgstr ""
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
@@ -419,65 +424,50 @@ msgstr[2] "%d
 msgid "start symbol %s does not derive any sentence"
 msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
+#, fuzzy, c-format
+msgid "unexpected end of file in `%s ... %s'"
+msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
+
+#: scan-gram.l:267
+#, fuzzy, c-format
+msgid "invalid directive: %s"
+msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
+
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
 #, c-format
-msgid ": invalid character: `%c'\n"
+msgid "integer out of range: %s"
 msgstr ""
 
-#: scan-gram.l:247
+#: scan-gram.l:332
-#, fuzzy
-msgid ": unexpected end of file in a comment\n"
-msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
-
-#: scan-gram.l:276 scan-gram.l:415
-#, fuzzy
-msgid ": unexpected end of file in a string\n"
-msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
-
-#: scan-gram.l:314 scan-gram.l:386
-#, fuzzy
-msgid ": unexpected end of file in a character\n"
-msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
-
-#: scan-gram.l:335
 #, fuzzy, c-format
-msgid ": invalid escape: %s\n"
+msgid "invalid character: %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ: %s%d"
 
-#: scan-gram.l:356
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
 #, fuzzy, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "invalid escape sequence: %s"
+msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ: %s%d"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-#, fuzzy
-msgid ": unexpected end of file in a braced code\n"
-msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
-
-#: scan-gram.l:506
-#, fuzzy
-msgid ": unexpected end of file in a prologue\n"
-msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ: %s%d"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË %s"
+msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ: %s%d"
 
 #: src/state.c:145
 #, c-format
@@ -615,7 +605,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr ""
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr ""
 
@@ -623,11 +613,11 @@ msgstr ""
 msgid "Bad stats file size.\n"
 msgstr ""
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr ""
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr ""
 
@@ -733,15 +723,31 @@ msgstr ""
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
+
+#~ msgid "%s is invalid"
+#~ msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË %s"
+
 #~ msgid "reduce"
 #~ msgstr "×Ù×ÏÄ"
 
 #~ msgid "shift"
 #~ msgstr "ÓÄ×ÉÇ"
 
-#~ msgid "an error"
-#~ msgstr "ÏÛÉÂËÁ"
-
 #~ msgid "%s contains "
 #~ msgstr "%s ÓÏÄÅÒÖÉÔ "
 
@@ -893,9 +899,6 @@ msgstr ""
 #~ msgid "two actions at end of one rule"
 #~ msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
-#~ msgid "invalid input: %s"
-#~ msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
-
 #~ msgid "maximum table size (%d) exceeded"
 #~ msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)"
 

po/sv.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.50\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-10-08 19:02+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -91,6 +91,10 @@ msgstr[1] "f
 msgid "cannot open file `%s'"
 msgstr "kan inte öppna filen \"%s\""
 
+#: src/files.c:130
+msgid "I/O error"
+msgstr ""
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "kan inte stänga fil"
@@ -308,50 +312,50 @@ msgstr " till h
 msgid "Rules never reduced"
 msgstr "Aldrig reducerade regler"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "flera %s-deklarationer"
 
-#: src/reader.c:141
+#: src/reader.c:132
-#, c-format
+#, fuzzy, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr "resultattypskonflikt vid sammanslagningsfunktion %s: \"%s\" mot \"%s\""
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel given för %s, som är ett element"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "typkonflikt (\"%s\" \"%s\") för standardåtgärd"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tom regel för typad icketerminal, och ingen åtgärd"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, fuzzy, c-format
 msgid "only one %s allowed per rule"
 msgstr "endast en %%dprec tillåts per regel"
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, fuzzy, c-format
 msgid "%s affects only GLR parsers"
 msgstr "%%dprec påverkar endast GLR-parsrar"
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, fuzzy, c-format
 msgid "%s must be followed by positive number"
 msgstr "%%dprec måste följas av ett positivt tal"
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "inga regler i ingrammatiken"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "för många symboler (element plus icketerminaler); max %d"
@@ -406,60 +410,50 @@ msgstr[1] "%d oanv
 msgid "start symbol %s does not derive any sentence"
 msgstr "startsymbolen %s genererar inga meningar"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
-#, c-format
+#, fuzzy, c-format
-msgid ": invalid character: `%c'\n"
+msgid "unexpected end of file in `%s ... %s'"
-msgstr ": ogiltigt tecken: \"%c\"\n"
-
-#: scan-gram.l:247
-msgid ": unexpected end of file in a comment\n"
-msgstr ": oväntat filslut i en kommentar\n"
-
-#: scan-gram.l:276 scan-gram.l:415
-msgid ": unexpected end of file in a string\n"
 msgstr ": oväntat filslut i en sträng\n"
 
-#: scan-gram.l:314 scan-gram.l:386
+#: scan-gram.l:267
-msgid ": unexpected end of file in a character\n"
+#, fuzzy, c-format
-msgstr ": oväntat filslut i ett tecken\n"
+msgid "invalid directive: %s"
-
-#: scan-gram.l:335
-#, c-format
-msgid ": invalid escape: %s\n"
 msgstr ": ogiltig specialsekvens: %s\n"
 
-#: scan-gram.l:356
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
 #, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "integer out of range: %s"
+msgstr ""
+
+#: scan-gram.l:332
+#, fuzzy, c-format
+msgid "invalid character: %s"
+msgstr ": ogiltigt tecken: \"%c\"\n"
+
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
+#, fuzzy, c-format
+msgid "invalid escape sequence: %s"
+msgstr ": ogiltig specialsekvens: %s\n"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr ": okänd specialsekvens: %s\n"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-msgid ": unexpected end of file in a braced code\n"
-msgstr ": oväntat filslut i kod inom klamrar\n"
-
-#: scan-gram.l:506
-msgid ": unexpected end of file in a prologue\n"
-msgstr ": oväntat filslut i en prolog\n"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ för \"%s\" har ingen deklarerad typ"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "felaktigt värde: %s%d"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d för \"%s\" har ingen deklarerad typ"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s är felaktigt"
+msgstr "felaktigt värde: %s%d"
 
 #: src/state.c:145
 #, c-format
@@ -601,7 +595,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr "Accumulerade körningar = %u\n"
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr "Kunde inte läsa statistikfil."
 
@@ -609,11 +603,11 @@ msgstr "Kunde inte l
 msgid "Bad stats file size.\n"
 msgstr "Dålig statistikfilstorlek.\n"
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr "Kunde inte skriva statistikfil."
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr "Kunde inte öppna statistikfil för skrivning."
 
@@ -724,6 +718,21 @@ msgstr " TOTALT                :"
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "tid i %s: %ld.%06ld (%ld%%)\n"
 
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr ": oväntat filslut i en kommentar\n"
+
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr ": oväntat filslut i ett tecken\n"
+
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr ": oväntat filslut i kod inom klamrar\n"
+
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr ": oväntat filslut i en prolog\n"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s är felaktigt"
+
 #~ msgid "%s: no grammar file given\n"
 #~ msgstr "%s: ingen grammatikfil angiven\n"
 

po/tr.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.49a\n"
-"POT-Creation-Date: 2002-10-24 22:53-0700\n"
+"POT-Creation-Date: 2002-11-07 15:27+0100\n"
 "PO-Revision-Date: 2002-06-25 11:03GMT +02:00\n"
 "Last-Translator: Altuð Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -97,6 +97,11 @@ msgstr[1] "beklenen %d
 msgid "cannot open file `%s'"
 msgstr "`%s' dosyasý açýlamadý"
 
+#: src/files.c:130
+#, fuzzy
+msgid "I/O error"
+msgstr "bir hata"
+
 #: src/files.c:133
 msgid "cannot close file"
 msgstr "dosya kapatýlamýyor"
@@ -311,51 +316,51 @@ msgstr " sa
 msgid "Rules never reduced"
 msgstr "%d kural asla indirgenmedi\n"
 
-#: src/reader.c:52
+#: src/reader.c:51
 #, c-format
 msgid "multiple %s declarations"
 msgstr "çoklu %s bildirimleri"
 
-#: src/reader.c:141
+#: src/reader.c:132
 #, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 
-#: src/reader.c:239
+#: src/reader.c:230
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "bir andaç olan %s için verilen kural"
 
-#: src/reader.c:268
+#: src/reader.c:259
-#, c-format
+#, fuzzy, c-format
-msgid "type clash (`%s' `%s') on default action"
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý"
 
-#: src/reader.c:274
+#: src/reader.c:265
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylem belirtilmemiþ"
 
-#: src/reader.c:344 src/reader.c:359 src/reader.c:372
+#: src/reader.c:335 src/reader.c:350 src/reader.c:363
 #, c-format
 msgid "only one %s allowed per rule"
 msgstr ""
 
-#: src/reader.c:354 src/reader.c:370
+#: src/reader.c:345 src/reader.c:361
 #, c-format
 msgid "%s affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:357
+#: src/reader.c:348
 #, c-format
 msgid "%s must be followed by positive number"
 msgstr ""
 
-#: src/reader.c:515
+#: src/reader.c:506
 msgid "no rules in the input grammar"
 msgstr "girdi grameri içinde kurallar yok"
 
-#: src/reader.c:547
+#: src/reader.c:538
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "çok fazla simge var (andaçlar ve deðiþken simgeler); en fazla %d"
@@ -415,65 +420,50 @@ msgstr[1] "%d yarars
 msgid "start symbol %s does not derive any sentence"
 msgstr "Baþlangýç simgesi %s herhangi bir cümleden türemez"
 
-#: scan-gram.l:203
+#: scan-gram.l:140
+#, fuzzy, c-format
+msgid "unexpected end of file in `%s ... %s'"
+msgstr "beklenmeyen dosya sonu"
+
+#: scan-gram.l:267
+#, fuzzy, c-format
+msgid "invalid directive: %s"
+msgstr "geçersiz girdi: %s"
+
+#: scan-gram.l:293 scan-gram.l:746 scan-gram.l:818
 #, c-format
-msgid ": invalid character: `%c'\n"
+msgid "integer out of range: %s"
 msgstr ""
 
-#: scan-gram.l:247
+#: scan-gram.l:332
-#, fuzzy
-msgid ": unexpected end of file in a comment\n"
-msgstr "beklenmeyen dosya sonu"
-
-#: scan-gram.l:276 scan-gram.l:415
-#, fuzzy
-msgid ": unexpected end of file in a string\n"
-msgstr "beklenmeyen dosya sonu"
-
-#: scan-gram.l:314 scan-gram.l:386
-#, fuzzy
-msgid ": unexpected end of file in a character\n"
-msgstr "beklenmeyen dosya sonu"
-
-#: scan-gram.l:335
 #, fuzzy, c-format
-msgid ": invalid escape: %s\n"
+msgid "invalid character: %s"
 msgstr "geçersiz deðer: %s%d"
 
-#: scan-gram.l:356
+#: scan-gram.l:474 scan-gram.l:488 scan-gram.l:508
 #, fuzzy, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "invalid escape sequence: %s"
+msgstr "geçersiz deðer: %s%d"
+
+#: scan-gram.l:516
+#, fuzzy, c-format
+msgid "unrecognized escape sequence: %s"
 msgstr "tanýnmayan: %s"
 
-#: scan-gram.l:477
+#: scan-gram.l:717
-#, fuzzy
-msgid ": unexpected end of file in a braced code\n"
-msgstr "beklenmeyen dosya sonu"
-
-#: scan-gram.l:506
-#, fuzzy
-msgid ": unexpected end of file in a prologue\n"
-msgstr "beklenmeyen dosya sonu"
-
-#: scan-gram.l:564
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s''in $$'ý bildirilmiþ tip deðil"
 
-#: scan-gram.l:576 scan-gram.l:658
+#: scan-gram.l:737
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "geçersiz deðer: %s%d"
-
-#: scan-gram.l:583
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "`%2$s''in %1$d'i bildirilmiþ tip deðil"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:665 scan-gram.l:682
+#: scan-gram.l:763 scan-gram.l:835
-#, c-format
+#, fuzzy, c-format
-msgid "%s is invalid"
+msgid "invalid value: %s"
-msgstr "%s geçersizdir"
+msgstr "geçersiz deðer: %s%d"
 
 #: src/state.c:145
 #, c-format
@@ -612,7 +602,7 @@ msgstr ""
 msgid "Accumulated runs = %u\n"
 msgstr ""
 
-#: lib/bitset_stats.c:260
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr ""
 
@@ -620,11 +610,11 @@ msgstr ""
 msgid "Bad stats file size.\n"
 msgstr ""
 
-#: lib/bitset_stats.c:287
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr ""
 
-#: lib/bitset_stats.c:291
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr ""
 
@@ -730,15 +720,31 @@ msgstr ""
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid ": unexpected end of file in a comment\n"
+#~ msgstr "beklenmeyen dosya sonu"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a character\n"
+#~ msgstr "beklenmeyen dosya sonu"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a braced code\n"
+#~ msgstr "beklenmeyen dosya sonu"
+
+#, fuzzy
+#~ msgid ": unexpected end of file in a prologue\n"
+#~ msgstr "beklenmeyen dosya sonu"
+
+#~ msgid "%s is invalid"
+#~ msgstr "%s geçersizdir"
+
 #~ msgid "reduce"
 #~ msgstr "indirgeme"
 
 #~ msgid "shift"
 #~ msgstr "shift"
 
-#~ msgid "an error"
-#~ msgstr "bir hata"
-
 #~ msgid "%s contains "
 #~ msgstr "%s içerir"
 
@@ -890,9 +896,6 @@ msgstr ""
 #~ msgid "two actions at end of one rule"
 #~ msgstr "bir kuralýn sonunda iki eylem"
 
-#~ msgid "invalid input: %s"
-#~ msgstr "geçersiz girdi: %s"
-
 #~ msgid "maximum table size (%d) exceeded"
 #~ msgstr "en büyük tablo uzunluðu (%d) aþýldý"