Regen.

11 files changed, 1837 insertions, 2508 deletions

diff --git a/po/de.po b/po/de.po
index 747a3549..4e78ff7c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.35\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\n"
 "PO-Revision-Date: 2002-04-26 11:58:57+0200\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -24,11 +24,11 @@ msgstr "zu viele Zustände (max %d)"
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "Warnung: "
 
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "fataler Fehler: "
 
@@ -47,49 +47,49 @@ msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d Schiebe/Reduziere-Konflikt"
 msgstr[1] "%d Schiebe/Reduziere-Konflikte"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "und"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d Reduziere/Reduziere-Konflikt"
 msgstr[1] "%d Reduziere/Reduziere-Konflikte"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "Zustand %d enthält "
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "Konflikte: "
 
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d Schiebe/Reduziere"
 
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d Reduziere/Reduziere"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s enthält "
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -179,7 +179,6 @@ msgstr ""
 "herstellen\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -189,13 +188,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"Ausgabe:\n"
-"  -d, --defines              auch eine Header-Datei herstellen\n"
-"  -v, --verbose              auch eine Erklärung des Automaten herstellen\n"
-"  -b, --file-prefix=PRÄFIX   einen PRÄFIX für Ausgabe-Dateien angeben\n"
-"  -o, --output=DATEI         Ausgabe in DATEI schreiben\n"
-"  -g, --graph                auch eine VCG-Beschreibung des Automaten "
-"herstellen\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -247,65 +239,6 @@ msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n"
 msgid "too many gotos (max %d)"
 msgstr "zu viele Gotos (max %d)"
 
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "unbeendeter Kommentar"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "Datei endet unerwartet"
-
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«"
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«"
-
-# Oder soll man den Begriff "Escapezeichen" verwenden?
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "unbekanntes Escapezeichen: »\\« gefolgt von »%s«"
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "unerwarteter Typname am Ende der Datei"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "unerwarteter Typname"
-
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "»%s« unterstützt kein Argument: %s"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "die Option »%s« erfordert ein Argument"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "»%s« wird nicht länger unterstützt"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -401,157 +334,38 @@ msgstr " auf der linken Seite:"
 msgid " on right:"
 msgstr " auf der rechten Seite:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   Überspringe Zeichen bis zum nächsten \\n"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Überspringe Zeichen bis zum nächten %c"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "unzulässiger $-Wert"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "unbeendete Zeichenkette am Ende der Datei"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "unbeendete Zeichenkette"
-
-#: src/reader.c:341 src/reader.c:399
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "unzulässiger @-Wert"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "%s ist unzulässig"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ von »%s« hat keinen deklarierten Typ"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d von »%s« hat keinen deklarierten Typ"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "unbeendete »%{«-Definition"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "Vorzeitiges EOF nach %s"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "»%s« ist in %s nicht erlaubt"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "mehr als eine %s-Deklaration"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "ungültige %s-Deklaration"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "%type-Deklaration hat keinen <Typ-Namen>"
-
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "ungültige %%type-Deklaration wegen: %s"
-
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr "unzulässiger Text (%s) - Zahl sollte nach Bezeichner kommen"
-
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "unerwartetes Symbol: %s"
-
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "%s ohne Gegenstück"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "Argument von %%expect ist keine ganze Zahl"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "unbekannt: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "keine Eingabe-Grammatik"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "unbekanntes Zeichen: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, 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:1181
-msgid "two @prec's in a row"
-msgstr "zwei @prec-Anweisungen nacheinander"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default-Aktion"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal mit Typ und keine Aktion"
 
-#: src/reader.c:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr ""
-"falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon "
-"gefolgt"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr "vorangehende Regel hat kein abschließendes »;«"
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "ungültige Eingabe: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "zwei @prec-Anweisungen nacheinander"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "zu viele Symbole (Token plus Nicht-Terminale); Maximum %d"
@@ -598,6 +412,26 @@ 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:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ von »%s« hat keinen deklarierten Typ"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "unzulässiger @-Wert"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d von »%s« hat keinen deklarierten Typ"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "%s ist unzulässig"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -665,23 +499,116 @@ msgstr "»"
 msgid "'"
 msgstr "«"
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "Zwei Aktionen am Ende einer Regel"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "Symbol %s noch einmal definiert"
+#~ msgid "unterminated comment"
+#~ msgstr "unbeendeter Kommentar"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "erneute Deklaration des Typs für %s"
+#~ msgid "unexpected end of file"
+#~ msgstr "Datei endet unerwartet"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "Vorrang von %s wird erneut definiert"
+#~ msgid "unescaped newline in constant"
+#~ msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
 
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«"
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«"
+
+# Oder soll man den Begriff "Escapezeichen" verwenden?
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "unbekanntes Escapezeichen: »\\« gefolgt von »%s«"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "unerwarteter Typname am Ende der Datei"
+
+#~ msgid "unterminated type name"
+#~ msgstr "unerwarteter Typname"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "»%s« unterstützt kein Argument: %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "die Option »%s« erfordert ein Argument"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "»%s« wird nicht länger unterstützt"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   Überspringe Zeichen bis zum nächsten \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   Überspringe Zeichen bis zum nächten %c"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "unbeendete Zeichenkette am Ende der Datei"
+
+#~ msgid "unterminated string"
+#~ msgstr "unbeendete Zeichenkette"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "Vorzeitiges EOF nach %s"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "»%s« ist in %s nicht erlaubt"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "%type-Deklaration hat keinen <Typ-Namen>"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "ungültige %%type-Deklaration wegen: %s"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr "unzulässiger Text (%s) - Zahl sollte nach Bezeichner kommen"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "unerwartetes Symbol: %s"
+
+#~ msgid "unmatched %s"
+#~ msgstr "%s ohne Gegenstück"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "ungültige %s-Deklaration"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "unbekannt: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "keine Eingabe-Grammatik"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "unbekanntes Zeichen: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr ""
+#~ "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon "
+#~ "gefolgt"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
+
+#~ msgid "previous rule lacks an ending `;'"
+#~ msgstr "vorangehende Regel hat kein abschließendes »;«"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "ungültige Eingabe: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "Zwei Aktionen am Ende einer Regel"
+
+#~ msgid "reduce"
+#~ msgstr "durch Reduzierung gelöst"
+
+#~ msgid "shift"
+#~ msgstr "durch Schieben gelöst"
+
+#~ msgid "an error"
+#~ msgstr "als Fehler betrachtet"
 
 #~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ msgstr ""
@@ -703,21 +630,33 @@ msgstr "«"
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "Token %s und %s haben die selbe Nummer %d"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "unbeendete »%{«-Definition"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "Symbol %s noch einmal definiert"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "erneute Deklaration des Typs für %s"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "Vorrang von %s wird erneut definiert"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "Argument von %%expect ist keine ganze Zahl"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "das Startsymbol %s ist undefiniert"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "das Startsymbol %s ist ein Token"
 
-#~ msgid "reduce"
-#~ msgstr "durch Reduzierung gelöst"
-
-#~ msgid "shift"
-#~ msgstr "durch Schieben gelöst"
-
-#~ msgid "an error"
-#~ msgstr "als Fehler betrachtet"
-
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr ""
 #~ "%%guard-Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
diff --git a/po/es.po b/po/es.po
index d7628ef2..1abe5905 100644
--- a/po/es.po
+++ b/po/es.po
@@ -29,7 +29,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.35\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\n"
 "PO-Revision-Date: 2002-04-03 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -47,7 +47,7 @@ msgstr "demasiados estados (máximo %d)"
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "aviso: "
 
@@ -58,7 +58,7 @@ msgstr "aviso: "
 # La verdad es que a mi lo de error fatal me suena fatal
 # ngp
 #
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "error grave: "
 
@@ -83,30 +83,30 @@ msgstr ""
 "El conflicto en el estado %d entre la regla %d y el terminal %s se resuelve "
 "como %s.\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d conflicto desplazamiento/reducción"
 msgstr[1] "%d conflictos desplazamiento/reducción"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "y"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] " %d conflicto reducción/reducción"
 msgstr[1] " %d conflictos reducción/reducción"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "El estado %d contiene"
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "conflictos: "
 
@@ -122,7 +122,7 @@ msgstr "conflictos: "
 # ok
 # ngp
 #
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"
@@ -139,17 +139,17 @@ msgstr " %d desplazamiento(s)/reducción(ones)"
 #
 # ok
 # ngp
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s contiene "
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -238,7 +238,6 @@ msgstr ""
 "automaton\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -248,14 +247,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"Salida:\n"
-"  -d, --defines              también produce un fichero de cabecera\n"
-"  -v, --verbose              también produce una explicación del automaton\n"
-"  -b, --file-prefix=PREFIJO  especifia el PREFIJO para los ficheros de "
-"salida\n"
-"  -o, --output=FICHERO       almacena la salida en FICHERO\n"
-"  -g, --graph                también produce una descripción en VCG del "
-"automaton\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -310,67 +301,6 @@ msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n"
 msgid "too many gotos (max %d)"
 msgstr "demasiados gotos (máximo %d)"
 
-# to ignore no es ignorar. Pon otra cosa, please. sv
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "comentario sin terminar"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "fin de fichero inesperado"
-
-# ¿unescaped?
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "salto de línea en constante sin secuencia de escape"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "valor octal fuera del rango 0...255: `\\%o'"
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "valor hexadecimal mayor que 255: `\\x%x'"
-
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "nombre de tipo sin terminar al final del fichero"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "nombre de tipo sin terminar"
-
-# ¿multicarácter o multicaracteres? sv
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "use \"...\" para terminales literales multicarácter"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "`%s' no soporta el argumento: %s"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "`%s' requiere un argumento"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "`%s' ya no está soportado"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -466,165 +396,38 @@ msgstr " en la izquierda:"
 msgid " on right:"
 msgstr " en la derecha:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   Saltando al siguiente \\n"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Saltando al siguiente %c"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "valor $ no válido"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "cadena sin terminar al final del fichero"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "cadena sin terminar"
-
-#: src/reader.c:341 src/reader.c:399
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "valor @ no válido"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "%s no es válido"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ de `%s' no tiene tipo declarado"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d de `%s' no tiene tipo declarado"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "definición `%{' sin terminar"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "EOF prematuro después de %s"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "`%s' no es válido en %s"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "múltiples declaraciones de %s"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "declaración de %s no válida"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "la declaración %type no tiene <nombre-tipo>"
-
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "declaración de %%type no válida debido al ítem: %s"
-
-# Una corrección menor: en realidad, `should' es el pasado y condicional
-# de "to must" y aquí se emplea en su forma condicional. Por eso, he
-# cambiado `debe' por `debería' - cll
-# ahí me has pillado en un olvido del inglés - ngp
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr ""
-"texto no válido (%s) - el número debería estar después del identificador"
-
-# En unas ocasiones, has traducido `unexpected' como `no esperado' y, en
-# otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en
-# este caso, la segunda me parece más apropiada - cll
-# ok - ngp
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "ítem inesperado: %s"
-
-# Cambio el orden y el sexo. Ahora está "en español". sv
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "%s desemparejado/a"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "el argumento de %%expect no es un entero"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "no reconocido: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "no hay gramática de entrada"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "carácter desconocido: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, 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:1181
-msgid "two @prec's in a row"
-msgstr "dos @prec en una línea"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 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:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "regla mal formada: el símbolo inicial no está seguido por :"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "la gramática comienza con una barra vertical"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr "a la regla previa le falta un `;' al final"
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "entrada no válida: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "dos @prec en una línea"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "no hay reglas en la gramática de entrada"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %d"
@@ -671,6 +474,26 @@ 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:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ de `%s' no tiene tipo declarado"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "valor @ no válido"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d de `%s' no tiene tipo declarado"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "%s no es válido"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -762,29 +585,126 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "dos acciones al final de una regla"
+# to ignore no es ignorar. Pon otra cosa, please. sv
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "redefinido el símbolo %s"
+#~ msgid "unterminated comment"
+#~ msgstr "comentario sin terminar"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "redeclaración del tipo de %s"
+#~ msgid "unexpected end of file"
+#~ msgstr "fin de fichero inesperado"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "redefinición de la precedencia de %s"
+# ¿unescaped?
+#~ msgid "unescaped newline in constant"
+#~ msgstr "salto de línea en constante sin secuencia de escape"
 
-# No te recomiendo que emplees participios para expresar acciones (¡si
-# me oyera mi antigua profesora de lengua, lloraría de emoción! :). En
-# vez de eso, emplea las conjugaciones habituales, que para eso están :)
-# - cll
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "valor octal fuera del rango 0...255: `\\%o'"
+
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "valor hexadecimal mayor que 255: `\\x%x'"
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "nombre de tipo sin terminar al final del fichero"
+
+#~ msgid "unterminated type name"
+#~ msgstr "nombre de tipo sin terminar"
+
+# ¿multicarácter o multicaracteres? sv
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr "use \"...\" para terminales literales multicarácter"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "`%s' no soporta el argumento: %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "`%s' requiere un argumento"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "`%s' ya no está soportado"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   Saltando al siguiente \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   Saltando al siguiente %c"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "cadena sin terminar al final del fichero"
+
+#~ msgid "unterminated string"
+#~ msgstr "cadena sin terminar"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "EOF prematuro después de %s"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "`%s' no es válido en %s"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "la declaración %type no tiene <nombre-tipo>"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "declaración de %%type no válida debido al ítem: %s"
+
+# Una corrección menor: en realidad, `should' es el pasado y condicional
+# de "to must" y aquí se emplea en su forma condicional. Por eso, he
+# cambiado `debe' por `debería' - cll
+# ahí me has pillado en un olvido del inglés - ngp
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr ""
+#~ "texto no válido (%s) - el número debería estar después del identificador"
+
+# En unas ocasiones, has traducido `unexpected' como `no esperado' y, en
+# otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en
+# este caso, la segunda me parece más apropiada - cll
 # ok - ngp
-#
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "no se reconoce el ítem %s, se esperaba un identificador"
+#~ msgid "unexpected item: %s"
+#~ msgstr "ítem inesperado: %s"
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "se esperaba una cadena constante en lugar de %s"
+# Cambio el orden y el sexo. Ahora está "en español". sv
+#~ msgid "unmatched %s"
+#~ msgstr "%s desemparejado/a"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "declaración de %s no válida"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "no reconocido: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "no hay gramática de entrada"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "carácter desconocido: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "regla mal formada: el símbolo inicial no está seguido por :"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "la gramática comienza con una barra vertical"
+
+#~ msgid "previous rule lacks an ending `;'"
+#~ msgstr "a la regla previa le falta un `;' al final"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "entrada no válida: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "dos acciones al final de una regla"
+
+#~ msgid "reduce"
+#~ msgstr "reduce"
+
+#~ msgid "shift"
+#~ msgstr "desplaza"
+
+#~ msgid "an error"
+#~ msgstr "un error"
 
 # `token' se debe traducir como `literal' - cll
 # en terminología de compiladores token es más un terminal - ngp
@@ -809,21 +729,39 @@ msgstr "'"
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "los terminales %s y %s tienen asignados ambos el número %d"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "definición `%{' sin terminar"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "redefinido el símbolo %s"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "redeclaración del tipo de %s"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "redefinición de la precedencia de %s"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "el argumento de %%expect no es un entero"
+
+# No te recomiendo que emplees participios para expresar acciones (¡si
+# me oyera mi antigua profesora de lengua, lloraría de emoción! :). En
+# vez de eso, emplea las conjugaciones habituales, que para eso están :)
+# - cll
+# ok - ngp
+#
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "no se reconoce el ítem %s, se esperaba un identificador"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "se esperaba una cadena constante en lugar de %s"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "el símbolo de inicio (axioma) %s no está definido"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "el símbolo de inicio (axioma) %s es un terminal"
 
-#~ msgid "reduce"
-#~ msgstr "reduce"
-
-#~ msgid "shift"
-#~ msgstr "desplaza"
-
-#~ msgid "an error"
-#~ msgstr "un error"
-
 # Insisto, el empleo de participios a secas me parece como hablar en
 # indio. Por favor, permíteme que añada un "está" :) - cll
 # ok - ngp
diff --git a/po/et.po b/po/et.po
index 1b9fecab..6efce5d3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\n"
 "PO-Revision-Date: 2002-03-05 16:27+0200\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -23,11 +23,11 @@ msgstr "liiga palju olekuid (maks %d)"
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemi viga"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "hoiatus: "
 
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "fataalne viga: "
 
@@ -46,49 +46,49 @@ msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d nihutamine/redutseerimine konflikt"
 msgstr[1] "%d nihutamine/redutseerimine konflikti"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "ja"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d redutseerimine/redutseerimine konflikt"
 msgstr[1] "%d redutseerimine/redutseerimine konflikti"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "Olek %d sisaldab "
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "konfliktid: "
 
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"
 
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s sisaldab "
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -173,7 +173,6 @@ msgstr ""
 "  -g, --graph                loo automaadi kirjeldus VCG graafina\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -183,12 +182,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"Väljund:\n"
-"  -d, --defines              loo ka päisfail\n"
-"  -v, --verbose              väljasta automaadi kohta selgitusi\n"
-"  -b, --file-prefix=PREFIKS  kasuta väljundfailide nimedes PREFIKSit\n"
-"  -o, --output-file=FAIL     jäta väljund FAILi\n"
-"  -g, --graph                loo automaadi kirjeldus VCG graafina\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -238,64 +231,6 @@ msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "leidsin ja ignoreerin ootamatu `/'"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "lõpetamata kommentaar"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "ootamatu faililõpp"
-
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "paojadata reavahetus konstandis"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
-
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "tundmatu paojada: `\\' järgneb `%s'"
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "lõpetamata tüübinimi faili lõpus"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "lõpetamata tüübinimi"
-
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "`%s' ei toeta argumente: %s"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "võti `%s' nõuab argumenti"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "`%s' ei ole enam toetatud"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -391,155 +326,38 @@ msgstr " vasakul:"
 msgid " on right:"
 msgstr " paremal:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   Liigun järgmisele \\n"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Liigun järgmisele %c"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "vigane $ väärtus"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "lõpetamata sõne faili lõpus"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "lõpetamata sõne"
-
-#: src/reader.c:341 src/reader.c:399
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "vigane @ väärtus"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "%s on vigane"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "`%s' $$ ei oma deklareeritud tüüpi"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d `%s' ei oma deklareeritud tüüpi"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "lõpetamata `%{' definitsioon"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "Enneaegne EOF peale %s"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "`%s' ei ole %s sees lubatud"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "korduvad %s deklaratsioonid"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "vigane %s deklaratsioon"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "%type deklaratsioonis puudub <tüübinimi>"
-
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "vigane %%type deklaratsioon, element: %s"
-
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
-
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "ootamatu element: %s"
-
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "puudub %s"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "%%expect argument ei ole täisarv"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "tundmatu: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "sisendgrammatikat pole"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "tundmatu sümbol: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, 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:1181
-msgid "two @prec's in a row"
-msgstr "kaks @prec ühel real"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
-#: src/reader.c:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "grammatika algab püstkriipsuga"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr "eelmisel reeglil puudub lõpetav `;'"
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "vigane sisend: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "kaks @prec ühel real"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
@@ -586,6 +404,26 @@ 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:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "`%s' $$ ei oma deklareeritud tüüpi"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "vigane @ väärtus"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d `%s' ei oma deklareeritud tüüpi"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "%s on vigane"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -653,23 +491,113 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "kaks tegevust ühe reegli lõpus"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "leidsin ja ignoreerin ootamatu `/'"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "sümbol %s on uuesti defineeritud"
+#~ msgid "unterminated comment"
+#~ msgstr "lõpetamata kommentaar"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "%s tüübi uuesti deklareerimine"
+#~ msgid "unexpected end of file"
+#~ msgstr "ootamatu faililõpp"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "%s prioriteedi uus definitsioon"
+#~ msgid "unescaped newline in constant"
+#~ msgstr "paojadata reavahetus konstandis"
 
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "tundmatu element %s, eeldasin identifikaatorit"
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "eeldasin %s asemel sõnekonstanti"
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "tundmatu paojada: `\\' järgneb `%s'"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "lõpetamata tüübinimi faili lõpus"
+
+#~ msgid "unterminated type name"
+#~ msgstr "lõpetamata tüübinimi"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "`%s' ei toeta argumente: %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "võti `%s' nõuab argumenti"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "`%s' ei ole enam toetatud"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   Liigun järgmisele \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   Liigun järgmisele %c"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "lõpetamata sõne faili lõpus"
+
+#~ msgid "unterminated string"
+#~ msgstr "lõpetamata sõne"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "Enneaegne EOF peale %s"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "`%s' ei ole %s sees lubatud"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "%type deklaratsioonis puudub <tüübinimi>"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "vigane %%type deklaratsioon, element: %s"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "ootamatu element: %s"
+
+#~ msgid "unmatched %s"
+#~ msgstr "puudub %s"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "vigane %s deklaratsioon"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "tundmatu: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "sisendgrammatikat pole"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "tundmatu sümbol: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "grammatika algab püstkriipsuga"
+
+#~ msgid "previous rule lacks an ending `;'"
+#~ msgstr "eelmisel reeglil puudub lõpetav `;'"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "vigane sisend: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "kaks tegevust ühe reegli lõpus"
+
+#~ msgid "reduce"
+#~ msgstr "redutseerimine"
+
+#~ msgid "shift"
+#~ msgstr "nihutamine"
+
+#~ msgid "an error"
+#~ msgstr "viga"
 
 #~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ msgstr ""
@@ -691,21 +619,33 @@ msgstr "'"
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "lõpetamata `%{' definitsioon"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "sümbol %s on uuesti defineeritud"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "%s tüübi uuesti deklareerimine"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "%s prioriteedi uus definitsioon"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "%%expect argument ei ole täisarv"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "tundmatu element %s, eeldasin identifikaatorit"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "eeldasin %s asemel sõnekonstanti"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "stardisümbol %s ei ole defineeritud"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "stardisümbol %s on märk"
 
-#~ msgid "reduce"
-#~ msgstr "redutseerimine"
-
-#~ msgid "shift"
-#~ msgstr "nihutamine"
-
-#~ msgid "an error"
-#~ msgstr "viga"
-
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
 
diff --git a/po/fr.po b/po/fr.po
index 39c993eb..36e21cca 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.34a\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\n"
 "PO-Revision-Date: 2002-03-21 15:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -24,11 +24,11 @@ msgstr "nombre trop grand d'états (max %d)"
 msgid "Unknown system error"
 msgstr "Erreur système inconnue"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "AVERTISSEMENT: "
 
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "erreur fatale: "
 
@@ -50,49 +50,49 @@ msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr ""
 "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d conflit par décalage/réduction"
 msgstr[1] "%d conflits par décalage/réduction"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "et"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d conflit par réduction/réduction"
 msgstr[1] "%d conflits par réduction/réduction"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "L'état %d contient "
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "conflits: "
 
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"
 
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s contient "
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -181,7 +181,6 @@ msgstr ""
 "l'automate\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -191,13 +190,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"Sortie:\n"
-"  -d, --defines              produire un fichier d'en-tête\n"
-"  -v, --verbose              produire une explication de l'automate\n"
-"  -b, --file-prefix=PREFIXE  utiliser le PREFIXE pour le fichier de sortie\n"
-"  -o, --output=FICHIER       produire la sortie dans le FICHIER\n"
-"  -g, --graph                produire aussi la description du graphe VCG de "
-"l'automate\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -248,64 +240,6 @@ msgstr "%s: arguments supplémentaires ignorés après « %s »\n"
 msgid "too many gotos (max %d)"
 msgstr "nombre trop grand de « goto » (Max %d)"
 
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "« / » inattendu et ignoré"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "le commentaire ne se termine pas"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "Fin de fichier inattendue"
-
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "retour de chariot sans échappement dans une constante"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "valeur octale à l'extérieur de l'intervalle 0...255: « \\%o »"
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "valeur hexadécimale supérieure à 255: « \\x%x »"
-
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "séquence d'échappement inconnue: « \\ » suivie de « %s »"
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "le nom de type ne se termine pas avant la fin de fichier"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "le nom de type ne se termine pas"
-
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "« %s » ne supporte aucun argument: %s"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "« %s »: requiert un argument"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "« %s » n'est plus supporté"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -401,156 +335,38 @@ msgstr " à gauche:"
 msgid " on right:"
 msgstr " à droite:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   Saut jusqu'au prochain \\n"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Saut jusqu'au prochain %c"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "la valeur de symbole $ n'est pas valide"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "chaîne de caractères non terminée en fin de fichier"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "chaîne de caractère non terminée"
-
-#: src/reader.c:341 src/reader.c:399
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "valeur @ invalide"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "%s n'est pas valide"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ de « %s » n'a pas son type déclaré"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d de « %s » n'a pas de type déclaré"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "La section de définition « %{ » ne termine pas avant la fin du fichier"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "Fin de fichier prématutée après %s"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "« %s » n'est pas valide dans %s"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "multiples déclarations %s"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "la déclaration %s n'est pas valide"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "la déclaration %type n'a pas de <nom_de_type>"
-
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "la déclaration %%type n'est pas valide en raison de l'item: %s"
-
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr ""
-"le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur"
-
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "item inattendu: %s"
-
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "non appariement de %s"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "l'argument de %%expect n'est pas un entier"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "non reconnu: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "aucune grammaire en entrée"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "caractère inconnu: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
-#: src/reader.c:1181
-msgid "two @prec's in a row"
-msgstr "deux @prec de suite"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflit de type (« %s » « %s ») pour l'action par défaut"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 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:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "règle mal formée: le symbole initial n'est pas suivi de « : »"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "la grammaire débute par une barre verticale"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr "règle précédente manque une terminaison « ; »"
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "entrée non valide: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "deux @prec de suite"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"
@@ -597,6 +413,26 @@ msgstr[1] "%d règles inutilisables"
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"
 
+#: scan-gram.l:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ de « %s » n'a pas son type déclaré"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "valeur @ invalide"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d de « %s » n'a pas de type déclaré"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "%s n'est pas valide"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -664,23 +500,115 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "deux actions à la fin d'une même règle"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "« / » inattendu et ignoré"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "symbole %s redéfini"
+#~ msgid "unterminated comment"
+#~ msgstr "le commentaire ne se termine pas"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "redéclaration du type de %s"
+#~ msgid "unexpected end of file"
+#~ msgstr "Fin de fichier inattendue"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "redéfinition du niveau de priorité de %s"
+#~ msgid "unescaped newline in constant"
+#~ msgstr "retour de chariot sans échappement dans une constante"
 
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "item %s non reconnu, un identificateur est attendu"
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "valeur octale à l'extérieur de l'intervalle 0...255: « \\%o »"
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "chaîne de caractères constante attendue plutôt que %s"
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "valeur hexadécimale supérieure à 255: « \\x%x »"
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "séquence d'échappement inconnue: « \\ » suivie de « %s »"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "le nom de type ne se termine pas avant la fin de fichier"
+
+#~ msgid "unterminated type name"
+#~ msgstr "le nom de type ne se termine pas"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr ""
+#~ "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "« %s » ne supporte aucun argument: %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "« %s »: requiert un argument"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "« %s » n'est plus supporté"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   Saut jusqu'au prochain \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   Saut jusqu'au prochain %c"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "chaîne de caractères non terminée en fin de fichier"
+
+#~ msgid "unterminated string"
+#~ msgstr "chaîne de caractère non terminée"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "Fin de fichier prématutée après %s"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "« %s » n'est pas valide dans %s"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "la déclaration %type n'a pas de <nom_de_type>"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "la déclaration %%type n'est pas valide en raison de l'item: %s"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr ""
+#~ "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "item inattendu: %s"
+
+#~ msgid "unmatched %s"
+#~ msgstr "non appariement de %s"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "la déclaration %s n'est pas valide"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "non reconnu: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "aucune grammaire en entrée"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "caractère inconnu: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "règle mal formée: le symbole initial n'est pas suivi de « : »"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "la grammaire débute par une barre verticale"
+
+#~ msgid "previous rule lacks an ending `;'"
+#~ msgstr "règle précédente manque une terminaison « ; »"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "entrée non valide: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "deux actions à la fin d'une même règle"
+
+#~ msgid "reduce"
+#~ msgstr "réduction"
+
+#~ msgid "shift"
+#~ msgstr "décalage"
+
+#~ msgid "an error"
+#~ msgstr "une erreur"
 
 #~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ msgstr ""
@@ -702,21 +630,34 @@ msgstr "'"
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "les jetons %s et %s se sont vus assigner le nombre %d"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr ""
+#~ "La section de définition « %{ » ne termine pas avant la fin du fichier"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "symbole %s redéfini"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "redéclaration du type de %s"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "redéfinition du niveau de priorité de %s"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "l'argument de %%expect n'est pas un entier"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "item %s non reconnu, un identificateur est attendu"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "chaîne de caractères constante attendue plutôt que %s"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "le symbole de départ %s n'est pas défini"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "le symbole de départ %s est un terminal"
 
-#~ msgid "reduce"
-#~ msgstr "réduction"
-
-#~ msgid "shift"
-#~ msgstr "décalage"
-
-#~ msgid "an error"
-#~ msgstr "une erreur"
-
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 
diff --git a/po/hr.po b/po/hr.po
index b0b0dc5d..00fa6e21 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.34a\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\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"
@@ -25,11 +25,11 @@ msgstr "previ¹e stanja (maks %d)"
 msgid "Unknown system error"
 msgstr "Nepoznata sistemska gre¹ka"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "upozorenje:"
 
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "fatalna gre¹ka:"
 
@@ -48,49 +48,49 @@ msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n"
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d pomakni/reduciraj konflikat"
 msgstr[1] "%d pomakni/reduciraj konflikata"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "i"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d reduciraj/reduciraj konflikt"
 msgstr[1] "%d reduciraj/reduciraj konflikata"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "Stanje %d sadr¾i"
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "konflikt:"
 
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d pomakni/reduciraj"
 
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reduviraj/reduciraj"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s sadr¾i"
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -175,7 +175,6 @@ msgstr ""
 "  -g, --graph                takoðer proizvedi VCG opis automata\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -185,12 +184,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"Izlaz:\n"
-"  -d, --defines              takoðer proizvedi header datoteku\n"
-"  -v, --verbose              takoðer proizvedi obja¹njenje automata\n"
-"  -b, --file-prefix=PREFIKS   specificiraj PREFIKS za izlazne datoteke\n"
-"  -o, --output=DATOTEKA          ispi¹i izlaz u DATOTEKU\n"
-"  -g, --graph                takoðer proizvedi VCG opis automata\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -241,64 +234,6 @@ msgstr "%s: dodatni argumenti se ignoriraju nakon `%s'\n"
 msgid "too many gotos (max %d)"
 msgstr "previ¹e goto-a (maksimalno %d)"
 
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "neoèekivan  `/' naðen i zanemaren"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "nezavr¹eni komentar"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "neoèekivan kraj datoteke"
-
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "neoèekivan znak za novu liniju u konstanti"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "oktalna vrijednost izvan dosega 0...255: `\\%o'"
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "heksadecimalna vrijednost vi¹a od 255: `\\x%x'"
-
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "nepoznata escape sekvenca: `\\' koju slijedi `%s'"
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "nezavr¹eno ime tipa pri kraju datoteke"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "nezavr¹eno ime tipa"
-
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "koristi \"...\" za vi¹ebajtne znakove"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "`%s' ne podr¾ava argument: %s"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "`%s' zahtijeva argument"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "`%s' vi¹e nije podr¾ano"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -394,155 +329,38 @@ msgstr "s lijeva:"
 msgid " on right:"
 msgstr "s desna:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   Preskaèem na slijedeæe \\n"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Preskaèem na slijedeæi %c"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "nedozvoljena $ vrijednost"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "nezavr¹eni znakovni niz na kraju datoteke"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "nezavr¹eni znakovni niz"
-
-#: src/reader.c:341 src/reader.c:399
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "nedozvoljena  @ vrijednost"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "%s je nedozvoljeno"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ od `%s' nema deklarirani tip"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d od `%s' nema deklarirani tip"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "nezavr¹ena `%{' definicija"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "Preuranjeni EOF nakon %s"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "`%s' je nedozvoljen u %s"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "vi¹estruke %s deklaracije"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "nedozvoljena %s deklaracija"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "%type deklaracija nema  <typename>"
-
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "nedozvoljena %%type deklaracija zbog: %s"
-
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr "nedozvoljeno tekst (%s) - broj bi trebao biti nakon identifikatora"
-
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "neoèekivani: %s"
-
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "nije pronaðen %s"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "argument od %%expect nije cijeli broj"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "neprepoznati: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "nema ulazne gramatike"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "nepoznati znak: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "pravilo dato za %s, a to je znak"
 
-#: src/reader.c:1181
-msgid "two @prec's in a row"
-msgstr "dva @prec's u retku"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "sudar tipova (`%s' `%s') na deaultnoj akciji"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "prazno pravilo za nezavr¹ni znak, i nema akcije"
 
-#: src/reader.c:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "lo¹e pravilo: zarez ne bi trebao slijediti poèetni simbol"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "gramatika poèinje sa okomitom crtom"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr "prethodnom pravilu nedostaje zavr¹etak `;'"
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "nedozvoljeni ulaz: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "dva @prec's u retku"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "nema pravila u ulaznoj gramatici"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "previ¹e simbola (znakovi plus nezavr¹ni znakovi); maksimalno %d"
@@ -589,6 +407,26 @@ 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:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ od `%s' nema deklarirani tip"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "nedozvoljena  @ vrijednost"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d od `%s' nema deklarirani tip"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "%s je nedozvoljeno"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -656,23 +494,113 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "dvije akcije pri kraju jednog pravila"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "neoèekivan  `/' naðen i zanemaren"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "simbol %s ponovo definiran"
+#~ msgid "unterminated comment"
+#~ msgstr "nezavr¹eni komentar"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "ponovna deklaracija za %s"
+#~ msgid "unexpected end of file"
+#~ msgstr "neoèekivan kraj datoteke"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "ponovno definiran prethodnik od %s"
+#~ msgid "unescaped newline in constant"
+#~ msgstr "neoèekivan znak za novu liniju u konstanti"
 
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "neprepoznati %s, oèekivan nakon identifikatora"
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "oktalna vrijednost izvan dosega 0...255: `\\%o'"
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "oèekivana znakovna konstana umjesto %s"
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "heksadecimalna vrijednost vi¹a od 255: `\\x%x'"
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "nepoznata escape sekvenca: `\\' koju slijedi `%s'"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "nezavr¹eno ime tipa pri kraju datoteke"
+
+#~ msgid "unterminated type name"
+#~ msgstr "nezavr¹eno ime tipa"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr "koristi \"...\" za vi¹ebajtne znakove"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "`%s' ne podr¾ava argument: %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "`%s' zahtijeva argument"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "`%s' vi¹e nije podr¾ano"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   Preskaèem na slijedeæe \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   Preskaèem na slijedeæi %c"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "nezavr¹eni znakovni niz na kraju datoteke"
+
+#~ msgid "unterminated string"
+#~ msgstr "nezavr¹eni znakovni niz"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "Preuranjeni EOF nakon %s"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "`%s' je nedozvoljen u %s"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "%type deklaracija nema  <typename>"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "nedozvoljena %%type deklaracija zbog: %s"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr "nedozvoljeno tekst (%s) - broj bi trebao biti nakon identifikatora"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "neoèekivani: %s"
+
+#~ msgid "unmatched %s"
+#~ msgstr "nije pronaðen %s"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "nedozvoljena %s deklaracija"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "neprepoznati: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "nema ulazne gramatike"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "nepoznati znak: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "lo¹e pravilo: zarez ne bi trebao slijediti poèetni simbol"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "gramatika poèinje sa okomitom crtom"
+
+#~ msgid "previous rule lacks an ending `;'"
+#~ msgstr "prethodnom pravilu nedostaje zavr¹etak `;'"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "nedozvoljeni ulaz: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "dvije akcije pri kraju jednog pravila"
+
+#~ msgid "reduce"
+#~ msgstr "reduciraj"
+
+#~ msgid "shift"
+#~ msgstr "pomakni"
+
+#~ msgid "an error"
+#~ msgstr "gre¹ka"
 
 #~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ msgstr "simbol %s je kori¹ten, ali nije definiran kao znak i nema pravila"
@@ -692,21 +620,33 @@ msgstr "'"
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "objema znakovima %s i %s je pridru¾en broj %d"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "nezavr¹ena `%{' definicija"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "simbol %s ponovo definiran"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "ponovna deklaracija za %s"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "ponovno definiran prethodnik od %s"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "argument od %%expect nije cijeli broj"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "neprepoznati %s, oèekivan nakon identifikatora"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "oèekivana znakovna konstana umjesto %s"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "poèetni simbol  %s nije definiran"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "poèetni simbol %s je znak"
 
-#~ msgid "reduce"
-#~ msgstr "reduciraj"
-
-#~ msgid "shift"
-#~ msgstr "pomakni"
-
-#~ msgid "an error"
-#~ msgstr "gre¹ka"
-
 #~ msgid "maximum table size (%d) exceeded"
 #~ msgstr "maksimalna velièina tablice (%d) prekoraèena"
 
diff --git a/po/it.po b/po/it.po
index 5e07b597..52f44fde 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.31\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\n"
 "PO-Revision-Date: 2002-01-18 12:40 CET\n"
 "Last-Translator: Paolo Bonzini <bonzini@gnu.org>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -23,11 +23,11 @@ msgstr "troppi stati (massimo %d)"
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "attenzione: "
 
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "errore fatale: "
 
@@ -49,49 +49,49 @@ msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr ""
 "Conflitto nello stato %d tra la regola %d e il token %s risolto come %s.\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d conflitto shift/riduzione"
 msgstr[1] "%d conflitti shift/riduzione"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "e"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d conflitto riduzione/riduzione"
 msgstr[1] "%d conflitti riduzione/riduzione"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "Lo stato %d contiene"
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "conflitti: "
 
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d shift/riduzione"
 
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d riduzione/riduzione"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s contiene "
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -176,7 +176,6 @@ msgstr ""
 "  -g, --graph                produce anche una descrizione VCG dell'automa\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -186,12 +185,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"Output:\n"
-"  -d, --defines              produce anche uno header\n"
-"  -v, --verbose              produce anche una spiegazione dell'automa\n"
-"  -b, --file-prefix=PREFIX   specifica un prefisso per il file di output\n"
-"  -o, --output=FILE          lascia l'output in FILE\n"
-"  -g, --graph                produce anche una descrizione VCG dell'automa\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -241,65 +234,6 @@ msgstr "%s: ignorati gli argomenti successivi a `%s'\n"
 msgid "too many gotos (max %d)"
 msgstr "troppi goto (max %d)"
 
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "`/' inatteso, trovato e ignorato"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "commento non terminato"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "fine del file inattesa"
-
-# Oder soll man den Begriff "Escapezeichen" verwenden?
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "fine di linea non preceduta da `\\' in una costante"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "valore ottale fuori dall'intervallo 0...255: `\\%o'"
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "valore esadecimale superiore a 255: `\\x%x'"
-
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "sequenza di escape sconosciuta: `\\' seguito da `%s'"
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "nome di tipo non terminato a fine file"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "nome di tipo non terminato"
-
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "usa \"...\" per token letterali di più caratteri"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "`%s' non supporta argomenti: %s"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "`%s' richiede un argomento"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "`%s' non è più supportato"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -395,155 +329,38 @@ msgstr " nel primo membro:"
 msgid " on right:"
 msgstr " nel secondo membro:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   Passo al successivo \\n"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Passo al successivo %c"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "valore $ non valido"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "stringa non terminata alla fine del file"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "stringa non terminata"
-
-#: src/reader.c:341 src/reader.c:399
-#, c-format
-msgid "invalid value: %s%d"
-msgstr "valore non valido: %s%d"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "%s non è valido"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "Manca una dichiarazione di tipo per $$ di `%s'"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "Manca una dichiarazione di tipo per $%d di `%s'"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "definizione `%{' non terminata"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "Fine di file prematura dopo %s"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "`%s' non è valido in %s"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "dichiarazioni multiple per %s"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "dichiarazione %s non valida"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "dichiarazione %type senza <nome di tipo>"
-
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "dichiarazione %%type non valida per la presenza di `%s'"
-
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr "testo non valido (%s) - il numero dovrebbe seguire l'identificatore"
-
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "elemento inatteso: %s"
-
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "%s non bilanciato"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "L'argomento di %%expect non è un intero"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "non riconosciuto: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "nessuna grammatica di input"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "carattere sconosciuto: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "fornita una regola per il token %s"
 
-#: src/reader.c:1181
-msgid "two @prec's in a row"
-msgstr "due @prec di seguito"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflitto di tipo (`%s' e `%s') nell'azione di default"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regola vuota e nessuna azione per un nonterminale con tipo"
 
-#: src/reader.c:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "regola malformata: simbolo iniziale non seguito da `:'"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "la grammatica comincia con un `|'"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr ""
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "input non valido: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "due @prec di seguito"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "nessuna regola nella grammatica di input"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "troppi simboli (token e nonterminali); il massimo è %d"
@@ -590,6 +407,26 @@ 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:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "Manca una dichiarazione di tipo per $$ di `%s'"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, c-format
+msgid "invalid value: %s%d"
+msgstr "valore non valido: %s%d"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "Manca una dichiarazione di tipo per $%d di `%s'"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "%s non è valido"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -657,23 +494,111 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "due azioni alla fine di una regola"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "`/' inatteso, trovato e ignorato"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "simbolo %s ridefinito"
+#~ msgid "unterminated comment"
+#~ msgstr "commento non terminato"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "tipo dichiarato due volte per %s"
+#~ msgid "unexpected end of file"
+#~ msgstr "fine del file inattesa"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "precedenza di `%s' definita due volte"
+# Oder soll man den Begriff "Escapezeichen" verwenden?
+#~ msgid "unescaped newline in constant"
+#~ msgstr "fine di linea non preceduta da `\\' in una costante"
 
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "elemento %s non riconosciuto, atteso un identificatore"
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "valore ottale fuori dall'intervallo 0...255: `\\%o'"
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "attesa una costante stringa invece di %s"
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "valore esadecimale superiore a 255: `\\x%x'"
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "sequenza di escape sconosciuta: `\\' seguito da `%s'"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "nome di tipo non terminato a fine file"
+
+#~ msgid "unterminated type name"
+#~ msgstr "nome di tipo non terminato"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr "usa \"...\" per token letterali di più caratteri"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "`%s' non supporta argomenti: %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "`%s' richiede un argomento"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "`%s' non è più supportato"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   Passo al successivo \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   Passo al successivo %c"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "stringa non terminata alla fine del file"
+
+#~ msgid "unterminated string"
+#~ msgstr "stringa non terminata"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "Fine di file prematura dopo %s"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "`%s' non è valido in %s"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "dichiarazione %type senza <nome di tipo>"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "dichiarazione %%type non valida per la presenza di `%s'"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr "testo non valido (%s) - il numero dovrebbe seguire l'identificatore"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "elemento inatteso: %s"
+
+#~ msgid "unmatched %s"
+#~ msgstr "%s non bilanciato"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "dichiarazione %s non valida"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "non riconosciuto: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "nessuna grammatica di input"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "carattere sconosciuto: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "regola malformata: simbolo iniziale non seguito da `:'"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "la grammatica comincia con un `|'"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "input non valido: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "due azioni alla fine di una regola"
+
+#~ msgid "reduce"
+#~ msgstr "riduzione"
+
+#~ msgid "shift"
+#~ msgstr "shift"
+
+#~ msgid "an error"
+#~ msgstr "un errore"
 
 #~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ msgstr "usato il simbolo %s, ma non è un token e non ha regole"
@@ -693,21 +618,33 @@ msgstr "'"
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "i token %s e %s hanno lo stesso numero %d"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "definizione `%{' non terminata"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "simbolo %s ridefinito"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "tipo dichiarato due volte per %s"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "precedenza di `%s' definita due volte"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "L'argomento di %%expect non è un intero"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "elemento %s non riconosciuto, atteso un identificatore"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "attesa una costante stringa invece di %s"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "simbolo iniziale %s non definito"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "specificato il token %s come simbolo iniziale"
 
-#~ msgid "reduce"
-#~ msgstr "riduzione"
-
-#~ msgid "shift"
-#~ msgstr "shift"
-
-#~ msgid "an error"
-#~ msgstr "un errore"
-
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "trovato %%guard senza che sia specificato %%semantic_parser"
 
diff --git a/po/ja.po b/po/ja.po
index ad661f51..8394181d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\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"
@@ -23,11 +23,11 @@ msgstr "¾õÂÖ¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 msgid "Unknown system error"
 msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à¥¨¥é¡¼"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "Ã×̿Ū¥¨¥é¡¼: "
 
@@ -46,47 +46,47 @@ msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n"
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "¤ª¤è¤Ó"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d ´Ô¸µ/´Ô¸µ¾×ÆÍ"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï "
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "¾×ÆÍ: "
 
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
 
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ´Ô¸µ/´Ô¸µ"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s ¤ÎÃæ¿È¤Ï"
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -170,7 +170,6 @@ msgstr ""
 "  -g, --graph                ¥ª¡¼¥È¥Þ¥È¥ó¤Î VCG µ­½Ò»Ò¤âºîÀ®¤¹¤ë\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -180,12 +179,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"½ÐÎÏ:\n"
-"  -d, --defines              ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤âºîÀ®¤¹¤ë\n"
-"  -v, --verbose              ¥ª¡¼¥È¥Þ¥È¥ó¤Î²òÀâ¤âºîÀ®¤¹¤ë\n"
-"  -b, --file-prefix=PREFIX   ½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î PREFIX(ÀÜƬ¼­) ¤ò»ØÄꤹ¤ë\n"
-"  -o, --output=FILE          ½ÐÎÏÀè¤ò FILE ¤È¤¹¤ë\n"
-"  -g, --graph                ¥ª¡¼¥È¥Þ¥È¥ó¤Î VCG µ­½Ò»Ò¤âºîÀ®¤¹¤ë\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -237,64 +230,6 @@ msgstr "%s: `%s' ¤Î¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n"
 msgid "too many gotos (max %d)"
 msgstr "goto ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
-
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "8 ¿Ê¿ô¤ÎÃͤ¬ 0...255 ¤ÎÈϰϳ°¤Ç¤¹: `\\%o'"
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "16 ¿Ê¿ô¤ÎÃͤ¬ 255 ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹: `\\x%x'"
-
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹: `\\' ¤Î¸å¤Ë `%s'"
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¡¢¥Õ¥¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹"
-
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "`%s' ¤Ï°ú¿ô¤ò¼õ¤±ÉÕ¤±¤Þ¤»¤ó: %s"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "`%s' ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "`%s' ¤ÏºÇÁ᥵¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -390,155 +325,38 @@ msgstr " º¸ÊÕ:"
 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   ¼¡¤Î \\n ¤Ë¥¹¥­¥Ã¥×"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó"
-
-#: src/reader.c:341 src/reader.c:399
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "%s ¤ÏÉÔŬÀڤǤ¹"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d ¸Ä¤Î `%s' ¤¬Àë¸À¤µ¤ì¤¿·¿¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "%s ¤Î¸å¤í¤ËÁ᤯¤â EOF ¤¬¤¢¤ê¤Þ¤¹"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "`%s' ¤Ï %s Æâ¤Ç¤ÏÉÔŬÀڤǤ¹"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "%s ¤¬Ê£¿ô¸ÄÀë¸À¤µ¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "%s ¤ÎÀë¸À¤¬ÉÔŬÀڤǤ¹"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "¥¢¥¤¥Æ¥à¤Î°Ù¤Î %%type Àë¸À¤¬ÉÔŬÀڤǤ¹: %s"
-
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr "ÉÔŬÀڤʥƥ­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹"
-
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s"
-
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "Âбþ¤Î¤Ê¤¤ %s ¤Ç¤¹"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "%%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "̤ÃΤÎʸ»ú: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹"
 
-#: src/reader.c:1181
-msgid "two @prec's in a row"
-msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó"
 
-#: src/reader.c:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr ""
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó + Èó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %d"
@@ -582,6 +400,26 @@ msgstr[0] "%d ¸Ä¤Î̵°ÕÌ£¤Êµ¬Â§"
 msgid "Start symbol %s does not derive any sentence"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó"
 
+#: scan-gram.l:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d ¸Ä¤Î `%s' ¤¬Àë¸À¤µ¤ì¤¿·¿¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "%s ¤ÏÉÔŬÀڤǤ¹"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -649,23 +487,110 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
+#~ msgid "unterminated comment"
+#~ msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
+#~ msgid "unexpected end of file"
+#~ msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
+#~ msgid "unescaped newline in constant"
+#~ msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹"
 
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "8 ¿Ê¿ô¤ÎÃͤ¬ 0...255 ¤ÎÈϰϳ°¤Ç¤¹: `\\%o'"
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "16 ¿Ê¿ô¤ÎÃͤ¬ 255 ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹: `\\x%x'"
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹: `\\' ¤Î¸å¤Ë `%s'"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¡¢¥Õ¥¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
+
+#~ msgid "unterminated type name"
+#~ msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "`%s' ¤Ï°ú¿ô¤ò¼õ¤±ÉÕ¤±¤Þ¤»¤ó: %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "`%s' ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "`%s' ¤ÏºÇÁ᥵¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   ¼¡¤Î \\n ¤Ë¥¹¥­¥Ã¥×"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
+
+#~ msgid "unterminated string"
+#~ msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "%s ¤Î¸å¤í¤ËÁ᤯¤â EOF ¤¬¤¢¤ê¤Þ¤¹"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "`%s' ¤Ï %s Æâ¤Ç¤ÏÉÔŬÀڤǤ¹"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "¥¢¥¤¥Æ¥à¤Î°Ù¤Î %%type Àë¸À¤¬ÉÔŬÀڤǤ¹: %s"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr "ÉÔŬÀڤʥƥ­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s"
+
+#~ msgid "unmatched %s"
+#~ msgstr "Âбþ¤Î¤Ê¤¤ %s ¤Ç¤¹"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "%s ¤ÎÀë¸À¤¬ÉÔŬÀڤǤ¹"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "̤ÃΤÎʸ»ú: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
+
+#~ msgid "reduce"
+#~ msgstr "´Ô¸µ"
+
+#~ msgid "shift"
+#~ msgstr "¥·¥Õ¥È"
+
+#~ msgid "an error"
+#~ msgstr "¥¨¥é¡¼"
 
 #~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ msgstr ""
@@ -687,21 +612,33 @@ msgstr "'"
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %d ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "%%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
 
-#~ msgid "reduce"
-#~ msgstr "´Ô¸µ"
-
-#~ msgid "shift"
-#~ msgstr "¥·¥Õ¥È"
-
-#~ msgid "an error"
-#~ msgstr "¥¨¥é¡¼"
-
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
diff --git a/po/nl.po b/po/nl.po
index fb41d06f..aca83170 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.34a\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\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"
@@ -24,11 +24,11 @@ msgstr "teveel staten (maximum is %d)"
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "let op: "
 
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "fatale fout: "
 
@@ -50,49 +50,49 @@ msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr ""
 "Conflict in staat %d tussen regel %d en token %s opgelost als \"%s\".\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d shift/reductie conflict"
 msgstr[1] "%d shift/reductie conflicten"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "en"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d reductie/reductie conflict"
 msgstr[1] "%d reductie/reductie conflicten"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "Staat %d bevat"
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "conflicten: "
 
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d vershuif/reductie"
 
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reductie/reductie"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s bevat"
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -183,7 +183,6 @@ msgstr ""
 "automaat\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -193,13 +192,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"Uitvoer:\n"
-"  -d, --defines              genereer ook een header-bestand\n"
-"  -v, --verbose              genereer ook een beschrijving van de automaat\n"
-"  -b, --file-prefix=PREFIX   geef een PREFIX op voor de uitvoerbestanden\n"
-"  -o, --output=BESTAND       schrijf uitvoer naar BESTAND\n"
-"  -g, --graph                genereer ook een VCG beschrijving van de "
-"automaat\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -252,65 +244,6 @@ msgstr "%s: extra argumenten na `%s' worden genegeerd\n"
 msgid "too many gotos (max %d)"
 msgstr "teveel gotos (maximum is %d)"
 
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "onverwachte `/' gevonden en genegeerd"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "niet-beëindigde commentaar"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "onverwacht einde van bestand"
-
-# geen letterlijke vertaling, maar zegt wel waar het om gaat
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "newline-teken zonder voorafgaande `\\' in constante"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "octale waarde buiten bereik 0...255: `\\%o'"
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "hexadecimale waarde boven 255: `\\x%x'"
-
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "onbekende escape-reeks: `\\' gevolgd door `%s'"
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "niet-beëindigde typenaam aan einde van bestand"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "niet-beëindigde typenaam"
-
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "gebruik \"...\" voor letterlijke tokens die meerder karakters bevatten"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "`%s' ondersteunt geen argument: %s"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "`%s' heeft een argument nodig"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "`%s' wordt niet meer ondersteund"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -408,158 +341,38 @@ msgstr " links:"
 msgid " on right:"
 msgstr " rechts:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   Verder naar volgende \\n"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Verder naar volgende %c"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "ongeldige $-waarde"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "niet-beëindigde string aan einde van bestand"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "niet-beëindigde string"
-
-#: src/reader.c:341 src/reader.c:399
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "ongeldige @-waarde"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "%s is ongeldig"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ van `%s' heeft geen gedeclareerd type"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d van `%s' heeft geen gedeclareerd type"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "niet-beëindigde `%{' definitie"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "Voortijdig bestandseinde na %s"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "`%s' is ongeldig in %s"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "meerdere %s declaraties"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "ongeldige %s declaratie"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "%type declaratie heeft geen <typenaam>"
-
-# Vertaling voor item?
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "ongeldige %%type declaratie door element: %s"
-
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr "ongeldige tekst (%s) - nummer moet achter de naam staan"
-
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "onverwacht element: %s"
-
-# Lichtjes vrij vertaald; maar klinkt wel beter dan 'niet overeenkomstige x'
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "%s zonder tegenhanger"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "argument van %%expect is geen geheel getal"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "onbekend: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "geen invoergrammatica"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "onbekend karakter: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel opgegeven voor token (%s)"
 
-#: src/reader.c:1181
-msgid "two @prec's in a row"
-msgstr "twee @prec's na elkaar"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type-conflict (`%s' `%s') bij standaardaktie"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor niet-eindsymbool met type, en geen actie"
 
-#: src/reader.c:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr ""
-"slecht geformuleerde regel: beginsymbool wordt niet gevolgd door dubbele punt"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "grammatica start met een verticale streep"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr "`;' ontbreekt aan het einde van de voorgaande regel"
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "ongeldige invoer: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "twee @prec's na elkaar"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "invoergrammatica bevat geen regels"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "teveel symbolen (tokens plus niet-eindsymbolen); het maximum is %d"
@@ -607,6 +420,26 @@ 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:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ van `%s' heeft geen gedeclareerd type"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "ongeldige @-waarde"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d van `%s' heeft geen gedeclareerd type"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "%s is ongeldig"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -674,23 +507,119 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "twee akties aan het einde van één regel"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "onverwachte `/' gevonden en genegeerd"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "symbool %s opnieuw gedefinieerd"
+#~ msgid "unterminated comment"
+#~ msgstr "niet-beëindigde commentaar"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "type herdeclaratie voor %s"
+#~ msgid "unexpected end of file"
+#~ msgstr "onverwacht einde van bestand"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "herdefinitie van de voorrang van %s"
+# geen letterlijke vertaling, maar zegt wel waar het om gaat
+#~ msgid "unescaped newline in constant"
+#~ msgstr "newline-teken zonder voorafgaande `\\' in constante"
 
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "onbekend element %s; een naam werd verwacht"
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "octale waarde buiten bereik 0...255: `\\%o'"
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "in plaats van %s werd een stringconstante verwacht"
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "hexadecimale waarde boven 255: `\\x%x'"
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "onbekende escape-reeks: `\\' gevolgd door `%s'"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "niet-beëindigde typenaam aan einde van bestand"
+
+#~ msgid "unterminated type name"
+#~ msgstr "niet-beëindigde typenaam"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr ""
+#~ "gebruik \"...\" voor letterlijke tokens die meerder karakters bevatten"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "`%s' ondersteunt geen argument: %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "`%s' heeft een argument nodig"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "`%s' wordt niet meer ondersteund"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   Verder naar volgende \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   Verder naar volgende %c"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "niet-beëindigde string aan einde van bestand"
+
+#~ msgid "unterminated string"
+#~ msgstr "niet-beëindigde string"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "Voortijdig bestandseinde na %s"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "`%s' is ongeldig in %s"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "%type declaratie heeft geen <typenaam>"
+
+# Vertaling voor item?
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "ongeldige %%type declaratie door element: %s"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr "ongeldige tekst (%s) - nummer moet achter de naam staan"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "onverwacht element: %s"
+
+# Lichtjes vrij vertaald; maar klinkt wel beter dan 'niet overeenkomstige x'
+#~ msgid "unmatched %s"
+#~ msgstr "%s zonder tegenhanger"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "ongeldige %s declaratie"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "onbekend: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "geen invoergrammatica"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "onbekend karakter: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr ""
+#~ "slecht geformuleerde regel: beginsymbool wordt niet gevolgd door dubbele "
+#~ "punt"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "grammatica start met een verticale streep"
+
+#~ msgid "previous rule lacks an ending `;'"
+#~ msgstr "`;' ontbreekt aan het einde van de voorgaande regel"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "ongeldige invoer: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "twee akties aan het einde van één regel"
+
+#~ msgid "reduce"
+#~ msgstr "reductie"
+
+#~ msgid "shift"
+#~ msgstr "shift"
+
+#~ msgid "an error"
+#~ msgstr "een fout"
 
 #~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ msgstr ""
@@ -712,21 +641,33 @@ msgstr "'"
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "tokens %s en %s hebben beide nummer %d toegewezen gekregen"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "niet-beëindigde `%{' definitie"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "symbool %s opnieuw gedefinieerd"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "type herdeclaratie voor %s"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "herdefinitie van de voorrang van %s"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "argument van %%expect is geen geheel getal"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "onbekend element %s; een naam werd verwacht"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "in plaats van %s werd een stringconstante verwacht"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "het startsymbool %s is niet gedefinieerd"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "het startsymbool %s is een token"
 
-#~ msgid "reduce"
-#~ msgstr "reductie"
-
-#~ msgid "shift"
-#~ msgstr "shift"
-
-#~ msgid "an error"
-#~ msgstr "een fout"
-
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard aanwezig maar %%semantic_parser niet opgegeven"
 
diff --git a/po/ru.po b/po/ru.po
index 8e3b44a2..ffd4690c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\n"
 "PO-Revision-Date: 2002-01-25 12:19+0300\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -24,11 +24,11 @@ msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)"
 msgid "Unknown system error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "
 
@@ -50,7 +50,7 @@ msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr ""
 "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
@@ -58,11 +58,11 @@ msgstr[0] "%d ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 msgstr[1] "%d ËÏÎÆÌÉËÔÁ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 msgstr[2] "%d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "É"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
@@ -70,31 +70,31 @@ msgstr[0] "%d ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 msgstr[1] "%d ËÏÎÆÌÉËÔÁ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 msgstr[2] "%d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ "
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "ËÏÎÆÌÉËÔÙ: "
 
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
 
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s ÓÏÄÅÒÖÉÔ "
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -182,7 +182,6 @@ msgstr ""
 "VCG-ÇÒÁÆÁ\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -192,13 +191,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"÷Ù×ÏÄ:\n"
-"  -d, --defines              ÓÏÚÄÁÔØ ÔÁËÖÅ ÆÁÊÌ ÚÁÇÏÌÏ×ËÏ×\n"
-"  -v, --verbose              ÓÏÚÄÁÔØ ÔÁËÖÅ ÐÏÑÓÎÅÎÉÑ × Á×ÔÏÍÁÔÕ\n"
-"  -b, --file-prefix=ðòåæéëó  ÕËÁÚÁÔØ ðòåæéëó ÄÌÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×\n"
-"  -o, --output=æáêì          ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ × æáêì\n"
-"  -g, --graph                ÓÏÚÄÁÔØ ÔÁËÖÅ ÐÏÑÓÎÅÎÉÑ Ë Á×ÔÏÍÁÔÕ × ×ÉÄÅ \n"
-"VCG-ÇÒÁÆÁ\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -251,64 +243,6 @@ msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"
 msgid "too many gotos (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
 
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
-
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
-
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
-
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "`%s' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÁÒÇÕÍÅÎÔÁ %s"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -404,156 +338,39 @@ msgstr " ÎÁÌÅ×Ï:"
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
-
-#: src/reader.c:341 src/reader.c:399
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË %s"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %s"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
-
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s"
-
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"
-
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
-
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "ÎÅÐÁÒÎÁÑ %s"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reader.c:1181
-msgid "two @prec's in a row"
-msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
-#: src/reader.c:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr ""
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
@@ -603,6 +420,26 @@ msgstr[2] "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ"
 msgid "Start symbol %s does not derive any sentence"
 msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
 
+#: scan-gram.l:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË %s"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -670,23 +507,110 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
+#~ msgid "unterminated comment"
+#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
+#~ msgid "unexpected end of file"
+#~ msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
+#~ msgid "unescaped newline in constant"
+#~ msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
 
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"
+
+#~ msgid "unterminated type name"
+#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "`%s' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÁÒÇÕÍÅÎÔÁ %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ"
+
+#~ msgid "unterminated string"
+#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
+
+#~ msgid "unmatched %s"
+#~ msgstr "ÎÅÐÁÒÎÁÑ %s"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %s"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
+
+#~ msgid "reduce"
+#~ msgstr "×Ù×ÏÄ"
+
+#~ msgid "shift"
+#~ msgstr "ÓÄ×ÉÇ"
+
+#~ msgid "an error"
+#~ msgstr "ÏÛÉÂËÁ"
 
 #~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ msgstr ""
@@ -701,21 +625,33 @@ msgstr "'"
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#~ msgid "reduce"
-#~ msgstr "×Ù×ÏÄ"
-
-#~ msgid "shift"
-#~ msgstr "ÓÄ×ÉÇ"
-
-#~ msgid "an error"
-#~ msgstr "ÏÛÉÂËÁ"
-
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
 
diff --git a/po/sv.po b/po/sv.po
index a8c6ba1e..acb64e0a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\n"
 "PO-Revision-Date: 2002-03-05 10:18+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -23,11 +23,11 @@ msgstr "för många tillstånd (max %d)"
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "varning: "
 
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "ödesdigert fel: "
 
@@ -49,49 +49,49 @@ msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr ""
 "Konflikt i tillstånd %d mellan regel %d och element %s, löstes med %s.\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d skifta/reducerakonflikt"
 msgstr[1] "%d skifta/reducerakonflikter"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "och"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d reducera/reducerakonflikt"
 msgstr[1] "%d reducera/reducerakonflikter"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "Tillstånd %d innehåller "
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "konflikter: "
 
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d skifta/reducera"
 
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducera/reducera"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s innehåller "
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -177,7 +177,6 @@ msgstr ""
 "  -g, --graph                skapa också en VCG-beskrivning av automaten\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -187,12 +186,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"Utdata:\n"
-"  -d, --defines              skapa också en huvudfil\n"
-"  -v, --verbose              skapa också en förklaring av automaten\n"
-"  -b, --file-prefix=PREFIX   ange ett PREFIX för utdatafiler\n"
-"  -o, --output=FIL           lägg utdata i FIL\n"
-"  -g, --graph                skapa också en VCG-beskrivning av automaten\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -245,64 +238,6 @@ msgstr "%s: extra argument ignorerade efter \"%s\"\n"
 msgid "too many gotos (max %d)"
 msgstr "för många goto (max %d)"
 
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "oväntat \"/\" hittat och ignorerat"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "oavslutad kommentar"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "oväntat filslut"
-
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "oskyddat nyradstecken i konstant"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "oktalt värde utanför intervallet 0-255: \"\\%o\""
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "hexadecimalt värde över 255: \"\\x%x\""
-
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "okänd specialsekvens: \"\\\" följt av \"%s\""
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "oavslutat typnamn vid filslut"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "oavslutat typnamn"
-
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "använd \"...\" för bokstavliga element med mer än ett tecken"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "\"%s\" stödjer inga argument: %s"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "\"%s\" behöver ett argument"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "\"%s\" stöds inte längre"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -398,155 +333,38 @@ msgstr " till vänster:"
 msgid " on right:"
 msgstr " till höger:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   Hoppar över till nästa \\n"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Hoppar över till nästa %c"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "felaktigt $-värde"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "oavslutad sträng vid filslut"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "oavslutad sträng"
-
-#: src/reader.c:341 src/reader.c:399
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "felaktigt @-värde"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "%s är felaktigt"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ för \"%s\" har ingen deklarerad typ"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d för \"%s\" har ingen deklarerad typ"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "oavslutad \"%{\"-definition"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "Förtida filslut efter %s"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "\"%s\" är felaktig i %s"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "flera %s-deklarationer"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "felaktig %s-deklaration"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "%type-deklaration har inget <typnamn>"
-
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "felaktig %%type-deklaration på grund av objekt: %s"
-
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr "felaktig text (%s) - tal skulle följa efter identifierare"
-
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "oväntat objekt: %s"
-
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "ensam %s"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "argument till %%expect är inte ett heltal"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "okänt: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "ingen ingrammatik"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "okänt tecken: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel given för %s, som är ett element"
 
-#: src/reader.c:1181
-msgid "two @prec's in a row"
-msgstr "två @prec i rad"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "typkonflikt (\"%s\" \"%s\") för standardåtgärd"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tom regel för typad icketerminal, och ingen åtgärd"
 
-#: src/reader.c:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "felskriven regel: första symbolen följs inte av ett kolon"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "grammatiken startar med ett vertikalt streck"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr "föregående regel saknar ett avslutande \";\""
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "felaktig indata: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "två @prec i rad"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "inga regler i ingrammatiken"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "för många symboler (element plus icketerminaler); max %d"
@@ -593,6 +411,26 @@ msgstr[1] "%d oanvändbara regler"
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Startsymbolen %s genererar inga meningar"
 
+#: scan-gram.l:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ för \"%s\" har ingen deklarerad typ"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "felaktigt @-värde"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d för \"%s\" har ingen deklarerad typ"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "%s är felaktigt"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -663,23 +501,113 @@ msgstr "\""
 msgid "'"
 msgstr "\""
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "två åtgärder vid slutet av en regel"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "oväntat \"/\" hittat och ignorerat"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "symbolen %s omdefinierad"
+#~ msgid "unterminated comment"
+#~ msgstr "oavslutad kommentar"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "typen omdeklarerad för %s"
+#~ msgid "unexpected end of file"
+#~ msgstr "oväntat filslut"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "omdefinition av precedens för %s"
+#~ msgid "unescaped newline in constant"
+#~ msgstr "oskyddat nyradstecken i konstant"
 
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "oväntat objekt %s, förväntade en identifierare"
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "oktalt värde utanför intervallet 0-255: \"\\%o\""
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "förväntade strängkonstant istället för %s"
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "hexadecimalt värde över 255: \"\\x%x\""
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "okänd specialsekvens: \"\\\" följt av \"%s\""
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "oavslutat typnamn vid filslut"
+
+#~ msgid "unterminated type name"
+#~ msgstr "oavslutat typnamn"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr "använd \"...\" för bokstavliga element med mer än ett tecken"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "\"%s\" stödjer inga argument: %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "\"%s\" behöver ett argument"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "\"%s\" stöds inte längre"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   Hoppar över till nästa \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   Hoppar över till nästa %c"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "oavslutad sträng vid filslut"
+
+#~ msgid "unterminated string"
+#~ msgstr "oavslutad sträng"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "Förtida filslut efter %s"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "\"%s\" är felaktig i %s"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "%type-deklaration har inget <typnamn>"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "felaktig %%type-deklaration på grund av objekt: %s"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr "felaktig text (%s) - tal skulle följa efter identifierare"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "oväntat objekt: %s"
+
+#~ msgid "unmatched %s"
+#~ msgstr "ensam %s"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "felaktig %s-deklaration"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "okänt: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "ingen ingrammatik"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "okänt tecken: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "felskriven regel: första symbolen följs inte av ett kolon"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "grammatiken startar med ett vertikalt streck"
+
+#~ msgid "previous rule lacks an ending `;'"
+#~ msgstr "föregående regel saknar ett avslutande \";\""
+
+#~ msgid "invalid input: %s"
+#~ msgstr "felaktig indata: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "två åtgärder vid slutet av en regel"
+
+#~ msgid "reduce"
+#~ msgstr "reducera"
+
+#~ msgid "shift"
+#~ msgstr "skifta"
+
+#~ msgid "an error"
+#~ msgstr "ett fel"
 
 #~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ msgstr ""
@@ -701,21 +629,33 @@ msgstr "\""
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "elementen %s och %s har båda fått nummer %d"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "oavslutad \"%{\"-definition"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "symbolen %s omdefinierad"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "typen omdeklarerad för %s"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "omdefinition av precedens för %s"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "argument till %%expect är inte ett heltal"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "oväntat objekt %s, förväntade en identifierare"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "förväntade strängkonstant istället för %s"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "startsymbolen %s är odefinierad"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "startsymbolen %s är ett element"
 
-#~ msgid "reduce"
-#~ msgstr "reducera"
-
-#~ msgid "shift"
-#~ msgstr "skifta"
-
-#~ msgid "an error"
-#~ msgstr "ett fel"
-
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard finns men %%semantic_parser är inte angiven"
 
diff --git a/po/tr.po b/po/tr.po
index 7598a46b..a01c8b28 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.34\n"
-"POT-Creation-Date: 2002-06-11 10:09+0200\n"
+"POT-Creation-Date: 2002-06-11 21:15+0200\n"
 "PO-Revision-Date: 2002-03-14 11:03GMT +02:00\n"
 "Last-Translator: Altuð Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -24,11 +24,11 @@ msgstr "çok fazla durum (en fazla %d)"
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatasý"
 
-#: src/complain.c:150
+#: src/complain.c:151 src/complain.c:200
 msgid "warning: "
 msgstr "uyarý: "
 
-#: src/complain.c:238
+#: src/complain.c:337 src/complain.c:370
 msgid "fatal error: "
 msgstr "ölümcül hata:"
 
@@ -53,49 +53,49 @@ msgstr ""
 "%d durumu içinde %d kuralý ve %s andaçý arasýndaki çeliþki %s olarak\n"
 "çözümlendi.\n"
 
-#: src/conflicts.c:362
+#: src/conflicts.c:366
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d öteleme/indirgeme çeliþkisi"
 msgstr[1] "%d öteleme/indirgeme çeliþkisi"
 
-#: src/conflicts.c:369
+#: src/conflicts.c:373
 msgid "and"
 msgstr "ve"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:379
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d indirgeme/indirgeme çeliþkisi"
 msgstr[1] "%d indirgeme/indirgeme çeliþkisi"
 
-#: src/conflicts.c:400
+#: src/conflicts.c:404
 #, c-format
 msgid "State %d contains "
 msgstr "%d durumu içerir"
 
-#: src/conflicts.c:447
+#: src/conflicts.c:451
 msgid "conflicts: "
 msgstr "çeliþkiler: "
 
-#: src/conflicts.c:449
+#: src/conflicts.c:453
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d öteleme/indirgeme"
 
-#: src/conflicts.c:453
+#: src/conflicts.c:457
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d indirgeme/indirgeme"
 
-#: src/conflicts.c:458 src/reduce.c:397
+#: src/conflicts.c:462 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s içerir"
 
-#: src/conflicts.c:465
+#: src/conflicts.c:469
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -182,7 +182,6 @@ msgstr ""
 "  -g, --graph                otomatýn bir VCG grafik açýklamasýný da üretir\n"
 
 #: src/getargs.c:143
-#, fuzzy
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -192,12 +191,6 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
-"Çýktý:\n"
-"  -d, --defines              bir baþlýk dosyasýda üretir\n"
-"  -v, --verbose              otomatýn bir açýklamasýný da üretir\n"
-"  -b, --file-prefix=ÖNEK      çýktý dosyalarý için bir önek belirtir\n"
-"  -o, --output=DOSYA        çýktýyý dosyaya býrakýr\n"
-"  -g, --graph                otomatýn bir VCG grafik açýklamasýný da üretir\n"
 
 #: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
@@ -250,64 +243,6 @@ msgstr "%s: '%s' den sonraki argümanlar yoksayýldý\n"
 msgid "too many gotos (max %d)"
 msgstr "gotos çok fazla (en fazla %d)"
 
-#: src/lex.c:78
-msgid "unexpected `/' found and ignored"
-msgstr "beklenmeyen `/' bulundu ve yoksayýldý"
-
-#: src/lex.c:107 src/reader.c:307
-msgid "unterminated comment"
-msgstr "sonlandýrýlmamýþ açýklama"
-
-#: src/lex.c:139
-msgid "unexpected end of file"
-msgstr "beklenmeyen dosya sonu"
-
-#: src/lex.c:158
-msgid "unescaped newline in constant"
-msgstr "sabit içinde kaçamayan yeni satýr"
-
-#: src/lex.c:197
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "sekizli deðer 0...255'in dýþýnda: `\\%o'"
-
-#: src/lex.c:222
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "onaltýlýk deðer 255'in üstünde: `\\x%x'"
-
-#: src/lex.c:234
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "bilinmeyen kaçýþ sýrasý: `\\' `%s' tarafýndan takip edildi"
-
-#: src/lex.c:265
-msgid "unterminated type name at end of file"
-msgstr "dosya sonunda sonlandýrýlmamýþ tip adý"
-
-#: src/lex.c:268
-msgid "unterminated type name"
-msgstr "sonlandýrýlmamýþ tip ismi"
-
-#: src/lex.c:360
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"
-
-#: src/lex.c:566
-#, c-format
-msgid "`%s' supports no argument: %s"
-msgstr "`%s' argüman %s'i desteklemez"
-
-#: src/lex.c:584
-#, c-format
-msgid "`%s' requires an argument"
-msgstr "`%s' bir argüman gerektirir"
-
-#: src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "`%s' artýk desteklenmeyecek"
-
 #: src/print.c:46
 #, c-format
 msgid " type %d is %s\n"
@@ -403,156 +338,39 @@ msgstr " solda:"
 msgid " on right:"
 msgstr " saðda:"
 
-#: src/reader.c:83
-msgid "   Skipping to next \\n"
-msgstr "   Sonrakine atlanýyor \\n"
-
-#: src/reader.c:85
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Sonraki  %c'ye atlanýyor"
-
-#: src/reader.c:136 src/reader.c:148
+#: src/reader.c:71 src/reader.c:83
 msgid "invalid $ value"
 msgstr "geçersiz $ deðeri"
 
-#: src/reader.c:197 src/reader.c:212
-msgid "unterminated string at end of file"
-msgstr "dosyanýn sonunda sonlandýrýlmamýþ dizge"
-
-#: src/reader.c:200
-msgid "unterminated string"
-msgstr "sonlandýrýlmamýþ dizge"
-
-#: src/reader.c:341 src/reader.c:399
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "geçersiz @ deðeri"
-
-#: src/reader.c:350 src/reader.c:417
-#, c-format
-msgid "%s is invalid"
-msgstr "%s geçersizdir"
-
-#: src/reader.c:385
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "`%s''in $$'ý bildirilmiþ tip deðil"
-
-#: src/reader.c:405
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "`%2$s''in %1$d'i bildirilmiþ tip deðil"
-
-#: src/reader.c:467
-msgid "unterminated `%{' definition"
-msgstr "`%{' tanýmlamasý sonlandýrýlmamýþ"
-
-#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "%s'den sonra erken EOF"
-
-#: src/reader.c:544
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "`%s' %s içinde geçersizdir"
-
-#: src/reader.c:562 src/reader.c:707
+#: src/reader.c:101
 #, c-format
 msgid "multiple %s declarations"
 msgstr "çoklu %s bildirimleri"
 
-#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
-#: src/reader.c:847
-#, c-format
-msgid "invalid %s declaration"
-msgstr "geçersiz %s bildirimi"
-
-#: src/reader.c:584
-msgid "%type declaration has no <typename>"
-msgstr "%type bildirimi <tipadý>'na sahip deðil"
-
-#: src/reader.c:614
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "geçersiz %%type bildirimine neden olan öðe: `%s'"
-
-#: src/reader.c:673
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr "geçersiz metin (%s) - sayý tanýtýcýdan sonra olmalýdýr"
-
-#: src/reader.c:683
-#, c-format
-msgid "unexpected item: %s"
-msgstr "beklenmeyen öðe: %s"
-
-#: src/reader.c:740 src/reader.c:1021
-#, c-format
-msgid "unmatched %s"
-msgstr "eþlenemeyen %s"
-
-#: src/reader.c:769
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "%%expect'in argümaný bir tamsayý deðildir"
-
-#: src/reader.c:951
-#, c-format
-msgid "unrecognized: %s"
-msgstr "tanýnmayan: %s"
-
-#: src/reader.c:956
-msgid "no input grammar"
-msgstr "girdi grameri yok"
-
-#: src/reader.c:961
-#, c-format
-msgid "unknown character: %s"
-msgstr "bilinmeyen karakter: %s"
-
-#: src/reader.c:1129
+#: src/reader.c:247
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "bir andaç olan %s için verilen kural"
 
-#: src/reader.c:1181
-msgid "two @prec's in a row"
-msgstr "bir satýrda iki @prec"
-
-#: src/reader.c:1206
+#: src/reader.c:271
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý"
 
-#: src/reader.c:1213
+#: src/reader.c:278
 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:1263
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "kötü-biçemli kural: baþlangýç simgesini takip eden \":\" yok"
-
-#: src/reader.c:1269
-msgid "grammar starts with vertical bar"
-msgstr "gramer düþey çubuk ile baþlýyor"
-
-#: src/reader.c:1302 src/reader.c:1342
-msgid "previous rule lacks an ending `;'"
-msgstr "önceki kuralda bir bitiþ `;' eksik"
-
-#: src/reader.c:1348
-#, c-format
-msgid "invalid input: %s"
-msgstr "geçersiz girdi: %s"
+#: src/reader.c:343
+msgid "two @prec's in a row"
+msgstr "bir satýrda iki @prec"
 
-#: src/reader.c:1355
+#: src/reader.c:488
 msgid "no rules in the input grammar"
 msgstr "girdi grameri içinde kurallar yok"
 
-#: src/reader.c:1377
+#: src/reader.c:520
 #, 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"
@@ -599,6 +417,26 @@ msgstr[1] "%d yararsýz kural"
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Baþlangýç simgesi %s herhangi bir cümleden türemez"
 
+#: scan-gram.l:508
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "`%s''in $$'ý bildirilmiþ tip deðil"
+
+#: scan-gram.l:520 scan-gram.l:571
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "geçersiz @ deðeri"
+
+#: scan-gram.l:526
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "`%2$s''in %1$d'i bildirilmiþ tip deðil"
+
+#: scan-gram.l:539 scan-gram.l:580
+#, c-format
+msgid "%s is invalid"
+msgstr "%s geçersizdir"
+
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -666,23 +504,113 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "two actions at end of one rule"
-#~ msgstr "bir kuralýn sonunda iki eylem"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "beklenmeyen `/' bulundu ve yoksayýldý"
 
-#~ msgid "symbol %s redefined"
-#~ msgstr "%s simgesi yeniden tanýmlandý"
+#~ msgid "unterminated comment"
+#~ msgstr "sonlandýrýlmamýþ açýklama"
 
-#~ msgid "type redeclaration for %s"
-#~ msgstr "%s için yeniden tip bildirimi"
+#~ msgid "unexpected end of file"
+#~ msgstr "beklenmeyen dosya sonu"
 
-#~ msgid "redefining precedence of %s"
-#~ msgstr "%s'in önceliði tekrar tanýmlandý"
+#~ msgid "unescaped newline in constant"
+#~ msgstr "sabit içinde kaçamayan yeni satýr"
 
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "%s öðesi tanýnmadý, beklenen bir tanýtýcýdýr"
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "sekizli deðer 0...255'in dýþýnda: `\\%o'"
 
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "%s'in yerine sabit dizge beklendi"
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "onaltýlýk deðer 255'in üstünde: `\\x%x'"
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "bilinmeyen kaçýþ sýrasý: `\\' `%s' tarafýndan takip edildi"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "dosya sonunda sonlandýrýlmamýþ tip adý"
+
+#~ msgid "unterminated type name"
+#~ msgstr "sonlandýrýlmamýþ tip ismi"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "`%s' argüman %s'i desteklemez"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "`%s' bir argüman gerektirir"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "`%s' artýk desteklenmeyecek"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   Sonrakine atlanýyor \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   Sonraki  %c'ye atlanýyor"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "dosyanýn sonunda sonlandýrýlmamýþ dizge"
+
+#~ msgid "unterminated string"
+#~ msgstr "sonlandýrýlmamýþ dizge"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "%s'den sonra erken EOF"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "`%s' %s içinde geçersizdir"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "%type bildirimi <tipadý>'na sahip deðil"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "geçersiz %%type bildirimine neden olan öðe: `%s'"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr "geçersiz metin (%s) - sayý tanýtýcýdan sonra olmalýdýr"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "beklenmeyen öðe: %s"
+
+#~ msgid "unmatched %s"
+#~ msgstr "eþlenemeyen %s"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "geçersiz %s bildirimi"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "tanýnmayan: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "girdi grameri yok"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "bilinmeyen karakter: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "kötü-biçemli kural: baþlangýç simgesini takip eden \":\" yok"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "gramer düþey çubuk ile baþlýyor"
+
+#~ msgid "previous rule lacks an ending `;'"
+#~ msgstr "önceki kuralda bir bitiþ `;' eksik"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "geçersiz girdi: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "bir kuralýn sonunda iki eylem"
+
+#~ msgid "reduce"
+#~ msgstr "indirgeme"
+
+#~ msgid "shift"
+#~ msgstr "shift"
+
+#~ msgid "an error"
+#~ msgstr "bir hata"
 
 #~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ msgstr ""
@@ -703,21 +631,33 @@ msgstr "'"
 #~ msgid "tokens %s and %s both assigned number %d"
 #~ msgstr "%s ve %s andaçlarýnýn her ikisi %d sayýsýna atandý"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "`%{' tanýmlamasý sonlandýrýlmamýþ"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "%s simgesi yeniden tanýmlandý"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "%s için yeniden tip bildirimi"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "%s'in önceliði tekrar tanýmlandý"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "%%expect'in argümaný bir tamsayý deðildir"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "%s öðesi tanýnmadý, beklenen bir tanýtýcýdýr"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "%s'in yerine sabit dizge beklendi"
+
 #~ msgid "the start symbol %s is undefined"
 #~ msgstr "baþlangýç simgesi %s tanýmlanmadý"
 
 #~ msgid "the start symbol %s is a token"
 #~ msgstr "baþlangýç simgesi %s bir andaçtýr"
 
-#~ msgid "reduce"
-#~ msgstr "indirgeme"
-
-#~ msgid "shift"
-#~ msgstr "shift"
-
-#~ msgid "an error"
-#~ msgstr "bir hata"
-
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard sunulmuþ fakat %%semantic_parser belirlenmemiþ"