* src/reader.c (copy_comment2): New function, same as former

`copy_comment', but outputs into two FILE *.
(copy_comment): Use it.
(parse_union_decl): Use it.
(get_type, parse_start_decl): Use the same `invalid' message.
(parse_start_decl, parse_union_decl): Use the same `multiple'
message.
(parse_union_decl, copy_guard, copy_action): Use the same
`unmatched' message.
* m4/Makefile.am (EXTRA_DIST): Add `warning.m4'.

diff --git a/ChangeLog b/ChangeLog
index 5298e84b358f345e67dbb97c6126e86728905f6c..b4d76f366da6509c03af2384957cc77b5f0a0308 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-04-14  Akim Demaille  <akim@epita.fr>
+
+       * src/reader.c (copy_comment2): New function, same as former
+       `copy_comment', but outputs into two FILE *.
+       (copy_comment): Use it.
+       (parse_union_decl): Use it.
+       (get_type, parse_start_decl): Use the same `invalid' message.
+       (parse_start_decl, parse_union_decl): Use the same `multiple'
+       message.
+       (parse_union_decl, copy_guard, copy_action): Use the same
+       `unmatched' message.
+       * m4/Makefile.am (EXTRA_DIST): Add `warning.m4'.
+

 2000-03-31  Akim Demaille  <akim@epita.fr>
 
        * src/files.c (tryopen, tryclose): Move to the top.
 2000-03-31  Akim Demaille  <akim@epita.fr>
 
        * src/files.c (tryopen, tryclose): Move to the top.

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 3643c690bd6eee942aac79be023a707e8f11d273..ea9bb9eef563f5d8fcdc9a06a8333c5030a72f81 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,2 +1,3 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-

-EXTRA_DIST = bison-decl.m4 error.m4 gettext.m4 lcmessage.m4 progtest.m4
+EXTRA_DIST = bison-decl.m4 error.m4 gettext.m4 lcmessage.m4 progtest.m4 \
+             warning.m4

diff --git a/po/de.po b/po/de.po
index 85f883a602055e827e8561ada9eec1adff92ab74..864f84ea6235167c2382a2804414a0dd38d6f928 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 2000-03-31 16:02+0200\n"
+"POT-Creation-Date: 2000-04-14 15:35+0200\n"

 "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
 "Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n"
 "Language-Team: German <de@li.org>\n"
 "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"


@@ -194,7 +194,7 @@ msgstr ""
 msgid "unexpected `/' found and ignored"
 msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
 
 msgid "unexpected `/' found and ignored"
 msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
 

-#: src/lex.c:144 src/reader.c:248
+#: src/lex.c:144 src/reader.c:256

 msgid "unterminated comment"
 msgstr "unbeendeter Kommentar"
 
 msgid "unterminated comment"
 msgstr "unbeendeter Kommentar"
 


@@ -235,7 +235,7 @@ msgstr "unerwarteter Typname am Ende der Datei"
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 

-#: src/main.c:137
+#: src/main.c:136

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"


@@ -244,7 +244,7 @@ msgstr "interner Fehler, %s\n"
 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"
 
 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"
 

-#: src/output.c:1199
+#: src/output.c:1207

 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale Tabellengröße (%s) überschritten"
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale Tabellengröße (%s) überschritten"


@@ -365,227 +365,207 @@ msgstr "unbeendete Zeichenkette am Ende der Datei"
 msgid "unterminated string"
 msgstr "unbeendete Zeichenkette"
 
 msgid "unterminated string"
 msgstr "unbeendete Zeichenkette"
 

-#: src/reader.c:424
+#: src/reader.c:444

 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 

-#: src/reader.c:429
+#: src/reader.c:449

 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 
 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 

-#: src/reader.c:432
+#: src/reader.c:452

 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 

-#: src/reader.c:484
+#: src/reader.c:504

 msgid "unterminated `%{' definition"
 msgstr "unbeendete »%{« Definition"
 
 msgid "unterminated `%{' definition"
 msgstr "unbeendete »%{« Definition"
 

-#: src/reader.c:525 src/reader.c:713 src/reader.c:762
+#: src/reader.c:545 src/reader.c:733 src/reader.c:782

 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 

-#: src/reader.c:562 src/reader.c:784
+#: src/reader.c:582 src/reader.c:804

 #, c-format
 msgid "symbol %s redefined"
 msgstr "Symbol %s noch einmal definiert"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "Symbol %s noch einmal definiert"
 

-#: src/reader.c:572 src/reader.c:728 src/reader.c:791 src/reader.c:1697
+#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
 

-#: src/reader.c:582
+#: src/reader.c:602

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "»%s« ist in %s nicht erlaubt"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "»%s« ist in %s nicht erlaubt"
 

-#: src/reader.c:630
+#: src/reader.c:650

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 

-#: src/reader.c:652
+#: src/reader.c:672

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 

-#: src/reader.c:674
-#, c-format
-msgid "multiple %start declarations"
+#: src/reader.c:694 src/reader.c:855
+#, fuzzy, c-format
+msgid "multiple %s declarations"

 msgstr "mehr als eine %start Deklaration"
 
 msgstr "mehr als eine %start Deklaration"
 

-#: src/reader.c:676
-#, c-format
-msgid "invalid %start declaration"
+#: src/reader.c:696 src/reader.c:1649
+#, fuzzy, c-format
+msgid "invalid %s declaration"

 msgstr "ungültige %start Deklaration"
 
 msgstr "ungültige %start Deklaration"
 

-#: src/reader.c:696
+#: src/reader.c:716

 msgid "%type declaration has no <typename>"
 msgstr "%type Deklaration hat keinen <Typ-Namen>"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type Deklaration hat keinen <Typ-Namen>"
 

-#: src/reader.c:733
+#: src/reader.c:753

 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ungültige %%type Deklaration wegen »%s«"
 
 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ungültige %%type Deklaration wegen »%s«"
 

-#: src/reader.c:780
+#: src/reader.c:800

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "Stellenwertigkeit von %s wird erneut definiert"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "Stellenwertigkeit von %s wird erneut definiert"
 

-#: src/reader.c:803
+#: src/reader.c:823

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen"
 

-#: src/reader.c:813
+#: src/reader.c:833

 #, c-format
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"
 

-#: src/reader.c:837
-#, c-format
-msgid "multiple %union declarations"
-msgstr "erneute %union Definition"
-
-#: src/reader.c:895
-msgid "unterminated comment at end of file"
-msgstr "unbeendeter Kommentar am Dateiende"
-
-#: src/reader.c:921
-msgid "unmatched close-brace (`}')"
-msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
+#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276
+#, fuzzy, c-format
+msgid "unmatched %s"
+msgstr "»{« hat kein Gegenstück"

 
 

-#: src/reader.c:965
+#: src/reader.c:941

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"
 

-#: src/reader.c:997
+#: src/reader.c:973

 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s ist unzulässig"
 
 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s ist unzulässig"
 

-#: src/reader.c:1012 src/reader.c:1024
+#: src/reader.c:988 src/reader.c:1000

 msgid "invalid $ value"
 msgstr "unzulässiger $ Wert"
 
 msgid "invalid $ value"
 msgstr "unzulässiger $ Wert"
 

-#: src/reader.c:1083
-msgid "unmatched right brace (`}')"
-msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
-
-#: src/reader.c:1130 src/reader.c:1270
+#: src/reader.c:1106 src/reader.c:1246

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ von »%s« hat keine deklarierten Wert"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ von »%s« hat keine deklarierten Wert"
 

-#: src/reader.c:1146 src/reader.c:1286
+#: src/reader.c:1122 src/reader.c:1262

 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "»%s« von »%s« hat keine deklarierten Wert"
 
 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "»%s« von »%s« hat keine deklarierten Wert"
 

-#: src/reader.c:1151 src/reader.c:1291
+#: src/reader.c:1127 src/reader.c:1267

 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s ist unzulässig"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s ist unzulässig"
 

-#: src/reader.c:1160
+#: src/reader.c:1136

 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "unbeendeter %%guard Fall"
 
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "unbeendeter %%guard Fall"
 

-#: src/reader.c:1300
-msgid "unmatched `{'"
-msgstr "»{« hat kein Gegenstück"
-
-#: src/reader.c:1386
+#: src/reader.c:1362

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon "
 "gefolgt"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon "
 "gefolgt"
 

-#: src/reader.c:1393
+#: src/reader.c:1369

 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 
 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 

-#: src/reader.c:1424
+#: src/reader.c:1400

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "Regel für %s vorhanden, welches aber ein Token ist"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "Regel für %s vorhanden, welches aber ein Token ist"
 

-#: src/reader.c:1522
+#: src/reader.c:1498

 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 
 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 

-#: src/reader.c:1531
+#: src/reader.c:1507

 #, fuzzy, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 
 #, fuzzy, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 

-#: src/reader.c:1540
+#: src/reader.c:1516

 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 
 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 

-#: src/reader.c:1555
+#: src/reader.c:1531

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 

-#: src/reader.c:1561
+#: src/reader.c:1537

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
 

-#: src/reader.c:1605
+#: src/reader.c:1581

 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 

-#: src/reader.c:1613
+#: src/reader.c:1589

 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s"
 
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s"
 

-#: src/reader.c:1616
+#: src/reader.c:1592

 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 

-#: src/reader.c:1634
+#: src/reader.c:1610

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "Symbol %s wird benutzt, ist aber nicht als Token definiert und hat keine "
 "Regel"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "Symbol %s wird benutzt, ist aber nicht als Token definiert und hat keine "
 "Regel"
 

-#: src/reader.c:1673
-msgid "ill-formed %type declaration"
-msgstr "falsch geformte %type Deklaration"
-
-#: src/reader.c:1752
+#: src/reader.c:1728

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
 

-#: src/reader.c:1764
+#: src/reader.c:1740

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"
 

-#: src/reader.c:1815
+#: src/reader.c:1791

 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "Token %s und %s haben die selbe nummer %s"
 
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "Token %s und %s haben die selbe nummer %s"
 

-#: src/reader.c:1829
+#: src/reader.c:1805

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 

-#: src/reader.c:1831
+#: src/reader.c:1807

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"


@@ -595,7 +575,7 @@ msgstr "das Startsymbol %s ist ein Token"
 msgid "Start symbol %s does not derive any sentence"
 msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"
 
 msgid "Start symbol %s does not derive any sentence"
 msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"
 

-#: src/reduce.c:154
+#: src/reduce.c:155

 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"


@@ -603,7 +583,7 @@ msgstr ""
 "Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d "
 "Produktionen.\n"
 
 "Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d "
 "Produktionen.\n"
 

-#: src/reduce.c:492
+#: src/reduce.c:493

 msgid ""
 "Useless nonterminals:\n"
 "\n"
 msgid ""
 "Useless nonterminals:\n"
 "\n"


@@ -611,7 +591,7 @@ msgstr ""
 "Nutzlose Nicht-Terminale:\n"
 "\n"
 
 "Nutzlose Nicht-Terminale:\n"
 "\n"
 

-#: src/reduce.c:504
+#: src/reduce.c:505

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -623,7 +603,7 @@ msgstr ""
 "Nicht genutzte Terminale:\n"
 "\n"
 
 "Nicht genutzte Terminale:\n"
 "\n"
 

-#: src/reduce.c:513
+#: src/reduce.c:514

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -635,7 +615,7 @@ msgstr ""
 "Ungenutzte Regeln:\n"
 "\n"
 
 "Ungenutzte Regeln:\n"
 "\n"
 

-#: src/reduce.c:541
+#: src/reduce.c:542

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -645,11 +625,11 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:542
+#: src/reduce.c:543

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Wert   Sprec    Sassoc    Tag\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Wert   Sprec    Sassoc    Tag\n"
 

-#: src/reduce.c:547
+#: src/reduce.c:548

 msgid ""
 "Rules\n"
 "-----\n"
 msgid ""
 "Rules\n"
 "-----\n"


@@ -659,7 +639,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:557
+#: src/reduce.c:558

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -669,26 +649,26 @@ msgstr ""
 "----------------------\n"
 "\n"
 
 "----------------------\n"
 "\n"
 

-#: src/reduce.c:573
+#: src/reduce.c:574

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d wurde niemals reduziert\n"
 
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d wurde niemals reduziert\n"
 

-#: src/reduce.c:575
+#: src/reduce.c:576

 #, c-format
 msgid "%s contains "
 msgstr "%s enthält "
 
 #, c-format
 msgid "%s contains "
 msgstr "%s enthält "
 

-#: src/reduce.c:579
+#: src/reduce.c:580

 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ungenutzte Nicht-Terminal"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ungenutzte Nicht-Terminal"
 

-#: src/reduce.c:584
+#: src/reduce.c:585

 msgid " and "
 msgstr " und "
 
 msgid " and "
 msgstr " und "
 

-#: src/reduce.c:588
+#: src/reduce.c:589

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ungenutzte Regel"
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ungenutzte Regel"


@@ -752,6 +732,21 @@ msgstr "%s: die Option 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: die Option »--%s« erlaubt kein Argument\n"
 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: die Option »--%s« erlaubt kein Argument\n"
 

+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
+
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
+
+#~ msgid "multiple %union declarations"
+#~ msgstr "erneute %union Definition"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "unbeendeter Kommentar am Dateiende"
+
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "falsch geformte %type Deklaration"
+

 #~ msgid "gotos"
 #~ msgstr "»goto« Anweisungen"
 
 #~ msgid "gotos"
 #~ msgstr "»goto« Anweisungen"
 

diff --git a/po/es.po b/po/es.po
index 5505edb2bb97d1e4415027f6ce27dc642454a531..cb81fb2238296ec420983628ad79f84c9e29dce8 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"

-"POT-Creation-Date: 2000-03-31 16:02+0200\n"
+"POT-Creation-Date: 2000-04-14 15:35+0200\n"

 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "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"


@@ -253,7 +253,7 @@ msgstr ""
 msgid "unexpected `/' found and ignored"
 msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"
 
 msgid "unexpected `/' found and ignored"
 msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"
 

-#: src/lex.c:144 src/reader.c:248
+#: src/lex.c:144 src/reader.c:256

 msgid "unterminated comment"
 msgstr "comentario sin terminar"
 
 msgid "unterminated comment"
 msgstr "comentario sin terminar"
 


@@ -295,7 +295,7 @@ msgstr "nombre de tipo sin terminar al final del fichero"
 msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 
 msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 

-#: src/main.c:137
+#: src/main.c:136

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"


@@ -309,7 +309,7 @@ msgstr "Entrando set_nullable"
 # en inglés era así, pero quizás en español sea mejor como dices
 # ngp
 #
 # en inglés era así, pero quizás en español sea mejor como dices
 # ngp
 #

-#: src/output.c:1199
+#: src/output.c:1207

 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "excedido el tamaño máximo de la tabla (%s)"
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "excedido el tamaño máximo de la tabla (%s)"


@@ -434,40 +434,40 @@ msgstr "cadena sin terminar al final del fichero"
 msgid "unterminated string"
 msgstr "cadena sin terminar"
 
 msgid "unterminated string"
 msgstr "cadena sin terminar"
 

-#: src/reader.c:424
+#: src/reader.c:444

 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 

-#: src/reader.c:429
+#: src/reader.c:449

 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 
 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 

-#: src/reader.c:432
+#: src/reader.c:452

 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
 

-#: src/reader.c:484
+#: src/reader.c:504

 msgid "unterminated `%{' definition"
 msgstr "definición `%{' sin terminar"
 
 msgid "unterminated `%{' definition"
 msgstr "definición `%{' sin terminar"
 

-#: src/reader.c:525 src/reader.c:713 src/reader.c:762
+#: src/reader.c:545 src/reader.c:733 src/reader.c:782

 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 

-#: src/reader.c:562 src/reader.c:784
+#: src/reader.c:582 src/reader.c:804

 #, c-format
 msgid "symbol %s redefined"
 msgstr "redefinido el símbolo %s"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "redefinido el símbolo %s"
 

-#: src/reader.c:572 src/reader.c:728 src/reader.c:791 src/reader.c:1697
+#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"
 

-#: src/reader.c:582
+#: src/reader.c:602

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' no es válido en %s"
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' no es válido en %s"


@@ -478,36 +478,36 @@ msgstr "`%s' no es v
 # - cll
 # ok - ngp
 #
 # - cll
 # ok - ngp
 #

-#: src/reader.c:630
+#: src/reader.c:650

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "no se reconoce el ítem %s, se esperaba un identificador"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "no se reconoce el ítem %s, se esperaba un identificador"
 

-#: src/reader.c:652
+#: src/reader.c:672

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 

-#: src/reader.c:674
-#, c-format
-msgid "multiple %start declarations"
+#: src/reader.c:694 src/reader.c:855
+#, fuzzy, c-format
+msgid "multiple %s declarations"

 msgstr "múltiples declaraciones de %start"
 
 msgstr "múltiples declaraciones de %start"
 

-#: src/reader.c:676
-#, c-format
-msgid "invalid %start declaration"
+#: src/reader.c:696 src/reader.c:1649
+#, fuzzy, c-format
+msgid "invalid %s declaration"

 msgstr "declaración de %start no válida"
 
 msgstr "declaración de %start no válida"
 

-#: src/reader.c:696
+#: src/reader.c:716

 msgid "%type declaration has no <typename>"
 msgstr "la declaración %type no tiene <nombre-tipo>"
 
 msgid "%type declaration has no <typename>"
 msgstr "la declaración %type no tiene <nombre-tipo>"
 

-#: src/reader.c:733
+#: src/reader.c:753

 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "declaración de %%type no válida debido al ítem: `%s'"
 
 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "declaración de %%type no válida debido al ítem: `%s'"
 

-#: src/reader.c:780
+#: src/reader.c:800

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redefinición de la precedencia de %s"
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redefinición de la precedencia de %s"


@@ -516,7 +516,7 @@ msgstr "redefinici
 # de "to must" y aquí se emplea en su forma condicional. Por eso, he
 # cambiado `debe' por `debería' - cll
 # ahí me has pillado en un olvido del inglés - ngp
 # de "to must" y aquí se emplea en su forma condicional. Por eso, he
 # cambiado `debe' por `debería' - cll
 # ahí me has pillado en un olvido del inglés - ngp

-#: src/reader.c:803
+#: src/reader.c:823

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""


@@ -526,53 +526,42 @@ msgstr ""
 # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en
 # este caso, la segunda me parece más apropiada - cll
 # ok - ngp
 # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en
 # este caso, la segunda me parece más apropiada - cll
 # ok - ngp

-#: src/reader.c:813
+#: src/reader.c:833

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"
 

-#: src/reader.c:837
-#, c-format
-msgid "multiple %union declarations"
-msgstr "declaraciones múltiples de %union"
-
-#: src/reader.c:895
-msgid "unterminated comment at end of file"
-msgstr "comentario sin terminar al final del fichero"
-
-#: src/reader.c:921
-msgid "unmatched close-brace (`}')"
-msgstr "llave de cierre (`}') desemparejada"
+# Cambio el orden y el sexo. Ahora está "en español". sv
+#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276
+#, fuzzy, c-format
+msgid "unmatched %s"
+msgstr "`{' desemparejada"

 
 

-#: src/reader.c:965
+#: src/reader.c:941

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "el argumento de %expect no es un entero"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "el argumento de %expect no es un entero"
 

-#: src/reader.c:997
+#: src/reader.c:973

 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s no es válido"
 
 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s no es válido"
 

-#: src/reader.c:1012 src/reader.c:1024
+#: src/reader.c:988 src/reader.c:1000

 msgid "invalid $ value"
 msgstr "valor $ no válido"
 
 msgid "invalid $ value"
 msgstr "valor $ no válido"
 

-#: src/reader.c:1083
-msgid "unmatched right brace (`}')"
-msgstr "llave derecha (`}') desemparejada"
-
-#: src/reader.c:1130 src/reader.c:1270
+#: src/reader.c:1106 src/reader.c:1246

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' no tiene tipo declarado"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' no tiene tipo declarado"
 

-#: src/reader.c:1146 src/reader.c:1286
+#: src/reader.c:1122 src/reader.c:1262

 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%s de `%s' no tiene tipo declarado"
 
 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%s de `%s' no tiene tipo declarado"
 

-#: src/reader.c:1151 src/reader.c:1291
+#: src/reader.c:1127 src/reader.c:1267

 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s no es válida"
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s no es válida"


@@ -581,102 +570,93 @@ msgstr "$%s no es v
 # mejor que `sin terminar' que me parece más "computerizado" - cll
 # quizás un poco cacofónico lo de claúsula inconclusa - ngp
 #
 # mejor que `sin terminar' que me parece más "computerizado" - cll
 # quizás un poco cacofónico lo de claúsula inconclusa - ngp
 #

-#: src/reader.c:1160
+#: src/reader.c:1136

 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "cláusula %%guard sin terminar"
 
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "cláusula %%guard sin terminar"
 

-# Cambio el orden y el sexo. Ahora está "en español". sv
-#: src/reader.c:1300
-msgid "unmatched `{'"
-msgstr "`{' desemparejada"
-
-#: src/reader.c:1386
+#: src/reader.c:1362

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "regla mal formada: el símbolo inicial no está seguido por :"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "regla mal formada: el símbolo inicial no está seguido por :"
 

-#: src/reader.c:1393
+#: src/reader.c:1369

 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 
 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 

-#: src/reader.c:1424
+#: src/reader.c:1400

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "se ha dado una regla para %s, que es un terminal"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "se ha dado una regla para %s, que es un terminal"
 

-#: src/reader.c:1522
+#: src/reader.c:1498

 msgid "two @prec's in a row"
 msgstr "dos @prec en una línea"
 
 # Insisto, el empleo de participios a secas me parece como hablar en
 # indio. Por favor, permíteme que añada un "está" :) - cll
 # ok - ngp
 msgid "two @prec's in a row"
 msgstr "dos @prec en una línea"
 
 # Insisto, el empleo de participios a secas me parece como hablar en
 # indio. Por favor, permíteme que añada un "está" :) - cll
 # ok - ngp

-#: src/reader.c:1531
+#: src/reader.c:1507

 #, fuzzy, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 
 #, fuzzy, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 

-#: src/reader.c:1540
+#: src/reader.c:1516

 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 
 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 

-#: src/reader.c:1555
+#: src/reader.c:1531

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto"
 

-#: src/reader.c:1561
+#: src/reader.c:1537

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regla vacía para un no terminal con tipo y no hay ninguna acción"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regla vacía para un no terminal con tipo y no hay ninguna acción"
 

-#: src/reader.c:1605
+#: src/reader.c:1581

 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 

-#: src/reader.c:1613
+#: src/reader.c:1589

 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %s"
 
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %s"
 

-#: src/reader.c:1616
+#: src/reader.c:1592

 msgid "no rules in the input grammar"
 msgstr "no hay reglas en la gramática de entrada"
 
 # `token' se debe traducir como `literal' - cll
 # en terminología de compiladores token es más un terminal - ngp
 #
 msgid "no rules in the input grammar"
 msgstr "no hay reglas en la gramática de entrada"
 
 # `token' se debe traducir como `literal' - cll
 # en terminología de compiladores token es más un terminal - ngp
 #

-#: src/reader.c:1634
+#: src/reader.c:1610

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "se usa el símbolo %s, pero no está definido como terminal y no tiene reglas"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "se usa el símbolo %s, pero no está definido como terminal y no tiene reglas"
 

-#: src/reader.c:1673
-msgid "ill-formed %type declaration"
-msgstr "declaración %type incorrectamente formada"
-
-#: src/reader.c:1752
+#: src/reader.c:1728

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 

-#: src/reader.c:1764
+#: src/reader.c:1740

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 

-#: src/reader.c:1815
+#: src/reader.c:1791

 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "los terminales %s y %s tienen asignados ambos el número %s"
 
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "los terminales %s y %s tienen asignados ambos el número %s"
 

-#: src/reader.c:1829
+#: src/reader.c:1805

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 

-#: src/reader.c:1831
+#: src/reader.c:1807

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"


@@ -698,7 +678,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
 # 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:154
+#: src/reduce.c:155

 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"


@@ -706,7 +686,7 @@ msgstr ""
 "la reducción de %s define %d terminal%s, %d no terminal%s, y %d "
 "produccion%s.\n"
 
 "la reducción de %s define %d terminal%s, %d no terminal%s, y %d "
 "produccion%s.\n"
 

-#: src/reduce.c:492
+#: src/reduce.c:493

 msgid ""
 "Useless nonterminals:\n"
 "\n"
 msgid ""
 "Useless nonterminals:\n"
 "\n"


@@ -714,7 +694,7 @@ msgstr ""
 "No terminales sin uso:\n"
 "\n"
 
 "No terminales sin uso:\n"
 "\n"
 

-#: src/reduce.c:504
+#: src/reduce.c:505

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -726,7 +706,7 @@ msgstr ""
 "Terminales que no se usan:\n"
 "\n"
 
 "Terminales que no se usan:\n"
 "\n"
 

-#: src/reduce.c:513
+#: src/reduce.c:514

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -738,7 +718,7 @@ msgstr ""
 "Reglas sin uso:\n"
 "\n"
 
 "Reglas sin uso:\n"
 "\n"
 

-#: src/reduce.c:541
+#: src/reduce.c:542

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -748,11 +728,11 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:542
+#: src/reduce.c:543

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valor  Sprec    Sasoc     Tag\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valor  Sprec    Sasoc     Tag\n"
 

-#: src/reduce.c:547
+#: src/reduce.c:548

 msgid ""
 "Rules\n"
 "-----\n"
 msgid ""
 "Rules\n"
 "-----\n"


@@ -762,7 +742,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:557
+#: src/reduce.c:558

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -772,26 +752,26 @@ msgstr ""
 "--------------------\n"
 "\n"
 
 "--------------------\n"
 "\n"
 

-#: src/reduce.c:573
+#: src/reduce.c:574

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reglas que nunca se han reducido\n"
 
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reglas que nunca se han reducido\n"
 

-#: src/reduce.c:575
+#: src/reduce.c:576

 #, c-format
 msgid "%s contains "
 msgstr "%s contiene "
 
 #, c-format
 msgid "%s contains "
 msgstr "%s contiene "
 

-#: src/reduce.c:579
+#: src/reduce.c:580

 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d no terminales %s sin uso"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d no terminales %s sin uso"
 

-#: src/reduce.c:584
+#: src/reduce.c:585

 msgid " and "
 msgstr " y "
 
 msgid " and "
 msgstr " y "
 

-#: src/reduce.c:588
+#: src/reduce.c:589

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d regla%s sin uso"
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d regla%s sin uso"


@@ -879,6 +859,21 @@ msgstr "%s: la opci
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 

+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "llave de cierre (`}') desemparejada"
+
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "llave derecha (`}') desemparejada"
+
+#~ msgid "multiple %union declarations"
+#~ msgstr "declaraciones múltiples de %union"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "comentario sin terminar al final del fichero"
+
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "declaración %type incorrectamente formada"
+

 # Duda: desconozco en qué caso se emplea esto. Estúdialo bien y
 # comprueba que realmente es necesario emplear una palabra no
 # española. Recuerda que el acuerdo que existe en la lista de correo en
 # Duda: desconozco en qué caso se emplea esto. Estúdialo bien y
 # comprueba que realmente es necesario emplear una palabra no
 # española. Recuerda que el acuerdo que existe en la lista de correo en

diff --git a/po/et.po b/po/et.po
index c9e2f27bdcc2cc95dd6214c31aabf2ae38138f91..56574aae56a919fa730b4b5138b684b57201a7c0 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 2000-03-31 16:53+0200\n"
+"POT-Creation-Date: 2000-04-14 15:35+0200\n"

 "PO-Revision-Date: 2000-04-11 22:19+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "PO-Revision-Date: 2000-04-11 22:19+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"


@@ -95,8 +95,12 @@ msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 
 #: src/conflicts.c:609 src/print.c:217
 #, c-format
 
 #: src/conflicts.c:609 src/print.c:217
 #, c-format

-msgid "    $default\treduce using rule %d (%s)\n\n"
-msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n\n"
+msgid ""
+"    $default\treduce using rule %d (%s)\n"
+"\n"
+msgstr ""
+"    $default\tredutseerin kasutades reeglit %d (%s)\n"
+"\n"

 
 #: src/conflicts.c:695 src/conflicts.c:707
 #, c-format
 
 #: src/conflicts.c:695 src/conflicts.c:707
 #, c-format


@@ -109,8 +113,18 @@ msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 
 #: src/derives.c:106
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 
 #: src/derives.c:106

-msgid "\n\n\nDERIVES\n\n"
-msgstr "\n\n\nDERIVES\n\n"
+msgid ""
+"\n"
+"\n"
+"\n"
+"DERIVES\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"\n"
+"DERIVES\n"
+"\n"

 
 #: src/derives.c:110
 #, c-format
 
 #: src/derives.c:110
 #, c-format


@@ -203,7 +217,7 @@ msgstr "liiga palju gotosid (maks %d)"
 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"
 
 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"
 

-#: src/lex.c:144 src/reader.c:248
+#: src/lex.c:144 src/reader.c:256

 msgid "unterminated comment"
 msgstr "lõpetamata kommentaar"
 
 msgid "unterminated comment"
 msgstr "lõpetamata kommentaar"
 


@@ -263,8 +277,16 @@ msgstr " t
 
 #: src/print.c:92
 #, c-format
 
 #: src/print.c:92
 #, c-format

-msgid "\n\nstate %d\n\n"
-msgstr "\n\nolek %d\n\n"
+msgid ""
+"\n"
+"\n"
+"state %d\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"olek %d\n"
+"\n"

 
 #: src/print.c:136
 #, c-format
 
 #: src/print.c:136
 #, c-format


@@ -302,8 +324,12 @@ msgstr "    %-4s\tliigu olekule %d\n"
 
 #. rule # : LHS -> RHS
 #: src/print.c:253
 
 #. rule # : LHS -> RHS
 #: src/print.c:253

-msgid "\nGrammar\n"
-msgstr "\nGrammatika\n"
+msgid ""
+"\n"
+"Grammar\n"
+msgstr ""
+"\n"
+"Grammatika\n"

 
 #: src/print.c:258
 #, c-format
 
 #: src/print.c:258
 #, c-format


@@ -316,12 +342,24 @@ msgstr "\t\t/* t
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
 #: src/print.c:269
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
 #: src/print.c:269

-msgid "\nTerminals, with rules where they appear\n\n"
-msgstr "\nTerminalid, koos reeglitega, kus nad ilmuvad\n\n"
+msgid ""
+"\n"
+"Terminals, with rules where they appear\n"
+"\n"
+msgstr ""
+"\n"
+"Terminalid, koos reeglitega, kus nad ilmuvad\n"
+"\n"

 
 #: src/print.c:317
 
 #: src/print.c:317

-msgid "\nNonterminals, with rules where they appear\n\n"
-msgstr "\nMitteterminalid, koos reeglitega, kus nad ilmuvad\n\n"
+msgid ""
+"\n"
+"Nonterminals, with rules where they appear\n"
+"\n"
+msgstr ""
+"\n"
+"Mitteterminalid, koos reeglitega, kus nad ilmuvad\n"
+"\n"

 
 #: src/print.c:343
 msgid " on left:"
 
 #: src/print.c:343
 msgid " on left:"


@@ -348,221 +386,203 @@ msgstr "l
 msgid "unterminated string"
 msgstr "lõpetamata sõne"
 
 msgid "unterminated string"
 msgstr "lõpetamata sõne"
 

-#: src/reader.c:424
+#: src/reader.c:444

 #, c-format
 msgid "unrecognized: %s"
 msgstr "tundmatu: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tundmatu: %s"
 

-#: src/reader.c:429
+#: src/reader.c:449

 msgid "no input grammar"
 msgstr "sisendgrammatikat pole"
 
 msgid "no input grammar"
 msgstr "sisendgrammatikat pole"
 

-#: src/reader.c:432
+#: src/reader.c:452

 #, c-format
 msgid "unknown character: %s"
 msgstr "tundmatu sümbol: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "tundmatu sümbol: %s"
 

-#: src/reader.c:484
+#: src/reader.c:504

 msgid "unterminated `%{' definition"
 msgstr "lõpetamata `%{' definitsioon"
 
 msgid "unterminated `%{' definition"
 msgstr "lõpetamata `%{' definitsioon"
 

-#: src/reader.c:525 src/reader.c:713 src/reader.c:762
+#: src/reader.c:545 src/reader.c:733 src/reader.c:782

 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Enneaegne EOF peale %s"
 
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Enneaegne EOF peale %s"
 

-#: src/reader.c:562 src/reader.c:784
+#: src/reader.c:582 src/reader.c:804

 #, c-format
 msgid "symbol %s redefined"
 msgstr "sümbol %s on uuesti defineeritud"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "sümbol %s on uuesti defineeritud"
 

-#: src/reader.c:572 src/reader.c:728 src/reader.c:791 src/reader.c:1697
+#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"
 

-#: src/reader.c:582
+#: src/reader.c:602

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ei ole %s sees lubatud"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ei ole %s sees lubatud"
 

-#: src/reader.c:630
+#: src/reader.c:650

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "tundmatu element %s, eeldasin identifikaatorit"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "tundmatu element %s, eeldasin identifikaatorit"
 

-#: src/reader.c:652
+#: src/reader.c:672

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "eeldasin %s asemel sõnekonstanti"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "eeldasin %s asemel sõnekonstanti"
 

-#: src/reader.c:674
-#, c-format
-msgid "multiple %start declarations"
+#: src/reader.c:694 src/reader.c:855
+#, fuzzy, c-format
+msgid "multiple %s declarations"

 msgstr "korduvad %start deklaratsioonid"
 
 msgstr "korduvad %start deklaratsioonid"
 

-#: src/reader.c:676
-#, c-format
-msgid "invalid %start declaration"
+#: src/reader.c:696 src/reader.c:1649
+#, fuzzy, c-format
+msgid "invalid %s declaration"

 msgstr "vigane %start deklaratsioon"
 
 msgstr "vigane %start deklaratsioon"
 

-#: src/reader.c:696
+#: src/reader.c:716

 msgid "%type declaration has no <typename>"
 msgstr "%type deklaratsioonis puudub <tüübinimi>"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type deklaratsioonis puudub <tüübinimi>"
 

-#: src/reader.c:733
+#: src/reader.c:753

 msgid "invalid %%type declaration due to item: %s"
 msgstr "vigane %%type deklaratsioon, element: %s"
 
 msgid "invalid %%type declaration due to item: %s"
 msgstr "vigane %%type deklaratsioon, element: %s"
 

-#: src/reader.c:780
+#: src/reader.c:800

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s prioriteedi uus definitsioon"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s prioriteedi uus definitsioon"
 

-#: src/reader.c:803
+#: src/reader.c:823

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
 

-#: src/reader.c:813
+#: src/reader.c:833

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"
 

-#: src/reader.c:837
-#, c-format
-msgid "multiple %union declarations"
-msgstr "korduvad %union deklaratsioonid"
-
-#: src/reader.c:895
-msgid "unterminated comment at end of file"
-msgstr "lõpetamata kommentaar faili lõpus"
-
-#: src/reader.c:921
-msgid "unmatched close-brace (`}')"
-msgstr "puudub sulgev loogeline sulg (`}')"
+#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276
+#, fuzzy, c-format
+msgid "unmatched %s"
+msgstr "puudub `{'"

 
 

-#: src/reader.c:965
+#: src/reader.c:941

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "%expect argument ei ole täisarv"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "%expect argument ei ole täisarv"
 

-#: src/reader.c:997
+#: src/reader.c:973

 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s on vigane"
 
 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s on vigane"
 

-#: src/reader.c:1012 src/reader.c:1024
+#: src/reader.c:988 src/reader.c:1000

 msgid "invalid $ value"
 msgstr "vigane $ väärtus"
 
 msgid "invalid $ value"
 msgstr "vigane $ väärtus"
 

-#: src/reader.c:1083
-msgid "unmatched right brace (`}')"
-msgstr "puudub sulgev loogeline sulg (`}')"
-
-#: src/reader.c:1130 src/reader.c:1270
+#: src/reader.c:1106 src/reader.c:1246

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' $$ ei oma deklareeritud tüüpi"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' $$ ei oma deklareeritud tüüpi"
 

-#: src/reader.c:1146 src/reader.c:1286
+#: src/reader.c:1122 src/reader.c:1262

 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d `%s' ei oma deklareeritud tüüpi"
 
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d `%s' ei oma deklareeritud tüüpi"
 

-#: src/reader.c:1151 src/reader.c:1291
+#: src/reader.c:1127 src/reader.c:1267

 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s on vigane"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s on vigane"
 

-#: src/reader.c:1160
+#: src/reader.c:1136

 #, c-format
 msgid "unterminated %guard clause"
 msgstr "lõpetamata %guard klausel"
 
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "lõpetamata %guard klausel"
 

-#: src/reader.c:1300
-msgid "unmatched `{'"
-msgstr "puudub `{'"
-
-#: src/reader.c:1386
+#: src/reader.c:1362

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
 

-#: src/reader.c:1393
+#: src/reader.c:1369

 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"
 
 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"
 

-#: src/reader.c:1424
+#: src/reader.c:1400

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s jaoks on antud reegel, aga see on märk"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s jaoks on antud reegel, aga see on märk"
 

-#: src/reader.c:1522
+#: src/reader.c:1498

 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 
 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 

-#: src/reader.c:1531
+#: src/reader.c:1507

 #, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%guard on määratud, aga %semantic_parser ei ole"
 
 #, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%guard on määratud, aga %semantic_parser ei ole"
 

-#: src/reader.c:1540
+#: src/reader.c:1516

 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 
 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 

-#: src/reader.c:1555
+#: src/reader.c:1531

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 

-#: src/reader.c:1561
+#: src/reader.c:1537

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 

-#: src/reader.c:1605
+#: src/reader.c:1581

 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 

-#: src/reader.c:1613
+#: src/reader.c:1589

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
 
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
 

-#: src/reader.c:1616
+#: src/reader.c:1592

 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 

-#: src/reader.c:1634
+#: src/reader.c:1610

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"

-msgstr "kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad reeglid"
-
-#: src/reader.c:1673
-msgid "ill-formed %type declaration"
-msgstr "vigaselt formeeritud %type deklaratsioon"
+msgstr ""
+"kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad "
+"reeglid"

 
 

-#: src/reader.c:1752
+#: src/reader.c:1728

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 

-#: src/reader.c:1764
+#: src/reader.c:1740

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
 

-#: src/reader.c:1815
+#: src/reader.c:1791

 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
 
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
 

-#: src/reader.c:1829
+#: src/reader.c:1805

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"
 

-#: src/reader.c:1831
+#: src/reader.c:1807

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"


@@ -574,20 +594,43 @@ msgstr "Stardis
 
 #: src/reduce.c:155
 #, c-format
 
 #: src/reduce.c:155
 #, c-format

-msgid "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr "redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d reeglit%s.\n"
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d "
+"reeglit%s.\n"

 
 #: src/reduce.c:493
 
 #: src/reduce.c:493

-msgid "Useless nonterminals:\n\n"
-msgstr "Kasutamata mitteterminalid:\n\n"
+msgid ""
+"Useless nonterminals:\n"
+"\n"
+msgstr ""
+"Kasutamata mitteterminalid:\n"
+"\n"

 
 #: src/reduce.c:505
 
 #: src/reduce.c:505

-msgid "\n\nTerminals which are not used:\n\n"
-msgstr "\n\nTerminalid, mida ei kasutatud:\n\n"
+msgid ""
+"\n"
+"\n"
+"Terminals which are not used:\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"Terminalid, mida ei kasutatud:\n"
+"\n"

 
 #: src/reduce.c:514
 
 #: src/reduce.c:514

-msgid "\n\nUseless rules:\n\n"
-msgstr "\n\nKasutamata reeglid:\n\n"
+msgid ""
+"\n"
+"\n"
+"Useless rules:\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"Kasutamata reeglid:\n"
+"\n"

 
 #: src/reduce.c:542
 msgid ""
 
 #: src/reduce.c:542
 msgid ""


@@ -706,17 +749,66 @@ msgstr "%s: v
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: võti `-W %s' ei luba argumenti\n"
 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: võti `-W %s' ei luba argumenti\n"
 

-#~ msgid "\n\n\nFIRSTS\n\n"
-#~ msgstr "\n\n\nFIRSTS\n\n"
+#~ msgid "multiple %union declarations"
+#~ msgstr "korduvad %union deklaratsioonid"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "lõpetamata kommentaar faili lõpus"

 
 

-#~ msgid "\n\n%s firsts\n\n"
-#~ msgstr "\n\n%s firsts\n\n"
+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "puudub sulgev loogeline sulg (`}')"

 
 

-#~ msgid "\n\n\nFDERIVES\n"
-#~ msgstr "\n\n\nFDERIVES\n"
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "puudub sulgev loogeline sulg (`}')"

 
 

-#~ msgid "\n\n%s derives\n\n"
-#~ msgstr "\n\n%s derives\n\n"
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "vigaselt formeeritud %type deklaratsioon"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FIRSTS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FIRSTS\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s firsts\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s firsts\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FDERIVES\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FDERIVES\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s derives\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s derives\n"
+#~ "\n"

 
 #~ msgid ""
 #~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
 
 #~ msgid ""
 #~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"


@@ -726,7 +818,8 @@ msgstr "%s: v
 #~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
 #~ "       [--output=outfile] grammar-file\n"
 #~ msgstr ""
 #~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
 #~ "       [--output=outfile] grammar-file\n"
 #~ msgstr ""

-#~ "Kasuta: %s [-dhklntvyV] [-b faili-prefiks] [-o väljundfail] [-p nime-prefiks]\n"
+#~ "Kasuta: %s [-dhklntvyV] [-b faili-prefiks] [-o väljundfail] [-p "
+#~ "nime-prefiks]\n"

 #~ "        [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
 #~ "        [--verbose] [--version] [--help] [--yacc]\n"
 #~ "        [--no-parser] [--token-table]\n"
 #~ "        [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
 #~ "        [--verbose] [--version] [--help] [--yacc]\n"
 #~ "        [--no-parser] [--token-table]\n"

diff --git a/po/fr.po b/po/fr.po
index 71d247fb2a2c8b3b440eb4f706953145f5ee37b1..18edf8aeb399e769740afd3a4cf687d41d4c7ae6 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 2000-03-31 16:02+0200\n"
+"POT-Creation-Date: 2000-04-14 15:35+0200\n"

 "PO-Revision-Date: 1996-03-19 20:05 EST\n"
 "Last-Translator: Dominique Boucher <boucherd@IRO.UMontreal.CA>\n"
 "Language-Team: French <fr@li.org>\n"
 "PO-Revision-Date: 1996-03-19 20:05 EST\n"
 "Last-Translator: Dominique Boucher <boucherd@IRO.UMontreal.CA>\n"
 "Language-Team: French <fr@li.org>\n"


@@ -200,7 +200,7 @@ msgstr ""
 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 
 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 

-#: src/lex.c:144 src/reader.c:248
+#: src/lex.c:144 src/reader.c:256

 msgid "unterminated comment"
 msgstr "le commentaire ne se termine pas"
 
 msgid "unterminated comment"
 msgstr "le commentaire ne se termine pas"
 


@@ -240,7 +240,7 @@ msgstr "le nom de type ne se termine pas avant la fin de fichier"
 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 
 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 

-#: src/main.c:137
+#: src/main.c:136

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "erreur interne, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "erreur interne, %s\n"


@@ -249,7 +249,7 @@ msgstr "erreur interne, %s\n"
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 

-#: src/output.c:1199
+#: src/output.c:1207

 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "taille maximum des tables (%s) dépassée"
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "taille maximum des tables (%s) dépassée"


@@ -370,225 +370,205 @@ msgstr "cha
 msgid "unterminated string"
 msgstr "chaîne de caractère non terminée"
 
 msgid "unterminated string"
 msgstr "chaîne de caractère non terminée"
 

-#: src/reader.c:424
+#: src/reader.c:444

 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 

-#: src/reader.c:429
+#: src/reader.c:449

 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 
 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 

-#: src/reader.c:432
+#: src/reader.c:452

 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 

-#: src/reader.c:484
+#: src/reader.c:504

 msgid "unterminated `%{' definition"
 msgstr "La section de définition (%{) ne termine pas avant la fin du fichier"
 
 msgid "unterminated `%{' definition"
 msgstr "La section de définition (%{) ne termine pas avant la fin du fichier"
 

-#: src/reader.c:525 src/reader.c:713 src/reader.c:762
+#: src/reader.c:545 src/reader.c:733 src/reader.c:782

 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 

-#: src/reader.c:562 src/reader.c:784
+#: src/reader.c:582 src/reader.c:804

 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 

-#: src/reader.c:572 src/reader.c:728 src/reader.c:791 src/reader.c:1697
+#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
 

-#: src/reader.c:582
+#: src/reader.c:602

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' n'est pas valide dans %s"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' n'est pas valide dans %s"
 

-#: src/reader.c:630
+#: src/reader.c:650

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"
 

-#: src/reader.c:652
+#: src/reader.c:672

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 

-#: src/reader.c:674
-#, c-format
-msgid "multiple %start declarations"
+#: src/reader.c:694 src/reader.c:855
+#, fuzzy, c-format
+msgid "multiple %s declarations"

 msgstr "multiples déclarations %start"
 
 msgstr "multiples déclarations %start"
 

-#: src/reader.c:676
-#, c-format
-msgid "invalid %start declaration"
+#: src/reader.c:696 src/reader.c:1649
+#, fuzzy, c-format
+msgid "invalid %s declaration"

 msgstr "la déclaration %start n'est pas valide"
 
 msgstr "la déclaration %start n'est pas valide"
 

-#: src/reader.c:696
+#: src/reader.c:716

 msgid "%type declaration has no <typename>"
 msgstr "la déclaration %type n'a pas de <nom_de_type>"
 
 msgid "%type declaration has no <typename>"
 msgstr "la déclaration %type n'a pas de <nom_de_type>"
 

-#: src/reader.c:733
+#: src/reader.c:753

 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "la déclaration %%type n'est pas valide à cause de l'item: %s"
 
 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "la déclaration %%type n'est pas valide à cause de l'item: %s"
 

-#: src/reader.c:780
+#: src/reader.c:800

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redéfinition du niveau de priorité de %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redéfinition du niveau de priorité de %s"
 

-#: src/reader.c:803
+#: src/reader.c:823

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur"
 

-#: src/reader.c:813
+#: src/reader.c:833

 #, c-format
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 

-#: src/reader.c:837
-#, c-format
-msgid "multiple %union declarations"
-msgstr "multiples déclarations %union"
-
-#: src/reader.c:895
-msgid "unterminated comment at end of file"
-msgstr "le commentaire ne se termine pas avant la fin du fichier"
-
-#: src/reader.c:921
-msgid "unmatched close-brace (`}')"
-msgstr "accolade fermante `}' non appariée"
+#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276
+#, fuzzy, c-format
+msgid "unmatched %s"
+msgstr "accolade ouvrante `{' non appariée"

 
 

-#: src/reader.c:965
+#: src/reader.c:941

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "le paramètre de %expect n'est pas un entier"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "le paramètre de %expect n'est pas un entier"
 

-#: src/reader.c:997
+#: src/reader.c:973

 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s n'est pas valide"
 
 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s n'est pas valide"
 

-#: src/reader.c:1012 src/reader.c:1024
+#: src/reader.c:988 src/reader.c:1000

 msgid "invalid $ value"
 msgstr "la valeur de symbole $ n'est pas valide"
 
 msgid "invalid $ value"
 msgstr "la valeur de symbole $ n'est pas valide"
 

-#: src/reader.c:1083
-msgid "unmatched right brace (`}')"
-msgstr "accolade fermante `}' non appariée"
-
-#: src/reader.c:1130 src/reader.c:1270
+#: src/reader.c:1106 src/reader.c:1246

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' n'a pas son type déclaré"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' n'a pas son type déclaré"
 

-#: src/reader.c:1146 src/reader.c:1286
+#: src/reader.c:1122 src/reader.c:1262

 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%s cd `%s' n'a pas son type déclaré"
 
 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%s cd `%s' n'a pas son type déclaré"
 

-#: src/reader.c:1151 src/reader.c:1291
+#: src/reader.c:1127 src/reader.c:1267

 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s n'est pas valide"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s n'est pas valide"
 

-#: src/reader.c:1160
+#: src/reader.c:1136

 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "clause %%guard non terminée"
 
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "clause %%guard non terminée"
 

-#: src/reader.c:1300
-msgid "unmatched `{'"
-msgstr "accolade ouvrante `{' non appariée"
-
-#: src/reader.c:1386
+#: src/reader.c:1362

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'"
 

-#: src/reader.c:1393
+#: src/reader.c:1369

 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 
 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 

-#: src/reader.c:1424
+#: src/reader.c:1400

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 

-#: src/reader.c:1522
+#: src/reader.c:1498

 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 
 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 

-#: src/reader.c:1531
+#: src/reader.c:1507

 #, fuzzy, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 
 #, fuzzy, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 

-#: src/reader.c:1540
+#: src/reader.c:1516

 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 
 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 

-#: src/reader.c:1555
+#: src/reader.c:1531

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflit de type (`%s' `%s') pour l'action par défaut"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflit de type (`%s' `%s') pour l'action par défaut"
 

-#: src/reader.c:1561
+#: src/reader.c:1537

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "règle vide pour une catégorie typée et aucune action"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "règle vide pour une catégorie typée et aucune action"
 

-#: src/reader.c:1605
+#: src/reader.c:1581

 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 

-#: src/reader.c:1613
+#: src/reader.c:1589

 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (terminaux et catégories); maximum de %s"
 
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (terminaux et catégories); maximum de %s"
 

-#: src/reader.c:1616
+#: src/reader.c:1592

 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 

-#: src/reader.c:1634
+#: src/reader.c:1610

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas "
 "de règle"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas "
 "de règle"
 

-#: src/reader.c:1673
-msgid "ill-formed %type declaration"
-msgstr "déclaration %type mal formée"
-
-#: src/reader.c:1752
+#: src/reader.c:1728

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 

-#: src/reader.c:1764
+#: src/reader.c:1740

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "les valeurs d'association de %s et %s entrent en conflit"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "les valeurs d'association de %s et %s entrent en conflit"
 

-#: src/reader.c:1815
+#: src/reader.c:1791

 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "les terminaux %s et %s se sont vus assigner le nombre %s"
 
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "les terminaux %s et %s se sont vus assigner le nombre %s"
 

-#: src/reader.c:1829
+#: src/reader.c:1805

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 

-#: src/reader.c:1831
+#: src/reader.c:1807

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"


@@ -598,7 +578,7 @@ msgstr "le symbole de d
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"
 
 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:154
+#: src/reduce.c:155

 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"


@@ -606,7 +586,7 @@ msgstr ""
 "la réduction de %s définit %d terminal%s, %d catégorie%s et %d "
 "production%s.\n"
 
 "la réduction de %s définit %d terminal%s, %d catégorie%s et %d "
 "production%s.\n"
 

-#: src/reduce.c:492
+#: src/reduce.c:493

 msgid ""
 "Useless nonterminals:\n"
 "\n"
 msgid ""
 "Useless nonterminals:\n"
 "\n"


@@ -614,7 +594,7 @@ msgstr ""
 "Catégories non productives:\n"
 "\n"
 
 "Catégories non productives:\n"
 "\n"
 

-#: src/reduce.c:504
+#: src/reduce.c:505

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -626,7 +606,7 @@ msgstr ""
 "Terminaux non utilisés:\n"
 "\n"
 
 "Terminaux non utilisés:\n"
 "\n"
 

-#: src/reduce.c:513
+#: src/reduce.c:514

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -638,7 +618,7 @@ msgstr ""
 "Règles non productives:\n"
 "\n"
 
 "Règles non productives:\n"
 "\n"
 

-#: src/reduce.c:541
+#: src/reduce.c:542

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -648,11 +628,11 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:542
+#: src/reduce.c:543

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valeur Spréc    Sassoc    Tag\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valeur Spréc    Sassoc    Tag\n"
 

-#: src/reduce.c:547
+#: src/reduce.c:548

 msgid ""
 "Rules\n"
 "-----\n"
 msgid ""
 "Rules\n"
 "-----\n"


@@ -662,7 +642,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:557
+#: src/reduce.c:558

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -672,26 +652,26 @@ msgstr ""
 "-------------------\n"
 "\n"
 
 "-------------------\n"
 "\n"
 

-#: src/reduce.c:573
+#: src/reduce.c:574

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d règles jamais réduites\n"
 
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d règles jamais réduites\n"
 

-#: src/reduce.c:575
+#: src/reduce.c:576

 #, c-format
 msgid "%s contains "
 msgstr "%s contient "
 
 #, c-format
 msgid "%s contains "
 msgstr "%s contient "
 

-#: src/reduce.c:579
+#: src/reduce.c:580

 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d catégories non productives%s"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d catégories non productives%s"
 

-#: src/reduce.c:584
+#: src/reduce.c:585

 msgid " and "
 msgstr " et "
 
 msgid " and "
 msgstr " et "
 

-#: src/reduce.c:588
+#: src/reduce.c:589

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d règle(s) non productive(s)"
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d règle(s) non productive(s)"


@@ -755,6 +735,21 @@ msgstr "%s: l'option %s est ambig
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option --%s n'admet pas de paramètre\n"
 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option --%s n'admet pas de paramètre\n"
 

+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "accolade fermante `}' non appariée"
+
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "accolade fermante `}' non appariée"
+
+#~ msgid "multiple %union declarations"
+#~ msgstr "multiples déclarations %union"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "le commentaire ne se termine pas avant la fin du fichier"
+
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "déclaration %type mal formée"
+

 #~ msgid "gotos"
 #~ msgstr "gotos"
 
 #~ msgid "gotos"
 #~ msgstr "gotos"
 

diff --git a/po/ja.po b/po/ja.po
index 70811a9bc053b7dd69ccd2f75d2adb9b5c0f1498..0d86425c64fec5934cae84e27dfc47375aa6d7fa 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"

-"POT-Creation-Date: 1999-06-14 18:19-0400\n"
+"POT-Creation-Date: 2000-04-14 15:35+0200\n"

 "PO-Revision-Date: 1999-09-28 21:10+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "PO-Revision-Date: 1999-09-28 21:10+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"


@@ -13,29 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 

+#: src/LR0.c:377
+#, fuzzy, c-format
+msgid "too many states (max %d)"
+msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
+

 #: src/allocate.c:59 src/allocate.c:75
 #, c-format
 msgid "%s: memory exhausted\n"
 msgstr "%s: ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿\n"
 
 #: src/allocate.c:59 src/allocate.c:75
 #, c-format
 msgid "%s: memory exhausted\n"
 msgstr "%s: ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿\n"
 

-#: src/closure.c:315
-msgid "\n\n\nFIRSTS\n\n"
-msgstr "\n\n\nFIRSTS\n\n"
-
-#: src/closure.c:319
-#, c-format
-msgid "\n\n%s firsts\n\n"
-msgstr "\n\n%s firsts\n\n"
-
-#: src/closure.c:337
-msgid "\n\n\nFDERIVES\n"
-msgstr "\n\n\nFDERIVES\n"
-
-#: src/closure.c:341
-#, c-format
-msgid "\n\n%s derives\n\n"
-msgstr "\n\n%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸\n\n"
-

 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "´Ô¸µ"
 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "´Ô¸µ"


@@ -108,8 +95,12 @@ msgstr "    %-4s\t[
 
 #: src/conflicts.c:609 src/print.c:217
 #, c-format
 
 #: src/conflicts.c:609 src/print.c:217
 #, c-format

-msgid "    $default\treduce using rule %d (%s)\n\n"
-msgstr "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n\n"
+msgid ""
+"    $default\treduce using rule %d (%s)\n"
+"\n"
+msgstr ""
+"    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
+"\n"

 
 #: src/conflicts.c:695 src/conflicts.c:707
 #, c-format
 
 #: src/conflicts.c:695 src/conflicts.c:707
 #, c-format


@@ -122,118 +113,133 @@ msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 
 #: src/derives.c:106
 msgstr "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 
 #: src/derives.c:106

-msgid "\n\n\nDERIVES\n\n"
-msgstr "\n\n\nDERIVES\n\n"
+msgid ""
+"\n"
+"\n"
+"\n"
+"DERIVES\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"\n"
+"DERIVES\n"
+"\n"

 
 #: src/derives.c:110
 #, c-format
 msgid "%s derives"
 msgstr "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸"
 
 
 #: src/derives.c:110
 #, c-format
 msgid "%s derives"
 msgstr "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸"
 

-#: src/getargs.c:68
+#. Some efforts were made to ease the translators' task, please
+#. continue.
+#: src/getargs.c:69
+msgid "GNU bison generates parsers for LALR(1) grammars.\n"
+msgstr ""
+
+#: src/getargs.c:73

 #, c-format
 #, c-format

+msgid "Usage: %s [OPTION]... FILE\n"
+msgstr ""
+
+#: src/getargs.c:77

 msgid ""
 msgid ""

-"Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
-"       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"       [--verbose] [--version] [--help] [--yacc]\n"
-"       [--no-parser] [--token-table]\n"
-"       [--file-prefix=prefix] [--name-prefix=prefix]\n"
-"       [--output=outfile] grammar-file\n"
-"\n"
-"Report bugs to bug-bison@gnu.org\n"
+"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 ""
+
+#: src/getargs.c:83
+msgid ""
+"Operation modes:\n"
+"  -h, --help      display this help and exit\n"
+"  -V, --version   output version information and exit\n"
+"  -y, --yacc      emulate POSIX yacc\n"
+msgstr ""
+
+#: src/getargs.c:90
+msgid ""
+"Parser:\n"
+"  -t, --debug                instrument the parser for debugging\n"
+"  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
+"  -l, --no-lines             don't generate `#line' directives\n"
+"  -n, --no-parser            generate the tables only\n"
+"  -r, --raw                  number the tokens from 3\n"
+"  -k, --token-table          include a table of token names\n"
+msgstr ""
+
+#: src/getargs.c:101
+msgid ""
+"Output:\n"
+"  -d, --defines              also produce a header file\n"
+"  -v, --verbose              also produce an explanation of the automaton\n"
+"  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n"
+"  -o, --output-file=FILE     leave output to FILE\n"

 msgstr ""
 msgstr ""

-"»È¤¤Êý: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
-"       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-"       [--verbose] [--version] [--help] [--yacc]\n"
-"       [--no-parser] [--token-table]\n"
-"       [--file-prefix=prefix] [--name-prefix=prefix]\n"
-"       [--output=outfile] ʸˡ¥Õ¥¡¥¤¥ë\n"
-"\n"
-"¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é bug-bison@gnu.org ¤Þ¤ÇÏ¢Íí¤ò¡£\n"

 
 

-#: src/getargs.c:161
+#: src/getargs.c:109
+msgid "Report bugs to <bug-bison@gnu.org>.\n"
+msgstr ""
+
+#: src/getargs.c:195

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 

-#: src/getargs.c:165
-#, c-format
-msgid "%s: extra arguments ignored after '%s'\n"
+#: src/getargs.c:199
+#, fuzzy, c-format
+msgid "%s: extra arguments ignored after `%s'\n"

 msgstr "%s: '%s' ¤è¤ê¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n"
 
 msgstr "%s: '%s' ¤è¤ê¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n"
 

-#: src/lalr.c:294
-msgid "gotos"
-msgstr "goto"
+#: src/lalr.c:293
+#, fuzzy, c-format
+msgid "too many gotos (max %d)"
+msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"

 
 

-#: src/lex.c:119
+#: src/lex.c:115

 msgid "unexpected `/' found and ignored"
 msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿"
 
 msgid "unexpected `/' found and ignored"
 msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿"
 

-#: src/lex.c:148 src/reader.c:1105 src/reader.c:1330
+#: src/lex.c:144 src/reader.c:256

 msgid "unterminated comment"
 msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹"
 
 msgid "unterminated comment"
 msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹"
 

-#: src/lex.c:176
-msgid "Unexpected end of file"
+#: src/lex.c:172
+#, fuzzy
+msgid "unexpected end of file"

 msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
 
 msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
 

-#: src/lex.c:197
+#: src/lex.c:193

 msgid "unescaped newline in constant"
 msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹"
 
 msgid "unescaped newline in constant"
 msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹"
 

-#: src/lex.c:229
+#: src/lex.c:225

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "8 ¿Ê¿ô¤ÎÃͤ¬ 0...255 ¤ÎÈϰϳ°¤Ç¤¹: `\\%o'"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "8 ¿Ê¿ô¤ÎÃͤ¬ 0...255 ¤ÎÈϰϳ°¤Ç¤¹: `\\%o'"
 

-#: src/lex.c:253
+#: src/lex.c:250

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "16 ¿Ê¿ô¤ÎÃͤ¬ 255 ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "16 ¿Ê¿ô¤ÎÃͤ¬ 255 ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹: `\\x%x'"
 

-#: src/lex.c:263
+#: src/lex.c:261

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹: `\\' ¤Î¸å¤Ë `%s'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹: `\\' ¤Î¸å¤Ë `%s'"
 

-#: src/lex.c:396
+#: src/lex.c:394

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦"
 

-#: src/lex.c:475
+#: src/lex.c:473

 msgid "unterminated type name at end of file"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¡¢¥Õ¥¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
 
 msgid "unterminated type name at end of file"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¡¢¥Õ¥¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
 

-#: src/lex.c:478
+#: src/lex.c:476

 msgid "unterminated type name"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹"
 
 msgid "unterminated type name"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹"
 

-#: src/main.c:152
-#, c-format
-msgid "%s: fatal error: "
-msgstr "%s: Ã×̿Ū¥¨¥é¡¼: "
-
-#: src/main.c:154
-#, c-format
-msgid "%s:%d: fatal error: "
-msgstr "%s:%d: Ã×̿Ū¥¨¥é¡¼: "
-
-#: src/main.c:185
-#, c-format
-msgid "%s: "
-msgstr "%s: "
-
-#: src/main.c:187
-#, c-format
-msgid "%s:%d: "
-msgstr "%s:%d: "
-
-#: src/main.c:252
-#, c-format
-msgid "too many %s (max %d)"
-msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
-
-#: src/main.c:262
+#: src/main.c:136

 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ÆâÉô¥¨¥é¡¼: %s\n"
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ÆâÉô¥¨¥é¡¼: %s\n"


@@ -242,9 +248,9 @@ msgstr "%s: 
 msgid "Entering set_nullable"
 msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹"
 
 msgid "Entering set_nullable"
 msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹"
 

-#: src/output.c:1190
-#, c-format
-msgid "maximum table size (%s) exceeded"
+#: src/output.c:1207
+#, fuzzy, c-format
+msgid "maximum table size (%d) exceeded"

 msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿"
 
 #: src/print.c:85
 msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿"
 
 #: src/print.c:85


@@ -254,8 +260,16 @@ msgstr " 
 
 #: src/print.c:92
 #, c-format
 
 #: src/print.c:92
 #, c-format

-msgid "\n\nstate %d\n\n"
-msgstr "\n\n¾õÂÖ %d\n\n"
+msgid ""
+"\n"
+"\n"
+"state %d\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"¾õÂÖ %d\n"
+"\n"

 
 #: src/print.c:136
 #, c-format
 
 #: src/print.c:136
 #, c-format


@@ -293,8 +307,12 @@ msgstr "    %-4s\t
 
 #. rule # : LHS -> RHS
 #: src/print.c:253
 
 #. rule # : LHS -> RHS
 #: src/print.c:253

-msgid "\nGrammar\n"
-msgstr "\nʸˡ\n"
+msgid ""
+"\n"
+"Grammar\n"
+msgstr ""
+"\n"
+"ʸˡ\n"

 
 #: src/print.c:258
 #, c-format
 
 #: src/print.c:258
 #, c-format


@@ -307,12 +325,24 @@ msgstr "\t\t/* 
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
 #: src/print.c:269
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
 #: src/print.c:269

-msgid "\nTerminals, with rules where they appear\n\n"
-msgstr "\n½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n\n"
+msgid ""
+"\n"
+"Terminals, with rules where they appear\n"
+"\n"
+msgstr ""
+"\n"
+"½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
+"\n"

 
 #: src/print.c:317
 
 #: src/print.c:317

-msgid "\nNonterminals, with rules where they appear\n\n"
-msgstr "\nÈó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n\n"
+msgid ""
+"\n"
+"Nonterminals, with rules where they appear\n"
+"\n"
+msgstr ""
+"\n"
+"Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
+"\n"

 
 #: src/print.c:343
 msgid " on left:"
 
 #: src/print.c:343
 msgid " on left:"


@@ -322,241 +352,221 @@ msgstr " 
 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 
 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 

-#: src/reader.c:145
+#: src/reader.c:154

 msgid "   Skipping to next \\n"
 msgstr "   ¼¡¤Î \\n ¤Ë¥¹¥­¥Ã¥×"
 
 msgid "   Skipping to next \\n"
 msgstr "   ¼¡¤Î \\n ¤Ë¥¹¥­¥Ã¥×"
 

-#: src/reader.c:147
+#: src/reader.c:156

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×"
 

-#: src/reader.c:323
+#: src/reader.c:180 src/reader.c:195
+msgid "unterminated string at end of file"
+msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
+
+#: src/reader.c:183
+msgid "unterminated string"
+msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó"
+
+#: src/reader.c:444

 #, c-format
 msgid "unrecognized: %s"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
 

-#: src/reader.c:328
+#: src/reader.c:449

 msgid "no input grammar"
 msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
 
 msgid "no input grammar"
 msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
 

-#: src/reader.c:332
+#: src/reader.c:452

 #, c-format
 msgid "unknown character: %s"
 msgstr "̤ÃΤÎʸ»ú: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "̤ÃΤÎʸ»ú: %s"
 

-#: src/reader.c:381 src/reader.c:396 src/reader.c:1041 src/reader.c:1273
-msgid "unterminated string at end of file"
-msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
-
-#: src/reader.c:384 src/reader.c:1044 src/reader.c:1056 src/reader.c:1267
-#: src/reader.c:1281
-msgid "unterminated string"
-msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó"
-
-#: src/reader.c:445
-msgid "unterminated comment in `%{' definition"
-msgstr "`%{' ÄêµÁ ¤ËÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤¬¤¢¤ê¤Þ¤¹"
-
-#: src/reader.c:456
+#: src/reader.c:504

 msgid "unterminated `%{' definition"
 msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 msgid "unterminated `%{' definition"
 msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 

-#: src/reader.c:534 src/reader.c:755
+#: src/reader.c:545 src/reader.c:733 src/reader.c:782
+#, c-format
+msgid "Premature EOF after %s"
+msgstr ""
+
+#: src/reader.c:582 src/reader.c:804

 #, c-format
 msgid "symbol %s redefined"
 msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:544 src/reader.c:700 src/reader.c:762 src/reader.c:1804
+#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:554
+#: src/reader.c:602

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "%2$s Æâ¤Î `%1$s' ¤Ï̵¸ú¤Ç¤¹"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "%2$s Æâ¤Î `%1$s' ¤Ï̵¸ú¤Ç¤¹"
 

-#: src/reader.c:602
+#: src/reader.c:650

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
 

-#: src/reader.c:624
+#: src/reader.c:672

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
 

-#: src/reader.c:646
-#, c-format
-msgid "multiple %start declarations"
+#: src/reader.c:694 src/reader.c:855
+#, fuzzy, c-format
+msgid "multiple %s declarations"

 msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 
 msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:648
-#, c-format
-msgid "invalid %start declaration"
+#: src/reader.c:696 src/reader.c:1649
+#, fuzzy, c-format
+msgid "invalid %s declaration"

 msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 
 msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:668
+#: src/reader.c:716

 msgid "%type declaration has no <typename>"
 msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó"
 

-#: src/reader.c:705
-msgid "invalid %%type declaration due to item: `%s'"
+#: src/reader.c:753
+#, fuzzy
+msgid "invalid %%type declaration due to item: %s"

 msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤­ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'"
 
 msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤­ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'"
 

-#: src/reader.c:751
+#: src/reader.c:800

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
 

-#: src/reader.c:774
+#: src/reader.c:823

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "̵¸ú¤Ê¥Æ¥­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "̵¸ú¤Ê¥Æ¥­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹"
 

-#: src/reader.c:784
+#: src/reader.c:833

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s"
 

-#: src/reader.c:808
-#, c-format
-msgid "multiple %union declarations"
-msgstr "Ê£¿ô¤Î %union Àë¸À¤Ç¤¹"
-
-#: src/reader.c:866
-msgid "unterminated comment at end of file"
-msgstr "¥Õ¥¡¥¤¥ëËöÈø¤ËÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤¬¤¢¤ê¤Þ¤¹"
-
-#: src/reader.c:892
-msgid "unmatched close-brace (`}')"
-msgstr "Âбþ¤Î¤Ê¤¤ÊĤ¸¥Ö¥ì¡¼¥¹ (`}') ¤Ç¤¹"
+#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276
+#, fuzzy, c-format
+msgid "unmatched %s"
+msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹"

 
 

-#: src/reader.c:936
+#: src/reader.c:941

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
 

-#: src/reader.c:947
+#: src/reader.c:973
+#, c-format
+msgid "@%s is invalid"
+msgstr "@%s ¤Ï̵¸ú¤Ç¤¹"
+
+#: src/reader.c:988 src/reader.c:1000

 msgid "invalid $ value"
 msgstr "̵¸ú¤Ê $ ¤ÎÃÍ"
 
 msgid "invalid $ value"
 msgstr "̵¸ú¤Ê $ ¤ÎÃÍ"
 

-#: src/reader.c:1027
-msgid "unmatched right brace (`}')"
-msgstr "Âбþ¤Î¤Ê¤¤±¦¥Ö¥ì¡¼¥¹ (`}') ¤Ç¤¹"
-
-#: src/reader.c:1143 src/reader.c:1368
+#: src/reader.c:1106 src/reader.c:1246

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
 

-#: src/reader.c:1159 src/reader.c:1383
-#, c-format
-msgid "$%s of `%s' has no declared type"
+#: src/reader.c:1122 src/reader.c:1262
+#, fuzzy, c-format
+msgid "$%d of `%s' has no declared type"

 msgstr "`%s' ¤Î $%s ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
 
 msgstr "`%s' ¤Î $%s ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
 

-#: src/reader.c:1163 src/reader.c:1388
+#: src/reader.c:1127 src/reader.c:1267

 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s ¤Ï̵¸ú¤Ç¤¹"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s ¤Ï̵¸ú¤Ç¤¹"
 

-#: src/reader.c:1177
-#, c-format
-msgid "@%s is invalid"
-msgstr "@%s ¤Ï̵¸ú¤Ç¤¹"
-
-#: src/reader.c:1187
-msgid "unterminated %%guard clause"
+#: src/reader.c:1136
+#, fuzzy, c-format
+msgid "unterminated %guard clause"

 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹"
 
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹"
 

-#: src/reader.c:1402
-msgid "invalid @-construct"
-msgstr "̵¸ú¤Ê @-¥³¥ó¥¹¥È¥é¥¯¥È¤Ç¤¹"
-
-#: src/reader.c:1412
-msgid "unmatched `{'"
-msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹"
-
-#: src/reader.c:1498
+#: src/reader.c:1362

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
 

-#: src/reader.c:1505
+#: src/reader.c:1369

 msgid "grammar starts with vertical bar"
 msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
 
 msgid "grammar starts with vertical bar"
 msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
 

-#: src/reader.c:1536
+#: src/reader.c:1400

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹"
 

-#: src/reader.c:1634
+#: src/reader.c:1498

 msgid "two @prec's in a row"
 msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 
 msgid "two @prec's in a row"
 msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 

-#: src/reader.c:1642
-msgid "%%guard present but %%semantic_parser not specified"
+#: src/reader.c:1507
+#, fuzzy, c-format
+msgid "%guard present but %semantic_parser not specified"

 msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 

-#. This case never occurs -wjh
-#: src/reader.c:1650
+#: src/reader.c:1516

 msgid "two actions at end of one rule"
 msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
 
 msgid "two actions at end of one rule"
 msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
 

-#: src/reader.c:1662
+#: src/reader.c:1531

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹"
 

-#: src/reader.c:1668
+#: src/reader.c:1537

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó"
 

-#: src/reader.c:1712
+#: src/reader.c:1581

 #, c-format
 msgid "invalid input: %s"
 msgstr "̵¸ú¤ÊÆþÎÏ: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "̵¸ú¤ÊÆþÎÏ: %s"
 

-#: src/reader.c:1720
-#, c-format
-msgid "too many symbols (tokens plus nonterminals); maximum %s"
+#: src/reader.c:1589
+#, fuzzy, c-format
+msgid "too many symbols (tokens plus nonterminals); maximum %d"

 msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s"
 
 msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s"
 

-#: src/reader.c:1723
+#: src/reader.c:1592

 msgid "no rules in the input grammar"
 msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 msgid "no rules in the input grammar"
 msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 

-#: src/reader.c:1741
+#: src/reader.c:1610

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"

-msgstr "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ¤»¤ó"
-
-#: src/reader.c:1780
-msgid "ill-formed %type declaration"
-msgstr "¼Ù°­¤Ê %type Àë¸À¤Ç¤¹"
+msgstr ""
+"¥·¥ó¥Ü¥ë %s "
+"¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ¤»¤ó"

 
 

-#: src/reader.c:1859
+#: src/reader.c:1728

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 

-#: src/reader.c:1868
+#: src/reader.c:1740

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 

-#: src/reader.c:1915
-#, c-format
-msgid "tokens %s and %s both assigned number %s"
+#: src/reader.c:1791
+#, fuzzy, c-format
+msgid "tokens %s and %s both assigned number %d"

 msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 
 msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:1929
+#: src/reader.c:1805

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 

-#: src/reader.c:1931
+#: src/reader.c:1807

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"


@@ -566,24 +576,47 @@ msgstr "
 msgid "Start symbol %s does not derive any sentence"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó"
 
 msgid "Start symbol %s does not derive any sentence"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó"
 

-#: src/reduce.c:154
+#: src/reduce.c:155

 #, c-format
 #, c-format

-msgid "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr "´Ô¸µ¥Õ¥¡¥¤¥ë %s ¤Ç %d ¸Ä¤Î½ªÃ¼»Ò%.0s, %d ¸Ä¤ÎÈó½ªÃ¼»Ò%.0s, %d ¸Ä¤Îµ¬Â§%.0s¤¬ÄêµÁ¤µ¤ì¤Þ¤·¤¿\n"
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"´Ô¸µ¥Õ¥¡¥¤¥ë %s ¤Ç %d ¸Ä¤Î½ªÃ¼»Ò%.0s, %d ¸Ä¤ÎÈó½ªÃ¼»Ò%.0s, %d "
+"¸Ä¤Îµ¬Â§%.0s¤¬ÄêµÁ¤µ¤ì¤Þ¤·¤¿\n"

 
 

-#: src/reduce.c:492
-msgid "Useless nonterminals:\n\n"
-msgstr "ÉÔ»ÈÍÑÈó½ªÃ¼»Ò:\n\n"
+#: src/reduce.c:493
+msgid ""
+"Useless nonterminals:\n"
+"\n"
+msgstr ""
+"ÉÔ»ÈÍÑÈó½ªÃ¼»Ò:\n"
+"\n"

 
 

-#: src/reduce.c:504
-msgid "\n\nTerminals which are not used:\n\n"
-msgstr "\n\nÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n\n"
+#: src/reduce.c:505
+msgid ""
+"\n"
+"\n"
+"Terminals which are not used:\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n"
+"\n"

 
 

-#: src/reduce.c:513
-msgid "\n\nUseless rules:\n\n"
-msgstr "\n\nÉÔ»ÈÍѵ¬Â§:\n\n"
+#: src/reduce.c:514
+msgid ""
+"\n"
+"\n"
+"Useless rules:\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"ÉÔ»ÈÍѵ¬Â§:\n"
+"\n"

 
 

-#: src/reduce.c:541
+#: src/reduce.c:542

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -593,11 +626,11 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:542
+#: src/reduce.c:543

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "ÃÍ     Á°ÃÖ     ·ë¹ç      ¥¿¥°\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "ÃÍ     Á°ÃÖ     ·ë¹ç      ¥¿¥°\n"
 

-#: src/reduce.c:547
+#: src/reduce.c:548

 msgid ""
 "Rules\n"
 "-----\n"
 msgid ""
 "Rules\n"
 "-----\n"


@@ -607,7 +640,7 @@ msgstr ""
 "-----\n"
 "\n"
 
 "-----\n"
 "\n"
 

-#: src/reduce.c:557
+#: src/reduce.c:558

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -617,85 +650,186 @@ msgstr ""
 "-----------------\n"
 "\n"
 
 "-----------------\n"
 "\n"
 

-#: src/reduce.c:573
+#: src/reduce.c:574

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n"
 
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n"
 

-#: src/reduce.c:575
+#: src/reduce.c:576

 #, c-format
 msgid "%s contains "
 msgstr "%s ¤Ë¤Ï"
 
 #, c-format
 msgid "%s contains "
 msgstr "%s ¤Ë¤Ï"
 

-#: src/reduce.c:579
+#: src/reduce.c:580

 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ¸Ä¤ÎÉÔ»ÈÍÑÈó½ªÃ¼»Ò%.0s"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ¸Ä¤ÎÉÔ»ÈÍÑÈó½ªÃ¼»Ò%.0s"
 

-#: src/reduce.c:584
+#: src/reduce.c:585

 msgid " and "
 msgstr "¤ª¤è¤Ó"
 
 msgid " and "
 msgstr "¤ª¤è¤Ó"
 

-#: src/reduce.c:588
+#: src/reduce.c:589

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ¸Ä¤ÎÉÔ»ÈÍѵ¬Â§%.0s"
 
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ¸Ä¤ÎÉÔ»ÈÍѵ¬Â§%.0s"
 

-#: src/getopt.c:680
+#: lib/getopt.c:675

 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 

-#: src/getopt.c:704
+#: lib/getopt.c:700

 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n"
 
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n"
 

-#: src/getopt.c:709
+#: lib/getopt.c:705

 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n"
 
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n"
 

-#: src/getopt.c:726 src/getopt.c:899
+#: lib/getopt.c:723 lib/getopt.c:896

 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n"
 
 #. --option
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n"
 
 #. --option

-#: src/getopt.c:755
+#: lib/getopt.c:752

 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `--%s' ¤Ç¤¹\n"
 
 #. +option or -option
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `--%s' ¤Ç¤¹\n"
 
 #. +option or -option

-#: src/getopt.c:759
+#: lib/getopt.c:756

 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `%c%s' ¤Ç¤¹\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `%c%s' ¤Ç¤¹\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:785
+#: lib/getopt.c:782

 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: Äê³Ê³°¤Î¥ª¥×¥·¥ç¥ó -- %c\n"
 
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: Äê³Ê³°¤Î¥ª¥×¥·¥ç¥ó -- %c\n"
 

-#: src/getopt.c:788
+#: lib/getopt.c:785

 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
 
 #. 1003.2 specifies the format of this message.

-#: src/getopt.c:818 src/getopt.c:948
+#: lib/getopt.c:815 lib/getopt.c:945

 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n"
 
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n"
 

-#: src/getopt.c:865
+#: lib/getopt.c:862

 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 

-#: src/getopt.c:883
+#: lib/getopt.c:880

 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n"
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n"

+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FIRSTS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FIRSTS\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s firsts\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s firsts\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FDERIVES\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "FDERIVES\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s derives\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
+#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "       [--verbose] [--version] [--help] [--yacc]\n"
+#~ "       [--no-parser] [--token-table]\n"
+#~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
+#~ "       [--output=outfile] grammar-file\n"
+#~ "\n"
+#~ "Report bugs to bug-bison@gnu.org\n"
+#~ msgstr ""
+#~ "»È¤¤Êý: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
+#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
+#~ "       [--verbose] [--version] [--help] [--yacc]\n"
+#~ "       [--no-parser] [--token-table]\n"
+#~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
+#~ "       [--output=outfile] ʸˡ¥Õ¥¡¥¤¥ë\n"
+#~ "\n"
+#~ "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é bug-bison@gnu.org ¤Þ¤ÇÏ¢Íí¤ò¡£\n"
+
+#~ msgid "gotos"
+#~ msgstr "goto"
+
+#~ msgid "%s: fatal error: "
+#~ msgstr "%s: Ã×̿Ū¥¨¥é¡¼: "
+
+#~ msgid "%s:%d: fatal error: "
+#~ msgstr "%s:%d: Ã×̿Ū¥¨¥é¡¼: "
+
+#~ msgid "%s: "
+#~ msgstr "%s: "
+
+#~ msgid "%s:%d: "
+#~ msgstr "%s:%d: "
+
+#~ msgid "unterminated comment in `%{' definition"
+#~ msgstr "`%{' ÄêµÁ ¤ËÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤¬¤¢¤ê¤Þ¤¹"
+
+#~ msgid "multiple %union declarations"
+#~ msgstr "Ê£¿ô¤Î %union Àë¸À¤Ç¤¹"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "¥Õ¥¡¥¤¥ëËöÈø¤ËÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤¬¤¢¤ê¤Þ¤¹"
+
+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "Âбþ¤Î¤Ê¤¤ÊĤ¸¥Ö¥ì¡¼¥¹ (`}') ¤Ç¤¹"
+
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "Âбþ¤Î¤Ê¤¤±¦¥Ö¥ì¡¼¥¹ (`}') ¤Ç¤¹"
+
+#~ msgid "invalid @-construct"
+#~ msgstr "̵¸ú¤Ê @-¥³¥ó¥¹¥È¥é¥¯¥È¤Ç¤¹"
+
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "¼Ù°­¤Ê %type Àë¸À¤Ç¤¹"

diff --git a/po/nl.po b/po/nl.po
index a3ee3815d9717f751b060ded4e86cd6f7af2a6b3..2bd59a70d3f8fa3900eae206cd5d038f5d0bd377 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 2000-03-31 16:02+0200\n"
+"POT-Creation-Date: 2000-04-14 15:35+0200\n"

 "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
 "Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "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"


@@ -199,7 +199,7 @@ msgstr ""
 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 
 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 

-#: src/lex.c:144 src/reader.c:248
+#: src/lex.c:144 src/reader.c:256

 msgid "unterminated comment"
 msgstr "ongetermineerd commentaar"
 
 msgid "unterminated comment"
 msgstr "ongetermineerd commentaar"
 


@@ -239,7 +239,7 @@ msgstr "niet getermineerd type naam aan het einde van bestand"
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 

-#: src/main.c:137
+#: src/main.c:136

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"


@@ -248,7 +248,7 @@ msgstr "interne fout, %s\n"
 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"
 
 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"
 

-#: src/output.c:1199
+#: src/output.c:1207

 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale tabel grootte (%s) overschreden"
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale tabel grootte (%s) overschreden"


@@ -369,225 +369,205 @@ msgstr "niet getermineerde string aan einde van bestand"
 msgid "unterminated string"
 msgstr "niet getermineerde string"
 
 msgid "unterminated string"
 msgstr "niet getermineerde string"
 

-#: src/reader.c:424
+#: src/reader.c:444

 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 

-#: src/reader.c:429
+#: src/reader.c:449

 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 
 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 

-#: src/reader.c:432
+#: src/reader.c:452

 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 

-#: src/reader.c:484
+#: src/reader.c:504

 msgid "unterminated `%{' definition"
 msgstr "niet getermineerde `%{' definitie"
 
 msgid "unterminated `%{' definition"
 msgstr "niet getermineerde `%{' definitie"
 

-#: src/reader.c:525 src/reader.c:713 src/reader.c:762
+#: src/reader.c:545 src/reader.c:733 src/reader.c:782

 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 

-#: src/reader.c:562 src/reader.c:784
+#: src/reader.c:582 src/reader.c:804

 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"
 

-#: src/reader.c:572 src/reader.c:728 src/reader.c:791 src/reader.c:1697
+#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"
 

-#: src/reader.c:582
+#: src/reader.c:602

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' is onjuist in %s"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' is onjuist in %s"
 

-#: src/reader.c:630
+#: src/reader.c:650

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "onbekend item %s, verwacht een identifier"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "onbekend item %s, verwacht een identifier"
 

-#: src/reader.c:652
+#: src/reader.c:672

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 

-#: src/reader.c:674
-#, c-format
-msgid "multiple %start declarations"
+#: src/reader.c:694 src/reader.c:855
+#, fuzzy, c-format
+msgid "multiple %s declarations"

 msgstr "meerdere %start declaraties"
 
 msgstr "meerdere %start declaraties"
 

-#: src/reader.c:676
-#, c-format
-msgid "invalid %start declaration"
+#: src/reader.c:696 src/reader.c:1649
+#, fuzzy, c-format
+msgid "invalid %s declaration"

 msgstr "onjuiste %start declaratie"
 
 msgstr "onjuiste %start declaratie"
 

-#: src/reader.c:696
+#: src/reader.c:716

 msgid "%type declaration has no <typename>"
 msgstr "%type declaratie heeft geen <typenaam>"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type declaratie heeft geen <typenaam>"
 

-#: src/reader.c:733
+#: src/reader.c:753

 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "onjuist %%type declaratie door item: `%s'"
 
 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "onjuist %%type declaratie door item: `%s'"
 

-#: src/reader.c:780
+#: src/reader.c:800

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "herdefinieren voorganger van %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "herdefinieren voorganger van %s"
 

-#: src/reader.c:803
+#: src/reader.c:823

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
 

-#: src/reader.c:813
+#: src/reader.c:833

 #, c-format
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"
 

-#: src/reader.c:837
-#, c-format
-msgid "multiple %union declarations"
-msgstr "meerdere %union declaraties"
-
-#: src/reader.c:895
-msgid "unterminated comment at end of file"
-msgstr "niet getermineerd commentaar aan einde van bestand"
-
-#: src/reader.c:921
-msgid "unmatched close-brace (`}')"
-msgstr "niet overeenkomstige afsluit-haakje (`}')"
+#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276
+#, fuzzy, c-format
+msgid "unmatched %s"
+msgstr "niet overeenkomstige `{'"

 
 

-#: src/reader.c:965
+#: src/reader.c:941

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "argument van %expect is niet een integer"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "argument van %expect is niet een integer"
 

-#: src/reader.c:997
+#: src/reader.c:973

 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s is onjuist"
 
 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s is onjuist"
 

-#: src/reader.c:1012 src/reader.c:1024
+#: src/reader.c:988 src/reader.c:1000

 msgid "invalid $ value"
 msgstr "onjuiste $ waarde"
 
 msgid "invalid $ value"
 msgstr "onjuiste $ waarde"
 

-#: src/reader.c:1083
-msgid "unmatched right brace (`}')"
-msgstr "niet overeenkomstig rechter haakje (`}')"
-
-#: src/reader.c:1130 src/reader.c:1270
+#: src/reader.c:1106 src/reader.c:1246

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ van `%s' heeft geen gedeclareerd type"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ van `%s' heeft geen gedeclareerd type"
 

-#: src/reader.c:1146 src/reader.c:1286
+#: src/reader.c:1122 src/reader.c:1262

 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%s van `%s' heeft geen gedeclareerd type"
 
 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%s van `%s' heeft geen gedeclareerd type"
 

-#: src/reader.c:1151 src/reader.c:1291
+#: src/reader.c:1127 src/reader.c:1267

 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s is onjuist"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s is onjuist"
 

-#: src/reader.c:1160
+#: src/reader.c:1136

 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 

-#: src/reader.c:1300
-msgid "unmatched `{'"
-msgstr "niet overeenkomstige `{'"
-
-#: src/reader.c:1386
+#: src/reader.c:1362

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
 

-#: src/reader.c:1393
+#: src/reader.c:1369

 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 
 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 

-#: src/reader.c:1424
+#: src/reader.c:1400

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"
 

-#: src/reader.c:1522
+#: src/reader.c:1498

 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 
 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 

-#: src/reader.c:1531
+#: src/reader.c:1507

 #, fuzzy, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 
 #, fuzzy, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 

-#: src/reader.c:1540
+#: src/reader.c:1516

 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 
 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 

-#: src/reader.c:1555
+#: src/reader.c:1531

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"
 

-#: src/reader.c:1561
+#: src/reader.c:1537

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"
 

-#: src/reader.c:1605
+#: src/reader.c:1581

 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 

-#: src/reader.c:1613
+#: src/reader.c:1589

 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
 
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
 

-#: src/reader.c:1616
+#: src/reader.c:1592

 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 
 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 

-#: src/reader.c:1634
+#: src/reader.c:1610

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n"
 "heeft geen regels"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n"
 "heeft geen regels"
 

-#: src/reader.c:1673
-msgid "ill-formed %type declaration"
-msgstr "slecht geformuleerde %type declaratie"
-
-#: src/reader.c:1752
+#: src/reader.c:1728

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 

-#: src/reader.c:1764
+#: src/reader.c:1740

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"
 

-#: src/reader.c:1815
+#: src/reader.c:1791

 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr ""
 
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr ""
 

-#: src/reader.c:1829
+#: src/reader.c:1805

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 

-#: src/reader.c:1831
+#: src/reader.c:1807

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"


@@ -597,7 +577,7 @@ msgstr "het start symbool %s is een token"
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Start symbool %s is niet afkomstig uit een zin"
 
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Start symbool %s is niet afkomstig uit een zin"
 

-#: src/reduce.c:154
+#: src/reduce.c:155

 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"


@@ -605,7 +585,7 @@ msgstr ""
 "gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d "
 "productie%s.\n"
 
 "gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d "
 "productie%s.\n"
 

-#: src/reduce.c:492
+#: src/reduce.c:493

 msgid ""
 "Useless nonterminals:\n"
 "\n"
 msgid ""
 "Useless nonterminals:\n"
 "\n"


@@ -613,7 +593,7 @@ msgstr ""
 "Onbruikbare niet terminals:\n"
 "\n"
 
 "Onbruikbare niet terminals:\n"
 "\n"
 

-#: src/reduce.c:504
+#: src/reduce.c:505

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -625,7 +605,7 @@ msgstr ""
 "Terminals welke niet worden gebruikt:\n"
 "\n"
 
 "Terminals welke niet worden gebruikt:\n"
 "\n"
 

-#: src/reduce.c:513
+#: src/reduce.c:514

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -637,7 +617,7 @@ msgstr ""
 "Onbruikbare regels:\n"
 "\n"
 
 "Onbruikbare regels:\n"
 "\n"
 

-#: src/reduce.c:541
+#: src/reduce.c:542

 msgid ""
 "Variables\n"
 "---------\n"
 msgid ""
 "Variables\n"
 "---------\n"


@@ -647,11 +627,11 @@ msgstr ""
 "----------\n"
 "\n"
 
 "----------\n"
 "\n"
 

-#: src/reduce.c:542
+#: src/reduce.c:543

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Waarde  Sprec    Sassoc    Tag\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Waarde  Sprec    Sassoc    Tag\n"
 

-#: src/reduce.c:547
+#: src/reduce.c:548

 msgid ""
 "Rules\n"
 "-----\n"
 msgid ""
 "Rules\n"
 "-----\n"


@@ -661,7 +641,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:557
+#: src/reduce.c:558

 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"


@@ -671,26 +651,26 @@ msgstr ""
 "-----------------------\n"
 "\n"
 
 "-----------------------\n"
 "\n"
 

-#: src/reduce.c:573
+#: src/reduce.c:574

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d regels nooit gereduceerd\n"
 
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d regels nooit gereduceerd\n"
 

-#: src/reduce.c:575
+#: src/reduce.c:576

 #, c-format
 msgid "%s contains "
 msgstr "%s bevat"
 
 #, c-format
 msgid "%s contains "
 msgstr "%s bevat"
 

-#: src/reduce.c:579
+#: src/reduce.c:580

 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d onbruikbare niet terminal%s"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d onbruikbare niet terminal%s"
 

-#: src/reduce.c:584
+#: src/reduce.c:585

 msgid " and "
 msgstr " en "
 
 msgid " and "
 msgstr " en "
 

-#: src/reduce.c:588
+#: src/reduce.c:589

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"


@@ -754,6 +734,21 @@ msgstr "%s: optie `%s' is niet eenduidig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 

+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "niet overeenkomstige afsluit-haakje (`}')"
+
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "niet overeenkomstig rechter haakje (`}')"
+
+#~ msgid "multiple %union declarations"
+#~ msgstr "meerdere %union declaraties"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "niet getermineerd commentaar aan einde van bestand"
+
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "slecht geformuleerde %type declaratie"
+

 #~ msgid "gotos"
 #~ msgstr "ganaar"
 
 #~ msgid "gotos"
 #~ msgstr "ganaar"
 

diff --git a/po/ru.po b/po/ru.po
index 23cc5c58be5537a79fdebf208f3044eaca945d12..6502292698600f3dc7fb4fdaa2a121909fcb4c13 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28a\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28a\n"

-"POT-Creation-Date: 2000-03-31 16:53+0200\n"
+"POT-Creation-Date: 2000-04-14 15:35+0200\n"

 "PO-Revision-Date: 2000-04-12 13:16+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "PO-Revision-Date: 2000-04-12 13:16+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"


@@ -38,7 +38,8 @@ msgstr "
 #: src/conflicts.c:299
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 #: src/conflicts.c:299
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"

-msgstr "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"
+msgstr ""
+"ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"

 
 #: src/conflicts.c:344
 #, c-format
 
 #: src/conflicts.c:344
 #, c-format


@@ -95,8 +96,12 @@ msgstr "    %-4s\t[
 
 #: src/conflicts.c:609 src/print.c:217
 #, c-format
 
 #: src/conflicts.c:609 src/print.c:217
 #, c-format

-msgid "    $default\treduce using rule %d (%s)\n\n"
-msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n\n"
+msgid ""
+"    $default\treduce using rule %d (%s)\n"
+"\n"
+msgstr ""
+"    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
+"\n"

 
 #: src/conflicts.c:695 src/conflicts.c:707
 #, c-format
 
 #: src/conflicts.c:695 src/conflicts.c:707
 #, c-format


@@ -109,8 +114,18 @@ msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 
 #: src/derives.c:106
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 
 #: src/derives.c:106

-msgid "\n\n\nDERIVES\n\n"
-msgstr "\n\n\nDERIVES\n\n"
+msgid ""
+"\n"
+"\n"
+"\n"
+"DERIVES\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"\n"
+"DERIVES\n"
+"\n"

 
 #: src/derives.c:110
 #, c-format
 
 #: src/derives.c:110
 #, c-format


@@ -204,7 +219,7 @@ msgstr "
 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 
 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 

-#: src/lex.c:144 src/reader.c:248
+#: src/lex.c:144 src/reader.c:256

 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 
 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 


@@ -264,8 +279,16 @@ msgstr " 
 
 #: src/print.c:92
 #, c-format
 
 #: src/print.c:92
 #, c-format

-msgid "\n\nstate %d\n\n"
-msgstr "\n\nÓÏÓÔÏÑÎÉÅ %d\n\n"
+msgid ""
+"\n"
+"\n"
+"state %d\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"ÓÏÓÔÏÑÎÉÅ %d\n"
+"\n"

 
 #: src/print.c:136
 #, c-format
 
 #: src/print.c:136
 #, c-format


@@ -303,8 +326,12 @@ msgstr "    %-4s\t
 
 #. rule # : LHS -> RHS
 #: src/print.c:253
 
 #. rule # : LHS -> RHS
 #: src/print.c:253

-msgid "\nGrammar\n"
-msgstr "\nçÒÁÍÍÁÔÉËÁ\n"
+msgid ""
+"\n"
+"Grammar\n"
+msgstr ""
+"\n"
+"çÒÁÍÍÁÔÉËÁ\n"

 
 #: src/print.c:258
 #, c-format
 
 #: src/print.c:258
 #, c-format


@@ -317,12 +344,24 @@ msgstr "\t\t/* 
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
 #: src/print.c:269
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
 #: src/print.c:269

-msgid "\nTerminals, with rules where they appear\n\n"
-msgstr "\nôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n\n"
+msgid ""
+"\n"
+"Terminals, with rules where they appear\n"
+"\n"
+msgstr ""
+"\n"
+"ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
+"\n"

 
 #: src/print.c:317
 
 #: src/print.c:317

-msgid "\nNonterminals, with rules where they appear\n\n"
-msgstr "\nîÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n\n"
+msgid ""
+"\n"
+"Nonterminals, with rules where they appear\n"
+"\n"
+msgstr ""
+"\n"
+"îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
+"\n"

 
 #: src/print.c:343
 msgid " on left:"
 
 #: src/print.c:343
 msgid " on left:"


@@ -349,221 +388,202 @@ msgstr "
 msgid "unterminated string"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
 
 msgid "unterminated string"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
 

-#: src/reader.c:424
+#: src/reader.c:444

 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 

-#: src/reader.c:429
+#: src/reader.c:449

 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 
 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 

-#: src/reader.c:432
+#: src/reader.c:452

 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 

-#: src/reader.c:484
+#: src/reader.c:504

 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
 
 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
 

-#: src/reader.c:525 src/reader.c:713 src/reader.c:762
+#: src/reader.c:545 src/reader.c:733 src/reader.c:782

 #, c-format
 msgid "Premature EOF after %s"
 msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s"
 
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s"
 

-#: src/reader.c:562 src/reader.c:784
+#: src/reader.c:582 src/reader.c:804

 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 

-#: src/reader.c:572 src/reader.c:728 src/reader.c:791 src/reader.c:1697
+#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
 

-#: src/reader.c:582
+#: src/reader.c:602

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
 

-#: src/reader.c:630
+#: src/reader.c:650

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
 

-#: src/reader.c:652
+#: src/reader.c:672

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 

-#: src/reader.c:674
-#, c-format
-msgid "multiple %start declarations"
+#: src/reader.c:694 src/reader.c:855
+#, fuzzy, c-format
+msgid "multiple %s declarations"

 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 

-#: src/reader.c:676
-#, c-format
-msgid "invalid %start declaration"
+#: src/reader.c:696 src/reader.c:1649
+#, fuzzy, c-format
+msgid "invalid %s declaration"

 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 

-#: src/reader.c:696
+#: src/reader.c:716

 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
 
 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
 

-#: src/reader.c:733
+#: src/reader.c:753

 msgid "invalid %%type declaration due to item: %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s"
 
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s"
 

-#: src/reader.c:780
+#: src/reader.c:800

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
 

-#: src/reader.c:803
+#: src/reader.c:823

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"
 

-#: src/reader.c:813
+#: src/reader.c:833

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 

-#: src/reader.c:837
-#, c-format
-msgid "multiple %union declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
-
-#: src/reader.c:895
-msgid "unterminated comment at end of file"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"
-
-#: src/reader.c:921
-msgid "unmatched close-brace (`}')"
-msgstr "ÎÅÐÁÒÎÁÑ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
+#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276
+#, fuzzy, c-format
+msgid "unmatched %s"
+msgstr "ÎÅÐÁÒÎÁÑ `{'"

 
 

-#: src/reader.c:965
+#: src/reader.c:941

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 

-#: src/reader.c:997
+#: src/reader.c:973

 #, c-format
 msgid "@%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
 
 #, c-format
 msgid "@%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
 

-#: src/reader.c:1012 src/reader.c:1024
+#: src/reader.c:988 src/reader.c:1000

 msgid "invalid $ value"
 msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
 
 msgid "invalid $ value"
 msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
 

-#: src/reader.c:1083
-msgid "unmatched right brace (`}')"
-msgstr "ÎÅÐÁÒÎÁÑ ÐÒÁ×ÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
-
-#: src/reader.c:1130 src/reader.c:1270
+#: src/reader.c:1106 src/reader.c:1246

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 

-#: src/reader.c:1146 src/reader.c:1286
+#: src/reader.c:1122 src/reader.c:1262

 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 

-#: src/reader.c:1151 src/reader.c:1291
+#: src/reader.c:1127 src/reader.c:1267

 #, c-format
 msgid "$%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË $%s"
 
 #, c-format
 msgid "$%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË $%s"
 

-#: src/reader.c:1160
+#: src/reader.c:1136

 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 

-#: src/reader.c:1300
-msgid "unmatched `{'"
-msgstr "ÎÅÐÁÒÎÁÑ `{'"
-
-#: src/reader.c:1386
+#: src/reader.c:1362

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 

-#: src/reader.c:1393
+#: src/reader.c:1369

 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 
 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 

-#: src/reader.c:1424
+#: src/reader.c:1400

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 

-#: src/reader.c:1522
+#: src/reader.c:1498

 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 

-#: src/reader.c:1531
+#: src/reader.c:1507

 #, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ"
 
 #, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ"
 

-#: src/reader.c:1540
+#: src/reader.c:1516

 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 

-#: src/reader.c:1555
+#: src/reader.c:1531

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 

-#: src/reader.c:1561
+#: src/reader.c:1537

 msgid "empty rule for typed nonterminal, and no action"
 msgid "empty rule for typed nonterminal, and no action"

-msgstr "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
+msgstr ""
+"ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"

 
 

-#: src/reader.c:1605
+#: src/reader.c:1581

 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 

-#: src/reader.c:1613
+#: src/reader.c:1589

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
 
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
 

-#: src/reader.c:1616
+#: src/reader.c:1592

 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 

-#: src/reader.c:1634
+#: src/reader.c:1610

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 

-#: src/reader.c:1673
-msgid "ill-formed %type declaration"
-msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %type"
-
-#: src/reader.c:1752
+#: src/reader.c:1728

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 

-#: src/reader.c:1764
+#: src/reader.c:1740

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 

-#: src/reader.c:1815
+#: src/reader.c:1791

 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 

-#: src/reader.c:1829
+#: src/reader.c:1805

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 

-#: src/reader.c:1831
+#: src/reader.c:1807

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"


@@ -575,20 +595,43 @@ msgstr "
 
 #: src/reduce.c:155
 #, c-format
 
 #: src/reduce.c:155
 #, c-format

-msgid "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr "×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ ×Ù×ÏÄÁ%s.\n"
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ "
+"×Ù×ÏÄÁ%s.\n"

 
 #: src/reduce.c:493
 
 #: src/reduce.c:493

-msgid "Useless nonterminals:\n\n"
-msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:\n\n"
+msgid ""
+"Useless nonterminals:\n"
+"\n"
+msgstr ""
+"âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:\n"
+"\n"

 
 #: src/reduce.c:505
 
 #: src/reduce.c:505

-msgid "\n\nTerminals which are not used:\n\n"
-msgstr "\n\nîÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:\n\n"
+msgid ""
+"\n"
+"\n"
+"Terminals which are not used:\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:\n"
+"\n"

 
 #: src/reduce.c:514
 
 #: src/reduce.c:514

-msgid "\n\nUseless rules:\n\n"
-msgstr "\n\nâÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:\n\n"
+msgid ""
+"\n"
+"\n"
+"Useless rules:\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:\n"
+"\n"

 
 #: src/reduce.c:542
 msgid ""
 
 #: src/reduce.c:542
 msgid ""


@@ -706,3 +749,18 @@ msgstr "%s: 
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"

+
+#~ msgid "multiple %union declarations"
+#~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"
+
+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "ÎÅÐÁÒÎÁÑ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
+
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "ÎÅÐÁÒÎÁÑ ÐÒÁ×ÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
+
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %type"

diff --git a/src/reader.c b/src/reader.c
index 552bdd48eb818cfc6f7bb27b1705968bcf609c4c..f0c0434ca7dc5ef7124919abb0aaed6fe451c2b5 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -205,18 +205,20 @@ copy_string (FILE *finput, FILE *foutput, int match)
 }
 
 
 }
 
 

-/* Dump the comment from FINPUT to FOUTPUT.  C is either `*' or `/',
-   depending upon the type of comments used.  */
+/* Dump the comment from IN to OUT1 and OUT2.  C is either `*' or `/',
+   depending upon the type of comments used.  OUT2 might be NULL.  */

 
 static inline void
 
 static inline void

-copy_comment (FILE *finput, FILE *foutput, int c)
+copy_comment2 (FILE *in, FILE *out1, FILE* out2, int c)

 {
   int cplus_comment;
   register int ended;
 
   cplus_comment = (c == '/');
 {
   int cplus_comment;
   register int ended;
 
   cplus_comment = (c == '/');

-  putc (c, foutput);
-  c = getc (finput);
+  putc (c, out1);
+  if (out2)
+    putc (c, out2);
+  c = getc (in);

 
   ended = 0;
   while (!ended)
 
   ended = 0;
   while (!ended)


@@ -225,36 +227,54 @@ copy_comment (FILE *finput, FILE *foutput, int c)
        {
          while (c == '*')
            {
        {
          while (c == '*')
            {

-             putc(c, foutput);
-             c = getc(finput);
+             putc (c, out1);
+             if (out2)
+               putc (c, out2);
+             c = getc (in);

            }
 
          if (c == '/')
            {
            }
 
          if (c == '/')
            {

-             putc(c, foutput);
+             putc(c, out1);
+             if (out2)
+               putc(c, out2);

              ended = 1;
            }
        }
       else if (c == '\n')
        {
          lineno++;
              ended = 1;
            }
        }
       else if (c == '\n')
        {
          lineno++;

-         putc (c, foutput);
+         putc (c, out1);
+         if (out2)
+           putc (c, out2);

          if (cplus_comment)
            ended = 1;
          else
          if (cplus_comment)
            ended = 1;
          else

-           c = getc(finput);
+           c = getc (in);

        }
       else if (c == EOF)
        fatal (_("unterminated comment"));
       else
        {
        }
       else if (c == EOF)
        fatal (_("unterminated comment"));
       else
        {

-         putc (c, foutput);
-         c = getc (finput);
+         putc (c, out1);
+         if (out2)
+           putc (c, out2);
+         c = getc (in);

        }
     }
 }
 
 
        }
     }
 }
 
 

+/* Dump the comment from FINPUT to FOUTPUT.  C is either `*' or `/',
+   depending upon the type of comments used.  */
+
+static inline void
+copy_comment (FILE *finput, FILE *foutput, int c)
+{
+  copy_comment2 (finput, foutput, NULL, c);
+}
+
+

 void
 reader (void)
 {
 void
 reader (void)
 {


@@ -384,7 +404,7 @@ read_declarations (void)
              break;
 
            case UNION:
              break;
 
            case UNION:

-             parse_union_decl();
+             parse_union_decl ();

              break;
 
            case EXPECT:
              break;
 
            case EXPECT:


@@ -671,9 +691,9 @@ void
 parse_start_decl (void)
 {
   if (start_flag)
 parse_start_decl (void)
 {
   if (start_flag)

-    complain ("%s", _("multiple %start declarations"));
-  if (lex() != IDENTIFIER)
-    complain ("%s", _("invalid %start declaration"));
+    complain (_("multiple %s declarations"), "%start");
+  if (lex () != IDENTIFIER)
+    complain (_("invalid %s declaration"), "%start");

   else
     {
       start_flag = 1;
   else
     {
       start_flag = 1;


@@ -829,34 +849,29 @@ void
 parse_union_decl (void)
 {
   register int c;
 parse_union_decl (void)
 {
   register int c;

-  register int count;
-  register int in_comment;
-  int cplus_comment;
+  register int count = 0;

 
   if (typed)
 
   if (typed)

-    complain ("%s", _("multiple %union declarations"));
+    complain (_("multiple %s declarations"), "%union");

 
   typed = 1;
 
   if (!nolinesflag)
 
   typed = 1;
 
   if (!nolinesflag)

-    fprintf(fattrs, "\n#line %d \"%s\"\n", lineno, infile);
+    fprintf (fattrs, "\n#line %d \"%s\"\n", lineno, infile);

   else
   else

-    fprintf(fattrs, "\n");
+    fprintf (fattrs, "\n");

 
 

-  fprintf(fattrs, "typedef union");
+  fprintf (fattrs, "typedef union");

   if (fdefines)
   if (fdefines)

-    fprintf(fdefines, "typedef union");
+    fprintf (fdefines, "typedef union");

 
 

-  count = 0;
-  in_comment = 0;
-
-  c = getc(finput);
+  c = getc (finput);

 
   while (c != EOF)
     {
 
   while (c != EOF)
     {

-      putc(c, fattrs);
+      putc (c, fattrs);

       if (fdefines)
       if (fdefines)

-       putc(c, fdefines);
+       putc (c, fdefines);

 
       switch (c)
        {
 
       switch (c)
        {


@@ -865,50 +880,10 @@ parse_union_decl (void)
          break;
 
        case '/':
          break;
 
        case '/':

-         c = getc(finput);
+         c = getc (finput);

          if (c != '*' && c != '/')
          if (c != '*' && c != '/')

-           ungetc(c, finput);
-         else
-           {
-             putc(c, fattrs);
-             if (fdefines)
-               putc(c, fdefines);
-             cplus_comment = (c == '/');
-             in_comment = 1;
-             c = getc(finput);
-             while (in_comment)
-               {
-                 putc(c, fattrs);
-                 if (fdefines)
-                   putc(c, fdefines);
-
-                 if (c == '\n')
-                   {
-                     lineno++;
-                     if (cplus_comment)
-                       {
-                         in_comment = 0;
-                         break;
-                       }
-                   }
-                 if (c == EOF)
-                   fatal (_("unterminated comment at end of file"));
-
-                 if (!cplus_comment && c == '*')
-                   {
-                     c = getc(finput);
-                     if (c == '/')
-                       {
-                         putc('/', fattrs);
-                         if (fdefines)
-                           putc('/', fdefines);
-                         in_comment = 0;
-                       }
-                   }
-                 else
-                   c = getc(finput);
-               }
-           }
+           continue;
+         copy_comment2 (finput, fattrs, fdefines, c);

          break;
 
 
          break;
 
 


@@ -918,21 +893,22 @@ parse_union_decl (void)
 
        case '}':
          if (count == 0)
 
        case '}':
          if (count == 0)

-           complain (_("unmatched close-brace (`}')"));
+           complain (_("unmatched %s"), "`}'");

          count--;
          if (count <= 0)
            {
          count--;
          if (count <= 0)
            {

-             fprintf(fattrs, " YYSTYPE;\n");
+             fprintf (fattrs, " YYSTYPE;\n");

              if (fdefines)
              if (fdefines)

-               fprintf(fdefines, " YYSTYPE;\n");
+               fprintf (fdefines, " YYSTYPE;\n");

              /* JF don't choke on trailing semi */
              /* JF don't choke on trailing semi */

-             c=skip_white_space();
-             if(c!=';') ungetc(c,finput);
+             c = skip_white_space ();
+             if (c != ';')
+               ungetc (c,finput);

              return;
            }
        }
 
              return;
            }
        }
 

-      c = getc(finput);
+      c = getc (finput);

     }
 }
 
     }
 }
 


@@ -1080,7 +1056,7 @@ copy_guard (symbol_list *rule, int stack_offset)
            count--;
          else
            {
            count--;
          else
            {

-             complain (_("unmatched right brace (`}')"));
+             complain (_("unmatched %s"), "`}'");

              c = getc(finput); /* skip it */
            }
           break;
              c = getc(finput); /* skip it */
            }
           break;


@@ -1231,8 +1207,8 @@ copy_action (symbol_list *rule, int stack_offset)
              break;
 
            case '/':
              break;
 
            case '/':

-             putc(c, faction);
-             c = getc(finput);
+             putc (c, faction);
+             c = getc (finput);

              if (c != '*' && c != '/')
                continue;
              copy_comment (finput, faction, c);
              if (c != '*' && c != '/')
                continue;
              copy_comment (finput, faction, c);


@@ -1297,7 +1273,7 @@ copy_action (symbol_list *rule, int stack_offset)
              break;
 
            case EOF:
              break;
 
            case EOF:

-             fatal (_("unmatched `{'"));
+             fatal (_("unmatched %s"), "`{'");

 
            default:
              putc(c, faction);
 
            default:
              putc(c, faction);


@@ -1670,7 +1646,7 @@ get_type (void)
 
   if (t != TYPENAME)
     {
 
   if (t != TYPENAME)
     {

-      complain (_("ill-formed %type declaration"));
+      complain (_("invalid %s declaration"), "%type");

       return t;
     }
 
       return t;
     }