From 78a00b7d7fad9a7b81cdf3d9cba4ca896a873502 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 29 Dec 2002 03:17:45 +0000
Subject: [PATCH] Regenerate.

---
 po/da.po         |  87 +++++++++++++++++++++------------------
 po/de.po         | 103 +++++++++++++++++++++++++----------------------
 po/es.po         |  87 +++++++++++++++++++++------------------
 po/et.po         | 103 +++++++++++++++++++++++++----------------------
 po/fr.po         |  87 +++++++++++++++++++++------------------
 po/hr.po         |  87 +++++++++++++++++++++------------------
 po/id.po         |  87 +++++++++++++++++++++------------------
 po/it.po         |  87 +++++++++++++++++++++------------------
 po/ja.po         |  84 +++++++++++++++++++++-----------------
 po/nl.po         |  87 +++++++++++++++++++++------------------
 po/pt_BR.po      |  87 +++++++++++++++++++++------------------
 po/ru.po         |  90 ++++++++++++++++++++++-------------------
 po/sv.po         | 103 +++++++++++++++++++++++++----------------------
 po/tr.po         |  87 +++++++++++++++++++++------------------
 src/parse-gram.c |  35 ++++++++++++----
 src/parse-gram.h |   4 +-
 16 files changed, 712 insertions(+), 593 deletions(-)

diff --git a/po/da.po b/po/da.po
index 43d9ea4a..bf5798da 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.75b\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-11-28 22:16+0100\n"
 "Last-Translator: Byrial Ole Jensen <byrial@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -19,11 +19,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "advarsel: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "fatal fejl: "
 
@@ -42,63 +42,56 @@ msgstr "    Konflikt mellem regel %d og element %s l
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "    Konflikt mellem regel %d og element %s løstes som en fejl"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d skift/reducér-konflikt"
-msgstr[1] "%d skift/reducér-konflikter"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "og"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d reducér/reducér-konflikt"
-msgstr[1] "%d reducér/reducér-konflikter"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "konflikter: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d skift/reducér"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d reducér/reducér"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "Tilstand %d indeholder "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "tilstand %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "forventede %d skift/reducér-konflikt"
 msgstr[1] "forventede %d skift/reducér-konflikter"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d reducér/reducér-konflikt"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "kan ikke åbne filen \"%s\""
 
-#: src/files.c:114
+#: src/files.c:115
 msgid "I/O error"
 msgstr "Fejl ved ind- eller udlæsning"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "kan ikke lukke fil"
 
+#: src/files.c:336
+#, c-format
+msgid "conflicting outputs to file %s"
+msgstr ""
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -220,12 +213,12 @@ msgstr ""
 "gives INGEN garanti, endog ikke for SALGBARHED eller EGNETHED FOR NOGET\n"
 "BESTEMT FORMÅL.\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr "manglende operand efter \"%s\""
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr "overtallig operand \"%s\""
@@ -400,7 +393,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "%d ubrugelig regel"
 msgstr[1] "%d ubrugelige regler"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "startsymbolet %s genererer ingen sætninger"
@@ -715,3 +708,17 @@ msgstr " TOTALT                :"
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "tid i %s: %ld.%06ld (%ld%%)\n"
+
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d skift/reducér-konflikt"
+#~ msgstr[1] "%d skift/reducér-konflikter"
+
+#~ msgid "and"
+#~ msgstr "og"
+
+#~ msgid "conflicts: "
+#~ msgstr "konflikter: "
+
+#~ msgid "State %d contains "
+#~ msgstr "Tilstand %d indeholder "
diff --git a/po/de.po b/po/de.po
index e1eef404..7a78a9ca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.75b\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
-"PO-Revision-Date: 2002-11-14 10:40:26+0100\n"
+"Project-Id-Version: bison 1.75e\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
+"PO-Revision-Date: 2002-12-27 12:17:36+0100\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "Warnung: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "fataler Fehler: "
 
@@ -45,63 +45,56 @@ msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr ""
 "    Konflikt zwischen Regel %d and Token %s wurde als Fehler betrachtet"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d Schiebe/Reduziere-Konflikt"
-msgstr[1] "%d Schiebe/Reduziere-Konflikte"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "und"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d Reduziere/Reduziere-Konflikt"
-msgstr[1] "%d Reduziere/Reduziere-Konflikte"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "Konflikte: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d Schiebe/Reduziere"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d Reduziere/Reduziere"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "Zustand %d enthält "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "Zustand %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "erwartete %d Schiebe/Reduziere-Konflikt"
 msgstr[1] "erwartete %d Schiebe/Reduziere-Konflikte"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d Reduziere/Reduziere-Konflikt"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "kann Datei »%s« nicht öffnen"
 
-#: src/files.c:114
+#: src/files.c:115
 msgid "I/O error"
 msgstr "E/A-Fehler"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "kann Datei nicht schließen"
 
+#: src/files.c:336
+#, c-format
+msgid "conflicting outputs to file %s"
+msgstr ""
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -226,12 +219,12 @@ msgstr ""
 "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE "
 "ZWECKE.\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr "fehlender Operand nach »%s«"
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr "zusätzlicher Operand »%s«"
@@ -258,7 +251,7 @@ msgstr "POSIX verbietet Deklarationen in der Grammatik"
 
 #: src/parse-gram.y:457
 msgid "missing identifier in parameter declaration"
-msgstr ""
+msgstr "fehlender Bezeichner in Parameterdeklaration"
 
 #: src/print.c:48
 #, c-format
@@ -365,9 +358,9 @@ msgid "useless rule"
 msgstr "nutzlose Regel"
 
 #: src/reduce.c:302
-#, fuzzy, c-format
+#, c-format
 msgid "useless nonterminal: %s"
-msgstr "nutzloses Nicht-Terminal"
+msgstr "nutzloses Nicht-Terminal: %s"
 
 #: src/reduce.c:350
 msgid "Useless nonterminals"
@@ -406,7 +399,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "%d nutzlose Regel"
 msgstr[1] "%d nutzlose Regeln"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"
@@ -418,7 +411,7 @@ msgstr "ungültige Direktive: %s"
 
 #: src/scan-gram.l:219
 msgid "stray `,' treated as white space"
-msgstr ""
+msgstr "überzähliges »,« als Freiraum betrachtet"
 
 #: src/scan-gram.l:235 src/scan-gram.l:765 src/scan-gram.l:833
 #, c-format
@@ -441,9 +434,9 @@ msgid "unrecognized escape sequence: %s"
 msgstr "unbekanntes Fluchtzeichen: %s"
 
 #: src/scan-gram.l:523
-#, fuzzy, c-format
+#, c-format
 msgid "missing `{' in `%s'"
-msgstr "fehlender Operand nach »%s«"
+msgstr "fehlende »{« in »%s«"
 
 #: src/scan-gram.l:737
 #, c-format
@@ -720,6 +713,20 @@ msgstr " ZUSAMMEN              :"
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "Zeit in %s: %ld.%06ld (%ld%%)\n"
 
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d Schiebe/Reduziere-Konflikt"
+#~ msgstr[1] "%d Schiebe/Reduziere-Konflikte"
+
+#~ msgid "and"
+#~ msgstr "und"
+
+#~ msgid "conflicts: "
+#~ msgstr "Konflikte: "
+
+#~ msgid "State %d contains "
+#~ msgstr "Zustand %d enthält "
+
 #~ msgid "too many gotos (max %d)"
 #~ msgstr "zu viele Gotos (max %d)"
 
diff --git a/po/es.po b/po/es.po
index 42c32e98..a942613b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -29,7 +29,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.49a\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-05-02 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -42,7 +42,7 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "aviso: "
 
@@ -53,7 +53,7 @@ msgstr "aviso: "
 # La verdad es que a mi lo de error fatal me suena fatal
 # ngp
 #
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "error grave: "
 
@@ -78,27 +78,10 @@ msgstr ""
 "El conflicto en el estado %d entre la regla %d y el terminal %s se resuelve "
 "como %s.\n"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d conflicto desplazamiento/reducción"
-msgstr[1] "%d conflictos desplazamiento/reducción"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "y"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] " %d conflicto reducción/reducción"
-msgstr[1] " %d conflictos reducción/reducción"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "conflictos: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
 # Date cuenta de que `%d' puede ser cualquier número decimal. Podría
 # ocurrir, por lo tanto, que tu mensaje en ejecución se vea luego como:
@@ -112,9 +95,9 @@ msgstr "conflictos: "
 # ok
 # ngp
 #
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d desplazamiento(s)/reducción(ones)"
 
 # Date cuenta de que `%d' puede ser cualquier número decimal. Podría
@@ -129,37 +112,47 @@ msgstr " %d desplazamiento(s)/reducci
 #
 # ok
 # ngp
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d reducción(ones)/reducción(ones)"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "El estado %d contiene"
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "estado %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "esperado: %d conflicto desplazamiento/reducción\n"
 msgstr[1] "esperados: %d conflictos desplazamiento/reducción\n"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr " %d conflicto reducción/reducción"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "no se puede abrir el fichero `%s'"
 
-#: src/files.c:114
+#: src/files.c:115
 #, fuzzy
 msgid "I/O error"
 msgstr "un error"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "no se puede cerrar el fichero"
 
+#: src/files.c:336
+#, fuzzy, c-format
+msgid "conflicting outputs to file %s"
+msgstr "conflicto de valores assoc para %s y %s"
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -276,12 +269,12 @@ msgstr ""
 "NINGUNA garantía; ni siquiera para COMERCIALIZACIÓN o ADAPTACIÓN PARA UN\n"
 "USO PARTICULAR\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr ""
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr ""
@@ -463,7 +456,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "%d regla sin uso"
 msgstr[1] "%d reglas sin uso"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, fuzzy, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia"
@@ -808,6 +801,20 @@ msgstr ""
 #~ msgid "shift"
 #~ msgstr "desplaza"
 
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d conflicto desplazamiento/reducción"
+#~ msgstr[1] "%d conflictos desplazamiento/reducción"
+
+#~ msgid "and"
+#~ msgstr "y"
+
+#~ msgid "State %d contains "
+#~ msgstr "El estado %d contiene"
+
+#~ msgid "conflicts: "
+#~ msgstr "conflictos: "
+
 #~ msgid "%s contains "
 #~ msgstr "%s contiene "
 
diff --git a/po/et.po b/po/et.po
index 913806d2..05840bf1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.75b\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
-"PO-Revision-Date: 2002-11-13 23:33+0200\n"
+"Project-Id-Version: bison 1.75e\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
+"PO-Revision-Date: 2002-12-27 10:55+0200\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemi viga"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "hoiatus: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "fataalne viga: "
 
@@ -41,63 +41,56 @@ msgstr "    Konflikt reegli %d ja m
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "    Konflikt reegli %d ja märgi %s vahel lahendatud veana"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d nihutamine/redutseerimine konflikt"
-msgstr[1] "%d nihutamine/redutseerimine konflikti"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "ja"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d redutseerimine/redutseerimine konflikt"
-msgstr[1] "%d redutseerimine/redutseerimine konflikti"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "konfliktid: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d nihutamine/redutseerimine"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d redutseerimine/redutseerimine"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "Olek %d sisaldab "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "olek %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "eeldasime %d nihutamine/redutseerimine konflikti"
 msgstr[1] "eeldasime %d nihutamine/redutseerimine konflikti"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d redutseerimine/redutseerimine konflikt"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"
 
-#: src/files.c:114
+#: src/files.c:115
 msgid "I/O error"
 msgstr "S/V viga"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"
 
+#: src/files.c:336
+#, c-format
+msgid "conflicting outputs to file %s"
+msgstr ""
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -215,12 +208,12 @@ 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:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr "`%s' järel puudub operand"
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr "Liigne operand `%s'"
@@ -247,7 +240,7 @@ msgstr "POSIX keelab deklareerimised grammatikas"
 
 #: src/parse-gram.y:457
 msgid "missing identifier in parameter declaration"
-msgstr ""
+msgstr "parameetri deklaratsioonis puudub identifikaator"
 
 #: src/print.c:48
 #, c-format
@@ -354,9 +347,9 @@ msgid "useless rule"
 msgstr "kasutamata reegel"
 
 #: src/reduce.c:302
-#, fuzzy, c-format
+#, c-format
 msgid "useless nonterminal: %s"
-msgstr "kasutamata mitteterminal"
+msgstr "kasutamata mitteterminal: %s"
 
 #: src/reduce.c:350
 msgid "Useless nonterminals"
@@ -395,7 +388,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "%d kasutamata reegel"
 msgstr[1] "%d kasutamata reeglit"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "stardisümbolist %s ei tuletata ühtegi lauset"
@@ -407,7 +400,7 @@ msgstr "vigane juhus: %s"
 
 #: src/scan-gram.l:219
 msgid "stray `,' treated as white space"
-msgstr ""
+msgstr "käsitlen juhuslikku `,' kui tühikut"
 
 #: src/scan-gram.l:235 src/scan-gram.l:765 src/scan-gram.l:833
 #, c-format
@@ -430,9 +423,9 @@ msgid "unrecognized escape sequence: %s"
 msgstr "tundmatu paojada: %s"
 
 #: src/scan-gram.l:523
-#, fuzzy, c-format
+#, c-format
 msgid "missing `{' in `%s'"
-msgstr "`%s' järel puudub operand"
+msgstr "`%s' juures puudub `{'"
 
 #: src/scan-gram.l:737
 #, c-format
@@ -708,3 +701,17 @@ msgstr " KOKKU                 :"
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "aeg %s: %ld.%06ld (%ld%%)\n"
+
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d nihutamine/redutseerimine konflikt"
+#~ msgstr[1] "%d nihutamine/redutseerimine konflikti"
+
+#~ msgid "and"
+#~ msgstr "ja"
+
+#~ msgid "conflicts: "
+#~ msgstr "konfliktid: "
+
+#~ msgid "State %d contains "
+#~ msgstr "Olek %d sisaldab "
diff --git a/po/fr.po b/po/fr.po
index 653714cc..15e03dbb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.75b\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-11-13 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -19,11 +19,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Erreur système inconnue"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "AVERTISSEMENT: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "erreur fatale: "
 
@@ -42,63 +42,56 @@ msgstr "Conflit entre la r
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "Conflit entre la règle %d et le jeton %s résolu comme étant une erreur"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d conflit par décalage/réduction"
-msgstr[1] "%d conflits par décalage/réduction"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "et"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d conflit par réduction/réduction"
-msgstr[1] "%d conflits par réduction/réduction"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "conflits: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d décalage/réduction"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d réduction/réduction"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "L'état %d contient "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "état %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "attendait %d conflit par décalage/réduction"
 msgstr[1] "attendait %d conflits par décalage/réduction"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d conflit par réduction/réduction"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne peut ouvrir le fichier « %s »"
 
-#: src/files.c:114
+#: src/files.c:115
 msgid "I/O error"
 msgstr "une erreur d'E/S"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "ne peut fermer le fichier"
 
+#: src/files.c:336
+#, c-format
+msgid "conflicting outputs to file %s"
+msgstr ""
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -221,12 +214,12 @@ 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:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr "opérande manquante après « %s »"
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr "opérande superflue « %s »"
@@ -402,7 +395,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "%d règle inutilisable"
 msgstr[1] "%d règles inutilisables"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr ""
@@ -717,6 +710,20 @@ msgstr " TOTAL                 :"
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "temps dans %s: %ld.%06ld (%ld%%)\n"
 
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d conflit par décalage/réduction"
+#~ msgstr[1] "%d conflits par décalage/réduction"
+
+#~ msgid "and"
+#~ msgstr "et"
+
+#~ msgid "conflicts: "
+#~ msgstr "conflits: "
+
+#~ msgid "State %d contains "
+#~ msgstr "L'état %d contient "
+
 #~ msgid "too many gotos (max %d)"
 #~ msgstr "nombre trop grand de « goto » (Max %d)"
 
diff --git a/po/hr.po b/po/hr.po
index e91a8521..9d90c2a0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.34a\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-04-10 22:20+01\n"
 "Last-Translator: Denis Lackovic <delacko@fly.srk.fer.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -20,11 +20,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Nepoznata sistemska gre¹ka"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "upozorenje:"
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "fatalna gre¹ka:"
 
@@ -43,64 +43,57 @@ msgstr "Konflikt u stanju %d izme
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d pomakni/reduciraj konflikat"
-msgstr[1] "%d pomakni/reduciraj konflikata"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "i"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d reduciraj/reduciraj konflikt"
-msgstr[1] "%d reduciraj/reduciraj konflikata"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "konflikt:"
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d pomakni/reduciraj"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d reduviraj/reduciraj"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "Stanje %d sadr¾i"
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "stanje %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "oèekujem %d pomakni/reduciraj konflikt\n"
 msgstr[1] "oèekujem %d pomakni/reduciraj konflikata\n"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d reduciraj/reduciraj konflikt"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne mogu otvoriti datoteku `%s'"
 
-#: src/files.c:114
+#: src/files.c:115
 #, fuzzy
 msgid "I/O error"
 msgstr "gre¹ka"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "ne mogu zatvoriti datoteku"
 
+#: src/files.c:336
+#, fuzzy, c-format
+msgid "conflicting outputs to file %s"
+msgstr "konfliktne asocijativne vrijednosti za %s i %s"
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -214,12 +207,12 @@ msgstr ""
 "kopiranja.  NEMA\n"
 "garancije; èak ni tvrdnje o ISPLATIVOSTI ili POGODNOSTI ZA NEKU SVRHU.\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr ""
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr ""
@@ -401,7 +394,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "%d beskorisno pravilo"
 msgstr[1] "%d beskorisnih pravila"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, fuzzy, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "Poèetni simbol %s ne daje niti jednu reèenicu"
@@ -718,6 +711,20 @@ msgstr ""
 #~ msgid "shift"
 #~ msgstr "pomakni"
 
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d pomakni/reduciraj konflikat"
+#~ msgstr[1] "%d pomakni/reduciraj konflikata"
+
+#~ msgid "and"
+#~ msgstr "i"
+
+#~ msgid "State %d contains "
+#~ msgstr "Stanje %d sadr¾i"
+
+#~ msgid "conflicts: "
+#~ msgstr "konflikt:"
+
 #~ msgid "%s contains "
 #~ msgstr "%s sadr¾i"
 
diff --git a/po/id.po b/po/id.po
index 86551cd0..22ef5cae 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.75b\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-11-22 12:24GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -20,11 +20,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Kesalahan sistem tidak dikenal"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "peringatan: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "kesalahan fatal: "
 
@@ -44,63 +44,56 @@ msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr ""
 "    Konflik antara aturan %d dan token %s diselesaikan sebagai kesalahan"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d geser/kurangi konflik"
-msgstr[1] "%d geser/kurangi konflik"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "dan"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d geser/kurangi konflik"
-msgstr[1] "%d geser/kurangi konflik"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "konflik: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d geser/kurangi"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d kurangi/kurangi"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "State %d berisi "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "state %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "mengharapkan %d shift/reduce konflik"
 msgstr[1] "mengharapkan %d shift/reduce konflik"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d geser/kurangi konflik"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "tidak dapat membuka file `%s'"
 
-#: src/files.c:114
+#: src/files.c:115
 msgid "I/O error"
 msgstr "Kesalahan I/O"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "tidak dapat menutup file"
 
+#: src/files.c:336
+#, c-format
+msgid "conflicting outputs to file %s"
+msgstr ""
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -219,12 +212,12 @@ msgstr ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr "operand hilang setelah `%s'"
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr "operand ekstra `%s'"
@@ -399,7 +392,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "aturan tidak berguna %d"
 msgstr[1] "aturan tidak berguna %d"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "simbol awal %s tidak melahirkan kalimat"
@@ -712,3 +705,17 @@ msgstr " TOTAL                 :"
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "waktu dalam %s: %ld.%06ld (%ld%%)\n"
+
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d geser/kurangi konflik"
+#~ msgstr[1] "%d geser/kurangi konflik"
+
+#~ msgid "and"
+#~ msgstr "dan"
+
+#~ msgid "conflicts: "
+#~ msgstr "konflik: "
+
+#~ msgid "State %d contains "
+#~ msgstr "State %d berisi "
diff --git a/po/it.po b/po/it.po
index ee4c6f7d..9f1de6a1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.50\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-10-17 14:37+0100\n"
 "Last-Translator: Paolo Bonzini <bonzini@gnu.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -18,11 +18,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "attenzione: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "errore fatale: "
 
@@ -41,63 +41,56 @@ msgstr "    Conflitto tra la regola %d e il token %s risolto come riduzione"
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "    Conflitto tra la regola %d e il token %s risolto come errore"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d conflitto shift/riduzione"
-msgstr[1] "%d conflitti shift/riduzione"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "e"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d conflitto riduzione/riduzione"
-msgstr[1] "%d conflitti riduzione/riduzione"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "conflitti: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d shift/riduzione"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d riduzione/riduzione"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "Lo stato %d contiene"
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "stato %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "atteso %d conflitto shift/riduzione"
 msgstr[1] "attesi %d conflitti shift/riduzione"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d conflitto riduzione/riduzione"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "impossibile aprire il file `%s'"
 
-#: src/files.c:114
+#: src/files.c:115
 msgid "I/O error"
 msgstr ""
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "impossibile chiudere il file `%s'"
 
+#: src/files.c:336
+#, c-format
+msgid "conflicting outputs to file %s"
+msgstr ""
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -217,12 +210,12 @@ msgstr ""
 "sottoposta la copia. NON c'è ALCUNA garanzia, neanche di\n"
 "COMMERCIABILITA` o di ADEGUATEZZA AD UN PARTICOLARE SCOPO.\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr ""
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr ""
@@ -398,7 +391,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "%d regola inutile"
 msgstr[1] "%d regole inutili"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "dal simbolo iniziale %s non deriva alcuna frase"
@@ -710,6 +703,20 @@ msgstr " TOTALE                :"
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "tempo in %s: %ld.%06ld (%ld%%)\n"
 
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d conflitto shift/riduzione"
+#~ msgstr[1] "%d conflitti shift/riduzione"
+
+#~ msgid "and"
+#~ msgstr "e"
+
+#~ msgid "conflicts: "
+#~ msgstr "conflitti: "
+
+#~ msgid "State %d contains "
+#~ msgstr "Lo stato %d contiene"
+
 #~ msgid "%s: no grammar file given\n"
 #~ msgstr "%s: nessun file grammatica specificato\n"
 
diff --git a/po/ja.po b/po/ja.po
index 0af793d4..0e3fe5ba 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-10-29 01:00-05:00\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à¥¨¥é¡¼"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "Ã×̿Ū¥¨¥é¡¼: "
 
@@ -41,61 +41,56 @@ msgstr "
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "¤ª¤è¤Ó"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d ´Ô¸µ/´Ô¸µ¾×ÆÍ"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "¾×ÆÍ: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d ´Ô¸µ/´Ô¸µ"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "¾õÂÖ %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "ËÜÍè %d ¸Ä¤Î¥·¥Õ¥È/´Ô¸µ¾×ÆͤǤ¢¤ë¤Ï¤º¤Ç¤¹\n"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d ´Ô¸µ/´Ô¸µ¾×ÆÍ"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "¥Õ¥¡¥¤¥ë `%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: src/files.c:114
+#: src/files.c:115
 #, fuzzy
 msgid "I/O error"
 msgstr "¥¨¥é¡¼"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "¥Õ¥¡¥¤¥ë¤òÊĤ¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
+#: src/files.c:336
+#, fuzzy, c-format
+msgid "conflicting outputs to file %s"
+msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -210,12 +205,12 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹ -- Ê£À½¤Ë¤Ä¤¤¤Æ¤Î¾ò·ï¤Ï¥½¡¼¥¹¤ò¸«¤Þ¤·¤ç¤¦¡£\n"
 "°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó -- ¾¦¶ÈÀ­¤äÌÜŪŬ¹çÀ­¤Ë¤Ä¤¤¤Æ¤ÎÊݾڤ¹¤é¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr ""
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr ""
@@ -395,7 +390,7 @@ msgid "%d useless rule"
 msgid_plural "%d useless rules"
 msgstr[0] "%d ¸Ä¤Î̵°ÕÌ£¤Êµ¬Â§"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, fuzzy, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó"
@@ -714,6 +709,19 @@ msgstr ""
 #~ msgid "shift"
 #~ msgstr "¥·¥Õ¥È"
 
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
+
+#~ msgid "and"
+#~ msgstr "¤ª¤è¤Ó"
+
+#~ msgid "State %d contains "
+#~ msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï "
+
+#~ msgid "conflicts: "
+#~ msgstr "¾×ÆÍ: "
+
 #~ msgid "%s contains "
 #~ msgstr "%s ¤ÎÃæ¿È¤Ï"
 
diff --git a/po/nl.po b/po/nl.po
index 7d4486cc..74694f43 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.75b\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-11-16 11:43+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@pandora.be>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -19,11 +19,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "let op: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "fatale fout: "
 
@@ -42,63 +42,56 @@ msgstr "    Conflict tussen regel %d en token %s opgelost als reductie"
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "    Conflict tussen regel %d en token %s opgelost als een fout"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d shift/reductie conflict"
-msgstr[1] "%d shift/reductie conflicten"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "en"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d reductie/reductie conflict"
-msgstr[1] "%d reductie/reductie conflicten"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "conflicten: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d shift/reductie"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d reductie/reductie"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "Staat %d bevat"
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "staat %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "%d shift/reductie conflict werd verwacht"
 msgstr[1] "%d shift/reductie conflicten werden verwacht"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d reductie/reductie conflict"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "kan bestand `%s' niet openen"
 
-#: src/files.c:114
+#: src/files.c:115
 msgid "I/O error"
 msgstr "I/O fout"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "kan bestand niet sluiten"
 
+#: src/files.c:336
+#, c-format
+msgid "conflicting outputs to file %s"
+msgstr ""
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -228,12 +221,12 @@ msgstr ""
 "garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD\n"
 "DOEL.\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr "operand ontbreekt na `%s'"
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr "overtollige operand `%s'"
@@ -410,7 +403,7 @@ msgstr[0] "%d nutteloze regel"
 msgstr[1] "%d nutteloze regels"
 
 # Ik _denk_ dat dit correct weergeeft wat er bedoeld wordt (m.a.w. er is geen regel voor het startsymbool)
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "uit startsymbool %s kan geen enkele zin afgeleid worden"
@@ -725,3 +718,17 @@ msgstr " TOTAAL                :"
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "tijd in %s: %ld.%06ld (%ld%%)\n"
+
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d shift/reductie conflict"
+#~ msgstr[1] "%d shift/reductie conflicten"
+
+#~ msgid "and"
+#~ msgstr "en"
+
+#~ msgid "conflicts: "
+#~ msgstr "conflicten: "
+
+#~ msgid "State %d contains "
+#~ msgstr "Staat %d bevat"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c2736fbd..2543faab 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.75b\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-12-14 02:10-0300\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -18,11 +18,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "aviso: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "erro fatal: "
 
@@ -41,63 +41,56 @@ msgstr "    Conflito entre a regra %d e a token %s resolvido como `reduce`."
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "    Conflito entre a regra %d e a token %s resolvido como um erro."
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d conflito de deslocamento/redução"
-msgstr[1] "%d conflitos de deslocamento/redução"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "e"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d conflito de redução/redução"
-msgstr[1] "%d conflitos de redução/redução"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "conflitos: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d deslocamento/redução"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d redução/redução"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "O estado %d contém "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "estado %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "esperado: %d conflito de deslocamento/redução"
 msgstr[1] "esperados: %d conflitos de deslocamento/redução"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d conflito de redução/redução"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "impossível abrir o arquivo `%s'"
 
-#: src/files.c:114
+#: src/files.c:115
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "impossível fechar o arquivo"
 
+#: src/files.c:336
+#, c-format
+msgid "conflicting outputs to file %s"
+msgstr ""
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -220,12 +213,12 @@ msgstr ""
 "ou\n"
 "ADEQUAÇÃO À QUALQUER FINALIDADE PARTICULAR.\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr "falta operando depois de `%s'"
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr "operando `%s' sobrando"
@@ -400,7 +393,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "%d regra inútil"
 msgstr[1] "%d regras inúteis"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "símbolo de início %s não deriva nenhuma sentença"
@@ -711,3 +704,17 @@ msgstr " TOTAL                 :"
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "tempo em  %s: %ld.%06ld (%ld%%)\n"
+
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d conflito de deslocamento/redução"
+#~ msgstr[1] "%d conflitos de deslocamento/redução"
+
+#~ msgid "and"
+#~ msgstr "e"
+
+#~ msgid "conflicts: "
+#~ msgstr "conflitos: "
+
+#~ msgid "State %d contains "
+#~ msgstr "O estado %d contém "
diff --git a/po/ru.po b/po/ru.po
index 34ee7fbc..aa9cbb4f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.49a\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-07-20 13:23+0400\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -19,11 +19,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "
 
@@ -45,46 +45,27 @@ msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr ""
 "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
-msgstr[1] "%d ËÏÎÆÌÉËÔÁ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
-msgstr[2] "%d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "É"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
-msgstr[1] "%d ËÏÎÆÌÉËÔÁ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
-msgstr[2] "%d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "ËÏÎÆÌÉËÔÙ: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "ÓÏÓÔÏÑÎÉÅ %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
@@ -92,20 +73,30 @@ msgstr[0] "
 msgstr[1] "ÏÖÉÄÁÌÏÓØ %d ËÏÎÆÌÉËÔÁ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ\n"
 msgstr[2] "ÏÖÉÄÁÌÏÓØ %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ\n"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"
 
-#: src/files.c:114
+#: src/files.c:115
 #, fuzzy
 msgid "I/O error"
 msgstr "ÏÛÉÂËÁ"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"
 
+#: src/files.c:336
+#, fuzzy, c-format
+msgid "conflicting outputs to file %s"
+msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -221,12 +212,12 @@ msgstr ""
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr ""
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr ""
@@ -413,7 +404,7 @@ msgstr[0] "%d 
 msgstr[1] "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌÁ"
 msgstr[2] "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, fuzzy, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
@@ -730,6 +721,21 @@ msgstr ""
 #~ msgid "shift"
 #~ msgstr "ÓÄ×ÉÇ"
 
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
+#~ msgstr[1] "%d ËÏÎÆÌÉËÔÁ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
+#~ msgstr[2] "%d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
+
+#~ msgid "and"
+#~ msgstr "É"
+
+#~ msgid "State %d contains "
+#~ msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ "
+
+#~ msgid "conflicts: "
+#~ msgstr "ËÏÎÆÌÉËÔÙ: "
+
 #~ msgid "%s contains "
 #~ msgstr "%s ÓÏÄÅÒÖÉÔ "
 
diff --git a/po/sv.po b/po/sv.po
index 7850d26e..59cbf769 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.75b\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
-"PO-Revision-Date: 2002-11-23 14:19+0100\n"
+"Project-Id-Version: bison 1.75e\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
+"PO-Revision-Date: 2002-12-28 20:27+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "varning: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "ödesdigert fel: "
 
@@ -42,63 +42,56 @@ msgstr "    Konflikt mellan regel %d och element %s l
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "    Konflikt mellan regel %d och element %s löstes som ett fel"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d skifta/reducerakonflikt"
-msgstr[1] "%d skifta/reducerakonflikter"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "och"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d reducera/reducerakonflikt"
-msgstr[1] "%d reducera/reducerakonflikter"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "konflikter: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d skifta/reducera"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d reducera/reducera"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "Tillstånd %d innehåller "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "tillstånd %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "förväntade %d skifta/reducerakonflikt"
 msgstr[1] "förväntade %d skifta/reducerakonflikter"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d reducera/reducerakonflikt"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "kan inte öppna filen \"%s\""
 
-#: src/files.c:114
+#: src/files.c:115
 msgid "I/O error"
 msgstr "I/O-fel"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "kan inte stänga fil"
 
+#: src/files.c:336
+#, c-format
+msgid "conflicting outputs to file %s"
+msgstr ""
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -220,12 +213,12 @@ msgstr ""
 "finns INGEN garanti, inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR ETT\n"
 "SPECIELLT ÄNDAMÅL.\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr "saknad operand efter \"%s\""
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr "extra operand \"%s\""
@@ -252,7 +245,7 @@ msgstr "POSIX f
 
 #: src/parse-gram.y:457
 msgid "missing identifier in parameter declaration"
-msgstr ""
+msgstr "identiferare saknas i parameterdeklaration"
 
 #: src/print.c:48
 #, c-format
@@ -359,9 +352,9 @@ msgid "useless rule"
 msgstr "oanvändbar regel"
 
 #: src/reduce.c:302
-#, fuzzy, c-format
+#, c-format
 msgid "useless nonterminal: %s"
-msgstr "oanvändbar icketerminal"
+msgstr "oanvändbar icketerminal: %s"
 
 #: src/reduce.c:350
 msgid "Useless nonterminals"
@@ -400,7 +393,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "%d oanvändbar regel"
 msgstr[1] "%d oanvändbara regler"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "startsymbolen %s genererar inga meningar"
@@ -412,7 +405,7 @@ msgstr "ogiltigt direktiv: %s"
 
 #: src/scan-gram.l:219
 msgid "stray `,' treated as white space"
-msgstr ""
+msgstr "vilsekommet \",\" hanterat som blank"
 
 #: src/scan-gram.l:235 src/scan-gram.l:765 src/scan-gram.l:833
 #, c-format
@@ -435,9 +428,9 @@ msgid "unrecognized escape sequence: %s"
 msgstr "okänd specialsekvens: %s"
 
 #: src/scan-gram.l:523
-#, fuzzy, c-format
+#, c-format
 msgid "missing `{' in `%s'"
-msgstr "saknad operand efter \"%s\""
+msgstr "saknad \"{\" i \"%s\""
 
 #: src/scan-gram.l:737
 #, c-format
@@ -716,3 +709,17 @@ msgstr " TOTALT                :"
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr "tid i %s: %ld.%06ld (%ld%%)\n"
+
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d skifta/reducerakonflikt"
+#~ msgstr[1] "%d skifta/reducerakonflikter"
+
+#~ msgid "and"
+#~ msgstr "och"
+
+#~ msgid "conflicts: "
+#~ msgstr "konflikter: "
+
+#~ msgid "State %d contains "
+#~ msgstr "Tillstånd %d innehåller "
diff --git a/po/tr.po b/po/tr.po
index ed35b356..c080866c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.49a\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\n"
 "PO-Revision-Date: 2002-06-25 11:03GMT +02:00\n"
 "Last-Translator: Altuð Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -19,11 +19,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatasý"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "uyarý: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "ölümcül hata:"
 
@@ -48,64 +48,57 @@ msgstr ""
 "%d durumu içinde %d kuralý ve %s andaçý arasýndaki çeliþki %s olarak\n"
 "çözümlendi.\n"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d öteleme/indirgeme çeliþkisi"
-msgstr[1] "%d öteleme/indirgeme çeliþkisi"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "ve"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d indirgeme/indirgeme çeliþkisi"
-msgstr[1] "%d indirgeme/indirgeme çeliþkisi"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "çeliþkiler: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d öteleme/indirgeme"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d indirgeme/indirgeme"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "%d durumu içerir"
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "durum %d"
 
-#: src/conflicts.c:538
+#: src/conflicts.c:498
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "beklenen %d öteleme/indirgeme çeliþkisi\n"
 msgstr[1] "beklenen %d öteleme/indirgeme çeliþkisi\n"
 
-#: src/files.c:98
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d indirgeme/indirgeme çeliþkisi"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "`%s' dosyasý açýlamadý"
 
-#: src/files.c:114
+#: src/files.c:115
 #, fuzzy
 msgid "I/O error"
 msgstr "bir hata"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "dosya kapatýlamýyor"
 
+#: src/files.c:336
+#, fuzzy, c-format
+msgid "conflicting outputs to file %s"
+msgstr "%s ve %s için çeliþen birleþmeli deðerler"
+
 #: src/getargs.c:182
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -221,12 +214,12 @@ msgstr ""
 "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya ÞAHSÝ KULLANIMINIZA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr ""
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr ""
@@ -409,7 +402,7 @@ msgid_plural "%d useless rules"
 msgstr[0] "%d yararsýz kural"
 msgstr[1] "%d yararsýz kural"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, fuzzy, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "Baþlangýç simgesi %s herhangi bir cümleden türemez"
@@ -727,6 +720,20 @@ msgstr ""
 #~ msgid "shift"
 #~ msgstr "shift"
 
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d öteleme/indirgeme çeliþkisi"
+#~ msgstr[1] "%d öteleme/indirgeme çeliþkisi"
+
+#~ msgid "and"
+#~ msgstr "ve"
+
+#~ msgid "State %d contains "
+#~ msgstr "%d durumu içerir"
+
+#~ msgid "conflicts: "
+#~ msgstr "çeliþkiler: "
+
 #~ msgid "%s contains "
 #~ msgstr "%s içerir"
 
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 0af6caf5..167fd18d 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 1.75e.  */
+/* A Bison parser, made by GNU Bison 1.75f.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
@@ -221,7 +221,7 @@ typedef union YYSTYPE {
   assoc assoc;
   uniqstr uniqstr;
 } YYSTYPE;
-/* Line 192 of yacc.c.  */
+/* Line 191 of yacc.c.  */
 #line 225 "parse-gram.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -245,7 +245,7 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 
-/* Line 215 of yacc.c.  */
+/* Line 214 of yacc.c.  */
 #line 249 "parse-gram.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
@@ -1032,6 +1032,7 @@ YYLTYPE yylloc;
   YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;
+  YYLTYPE *yylerrsp;
 
 #define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
 
@@ -1334,7 +1335,7 @@ yyreduce:
 
   case 23:
 #line 192 "parse-gram.y"
-    { report_flag = 1; }
+    { report_flag = report_states; }
     break;
 
   case 24:
@@ -1610,7 +1611,7 @@ yyreduce:
     }
 
 /* Line 991 of yacc.c.  */
-#line 1613 "parse-gram.c"
+#line 1614 "parse-gram.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1694,6 +1695,8 @@ yyerrlab:
 	yyerror ("syntax error");
     }
 
+  yylerrsp = yylsp;
+
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
@@ -1717,17 +1720,34 @@ yyerrlab:
       YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
       yydestruct (yytoken, &yylval, &yylloc);
       yychar = YYEMPTY;
+      *++yylerrsp = yylloc;
     }
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
-  goto yyerrlab1;
+  goto yyerrlab2;
 
 
 /*----------------------------------------------------.
 | yyerrlab1 -- error raised explicitly by an action.  |
 `----------------------------------------------------*/
 yyerrlab1:
+
+  /* Suppress GCC warning that yyerrlab1 is unused when no action
+     invokes YYERROR.  */
+#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__)
+  __attribute__ ((__unused__))
+#endif
+
+  yylerrsp = yylsp;
+  *++yylerrsp = yyloc;
+  goto yyerrlab2;
+
+
+/*---------------------------------------------------------------.
+| yyerrlab2 -- pop states until the error token can be shifted.  |
+`---------------------------------------------------------------*/
+yyerrlab2:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1762,7 +1782,8 @@ yyerrlab1:
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-  *++yylsp = yylloc;
+  YYLLOC_DEFAULT (yyloc, yylsp, (yylerrsp - yylsp));
+  *++yylsp = yyloc;
 
   yystate = yyn;
   goto yynewstate;
diff --git a/src/parse-gram.h b/src/parse-gram.h
index d54d0b3e..1b5fc181 100644
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 1.75e.  */
+/* A Bison parser, made by GNU Bison 1.75f.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
@@ -133,7 +133,7 @@ typedef union YYSTYPE {
   assoc assoc;
   uniqstr uniqstr;
 } YYSTYPE;
-/* Line 1228 of yacc.c.  */
+/* Line 1248 of yacc.c.  */
 #line 137 "y.tab.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-- 
2.47.2