From 78986eff740941e9a2cb4ca34ed36e35940068b3 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Mon, 12 Nov 2001 09:42:14 +0000
Subject: [PATCH] Version 1.30b. * config/config.guess, config/config.sub,
 po/*.po: Update.

---
 ChangeLog           |   6 ++
 config/config.guess |   4 +-
 config/config.sub   |  20 ++--
 po/de.gmo           | Bin 8517 -> 8085 bytes
 po/de.po            | 121 ++++++++++++-----------
 po/es.gmo           | Bin 8127 -> 7691 bytes
 po/es.po            | 121 ++++++++++++-----------
 po/et.gmo           | Bin 13689 -> 14004 bytes
 po/et.po            | 132 ++++++++++++-------------
 po/fr.gmo           | Bin 14397 -> 13960 bytes
 po/fr.po            | 121 ++++++++++++-----------
 po/ja.gmo           | Bin 8342 -> 7938 bytes
 po/ja.po            | 121 ++++++++++++-----------
 po/nl.gmo           | Bin 7502 -> 7011 bytes
 po/nl.po            | 119 ++++++++++++-----------
 po/ru.gmo           | Bin 13820 -> 13412 bytes
 po/ru.po            | 121 ++++++++++++-----------
 po/tr.po            | 228 +++++++++++++++++++-------------------------
 18 files changed, 561 insertions(+), 553 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f4c0090..cbb8bae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-12  Akim Demaille  <akim@epita.fr>
+
+	Version 1.30b.
+
+	* config/config.guess, config/config.sub, po/*.po: Update.
+
 2001-11-12  Akim Demaille  <akim@epita.fr>
 
 	* doc/bison.texinfo: Use `$' as shell prompt, not `%'.
diff --git a/config/config.guess b/config/config.guess
index 297e5c30..28fcc5e2 100755
--- a/config/config.guess
+++ b/config/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-10-05'
+timestamp='2001-11-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -947,7 +947,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
diff --git a/config/config.sub b/config/config.sub
index 791bcded..24794696 100755
--- a/config/config.sub
+++ b/config/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-10-05'
+timestamp='2001-11-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -245,14 +245,13 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
 	| sh | sh[34] | sh[34]eb | shbe | shle \
 	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
-	| stormy16 | strongarm \
+	| strongarm \
 	| tahoe | thumb | tic80 | tron \
 	| v850 \
 	| we32k \
-	| x86 | xscale \
+	| x86 | xscale | xstormy16 \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -304,14 +303,13 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
 	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
 	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -786,6 +784,12 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1070,7 +1074,7 @@ case $os in
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos*)
+	      | -os2* | -vos* | -palmos* | -uclinux*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
diff --git a/po/de.gmo b/po/de.gmo
index 1f3fc34fca9e72d62afb937bc047d99c1bbaaa35..2b48b4051b043291f404406db42a651ffeffeba6 100644
GIT binary patch
delta 2052
zcmY+^OKenC7{Ku}!%QiqErr@r3fM~pT5<Yrt)kF}s0g*z7qv-oAy!%>Awe`67GsDD
zNmv+%F`5_+E(9Wxgh^cKhFIex3egxbCZ-F~C}`qFOo-9{|MrH+$$a;B?wPsg`Q4cv
zE)L{>T$U*Y$^@~B_$eJi9#3VtP);lip#e|g4R{t?@H=e9e{mhQmWL4GDEj+-coV*y
zcnX(re;zAw4(lE2_xVc5EDB*MU#!F$Y(wX;8To`QTq<xB?Pvm<a0YwuFfPZB&<T8t
z_V))mpbz_e6_*v*5X(}#sWj3sf;rrctMMqhvNK8h1zgX4cJchcxx^84rF(H0U%@*3
z2CMK_w4W<z|ErnJjkpc#-0B%Cm`64v6w!g+LLZz(o(-3<1Ft0Cx6pgU{U|zteb|Qu
zbca4eci{V^{SvyfYpUlL*p2yC8pf!s#22s(i+CTtiFWieI>2A(ku=gcgb~)_6X=Sb
z!w8FLu6&TRe}Rtk8@lzi%)%XRtKs}3D%)wWqrK=(yohc18s_k0<P-knVv?p=mIE}Q
z&-G$6ZbgzRJdN($A@unZ*q$OMa1Hkv9x_MP*RuaNQyHLP1J0n?eH2~shv)-yXoqP=
zbz-eZQ`mv*YS@GJ^E}$mJ7_X~i7x0Ox^q|238rZD`-VIfb|rM80}tXhoJNnNgs%7;
zI^bnA7wm;J2$kq_E70E$;ac2@uKW<X^{4R`ypXhK7~T7P7ZuN9XW~Khfj4jv&!Stk
zfQu7dg&ml~TX7OS`vNkza0Z?5r^)?AbfBx)i!CI83z)>)eE+AZw9{}5{lR&3fGqFi
zDE6T%e+eDnb=-vSBXbLv(WA+*d^!vp(EfHIV}@7pL3|I*p?|O&tC?k;e|1At9B3Sy
z@Li1X6EvxQL35#kZ88_y(K8-H+Yh1>ejEGo96GUuY>PIb-}mF~xEsxxW7z2Xf0~Lb
z`y72>4o#-Nk$efw%*y|Ress$p$CUTPR$`DKvBLv|#dEixjfAgp58;X}kIWMuM*GTF
zaB)?e2@8Mc*UHGXS_sRi4-*4~lOm78-9#VJNjyrp{awTz1g9A1!4kZSuz0-g=oZ2q
zXE*Zk8Bve3UL!A*_%*|E!i?tFt}EumqNHU9K18@np0USblBJ1ziE4sViOU$*`;)rk
z$K^4u<WYS7Hh5kcD@pOZEFR0IxOV;JPHs&)k8y(V)wGy+LqxeZlzRwsXFK6PZM-G^
zG5o)n%?pwSUmXjn5EtL|P+C`hBvtv$^vqKSI`&UJ`RuN#LaySgQrY5xbZNY5He24+
t9d&hX?CCA7t^GP(Xs=&dI#OSgDji>bIGr7z+J7J_Ojb3Q_B8%b_8)jstUUk#

delta 2422
zcmZwIYfM{Z9LMp8%SKT~xs*|_oJ}WeE0+qL8;Xo>$W<A`4IFL^N+;FXB~TC-V@;;U
z#4R&+#20F^VN5nB@kO1+z3_#%1Ye-T#0y4VnCV`b#Tnzo#QFW59tcLC^nX6*Jg4Wm
z{!cqm|7kEjUywOrDEo<<6&c1Hkt;b+%3Q{HaXor4h^5$#Wf;eGcp5F7L4E%+-iEI1
zls<HGy#sS_Kd$C+^LXmSJd63<colELDa^xZyb<T{2K*h>f%`gRGO-L-U^#NjR3jf#
z$3Y!7V+r<PHI8F3zKve`H=l5#j(@=G@iJ<Je<2^^qEa0fI+mjb)Pz19z+3P*Y9*$e
z`mgW~uGN?ZQ0mx(TA4>MNdM+VPKs~_SK&oeLs!s;UMe-fM!XffQQsePJc_KgnM8GX
z7WMorG6r)MD={-Sb-xBJu6r@Akvzpo08gTp>}ynqKRfkTQCm^LP0h3(%WyAhtDZ-t
z%Otko8RTPr<Dm94cvxFhiVawfg?K2B_1BD!P+{RDD#<=Z)qjiX=nvEuSd2;os6`8V
zPz^naT9IQ|j&Gn=?gH|t`5Tqo?t)bNKGbs!1+4#CPIgg2HkxtN(j7-Na1JZdjQJ7Q
zaGlTSlzi2=9@}vPj-lR)Q>YnFqrU$Osy#QO)4&3#jzh?<m?z?#sG;Xj4ZVZP&N);A
zSCEhKFghjC2FF&^N<4~s3tm7i@iF9M5**adTd1x02sOZ2Y{doC*2Nq7mX@X;HL|Bs
zS^qLBd0t2I(40Xv@E+>HdAuDLP%Bl!vS_Q?aU+hR>Q6b>GpGSCIC|Mnz8^Q6IN8dL
zKIEP`i5l?-Sc%iP3I9ZP!Bp|?DL1yER%QS-fpO=00yTiMScBi7CX&ObH=`FTuoG+a
z{y)QsIy#3B;7_QPsG(JL(2RAs51Fia4YjB5q8gk-HCV{>G=U&?VlOKBrtnVu5Y^tV
zsD84TMTy@3-JDoBhDyd)P)T$il>_sr+)x6jej{qY9e5YUQ3HG5@eAkvCEP-Nv6V`;
zPGm7mA8H_nF|G$+;zUV!8cA3)i~1qCgj)JsMv;bEe$8wTu~@VM-Go-GgSejv5Gw50
zQc*jrovR>fVwAXj?6r@nKcTxh&vLHCeS|WcMX-yXqn2Mu+Ds_vSW$aMyHF*A&`h<=
zD*IB{N4+H~%85p&fBTO?l@AkLM4c`utf0NLN+hk!RzgevAfeJnXm2f|g&=k8UpTP0
z>R!}aqc=!7qBlatP25A|Y5vMqC60=I6m}5#L=~Z8?>#<5=x4Tx=pkwe6}^UgiF#c)
zr46%*^u-ECZL5pe=3EDIIZ+aACzJ!Ngnp?=YST_AAs5R|PIePpl5b`mO^XkQ2S-EU
z$`n@UQ1rmTNGLX9taXFd$WY`!%(?ZSisj$+TmRpTvHbsPWa$}W^+yMFNHk=Bp1hXb
zmY&}g>yL%iD`SZDN1`LimYmO4xT*q{-(Op`IaypVo1VDfDJ-(u>_I*j3)^Gr3JpcV
z1BvfEYgR44<4=6)@%WZ%G?LUe!<9Rk^5IB$IK1rcXml{S;K@r%UMo70?%gvw5@UcG
bO*k4Gx_B^Vy2HaUE76g&HhJFr{mOp;19=hv

diff --git a/po/de.po b/po/de.po
index cc129edf..50915675 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-11-05 11:08+0100\n"
+"POT-Creation-Date: 2001-11-12 10:34+0100\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"
@@ -31,77 +31,78 @@ msgstr ""
 msgid "fatal error: "
 msgstr "fataler Fehler: %s\n"
 
-#: src/conflicts.c:48
+#: src/conflicts.c:45
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"
 
-#: src/conflicts.c:114 src/conflicts.c:137
+#: src/conflicts.c:111 src/conflicts.c:134
 msgid "reduce"
 msgstr "durch Reduzierung gelöst"
 
-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130
 msgid "shift"
 msgstr "durch Schieben gelöst"
 
-#: src/conflicts.c:141
+#: src/conflicts.c:138
 msgid "an error"
 msgstr "als Fehler betrachtet"
 
-#: src/conflicts.c:421
-msgid " 1 shift/reduce conflict"
-msgstr " 1 Schiebe/Reduziere Konflikt"
-
-#: src/conflicts.c:426
-#, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d Schiebe/Reduziere Konflikte"
+#: src/conflicts.c:411
+#, fuzzy, c-format
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] " %d Schiebe/Reduziere Konflikte"
 
-#: src/conflicts.c:432
-msgid " and"
+#: src/conflicts.c:418
+#, fuzzy
+msgid "and"
 msgstr " und"
 
-#: src/conflicts.c:438
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 Reduziere/Reduziere Konflikt"
-
-#: src/conflicts.c:443
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d Reduziere/Reduziere Konflikte"
+#: src/conflicts.c:424
+#, fuzzy, c-format
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] " %d Reduziere/Reduziere Konflikte"
 
-#: src/conflicts.c:480
-#, c-format
-msgid "State %d contains"
+#: src/conflicts.c:448
+#, fuzzy, c-format
+msgid "State %d contains "
 msgstr "Zustand %d enthält"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:491
+#: src/conflicts.c:481
 msgid "conflicts: "
 msgstr "Konflikte: "
 
-#: src/conflicts.c:493
+#: src/conflicts.c:483
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d Schiebe/Reduziere"
 
-#: src/conflicts.c:497
+#: src/conflicts.c:487
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d Reduziere/Reduziere"
 
-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497
 #, c-format
-msgid "%s contains"
-msgstr "%s enthält"
+msgid "%s contains "
+msgstr "%s enthält "
+
+#: src/conflicts.c:500
+#, fuzzy, c-format
+msgid "expected %d shift/reduce conflict"
+msgid_plural "expected %d shift/reduce conflicts"
+msgstr[0] " %d Schiebe/Reduziere Konflikte"
 
-#: src/conflicts.c:588 src/conflicts.c:709
+#: src/conflicts.c:587 src/conflicts.c:707
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduziere mit Regel %d (%s)]\n"
 
-#: src/conflicts.c:600 src/print.c:171
+#: src/conflicts.c:598 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,12 +111,12 @@ msgstr ""
 "    $default\treduziere mit Regel %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:689 src/conflicts.c:703
+#: src/conflicts.c:687 src/conflicts.c:701
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduziere mit Tegel %d (%s)\n"
 
-#: src/conflicts.c:730
+#: src/conflicts.c:727
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"
@@ -288,7 +289,7 @@ msgstr ""
 msgid "`%s' requires an argument"
 msgstr "%s: die Option »%s« erfordert ein Argument\n"
 
-#: src/main.c:125
+#: src/main.c:128
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"
@@ -367,7 +368,7 @@ msgid "empty"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:244
+#: src/print.c:245
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -375,7 +376,7 @@ msgstr ""
 "Terminale und die Regeln un denen sie verwendet werden\n"
 "\n"
 
-#: src/print.c:268
+#: src/print.c:269
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -383,11 +384,11 @@ msgstr ""
 "Nicht-Terminal und die Regeln in denen sie verwendet werden\n"
 "\n"
 
-#: src/print.c:294
+#: src/print.c:295
 msgid " on left:"
 msgstr " auf der linken Seite:"
 
-#: src/print.c:309
+#: src/print.c:310
 msgid " on right:"
 msgstr " auf der rechten Seite:"
 
@@ -628,14 +629,14 @@ msgstr "das Startsymbol %s ist undefiniert"
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"
 
-#: src/reduce.c:401
+#: src/reduce.c:405
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "Nutzlose Nicht-Terminale:\n"
 "\n"
 
-#: src/reduce.c:416
+#: src/reduce.c:419
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -644,7 +645,7 @@ msgstr ""
 "Nicht genutzte Terminale:\n"
 "\n"
 
-#: src/reduce.c:427
+#: src/reduce.c:430
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -653,7 +654,7 @@ msgstr ""
 "Ungenutzte Regeln:\n"
 "\n"
 
-#: src/reduce.c:456
+#: src/reduce.c:458
 msgid ""
 "Variables\n"
 "---------\n"
@@ -663,7 +664,7 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:458
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Wert   Sprec    Sassoc    Tag\n"
 
@@ -677,7 +678,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:474
+#: src/reduce.c:473
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -687,36 +688,31 @@ msgstr ""
 "----------------------\n"
 "\n"
 
-#: src/reduce.c:491
+#: src/reduce.c:495
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d wurde niemals reduziert\n"
 
-#: src/reduce.c:493
-#, c-format
-msgid "%s contains "
-msgstr "%s enthält "
-
-#: src/reduce.c:497
+#: src/reduce.c:501
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ungenutzte Nicht-Terminal"
 
-#: src/reduce.c:502
+#: src/reduce.c:506
 msgid " and "
 msgstr " und "
 
-#: src/reduce.c:506
+#: src/reduce.c:510
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ungenutzte Regel"
 
-#: src/reduce.c:539
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"
 
-#: src/reduce.c:552
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -812,6 +808,15 @@ msgstr ""
 msgid "'"
 msgstr ""
 
+#~ msgid " 1 shift/reduce conflict"
+#~ msgstr " 1 Schiebe/Reduziere Konflikt"
+
+#~ msgid " 1 reduce/reduce conflict"
+#~ msgstr " 1 Reduziere/Reduziere Konflikt"
+
+#~ msgid "%s contains"
+#~ msgstr "%s enthält"
+
 #~ 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 e2aba02369f95bb1ab9b91045ee443dacf2b0f7c..d73c15a9c18a25e74109786fa7ccb952607f4ed8 100644
GIT binary patch
delta 1975
zcmY+_O>9(E7=YoggLL`}wLn|jqEjn~$e&hPX**8qAE0PK1sjM>l%TFKCMIfJ+!X5y
zjKq;>QWmlx8gZc+O^8WDG!1H^;09v}0-NH-Xp}}1<HGlyxsBnZXP$HK%suCP-#O>@
zRN>%Ya<TckBS9IZc2X~7A`(2hFrp3L%SJ54Pw`efjjQlCT!F1M5jo7GzaPVHd^vRz
z7ju0I8}KZ);Dw4wT%~b6H|lC5ny?cYJJuq9(Zfd_=FyI};7vG+J@^W?;>YL&rqTX>
zMhE;Ieg0p(0kd3a7q%Pf0F5==*oDjSbu_YL>HV*9CD(K4z#a7!2hd3O;JujOGW-e~
z@h7yOD`@`>%;rYig#K<+P4#{nBq1iyf!;(P{0w<E&f|K#l78Pp?>VmX=mf@aBOX9A
zbP~<LH|hQJXl9!hRRZk7Ra_S^>7emEjcT00t#}aa=o~u0EV?AM+#JTmxCD2g5$(eq
zPM~|`czXW}bf6hD<r!vShC4Bb{Y~WGj`ncFl)Qjz@eN#qCFCzI^Wo<F107%y;rU!Q
z-i&?drrM2W?nU(ZchP~T(f%){_vg@Yx|+%V?KDQ3D{J~1`oJXKhM%JyUP7LUg^Wrz
zqZQ5Eiqv5=Q%|A4AIAmw0s7ntBndHvbQRyD6Th6$7^Ja)ux`O2wBvo~566*Zk9Uv_
z9LLaIegfNZ8hh~)Zon48bV)X&0X&P|Ka8vKOU&V~sYxSwGXv{zC+<eRi%-xQpH9F3
z5uIp;v*rK=^mk+E@q396H}N6#J#i#;3JqWuhwx8ak3B@e5+$*hh7TOZ0X&JOYz`fu
zn)TR%omkEcx~ay|h(1CycMjde|KOuoMS9pSu^r98)93`>#)okd+dTij&~Qffeg|wo
zf{ka;HF_0|{3yB!XRrtV!uxPFH(ABlkIXp^;9WS0efR?!Pz_t3X0#(oh(286`5&QS
zM0=4w;}AOI577zDU@uxWQwvlhGfIog=Y%&=&D5P#pR+t(As)kxRQFJhnx|S4Q#M~r
z%Y1Rh!_<4IM(0x8Pc<^L^#s-EoM=DQ$elc|it^hK%310{v-Ak{ZmN-6wpK{WuT<Nf
zSNFj#sz-@cxu$p;TtCZB>JF+$%}weu@pg_X>Vs5|sHwJ$P`8y^|9?D5lWoFAey(zJ
z9e7^ni#yihvJ946*M1Ce=?jEYSN_jgpMJd^hp5@~`T_J9K2-cR+p*kjnn}NL>snab
wa#>lbs(GubI91zFtgky$nyo8jO1+KSvc=;|yNmtH{x0QP-p`b-wtZLqAADG)l>h($

delta 2411
zcmZ|QZERCj9LMoPH&@1rZtcdLz&s2XQ#Zzdbv%qcAPgsCLvfBLx0JTTYVCy9M3(4v
z#zf^I##9oGZv+xURE$y<qaiWI7!#w55+jKUCO%||CNs(le5c>v?JY>ell}WSJ@?-8
z@IU8vhuS~vbS?&qj~dDdF^{M$GRDC`i7_|h%$c;|0$hS&Y`|e$jL)LQQ>gnVaUo85
zmX#WF6W^OLfSou8`|>&_N~MB^F`SEsu^dn0E%-jx;Mb@Drm-0Pvy8a`14xqzB7bHc
z9~y88-imFw0*9~~525-wffZWnSt?~TOrmD^E%Ilk_|U+AdIq>j6RO8X?8f<+LS^Ex
z*M1u7`ThfH0wr`R>rt8M!S(nMRx!RgMP)XAjOyqsY{bi`%q-$!ErziQ2R$D~vTVjt
z10F;@|1L7NIgicwlXpFIV}7gFpeC{lomMIi6{TzfHQ*<x_VcK%n9W74v=$q%9ko?)
z<d~Ro?8WDhKXZ-`4e%psi%RIE8v_`^e$;~Yl#_o;Wt;{bvg6)`_fP|UgW7_>Q4^?P
zb{5-E9c@QtB#BM<G%9oNAdi>}s6#!C>c1?Qf6ihZ-&Y37zfR*24N6@K)xk@sfj>eG
z@SWHG2Wp^NM!y65P<#70>i(DUHav~$?|Woy<70Go!BnC$SLfN`P*JLOqGt3Y>cL~E
z*X>iZ_`BC$&TM>q4`UIoMh&nImHGi>j%Eba-+pYzqqqpqp(bz{b)OSr`8q81$ayo%
zQLj@c>NV*_o%%f(#wTzYo<Z&5FQ^q4^KPkqDc+7FXz`%uo2ZO^j)V9YG6%=>Gm2&&
zL*0-;&G<Fs26F*5&?WDCkUaCOX+WL+E>xy^J@=s&@(On0>)4D_sI9GLHM)NTuGRaW
zq@om_L=E@>-i2SHQdPr;4r427Wy7dcK94&6Z(~1BpblLzCr+8DLQSv-H{$@Z2J<Rv
zLT9i=@BhzK$fB9U5!aqIVLNU`E}0{^0^h(p@gj1rOdV-ahhbca1K5VopcZr%_536%
zW51!EE8@gzLDlFmY12hTGv19Ycm%c5b%a*dLnt$YgvxTleGUhR)x;`dnAl0E>>#uV
zohAJ^Z6H*Xu|m05`(G%UvC_^#cUMLB-L$R6FtLl!Dzw6Gf+Uy)1iw-4kIyDtLuhaB
zChj9T31vWKYaaLQQdJpk()bTh(SBNDJE5X1=um3^RCW^^2^~=FvC=n-m_ckI^loeG
zRPHCXxwWew+Fp|C9%Qw)5_)~z0rmRm#HuVMw8w=q<W<(A_LxKL{;MwY+B;D1vETdN
zhdNyMWOw-I&ev}HyeryZm4$gsW9~)&3p1Sk@z`V0cyk^b9Zl^`CZd_Nv5R9i{a|8m
z#=G>NhJWANVz1wgu`Snha^)FgBdM4^vdc<8%T1SV_El`lL^5%W${aG0L@J$I71-jh
zEzD>%ogX8bxRlCINww@#p#~@aj5}}cipA59CL?2!M-uT=X7uW<n#+~WuGiPKH~fD$
u2aG*njg6;lGGY^B`?3?EUvt^Yw|rF_lQy2tL}H_bWiW+!uA};kl79fINg)IP

diff --git a/po/es.po b/po/es.po
index b62ebee6..0a0a9d90 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-11-05 11:08+0100\n"
+"POT-Creation-Date: 2001-11-12 10:34+0100\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"
@@ -63,55 +63,50 @@ msgstr ""
 msgid "fatal error: "
 msgstr "error grave: %s\n"
 
-#: src/conflicts.c:48
+#: src/conflicts.c:45
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "El conflicto en el estado %s entre la regla %d y el terminal %s se resuelve "
 "como %s.\n"
 
-#: src/conflicts.c:114 src/conflicts.c:137
+#: src/conflicts.c:111 src/conflicts.c:134
 msgid "reduce"
 msgstr "reduce"
 
-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130
 msgid "shift"
 msgstr "desplaza"
 
-#: src/conflicts.c:141
+#: src/conflicts.c:138
 msgid "an error"
 msgstr "un error"
 
-#: src/conflicts.c:421
-msgid " 1 shift/reduce conflict"
-msgstr " 1 conflicto desplazamiento/reducción"
-
-#: src/conflicts.c:426
-#, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d conflictos desplazamiento/reducción"
+#: src/conflicts.c:411
+#, fuzzy, c-format
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] " %d conflictos desplazamiento/reducción"
 
-#: src/conflicts.c:432
-msgid " and"
+#: src/conflicts.c:418
+#, fuzzy
+msgid "and"
 msgstr " y"
 
-#: src/conflicts.c:438
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 conflicto reducción/reducción"
-
-#: src/conflicts.c:443
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d conflictos reducción/reducción"
+#: src/conflicts.c:424
+#, fuzzy, c-format
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] " %d conflictos reducción/reducción"
 
-#: src/conflicts.c:480
-#, c-format
-msgid "State %d contains"
+#: src/conflicts.c:448
+#, fuzzy, c-format
+msgid "State %d contains "
 msgstr "El estado %d contiene"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:491
+#: src/conflicts.c:481
 msgid "conflicts: "
 msgstr "conflictos: "
 
@@ -127,7 +122,7 @@ msgstr "conflictos: "
 # ok
 # ngp
 #
-#: src/conflicts.c:493
+#: src/conflicts.c:483
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"
@@ -144,22 +139,28 @@ msgstr " %d desplazamiento(s)/reducci
 #
 # ok
 # ngp
-#: src/conflicts.c:497
+#: src/conflicts.c:487
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"
 
-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497
 #, c-format
-msgid "%s contains"
-msgstr "%s contiene"
+msgid "%s contains "
+msgstr "%s contiene "
+
+#: src/conflicts.c:500
+#, fuzzy, c-format
+msgid "expected %d shift/reduce conflict"
+msgid_plural "expected %d shift/reduce conflicts"
+msgstr[0] " %d conflictos desplazamiento/reducción"
 
-#: src/conflicts.c:588 src/conflicts.c:709
+#: src/conflicts.c:587 src/conflicts.c:707
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduce usando la regla  %d (%s)]\n"
 
-#: src/conflicts.c:600 src/print.c:171
+#: src/conflicts.c:598 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -168,12 +169,12 @@ msgstr ""
 "    $default\treduce usando la regla %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:689 src/conflicts.c:703
+#: src/conflicts.c:687 src/conflicts.c:701
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduce usando la regla  %d (%s)\n"
 
-#: src/conflicts.c:730
+#: src/conflicts.c:727
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduce usando la regla %d (%s)\n"
@@ -356,7 +357,7 @@ msgstr ""
 msgid "`%s' requires an argument"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 
-#: src/main.c:125
+#: src/main.c:128
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"
@@ -440,7 +441,7 @@ msgid "empty"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:244
+#: src/print.c:245
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -448,18 +449,18 @@ msgstr ""
 "Terminales con las reglas donde aparecen\n"
 "\n"
 
-#: src/print.c:268
+#: 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:294
+#: src/print.c:295
 msgid " on left:"
 msgstr " en la izquierda:"
 
-#: src/print.c:309
+#: src/print.c:310
 msgid " on right:"
 msgstr " en la derecha:"
 
@@ -722,14 +723,14 @@ msgstr "el s
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"
 
-#: src/reduce.c:401
+#: src/reduce.c:405
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "No terminales sin uso:\n"
 "\n"
 
-#: src/reduce.c:416
+#: src/reduce.c:419
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -738,7 +739,7 @@ msgstr ""
 "Terminales que no se usan:\n"
 "\n"
 
-#: src/reduce.c:427
+#: src/reduce.c:430
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -747,7 +748,7 @@ msgstr ""
 "Reglas sin uso:\n"
 "\n"
 
-#: src/reduce.c:456
+#: src/reduce.c:458
 msgid ""
 "Variables\n"
 "---------\n"
@@ -757,7 +758,7 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:458
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valor  Sprec    Sasoc     Tag\n"
 
@@ -771,7 +772,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:474
+#: src/reduce.c:473
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -781,31 +782,26 @@ msgstr ""
 "--------------------\n"
 "\n"
 
-#: src/reduce.c:491
+#: src/reduce.c:495
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reglas que nunca se han reducido\n"
 
-#: src/reduce.c:493
-#, c-format
-msgid "%s contains "
-msgstr "%s contiene "
-
-#: src/reduce.c:497
+#: src/reduce.c:501
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d no terminales %s sin uso"
 
-#: src/reduce.c:502
+#: src/reduce.c:506
 msgid " and "
 msgstr " y "
 
-#: src/reduce.c:506
+#: src/reduce.c:510
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d regla%s sin uso"
 
-#: src/reduce.c:539
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia"
@@ -822,7 +818,7 @@ msgstr "El s
 # Te recomiendo `la reducción de %s' en vez de seguir el estilo inglés y
 # usar participios - cll
 # un error lo tiene cualquiera - ngp
-#: src/reduce.c:552
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -993,6 +989,15 @@ msgstr ""
 #~ "\n"
 #~ "%s deriva\n"
 
+#~ msgid " 1 shift/reduce conflict"
+#~ msgstr " 1 conflicto desplazamiento/reducción"
+
+#~ msgid " 1 reduce/reduce conflict"
+#~ msgstr " 1 conflicto reducción/reducción"
+
+#~ msgid "%s contains"
+#~ msgstr "%s contiene"
+
 #~ 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/et.gmo b/po/et.gmo
index 8ca9d9fd6be9eab7139938963a0ebd2c73298d04..e54bd55fd8e1969be7978c14abb1669eaa6bedc3 100644
GIT binary patch
delta 3965
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
AvH$=8

delta 3531
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

diff --git a/po/et.po b/po/et.po
index 88be6f5d..994586fc 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.29f\n"
-"POT-Creation-Date: 2001-11-05 11:08+0100\n"
-"PO-Revision-Date: 2001-10-19 17:53+02:00\n"
+"Project-Id-Version: bison 1.30a\n"
+"POT-Creation-Date: 2001-11-12 10:34+0100\n"
+"PO-Revision-Date: 2001-11-05 21:19+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -30,77 +30,78 @@ msgstr "hoiatus: "
 msgid "fatal error: "
 msgstr "fataalne viga: "
 
-#: src/conflicts.c:48
+#: src/conflicts.c:45
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
 
-#: src/conflicts.c:114 src/conflicts.c:137
+#: src/conflicts.c:111 src/conflicts.c:134
 msgid "reduce"
 msgstr "redutseerimine"
 
-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130
 msgid "shift"
 msgstr "nihutamine"
 
-#: src/conflicts.c:141
+#: src/conflicts.c:138
 msgid "an error"
 msgstr "viga"
 
-#: src/conflicts.c:421
-msgid " 1 shift/reduce conflict"
-msgstr " 1 nihutamine/redutseerimine konflikt"
-
-#: src/conflicts.c:426
-#, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d nihutamine/redutseerimine konflikti"
+#: src/conflicts.c:411
+#, fuzzy, c-format
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] " %d nihutamine/redutseerimine konflikti"
 
-#: src/conflicts.c:432
-msgid " and"
+#: src/conflicts.c:418
+#, fuzzy
+msgid "and"
 msgstr " ja"
 
-#: src/conflicts.c:438
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 redutseerimine/redutseerimine konflikt"
-
-#: src/conflicts.c:443
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d redutseerimine/redutseerimine konflikti"
+#: src/conflicts.c:424
+#, fuzzy, c-format
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] " %d redutseerimine/redutseerimine konflikti"
 
-#: src/conflicts.c:480
-#, c-format
-msgid "State %d contains"
+#: src/conflicts.c:448
+#, fuzzy, c-format
+msgid "State %d contains "
 msgstr "Olek %d sisaldab"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:491
+#: src/conflicts.c:481
 msgid "conflicts: "
 msgstr "konfliktid: "
 
-#: src/conflicts.c:493
+#: src/conflicts.c:483
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"
 
-#: src/conflicts.c:497
+#: src/conflicts.c:487
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"
 
-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497
 #, c-format
-msgid "%s contains"
-msgstr "%s sisaldab"
+msgid "%s contains "
+msgstr "%s sisaldab "
 
-#: src/conflicts.c:588 src/conflicts.c:709
+#: src/conflicts.c:500
+#, fuzzy, c-format
+msgid "expected %d shift/reduce conflict"
+msgid_plural "expected %d shift/reduce conflicts"
+msgstr[0] " %d nihutamine/redutseerimine konflikti"
+
+#: src/conflicts.c:587 src/conflicts.c:707
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 
-#: src/conflicts.c:600 src/print.c:171
+#: src/conflicts.c:598 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -109,12 +110,12 @@ msgstr ""
 "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:689 src/conflicts.c:703
+#: src/conflicts.c:687 src/conflicts.c:701
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 
-#: src/conflicts.c:730
+#: src/conflicts.c:727
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
@@ -189,7 +190,6 @@ msgstr ""
 "  -k, --token-table          lisa ka sümbolite nimede tabel\n"
 
 #: src/getargs.c:117
-#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
@@ -303,14 +303,14 @@ msgstr "kasuta mitmes
 #: src/lex.c:666
 #, c-format
 msgid "`%s' supports no argument: %s"
-msgstr ""
+msgstr "`%s' ei toeta argumente: %s"
 
 #: src/lex.c:682
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' requires an argument"
-msgstr "%s: võti `%s' nõuab argumenti\n"
+msgstr "võti `%s' nõuab argumenti"
 
-#: src/main.c:125
+#: src/main.c:128
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: sisemine viga: %s\n"
@@ -382,19 +382,19 @@ msgid "empty"
 msgstr "tühi"
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:244
+#: src/print.c:245
 msgid "Terminals, with rules where they appear"
 msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
 
-#: src/print.c:268
+#: src/print.c:269
 msgid "Nonterminals, with rules where they appear"
 msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
 
-#: src/print.c:294
+#: src/print.c:295
 msgid " on left:"
 msgstr " vasakul:"
 
-#: src/print.c:309
+#: src/print.c:310
 msgid " on right:"
 msgstr " paremal:"
 
@@ -632,19 +632,19 @@ msgstr "stardis
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"
 
-#: src/reduce.c:401
+#: src/reduce.c:405
 msgid "Useless nonterminals:"
 msgstr "Kasutamata mitteterminalid:"
 
-#: src/reduce.c:416
+#: src/reduce.c:419
 msgid "Terminals which are not used:"
 msgstr "Terminalid, mida ei kasutatud:"
 
-#: src/reduce.c:427
+#: src/reduce.c:430
 msgid "Useless rules:"
 msgstr "Kasutamata reeglid:"
 
-#: src/reduce.c:456
+#: src/reduce.c:458
 msgid ""
 "Variables\n"
 "---------\n"
@@ -654,7 +654,7 @@ msgstr ""
 "--------\n"
 "\n"
 
-#: src/reduce.c:458
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Value  Sprec    Sassoc    Tag\n"
 
@@ -668,7 +668,7 @@ msgstr ""
 "-------\n"
 "\n"
 
-#: src/reduce.c:474
+#: src/reduce.c:473
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -678,36 +678,31 @@ msgstr ""
 "------------------------\n"
 "\n"
 
-#: src/reduce.c:491
+#: src/reduce.c:495
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reeglit ei redutseeritud\n"
 
-#: src/reduce.c:493
-#, c-format
-msgid "%s contains "
-msgstr "%s sisaldab "
-
-#: src/reduce.c:497
+#: src/reduce.c:501
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d kasutamata mitteterminali%s"
 
-#: src/reduce.c:502
+#: src/reduce.c:506
 msgid " and "
 msgstr " ja "
 
-#: src/reduce.c:506
+#: src/reduce.c:510
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d kasutamata reeglit%s"
 
-#: src/reduce.c:539
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
 
-#: src/reduce.c:552
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -801,3 +796,12 @@ msgstr "`"
 #: lib/quotearg.c:269
 msgid "'"
 msgstr "'"
+
+#~ msgid " 1 shift/reduce conflict"
+#~ msgstr " 1 nihutamine/redutseerimine konflikt"
+
+#~ msgid " 1 reduce/reduce conflict"
+#~ msgstr " 1 redutseerimine/redutseerimine konflikt"
+
+#~ msgid "%s contains"
+#~ msgstr "%s sisaldab"
diff --git a/po/fr.gmo b/po/fr.gmo
index 5c023201822339c737ab822026480c1b2d2d8ff1..cc8a500e4487761d30a1fd5d2bcafdbc631ba9c2 100644
GIT binary patch
delta 3142
zcmXxmc~Dhl7{~GF5{MuosNfz4p(I?8Ew>b~+%dA;a7}^hQi=<>rQ9SVHOp<RY^=1g
z0ozP(V>+W_<%~0BHT{*P42|O-RL*EQHEQD6_jm5wJ3jaGo^#KA&-*^-c@Lghv2|If
zrE~N?qwOGi6C0z=&SG<WK4?F8Fzb%LU{}0}{V+DcEDLk+A)JXG)}gL{4>Rzjvl%;a
zY#q($S`wz3g{)7cV+EMZ7n3jv=VA;l$2hFPc&tMWv<=g6KYDly`{E_c$9vcda}&+F
z;bhdrs!;c-!vyYcyXa`(caYy$6KaJgum`rF2Dt5xlel|Nj<az9j=?^-3YCdn?)(WH
z$njP5Fqu_7jCrVumrL$%>***}`!RrLa5SF9QjB7{u~>#FI0N%=nLB?FcXHf>**LT_
zV_^jzW59bzs_iJxFB8wB7J3asn(-YvT1gtCYbB+q3@pVraSv+d*^I)aHU*X1Ao7*f
zBgwJ1@Ih>J=g*@S)a;I1P`~>dRbENm$iD{eL4GxGF|r7oh8lPg>ibQoi5^Dk&%Q;~
z#!r}o&8X`Vc)(g&K6+S!%Ircc#0KPP*lARzzUxl@nT*}ygl?S31J{KfdN>_<3bq!x
z#J0NQL#Rw0N9}?iQ7gNH?J$J`nSi}fHw>aCvIaHrw^1257@|``=LmMeYd8q+qpEli
zqbj8f(ZkKC8@`V$+Ag3bb`^(U8!D3p>}CCK0_yt3$lPo<YT_TEhoNuiC<A|>CJ^9T
zr9K5!z5P-9wH#F=K~zTeB6GCE$WQGo>c-8easEPW#~5az@v~5mun09y6|${EwujEB
zfY||L@^+cMp$Xi={@Brr{9qV9!f_DOaTn_P<ERz>fGXNss7IN`MXH5d)C7y1b5NOE
zkEz=KyXo-KvnJGg;1lOb)Jo2wp4~;~T~x89vAmHu7IlLysEiy!=5D8*&8Q5vp<ZNh
z45o3rU>^6kesuK1S*V%Sq6T~o^=v;xW#XJWe*^t$XEW=3KB{KsBXhIYQJMM-HIYls
ze^HOLC(j{(<1sXj&O|z;xCdkLSJXsWaSYx^&3p`Z{R+#l0F%jgBaX$wD6{LxA}y1>
zr5DsVRP}E_O=vp~$InsY-^eEagXzSwj8ixibMPkWg1%G=Wnsfn$K|NvTj|c%qiW?4
zYDHflb!VqgnY)Pb_$Ttu?((4`%_0rj4I>AVf8AgPCx+r0R4R|6e%ON1_&aLF*HQ0>
z3@*~j%2AJC39=~Lha>PyBpKF*qcD?IDKizQ2{+(GJP@Lz)U;wJOeP(gSvsmFMxZ7*
z9W}vPRJDJKdL$QdGG4(X%*l;xvtn$|aS&s%8mHk}RPlX}T2SZ;9aV8E4@@(jin_r@
z)Ji`<>c%dkR-m`i5Xe9cG#gcn)u;jAKyAwlsNc7u9$g>4)WQm}GnOHl2-!k9Tx07Z
zC+uV7UiLLABmbZ>5yNOtpobn-IU7*FZ*<3(QJHGP(OCFsWSn)V8kt0>P4z!{{@dwn
zB9;<m{>jLPR;9Kig1?Fl^q+FaGqIFVHeM#QW!n)uh_S@uL<6A~jNoUahW;=@i|M8P
zub4sTIZY?(2^HO|#M8t|Lai=>|EXfzOemHAx2|+vBDBTSR2ORNBKU8^jr5;!$0Zml
z;$tnb+MU!k*-EIGD0Y84kvYFnqkdb(ryfx)v4v2fsi}~w38kH<=085aX6Vl$W)l+#
zwR9p)Yk$r^j1*x4eHF<RcTU6;^NG1SplQ4D0`y-@RXRbVhW+9l=O6Lc(kT`Y>_Y$l
z4HI>OrY-rT-&5{gOT-t6#|RbNcw!cjN~m=ww71n>h~V#(2k6gp$CbFo^~>>j*M9{o
zh!l71VKT8;_m3h}!P5w}6~s2b$6qO2P7HR(s_ZUACK2P##o;2?f7U7V-Y8awwv6B{
z&eox25^;;Fy_#w-ydq(JAYt|5CBd4URaKR>6;<KN#6f}ZyPb};3ol6B8P`5H&&wS=
gJij1(JMDPX-V1%ZhKn-h1;R%%e~S$t9<aZ|e<nXF>i_@%

delta 3526
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

diff --git a/po/fr.po b/po/fr.po
index 00743a19..b15ae515 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.29f\n"
-"POT-Creation-Date: 2001-11-05 11:08+0100\n"
+"POT-Creation-Date: 2001-11-12 10:34+0100\n"
 "PO-Revision-Date: 2001-10-19 15:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -31,78 +31,79 @@ msgstr "AVERTISSEMENT: "
 msgid "fatal error: "
 msgstr "erreur fatale: "
 
-#: src/conflicts.c:48
+#: src/conflicts.c:45
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 
-#: src/conflicts.c:114 src/conflicts.c:137
+#: src/conflicts.c:111 src/conflicts.c:134
 msgid "reduce"
 msgstr "réduction"
 
-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130
 msgid "shift"
 msgstr "décalage"
 
-#: src/conflicts.c:141
+#: src/conflicts.c:138
 msgid "an error"
 msgstr "une erreur"
 
-#: src/conflicts.c:421
-msgid " 1 shift/reduce conflict"
-msgstr " 1 conflit décalage/réduction"
-
-#: src/conflicts.c:426
-#, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d conflits décalage/réduction"
+#: src/conflicts.c:411
+#, fuzzy, c-format
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] " %d conflits décalage/réduction"
 
-#: src/conflicts.c:432
-msgid " and"
+#: src/conflicts.c:418
+#, fuzzy
+msgid "and"
 msgstr " et"
 
-#: src/conflicts.c:438
-msgid " 1 reduce/reduce conflict"
-msgstr "1 conflit réduction/réduction"
-
-#: src/conflicts.c:443
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d conflits réduction/réduction"
+#: src/conflicts.c:424
+#, fuzzy, c-format
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] " %d conflits réduction/réduction"
 
-#: src/conflicts.c:480
-#, c-format
-msgid "State %d contains"
+#: src/conflicts.c:448
+#, fuzzy, c-format
+msgid "State %d contains "
 msgstr "L'état %d contient"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:491
+#: src/conflicts.c:481
 msgid "conflicts: "
 msgstr "conflits: "
 
-#: src/conflicts.c:493
+#: src/conflicts.c:483
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"
 
-#: src/conflicts.c:497
+#: src/conflicts.c:487
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"
 
-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497
 #, c-format
-msgid "%s contains"
-msgstr "%s contient"
+msgid "%s contains "
+msgstr "%s contient "
+
+#: src/conflicts.c:500
+#, fuzzy, c-format
+msgid "expected %d shift/reduce conflict"
+msgid_plural "expected %d shift/reduce conflicts"
+msgstr[0] " %d conflits décalage/réduction"
 
-#: src/conflicts.c:588 src/conflicts.c:709
+#: src/conflicts.c:587 src/conflicts.c:707
 #, 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:600 src/print.c:171
+#: src/conflicts.c:598 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -111,12 +112,12 @@ msgstr ""
 "    $défaut\tréduction par la règle %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:689 src/conflicts.c:703
+#: src/conflicts.c:687 src/conflicts.c:701
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tréduction par la règle %d (%s)\n"
 
-#: src/conflicts.c:730
+#: src/conflicts.c:727
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $défaut\tréduction par la règle %d (%s)\n"
@@ -316,7 +317,7 @@ msgstr ""
 msgid "`%s' requires an argument"
 msgstr "%s: l'option %s requiert un paramètre\n"
 
-#: src/main.c:125
+#: src/main.c:128
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: erreur interne: %s\n"
@@ -388,19 +389,19 @@ msgid "empty"
 msgstr "vide"
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:244
+#: src/print.c:245
 msgid "Terminals, with rules where they appear"
 msgstr "Terminaux, suivis des règles où ils apparaissent"
 
-#: src/print.c:268
+#: src/print.c:269
 msgid "Nonterminals, with rules where they appear"
 msgstr "Non-terminaux, suivis des règles où ils apparaissent"
 
-#: src/print.c:294
+#: src/print.c:295
 msgid " on left:"
 msgstr " à gauche:"
 
-#: src/print.c:309
+#: src/print.c:310
 msgid " on right:"
 msgstr " à droite:"
 
@@ -639,19 +640,19 @@ msgstr "le symbole de d
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"
 
-#: src/reduce.c:401
+#: src/reduce.c:405
 msgid "Useless nonterminals:"
 msgstr "Non-terminaux inutiles:"
 
-#: src/reduce.c:416
+#: src/reduce.c:419
 msgid "Terminals which are not used:"
 msgstr "Terminaux non utilisés:"
 
-#: src/reduce.c:427
+#: src/reduce.c:430
 msgid "Useless rules:"
 msgstr "Règles inutiles:"
 
-#: src/reduce.c:456
+#: src/reduce.c:458
 msgid ""
 "Variables\n"
 "---------\n"
@@ -661,7 +662,7 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:458
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valeur Spréc    Sassoc    Tag\n"
 
@@ -675,7 +676,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:474
+#: src/reduce.c:473
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -685,36 +686,31 @@ msgstr ""
 "-------------------\n"
 "\n"
 
-#: src/reduce.c:491
+#: src/reduce.c:495
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d règles jamais réduites\n"
 
-#: src/reduce.c:493
-#, c-format
-msgid "%s contains "
-msgstr "%s contient "
-
-#: src/reduce.c:497
+#: src/reduce.c:501
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d catégories non productives%s"
 
-#: src/reduce.c:502
+#: src/reduce.c:506
 msgid " and "
 msgstr " et "
 
-#: src/reduce.c:506
+#: src/reduce.c:510
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d règle(s) non productive(s)%s"
 
-#: src/reduce.c:539
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"
 
-#: src/reduce.c:552
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -809,6 +805,15 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ msgid " 1 shift/reduce conflict"
+#~ msgstr " 1 conflit décalage/réduction"
+
+#~ msgid " 1 reduce/reduce conflict"
+#~ msgstr "1 conflit réduction/réduction"
+
+#~ msgid "%s contains"
+#~ msgstr "%s contient"
+
 #~ msgid "\t\t/* empty */"
 #~ msgstr "\t\t/* epsilon */"
 
diff --git a/po/ja.gmo b/po/ja.gmo
index 6145daf435f7fd65055725d88cdd65de599f7959..b171bb641244aa99a54afa029b6371e1f02e942a 100644
GIT binary patch
delta 2085
zcmZA2YiO2b7{Kw%cka+OZJW9^m-=?F9eU@^c}i`X<=SRhmewZ7rj`=1Y@rmn+LzS_
zMVLyGA${pXL?LfAqr-=aVg&0`S+I(VFrkC=Es5;^fA<j5&93M7obUU-?(2DXqH}cZ
z$afX9j|Z)vxR&@k6)}R-`D|!k7e-uz-{5@w6Kk=sD54IVa4BxbG#*0lKaDrw*~DqQ
zn&Y@Cq7=%o(ykWG>_j`3bD<l{a0fbu$B@4mW>buZ&=<XcOYkJN;k#Iczo7%j=Vsrx
z811kbeSQs_YTSfXPIVwT@f0rP!ZFO?o45$4(HUM!&ZkQv8aeL8G(L?t;VE=LA1D5V
zW+0E=*JCX%z<oFepT(u7`UpE2d<z%j59p2FrIkqbB7=6+fexr2=_5w536CV#Kg2Z0
zKcfREn9DQRfM#wdnwcRS@xmxOru-~A<4LT;^H_srJXL@h?7}wmMbEIYgTv@joxx6=
zz<Kx=I-xndJdGK&hI-NS17+mjj-KO$Yw{X8fKM=uKcX+nW4LCb3LCKz%~&6DOFWMj
z?@6?SchKiP$LsNXq}U==F_XD!^!ara<iBZF#G{<>!Bae?XRsbW#Rj~HR(%Z@9q0!1
zz8!2_iv4IuFCtlw_mEYLNp#>}CH|URPjQmuMA-;CrZ$~eo45=eaR-{>9$bw>Xh*N3
z1Nj2^iwkV{GUGBb*(l^;Gg*y{J(i<O*^LhPVRV8chuN`eC(s$5OD<eSXI{@YWrthQ
z>jx4~Cw_)Ea{dooj`R8U*o_`E1G~`YA4iw^7~0<l$kL6(x9m8w-_cAIGcBvU938+4
z^!y;+g8R_5dj<K6DK@_N7jyvSe8Vn57gE2m4SjA8S}QN3?|%d9{QkdW#}WU7v$2xV
z^kEIUMhDQM8$$>3Hr|8pW3IZXJk6k)=uR9$2YMWR{v&k27jYRDvp)6oA1m3RE@BWJ
z@j<*9$FKvl=*Tai9bH0_71bQDO3{kGunSG~L2SjBunnh>8jn>(H?e`RM(!o-KUWZD
zU=7hjm@YfEZJQw;z?B3)g1JsQlk*mxv$owmL+;0j4=Oei>j@|4KsOO92nV&DSZ)99
z?5rhB4VlTM{0_9ao>u>z#1`UK!kOE8XNc<(o6)R2M3A6dO~HT7uYi9Ix%MF2`-ytz
zZ)z<Fe@autU4+X()^hDWwyyV;t&aoBCDO@B({1h8{7Ni9o9lm@JO69zIBp>p>}1nV
zloGbB#O*|p2Q+_fEuPJU#b@)U_R41U=Orhs1KW}rq9MDt=;*A{Cmz|mXSiwq?p;p~
z?j9d5p2}`6c{P<Sm^+zY)Y6)6X<pUVo;^2jAT{1sSu%d2@_crzY9f{0vT$R;zi<hz
A2><{9

delta 2489
zcmZwIe@s<n9LMpmcm>3Z2?bG@oFGC|yWHpop^{*MmL+H@X%;`7tVSTvKj|*9T<Mnm
zU}WnL3U_ZbrgP)!@{c03O`C)Kqr^W7V{=WLo4KahYID6m_Z%Bp&(8O}&Ux-R&+|Rc
z59ld-zdU?4-PdQ7Mq)1U;B>QHxH^#&r7hVk3)}HF+>HhJ5zfaGn2(py!OWTN^Tn9Q
zeYIyN-opI{=*Len(=2R<-3uGVG=4aT*?1M_U|NdVotTSv;4)M~8_<VsI0L(oSL{{f
zu$`RL;X9avA7c?7#oO@;X3@X-XSp5cBZn1pQidy#XRI34@g~%ZUEcj$sKf?w5gx<4
z@K@A`q|%7$i*Pa4p@VzyUOb37^l#(3z~50rmYHf+fu)#%JCMVAIjP|RT!bf3BX$Mn
zVd8A}`FzhM$gEfms>6+__g_PDv_T99xQKZVoI{8E6vj=7EW{A5K@Qu=Ngeii^@FG>
znm~Q|CDfYmQ>iHop_Wk%uEJX65!;7qe|Qe#uelqiq8xw3TX7z}=!+ge2WwD^Z<|;D
z2CAb^P*ZaXmB26PU{bo<&V1AeF2%*T7BzC+NLO|so$=SIAE81W{D4Z}GUlR>8&;_m
zpoXpt)j$&lrkTBqdhaVva-7owyomQ<2EA*yEJr1}74=*Xs=d8oF4WN%$TZp{vJC7J
za@b#<X=I__3y_br5Nar^kQ{6S>Wf}Pa<}c6gm0s!V6SJtXB0Usyq~k?;%i)j=TQme
zvDB4uB`T3R)b@G>)o?c|kvCC8{~;=oBdEC_MSbA~)QHSx&uWpEphlz?sSjH>7aFP|
zRL7^i2mbJM$U-ly#Cxy}i?I)B+s05M_A~1J-%x8KgT1MdC_{BzgBqcBRDwO2sQus1
zg|<f&mB?uP2eWJV5ck(na~|R?+O`H%2isAJL{U>SfoveVh<fi&REI$pnA)#Ez1M<D
z{5|y1zYTG*2@j&?bQa^O)tZf(yH!|?)u>%D;CU1^B0qWh_)&>2K)t^nmGJ9$KlY=h
zVhptiuVGjj`x&2wn2jN<LS?=KdB*l2vtb92<zdHB4Njnj-0!eeF@QzbfNYNVUr(@g
zI#C`a^r02Hp)g8e_lmO`)B?Lv^mjpxsyKue)5C-kQDIhWb^MBdTAt6M7NtJwX|GOS
z%mBsz0IBLR;t@hqkf;8i<U&PruNAD3(6HVpOk;c+^kq|vhHxXH#i!Ch1c@5mP_$_E
zXI5oBv4-#w0pck_Wv;$IIezJGKW#OY=LpTAN+F?zqcx!6Paw3Q%899^lA9O2iWR82
zFC#X1bwbnoI8jeLPlQW2ttC{J5!&0!3C+LC-GsK$bm9r3k*FiI@>dd@iBv-CB!_s0
z&>}7+RF=9}m8TYHEs^Wq$Ic|}o)+HL+|<?B9B^?OUvAy<QcGiJhdKF8PRG`kEuG#^
z|EZYzY|#1tX3PoxtC4@+F{i$@NvGcSnI~g`l;MQ5b)EH{&FYmLI_q0nJ7SamlQWVF
zLrySQT38YrPH#xqeCYclhXXo|oH;%gPbvCY^mO!_c-_tS?lVE>rk8@wly}@`B14f2
qk?(qQGR`Lq?2BE`_%b1V<m$0;WfR$d=xk&%@@?c)?DMS3#J>T%^)Si+

diff --git a/po/ja.po b/po/ja.po
index 7e0ab544..3825064e 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-11-05 11:08+0100\n"
+"POT-Creation-Date: 2001-11-12 10:34+0100\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"
@@ -31,77 +31,78 @@ msgstr ""
 msgid "fatal error: "
 msgstr "%s: Ã×̿Ū¥¨¥é¡¼: "
 
-#: src/conflicts.c:48
+#: src/conflicts.c:45
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n"
 
-#: src/conflicts.c:114 src/conflicts.c:137
+#: src/conflicts.c:111 src/conflicts.c:134
 msgid "reduce"
 msgstr "´Ô¸µ"
 
-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130
 msgid "shift"
 msgstr "¥·¥Õ¥È"
 
-#: src/conflicts.c:141
+#: src/conflicts.c:138
 msgid "an error"
 msgstr "¥¨¥é¡¼"
 
-#: src/conflicts.c:421
-msgid " 1 shift/reduce conflict"
-msgstr " 1 ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
-
-#: src/conflicts.c:426
-#, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
+#: src/conflicts.c:411
+#, fuzzy, c-format
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
 
-#: src/conflicts.c:432
-msgid " and"
+#: src/conflicts.c:418
+#, fuzzy
+msgid "and"
 msgstr " ¤ª¤è¤Ó"
 
-#: src/conflicts.c:438
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ"
-
-#: src/conflicts.c:443
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d ´Ô¸µ/´Ô¸µ¾×ÆÍ"
+#: src/conflicts.c:424
+#, fuzzy, c-format
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] " %d ´Ô¸µ/´Ô¸µ¾×ÆÍ"
 
-#: src/conflicts.c:480
-#, c-format
-msgid "State %d contains"
+#: src/conflicts.c:448
+#, fuzzy, c-format
+msgid "State %d contains "
 msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:491
+#: src/conflicts.c:481
 msgid "conflicts: "
 msgstr "¾×ÆÍ: "
 
-#: src/conflicts.c:493
+#: src/conflicts.c:483
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
 
-#: src/conflicts.c:497
+#: src/conflicts.c:487
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ´Ô¸µ/´Ô¸µ"
 
-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497
 #, c-format
-msgid "%s contains"
-msgstr "%s ¤Ë¤Ï¡¢"
+msgid "%s contains "
+msgstr "%s ¤Ë¤Ï"
+
+#: src/conflicts.c:500
+#, fuzzy, c-format
+msgid "expected %d shift/reduce conflict"
+msgid_plural "expected %d shift/reduce conflicts"
+msgstr[0] " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
 
-#: src/conflicts.c:588 src/conflicts.c:709
+#: src/conflicts.c:587 src/conflicts.c:707
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n"
 
-#: src/conflicts.c:600 src/print.c:171
+#: src/conflicts.c:598 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,12 +111,12 @@ msgstr ""
 "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 "\n"
 
-#: src/conflicts.c:689 src/conflicts.c:703
+#: src/conflicts.c:687 src/conflicts.c:701
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 
-#: src/conflicts.c:730
+#: src/conflicts.c:727
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
@@ -293,7 +294,7 @@ msgstr ""
 msgid "`%s' requires an argument"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n"
 
-#: src/main.c:125
+#: src/main.c:128
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ÆâÉô¥¨¥é¡¼: %s\n"
@@ -372,7 +373,7 @@ msgid "empty"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:244
+#: src/print.c:245
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -380,7 +381,7 @@ msgstr ""
 "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 
-#: src/print.c:268
+#: src/print.c:269
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -388,11 +389,11 @@ msgstr ""
 "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 
-#: src/print.c:294
+#: src/print.c:295
 msgid " on left:"
 msgstr " º¸ÊÕ:"
 
-#: src/print.c:309
+#: src/print.c:310
 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 
@@ -630,14 +631,14 @@ msgstr "
 msgid "the start symbol %s is a token"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
 
-#: src/reduce.c:401
+#: src/reduce.c:405
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "ÉÔ»ÈÍÑÈó½ªÃ¼»Ò:\n"
 "\n"
 
-#: src/reduce.c:416
+#: src/reduce.c:419
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -646,7 +647,7 @@ msgstr ""
 "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n"
 "\n"
 
-#: src/reduce.c:427
+#: src/reduce.c:430
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -655,7 +656,7 @@ msgstr ""
 "ÉÔ»ÈÍѵ¬Â§:\n"
 "\n"
 
-#: src/reduce.c:456
+#: src/reduce.c:458
 msgid ""
 "Variables\n"
 "---------\n"
@@ -665,7 +666,7 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:458
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "ÃÍ     Á°ÃÖ     ·ë¹ç      ¥¿¥°\n"
 
@@ -679,7 +680,7 @@ msgstr ""
 "-----\n"
 "\n"
 
-#: src/reduce.c:474
+#: src/reduce.c:473
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -689,36 +690,31 @@ msgstr ""
 "-----------------\n"
 "\n"
 
-#: src/reduce.c:491
+#: src/reduce.c:495
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n"
 
-#: src/reduce.c:493
-#, c-format
-msgid "%s contains "
-msgstr "%s ¤Ë¤Ï"
-
-#: src/reduce.c:497
+#: src/reduce.c:501
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ¸Ä¤ÎÉÔ»ÈÍÑÈó½ªÃ¼»Ò%.0s"
 
-#: src/reduce.c:502
+#: src/reduce.c:506
 msgid " and "
 msgstr "¤ª¤è¤Ó"
 
-#: src/reduce.c:506
+#: src/reduce.c:510
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ¸Ä¤ÎÉÔ»ÈÍѵ¬Â§%.0s"
 
-#: src/reduce.c:539
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó"
 
-#: src/reduce.c:552
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -860,6 +856,15 @@ msgstr ""
 #~ "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸\n"
 #~ "\n"
 
+#~ msgid " 1 shift/reduce conflict"
+#~ msgstr " 1 ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
+
+#~ msgid " 1 reduce/reduce conflict"
+#~ msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ"
+
+#~ msgid "%s contains"
+#~ msgstr "%s ¤Ë¤Ï¡¢"
+
 #~ 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/nl.gmo b/po/nl.gmo
index b2cb9f7df7915e0eb5f5091f173781f52000564e..1f5116d47d0f264ff3e2042c10bafd6c72b7c83a 100644
GIT binary patch
delta 1828
zcmYk+YfQ~?9LMo*_fjq=mm*RkN9c5<BobYaLK^0>v8k-$0db5OXRc$jF%4rji-wt4
zJ8ho0^`K279xxu%JkT>URvYt#d4K->+x)igdHw$XbN;`}_xt;ww}k`w!Ow}2SBzFo
zOeJoHo9$6QiVxbWXfrSN;4B=%v6viVmVjQIgn6!2=;68+$6)|9)LD$f3pfg|;&ij1
zwbIGuMi(aGPfW(qvBLvpq9!UpJy?#DvD&o>r*M55=ix1!hHp>{{_5Tz$LyJ07a<c{
zonw#(>11%D4NLG9PQ-X-8;$9xfqbY5Heo8BME$PS^$9YU^`a*Fh<ff1#$yH_KJ=l!
z--&6=Z)fRf0rxNuU!zhS#<rD859)pfDy3UdJ8VKPp2HOEK&oTCSb-l<<D{|+jh~Gw
zMGdaNEf^e6=LQ|^=n+o9UibP7YJ#va!zs@~O<aa)xC{0CDO4t|;e2ezdDw?qa4f6P
z*_w<RKOgm6<yh)JgU(KF=n$PmrR+LtfESn@X7&xWkQCA}7t2rs??cvTCs1eLqU!_H
zg1TM%Fp}#*<apUHRH^=Y$iD`TNi<u6IjEKHMP=kX>QLTCJ@67WVGnA;PpHE<gflUL
zZOuVHrsH<h{bTO^+o%n`L6vMs`B!HQdC{TB!ZO@|%E(n@^VW`je1_Th19gg1*`^k_
z47KCUd}yJ2aRCM}3-6=Gd5;Tmz`Y+#W)@9cidtC{R^lZjOV*FfW#2IuBbbe@Ekc!U
z9cqI8s0H0bE#N6`z;0Bjl6a?QqZfI>tQt4!{oh7M4?aev>>VnlgQy4MxzGf;sFd$O
zrT7SH!FNy#?LjtWeW*h?i2B`h9^yr?3e@<Uk+1BqBlW*b$H$F_s8aM}9{xt9Dw~^}
zK}#b>+8Vc`=OPG|MvXVumJ-UKUPYai|C<&xilFLFTh07V`WK-l*N&VMj%vz4F`?S&
zAgS>WZR-i012xrIO<7V?`dPbk;!81#&|$73cq45cp^T}lLA}qar)pG9sHv`N3H@n|
zv?XpwwNq2cIP^}YDsUO0^gHi4t|F+Q^BU))&W_rOVVn}tt+8@GmFAI_<93$2s&<PB
z&XE-oF@&0zC?Qr7MTA-bk=}A9rZeF{L*wp)zUKP6Ky7_XXYBLP@wnpf(7X7ys967k
rG=ENE?!wSfPe+*NP<``(hCt(P_qX-UEnVaLLw6_Cgoomi%A@}Qv(%u+

delta 2289
zcmZwIZ){Ul7{~EvUAK-gWh;WC2;OZ>i_C2m3Ty*)DAO^WBF-gB)X{dXDs@>q&;Y5#
z7%&jy(wG_E?1dS=ArUOZM8illx|ooSL`~2v`T~QzBE0ZlG%<dEw|5N~PICG=_wJr^
zp7We@?=G#MY0v%?^uKSEe(D|6?|f!iJX*#N<#50(jPGD0eu9heB39uQT#CPYR#lkQ
zaNU5*F^bi=9YeSam*D}d)l}m&{M<N+n)3`Uz|XM~zrs850<Ohtcss7*AqKEbs0sUU
zA-;qPERE{_CThYXo|C9R&S8_5`Xh}M+z9ZrR@jJ5*n@ZB>!<)GJkMbR*FWPHEM?Xu
z*oC*?PSiLrqsDm;72sK1iL<EZuS%ubPq-|~LZ}HFPy=j3p0QzU!TsLfPoTr~x2QmV
z!zk7=ySAnmHR1E9`@^U$IF4HArx?cXF{?fLmqs~;ZZ+%1I@Ca~peERd+L{UM#7SI?
zzoJ(358j3$I_bIvH9;>b^?OkhkD-GfqxxT1ME;eEU$}8E{*6r-CR|0_$Bz!>AZmiQ
zP#r(OdOU$Te6y&GT}Jh<V)@M_W^JfIhJt2ma143G&LV5JnIQSsVVL8F{1X*WkXalI
zqprKL4qrg6<REIL6IhB<s6+e(@*>zYYD;HP0bIlmEMXN|&}LNsXR|bPn%_Wm81p=a
zits~JV5d;2JddmJGOosjM5n-_sQdk>`}<KDIgZ-m^PX2wXUtF99>(k%8cN|XKV;ty
zVFbsq8NWfL>@U<?uz+Y4@M?Y-%Q{hk_v3x|BHn{J)Ob_44rjdkrM$BWpcx4;Ykf3&
zxUmm)YNwIK*$=oDuOf3>J<Hdgx1lE3i3;ctDu9o0JDx-Z>?3V=<6`6uw+?(7x1#zT
z!#chHpV6R?&7nH{ftp|?d829FsFcQ0DSa0e=xJ02zD6D1In;BNY%p)6twU{1Cu;nd
z=K*ZtdK{NCzfIGK;w4n7mT|&La6Pq)`T$j_oG&`bDs9w9s7kxG>>27)R25}HW2$Ji
zo849+vtHA-(a5!y`4xlvq3J|kW%sMbfpv=lQnV^sbt|=<sx47=lzNp1soE}w`VjRo
z>PD(Er1EG1_tdMY*Hq`APiH`{lv4C0RYmF7o;|J$iuO$(BAxI`s?zGG?x3pZl_UFZ
z>E&1F>H4Dcz%g<UuI}q#&zE|gfpYIk`@d=aFZhJl?m+D^p9l9pWtn$>18T4JDyeLx
zhN<0DeHT=G1&Y6Vt?&1)bY9#q8e8uc9Wa$#sHQ#V3+$~MNyJBEiIxIR?6uV3tI1d<
zZBAp{Ne?9lGr8S?+AY`rA>!P;k2#S-kN*#5&Oj=jdpj_d-%!!xtJ#qm$Rsp8lVt{y
zsdWBe<z!h!Yt)HE+FLi~o2yTiWD8RyM!c~SBgF_3DL1w~iIMcsXmYUlK=E$uhTAvv
zn-BeF<0^a&>ULjR9JbisoJ1;jt!6I&W$-y)HH(NRM|W!(yApc_GWiuty2}3ppw<ji

diff --git a/po/nl.po b/po/nl.po
index c12cde17..df01f0ac 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-11-05 11:08+0100\n"
+"POT-Creation-Date: 2001-11-12 10:34+0100\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"
@@ -31,77 +31,78 @@ msgstr ""
 msgid "fatal error: "
 msgstr "fatale fout: %s\n"
 
-#: src/conflicts.c:48
+#: src/conflicts.c:45
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Conflict in stadium %d tussen regel %d en teken %s opgelost als %s.\n"
 
-#: src/conflicts.c:114 src/conflicts.c:137
+#: src/conflicts.c:111 src/conflicts.c:134
 msgid "reduce"
 msgstr "reduceer"
 
-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130
 msgid "shift"
 msgstr "verschuif"
 
-#: src/conflicts.c:141
+#: src/conflicts.c:138
 msgid "an error"
 msgstr "een fout"
 
-#: src/conflicts.c:421
-msgid " 1 shift/reduce conflict"
-msgstr " 1 verschuif/reduceer conflict"
-
-#: src/conflicts.c:426
-#, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d verschuif/reduceer conflicten"
+#: src/conflicts.c:411
+#, fuzzy, c-format
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] " %d verschuif/reduceer conflicten"
 
-#: src/conflicts.c:432
-msgid " and"
+#: src/conflicts.c:418
+#, fuzzy
+msgid "and"
 msgstr " en"
 
-#: src/conflicts.c:438
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 reduceer/reduceer conflict"
-
-#: src/conflicts.c:443
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d reduceer/reduceer conflicten"
+#: src/conflicts.c:424
+#, fuzzy, c-format
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] " %d reduceer/reduceer conflicten"
 
-#: src/conflicts.c:480
-#, c-format
-msgid "State %d contains"
+#: src/conflicts.c:448
+#, fuzzy, c-format
+msgid "State %d contains "
 msgstr "Stadium %d bevat"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:491
+#: src/conflicts.c:481
 msgid "conflicts: "
 msgstr "conflictueerd: "
 
-#: src/conflicts.c:493
+#: src/conflicts.c:483
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d vershuif/reduceer"
 
-#: src/conflicts.c:497
+#: src/conflicts.c:487
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reduceer/reduceer"
 
-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497
 #, c-format
-msgid "%s contains"
+msgid "%s contains "
 msgstr "%s bevat"
 
-#: src/conflicts.c:588 src/conflicts.c:709
+#: src/conflicts.c:500
+#, fuzzy, c-format
+msgid "expected %d shift/reduce conflict"
+msgid_plural "expected %d shift/reduce conflicts"
+msgstr[0] " %d verschuif/reduceer conflicten"
+
+#: src/conflicts.c:587 src/conflicts.c:707
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduceer gebruikt regel %d (%s)]\n"
 
-#: src/conflicts.c:600 src/print.c:171
+#: src/conflicts.c:598 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,12 +111,12 @@ msgstr ""
 "    $default\treduce using rule %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:689 src/conflicts.c:703
+#: src/conflicts.c:687 src/conflicts.c:701
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr ""
 
-#: src/conflicts.c:730
+#: src/conflicts.c:727
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr ""
@@ -293,7 +294,7 @@ msgstr ""
 msgid "`%s' requires an argument"
 msgstr "%s: optie `%s' vereist een argument\n"
 
-#: src/main.c:125
+#: src/main.c:128
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"
@@ -372,7 +373,7 @@ msgid "empty"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:244
+#: src/print.c:245
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -380,7 +381,7 @@ msgstr ""
 "Terminals, met regels waar ze voorkomen\n"
 "\n"
 
-#: src/print.c:268
+#: src/print.c:269
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -388,11 +389,11 @@ msgstr ""
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"
 
-#: src/print.c:294
+#: src/print.c:295
 msgid " on left:"
 msgstr " links:"
 
-#: src/print.c:309
+#: src/print.c:310
 msgid " on right:"
 msgstr " rechts:"
 
@@ -633,14 +634,14 @@ msgstr ""
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"
 
-#: src/reduce.c:401
+#: src/reduce.c:405
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "Onbruikbare niet terminals:\n"
 "\n"
 
-#: src/reduce.c:416
+#: src/reduce.c:419
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -649,7 +650,7 @@ msgstr ""
 "Terminals welke niet worden gebruikt:\n"
 "\n"
 
-#: src/reduce.c:427
+#: src/reduce.c:430
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -658,7 +659,7 @@ msgstr ""
 "Onbruikbare regels:\n"
 "\n"
 
-#: src/reduce.c:456
+#: src/reduce.c:458
 msgid ""
 "Variables\n"
 "---------\n"
@@ -668,7 +669,7 @@ msgstr ""
 "----------\n"
 "\n"
 
-#: src/reduce.c:458
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Waarde  Sprec    Sassoc    Tag\n"
 
@@ -682,7 +683,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:474
+#: src/reduce.c:473
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -692,36 +693,31 @@ msgstr ""
 "-----------------------\n"
 "\n"
 
-#: src/reduce.c:491
+#: src/reduce.c:495
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d regels nooit gereduceerd\n"
 
-#: src/reduce.c:493
-#, c-format
-msgid "%s contains "
-msgstr "%s bevat"
-
-#: src/reduce.c:497
+#: src/reduce.c:501
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d onbruikbare niet terminal%s"
 
-#: src/reduce.c:502
+#: src/reduce.c:506
 msgid " and "
 msgstr " en "
 
-#: src/reduce.c:506
+#: src/reduce.c:510
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"
 
-#: src/reduce.c:539
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Start symbool %s is niet afkomstig uit een zin"
 
-#: src/reduce.c:552
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -863,6 +859,15 @@ msgstr ""
 #~ "%s afgeleiden\n"
 #~ "\n"
 
+#~ msgid " 1 shift/reduce conflict"
+#~ msgstr " 1 verschuif/reduceer conflict"
+
+#~ msgid " 1 reduce/reduce conflict"
+#~ msgstr " 1 reduceer/reduceer conflict"
+
+#~ msgid "%s contains"
+#~ msgstr "%s bevat"
+
 #~ 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/ru.gmo b/po/ru.gmo
index 81353bd09947fd1a6c9b32de5f8fabe3f46b680f..514d027b7ba256e1c8250ec06daf914f1bb81864 100644
GIT binary patch
delta 3070
zcmYk+drZ}39LMqRQIy*e5b}~Yen$~eQBYLW5)rM06cx?Xyr3X~mo$;2vVPiype&aq
zES=4NV$~eP&RT13Y3ejfX45UYY^GVJZPnK1EY|J)Ip=Zp8{hMKeh<I%{GR9ge4q2@
z#_y~BOQ|vYjjM?mLR7|>9m6AWd~m&;Xf_bv!8`B-j>0a?!hdiiW(CbWEJZ!P1xH|`
z^9Uw$|2gt!m-*;#=G)KFhQ;(T>&rg|V+xMLURZ$fI0qB36gALtOvf7ZunC9byO@Wa
zI2Z#-W&?02YGRX7?<vI~@3(Rq8hA7E9jiyJumSJHHq-#0xckdEi2H8L#(vCZC>EhI
zQI6_wz;PHx53gV*_F#3I_-M)dt(b;VRf7S18H;c)&ch2Bi|I_eACAI_I0Mzc758F2
zj={K8vo|mgI~cGNNwxXxUj{a#7J3wY&G;-0&G=W;N`~+jWnenC;5yXIyOBpM#Ar(G
z6r{__kYrdj4#OR;zZtclBksNp^}SQ5^19rg{A=JFbZFod^2{P^Bx>M%)c@zBCb}J|
zH#>ki*y{fO1!_fqp@)fVv@)8FlW`%EeQQ8vs2O>seLRr->xEys2Y*73dykDL>oyDN
zvNCtS5tX5xsOmp}TG2`Djo)H1UPHYwmqO7*3Q@&eiCXyvoQ1VMjWinXqf&PkJ-m*3
zK|G_gD4U3yND1a+1uA0)QQvzH_569{-S#_bqN$u|4|7o~UW9sIH7djYP8zDxeHg^!
zs9NYmWuP0GizPA|P0K{Rcs6RFWvFAf3H5@#sI6*6jdKoleE-0VfLTvw>v5mO5#V{>
zifK%uqa3wY`%%^X8EW9a(ZdiQxmbjwu@<#;hft|*M;2|zoZq1OZ#iQ_yqx<1s4W<b
z@jCw*G_<1es29#g9g`}|!Iw}II*Kg9enF)!$iuoHj@qI^R0fx!eoxk;GPo6$;oYbV
zwxcq74po2lBMlE#Dau3$_25#RfVHmwEmVfSMv`JF%u*A}MLl2P+=UEjhcJN0QAK$I
z=V6fj(eK7`^tFd;X-vgB)XdxPFn)-4;|k7TE4E;m5exWnU@ZHMiqn=1U_Z1Kb5X^)
z0=1BRs4Y2z)A1^XaTsS%&s`Wp{x$Q2vC$ci!bp{)wxj}8-Swyxx1d(kj(TASY70)H
zj^7p3`M!?&ei{|1?`5IhQ;2!E3R#=Inoa%_X?#FO37$k9qa-#g74uO8mY`NzhssDR
zDsxwnciAn}3rCEPu6QcW<bDaVXnP%13m>75=Xum=x#7D9RB3n7F$P0eg}ty57vn3a
z34Mo}$W8bEOm2eQXX8CM4L$TxD?E&<mD8w&T|>&pk|`|R`*}2G(O8Ko_$KOsc2ue^
zqP8HGO4CX+kuj_cmD*>W2T>~uql)xXRAw~@Ls$?segSIB79ivLwwZ=fvImvIR#f#K
zMGbffRctp=MLK9wbfCqkTDYIkwIPbVfKL!L!~)kRsNKj_?bPIVXh{oQ$AdVJ$S0m5
zR4^*4CgNUV_G@bs(|oP%QDPb~hfsa*B$g67R1XjomBkQ^L>ci2q3g*gkxy0C(?sh3
z`n3FAgwBet`BALS*+)Y^&dp-ip^a0SZ6~(6J}TIrCzNceGLq~msEeYBTwC~Le{37E
zn}{QHsZ@0p5u`Wr`>DOq^$@W_ODm4tM$1&Cb^Dq@L#3$ATy(n=6NuHsO4p|<QiZ8p
zD_x%|gdY{V&)u(eigJQe5~-#VrB+t~Q5tFe_mM>NDMANSKd^I&<%Ft8mws7v#&p$3
ziJXC+v{$+N3aoYQWw_C`pTl*8-_Lb;*q3;i=s{4OwuHESHMquOxS7ax_bTBuB7^AV
z`r@(5wbwWW=feus;MzoRpu_3G7X!iC>YA$UIosA()>W(zXC#degjXkb^bUvmhvMTV
uO!Ow?PS2YZE=fP#Bk|&?uCr%yy1wc<e=59Z`20ZlhY^*r;Wc9qCHxEJ-5f*!

delta 3475
zcmZwHc~F&A7{~F$rYNfl;g-G_peP1cyY9KA;+B{sSgr^th$0FusCk7}7gAfstw}Sr
zKb&bsZ#h$zX#*75fC?j()-<MLlUXyB(;u4l{k`vtnRVtq_jAsDmvhc@&bgNhZWZ~y
zYajf&p==|%5^n?>b4v9#d{L}$V>)6y#^4a_i5b`nS79RVLknwB_g}?_&_p;UU=+>q
z$R#raA27ye@|}uVhwZrVDt5tx7>%c}GoHgvcpcS2>qui5tFbTy6H#OCgKg1^>To1>
z$Ej#x3HHG4*q{E*dsNinj~Iu+Jf#l0q6Xx}Fib~{JQLNyJY+1U2$hj?)BxW?z2~^w
zZbVJsI;LPKvw9G{m`ML7lZq~sV_!Uk7B*oL-ayTuE2ELaP^q1T0k{E2V<k?;8f=a2
z+Zz*$ov|OLp?=TBtyqM<-c)W<*@a0Rj5)#^Pa<n$mh*H1ZbZ%WUDR5Cgc|TAq%RZ2
z&6-g>Dib4c2QEZS;0|i<B#{<ndMNU!$&MrcWZf*`hi<sey|4#0vm<WXk9x2UL-7jg
z#lN6l9LsuXAiYs99)`L;4K?6$)DrH+R6OinztEBVYi5BgoQ2V-)Oyg1(~)H}n^BqC
zgG|QMqB{H*b>FXOVIm97YMF6JA12#vm!L9KfjTvNQ4{*yN2L{&%QykAp*r+(RRbA|
z+TDeynJ>jrxEfg{^C2p8^=RRBR0olqWs+kCq6U(I1F-;=v3;oLeD71y15L;z%wMRH
z#_?sL7d7K7REJAYDXu_m)*Tp*HK;vt4wZpB$XrY`z3@uY2i5U-)O%(l$Ixe%QBeo4
zq1Ng!>P2T!=lM1!1TcHHzD2t)U%Gz^K7#qECD@Jq@C@pF2gN)0Ct(`xbWFz8sHNMF
zQTF+#Le@;R>-Y8rV{V~F9?sjeB+01uU{t2ETuU&J_9hI%D%4VKM@?WiYUT%!kNJQv
zovMqN%KkF}EVM@ML9%A@P${l-+dENfc?`9S>rpBH2K7gD6_xVeP)icT+ci)RY6+&G
z_CO(8Sc%Hq+vwAcUs3Vk4fjG%)<G$qh5EyJ1vS8<sQa(D26DzUqwW}hqfwi93{J+E
zQGYlWP;34J4#GcC15fKo{`XNC%D=`iyoiUe6Fbt+8&4u*GG&}St>G@z+I@lA%@<KK
ziRt5HYyxU2=i(4ti+((Yx_=QHOB2|S8u%wE<X@?|#1C4do5+4M(d1DnPesiv9o6v!
z)Dq3aR#=XV!E8W1e;D=LNwhPI{b}Dol4g=0c9t*$C(@qjqoU(?2>BN_4X77hLd`fL
z)yd3oR0`K3lQCOS9Ue!`_zaG~pHaI!g@?5#vQV3KA?nmrpsw%4q3HXRN<5X@7=jiX
zArq5O16qSzGF7PSComkVaV(xi3**=zn&BYSo|%K1*m`7Nns?mxX&goS4~*9NA3%O|
zLpt&?MSN)q_M&Eb0yTi2P^s<0g3JD>8BIcM*7+EQJCQM&14swvJZj0VqTU<A&B{mu
z#_0SHr=rb}iF)Bm)TXOK?bf5H7hOZ`g{8zCVl6S7c#fD%Xag@G^o}jWKtiQ0vBs`B
zUoV3G7qo0+=>Kkc`fklRMjL3)B4!X;GnH|Ko>@dpA_fx?#B_r3+2v7JEt8f=WjsN~
z?ZOtZODW&J0=F^GRcL2+aNDbJK9NCK#Ac#Bkw-jEtS8v3_Bqc)POw=*DAfyzmJ;t)
zLS40_vCdrhqoDB^@gz}9XalK?CWaGAKg(|))v36WP?<~UoNGg=XakN^h4KWk%&s}h
z`vUbqLdSB7`};=aGT3djz)>|bTN=2Ic!toXX({DYa$6d>jmRe0V|FRwJB5gGn)ZK1
z6m=c#t?qBnO08wS`@?F~Nzm>tBdUn!37u1I#FnDnTuHPemJ@}9%3@*~5lM_7(g~fQ
z9AX9W5}}Q)QsH2{SyV!Z0qze$sN<v3nJ6NjB6<;F#3mxie=uxIfNyzz-iqA(R0k_}
zY4L)^g}G&=#!AeyN(%}Xl)0Dw^TWOOdaVC{4Sz)cddb~qjFnTIr!W7gh~5GIxse~Y
zYL{7-Q<kr88AMr5VR5OyOKguep=n;r;~A1R$UnAQZJ_UTLw)U+b*Gyenyu!qn;WW6
zr8?NdYpiar`^@>lZr^jWed(W@Jyy%L`(Ja<mHVElGgh6yQ~bmLe|C?O*0H}gG&VJy
Xt*@)mkQ*DSYtEgoYx377zuES0?{Bne

diff --git a/po/ru.po b/po/ru.po
index 5e891d28..462aefe7 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-11-05 11:08+0100\n"
+"POT-Creation-Date: 2001-11-12 10:34+0100\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"
@@ -30,78 +30,79 @@ msgstr "
 msgid "fatal error: "
 msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "
 
-#: src/conflicts.c:48
+#: src/conflicts.c:45
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"
 
-#: src/conflicts.c:114 src/conflicts.c:137
+#: src/conflicts.c:111 src/conflicts.c:134
 msgid "reduce"
 msgstr "×Ù×ÏÄ"
 
-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130
 msgid "shift"
 msgstr "ÓÄ×ÉÇ"
 
-#: src/conflicts.c:141
+#: src/conflicts.c:138
 msgid "an error"
 msgstr "ÏÛÉÂËÁ"
 
-#: src/conflicts.c:421
-msgid " 1 shift/reduce conflict"
-msgstr " 1 ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
-
-#: src/conflicts.c:426
-#, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
+#: src/conflicts.c:411
+#, fuzzy, c-format
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 
-#: src/conflicts.c:432
-msgid " and"
+#: src/conflicts.c:418
+#, fuzzy
+msgid "and"
 msgstr " É"
 
-#: src/conflicts.c:438
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
-
-#: src/conflicts.c:443
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
+#: src/conflicts.c:424
+#, fuzzy, c-format
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] " %d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 
-#: src/conflicts.c:480
-#, c-format
-msgid "State %d contains"
+#: src/conflicts.c:448
+#, fuzzy, c-format
+msgid "State %d contains "
 msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:491
+#: src/conflicts.c:481
 msgid "conflicts: "
 msgstr "ËÏÎÆÌÉËÔÙ: "
 
-#: src/conflicts.c:493
+#: src/conflicts.c:483
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
 
-#: src/conflicts.c:497
+#: src/conflicts.c:487
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
 
-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497
 #, c-format
-msgid "%s contains"
-msgstr "%s ÓÏÄÅÒÖÉÔ"
+msgid "%s contains "
+msgstr "%s ÓÏÄÅÒÖÉÔ "
+
+#: src/conflicts.c:500
+#, fuzzy, c-format
+msgid "expected %d shift/reduce conflict"
+msgid_plural "expected %d shift/reduce conflicts"
+msgstr[0] " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 
-#: src/conflicts.c:588 src/conflicts.c:709
+#: src/conflicts.c:587 src/conflicts.c:707
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n"
 
-#: src/conflicts.c:600 src/print.c:171
+#: src/conflicts.c:598 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,12 +111,12 @@ msgstr ""
 "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:689 src/conflicts.c:703
+#: src/conflicts.c:687 src/conflicts.c:701
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 
-#: src/conflicts.c:730
+#: src/conflicts.c:727
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
@@ -315,7 +316,7 @@ msgstr ""
 msgid "`%s' requires an argument"
 msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ\n"
 
-#: src/main.c:125
+#: src/main.c:128
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n"
@@ -387,19 +388,19 @@ msgid "empty"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:244
+#: src/print.c:245
 msgid "Terminals, with rules where they appear"
 msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
-#: src/print.c:268
+#: src/print.c:269
 msgid "Nonterminals, with rules where they appear"
 msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
-#: src/print.c:294
+#: src/print.c:295
 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"
 
-#: src/print.c:309
+#: src/print.c:310
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 
@@ -636,19 +637,19 @@ msgstr "
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reduce.c:401
+#: src/reduce.c:405
 msgid "Useless nonterminals:"
 msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:"
 
-#: src/reduce.c:416
+#: src/reduce.c:419
 msgid "Terminals which are not used:"
 msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:"
 
-#: src/reduce.c:427
+#: src/reduce.c:430
 msgid "Useless rules:"
 msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:"
 
-#: src/reduce.c:456
+#: src/reduce.c:458
 msgid ""
 "Variables\n"
 "---------\n"
@@ -658,7 +659,7 @@ msgstr ""
 "----------\n"
 "\n"
 
-#: src/reduce.c:458
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"
 
@@ -672,7 +673,7 @@ msgstr ""
 "-------\n"
 "\n"
 
-#: src/reduce.c:474
+#: src/reduce.c:473
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -682,36 +683,31 @@ msgstr ""
 "--------------------------\n"
 "\n"
 
-#: src/reduce.c:491
+#: src/reduce.c:495
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n"
 
-#: src/reduce.c:493
-#, c-format
-msgid "%s contains "
-msgstr "%s ÓÏÄÅÒÖÉÔ "
-
-#: src/reduce.c:497
+#: src/reduce.c:501
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s"
 
-#: src/reduce.c:502
+#: src/reduce.c:506
 msgid " and "
 msgstr " É "
 
-#: src/reduce.c:506
+#: src/reduce.c:510
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s"
 
-#: src/reduce.c:539
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
 
-#: src/reduce.c:552
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -806,6 +802,15 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ msgid " 1 shift/reduce conflict"
+#~ msgstr " 1 ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
+
+#~ msgid " 1 reduce/reduce conflict"
+#~ msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
+
+#~ msgid "%s contains"
+#~ msgstr "%s ÓÏÄÅÒÖÉÔ"
+
 #~ msgid "\t\t/* empty */"
 #~ msgstr "\t\t/* ÐÕÓÔÏ */"
 
diff --git a/po/tr.po b/po/tr.po
index 7ec13fa7..c4e6a267 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.28c\n"
-"POT-Creation-Date: 2001-11-05 11:08+0100\n"
-"PO-Revision-Date: 2001-09-10 10:54GMT\n"
+"Project-Id-Version: bison 1.30\n"
+"POT-Creation-Date: 2001-11-12 10:34+0100\n"
+"PO-Revision-Date: 2001-11-02 14:49GMT\n"
 "Last-Translator: Altug Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -31,79 +31,80 @@ msgstr "uyar
 msgid "fatal error: "
 msgstr "ölümcül hata:"
 
-#: src/conflicts.c:48
+#: src/conflicts.c:45
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "%d durumu içinde %d kuralý ve %s andaçý arasýndaki çeliþki %s "
 "olarakçözümlendi.\n"
 
-#: src/conflicts.c:114 src/conflicts.c:137
+#: src/conflicts.c:111 src/conflicts.c:134
 msgid "reduce"
 msgstr "indirgeme"
 
-#: src/conflicts.c:120 src/conflicts.c:133
+#: src/conflicts.c:117 src/conflicts.c:130
 msgid "shift"
 msgstr "öteleme"
 
-#: src/conflicts.c:141
+#: src/conflicts.c:138
 msgid "an error"
 msgstr "bir hata"
 
-#: src/conflicts.c:421
-msgid " 1 shift/reduce conflict"
-msgstr " 1 öteleme/indirgeme çeliþkisi"
-
-#: src/conflicts.c:426
-#, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d öteleme/indirgeme çeliþkisi"
+#: src/conflicts.c:411
+#, fuzzy, c-format
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] " %d öteleme/indirgeme çeliþkisi"
 
-#: src/conflicts.c:432
-msgid " and"
+#: src/conflicts.c:418
+#, fuzzy
+msgid "and"
 msgstr " ve"
 
-#: src/conflicts.c:438
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 indirgeme/indirgeme çeliþkisi"
-
-#: src/conflicts.c:443
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d indirgeme/indirgeme çeliþkisi"
+#: src/conflicts.c:424
+#, fuzzy, c-format
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] " %d indirgeme/indirgeme çeliþkisi"
 
-#: src/conflicts.c:480
-#, c-format
-msgid "State %d contains"
+#: src/conflicts.c:448
+#, fuzzy, c-format
+msgid "State %d contains "
 msgstr "%d durumu içerir"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:491
+#: src/conflicts.c:481
 msgid "conflicts: "
 msgstr "çeliþkiler: "
 
-#: src/conflicts.c:493
+#: src/conflicts.c:483
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d öteleme/indirgeme"
 
-#: src/conflicts.c:497
+#: src/conflicts.c:487
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d indirgeme/indirgeme"
 
-#: src/conflicts.c:502
+#: src/conflicts.c:492 src/reduce.c:497
 #, c-format
-msgid "%s contains"
-msgstr "%s içerir"
+msgid "%s contains "
+msgstr "%s içerir "
+
+#: src/conflicts.c:500
+#, fuzzy, c-format
+msgid "expected %d shift/reduce conflict"
+msgid_plural "expected %d shift/reduce conflicts"
+msgstr[0] " %d öteleme/indirgeme çeliþkisi"
 
-#: src/conflicts.c:588 src/conflicts.c:709
+#: src/conflicts.c:587 src/conflicts.c:707
 #, 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:600 src/print.c:171
+#: src/conflicts.c:598 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -112,12 +113,12 @@ msgstr ""
 "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
 "\n"
 
-#: src/conflicts.c:689 src/conflicts.c:703
+#: src/conflicts.c:687 src/conflicts.c:701
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tindirgeme kural %d (%s)'i kullanýyor\n"
 
-#: src/conflicts.c:730
+#: src/conflicts.c:727
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
@@ -156,9 +157,10 @@ msgid ""
 "If a long option shows an argument as mandatory, then it is mandatory\n"
 "for the equivalent short option also.  Similarly for optional arguments.\n"
 msgstr ""
-"Eðer bir uzun seçenek bir argümaný gerektirirse, bu gereklilik, denk olan\n"
-"kýsa seçenek için de geçerlidir.  Bu durum, seçimli argümanlar için de\n"
-"geçerlidir.\n"
+"Eðer bir uzun seçenek bir baðýmsýz deðiþkeni zorunlu gibi gösterilirse odenk "
+"kýsa\n"
+"seçenek için dahi zorunludur.  Seçimli baðýmsýz deðiþkenler için "
+"benzerþekildedir.\n"
 
 #: src/getargs.c:98
 msgid ""
@@ -167,7 +169,6 @@ msgid ""
 "  -V, --version   output version information and exit\n"
 "  -y, --yacc      emulate POSIX yacc\n"
 msgstr ""
-"Çalýþma kipleri:\n"
 "  -h, --help      bu yardýmý göster ve çýk\n"
 "  -V, --version   sürüm bilgisini ver ve çýk\n"
 "  -y, --yacc      POSIX yacc öykünmesi\n"
@@ -184,13 +185,13 @@ msgid ""
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 "Ayrýþtýrýcý:\n"
-"  -S, --skeleton=DOSYA       kullanýlacak iskeleti belirler\n"
+"  -S, --skeleton=FILE        kullanýlacak iskeleti belirle\n"
 "  -t, --debug                ayrýþtýrýcý için hata ayýklayýcý aracý\n"
-"      --locations            konum hesaplamalarýný etkinleþtirir\n"
-"  -p, --name-prefix=ÖNEK     dýþ simgelere eklenen ÖNEK\n"
-"  -l, --no-lines             `#line' bildirimlerini üretmez\n"
-"  -n, --no-parser            sadece tablolarý üretir\n"
-"  -k, --token-table          andaç isimlerinin bir tablosunu içerir\n"
+"      --locations            konum hesaplamalarýný etkinleþtir\n"
+"  -p, --name-prefix=PREFIX   dýþ simgelere hazýr bekletilen ÖNEK\n"
+"  -l, --no-lines             `#line' bildirimlerini üretme\n"
+"  -n, --no-parser            sadece tablolarý üret\n"
+"  -k, --token-table          andaç isimlerinin bir tablosunu içer\n"
 
 #: src/getargs.c:117
 #, fuzzy
@@ -208,12 +209,11 @@ msgstr ""
 "  -v, --verbose              otomatýn bir açýklamasýný da üretir\n"
 "  -b, --file-prefix=ÖNEK     çýktý dosyalarý için bir ÖNEK belirtir\n"
 "  -o, --output-file=DOSYA    çýktýyý DOSYAYA býrakýr\n"
+"  -g, --graph                otomatýn bir VCG grafik açýklamasýný da üretir\n"
 
 #: src/getargs.c:127
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
-msgstr ""
-"Hatalarý <bug-bison@gnu.org>'a,\n"
-"çeviri hatalarýný <gnu-tr-u12a@lists.sourceforge.net>'e bildir.\n"
+msgstr "Hatalarý <bug-bison@gnu.org>'a bildir.\n"
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
@@ -226,7 +226,7 @@ msgstr "bison (GNU Bison) %s"
 msgid ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 msgstr ""
-"Telifhakký 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, "
+"Kopyahakký 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, "
 "Inc.\n"
 
 #: src/getargs.c:150
@@ -235,13 +235,13 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "Bu bir serbest yazýlýmdýr; kopyalama koþullarý için kaynak koduna bakýnýz.\n"
-"Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya HERHANGÝ BÝR AMACA\n"
+"Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya ÞAHSÝ KULLANIMINIZA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"
 
 #: src/getargs.c:215 src/lex.c:693
 #, c-format
 msgid "`%s' is no longer supported"
-msgstr "`%s' artýk desteklenmiyor"
+msgstr "`%s' artýk desteklenmeyecek"
 
 #: src/getargs.c:239
 #, c-format
@@ -251,12 +251,12 @@ msgstr "Daha fazla bilgi i
 #: src/getargs.c:246
 #, c-format
 msgid "%s: no grammar file given\n"
-msgstr "%s: gramer dosyasý verilmemiþ\n"
+msgstr "%s: verilen gramer dosyasý yok\n"
 
 #: src/getargs.c:250
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
-msgstr "%s: '%s' den sonraki argümanlar yoksayýldý\n"
+msgstr "%s: '%s' den sonraki ek baðýmsýz deðiþkenler yoksayýldý\n"
 
 #: src/lalr.c:311
 #, c-format
@@ -277,7 +277,7 @@ msgstr "beklenmeyen dosya sonu"
 
 #: src/lex.c:166
 msgid "unescaped newline in constant"
-msgstr "sabit içinde kaçýþsýz yeni satýr"
+msgstr "sabit içinde kaçamayan yeni satýr"
 
 #: src/lex.c:208
 #, c-format
@@ -296,7 +296,7 @@ msgstr "bilinmeyen ka
 
 #: src/lex.c:342
 msgid "unterminated type name at end of file"
-msgstr "dosya sonunda sonlandýrýlmamýþ tip adý"
+msgstr "dosyanýn sonunda sonlandýrýlmamýþ tip adý"
 
 #: src/lex.c:345
 msgid "unterminated type name"
@@ -304,7 +304,7 @@ msgstr "sonland
 
 #: src/lex.c:438
 msgid "use \"...\" for multi-character literal tokens"
-msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"
+msgstr "cok-karakterli yazýn andaçlarý için \"...\" kullan"
 
 #: src/lex.c:666
 #, c-format
@@ -316,7 +316,7 @@ msgstr ""
 msgid "`%s' requires an argument"
 msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n"
 
-#: src/main.c:125
+#: src/main.c:128
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: iç hata: %s\n"
@@ -346,7 +346,7 @@ msgstr "    $default\tonayla\n"
 
 #: src/print.c:113
 msgid "    NO ACTIONS\n"
-msgstr "    EYLEM YOK\n"
+msgstr "    EYLEMLER YOK\n"
 
 #: src/print.c:132
 #, c-format
@@ -385,22 +385,22 @@ msgstr "kural %-4d %s ->"
 
 #: src/print.c:240
 msgid "empty"
-msgstr ""
+msgstr "boþ"
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:244
+#: src/print.c:245
 msgid "Terminals, with rules where they appear"
 msgstr "Sabit simgeler, kurallarýnýn bulunduklarý yerde"
 
-#: src/print.c:268
+#: src/print.c:269
 msgid "Nonterminals, with rules where they appear"
 msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde"
 
-#: src/print.c:294
+#: src/print.c:295
 msgid " on left:"
 msgstr " solda:"
 
-#: src/print.c:309
+#: src/print.c:310
 msgid " on right:"
 msgstr " saðda:"
 
@@ -462,12 +462,12 @@ msgstr "%s'den sonra erken EOF"
 #: src/reader.c:498
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
-msgstr "simge `%s' birden fazla defa sabit dizge olarak kullanýldý"
+msgstr "simge `%s' bir harfiyen uyumlu dizgi gibi birden fazla kullanýldý"
 
 #: src/reader.c:501
 #, c-format
 msgid "symbol `%s' given more than one literal string"
-msgstr "`%s' simgesine birden fazla sabit dizge verilmiþ"
+msgstr "simge `%s' bir harfiyen uyumlu dizgi gibi birden fazla verilmiþ"
 
 #: src/reader.c:522 src/reader.c:664
 #, c-format
@@ -501,7 +501,7 @@ msgstr "%type bildirimi <tipad
 #: src/reader.c:615
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
-msgstr "geçersiz %%type bildirimine neden olan öðe: %s"
+msgstr "geçersiz %%type bildirimine neden olan öðe: `%s'"
 
 #: src/reader.c:660
 #, c-format
@@ -526,7 +526,7 @@ msgstr "e
 #: src/reader.c:798
 #, c-format
 msgid "argument of %%expect is not an integer"
-msgstr "%%expect'in argümaný bir tamsayý deðil"
+msgstr "%%expect'in baðýmsýz deðiþkeni bir tamsayý deðildir"
 
 #: src/reader.c:844
 #, c-format
@@ -536,7 +536,7 @@ msgstr "%s 
 #: src/reader.c:866
 #, c-format
 msgid "expected string constant instead of %s"
-msgstr "%s'in yerine sabit dizge beklendi"
+msgstr "%s'in yerine beklenen dizgi sabitidir"
 
 #: src/reader.c:1014
 #, c-format
@@ -559,7 +559,7 @@ msgstr "sonland
 
 #: src/reader.c:1359
 msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "kötü-biçemli kural: baþlangýç simgesini takip eden \":\" yok"
+msgstr "kötü-biçimli kural: baþlangýç simgesini takip eden kolon(:) yok"
 
 #: src/reader.c:1366
 msgid "grammar starts with vertical bar"
@@ -590,7 +590,8 @@ msgstr "
 
 #: src/reader.c:1536
 msgid "empty rule for typed nonterminal, and no action"
-msgstr "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylembelirtilmemiþ"
+msgstr ""
+"Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylem belirtilmemiþ"
 
 #: src/reader.c:1580
 #, c-format
@@ -610,7 +611,8 @@ msgstr "girdi grameri i
 #, 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"
+"simge %s kullanýldý, fakat bir andaç gibi tanýmlanmadý ve kurallara "
+"sahipdeðil"
 
 #: src/reader.c:1707
 #, c-format
@@ -637,19 +639,19 @@ msgstr "ba
 msgid "the start symbol %s is a token"
 msgstr "baþlangýç simgesi %s bir andaçtýr"
 
-#: src/reduce.c:401
+#: src/reduce.c:405
 msgid "Useless nonterminals:"
 msgstr "Yararsýz kurallar:"
 
-#: src/reduce.c:416
+#: src/reduce.c:419
 msgid "Terminals which are not used:"
 msgstr "Kullanýlmayan sabit simgeler:"
 
-#: src/reduce.c:427
+#: src/reduce.c:430
 msgid "Useless rules:"
 msgstr "Yararsýz kurallar:"
 
-#: src/reduce.c:456
+#: src/reduce.c:458
 msgid ""
 "Variables\n"
 "---------\n"
@@ -659,7 +661,7 @@ msgstr ""
 "-----------\n"
 "\n"
 
-#: src/reduce.c:458
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Deðer  Söncel   Sbirleþ   Etiket\n"
 
@@ -673,7 +675,7 @@ msgstr ""
 "--------\n"
 "\n"
 
-#: src/reduce.c:474
+#: src/reduce.c:473
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -683,41 +685,36 @@ msgstr ""
 "-------------------\n"
 "\n"
 
-#: src/reduce.c:491
+#: src/reduce.c:495
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d kural asla indirgenmedi\n"
 
-#: src/reduce.c:493
-#, c-format
-msgid "%s contains "
-msgstr "%s içerir "
-
-#: src/reduce.c:497
+#: src/reduce.c:501
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d yararsýz deðiþken simge%s"
 
-#: src/reduce.c:502
+#: src/reduce.c:506
 msgid " and "
 msgstr " ve "
 
-#: src/reduce.c:506
+#: src/reduce.c:510
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d yararsýz kural%s"
 
-#: src/reduce.c:539
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Baþlangýç simgesi %s herhangi bir cümleden türemez"
 
-#: src/reduce.c:552
-#, fuzzy, c-format
+#: src/reduce.c:553
+#, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
 msgstr ""
-"indirgenen %s tanýmlanan %d sabit simge%s, %d deðiþken simge%s, ve %düretilen"
+"indirgenen %s tanýmlanan %d sabit simge%s, %d deðiþken simge%s,ve %d üretilen"
 "%s.\n"
 
 #: lib/getopt.c:694
@@ -807,44 +804,11 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "\t\t/* empty */"
-#~ msgstr "\t\t/* boþ */"
-
-#~ msgid "multiple %%header_extension declarations"
-#~ msgstr "çoklu %%header_extension bildirimleri"
-
-#~ msgid "multiple %%source_extension declarations"
-#~ msgstr "çoklu %%source_extension bildirimleri"
-
-#~ msgid "vcg graph: no such color."
-#~ msgstr "vcg graph: böyle bir renk yok."
-
-#~ msgid "vcg graph: no such text mode"
-#~ msgstr "vcg graph: böyle bir metin kipi yok"
-
-#~ msgid "vcg graph: no such shape"
-#~ msgstr "vcg graph: böyle bir þekil yok"
-
-#~ msgid "vcg graph: no such decision"
-#~ msgstr "vcg graph: böyle bir karar yok"
-
-#~ msgid "vcg graph: no such an orientation"
-#~ msgstr "vcg graph: böyle bir konum yok"
-
-#~ msgid "vcg graph: no such an alignement"
-#~ msgstr "vcg graph: böyle bir hizalama yok"
-
-#~ msgid "vcg graph: no such an arrow mode"
-#~ msgstr "vcg graph: böyle bir yön kipi yok"
-
-#~ msgid "vcg graph: no such crossing_type"
-#~ msgstr "vcg graph: böyle bir kesme tipi yok"
-
-#~ msgid "vcg graph: no such view"
-#~ msgstr "vcg graph: böyle bir görünüm yok"
+#~ msgid " 1 shift/reduce conflict"
+#~ msgstr " 1 öteleme/indirgeme çeliþkisi"
 
-#~ msgid "vcg graph: no such linestyle"
-#~ msgstr "vcg graph: böyle bir çizgi biçemi yok"
+#~ msgid " 1 reduce/reduce conflict"
+#~ msgstr " 1 indirgeme/indirgeme çeliþkisi"
 
-#~ msgid "vcg graph: no such an arrowstyle"
-#~ msgstr "vcg graph: böyle bir yön biçemi yok"
+#~ msgid "%s contains"
+#~ msgstr "%s içerir"
-- 
2.50.0