From bb84601097e8a8363c3f7cff29fbe070906758d9 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Mon, 24 Sep 2001 08:15:53 +0000
Subject: [PATCH] * src/reader.c (reader): Remove call to free_symtab (). *
 src/main.c (main): Call it here. Include symtab.h. * src/conflicts.c
 (initialize_conflicts): Rename as... (solve_conflicts): this. * src/print.c
 (print_core, print_actions, print_state) (print_grammar): Dump to a file
 instead a `output_obstack'. (print_results): Dump `output_obstack', and then
 proceed with the FILE *. * src/files.c (compute_output_file_names,
 close_files): New. (output_files): Adjust. * src/main.c (main): Adjust.

---
 ChangeLog       |  15 +++++
 po/de.gmo       | Bin 8560 -> 8517 bytes
 po/de.po        | 131 +++++++++++++++++++++---------------------
 po/es.gmo       | Bin 8187 -> 8127 bytes
 po/es.po        | 141 +++++++++++++++++++++++----------------------
 po/et.gmo       | Bin 14358 -> 14315 bytes
 po/et.po        | 131 +++++++++++++++++++++---------------------
 po/fr.gmo       | Bin 15129 -> 15083 bytes
 po/fr.po        | 131 +++++++++++++++++++++---------------------
 po/ja.gmo       | Bin 8383 -> 8342 bytes
 po/ja.po        | 131 +++++++++++++++++++++---------------------
 po/nl.gmo       | Bin 7502 -> 7502 bytes
 po/nl.po        | 126 +++++++++++++++++++++--------------------
 po/ru.gmo       | Bin 14565 -> 14505 bytes
 po/ru.po        | 131 +++++++++++++++++++++---------------------
 po/tr.po        | 131 +++++++++++++++++++++---------------------
 src/conflicts.c |  17 +++---
 src/conflicts.h |   4 +-
 src/files.c     |  82 ++++++++++++++++-----------
 src/files.h     |   7 ++-
 src/main.c      |  20 ++++++-
 src/print.c     | 148 ++++++++++++++++++++++++------------------------
 src/reader.c    |   3 -
 23 files changed, 715 insertions(+), 634 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c29cd2d8..a5985176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-09-24  Marc Autret  <autret_m@epita.fr>, Akim Demaille  <akim@epita.fr>
+
+	* src/reader.c (reader): Remove call to free_symtab ().
+	* src/main.c (main): Call it here.
+	Include symtab.h.
+	* src/conflicts.c (initialize_conflicts): Rename as...
+	(solve_conflicts): this.
+	* src/print.c (print_core, print_actions, print_state)
+	(print_grammar): Dump to a file instead a `output_obstack'.
+	(print_results): Dump `output_obstack', and then proceed with the
+	FILE *.
+	* src/files.c (compute_output_file_names, close_files): New.
+	(output_files): Adjust.
+	* src/main.c (main): Adjust.
+
 2001-09-23  Marc Autret  <autret_m@epita.fr>
 
 	* src/files.c (compute_header_macro): Computes header macro name
diff --git a/po/de.gmo b/po/de.gmo
index 173101f639f2b11a9a5f77092283896e161518d2..caf86370e58d1d6556c91e7033b18578bb2a5c4e 100644
GIT binary patch
delta 2131
zcmX}tOKenC7{Kv^t#&}@^d*eXUY{+{meNiUD-{?lEwu_&q16gST$q>`SJrBb*90{t
zN-z@QLQSA<Kx|wf8eO>XvFN78ny6`F7e-}8Pz(`kV*LN_oO&|f{oTjhbI$$FcV~Vt
zeO*fD>ne{1+J53XqauWZdIcL=b1sAeuEqu|VG|BxGp2Yep1=fW(C?qen=!YvYzyW&
z-i6C?Kd$8V@ML)>yo9w}cpI<9DXhV1yawm+YP^UJkY5%;B{t*b*os^VoyaHjuyMeC
zY{U`l#0gx5A7Fv;!&mG$@K1Opo=0c+5Aq2)PC9UXv=yCDAGY8DydDpunV5>_zr))&
zwlgQt6zxMZ^Ej3mKfK1yRXBqy@E5eB3)q4MPCCI}ya9*N?~g}cN3tCz(E(4P_s=48
z2$ygjR#um<7ct>@6jNvNJUd-@3{Bbh=zzb)^Ow-2Xyc+!x*3~sFS=B(pye`&JMbj(
z34gM&{|at)iJEXLwqiX#RYU%LqJx}Ba1t%DFVXWqq67VfE<wVqoIp1wID&TcESix+
z*oyC=nfn&GHT;VfcfPLNe+zow);jWk6Fa*(K{bX6G<Ap34$ffPk`R8z8#%6Jb{1bJ
zuEs%JgX8F1aU6Z(Y4rQ&(Ejqw&WUxQ13!kWN_Zw^$Bte`JNgi<&N;M$3&<xlFguHA
zO>_Xw#1rUS@G6?(L&zr_VPik<qf7AxI>A{Szy);a(q6u0Y92*r_5xb<Z=%KXE>ef#
zB-+8p=#BGu3of9UY9uW#)gZ3Lr_uAr<M9kS;e}{{_2m0$*uc&fE{q}9!ZCElpW-^4
z#try4vI?P{chB0`hGymf`T!I0_$WGoQ&_|w&<9!0tT$o-+i(brzW*<><3MNdKKvEU
zM3G({pdWj1AM&u_9du1ULOYy8JFMsNe1H-T;V4>sQ`mu@qy7DXj#I@`H2VJUVJE?H
zv>4w)i|8}72IkS)umC*27M<`;yd6_?VxL66iPz8K9h_g4l#6W$Nk$k$C-NMo-uMPP
z7U2n`V8bl>Lvj{PeKoUKf~Mamdze^kW?+~wV>^j^i7vv%iv8d0XJtGpp$|q&v+ZcM
zE&mDK$$nKlmhFTUP7<=Vo~`M(Nc#zkj*Mncv>R;|gimUkZTre(Ti+6!HPIW#&;A%Z
z`3Ug<(c=M)3}&gdkj%^$!qh)V*v1IgHX(Kpluq^w2ia2Hg}ybuLDq<Gge^~OB5Hho
ztJT7>`J=Fls3qD7TekN25aG{kA2C976E<JNy~Jh@V!H>I5|=HWh`OvfVp}}kSj~<_
xbT?rQ3=sZOQPg3Oupk%P{p{=^EUMGna~GFY6_fSt-5niAO7-VXZ)zy6_z!f;tDpb?

delta 2174
zcmXxlUu+ab9Ki9Rw9-Qg$CVb)f?N8>T3XH)fwn?{)`GV92b79dpp7}7gb=Y1lz1AW
zi737(kdT;I)CV9WCcJ12q?jmbc|#51L4|0H2}De)@lQzne)sk!{q1LVZg*yO=C|7~
zdT#XOf5?;`3X~C|hNzz!!mHSF3kOO^c?cEQiSuwh&cR{46GyQL-@^v{5+l5ZUSE+4
zp$;1p`*9ZMJ8?z``S22zY8u{5JchG5{}gY>2~6X!cpLtW^RaSzVSrXF<$N8M;Q(?;
z*ogdvAr21s4Bmlza48<fxr`saq2f%hq67bjw_*hcW*FupO`#DTxGix2olp*2@MT<p
zr_hy{NZS9vM$Q+~nG@(s%wZklhu5g|;Bl<NYv_`faIm8^w%~Gff=}Z@97V5xH}M3r
z>R}um@N4w`8^|0&^~?~mxCs4y6Xqi-`>41_M{yaRMVD+69k7%W+pE#7*nmFiR&2r-
z(XILrO`CCi0M8?TVKz6}e=WL2eYh3}(yV_am4h_+L}M7?IGSWvlJ>vQfvT8|ThNV8
zU<*dL2kqwwx*{jB70;n7_dC)>sL2$PycO-gKg0Ta<8~Sr;che;52H(W3hm$`E}24w
zi`ku!<?dQsiRR8WybJeYGmfEe#|8AsC(-NYF+2P1LMJ$!r{V<OMz$#&Lp%By?dUSj
z#WH4P2Mds<uo_LK&55JviX1}UhSTU$e}eplvmET_J9JB~qZ7>Eq|#5NfnVLjUFdh<
zEp%eX(d<8iCec^u3Ve%pa0R_D#WK`m1G-}U=$7rp#rS^Gejz#k2bpj_G_ax0ycfM;
z1lQmJ<eD&n&iH4{;v_D|dfq*DB@CgtvlCsJgXjZ%kerXB6ZjtQ!4hWcgRH;~-~V1J
zOK8}SUT_i}=qG##)ASbS2s*%ST!n8S4<F8>d-@}GU>Q$if8FQ<?7)rqI+}!+upNKH
zD&PMartd)Q=$^iU5sslr`8k?Izo0pg;v#cnG1@+ePWS~}fhW+3T}}Kq`8^Zy8K=Dm
z&9(iQXH~)hDn8jq=#8JDNq7-S+;9{9U}PBGrSHTk=&EcYhKOQufGvdgJwo_k-eYmB
zVsWC3m5<MRIr^l<@?cUK!IeaL@dsQ_nAtp3TwF>g=brk}apEjgob`if@r__N!^56X
zwigIbIlf;ki&?!ct`+jY>Q>@0qT3TnM7XCVge$g|xSQBaScZwEL@nW4MM}h<c8K4O
z)o7Bt{BBt*<HyCsSVi!mieDd+JT5ainmiezEp91fv(+bwX~g}+6U4oQ#bn$@tRaeJ
z0~KH6sl|rGLEqsNabMCf3(ev_!Xz6Y%x01`{vS|>#qubX$B8Z*QmJfnl-sfE`F&Ay
k_H<MEpVOzcM{ONlZJqDbS6-hH|NLw&_ng0`=PaxEA9jtg#sB~S

diff --git a/po/de.po b/po/de.po
index eaa9355c..e47e5e4e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\n"
 "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
 "Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n"
 "Language-Team: German <de@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/LR0.c:207
+#: src/LR0.c:208
 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
@@ -77,31 +77,31 @@ msgstr "Zustand %d enth
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:492
 msgid "conflicts: "
 msgstr "Konflikte: "
 
-#: src/conflicts.c:495
+#: src/conflicts.c:494
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d Schiebe/Reduziere"
 
-#: src/conflicts.c:499
+#: src/conflicts.c:498
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d Reduziere/Reduziere"
 
-#: src/conflicts.c:504
+#: src/conflicts.c:503
 #, c-format
 msgid "%s contains"
 msgstr "%s enthält"
 
-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduziere mit Regel %d (%s)]\n"
 
-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,12 +110,12 @@ msgstr ""
 "    $default\treduziere mit Regel %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduziere mit Tegel %d (%s)\n"
 
-#: src/conflicts.c:732
+#: src/conflicts.c:731
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"
@@ -129,12 +129,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s leitet ab"
 
-#: src/files.c:132
+#: src/files.c:138
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:151
+#: src/files.c:157
 msgid "cannot close file"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:633
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -274,11 +274,11 @@ msgstr "unerwarteter Typname am Ende der Datei"
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 
-#: src/lex.c:432
+#: src/lex.c:431
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
 
-#: src/main.c:108
+#: src/main.c:122
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"
@@ -287,7 +287,7 @@ msgstr "interner Fehler, %s\n"
 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"
 
-#: src/output.c:993
+#: src/output.c:987
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale Tabellengröße (%s) überschritten"
@@ -325,12 +325,12 @@ msgstr "    %-4s\tSchiebe und gehe zu Zustand %d 
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tFehler (nicht assoziativ)\n"
 
-#: src/print.c:190
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tgehe zu Zustand %d über\n"
 
-#: src/print.c:202
+#: src/print.c:200
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -339,23 +339,25 @@ msgstr ""
 "Zustand %d\n"
 "\n"
 
-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Grammatik\n"
 
-#: src/print.c:240
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "Regel %-4d %s ->"
 
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* leer */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""
 
-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -363,7 +365,7 @@ msgstr ""
 "Terminale und die Regeln un denen sie verwendet werden\n"
 "\n"
 
-#: src/print.c:302
+#: src/print.c:269
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -371,11 +373,11 @@ msgstr ""
 "Nicht-Terminal und die Regeln in denen sie verwendet werden\n"
 "\n"
 
-#: src/print.c:329
+#: src/print.c:295
 msgid " on left:"
 msgstr " auf der linken Seite:"
 
-#: src/print.c:344
+#: src/print.c:310
 msgid " on right:"
 msgstr " auf der rechten Seite:"
 
@@ -429,7 +431,7 @@ msgstr "
 msgid "unterminated `%{' definition"
 msgstr "unbeendete »%{« Definition"
 
-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
@@ -444,174 +446,174 @@ msgstr ""
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665
 #, c-format
 msgid "symbol %s redefined"
 msgstr "Symbol %s noch einmal definiert"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
 
-#: src/reader.c:544
+#: src/reader.c:542
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "»%s« ist in %s nicht erlaubt"
 
-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "mehr als eine %start Deklaration"
 
-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ungültige %start Deklaration"
 
-#: src/reader.c:583
+#: src/reader.c:581
 msgid "%type declaration has no <typename>"
 msgstr "%type Deklaration hat keinen <Typ-Namen>"
 
-#: src/reader.c:618
+#: src/reader.c:616
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ungültige %%type Deklaration wegen »%s«"
 
-#: src/reader.c:663
+#: src/reader.c:661
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "Stellenwertigkeit von %s wird erneut definiert"
 
-#: src/reader.c:687
+#: src/reader.c:684
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen"
 
-#: src/reader.c:697
+#: src/reader.c:694
 #, c-format
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"
 
-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "»{« hat kein Gegenstück"
 
-#: src/reader.c:796
+#: src/reader.c:793
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"
 
-#: src/reader.c:843
+#: src/reader.c:839
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 
-#: src/reader.c:867
+#: src/reader.c:863
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 
-#: src/reader.c:1010
+#: src/reader.c:1006
 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 
-#: src/reader.c:1015
+#: src/reader.c:1011
 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 
-#: src/reader.c:1020
+#: src/reader.c:1016
 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 
-#: src/reader.c:1188
+#: src/reader.c:1184
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "unbeendeter %%guard Fall"
 
-#: src/reader.c:1355
+#: src/reader.c:1351
 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:1362
+#: src/reader.c:1358
 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 
-#: src/reader.c:1393
+#: src/reader.c:1389
 #, 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:1495
+#: src/reader.c:1491
 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 
-#: src/reader.c:1503
+#: src/reader.c:1499
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 
-#: src/reader.c:1512
+#: src/reader.c:1508
 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 
-#: src/reader.c:1526
+#: src/reader.c:1522
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 
-#: src/reader.c:1532
+#: src/reader.c:1528
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
 
-#: src/reader.c:1576
+#: src/reader.c:1572
 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 
-#: src/reader.c:1584
+#: src/reader.c:1580
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s"
 
-#: src/reader.c:1587
+#: src/reader.c:1583
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
-#: src/reader.c:1611
+#: src/reader.c:1607
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "Symbol %s wird benutzt, ist aber nicht als Token definiert und hat keine "
 "Regel"
 
-#: src/reader.c:1716
+#: src/reader.c:1713
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
 
-#: src/reader.c:1728
+#: src/reader.c:1725
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"
 
-#: src/reader.c:1779
+#: src/reader.c:1771
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "Token %s und %s haben die selbe nummer %s"
 
-#: src/reader.c:1792
+#: src/reader.c:1783
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 
-#: src/reader.c:1794
+#: src/reader.c:1785
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"
@@ -800,6 +802,9 @@ msgstr ""
 msgid "'"
 msgstr ""
 
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* leer */"
+
 #~ msgid ""
 #~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
 #~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
diff --git a/po/es.gmo b/po/es.gmo
index eb3dc95e939e198ba365700ce2bd6451d82b1fee..e2aba02369f95bb1ab9b91045ee443dacf2b0f7c 100644
GIT binary patch
delta 2086
zcmYM#TZmOv7zgl`j+dOVbVi*lv*V?4Dld7NF|RY4SyMJ+7t_=ftX@ilqK63TU<8%v
zTSC!`6@(N<c_9)ZBBGa&l1QjD=)yb%M)hD2U4H*FduTD=`K`Uq-g~X}t+mel)$>tL
z{d{ZF!J_OG)5N5arPSFnx|Az8cC0qe;2d_dlRJ1VpJ$CnnEOw276&VvFD>PA*9+Lf
z9!}wgA?xKqm5Caj;#J(w2|Uaz`5~wBE2e`BY~q-4rHo<=HI-KSE7N?W!#TW$OSzbv
z+0K`k_q@r8nd&K(W(}vA5q?8|Wza`D{=KrrO&L%J=W-3N<{l;!`>Xb&>~Q@(Gl0=v
z8atTGtmj%j!pZtCM^wi16Xr!<axO12nVId&>FnlYZmN8gvRw8u9qwbEf1mm;XSsks
zR^PW>HnddBnSpF$y-TI8l9ZibI{cJrKg%q|cwc6w)7i<D%u+o}+obGeA77xqa>hqG
z_<>oX(O$BKEo@^yGof7*<iDn}S3@@08`T#dFdco(EWy9b0HzvUjZ2vqZDBI9oAdZA
zlezckk#dgN)EAidH@6NwSL00AOIqbWyK%FIq;3!Mf|r?&KV~}kwrc;4>1ev%Z{P-I
zZJ%WBe}&iaDD%GWsP8gD?^dBqVlp?ga&=uLsoKhn=o#k0*O}w?8EgEtYM)><BV2cL
zB$qKAtYT6>Kw~UBnfE=;l|0DVJi`p&B6DB8&GfTbI%vO@Ma*&PVU9^3v+H-Un@{sb
z9%t6@XJ*Dt&Q{vz^Lp-Njr%I!VKVkPH}OvzL%sCtB_n@`x#0<B#E0mHa*pZfkLtQr
zo;_PSncd&ZWU8<7F=isKvX^gh0SB3-Z8w|Tzm6+%{&%Y+g@>6APx3Z?!K7-ck8H*+
zW@bB>RKCdU{&(5W6U?S-vg4A8$;<%P^9~Ns9Lj6VfR1xv&i_v;vRJ0r;#sqKT*-~}
zRXM=Le497(JngG8Q(E%EZZ6>fm-0DgLZ_JLPcs?&g?VnI9h(WYvu@C(S0y9f&V@X{
z%ygB=%+`x!W|K%+BpT0gKr9nCi5+6ANV#8R64^`naat!*lCj}(ch-NnWW-6kjoz4*
z>^IW3g56@9$Sg9$H9``~4B<Db@#AwVmy4|J?c!e1Ba(rXjYBj}SE|YAy!8KoO4hR`
zwuqEuA)7Mmm$F^lBC<iV#!25eaf!H7<ZNf@QtlJ?G;05UWO*gEv60i-C31Wl^Uv|g
zj!l^_vc|(@b5&W(tg%hp_*dOrwXbH*@tEp*1GBmA5~HfNrpjTm2S!vE?OFGfSwl3A
Si0ZMfu_wnJ`@8j@mj3|O|DSmP

delta 2146
zcmX}sZD>|y7{KwXz2r7GovY<Et7A)DbL*+LS=-EQmYKS?+)FQ(OKpP^>_sfl22Ui5
zYJMo9FqP<|Uu;4pxi3mk;J1WcK3EpL2|}d=5oFl^f1a~$cI|hc`#I;__qp!toD*ID
zbmh<1l)N3ZEyN<DIAX6}8Bv7|Wf66_0<Xq?T!y3AfctO>evAp8LC?R0^;lb8upQ@e
zycsKT2VN7Ak3EG>yovMp;V@o{(^!pP<3c=#3$Uo7Fu@`$;kXS;u>(0Jx{<$F&p#&|
z#v5=9TW|vB<8iEG{y0s?iO=I~yo9c>j03t+i%y(mcAyIy!X|tMufs!VCZ@CTA8;wh
zRou)4v}O*Wnc0P_nLqZ^sl_vB$}gffx{OV@gh3ZLfY;+Fdj8(bcadzz6guH2==I+t
zYlzZ05jmWP{@#NLK8bl(@*15sJc6d|Cv?I;v++^}-HJ~1NqeyYx1(G27E&%Th3oJb
z@|RxZ{j0gyEo#Lc?7*vVyqf&`L~k&V;1pV9U!dc^pc9p_8n>VsUBFsQa16cCD`-Xz
zU^5;?Gj|rbMa-_riW|LuJ9=GT4f(&3&Nc?9#+X1;cL=?~r$`p#4|D<lq7%*MYJYD=
zC)|X~@l|xMKSIy{5^u)e(fighJ8Ozn=zSl^(=ml3nS0Qby@M`n8ols4^tCHy_5_!s
z<GomfJFys_M<>{gZowq7<~WGn?*m+kr|~At&*8CMKnr?eKUy@~uo9m}U#l0<_j&@Y
z{`YVN9>-hp0=i|3dAEGxZghM*HsV1{@bk=bNXGI}#$AW`p%qzFypFE?eKe&<(G`E2
z{l0*_I#CWizYn=rjG}MBIGU-6%p>T7e1+ZkBj&K4r)cv1AEe_2FJUJhMpO7RI>BFf
zA6AkkGd0XVi}E@2$qt~Y{0w~y&SM{5M2oMR&#IZ&h%WGD+<=o<=llN+9anS#Z^MKV
zCz~;V?%7kg689me#3^jSU-52SNIIym7(tR0JFyif@eVwRKG5Ij^%Yd88C!;VFYKb@
z6AdDZj&XFw`_ToR!rRgM*hp+5X4;)}9wNL?KXE_NM%c*o|IJ$Qp=_&(#c9v{(|QXB
zu?0JcS=q7NOZc5<@o95GR=%HRx5b5%h;*xl(dL`LuBF@H@reIuj}oP6uTbP`viZ|=
zI{p|jNZjQCjR#Ltbp`SUrUm3y4H34-3#66pm(T3=WMlQXim<jUz*~qW!Zw$1ORIf;
ztK5CFr5^=!zuW?wMP_@1u)x+54-*}P&Enfkba{|93(VKHXl5XDDO!ZqjcpB|__Rpw
zLEqc;gkLlZ#Uio*XW9Ur2Z?r~ygb*KjO}=K*Y2b-_u;Iv>58g!=!LCM{I=DhlQows
F{{s$gtV#d?

diff --git a/po/es.po b/po/es.po
index 39d0a9d9..e0fd5cd9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\n"
 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/LR0.c:207
+#: src/LR0.c:208
 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
@@ -111,7 +111,7 @@ msgstr "El estado %d contiene"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:492
 msgid "conflicts: "
 msgstr "conflictos: "
 
@@ -127,7 +127,7 @@ msgstr "conflictos: "
 # ok
 # ngp
 #
-#: src/conflicts.c:495
+#: src/conflicts.c:494
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"
@@ -144,22 +144,22 @@ msgstr " %d desplazamiento(s)/reducci
 #
 # ok
 # ngp
-#: src/conflicts.c:499
+#: src/conflicts.c:498
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"
 
-#: src/conflicts.c:504
+#: src/conflicts.c:503
 #, c-format
 msgid "%s contains"
 msgstr "%s contiene"
 
-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduce usando la regla  %d (%s)]\n"
 
-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -168,12 +168,12 @@ msgstr ""
 "    $default\treduce usando la regla %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduce usando la regla  %d (%s)\n"
 
-#: src/conflicts.c:732
+#: src/conflicts.c:731
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduce usando la regla %d (%s)\n"
@@ -192,12 +192,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s deriva"
 
-#: src/files.c:132
+#: src/files.c:138
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:151
+#: src/files.c:157
 msgid "cannot close file"
 msgstr ""
 
@@ -271,7 +271,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:633
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -342,11 +342,11 @@ msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 
 # ¿multicarácter o multicaracteres? sv
-#: src/lex.c:432
+#: src/lex.c:431
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "use \"...\" para terminales literales multicarácter"
 
-#: src/main.c:108
+#: src/main.c:122
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"
@@ -360,7 +360,7 @@ msgstr "Entrando set_nullable"
 # en inglés era así, pero quizás en español sea mejor como dices
 # ngp
 #
-#: src/output.c:993
+#: src/output.c:987
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "excedido el tamaño máximo de la tabla (%s)"
@@ -398,12 +398,12 @@ msgstr "    %-4s\tdesplazar e ir al estado %d\n"
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terror (no asociativo)\n"
 
-#: src/print.c:190
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tir al estado %d\n"
 
-#: src/print.c:202
+#: src/print.c:200
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -412,28 +412,25 @@ msgstr ""
 "estado %d\n"
 "\n"
 
-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Gramática\n"
 
-#: src/print.c:240
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regla %-4d %s ->"
 
-# Duda: ¿Estás seguro de que no será `vacío'? Si no lo estás o, si por
-# el contrario, pudiera cualquiera de los casos, debieras traducirlo
-# como `vacía/o' - cll
-# según el código indica reglas vacías por eso lo puse así
-# ngp
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* vacía */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""
 
-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -441,18 +438,18 @@ msgstr ""
 "Terminales con las reglas donde aparecen\n"
 "\n"
 
-#: src/print.c:302
+#: src/print.c:269
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
 "\n"
 "No terminales con las reglas donde aparecen\n"
 
-#: src/print.c:329
+#: src/print.c:295
 msgid " on left:"
 msgstr " en la izquierda:"
 
-#: src/print.c:344
+#: src/print.c:310
 msgid " on right:"
 msgstr " en la derecha:"
 
@@ -506,7 +503,7 @@ msgstr "$%s de `%s' no tiene tipo declarado"
 msgid "unterminated `%{' definition"
 msgstr "definición `%{' sin terminar"
 
-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
@@ -521,41 +518,41 @@ msgstr ""
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665
 #, c-format
 msgid "symbol %s redefined"
 msgstr "redefinido el símbolo %s"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"
 
-#: src/reader.c:544
+#: src/reader.c:542
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' no es válido en %s"
 
-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "múltiples declaraciones de %start"
 
-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "declaración de %start no válida"
 
-#: src/reader.c:583
+#: src/reader.c:581
 msgid "%type declaration has no <typename>"
 msgstr "la declaración %type no tiene <nombre-tipo>"
 
-#: src/reader.c:618
+#: src/reader.c:616
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "declaración de %%type no válida debido al ítem: `%s'"
 
-#: src/reader.c:663
+#: src/reader.c:661
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redefinición de la precedencia de %s"
@@ -564,7 +561,7 @@ msgstr "redefinici
 # 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:687
+#: src/reader.c:684
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
@@ -574,18 +571,18 @@ msgstr ""
 # 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:697
+#: src/reader.c:694
 #, 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:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "`{' desemparejada"
 
-#: src/reader.c:796
+#: src/reader.c:793
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "el argumento de %expect no es un entero"
@@ -596,26 +593,26 @@ msgstr "el argumento de %expect no es un entero"
 # - cll
 # ok - ngp
 #
-#: src/reader.c:843
+#: src/reader.c:839
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "no se reconoce el ítem %s, se esperaba un identificador"
 
-#: src/reader.c:867
+#: src/reader.c:863
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 
-#: src/reader.c:1010
+#: src/reader.c:1006
 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 
-#: src/reader.c:1015
+#: src/reader.c:1011
 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 
-#: src/reader.c:1020
+#: src/reader.c:1016
 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
@@ -624,93 +621,93 @@ msgstr "car
 # mejor que `sin terminar' que me parece más "computerizado" - cll
 # quizás un poco cacofónico lo de claúsula inconclusa - ngp
 #
-#: src/reader.c:1188
+#: src/reader.c:1184
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "cláusula %%guard sin terminar"
 
-#: src/reader.c:1355
+#: src/reader.c:1351
 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:1362
+#: src/reader.c:1358
 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 
-#: src/reader.c:1393
+#: src/reader.c:1389
 #, 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:1495
+#: src/reader.c:1491
 msgid "two @prec's in a row"
 msgstr "dos @prec en una línea"
 
 # 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
-#: src/reader.c:1503
+#: src/reader.c:1499
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 
-#: src/reader.c:1512
+#: src/reader.c:1508
 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 
-#: src/reader.c:1526
+#: src/reader.c:1522
 #, 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:1532
+#: src/reader.c:1528
 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:1576
+#: src/reader.c:1572
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 
-#: src/reader.c:1584
+#: src/reader.c:1580
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %s"
 
-#: src/reader.c:1587
+#: src/reader.c:1583
 msgid "no rules in the input grammar"
 msgstr "no hay reglas en la gramática de entrada"
 
 # `token' se debe traducir como `literal' - cll
 # en terminología de compiladores token es más un terminal - ngp
 #
-#: src/reader.c:1611
+#: src/reader.c:1607
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "se usa el símbolo %s, pero no está definido como terminal y no tiene reglas"
 
-#: src/reader.c:1716
+#: src/reader.c:1713
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 
-#: src/reader.c:1728
+#: src/reader.c:1725
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 
-#: src/reader.c:1779
+#: src/reader.c:1771
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "los terminales %s y %s tienen asignados ambos el número %s"
 
-#: src/reader.c:1792
+#: src/reader.c:1783
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 
-#: src/reader.c:1794
+#: src/reader.c:1785
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"
@@ -935,6 +932,14 @@ msgstr ""
 msgid "'"
 msgstr ""
 
+# Duda: ¿Estás seguro de que no será `vacío'? Si no lo estás o, si por
+# el contrario, pudiera cualquiera de los casos, debieras traducirlo
+# como `vacía/o' - cll
+# según el código indica reglas vacías por eso lo puse así
+# ngp
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* vacía */"
+
 # ¿Por qué no lo pones en mayúsculas? Al fin y al cabo, eso es lo que
 # haces luego con "FDERIVES" que traduces como "FDERIVACIONES", ... -
 # cll
diff --git a/po/et.gmo b/po/et.gmo
index d97ad84e5e6f32daf5247f79681345a985ae4c62..7a9ac05f07eea7c306e8dd9f0e7da58534eefa03 100644
GIT binary patch
delta 3226
zcmYk;dra0<9LMo53L*)DfS2(0!$6P(0dI+!h?HmqN}7fjB(TgYhLn-|Q@m0tBBi-9
zn_1TUL!FpoIftqJk)><amj7g=S*^5e*qWL3{yZEu&-(H@=l49%xqQz#KigUH>r(%_
z=-@Yu(m?bf8iUQwVtyEZD09QjdSNNXVl^gV9VX*(OvLZe!%h)x-%r8^XlFaiF_QLX
z<g4~3_AvA9{kDpoz;1kS5qsm07==My&EhZ`@5fZsgeD+!wYeCA^H6hMi1%R?YQQzv
zAGf22hj9RYg+m$NTB&HjWWL=Kb5R4#LQSX&yWl3&%o|Vxyo=1y4x%#BgqmOrs-J&c
zJBC$g0jW3`^RO>gVIt#OgZrQfQ)ypA4`Ug9APz^ZV3u<wDz$H85H@2Dev0`R5^WZW
zMc5sSF%v7?^Y^fh_CfShsEm#=+l|j+fqG=4k6<CcW{)h0<s@J))QZQT_WW_wik2Z`
z+dHV09Y$s3Jnq83Pz%{cT6Knwp)&q?FY>P$UgH6~V0W+|b|H^?o`RZBwrl60emDa=
z<8oBTt56;9M@^&&_4{+~^A^;EJF^ek$}}8;S#jiF9W3C1R#uN5?nR}z8HeLlWIHX6
z(Uq|jRA#2323&;t-fHx)5!pri23eC`bM6078H(bn>Gq`gRCs37u@hF}M65;)cm_3*
zuTiJ`Z`8`~;y4VYH+Ib?Vj9lIp|}N=$!7HMGHO6QWH)ROYGVF4DkG^Bqf)p7`OgmU
zM?d%s$)5d=^kHF~L=Tft8OTFTpahljO4K2)MctO;s55c~m64lBGOdFbc;EQemx>0?
zLUmM#x}RmJ0XCxcZV#%X)2Ms?2POoW-9~lTpC8FAR0gKuFswzL{*$Ofd=vG(9;9`M
z?tcaqeNc+r2-}D{jJr{(`q0^o@wC6i2k|y4BLn%dPJ1p6!bPYF@5GLH0)w#`HSx2~
z3mD1xc8Lm;vR{xsEu3F#FVistOOUKtJ+kd~1hqxyQ4_q5I@KYZWTm_t>IK!$wFjZL
zas+D6OHi3zfxaqrRFskrP!l<Y`r=j8K>xbueORU@I2Lti%TN>ZQD<bYvk5ieMP!HU
z4vxpWSb#Zv7>f1D?*8xQfezsz)XaZEy`la@WuS(<?!rb)rN?~k-~p^=AGCl0oVXD<
z3UwVTP-mb9b!I+B9lk551+}{8F=^z#h6mZ?TYGmJ)!}v2ih_AdXr=v7hcgS+L4j*8
zMy+ry>U--jkO>T?-Gm;VL>=<WsLZyawl2a?H+zUmBC=SUgWAJQ?)mHJ(f$%6@dj!F
zcTp?uOL`v0sThUzsDAdL1~`Y^@CxdCw~$@1Os+%(`o&Z<^ZBTiuSf0aTgVvpiEICc
zU1^7t*D2T=)$w9f=6uxFeT3TEMtl-apodZ1MY^yI)Pl>A3Hr8&iVoE=_k~NSYZcD>
zRHk4q=3y*uMP*<gYHv@u_6^j;BS?!5aVkdRWYq7<Fa}q+&$nQh?*AbwY_~O`QvWk*
z4{xEaTja>LH``#;7UZBZR)p$!33|8=mE!#vhAkL`n+UqHEkpsam6%Sb=-(f!CX|7v
zi0wps(JC5Tqa2qK+7eA7kJv%9m#MCz1!&dF+CRV{1Q#Yy^y2E^>Lkqkdj4b(x&<mZ
z#8{%1c!^M1OK6XkZteL7LMwcgm`tdwAYLRo5i1E6AJ~pjsFFo=CX{Ivot2H+|Mh`p
z+bdYrc-L-c0+mIC-f->Z2`U{4U8N{u48c1}yJ^o6DqQivfu4fJgs!6w@LWO%bTu(f
zznDoy2Wl0ek{$TV{|(_fBFVL1aaLdzQRdqBvYf^e_n;>}Pdx3~x|X^DI#arObwsRY
z{0yP8kkFNxMr<QW30;*Jh&9A!!Xs3M5jvzQ`NW(+jsGRX5F*#L7ds!rS;T0fyL+|(
zeg5sRLPA$<2B8!DGSOa2sBnb?S4YoYBZ^eHr;MjwN$6HgbkFBIAHhe7NyKbo9uX)W
eCBZwoA^bvY=rAuMJu5S_VP^afM<)&VqWk~M6(&3Y

delta 3263
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
C=PXqK

diff --git a/po/et.po b/po/et.po
index c501dc19..b6221ba7 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28d\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\n"
 "PO-Revision-Date: 2001-08-29 17:06+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/LR0.c:207
+#: src/LR0.c:208
 #, c-format
 msgid "too many states (max %d)"
 msgstr "liiga palju olekuid (maks %d)"
@@ -76,31 +76,31 @@ msgstr "Olek %d sisaldab"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:492
 msgid "conflicts: "
 msgstr "konfliktid: "
 
-#: src/conflicts.c:495
+#: src/conflicts.c:494
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"
 
-#: src/conflicts.c:499
+#: src/conflicts.c:498
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"
 
-#: src/conflicts.c:504
+#: src/conflicts.c:503
 #, c-format
 msgid "%s contains"
 msgstr "%s sisaldab"
 
-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 
-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -109,12 +109,12 @@ msgstr ""
 "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 
-#: src/conflicts.c:732
+#: src/conflicts.c:731
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
@@ -128,12 +128,12 @@ msgstr "DERIVES"
 msgid "%s derives"
 msgstr "%s derives"
 
-#: src/files.c:132
+#: src/files.c:138
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"
 
-#: src/files.c:151
+#: src/files.c:157
 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"
 
@@ -231,7 +231,7 @@ msgstr ""
 "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
 
-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:633
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ei ole enam toetatud"
@@ -295,11 +295,11 @@ msgstr "l
 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"
 
-#: src/lex.c:432
+#: src/lex.c:431
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
 
-#: src/main.c:108
+#: src/main.c:122
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: sisemine viga: %s\n"
@@ -308,7 +308,7 @@ msgstr "%s: sisemine viga: %s\n"
 msgid "Entering set_nullable"
 msgstr "Entering set_nullable"
 
-#: src/output.c:993
+#: src/output.c:987
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ületati maksimaalset tabelisuurust (%d)"
@@ -346,42 +346,44 @@ msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
 
-#: src/print.c:190
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tliigu olekule %d\n"
 
-#: src/print.c:202
+#: src/print.c:200
 #, c-format
 msgid "state %d"
 msgstr "olek %d"
 
-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230
 msgid "Grammar"
 msgstr "Grammatika"
 
-#: src/print.c:240
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "reegel %-4d %s ->"
 
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* tühi */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""
 
-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245
 msgid "Terminals, with rules where they appear"
 msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
 
-#: src/print.c:302
+#: src/print.c:269
 msgid "Nonterminals, with rules where they appear"
 msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
 
-#: src/print.c:329
+#: src/print.c:295
 msgid " on left:"
 msgstr " vasakul:"
 
-#: src/print.c:344
+#: src/print.c:310
 msgid " on right:"
 msgstr " paremal:"
 
@@ -435,7 +437,7 @@ msgstr "$%d `%s' ei oma deklareeritud t
 msgid "unterminated `%{' definition"
 msgstr "lõpetamata `%{' definitsioon"
 
-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Enneaegne EOF peale %s"
@@ -450,171 +452,171 @@ msgstr "s
 msgid "symbol `%s' given more than one literal string"
 msgstr "sümbolile `%s' on antud enam kui üks literaal sõne"
 
-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665
 #, c-format
 msgid "symbol %s redefined"
 msgstr "sümbol %s on uuesti defineeritud"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"
 
-#: src/reader.c:544
+#: src/reader.c:542
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ei ole %s sees lubatud"
 
-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718
 #, c-format
 msgid "multiple %s declarations"
 msgstr "korduvad %s deklaratsioonid"
 
-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264
 #, c-format
 msgid "invalid %s declaration"
 msgstr "vigane %s deklaratsioon"
 
-#: src/reader.c:583
+#: src/reader.c:581
 msgid "%type declaration has no <typename>"
 msgstr "%type deklaratsioonis puudub <tüübinimi>"
 
-#: src/reader.c:618
+#: src/reader.c:616
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "vigane %%type deklaratsioon, element: %s"
 
-#: src/reader.c:663
+#: src/reader.c:661
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s prioriteedi uus definitsioon"
 
-#: src/reader.c:687
+#: src/reader.c:684
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
 
-#: src/reader.c:697
+#: src/reader.c:694
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"
 
-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161
 #, c-format
 msgid "unmatched %s"
 msgstr "puudub %s"
 
-#: src/reader.c:796
+#: src/reader.c:793
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect argument ei ole täisarv"
 
-#: src/reader.c:843
+#: src/reader.c:839
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "tundmatu element %s, eeldasin identifikaatorit"
 
-#: src/reader.c:867
+#: src/reader.c:863
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "eeldasin %s asemel sõnekonstanti"
 
-#: src/reader.c:1010
+#: src/reader.c:1006
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tundmatu: %s"
 
-#: src/reader.c:1015
+#: src/reader.c:1011
 msgid "no input grammar"
 msgstr "sisendgrammatikat pole"
 
-#: src/reader.c:1020
+#: src/reader.c:1016
 #, c-format
 msgid "unknown character: %s"
 msgstr "tundmatu sümbol: %s"
 
-#: src/reader.c:1188
+#: src/reader.c:1184
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "lõpetamata %guard klausel"
 
-#: src/reader.c:1355
+#: src/reader.c:1351
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
 
-#: src/reader.c:1362
+#: src/reader.c:1358
 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"
 
-#: src/reader.c:1393
+#: src/reader.c:1389
 #, 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:1495
+#: src/reader.c:1491
 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 
-#: src/reader.c:1503
+#: src/reader.c:1499
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
 
-#: src/reader.c:1512
+#: src/reader.c:1508
 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 
-#: src/reader.c:1526
+#: src/reader.c:1522
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
-#: src/reader.c:1532
+#: src/reader.c:1528
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
-#: src/reader.c:1576
+#: src/reader.c:1572
 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 
-#: src/reader.c:1584
+#: src/reader.c:1580
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
 
-#: src/reader.c:1587
+#: src/reader.c:1583
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
-#: src/reader.c:1611
+#: src/reader.c:1607
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad "
 "reeglid"
 
-#: src/reader.c:1716
+#: src/reader.c:1713
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 
-#: src/reader.c:1728
+#: src/reader.c:1725
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
 
-#: src/reader.c:1779
+#: src/reader.c:1771
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
 
-#: src/reader.c:1792
+#: src/reader.c:1783
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"
 
-#: src/reader.c:1794
+#: src/reader.c:1785
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"
@@ -789,6 +791,9 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* tühi */"
+
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "korduvad %%header_extension eklaratsioonid"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 2cc4b24e2c385bb1fc2eb14effff75685b605be0..47dd50648e04358d7af7fb7261cfdc3ecce911bb 100644
GIT binary patch
delta 3226
zcmYk;e@vBC9LMo51Ooo#mx`A9pb|=gD3XbZf+&clX^})47@9w@)D#mEFNK1d3BsH@
zf8;dhA8yUmVw5W^b!DxV)=J$px1?!X*5=B}Y46Xy=WadY%j=wnd(U&u_k7QzyH@{N
z>AMmew%xc|h=+(1VP<D=S`@#y%DS2*;5>}SYD~sP9D=Qwgg>E&ow@}+pNxa(PjJr1
z9`rXNAGMv>%gkqo0u4KfG5p~IK8V*b8bi99^~G51gQ=(q<s);oG7QHBs5w_)XRJg$
zuoeek6MA?Q2jaJw!Sn4l4LxuOpYDx$s0YkJO{fyPU;}FAEvN_VN9JfpP#I}MP4F6O
zoPS+Ej#X#@sW=P^upd@p63@35_lGu2rQd-b#`E-tF%z|dInK4H)b7C$Y{y*u6sKW$
ztXTxk!k$=yBXPOAe-In#A3<LVjj?fNyYNMvt`XVj_izT^W{)g{<qXCI)QZQU_IxU8
zMJteJ+dkCFj-oR1HSWMaQ485hT2({uqcVOjf&6QR9o%3S>@N1lF62@7Q&97n;QG0!
zFBW4Yu0jo5gBti9)I{1)-~ZD6{Tgb*k?e!EG7X1gR$ub30hVw>E8B)1zKu$8J7(g~
z$aY#^p013gpfXd0df-yj=hmTzCy-sV?~yfGhwI-*Whk1Xrqh$=qrp9!jh%2MPQhx_
z15cwS@*S$m@1RzG4|6br(bzScf@wGxGjIzklkMo?Rn!A@lijePsEPS<XpE*&f=XdC
z@?(ejr7xUCvS+uDF)WHo^e`EffdbS7N>M3ai7MhvsMFGls*%&EjQoKl(?UJ}`^IPe
zXz0ONsDWmn&SyF50rjZ8+lw0LGt@c%9kWBs{y}AM3}4a&itrJvKz)7(4#m@$h`*se
zA5B_^===|(p=vEc?PU$B78;Q(+g|5~sMP&{9^OJtFq)&mqAVGep?v28e1Lu(hG7Hh
zy|Kl)1LJtU9iYKj_JQ*fswnT_I80*snn*b+b+xDm?sk5Js_M(Al>dUt&}~#k@1f3r
zEQ9L%lTZsOL)D+Hp`l{fj!NCTsQZ_YAN$MQ?@yXkWQC|yR-sb68#SRb&g-Ze2&aJ9
zA<Mvg%*1I}gAsU6`PWR&b7K<TM9n;%QBPqOj>5Zm7)NmS7Bk{S%nUV~$Of~WR>iEe
z!ab-{^9}M9yNX#D#bM`VXL+dS&Bk<GHk|yo(b&%oeyoJM`oLz?DLCNzr!boSMR)%u
zs@S4N1XefzwfBjrOpZtGbup?4%TYz%ggQ-!P~(5%qwyGxE68N6H_Ol$C!<zA6ZK-L
z#~yeRwMAbcNw7OO76)<Y$-0$dHa4I#a~3tx8(4_<QJE=ZaE<3%MME=Mk1CFRsF}5)
zCiWw;D;C2nqA&}ez&un&nvwdlgBXclp!W7W7U3m~!}Lc33(7+kbrmvUpS9A^1Fj;U
zwaC$de{8Z*D=0^Pte#&Q=wnn-o=4_pf1}QG8ne~+3$ZuWq87FjWAPaF#4|_|?6SYl
z{`VLYD4rx#N{UgLScG|4haP_Jynz~^GnJ+L*~nN{in+KGHO^(ER;__xZMKD&PP|3T
zCUoiFAFC#G{+}V5h~TBwx46!HTt-lL{=o~dnFwA_yGB>kYF7mRfWryZiZ0bosJ|7+
zmTwy!YR}$qH?@NC#3tfZckgvn(WsJRhz*2lVKeb0p=%AXn&?EVCD;}JJAq{RFOuP}
z4;8tt&P2WTf4#pO*mE@#T|Y=ZjirR%aKTFjs8?$Op(0d4sV0=og@i7>fO-)#i4r1=
z=uVUo5yUzoN8fmkhAO^>&^5vToBs`A9g*z%uQ``vB~kAB|7R7Qm)#8&;bP)h*H@8q
zTK#X<ZrDh~YsN1Sx+;jLh$3PuF^^DTy+YIy8wrolrONN)Zv|ed&%5?i3@7qj|0U;S
zoI~hcp;Mr13E|V(ok8gBRZKiiR1v|el!mH3&fRzuXSsHei8NLcI)+o+%|*^^oJ157
lbBP6n|MIv7d&f6)y$~NU${UfMHF9K2Y2uyZ3kM!c_zzwgDUbjF

delta 3266
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
L`ao{l;l%#|Yq%{s

diff --git a/po/fr.po b/po/fr.po
index d2615bf4..4c244e2b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28d\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\n"
 "PO-Revision-Date: 2001-08-29 20:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/LR0.c:207
+#: src/LR0.c:208
 #, c-format
 msgid "too many states (max %d)"
 msgstr "nombre trop grand d'états (max %d)"
@@ -78,31 +78,31 @@ msgstr "L'
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:492
 msgid "conflicts: "
 msgstr "conflits: "
 
-#: src/conflicts.c:495
+#: src/conflicts.c:494
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"
 
-#: src/conflicts.c:499
+#: src/conflicts.c:498
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"
 
-#: src/conflicts.c:504
+#: src/conflicts.c:503
 #, c-format
 msgid "%s contains"
 msgstr "%s contient"
 
-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[réduction par la règle %d (%s)\n"
 
-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -111,12 +111,12 @@ msgstr ""
 "    $défaut\tréduction par la règle %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tréduction par la règle %d (%s)\n"
 
-#: src/conflicts.c:732
+#: src/conflicts.c:731
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $défaut\tréduction par la règle %d (%s)\n"
@@ -130,12 +130,12 @@ msgstr "D
 msgid "%s derives"
 msgstr "%s dérive"
 
-#: src/files.c:132
+#: src/files.c:138
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne peut ouvrir le fichier `%s'"
 
-#: src/files.c:151
+#: src/files.c:157
 msgid "cannot close file"
 msgstr "ne peut fermer le fichier"
 
@@ -237,7 +237,7 @@ msgstr ""
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:633
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' n'est plus supporté"
@@ -301,11 +301,11 @@ 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"
 
-#: src/lex.c:432
+#: src/lex.c:431
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
 
-#: src/main.c:108
+#: src/main.c:122
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: erreur interne: %s\n"
@@ -314,7 +314,7 @@ msgstr "%s: erreur interne: %s\n"
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 
-#: src/output.c:993
+#: src/output.c:987
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "taille maximale de la table (%d) dépassée"
@@ -352,42 +352,44 @@ msgstr "    %-4s\td
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terreur (non-associatif)\n"
 
-#: src/print.c:190
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\taller à l'état %d\n"
 
-#: src/print.c:202
+#: src/print.c:200
 #, c-format
 msgid "state %d"
 msgstr "état %d"
 
-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230
 msgid "Grammar"
 msgstr "Grammaire"
 
-#: src/print.c:240
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "règle %-4d %s ->"
 
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* epsilon */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""
 
-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245
 msgid "Terminals, with rules where they appear"
 msgstr "Terminaux, suivis des règles où ils apparaissent"
 
-#: src/print.c:302
+#: src/print.c:269
 msgid "Nonterminals, with rules where they appear"
 msgstr "Non-terminaux, suivis des règles où ils apparaissent"
 
-#: src/print.c:329
+#: src/print.c:295
 msgid " on left:"
 msgstr " à gauche:"
 
-#: src/print.c:344
+#: src/print.c:310
 msgid " on right:"
 msgstr " à droite:"
 
@@ -441,7 +443,7 @@ msgstr "$%d de `%s' n'a pas de type d
 msgid "unterminated `%{' definition"
 msgstr "La section de définition (%{) ne termine pas avant la fin du fichier"
 
-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Fin de fichier prématutée après %s"
@@ -456,172 +458,172 @@ msgstr "symbole `%s' utilis
 msgid "symbol `%s' given more than one literal string"
 msgstr "symbole `%s' présent dans plus d'une chaîne litérale"
 
-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
 
-#: src/reader.c:544
+#: src/reader.c:542
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' n'est pas valide dans %s"
 
-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718
 #, c-format
 msgid "multiple %s declarations"
 msgstr "multiples déclarations %s"
 
-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264
 #, c-format
 msgid "invalid %s declaration"
 msgstr "la déclaration %s n'est pas valide"
 
-#: src/reader.c:583
+#: src/reader.c:581
 msgid "%type declaration has no <typename>"
 msgstr "la déclaration %type n'a pas de <nom_de_type>"
 
-#: src/reader.c:618
+#: src/reader.c:616
 #, 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:663
+#: src/reader.c:661
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redéfinition du niveau de priorité de %s"
 
-#: src/reader.c:687
+#: src/reader.c:684
 #, 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:697
+#: src/reader.c:694
 #, c-format
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 
-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161
 #, c-format
 msgid "unmatched %s"
 msgstr "non appariement de %s"
 
-#: src/reader.c:796
+#: src/reader.c:793
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "le paramètre de %%expect n'est pas un entier"
 
-#: src/reader.c:843
+#: src/reader.c:839
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"
 
-#: src/reader.c:867
+#: src/reader.c:863
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 
-#: src/reader.c:1010
+#: src/reader.c:1006
 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 
-#: src/reader.c:1015
+#: src/reader.c:1011
 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 
-#: src/reader.c:1020
+#: src/reader.c:1016
 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 
-#: src/reader.c:1188
+#: src/reader.c:1184
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "clause %guard non terminée"
 
-#: src/reader.c:1355
+#: src/reader.c:1351
 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:1362
+#: src/reader.c:1358
 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 
-#: src/reader.c:1393
+#: src/reader.c:1389
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
-#: src/reader.c:1495
+#: src/reader.c:1491
 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 
-#: src/reader.c:1503
+#: src/reader.c:1499
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 
-#: src/reader.c:1512
+#: src/reader.c:1508
 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 
-#: src/reader.c:1526
+#: src/reader.c:1522
 #, 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:1532
+#: src/reader.c:1528
 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:1576
+#: src/reader.c:1572
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 
-#: src/reader.c:1584
+#: src/reader.c:1580
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"
 
-#: src/reader.c:1587
+#: src/reader.c:1583
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
-#: src/reader.c:1611
+#: src/reader.c:1607
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas "
 "de règle"
 
-#: src/reader.c:1716
+#: src/reader.c:1713
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 
-#: src/reader.c:1728
+#: src/reader.c:1725
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "les valeurs d'association de %s et %s entrent en conflit"
 
-#: src/reader.c:1779
+#: src/reader.c:1771
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "les jetons %s et %s se sont vus assigner le nombre %d"
 
-#: src/reader.c:1792
+#: src/reader.c:1783
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 
-#: src/reader.c:1794
+#: src/reader.c:1785
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"
@@ -796,6 +798,9 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* epsilon */"
+
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "multiples déclarations %%header_extension"
 
diff --git a/po/ja.gmo b/po/ja.gmo
index 9ab1f8e4f8cf7f7330fce16096f71106823215dd..f677ff045b1ae9d94d9fbfe9a679e265bcee5e01 100644
GIT binary patch
delta 2204
zcmYk-UrbhI9Ki9P`358}CMaZK@&*x_8UhlAN`fU?mb_L%+8@F$YTaPVZqmKva{bw&
z%#p1N)Hb5IoLj7|o62g-8(dd%Q&gL4m2T#mW~;6B{l4#U^V#{G&pGEk=RCjjd!7fr
z?0mN~_hUtBBxpN`1;mP(5wGK>B6hUFl8E`Z6X)R@*no#{5uU_)ynq?3x~_148`g2&
zllTH&&-r_p#*eTnA{U<)4q_6^`QZ#!<0YJf<+CDg!dko$*PsdYVhRWGTHJ*^5-%ZJ
z>|<w#Z(|J}#uhw*H{eB_PydlFEp%LuY|+Nf4A&v|L=W2WcJ#qr$@!aTV&k|Jzs8&K
z540j>yu|A*xD5L-gTr_m9>*H`k0}rEFSKM;Wf5K2j+M9v+2Q~@Uwj0Y;z_h(7jYpL
z%`V(upSTJcmB^wUZbP4c8ObrmG1th!L~_F!%y2%7x|zrlY{kvU7W>%Q;Yf0Q937%*
z^vlnqb0W<}hp-i$Mp@j5eaJ2G0s8(==1_mfZi)+?_yf+xh4kVVHDd;|=;V7ox&A8J
z(TC{Je1|6RJ7%!BqVS$YXa!f}GTeezZV2frj#W^9XZ;sku!HZ>1TJ7LrZ{1iMgv;9
z4)g_2W8;j7{pfRFvC}Dbi}4)Zj+ON8YFUdW`V4yCUi5tja~#;w=g2U|&&V{0^T-ze
zCYF<hzc(Ns8Len3yOA8C7yY8=klbT87UNs!5FAV#O&mkE$bHP-vG@j8;jd^ybxd_L
zUXLcyk1nql(H9S)iM)oE{(Ur&&(N`-M8EJiv?8-vvrh7rXhr&v>$w=>z)~GWJ3gJ<
z@ONT{EPP-C-im|Rh9k(k;}lx4U(o0OMCV2&Ytu?}pdDw?3hhJ_+>1r7|4|NH9%E=C
zlldPaF5{h?|A&rwD^Kz67(hGNjV3aN4$U;OfZ`nb+&^fCO-wM~--SN+ESmT`n4<qU
z%E5L#j*e+5^>nsYqhq%bd$0#x6-N?JpcVNkF~yH2x)^<aE1K{tcn6N6Lvae7gqJaA
z#%b!a1go(XyV1<|Aos*DG8%CVnI7>i`od|n<mn7c6&tYy2av^)|LY0ykUQEvgdf`F
z35_b{3P<dHp%d&%^Y4N$wPgq=(_Ms#*cg@Alt1F1R^p@Rr1Ya6POkaI6e#}($V>MU
zcM}dlo&7(+fz7dZ23rZsdZjUp`C;(Ou5Ola8{y=$4G>L4))ShO)<3hht;A*`MKlr*
z61D|?e@XtZu>4$Vw#Nv^(6*d#;y4E^|22dYs*||7t>@&)<ia|1>^q3w<eE6V_YqGK
zPY}74?6wfLHH2$>E#dgvZXsMoGl~0&9YjCj%-=vfPLvVOlN#a?!b#jt*j5*a?nEbO
iA5mL4pAi$oCH<wvD>6;X+nbvYT$+1!;_STBrT+tysj>n9

delta 2245
zcmYk+ZA_L`7{Kw1L|&B;C@L!+0hLf96jG5$1TD%6H42eP%GO#_s8x$T^l0ClTQ6E|
z)|MX}Ek`eNZr0XPwj#D#tj4lFG^-D`#cF*Kw`!~Y|L3_|ojuq6JLi5o=f2K4&#N70
zI@0ILa$gC`ZsKa9ZC=Cy9LVE9*;f#;5clI1_yShoTeuuQ!a6*UOR=OdB8AQ9{k>R&
zdlL`grL<4sf{1i{O677+%p}g@BHB4c5sR@LOR*8J!VP#O?nFCy5_9o+oR5c*SHuzI
z7soi*;k#Icr*So&!%F&(vf}KE>d}rnkze$3V1zM*+#7q*jz_T)4=3$$bYPRX5`VyJ
za3K$ykrn9qt=NFiVhZ2JW%M6kP;q1z5-Z5JDQm`!*oT+l>&P!oaPY-va3!8c2VPbZ
zaV^%O_je}lKxQX~aTz|1K7SO`3^pdIG~!pu4LRg1MY|3iNH@0N9^@CtIN0II<oqN$
zMSr4SzJP{nq8^>X?dWnE#%_EHxiuzA$-f<Z$qDD~0(RgZSdMM<;urN`3Ww3f_hNE>
z4DIL>bZUM@2asQuy?-hCp3P`R`mq5=(9FG2M*it5KIeq1|2wpU-_Zw4I8<Xbx=1&n
zsT)9F@EkVgM7)Qtk?(of=VufD#_MQT(0e_$qr2u2bigmAsrbM+`r-++!=I38jY4{5
zSwtmrDrys3(d#|PN5>$V(h+1Vu@C*QmyvIYG0evg(5aY6Oiv}1Y2+7Qb8t$2!Sz_m
zQg=XG&=C)#137?hv!m#XkD~)Qflk54=s<o%*T5Y5fs5F)W@HVr=+iMo#gyz%E*wWw
zHG_8iS8{y`y?bAG;$v7#`v|VV(?}n25zSZ$d(!6@qiduc&BVj#ZhHn@fAJa>M>vkA
zW(wUV)966vlJhBUx{>yBbnXX{zTzO-!5BJ_X>@AxSWs-Js6d~qL8qi2egC6aNB?n%
ziX;CJ{U@8jo%k&}r_JQkRojIQ@Nw+HQFM2FmiRN8kpfO?13J)c=<{iG!0+JoIE88F
z;vy9nVT!ys;uc(iUD$#n=*ZthZjJYmS&6gAGKt^N7v`n1DR045wEJ*19z-@t=3f=!
zZV!}A&i??F&P+3#zNDJ@Ln`{WfquC!vn(M@VJqPmS;%_ak*Q?|ZMC0p&dp*kVR1_R
zh}&#9|C?b0;TM^<I|+*!Fe|3em3s+cVOBCLzB$wS@8GU*+MIjKgM?YwW`p7yaba5S
zC7i<f^dC16cM%q*Fte?!w-Kh-avx!eElq^ewv}+*%p=?x8;SpyTWIV`PIMvbIBq8T
zl5>)FW!_FaK-^EPBeoNkcA|jjAl%!QYQlY;OKc%_6GOyWqMH~bTtihvinxbx?W`v(
zH)V-ivsPtR<_;P)$%QB^Y^+Z`v}fdr(Nulo$&rFx#rdmJO>0}5)*b$)e6}ca`P7`(
JCMwPr{{yjjxjO&=

diff --git a/po/ja.po b/po/ja.po
index 4bb86e73..3ab33042 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\n"
 "PO-Revision-Date: 1999-09-28 21:10+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/LR0.c:207
+#: src/LR0.c:208
 #, fuzzy, c-format
 msgid "too many states (max %d)"
 msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
@@ -77,31 +77,31 @@ msgstr "
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:492
 msgid "conflicts: "
 msgstr "¾×ÆÍ: "
 
-#: src/conflicts.c:495
+#: src/conflicts.c:494
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
 
-#: src/conflicts.c:499
+#: src/conflicts.c:498
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ´Ô¸µ/´Ô¸µ"
 
-#: src/conflicts.c:504
+#: src/conflicts.c:503
 #, c-format
 msgid "%s contains"
 msgstr "%s ¤Ë¤Ï¡¢"
 
-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n"
 
-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,12 +110,12 @@ msgstr ""
 "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 "\n"
 
-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 
-#: src/conflicts.c:732
+#: src/conflicts.c:731
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
@@ -135,12 +135,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸"
 
-#: src/files.c:132
+#: src/files.c:138
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:151
+#: src/files.c:157
 msgid "cannot close file"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:633
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -279,11 +279,11 @@ msgstr "
 msgid "unterminated type name"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/lex.c:432
+#: src/lex.c:431
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦"
 
-#: src/main.c:108
+#: src/main.c:122
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ÆâÉô¥¨¥é¡¼: %s\n"
@@ -292,7 +292,7 @@ msgstr "%s: 
 msgid "Entering set_nullable"
 msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹"
 
-#: src/output.c:993
+#: src/output.c:987
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿"
@@ -330,12 +330,12 @@ msgstr "    %-4s\t
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n"
 
-#: src/print.c:190
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\t¾õÂÖ %d ¤Ø\n"
 
-#: src/print.c:202
+#: src/print.c:200
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -344,23 +344,25 @@ msgstr ""
 "¾õÂÖ %d\n"
 "\n"
 
-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "ʸˡ\n"
 
-#: src/print.c:240
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "µ¬Â§ %-4d %s ->"
 
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* ¶õ */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""
 
-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -368,7 +370,7 @@ msgstr ""
 "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 
-#: src/print.c:302
+#: src/print.c:269
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -376,11 +378,11 @@ msgstr ""
 "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 
-#: src/print.c:329
+#: src/print.c:295
 msgid " on left:"
 msgstr " º¸ÊÕ:"
 
-#: src/print.c:344
+#: src/print.c:310
 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 
@@ -434,7 +436,7 @@ msgstr "`%s' 
 msgid "unterminated `%{' definition"
 msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
@@ -449,171 +451,171 @@ msgstr ""
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665
 #, c-format
 msgid "symbol %s redefined"
 msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:544
+#: src/reader.c:542
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "%2$s Æâ¤Î `%1$s' ¤Ï̵¸ú¤Ç¤¹"
 
-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:583
+#: src/reader.c:581
 msgid "%type declaration has no <typename>"
 msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/reader.c:618
+#: src/reader.c:616
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤­ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'"
 
-#: src/reader.c:663
+#: src/reader.c:661
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
 
-#: src/reader.c:687
+#: src/reader.c:684
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "̵¸ú¤Ê¥Æ¥­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹"
 
-#: src/reader.c:697
+#: src/reader.c:694
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s"
 
-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹"
 
-#: src/reader.c:796
+#: src/reader.c:793
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
 
-#: src/reader.c:843
+#: src/reader.c:839
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
 
-#: src/reader.c:867
+#: src/reader.c:863
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
 
-#: src/reader.c:1010
+#: src/reader.c:1006
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
 
-#: src/reader.c:1015
+#: src/reader.c:1011
 msgid "no input grammar"
 msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
 
-#: src/reader.c:1020
+#: src/reader.c:1016
 #, c-format
 msgid "unknown character: %s"
 msgstr "̤ÃΤÎʸ»ú: %s"
 
-#: src/reader.c:1188
+#: src/reader.c:1184
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹"
 
-#: src/reader.c:1355
+#: src/reader.c:1351
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:1362
+#: src/reader.c:1358
 msgid "grammar starts with vertical bar"
 msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
 
-#: src/reader.c:1393
+#: src/reader.c:1389
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹"
 
-#: src/reader.c:1495
+#: src/reader.c:1491
 msgid "two @prec's in a row"
 msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: src/reader.c:1503
+#: src/reader.c:1499
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:1512
+#: src/reader.c:1508
 msgid "two actions at end of one rule"
 msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
 
-#: src/reader.c:1526
+#: src/reader.c:1522
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹"
 
-#: src/reader.c:1532
+#: src/reader.c:1528
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó"
 
-#: src/reader.c:1576
+#: src/reader.c:1572
 #, c-format
 msgid "invalid input: %s"
 msgstr "̵¸ú¤ÊÆþÎÏ: %s"
 
-#: src/reader.c:1584
+#: src/reader.c:1580
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s"
 
-#: src/reader.c:1587
+#: src/reader.c:1583
 msgid "no rules in the input grammar"
 msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:1611
+#: src/reader.c:1607
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ"
 "¤»¤ó"
 
-#: src/reader.c:1716
+#: src/reader.c:1713
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
-#: src/reader.c:1728
+#: src/reader.c:1725
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
-#: src/reader.c:1779
+#: src/reader.c:1771
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:1792
+#: src/reader.c:1783
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:1794
+#: src/reader.c:1785
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
@@ -802,6 +804,9 @@ msgstr ""
 msgid "'"
 msgstr ""
 
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* ¶õ */"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index bee3585bc673860f5d4f0dcf1f3b3e67596ac78f..c1c28aa4e0e4c5aec6e2483b1d1f6531d223155b 100644
GIT binary patch
delta 20
bcmX?Sb<S!-i6Fa)f}w$xk<sRA!OPqLO!x-9

delta 20
bcmX?Sb<S!-i6Fa?f}w?#q2=ak!OPqLO-lyJ

diff --git a/po/nl.po b/po/nl.po
index e1e14c36..211c11e7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\n"
 "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
 "Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/LR0.c:207
+#: src/LR0.c:208
 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
@@ -77,31 +77,31 @@ msgstr "Stadium %d bevat"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:492
 msgid "conflicts: "
 msgstr "conflictueerd: "
 
-#: src/conflicts.c:495
+#: src/conflicts.c:494
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d vershuif/reduceer"
 
-#: src/conflicts.c:499
+#: src/conflicts.c:498
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reduceer/reduceer"
 
-#: src/conflicts.c:504
+#: src/conflicts.c:503
 #, c-format
 msgid "%s contains"
 msgstr "%s bevat"
 
-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduceer gebruikt regel %d (%s)]\n"
 
-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,12 +110,12 @@ msgstr ""
 "    $default\treduce using rule %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr ""
 
-#: src/conflicts.c:732
+#: src/conflicts.c:731
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr ""
@@ -135,12 +135,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s afgeleiden"
 
-#: src/files.c:132
+#: src/files.c:138
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:151
+#: src/files.c:157
 msgid "cannot close file"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:633
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -279,11 +279,11 @@ msgstr "niet getermineerd type naam aan het einde van bestand"
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 
-#: src/lex.c:432
+#: src/lex.c:431
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
 
-#: src/main.c:108
+#: src/main.c:122
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"
@@ -292,7 +292,7 @@ msgstr "interne fout, %s\n"
 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"
 
-#: src/output.c:993
+#: src/output.c:987
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale tabel grootte (%s) overschreden"
@@ -330,12 +330,12 @@ msgstr ""
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr ""
 
-#: src/print.c:190
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr ""
 
-#: src/print.c:202
+#: src/print.c:200
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -344,23 +344,25 @@ msgstr ""
 "stadium %d\n"
 "\n"
 
-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Grammatica\n"
 
-#: src/print.c:240
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regel %-4d %s ->"
 
-#: src/print.c:246
-msgid "\t\t/* empty */"
+#: src/print.c:241
+msgid "empty"
 msgstr ""
 
-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -368,7 +370,7 @@ msgstr ""
 "Terminals, met regels waar ze voorkomen\n"
 "\n"
 
-#: src/print.c:302
+#: src/print.c:269
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -376,11 +378,11 @@ msgstr ""
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"
 
-#: src/print.c:329
+#: src/print.c:295
 msgid " on left:"
 msgstr " links:"
 
-#: src/print.c:344
+#: src/print.c:310
 msgid " on right:"
 msgstr " rechts:"
 
@@ -436,7 +438,7 @@ msgstr "$%s van `%s' heeft geen gedeclareerd type"
 msgid "unterminated `%{' definition"
 msgstr "niet getermineerde `%{' definitie"
 
-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
@@ -451,172 +453,172 @@ msgstr ""
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"
 
-#: src/reader.c:544
+#: src/reader.c:542
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' is onjuist in %s"
 
-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "meerdere %start declaraties"
 
-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "onjuiste %start declaratie"
 
-#: src/reader.c:583
+#: src/reader.c:581
 msgid "%type declaration has no <typename>"
 msgstr "%type declaratie heeft geen <typenaam>"
 
-#: src/reader.c:618
+#: src/reader.c:616
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "onjuist %%type declaratie door item: `%s'"
 
-#: src/reader.c:663
+#: src/reader.c:661
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "herdefinieren voorganger van %s"
 
-#: src/reader.c:687
+#: src/reader.c:684
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
 
-#: src/reader.c:697
+#: src/reader.c:694
 #, c-format
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"
 
-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "niet overeenkomstige `{'"
 
-#: src/reader.c:796
+#: src/reader.c:793
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "argument van %expect is niet een integer"
 
-#: src/reader.c:843
+#: src/reader.c:839
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "onbekend item %s, verwacht een identifier"
 
-#: src/reader.c:867
+#: src/reader.c:863
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 
-#: src/reader.c:1010
+#: src/reader.c:1006
 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 
-#: src/reader.c:1015
+#: src/reader.c:1011
 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 
-#: src/reader.c:1020
+#: src/reader.c:1016
 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 
-#: src/reader.c:1188
+#: src/reader.c:1184
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 
-#: src/reader.c:1355
+#: src/reader.c:1351
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
 
-#: src/reader.c:1362
+#: src/reader.c:1358
 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 
-#: src/reader.c:1393
+#: src/reader.c:1389
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"
 
-#: src/reader.c:1495
+#: src/reader.c:1491
 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 
-#: src/reader.c:1503
+#: src/reader.c:1499
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 
-#: src/reader.c:1512
+#: src/reader.c:1508
 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 
-#: src/reader.c:1526
+#: src/reader.c:1522
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"
 
-#: src/reader.c:1532
+#: src/reader.c:1528
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"
 
-#: src/reader.c:1576
+#: src/reader.c:1572
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 
-#: src/reader.c:1584
+#: src/reader.c:1580
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
 
-#: src/reader.c:1587
+#: src/reader.c:1583
 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 
-#: src/reader.c:1611
+#: src/reader.c:1607
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n"
 "heeft geen regels"
 
-#: src/reader.c:1716
+#: src/reader.c:1713
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 
-#: src/reader.c:1728
+#: src/reader.c:1725
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"
 
-#: src/reader.c:1779
+#: src/reader.c:1771
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr ""
 
-#: src/reader.c:1792
+#: src/reader.c:1783
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 
-#: src/reader.c:1794
+#: src/reader.c:1785
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"
diff --git a/po/ru.gmo b/po/ru.gmo
index e4f6babfba7e3c07abb2e3593ff205c72d85374a..4d90c945033df19a228bfc12af4a16de7cfadb98 100644
GIT binary patch
delta 3171
zcmX}tdytk@9S88kO^}P+7C}vUkp(tfWET)~p%7$A2~dKRQjtp~1&Da1P+m+?*Qmv!
zyfo89n$<Km5y2l_{%~T7nJi_Rq^739$eGHTsma01r1kl}@3WoR-}5=o^FHsn{LVS=
zzOwz>+v|TEGw@4Ac~rbhJUy_K=h%Lxi_$T?lnLx)3zu>lZ(<uC;uL<5HNM2W|2ijg
z)QF~YIMV$Z`lxK;*`?IWoy|(w%h5h~is$h#NAWn%<)3&C-)1@(e^x2RS~@t0moQ_V
z$D!<II=qGxxsEmN=7l`K+4?U>Rnp-b9M2ZtN(b%CfVw%1*D)jC$aHWkjiu~lGSb5g
z@F3I9FRJ@f%mm(MJ13ac`RwKt{g;g@`Jjh0c!V|nnNvB)C^Ccg%4JMyx3C}gaS^}3
zW&8~X^TIKujN^39;^oZq+u6&VtWQ@NHnx-}IF~E5_#zK-qHkNHa@?hre_>`k!t}D{
z=P?6cNPU)Dn3?TnGV)bE#-A}0Su3sCLwlHvKRH4EGr}Vt$bNaA7x4GY^S788j*{2h
zk72&p#vxqHG`yT?_zq?uJ<R)GsXjl*4EVRqQoh5P9D1(&r-3dDl$ot(joX+M@8c!>
z0WDwo8<VlOn9NKunshjyd2a=4e1KN3e1qmtj#T$AFc~_@oSt{;D*nneXYUMN!K=8G
z>2N<Ykf)hlevFy<uegvWXtl~YT21C=u*PLf2U{uo<;%=KzROGbb0%Z;|ElDREiU=O
zY|2i#fj%mCvBv$(j1My%KF_51B(rHxb2wY=)a;2)CIf3JS!ElIwLHRf{7q`7UVf~S
z^Y|ju!M~Zc8d_^M)WMwV8`;{gl$+_V?48tn|5?s)f0S8*H<{f&Q=@5jgG-Hj*uiJ`
zZl2)iod16En^ccwmSS?{g6jG8%*Z!a_YYV1k29G%T=@d~yZ<W(@bAo0{gau%o6O7y
zI7<316WFT%GEXJDaUC=AeN5_q%B1+^>i%_REyqbucJT}*<(Dx(NK2TMuVj{F12gb_
z%o04y?15vf@nzPNy8ezpUc8i@T+KXxkV)x}XjRI;m;sJ<xbyzv%Js~QcCjB1Fq`-(
zF5^Eqm|Zql_Rb={hu5~re@5Qx!PodC=X0I~dWJi=T#FN(xkKD~QS*mrlIdkFmoUfg
zZe~~aFav*%$=qpXNrzvobGGpiH!|;!pDF*D$<^|o8Ej!v)XS{Zw`gORpD?Na12e<d
zn2t{~OEtu3&frw$_hAO}{WZ+@wle+f;cR}LvR_`Rt7I+z!=)S||B_Hv(a&?ahiR~v
zUMW9hGW05w$~NmEDP=y>;U;Fr_i_QBpd^;xaTEvWJ)5?LIc@ceRq{eN=W!b+@jD#E
zUvd?H%`u!NzZpmu^Z90G6K-cWcd^E!%nV;)_RcUHDHFSh4nkSoyswuXDhoY0z>M%z
z^}=h^XPGd!xdh9YnQmqV@EDWYW0fa)w);2et7W7GPG-9)S!E^D{{767?dJtK|KC?h
zN{+LIuQGcfTQm($rju8?=&#)5l7=2<_QI`sChiey#U8O-WSMRjY2$N3vyC#;b!Syi
z|K(wErpUS_g?;7vz6!H9?h`kP4~r~W%KOD`v03D(T_#3|Yelk<^4=zmWm;0zuc9r{
z=)dvfljnDcPo$!(Z_>Daz;$eOzk?gaHKHc=itLMzi4`Ifa=IGleKj5Za*N0*+9XmI
zh)Io_*M~GKjWr!t)qA;Ed`N5)6Gh4u;(a3NZ|n`O6nBf1bt30{kx0n~T-d0U@<HBK
z)w8@0iT)XG&gIqB2aj-IRqw-ZNV%c!hWCnHB73H<d|KtBeK&kmtPwVUqilC=7ujDa
z`K=f!rYBwdM9KqA%Ev1|#T=FK;!g2-@u0{twfFvCvYYQ0qs8swlOkoSSS8L9my0V!
zPS6H%m*^2!wz{Nzrb)SugT&nGegHeGdj5%Q5g!q4BFF2qVyZZ_cKB^AgXh#bJGy4g
P`r?V&sYAymoj?A6qq-c7

delta 3240
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
E0U^pO!2kdN

diff --git a/po/ru.po b/po/ru.po
index f5047538..81594494 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\n"
 "PO-Revision-Date: 2001-09-09 13:49+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/LR0.c:207
+#: src/LR0.c:208
 #, c-format
 msgid "too many states (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)"
@@ -77,31 +77,31 @@ msgstr "
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:492
 msgid "conflicts: "
 msgstr "ËÏÎÆÌÉËÔÙ: "
 
-#: src/conflicts.c:495
+#: src/conflicts.c:494
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
 
-#: src/conflicts.c:499
+#: src/conflicts.c:498
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
 
-#: src/conflicts.c:504
+#: src/conflicts.c:503
 #, c-format
 msgid "%s contains"
 msgstr "%s ÓÏÄÅÒÖÉÔ"
 
-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n"
 
-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,12 +110,12 @@ msgstr ""
 "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 
-#: src/conflicts.c:732
+#: src/conflicts.c:731
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
@@ -129,12 +129,12 @@ msgstr "DERIVES"
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"
 
-#: src/files.c:132
+#: src/files.c:138
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"
 
-#: src/files.c:151
+#: src/files.c:157
 msgid "cannot close file"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"
 
@@ -236,7 +236,7 @@ msgstr ""
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"
 
-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:633
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
@@ -300,11 +300,11 @@ msgstr "
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 
-#: src/lex.c:432
+#: src/lex.c:431
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
 
-#: src/main.c:108
+#: src/main.c:122
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n"
@@ -313,7 +313,7 @@ msgstr "%s: 
 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"
 
-#: src/output.c:993
+#: src/output.c:987
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)"
@@ -351,42 +351,44 @@ msgstr "    %-4s\t
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n"
 
-#: src/print.c:190
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 
-#: src/print.c:202
+#: src/print.c:200
 #, c-format
 msgid "state %d"
 msgstr "ÓÏÓÔÏÑÎÉÅ %d"
 
-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230
 msgid "Grammar"
 msgstr "çÒÁÍÍÁÔÉËÁ"
 
-#: src/print.c:240
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->"
 
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* ÐÕÓÔÏ */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""
 
-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245
 msgid "Terminals, with rules where they appear"
 msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
-#: src/print.c:302
+#: src/print.c:269
 msgid "Nonterminals, with rules where they appear"
 msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
-#: src/print.c:329
+#: src/print.c:295
 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"
 
-#: src/print.c:344
+#: src/print.c:310
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 
@@ -440,7 +442,7 @@ msgstr "$%d 
 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
 
-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s"
@@ -455,170 +457,170 @@ msgstr ""
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665
 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
 
-#: src/reader.c:544
+#: src/reader.c:542
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
 
-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718
 #, c-format
 msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 
-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264
 #, c-format
 msgid "invalid %s declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 
-#: src/reader.c:583
+#: src/reader.c:581
 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
 
-#: src/reader.c:618
+#: src/reader.c:616
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s"
 
-#: src/reader.c:663
+#: src/reader.c:661
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
 
-#: src/reader.c:687
+#: src/reader.c:684
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"
 
-#: src/reader.c:697
+#: src/reader.c:694
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 
-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161
 #, c-format
 msgid "unmatched %s"
 msgstr "ÎÅÐÁÒÎÁÑ %s"
 
-#: src/reader.c:796
+#: src/reader.c:793
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
-#: src/reader.c:843
+#: src/reader.c:839
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
 
-#: src/reader.c:867
+#: src/reader.c:863
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 
-#: src/reader.c:1010
+#: src/reader.c:1006
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
-#: src/reader.c:1015
+#: src/reader.c:1011
 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 
-#: src/reader.c:1020
+#: src/reader.c:1016
 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 
-#: src/reader.c:1188
+#: src/reader.c:1184
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 
-#: src/reader.c:1355
+#: src/reader.c:1351
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 
-#: src/reader.c:1362
+#: src/reader.c:1358
 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 
-#: src/reader.c:1393
+#: src/reader.c:1389
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reader.c:1495
+#: src/reader.c:1491
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
-#: src/reader.c:1503
+#: src/reader.c:1499
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
 
-#: src/reader.c:1512
+#: src/reader.c:1508
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
-#: src/reader.c:1526
+#: src/reader.c:1522
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: src/reader.c:1532
+#: src/reader.c:1528
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
-#: src/reader.c:1576
+#: src/reader.c:1572
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 
-#: src/reader.c:1584
+#: src/reader.c:1580
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
 
-#: src/reader.c:1587
+#: src/reader.c:1583
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
-#: src/reader.c:1611
+#: src/reader.c:1607
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 
-#: src/reader.c:1716
+#: src/reader.c:1713
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 
-#: src/reader.c:1728
+#: src/reader.c:1725
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 
-#: src/reader.c:1779
+#: src/reader.c:1771
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 
-#: src/reader.c:1792
+#: src/reader.c:1783
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 
-#: src/reader.c:1794
+#: src/reader.c:1785
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
@@ -793,6 +795,9 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* ÐÕÓÔÏ */"
+
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%header_extension"
 
diff --git a/po/tr.po b/po/tr.po
index 61852a6f..eb94436c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28c\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\n"
 "PO-Revision-Date: 2001-09-10 10:54GMT\n"
 "Last-Translator: Altug Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: src/LR0.c:207
+#: src/LR0.c:208
 #, c-format
 msgid "too many states (max %d)"
 msgstr "çok fazla durum (en fazla %d)"
@@ -79,31 +79,31 @@ msgstr "%d durumu i
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:492
 msgid "conflicts: "
 msgstr "çeliþkiler: "
 
-#: src/conflicts.c:495
+#: src/conflicts.c:494
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d öteleme/indirgeme"
 
-#: src/conflicts.c:499
+#: src/conflicts.c:498
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d indirgeme/indirgeme"
 
-#: src/conflicts.c:504
+#: src/conflicts.c:503
 #, c-format
 msgid "%s contains"
 msgstr "%s içerir"
 
-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[indirgeme kural %d (%s)'i kullanýyor]\n"
 
-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -112,12 +112,12 @@ msgstr ""
 "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
 "\n"
 
-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tindirgeme kural %d (%s)'i kullanýyor\n"
 
-#: src/conflicts.c:732
+#: src/conflicts.c:731
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
@@ -131,12 +131,12 @@ msgstr "T
 msgid "%s derives"
 msgstr "%s türetildi"
 
-#: src/files.c:132
+#: src/files.c:138
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "`%s' dosyasý açýlamadý"
 
-#: src/files.c:151
+#: src/files.c:157
 msgid "cannot close file"
 msgstr "dosya kapatýlamýyor"
 
@@ -238,7 +238,7 @@ msgstr ""
 "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya HERHANGÝ BÝR AMACA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"
 
-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:633
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' artýk desteklenmiyor"
@@ -302,11 +302,11 @@ msgstr "dosya sonunda sonland
 msgid "unterminated type name"
 msgstr "sonlandýrýlmamýþ tip ismi"
 
-#: src/lex.c:432
+#: src/lex.c:431
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"
 
-#: src/main.c:108
+#: src/main.c:122
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: iç hata: %s\n"
@@ -315,7 +315,7 @@ msgstr "%s: i
 msgid "Entering set_nullable"
 msgstr "set_nullable'a girildi"
 
-#: src/output.c:993
+#: src/output.c:987
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "en büyük tablo uzunluðu (%d) aþýldý"
@@ -353,42 +353,44 @@ msgstr "    %-4s\t
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\thata (birleþmeli deðil)\n"
 
-#: src/print.c:190
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tdurum %d'ye git\n"
 
-#: src/print.c:202
+#: src/print.c:200
 #, c-format
 msgid "state %d"
 msgstr "durum %d"
 
-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230
 msgid "Grammar"
 msgstr "Gramer"
 
-#: src/print.c:240
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "kural %-4d %s ->"
 
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* boþ */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""
 
-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245
 msgid "Terminals, with rules where they appear"
 msgstr "Sabit simgeler, kurallarýnýn bulunduklarý yerde"
 
-#: src/print.c:302
+#: src/print.c:269
 msgid "Nonterminals, with rules where they appear"
 msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde"
 
-#: src/print.c:329
+#: src/print.c:295
 msgid " on left:"
 msgstr " solda:"
 
-#: src/print.c:344
+#: src/print.c:310
 msgid " on right:"
 msgstr " saðda:"
 
@@ -442,7 +444,7 @@ msgstr "`%d''in $%s'i bildirilmi
 msgid "unterminated `%{' definition"
 msgstr "`%{' tanýmlamasý sonlandýrýlmamýþ"
 
-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "%s'den sonra erken EOF"
@@ -457,170 +459,170 @@ msgstr "simge `%s' birden fazla defa sabit dizge olarak kullan
 msgid "symbol `%s' given more than one literal string"
 msgstr "`%s' simgesine birden fazla sabit dizge verilmiþ"
 
-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665
 #, c-format
 msgid "symbol %s redefined"
 msgstr "%s simgesi yeniden tanýmlandý"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s için yeniden tip bildirimi"
 
-#: src/reader.c:544
+#: src/reader.c:542
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' %s içinde geçersizdir"
 
-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718
 #, c-format
 msgid "multiple %s declarations"
 msgstr "çoklu %s bildirimleri"
 
-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264
 #, c-format
 msgid "invalid %s declaration"
 msgstr "geçersiz %s bildirimi"
 
-#: src/reader.c:583
+#: src/reader.c:581
 msgid "%type declaration has no <typename>"
 msgstr "%type bildirimi <tipadý>'na sahip deðil"
 
-#: src/reader.c:618
+#: src/reader.c:616
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "geçersiz %%type bildirimine neden olan öðe: %s"
 
-#: src/reader.c:663
+#: src/reader.c:661
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s'in önceliði tekrar tanýmlandý"
 
-#: src/reader.c:687
+#: src/reader.c:684
 #, 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:697
+#: src/reader.c:694
 #, c-format
 msgid "unexpected item: %s"
 msgstr "beklenmeyen öðe: %s"
 
-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161
 #, c-format
 msgid "unmatched %s"
 msgstr "eþlenemeyen %s"
 
-#: src/reader.c:796
+#: src/reader.c:793
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect'in argümaný bir tamsayý deðil"
 
-#: src/reader.c:843
+#: src/reader.c:839
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "%s öðesi tanýnmadý, beklenen bir tanýtýcýdýr"
 
-#: src/reader.c:867
+#: src/reader.c:863
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "%s'in yerine sabit dizge beklendi"
 
-#: src/reader.c:1010
+#: src/reader.c:1006
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tanýnmayan: %s"
 
-#: src/reader.c:1015
+#: src/reader.c:1011
 msgid "no input grammar"
 msgstr "girdi grameri yok"
 
-#: src/reader.c:1020
+#: src/reader.c:1016
 #, c-format
 msgid "unknown character: %s"
 msgstr "bilinmeyen karakter: %s"
 
-#: src/reader.c:1188
+#: src/reader.c:1184
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "sonlandýrýlmamýþ %guard yantümcesi"
 
-#: src/reader.c:1355
+#: src/reader.c:1351
 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:1362
+#: src/reader.c:1358
 msgid "grammar starts with vertical bar"
 msgstr "gramer düþey çubuk ile baþlýyor"
 
-#: src/reader.c:1393
+#: src/reader.c:1389
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "bir andaç olan %s için verilen kural"
 
-#: src/reader.c:1495
+#: src/reader.c:1491
 msgid "two @prec's in a row"
 msgstr "bir satýrda iki @prec"
 
-#: src/reader.c:1503
+#: src/reader.c:1499
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard sunulmuþ fakat %%semantic_parser belirlenmemiþ"
 
-#: src/reader.c:1512
+#: src/reader.c:1508
 msgid "two actions at end of one rule"
 msgstr "bir kuralýn sonunda iki eylem"
 
-#: src/reader.c:1526
+#: src/reader.c:1522
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý"
 
-#: src/reader.c:1532
+#: src/reader.c:1528
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylembelirtilmemiþ"
 
-#: src/reader.c:1576
+#: src/reader.c:1572
 #, c-format
 msgid "invalid input: %s"
 msgstr "geçersiz girdi: %s"
 
-#: src/reader.c:1584
+#: src/reader.c:1580
 #, 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"
 
-#: src/reader.c:1587
+#: src/reader.c:1583
 msgid "no rules in the input grammar"
 msgstr "girdi grameri içinde kurallar yok"
 
-#: src/reader.c:1611
+#: src/reader.c:1607
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "simge %s kullanýldý, fakat bir andaç olarak tanýmlanmadý vekurallarý yok"
 
-#: src/reader.c:1716
+#: src/reader.c:1713
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ve %s için çeliþen öncelikler"
 
-#: src/reader.c:1728
+#: src/reader.c:1725
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ve %s için çeliþen birleþmeli deðerler"
 
-#: src/reader.c:1779
+#: src/reader.c:1771
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "%s ve %s andaçlarýnýn her ikisi %d sayýsýna atandý"
 
-#: src/reader.c:1792
+#: src/reader.c:1783
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "baþlangýç simgesi %s tanýmlanmadý"
 
-#: src/reader.c:1794
+#: src/reader.c:1785
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "baþlangýç simgesi %s bir andaçtýr"
@@ -795,6 +797,9 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* boþ */"
+
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "çoklu %%header_extension bildirimleri"
 
diff --git a/src/conflicts.c b/src/conflicts.c
index 48d679b7..dc9ee3d6 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -30,12 +30,12 @@
 #include "LR0.h"
 
 int any_conflicts = 0;
-errs **err_table;
+errs **err_table = NULL;
 int expected_conflicts;
-static char *conflicts;
+static char *conflicts = NULL;
 
-static unsigned *shiftset;
-static unsigned *lookaheadset;
+static unsigned *shiftset = NULL;
+static unsigned *lookaheadset = NULL;
 static int src_total;
 static int rrc_total;
 static int src_count;
@@ -264,7 +264,7 @@ set_conflicts (int state)
 }
 
 void
-initialize_conflicts (void)
+solve_conflicts (void)
 {
   int i;
 
@@ -458,7 +458,7 @@ conflict_report (int src_num, int rrc_num)
 `---------------------------------------------*/
 
 void
-print_conflicts (void)
+print_conflicts (FILE *out)
 {
   int i;
 
@@ -478,9 +478,8 @@ print_conflicts (void)
 
 	  if (verbose_flag)
 	    {
-	      obstack_fgrow1 (&output_obstack, _("State %d contains"), i);
-	      obstack_sgrow (&output_obstack,
-			     conflict_report (src_count, rrc_count));
+	      fprintf (out, _("State %d contains"), i);
+	      fputs (conflict_report (src_count, rrc_count), out);
 	    }
 	}
     }
diff --git a/src/conflicts.h b/src/conflicts.h
index 205e42f5..99a504c8 100644
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -22,8 +22,8 @@
 # define CONFLICTS_H_
 # include "state.h"
 
-void initialize_conflicts PARAMS ((void));
-void print_conflicts PARAMS ((void));
+void solve_conflicts PARAMS ((void));
+void print_conflicts PARAMS ((FILE *out));
 void print_reductions PARAMS ((int));
 void free_conflicts PARAMS ((void));
 
diff --git a/src/files.c b/src/files.c
index 6084140c..03ca07a2 100644
--- a/src/files.c
+++ b/src/files.c
@@ -39,6 +39,7 @@ struct obstack graph_obstack;
 char *spec_outfile = NULL;	/* for -o. */
 char *spec_file_prefix = NULL;	/* for -b. */
 char *spec_name_prefix = NULL;	/* for -p. */
+char *spec_verbose_file = NULL;   /* for --verbose. */
 char *spec_graph_file = NULL;   /* for -g. */
 char *spec_defines_file = NULL; /* for --defines. */
 
@@ -97,7 +98,7 @@ compute_header_macro (void)
 {
   int ite;
   char *macro_name;
-  
+
   if (spec_defines_file)
     macro_name = xstrdup (spec_defines_file);
   else
@@ -105,7 +106,7 @@ compute_header_macro (void)
       macro_name = XMALLOC (char,
 			    strlen (base_name) +
 			    strlen (header_extension) + 1);
-      
+
       stpcpy (macro_name, base_name);
       strcat (macro_name, header_extension);
     }
@@ -392,6 +393,38 @@ compute_base_names (void)
   }
 }
 
+/*-------------------------------------------------------.
+| Close the open files, compute the output files names.  |
+`-------------------------------------------------------*/
+
+void
+compute_output_file_names (void)
+{
+  compute_base_names ();
+
+  /* If not yet done. */
+  if (!src_extension)
+    src_extension = ".c";
+  if (!header_extension)
+    header_extension = ".h";
+
+  /* It the defines filename if not given, we create it.  */
+  if (!spec_defines_file)
+    spec_defines_file = stringappend (base_name, header_extension);
+
+  /* It the graph filename if not given, we create it.  */
+  if (!spec_graph_file)
+    spec_graph_file = stringappend (short_base_name, ".vcg");
+
+  spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT);
+
+  attrsfile = stringappend (short_base_name, EXT_STYPE_H);
+#ifndef MSDOS
+  stringappend (attrsfile, header_extension);
+#endif /* MSDOS */
+
+}
+
 /*-----------------------------------------------------------------.
 | Open the input file.  Look for the skeletons.  Find the names of |
 | the output files.  Prepare the obstacks.                         |
@@ -414,36 +447,23 @@ open_files (void)
 
 
 
-/*-----------------------------------------------------.
-| Close the open files, produce all the output files.  |
-`-----------------------------------------------------*/
+/*-----------------------.
+| Close the open file..  |
+`-----------------------*/
+
+void
+close_files (void)
+{
+  xfclose (finput);
+}
+
+/*---------------------------.
+| Produce the output files.  |
+`---------------------------*/
 
 void
 output_files (void)
 {
-  xfclose (finput);
-
-  compute_base_names ();
-
-  /* If not yet done. */
-  if (!src_extension)
-    src_extension = ".c";
-  if (!header_extension)
-    header_extension = ".h";
-
-  /* It the defines filename if not given, we create it.  */
-  if (!spec_defines_file)
-    spec_defines_file = stringappend (base_name, header_extension);
-  
-  /* It the graph filename if not given, we create it.  */
-  if (!spec_graph_file)
-    spec_graph_file = stringappend (short_base_name, ".vcg");
-  
-  attrsfile = stringappend (short_base_name, EXT_STYPE_H);
-#ifndef MSDOS
-  stringappend (attrsfile, header_extension);
-#endif /* MSDOS */
-
   /* Output the main file.  */
   if (spec_outfile)
     obstack_save (&table_obstack, spec_outfile);
@@ -472,12 +492,6 @@ output_files (void)
       obstack_save (&guard_obstack, temp_name);
     }
 
-  if (verbose_flag)
-    /* We used to use just .out if spec_name_prefix (-p) was used, but
-       that conflicts with Posix.  */
-    obstack_save (&output_obstack,
-		  stringappend (short_base_name, EXT_OUTPUT));
-
   if (graph_flag)
     obstack_save (&graph_obstack, spec_graph_file);
 }
diff --git a/src/files.h b/src/files.h
index 1d540f2c..cf9f721d 100644
--- a/src/files.h
+++ b/src/files.h
@@ -33,9 +33,12 @@ extern char *spec_name_prefix;
 /* File name pfx specified with -b, or 0 if no -b.  */
 extern char *spec_file_prefix;
 
+/* --verbose. */
+extern char *spec_verbose_file;
+
 /* File name specified for the output VCG graph.  */
 extern char *spec_graph_file;
- 
+
 /* File name specified with --defines.  */
 extern char *spec_defines_file;
 
@@ -69,7 +72,9 @@ extern char *infile;
 extern char *attrsfile;
 
 void open_files PARAMS((void));
+void close_files PARAMS((void));
 
+void compute_output_file_names PARAMS((void));
 void output_files PARAMS((void));
 
 FILE *xfopen PARAMS ((const char *name, const char *mode));
diff --git a/src/main.c b/src/main.c
index 0e710920..6e7a87c0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -34,6 +34,7 @@
 #include "LR0.h"
 #include "conflicts.h"
 #include "print_graph.h"
+#include "symtab.h"
 
 /* The name this program was run with, for messages.  */
 char *program_name;
@@ -79,7 +80,15 @@ main (int argc, char *argv[])
      lookahead is not enough to disambiguate the parsing.  In file
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */
-  initialize_conflicts ();
+  solve_conflicts ();
+
+  /* Output file names. */
+  compute_output_file_names ();
+
+  /* Stop if there were errors, to avoid trashing previous output
+     files.  */
+  if (complain_message_count)
+    exit (1);
 
   /* Print information about results, if requested.  */
   print_results ();
@@ -90,12 +99,17 @@ main (int argc, char *argv[])
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 
+  /* Free the symbol table data structure.  */
+  free_symtab ();
+
+  /* Close the input files. */
+  close_files ();
+
   free_conflicts ();
   free_nullable ();
   free_derives ();
 
-  if (!complain_message_count)
-    output_files ();
+  output_files ();
 
   exit (complain_message_count ? 1 : 0);
 }
diff --git a/src/print.c b/src/print.c
index 6aa4c711..619b8a76 100644
--- a/src/print.c
+++ b/src/print.c
@@ -35,17 +35,17 @@
 static void
 print_token (int extnum, int token)
 {
-  obstack_fgrow2 (&output_obstack, _(" type %d is %s\n"), extnum, tags[token]);
+  fprintf (out, _(" type %d is %s\n"), extnum, tags[token]);
 }
 #endif
 
 
-/*================================\
+/*--------------------------------.
 | Report information on a state.  |
-\================================*/
+`--------------------------------*/
 
 static void
-print_core (int state)
+print_core (FILE *out, int state)
 {
   int i;
   int k;
@@ -68,30 +68,30 @@ print_core (int state)
 	sp++;
 
       rule = -(*sp);
-      obstack_fgrow1 (&output_obstack, "    %s  ->  ", tags[rlhs[rule]]);
+      fprintf (out, "    %s  ->  ", tags[rlhs[rule]]);
 
       for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
 	{
-	  obstack_fgrow1 (&output_obstack, "%s ", tags[*sp]);
+	  fprintf (out, "%s ", tags[*sp]);
 	}
 
-      obstack_1grow (&output_obstack, '.');
+      fputc ('.', out);
 
       while (*sp > 0)
 	{
-	  obstack_fgrow1 (&output_obstack, " %s", tags[*sp]);
+	  fprintf (out, " %s", tags[*sp]);
 	  sp++;
 	}
 
-      obstack_fgrow1 (&output_obstack, _("   (rule %d)"), rule);
-      obstack_1grow (&output_obstack, '\n');
+      fprintf (out, _("   (rule %d)"), rule);
+      fputc ('\n', out);
     }
 
-  obstack_1grow (&output_obstack, '\n');
+  fputc ('\n', out);
 }
 
 static void
-print_actions (int state)
+print_actions (FILE *out, int state)
 {
   int i;
   int k;
@@ -109,9 +109,9 @@ print_actions (int state)
   if (!shiftp && !redp)
     {
       if (final_state == state)
-	obstack_sgrow (&output_obstack, _("    $default\taccept\n"));
+	fprintf (out, _("    $default\taccept\n"));
       else
-	obstack_sgrow (&output_obstack, _("    NO ACTIONS\n"));
+	fprintf (out, _("    NO ACTIONS\n"));
       return;
     }
 
@@ -129,16 +129,16 @@ print_actions (int state)
 	  if (ISVAR (symbol))
 	    break;
 	  if (symbol == 0)	/* I.e. strcmp(tags[symbol],"$")==0 */
-	    obstack_fgrow1 (&output_obstack,
-			    _("    $   \tgo to state %d\n"), state1);
+	    fprintf (out,
+		     _("    $   \tgo to state %d\n"), state1);
 	  else
-	    obstack_fgrow2 (&output_obstack,
-			    _("    %-4s\tshift, and go to state %d\n"),
-			    tags[symbol], state1);
+	    fprintf (out,
+		     _("    %-4s\tshift, and go to state %d\n"),
+		     tags[symbol], state1);
 	}
 
       if (i > 0)
-	obstack_1grow (&output_obstack, '\n');
+	fputc ('\n', out);
     }
   else
     {
@@ -157,21 +157,20 @@ print_actions (int state)
 	  if (!errp->errs[j])
 	    continue;
 	  symbol = errp->errs[j];
-	  obstack_fgrow1 (&output_obstack, _("    %-4s\terror (nonassociative)\n"),
+	  fprintf (out, _("    %-4s\terror (nonassociative)\n"),
 		   tags[symbol]);
 	}
 
       if (j > 0)
-	obstack_1grow (&output_obstack, '\n');
+	fputc ('\n', out);
     }
 
   if (consistent[state] && redp)
     {
       rule = redp->rules[0];
       symbol = rlhs[rule];
-      obstack_fgrow2 (&output_obstack,
-		      _("    $default\treduce using rule %d (%s)\n\n"),
-		      rule, tags[symbol]);
+      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
+	       rule, tags[symbol]);
     }
   else if (redp)
     {
@@ -186,42 +185,41 @@ print_actions (int state)
 	    continue;
 	  state1 = shiftp->shifts[i];
 	  symbol = accessing_symbol[state1];
-	  obstack_fgrow2 (&output_obstack,
-			  _("    %-4s\tgo to state %d\n"),
-			  tags[symbol], state1);
+	  fprintf (out, _("    %-4s\tgo to state %d\n"),
+		   tags[symbol], state1);
 	}
 
-      obstack_1grow (&output_obstack, '\n');
+      fputc ('\n', out);
     }
 }
 
 static void
-print_state (int state)
+print_state (FILE *out, int state)
 {
-  obstack_sgrow (&output_obstack, "\n\n");
-  obstack_fgrow1 (&output_obstack, _("state %d"), state);
-  obstack_sgrow (&output_obstack, "\n\n");
-  print_core (state);
-  print_actions (state);
+  fputs ("\n\n", out);
+  fprintf (out, _("state %d"), state);
+  fputs ("\n\n", out);
+  print_core (out, state);
+  print_actions (out, state);
 }
 
 /*-----------------------------------------.
 | Print information on the whole grammar.  |
 `-----------------------------------------*/
 
-#define END_TEST(End)						\
-do {								\
-  if (column + strlen(buffer) > (End))				\
-    {								\
-      obstack_fgrow1 (&output_obstack, "%s\n   ", buffer);	\
-      column = 3;						\
-      buffer[0] = 0;						\
-    }								\
+#define END_TEST(End)				\
+do {						\
+  if (column + strlen(buffer) > (End))		\
+    {						\
+      fprintf (out, "%s\n   ", buffer);		\
+      column = 3;				\
+      buffer[0] = 0;				\
+    }						\
 } while (0)
 
 
 static void
-print_grammar (void)
+print_grammar (FILE *out)
 {
   int i, j;
   short *rule;
@@ -229,37 +227,30 @@ print_grammar (void)
   int column = 0;
 
   /* rule # : LHS -> RHS */
-  obstack_1grow (&output_obstack, '\n');
-  obstack_sgrow (&output_obstack, _("Grammar"));
-  obstack_1grow (&output_obstack, '\n');
+  fprintf (out, "\n%s\n", _("Grammar"));
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
     if (rlhs[i] >= 0)
       {
-	obstack_fgrow2 (&output_obstack,
-			_("rule %-4d %s ->"), i, tags[rlhs[i]]);
+	fprintf (out, _("rule %-4d %s ->"), i, tags[rlhs[i]]);
 	rule = &ritem[rrhs[i]];
 	if (*rule > 0)
 	  while (*rule > 0)
-	    obstack_fgrow1 (&output_obstack, " %s", tags[*rule++]);
+	    fprintf (out, " %s", tags[*rule++]);
 	else
-	  obstack_sgrow (&output_obstack, _("		/* empty */"));
-	obstack_1grow (&output_obstack, '\n');
+	  fprintf (out, "		/* %s */\n", _("empty"));
       }
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
-  obstack_sgrow (&output_obstack, "\n");
-  obstack_sgrow (&output_obstack,
-		 _("Terminals, with rules where they appear"));
-  obstack_sgrow (&output_obstack, "\n\n");
-  obstack_fgrow1 (&output_obstack, "%s (-1)\n", tags[0]);
+  fprintf (out, "\n%s\n\n", _("Terminals, with rules where they appear"));
+  fprintf (out, "%s (-1)\n", tags[0]);
 
   for (i = 0; i <= max_user_token_number; i++)
     if (token_translations[i] != 2)
       {
 	buffer[0] = 0;
 	column = strlen (tags[token_translations[i]]);
-	obstack_sgrow (&output_obstack, tags[token_translations[i]]);
+	fputs (tags[token_translations[i]], out);
 	END_TEST (50);
 	sprintf (buffer, " (%d)", i);
 
@@ -271,13 +262,11 @@ print_grammar (void)
 		sprintf (buffer + strlen (buffer), " %d", j);
 		break;
 	      }
-	obstack_fgrow1 (&output_obstack, "%s\n", buffer);
+	fprintf (out, "%s\n", buffer);
       }
 
-  obstack_sgrow (&output_obstack, "\n");
-  obstack_sgrow (&output_obstack,
-		 _("Nonterminals, with rules where they appear"));
-  obstack_sgrow (&output_obstack, "\n\n");
+  fprintf (out, "\n%s\n\n",
+	   _("Nonterminals, with rules where they appear"));
   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;
@@ -295,7 +284,7 @@ print_grammar (void)
 	}
 
       buffer[0] = 0;
-      obstack_sgrow (&output_obstack, tags[i]);
+      fputs (tags[i], out);
       column = strlen (tags[i]);
       sprintf (buffer, " (%d)", i);
       END_TEST (0);
@@ -330,22 +319,33 @@ print_grammar (void)
 		  }
 	    }
 	}
-      obstack_fgrow1 (&output_obstack, "%s\n", buffer);
+      fprintf (out, "%s\n", buffer);
     }
 }
 
 void
 print_results (void)
 {
-  int i;
-
-  if (any_conflicts)
-    print_conflicts ();
-
   if (verbose_flag)
-    print_grammar ();
+    {
+      int i;
 
-  if (verbose_flag)
-    for (i = 0; i < nstates; i++)
-      print_state (i);
+      /* We used to use just .out if spec_name_prefix (-p) was used, but
+	 that conflicts with Posix.  */
+      FILE *out = xfopen (spec_verbose_file, "w");
+
+      size_t size = obstack_object_size (&output_obstack);
+      fwrite (obstack_finish (&output_obstack), 1, size, out);
+
+      if (any_conflicts)
+	print_conflicts (out);
+
+      print_grammar (out);
+
+      for (i = 0; i < nstates; i++)
+	print_state (out, i);
+
+      xfclose (out);
+    }
+  obstack_free (&output_obstack, NULL);
 }
diff --git a/src/reader.c b/src/reader.c
index 0517abdc..2e489846 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -1959,9 +1959,6 @@ reader (void)
   packsymbols ();
   /* Convert the grammar into the format described in gram.h.  */
   packgram ();
-  /* Free the symbol table data structure since symbols are now all
-     referred to by symbol number.  */
-  free_symtab ();
 }