* lib/quote.h (PARAMS): New macro. Use it.

diff --git a/ChangeLog b/ChangeLog
index 89f4f2a43ae88f826525feb4557b4718f37fb624..768a5c0a90f901bdb9f3d6550e6bb3fb9fa01bbd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-20  Akim Demaille  <akim@epita.fr>
+
+       * lib/quote.h (PARAMS): New macro.  Use it.
+

 2000-10-16  Akim Demaille  <akim@epita.fr>
 
        * src/output.c (output_short_or_char_table): New function.
 2000-10-16  Akim Demaille  <akim@epita.fr>
 
        * src/output.c (output_short_or_char_table): New function.

diff --git a/lib/quote.h b/lib/quote.h
index 96549b76ba5be2dc525c4ebe791b364d946b9468..5de896bdec4e048929e40ba445664b8f55d9a1f1 100644 (file)
--- a/lib/quote.h
+++ b/lib/quote.h
@@ -1,4 +1,12 @@
 /* prototypes for quote.c */
 
 /* prototypes for quote.c */
 

-char const *quote_n (int n, char const *name);
-char const *quote (char const *name);
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+char const *quote_n PARAMS ((int n, char const *name));
+char const *quote PARAMS ((char const *name));

diff --git a/po/de.po b/po/de.po
index 7659f5bc83b98f8a61ccd6ee730edff215eedba6..c6fa4bf11adad7fe2066918c7cd4c6b23c4726bc 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-10-16 19:27+0200\n"
+"POT-Creation-Date: 2000-10-16 20:27+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"


@@ -204,51 +204,51 @@ msgstr "%s: zus
 msgid "too many gotos (max %d)"
 msgstr ""
 
 msgid "too many gotos (max %d)"
 msgstr ""
 

-#: src/lex.c:82
+#: src/lex.c:83

 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:111 src/reader.c:215
+#: src/lex.c:112 src/reader.c:269

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

-#: src/lex.c:139
+#: src/lex.c:144

 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Datei endet unerwartet"
 
 # Oder soll man den Begriff "Escapezeichen" verwenden?
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Datei endet unerwartet"
 
 # Oder soll man den Begriff "Escapezeichen" verwenden?

-#: src/lex.c:162
+#: src/lex.c:167

 msgid "unescaped newline in constant"
 msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
 
 msgid "unescaped newline in constant"
 msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
 

-#: src/lex.c:204
+#: src/lex.c:209

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«"
 

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

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«"
 

-#: src/lex.c:241
+#: src/lex.c:246

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«"
 

-#: src/lex.c:410
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
-
-#: src/lex.c:489
+#: src/lex.c:340

 msgid "unterminated type name at end of file"
 msgstr "unerwarteter Typname am Ende der Datei"
 
 msgid "unterminated type name at end of file"
 msgstr "unerwarteter Typname am Ende der Datei"
 

-#: src/lex.c:492
+#: src/lex.c:343

 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 

+#: src/lex.c:447
+msgid "use \"...\" for multi-character literal tokens"
+msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
+

 #: src/main.c:104
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 #: src/main.c:104
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"


@@ -258,7 +258,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:1009
+#: src/output.c:983

 #, 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"


@@ -360,220 +360,220 @@ msgstr "   
 msgid "   Skipping to next %c"
 msgstr "   Überspringe Zeichen bis zum nächten %c"
 
 msgid "   Skipping to next %c"
 msgstr "   Überspringe Zeichen bis zum nächten %c"
 

-#: src/reader.c:136 src/reader.c:151
+#: src/reader.c:133 src/reader.c:145
+msgid "invalid $ value"
+msgstr "unzulässiger $ Wert"
+
+#: src/reader.c:170 src/reader.c:185

 msgid "unterminated string at end of file"
 msgstr "unbeendete Zeichenkette am Ende der Datei"
 
 msgid "unterminated string at end of file"
 msgstr "unbeendete Zeichenkette am Ende der Datei"
 

-#: src/reader.c:139
+#: src/reader.c:173

 msgid "unterminated string"
 msgstr "unbeendete Zeichenkette"
 
 msgid "unterminated string"
 msgstr "unbeendete Zeichenkette"
 

-#: src/reader.c:271 src/reader.c:1021 src/reader.c:1174
+#: src/reader.c:325 src/reader.c:387

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

-#: src/reader.c:321
+#: src/reader.c:364
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ von »%s« hat keine deklarierten Wert"
+
+#: src/reader.c:380
+#, fuzzy, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "»%s« von »%s« hat keine deklarierten Wert"
+
+#: src/reader.c:433

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

-#: src/reader.c:362 src/reader.c:515 src/reader.c:565
+#: src/reader.c:480 src/reader.c:596 src/reader.c:646

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

-#: src/reader.c:379
+#: src/reader.c:497

 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 

-#: src/reader.c:382
+#: src/reader.c:500

 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:404 src/reader.c:584
+#: src/reader.c:522 src/reader.c:665

 #, 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:414 src/reader.c:530 src/reader.c:591 src/reader.c:1280
+#: src/reader.c:532 src/reader.c:611 src/reader.c:672 src/reader.c:1224

 #, 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:424
+#: src/reader.c:542

 #, 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:441 src/reader.c:638
+#: src/reader.c:559 src/reader.c:719

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "mehr als eine %start Deklaration"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "mehr als eine %start Deklaration"
 

-#: src/reader.c:443 src/reader.c:1258
+#: src/reader.c:561 src/reader.c:1202

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ungültige %start Deklaration"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ungültige %start Deklaration"
 

-#: src/reader.c:466 src/reader.c:478
-msgid "invalid $ value"
-msgstr "unzulässiger $ Wert"
-
-#: src/reader.c:500
+#: src/reader.c:581

 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:535
+#: src/reader.c:616

 #, 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:580
+#: src/reader.c:661

 #, 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:604
+#: src/reader.c:685

 #, 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:614
+#: src/reader.c:695

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

-#: src/reader.c:679 src/reader.c:1031 src/reader.c:1103
+#: src/reader.c:756 src/reader.c:1034 src/reader.c:1104

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "»{« hat kein Gegenstück"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "»{« hat kein Gegenstück"
 

-#: src/reader.c:727
-#, c-format
-msgid "argument of %expect is not an integer"
+#: src/reader.c:788
+#, fuzzy
+msgid "argument of %%expect is not an integer"

 msgstr "Argument von %expect ist keine ganze Zahl"
 
 msgstr "Argument von %expect ist keine ganze Zahl"
 

-#: src/reader.c:773
+#: src/reader.c:835

 #, 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:797
+#: src/reader.c:859

 #, 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:896
+#: src/reader.c:959

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

-#: src/reader.c:901
+#: src/reader.c:964

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

-#: src/reader.c:906
+#: src/reader.c:969

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

-#: src/reader.c:997 src/reader.c:1150
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ von »%s« hat keine deklarierten Wert"
-
-#: src/reader.c:1013 src/reader.c:1166
-#, fuzzy, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "»%s« von »%s« hat keine deklarierten Wert"
-
-#: src/reader.c:1183
+#: src/reader.c:1127

 #, 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:1345
+#: src/reader.c:1289

 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:1352
+#: src/reader.c:1296

 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:1383
+#: src/reader.c:1327

 #, 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:1484
+#: src/reader.c:1429

 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:1492
+#: src/reader.c:1437

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

-#: src/reader.c:1501
+#: src/reader.c:1446

 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:1515
+#: src/reader.c:1460

 #, 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:1521
+#: src/reader.c:1466

 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:1565
+#: src/reader.c:1510

 #, 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:1573
+#: src/reader.c:1518

 #, 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:1576
+#: src/reader.c:1521

 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:1596
+#: src/reader.c:1541

 #, 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:1701
+#: src/reader.c:1646

 #, 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:1713
+#: src/reader.c:1658

 #, 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:1764
+#: src/reader.c:1709

 #, 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:1777
+#: src/reader.c:1722

 #, 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:1779
+#: src/reader.c:1724

 #, 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"

diff --git a/po/es.po b/po/es.po
index eee9378d1da9df23b899c9f2a63e4a565669dd54..62614fdc9b3a2fcb2d4dcbb15f11aa4705560aeb 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-10-16 19:27+0200\n"
+"POT-Creation-Date: 2000-10-16 20:27+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"


@@ -264,52 +264,52 @@ msgid "too many gotos (max %d)"
 msgstr ""
 
 # to ignore no es ignorar. Pon otra cosa, please. sv
 msgstr ""
 
 # to ignore no es ignorar. Pon otra cosa, please. sv

-#: src/lex.c:82
+#: src/lex.c:83

 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:111 src/reader.c:215
+#: src/lex.c:112 src/reader.c:269

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

-#: src/lex.c:139
+#: src/lex.c:144

 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Fin de fichero inesperado"
 
 # ¿unescaped?
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Fin de fichero inesperado"
 
 # ¿unescaped?

-#: src/lex.c:162
+#: src/lex.c:167

 msgid "unescaped newline in constant"
 msgstr "salto de línea en constante sin secuencia de escape"
 
 msgid "unescaped newline in constant"
 msgstr "salto de línea en constante sin secuencia de escape"
 

-#: src/lex.c:204
+#: src/lex.c:209

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "valor octal fuera del rango 0...255: `\\%o'"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "valor octal fuera del rango 0...255: `\\%o'"
 

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

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valor hexadecimal mayor que 255: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valor hexadecimal mayor que 255: `\\x%x'"
 

-#: src/lex.c:241
+#: src/lex.c:246

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
 

-# ¿multicarácter o multicaracteres? sv
-#: src/lex.c:410
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "use \"...\" para terminales literales multicarácter"
-
-#: src/lex.c:489
+#: src/lex.c:340

 msgid "unterminated type name at end of file"
 msgstr "nombre de tipo sin terminar al final del fichero"
 
 msgid "unterminated type name at end of file"
 msgstr "nombre de tipo sin terminar al final del fichero"
 

-#: src/lex.c:492
+#: src/lex.c:343

 msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 
 msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 

+# ¿multicarácter o multicaracteres? sv
+#: src/lex.c:447
+msgid "use \"...\" for multi-character literal tokens"
+msgstr "use \"...\" para terminales literales multicarácter"
+

 #: src/main.c:104
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 #: src/main.c:104
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"


@@ -324,7 +324,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:1009
+#: src/output.c:983

 #, 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)"


@@ -430,77 +430,87 @@ msgstr "   Saltando al siguiente \\n"
 msgid "   Skipping to next %c"
 msgstr "   Saltando al siguiente %c"
 
 msgid "   Skipping to next %c"
 msgstr "   Saltando al siguiente %c"
 

-#: src/reader.c:136 src/reader.c:151
+#: src/reader.c:133 src/reader.c:145
+msgid "invalid $ value"
+msgstr "valor $ no válido"
+
+#: src/reader.c:170 src/reader.c:185

 msgid "unterminated string at end of file"
 msgstr "cadena sin terminar al final del fichero"
 
 msgid "unterminated string at end of file"
 msgstr "cadena sin terminar al final del fichero"
 

-#: src/reader.c:139
+#: src/reader.c:173

 msgid "unterminated string"
 msgstr "cadena sin terminar"
 
 msgid "unterminated string"
 msgstr "cadena sin terminar"
 

-#: src/reader.c:271 src/reader.c:1021 src/reader.c:1174
+#: src/reader.c:325 src/reader.c:387

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

-#: src/reader.c:321
+#: src/reader.c:364
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ de `%s' no tiene tipo declarado"
+
+#: src/reader.c:380
+#, fuzzy, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%s de `%s' no tiene tipo declarado"
+
+#: src/reader.c:433

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

-#: src/reader.c:362 src/reader.c:515 src/reader.c:565
+#: src/reader.c:480 src/reader.c:596 src/reader.c:646

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

-#: src/reader.c:379
+#: src/reader.c:497

 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 

-#: src/reader.c:382
+#: src/reader.c:500

 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:404 src/reader.c:584
+#: src/reader.c:522 src/reader.c:665

 #, 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:414 src/reader.c:530 src/reader.c:591 src/reader.c:1280
+#: src/reader.c:532 src/reader.c:611 src/reader.c:672 src/reader.c:1224

 #, 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:424
+#: src/reader.c:542

 #, 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"
 

-#: src/reader.c:441 src/reader.c:638
+#: src/reader.c:559 src/reader.c:719

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "múltiples declaraciones de %start"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "múltiples declaraciones de %start"
 

-#: src/reader.c:443 src/reader.c:1258
+#: src/reader.c:561 src/reader.c:1202

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "declaración de %start no válida"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "declaración de %start no válida"
 

-#: src/reader.c:466 src/reader.c:478
-msgid "invalid $ value"
-msgstr "valor $ no válido"
-
-#: src/reader.c:500
+#: src/reader.c:581

 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:535
+#: src/reader.c:616

 #, 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:580
+#: src/reader.c:661

 #, 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"


@@ -509,7 +519,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:604
+#: src/reader.c:685

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


@@ -519,20 +529,20 @@ 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:614
+#: src/reader.c:695

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"
 
 # Cambio el orden y el sexo. Ahora está "en español". sv
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"
 
 # Cambio el orden y el sexo. Ahora está "en español". sv

-#: src/reader.c:679 src/reader.c:1031 src/reader.c:1103
+#: src/reader.c:756 src/reader.c:1034 src/reader.c:1104

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "`{' desemparejada"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "`{' desemparejada"
 

-#: src/reader.c:727
-#, c-format
-msgid "argument of %expect is not an integer"
+#: src/reader.c:788
+#, fuzzy
+msgid "argument of %%expect is not an integer"

 msgstr "el argumento de %expect no es un entero"
 
 # No te recomiendo que emplees participios para expresar acciones (¡si
 msgstr "el argumento de %expect no es un entero"
 
 # No te recomiendo que emplees participios para expresar acciones (¡si


@@ -541,131 +551,121 @@ msgstr "el argumento de %expect no es un entero"
 # - cll
 # ok - ngp
 #
 # - cll
 # ok - ngp
 #

-#: src/reader.c:773
+#: src/reader.c:835

 #, 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:797
+#: src/reader.c:859

 #, 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:896
+#: src/reader.c:959

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

-#: src/reader.c:901
+#: src/reader.c:964

 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:906
+#: src/reader.c:969

 #, 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:997 src/reader.c:1150
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ de `%s' no tiene tipo declarado"
-
-#: src/reader.c:1013 src/reader.c:1166
-#, fuzzy, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%s de `%s' no tiene tipo declarado"
-

 # Tal vez pueda parecer pedante, pero `inconclusa' me suena muchísimo
 # mejor que `sin terminar' que me parece más "computerizado" - cll
 # quizás un poco cacofónico lo de claúsula inconclusa - ngp
 #
 # Tal vez pueda parecer pedante, pero `inconclusa' me suena muchísimo
 # 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:1183
+#: src/reader.c:1127

 #, 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"
 

-#: src/reader.c:1345
+#: src/reader.c:1289

 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:1352
+#: src/reader.c:1296

 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:1383
+#: src/reader.c:1327

 #, 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:1484
+#: src/reader.c:1429

 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:1492
+#: src/reader.c:1437

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

-#: src/reader.c:1501
+#: src/reader.c:1446

 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:1515
+#: src/reader.c:1460

 #, 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:1521
+#: src/reader.c:1466

 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:1565
+#: src/reader.c:1510

 #, 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:1573
+#: src/reader.c:1518

 #, 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:1576
+#: src/reader.c:1521

 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:1596
+#: src/reader.c:1541

 #, 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:1701
+#: src/reader.c:1646

 #, 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:1713
+#: src/reader.c:1658

 #, 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:1764
+#: src/reader.c:1709

 #, 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:1777
+#: src/reader.c:1722

 #, 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:1779
+#: src/reader.c:1724

 #, 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"

diff --git a/po/et.po b/po/et.po
index 4ab8eaa0a30bbb963b361693861207c1efbc3fbc..026f31b686ca8e9d8c0b2c1a54e185b4cbd2b285 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-10-16 19:27+0200\n"
+"POT-Creation-Date: 2000-10-16 20:27+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"


@@ -229,49 +229,49 @@ msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 

-#: src/lex.c:82
+#: src/lex.c:83

 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"
 
 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"
 

-#: src/lex.c:111 src/reader.c:215
+#: src/lex.c:112 src/reader.c:269

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

-#: src/lex.c:139
+#: src/lex.c:144

 msgid "unexpected end of file"
 msgstr "ootamatu faililõpp"
 
 msgid "unexpected end of file"
 msgstr "ootamatu faililõpp"
 

-#: src/lex.c:162
+#: src/lex.c:167

 msgid "unescaped newline in constant"
 msgstr "paojadata reavahetus konstandis"
 
 msgid "unescaped newline in constant"
 msgstr "paojadata reavahetus konstandis"
 

-#: src/lex.c:204
+#: src/lex.c:209

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
 

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

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
 

-#: src/lex.c:241
+#: src/lex.c:246

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "tundmatu paojada: `\\' järgneb `%s'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "tundmatu paojada: `\\' järgneb `%s'"
 

-#: src/lex.c:410
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
-
-#: src/lex.c:489
+#: src/lex.c:340

 msgid "unterminated type name at end of file"
 msgstr "lõpetamata tüübinimi faili lõpus"
 
 msgid "unterminated type name at end of file"
 msgstr "lõpetamata tüübinimi faili lõpus"
 

-#: src/lex.c:492
+#: src/lex.c:343

 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"
 
 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"
 

+#: src/lex.c:447
+msgid "use \"...\" for multi-character literal tokens"
+msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
+

 #: src/main.c:104
 #, c-format
 msgid "%s: internal error: %s\n"
 #: src/main.c:104
 #, c-format
 msgid "%s: internal error: %s\n"


@@ -281,7 +281,7 @@ msgstr "%s: sisemine viga: %s\n"
 msgid "Entering set_nullable"
 msgstr "Entering set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "Entering set_nullable"
 

-#: src/output.c:1009
+#: src/output.c:983

 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ületati maksimaalset tabelisuurust (%d)"
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ületati maksimaalset tabelisuurust (%d)"


@@ -383,216 +383,216 @@ msgstr "   Liigun j
 msgid "   Skipping to next %c"
 msgstr "   Liigun järgmisele %c"
 
 msgid "   Skipping to next %c"
 msgstr "   Liigun järgmisele %c"
 

-#: src/reader.c:136 src/reader.c:151
+#: src/reader.c:133 src/reader.c:145
+msgid "invalid $ value"
+msgstr "vigane $ väärtus"
+
+#: src/reader.c:170 src/reader.c:185

 msgid "unterminated string at end of file"
 msgstr "lõpetamata sõne faili lõpus"
 
 msgid "unterminated string at end of file"
 msgstr "lõpetamata sõne faili lõpus"
 

-#: src/reader.c:139
+#: src/reader.c:173

 msgid "unterminated string"
 msgstr "lõpetamata sõne"
 
 msgid "unterminated string"
 msgstr "lõpetamata sõne"
 

-#: src/reader.c:271 src/reader.c:1021 src/reader.c:1174
+#: src/reader.c:325 src/reader.c:387

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

-#: src/reader.c:321
+#: src/reader.c:364
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "`%s' $$ ei oma deklareeritud tüüpi"
+
+#: src/reader.c:380
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d `%s' ei oma deklareeritud tüüpi"
+
+#: src/reader.c:433

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

-#: src/reader.c:362 src/reader.c:515 src/reader.c:565
+#: src/reader.c:480 src/reader.c:596 src/reader.c:646

 #, 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:379
+#: src/reader.c:497

 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 

-#: src/reader.c:382
+#: src/reader.c:500

 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:404 src/reader.c:584
+#: src/reader.c:522 src/reader.c:665

 #, 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:414 src/reader.c:530 src/reader.c:591 src/reader.c:1280
+#: src/reader.c:532 src/reader.c:611 src/reader.c:672 src/reader.c:1224

 #, 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:424
+#: src/reader.c:542

 #, 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:441 src/reader.c:638
+#: src/reader.c:559 src/reader.c:719

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "korduvad %start deklaratsioonid"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "korduvad %start deklaratsioonid"
 

-#: src/reader.c:443 src/reader.c:1258
+#: src/reader.c:561 src/reader.c:1202

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "vigane %start deklaratsioon"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "vigane %start deklaratsioon"
 

-#: src/reader.c:466 src/reader.c:478
-msgid "invalid $ value"
-msgstr "vigane $ väärtus"
-
-#: src/reader.c:500
+#: src/reader.c:581

 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:535
+#: src/reader.c:616

 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:580
+#: src/reader.c:661

 #, 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:604
+#: src/reader.c:685

 #, 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:614
+#: src/reader.c:695

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

-#: src/reader.c:679 src/reader.c:1031 src/reader.c:1103
+#: src/reader.c:756 src/reader.c:1034 src/reader.c:1104

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "puudub `{'"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "puudub `{'"
 

-#: src/reader.c:727
-#, c-format
-msgid "argument of %expect is not an integer"
+#: src/reader.c:788
+#, fuzzy
+msgid "argument of %%expect is not an integer"

 msgstr "%expect argument ei ole täisarv"
 
 msgstr "%expect argument ei ole täisarv"
 

-#: src/reader.c:773
+#: src/reader.c:835

 #, 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:797
+#: src/reader.c:859

 #, 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:896
+#: src/reader.c:959

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

-#: src/reader.c:901
+#: src/reader.c:964

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

-#: src/reader.c:906
+#: src/reader.c:969

 #, 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:997 src/reader.c:1150
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "`%s' $$ ei oma deklareeritud tüüpi"
-
-#: src/reader.c:1013 src/reader.c:1166
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d `%s' ei oma deklareeritud tüüpi"
-
-#: src/reader.c:1183
+#: src/reader.c:1127

 #, 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:1345
+#: src/reader.c:1289

 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:1352
+#: src/reader.c:1296

 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:1383
+#: src/reader.c:1327

 #, 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:1484
+#: src/reader.c:1429

 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:1492
+#: src/reader.c:1437

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

-#: src/reader.c:1501
+#: src/reader.c:1446

 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:1515
+#: src/reader.c:1460

 #, 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:1521
+#: src/reader.c:1466

 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:1565
+#: src/reader.c:1510

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

-#: src/reader.c:1573
+#: src/reader.c:1518

 #, 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:1576
+#: src/reader.c:1521

 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:1596
+#: src/reader.c:1541

 #, 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"
 
 #, 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:1701
+#: src/reader.c:1646

 #, 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:1713
+#: src/reader.c:1658

 #, 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:1764
+#: src/reader.c:1709

 #, 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:1777
+#: src/reader.c:1722

 #, 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:1779
+#: src/reader.c:1724

 #, 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"

diff --git a/po/fr.po b/po/fr.po
index 528a7db2eddf993b824be13eb2d8dd46e818f105..011abbb3dc9bfa06ff294125b86a88f118ed4795 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-10-16 19:27+0200\n"
+"POT-Creation-Date: 2000-10-16 20:27+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"


@@ -211,50 +211,50 @@ msgstr "%s: param
 msgid "too many gotos (max %d)"
 msgstr ""
 
 msgid "too many gotos (max %d)"
 msgstr ""
 

-#: src/lex.c:82
+#: src/lex.c:83

 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 
 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 

-#: src/lex.c:111 src/reader.c:215
+#: src/lex.c:112 src/reader.c:269

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

-#: src/lex.c:139
+#: src/lex.c:144

 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Fin de fichier inattendue"
 
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Fin de fichier inattendue"
 

-#: src/lex.c:162
+#: src/lex.c:167

 msgid "unescaped newline in constant"
 msgstr "retour de chariot sans échappement dans une constante"
 
 msgid "unescaped newline in constant"
 msgstr "retour de chariot sans échappement dans une constante"
 

-#: src/lex.c:204
+#: src/lex.c:209

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "valeur octale à l'extérieur de l'intervalle 0...255: \\%o"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "valeur octale à l'extérieur de l'intervalle 0...255: \\%o"
 

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

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valeur hexadécimale supérieure à 255: \\x%x"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valeur hexadécimale supérieure à 255: \\x%x"
 

-#: src/lex.c:241
+#: src/lex.c:246

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'"
 

-#: src/lex.c:410
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
-
-#: src/lex.c:489
+#: src/lex.c:340

 msgid "unterminated type name at end of file"
 msgstr "le nom de type ne se termine pas avant la fin de fichier"
 
 msgid "unterminated type name at end of file"
 msgstr "le nom de type ne se termine pas avant la fin de fichier"
 

-#: src/lex.c:492
+#: src/lex.c:343

 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/lex.c:447
+msgid "use \"...\" for multi-character literal tokens"
+msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
+

 #: src/main.c:104
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 #: src/main.c:104
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"


@@ -264,7 +264,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:1009
+#: src/output.c:983

 #, 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"


@@ -366,218 +366,218 @@ msgstr "   Saut jusqu'au prochain \\n"
 msgid "   Skipping to next %c"
 msgstr "   Saut jusqu'au prochain %c"
 
 msgid "   Skipping to next %c"
 msgstr "   Saut jusqu'au prochain %c"
 

-#: src/reader.c:136 src/reader.c:151
+#: src/reader.c:133 src/reader.c:145
+msgid "invalid $ value"
+msgstr "la valeur de symbole $ n'est pas valide"
+
+#: src/reader.c:170 src/reader.c:185

 msgid "unterminated string at end of file"
 msgstr "chaîne de caractères non terminée en fin de fichier"
 
 msgid "unterminated string at end of file"
 msgstr "chaîne de caractères non terminée en fin de fichier"
 

-#: src/reader.c:139
+#: src/reader.c:173

 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:271 src/reader.c:1021 src/reader.c:1174
+#: src/reader.c:325 src/reader.c:387

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

-#: src/reader.c:321
+#: src/reader.c:364
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ de `%s' n'a pas son type déclaré"
+
+#: src/reader.c:380
+#, 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:433

 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:362 src/reader.c:515 src/reader.c:565
+#: src/reader.c:480 src/reader.c:596 src/reader.c:646

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

-#: src/reader.c:379
+#: src/reader.c:497

 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 

-#: src/reader.c:382
+#: src/reader.c:500

 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:404 src/reader.c:584
+#: src/reader.c:522 src/reader.c:665

 #, 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:414 src/reader.c:530 src/reader.c:591 src/reader.c:1280
+#: src/reader.c:532 src/reader.c:611 src/reader.c:672 src/reader.c:1224

 #, 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:424
+#: src/reader.c:542

 #, 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:441 src/reader.c:638
+#: src/reader.c:559 src/reader.c:719

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "multiples déclarations %start"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "multiples déclarations %start"
 

-#: src/reader.c:443 src/reader.c:1258
+#: src/reader.c:561 src/reader.c:1202

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "la déclaration %start n'est pas valide"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "la déclaration %start n'est pas valide"
 

-#: src/reader.c:466 src/reader.c:478
-msgid "invalid $ value"
-msgstr "la valeur de symbole $ n'est pas valide"
-
-#: src/reader.c:500
+#: src/reader.c:581

 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:535
+#: src/reader.c:616

 #, 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:580
+#: src/reader.c:661

 #, 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:604
+#: src/reader.c:685

 #, 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:614
+#: src/reader.c:695

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

-#: src/reader.c:679 src/reader.c:1031 src/reader.c:1103
+#: src/reader.c:756 src/reader.c:1034 src/reader.c:1104

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "accolade ouvrante `{' non appariée"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "accolade ouvrante `{' non appariée"
 

-#: src/reader.c:727
-#, c-format
-msgid "argument of %expect is not an integer"
+#: src/reader.c:788
+#, fuzzy
+msgid "argument of %%expect is not an integer"

 msgstr "le paramètre de %expect n'est pas un entier"
 
 msgstr "le paramètre de %expect n'est pas un entier"
 

-#: src/reader.c:773
+#: src/reader.c:835

 #, 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:797
+#: src/reader.c:859

 #, 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:896
+#: src/reader.c:959

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

-#: src/reader.c:901
+#: src/reader.c:964

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

-#: src/reader.c:906
+#: src/reader.c:969

 #, 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:997 src/reader.c:1150
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ de `%s' n'a pas son type déclaré"
-
-#: src/reader.c:1013 src/reader.c:1166
-#, 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:1183
+#: src/reader.c:1127

 #, 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:1345
+#: src/reader.c:1289

 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:1352
+#: src/reader.c:1296

 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:1383
+#: src/reader.c:1327

 #, 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:1484
+#: src/reader.c:1429

 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:1492
+#: src/reader.c:1437

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

-#: src/reader.c:1501
+#: src/reader.c:1446

 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:1515
+#: src/reader.c:1460

 #, 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:1521
+#: src/reader.c:1466

 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:1565
+#: src/reader.c:1510

 #, 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:1573
+#: src/reader.c:1518

 #, 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:1576
+#: src/reader.c:1521

 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:1596
+#: src/reader.c:1541

 #, 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:1701
+#: src/reader.c:1646

 #, 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:1713
+#: src/reader.c:1658

 #, 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:1764
+#: src/reader.c:1709

 #, 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:1777
+#: src/reader.c:1722

 #, 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:1779
+#: src/reader.c:1724

 #, 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"

diff --git a/po/ja.po b/po/ja.po
index 05da8ae15fc4c13b995b96a93a9865fceaee1ce6..c2eb5759fa017142474276889525bfdb7bec9454 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: 2000-10-16 19:27+0200\n"
+"POT-Creation-Date: 2000-10-16 20:27+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"


@@ -210,50 +210,50 @@ msgstr "%s: '%s' 
 msgid "too many gotos (max %d)"
 msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 
 msgid "too many gotos (max %d)"
 msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 

-#: src/lex.c:82
+#: src/lex.c:83

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

-#: src/lex.c:111 src/reader.c:215
+#: src/lex.c:112 src/reader.c:269

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

-#: src/lex.c:139
+#: src/lex.c:144

 #, fuzzy
 msgid "unexpected end of file"
 msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
 
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
 

-#: src/lex.c:162
+#: src/lex.c:167

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

-#: src/lex.c:204
+#: src/lex.c:209

 #, 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:229
+#: src/lex.c:234

 #, 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:241
+#: src/lex.c:246

 #, 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:410
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦"
-
-#: src/lex.c:489
+#: src/lex.c:340

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

-#: src/lex.c:492
+#: src/lex.c:343

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

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

 #: src/main.c:104
 #, c-format
 msgid "%s: internal error: %s\n"
 #: src/main.c:104
 #, c-format
 msgid "%s: internal error: %s\n"


@@ -263,7 +263,7 @@ msgstr "%s: 
 msgid "Entering set_nullable"
 msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹"
 
 msgid "Entering set_nullable"
 msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹"
 

-#: src/output.c:1009
+#: src/output.c:983

 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿"
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿"


@@ -365,217 +365,217 @@ msgstr "   
 msgid "   Skipping to next %c"
 msgstr "   ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×"
 
 msgid "   Skipping to next %c"
 msgstr "   ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×"
 

-#: src/reader.c:136 src/reader.c:151
+#: src/reader.c:133 src/reader.c:145
+msgid "invalid $ value"
+msgstr "̵¸ú¤Ê $ ¤ÎÃÍ"
+
+#: src/reader.c:170 src/reader.c:185

 msgid "unterminated string at end of file"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
 
 msgid "unterminated string at end of file"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
 

-#: src/reader.c:139
+#: src/reader.c:173

 msgid "unterminated string"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó"
 
 msgid "unterminated string"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó"
 

-#: src/reader.c:271 src/reader.c:1021 src/reader.c:1174
+#: src/reader.c:325 src/reader.c:387

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

-#: src/reader.c:321
+#: src/reader.c:364
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
+
+#: src/reader.c:380
+#, fuzzy, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "`%s' ¤Î $%s ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
+
+#: src/reader.c:433

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

-#: src/reader.c:362 src/reader.c:515 src/reader.c:565
+#: src/reader.c:480 src/reader.c:596 src/reader.c:646

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

-#: src/reader.c:379
+#: src/reader.c:497

 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 

-#: src/reader.c:382
+#: src/reader.c:500

 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:404 src/reader.c:584
+#: src/reader.c:522 src/reader.c:665

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

-#: src/reader.c:414 src/reader.c:530 src/reader.c:591 src/reader.c:1280
+#: src/reader.c:532 src/reader.c:611 src/reader.c:672 src/reader.c:1224

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

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

 #, 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:441 src/reader.c:638
+#: src/reader.c:559 src/reader.c:719

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:443 src/reader.c:1258
+#: src/reader.c:561 src/reader.c:1202

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:466 src/reader.c:478
-msgid "invalid $ value"
-msgstr "̵¸ú¤Ê $ ¤ÎÃÍ"
-
-#: src/reader.c:500
+#: src/reader.c:581

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

-#: src/reader.c:535
+#: src/reader.c:616

 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤­ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'"
 
 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤­ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'"
 

-#: src/reader.c:580
+#: src/reader.c:661

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

-#: src/reader.c:604
+#: src/reader.c:685

 #, 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:614
+#: src/reader.c:695

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

-#: src/reader.c:679 src/reader.c:1031 src/reader.c:1103
+#: src/reader.c:756 src/reader.c:1034 src/reader.c:1104

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹"
 

-#: src/reader.c:727
-#, c-format
-msgid "argument of %expect is not an integer"
+#: src/reader.c:788
+#, fuzzy
+msgid "argument of %%expect is not an integer"

 msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
 
 msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
 

-#: src/reader.c:773
+#: src/reader.c:835

 #, 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:797
+#: src/reader.c:859

 #, 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:896
+#: src/reader.c:959

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

-#: src/reader.c:901
+#: src/reader.c:964

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

-#: src/reader.c:906
+#: src/reader.c:969

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

-#: src/reader.c:997 src/reader.c:1150
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
-
-#: src/reader.c:1013 src/reader.c:1166
-#, fuzzy, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "`%s' ¤Î $%s ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
-
-#: src/reader.c:1183
+#: src/reader.c:1127

 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹"
 
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹"
 

-#: src/reader.c:1345
+#: src/reader.c:1289

 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:1352
+#: src/reader.c:1296

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

-#: src/reader.c:1383
+#: src/reader.c:1327

 #, 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:1484
+#: src/reader.c:1429

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

-#: src/reader.c:1492
+#: src/reader.c:1437

 #, fuzzy
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #, fuzzy
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 

-#: src/reader.c:1501
+#: src/reader.c:1446

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

-#: src/reader.c:1515
+#: src/reader.c:1460

 #, 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:1521
+#: src/reader.c:1466

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

-#: src/reader.c:1565
+#: src/reader.c:1510

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

-#: src/reader.c:1573
+#: src/reader.c:1518

 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s"
 
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s"
 

-#: src/reader.c:1576
+#: src/reader.c:1521

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

-#: src/reader.c:1596
+#: src/reader.c:1541

 #, 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:1701
+#: src/reader.c:1646

 #, 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:1713
+#: src/reader.c:1658

 #, 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:1764
+#: src/reader.c:1709

 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:1777
+#: src/reader.c:1722

 #, 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:1779
+#: src/reader.c:1724

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

diff --git a/po/nl.po b/po/nl.po
index da9703d72b8c8ed7a1f96dd7eea250928497765c..59048036e6b1c1134e41496e809dd1e4173fa553 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-10-16 19:27+0200\n"
+"POT-Creation-Date: 2000-10-16 20:27+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"


@@ -210,50 +210,50 @@ msgstr "%s: extra argumenten genegeerd na '%s'\n"
 msgid "too many gotos (max %d)"
 msgstr ""
 
 msgid "too many gotos (max %d)"
 msgstr ""
 

-#: src/lex.c:82
+#: src/lex.c:83

 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 
 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 

-#: src/lex.c:111 src/reader.c:215
+#: src/lex.c:112 src/reader.c:269

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

-#: src/lex.c:139
+#: src/lex.c:144

 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Onverwacht bestandseinde"
 
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Onverwacht bestandseinde"
 

-#: src/lex.c:162
+#: src/lex.c:167

 msgid "unescaped newline in constant"
 msgstr "niet geescapete nieuwe regel in constante"
 
 msgid "unescaped newline in constant"
 msgstr "niet geescapete nieuwe regel in constante"
 

-#: src/lex.c:204
+#: src/lex.c:209

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "octale waarde buiten domein 0...255: `\\%o'"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "octale waarde buiten domein 0...255: `\\%o'"
 

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

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadecimale waarde boven 255: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadecimale waarde boven 255: `\\x%x'"
 

-#: src/lex.c:241
+#: src/lex.c:246

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "onbekende escape reeks: `\\' gevolgd door `%s'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "onbekende escape reeks: `\\' gevolgd door `%s'"
 

-#: src/lex.c:410
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
-
-#: src/lex.c:489
+#: src/lex.c:340

 msgid "unterminated type name at end of file"
 msgstr "niet getermineerd type naam aan het einde van bestand"
 
 msgid "unterminated type name at end of file"
 msgstr "niet getermineerd type naam aan het einde van bestand"
 

-#: src/lex.c:492
+#: src/lex.c:343

 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 

+#: src/lex.c:447
+msgid "use \"...\" for multi-character literal tokens"
+msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
+

 #: src/main.c:104
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 #: src/main.c:104
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"


@@ -263,7 +263,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:1009
+#: src/output.c:983

 #, 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"


@@ -365,218 +365,218 @@ msgstr "   Verder naar volgende \\n"
 msgid "   Skipping to next %c"
 msgstr "   Verder naar volgende %c"
 
 msgid "   Skipping to next %c"
 msgstr "   Verder naar volgende %c"
 

-#: src/reader.c:136 src/reader.c:151
+#: src/reader.c:133 src/reader.c:145
+msgid "invalid $ value"
+msgstr "onjuiste $ waarde"
+
+#: src/reader.c:170 src/reader.c:185

 msgid "unterminated string at end of file"
 msgstr "niet getermineerde string aan einde van bestand"
 
 msgid "unterminated string at end of file"
 msgstr "niet getermineerde string aan einde van bestand"
 

-#: src/reader.c:139
+#: src/reader.c:173

 msgid "unterminated string"
 msgstr "niet getermineerde string"
 
 msgid "unterminated string"
 msgstr "niet getermineerde string"
 

-#: src/reader.c:271 src/reader.c:1021 src/reader.c:1174
+#: src/reader.c:325 src/reader.c:387

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

-#: src/reader.c:321
+#: src/reader.c:364
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ van `%s' heeft geen gedeclareerd type"
+
+#: src/reader.c:380
+#, fuzzy, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%s van `%s' heeft geen gedeclareerd type"
+
+#: src/reader.c:433

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

-#: src/reader.c:362 src/reader.c:515 src/reader.c:565
+#: src/reader.c:480 src/reader.c:596 src/reader.c:646

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

-#: src/reader.c:379
+#: src/reader.c:497

 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 

-#: src/reader.c:382
+#: src/reader.c:500

 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:404 src/reader.c:584
+#: src/reader.c:522 src/reader.c:665

 #, 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:414 src/reader.c:530 src/reader.c:591 src/reader.c:1280
+#: src/reader.c:532 src/reader.c:611 src/reader.c:672 src/reader.c:1224

 #, 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:424
+#: src/reader.c:542

 #, 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:441 src/reader.c:638
+#: src/reader.c:559 src/reader.c:719

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "meerdere %start declaraties"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "meerdere %start declaraties"
 

-#: src/reader.c:443 src/reader.c:1258
+#: src/reader.c:561 src/reader.c:1202

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "onjuiste %start declaratie"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "onjuiste %start declaratie"
 

-#: src/reader.c:466 src/reader.c:478
-msgid "invalid $ value"
-msgstr "onjuiste $ waarde"
-
-#: src/reader.c:500
+#: src/reader.c:581

 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:535
+#: src/reader.c:616

 #, 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:580
+#: src/reader.c:661

 #, 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:604
+#: src/reader.c:685

 #, 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:614
+#: src/reader.c:695

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

-#: src/reader.c:679 src/reader.c:1031 src/reader.c:1103
+#: src/reader.c:756 src/reader.c:1034 src/reader.c:1104

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "niet overeenkomstige `{'"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "niet overeenkomstige `{'"
 

-#: src/reader.c:727
-#, c-format
-msgid "argument of %expect is not an integer"
+#: src/reader.c:788
+#, fuzzy
+msgid "argument of %%expect is not an integer"

 msgstr "argument van %expect is niet een integer"
 
 msgstr "argument van %expect is niet een integer"
 

-#: src/reader.c:773
+#: src/reader.c:835

 #, 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:797
+#: src/reader.c:859

 #, 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:896
+#: src/reader.c:959

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

-#: src/reader.c:901
+#: src/reader.c:964

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

-#: src/reader.c:906
+#: src/reader.c:969

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

-#: src/reader.c:997 src/reader.c:1150
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ van `%s' heeft geen gedeclareerd type"
-
-#: src/reader.c:1013 src/reader.c:1166
-#, fuzzy, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%s van `%s' heeft geen gedeclareerd type"
-
-#: src/reader.c:1183
+#: src/reader.c:1127

 #, 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:1345
+#: src/reader.c:1289

 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:1352
+#: src/reader.c:1296

 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:1383
+#: src/reader.c:1327

 #, 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:1484
+#: src/reader.c:1429

 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:1492
+#: src/reader.c:1437

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

-#: src/reader.c:1501
+#: src/reader.c:1446

 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:1515
+#: src/reader.c:1460

 #, 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:1521
+#: src/reader.c:1466

 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:1565
+#: src/reader.c:1510

 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 

-#: src/reader.c:1573
+#: src/reader.c:1518

 #, 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:1576
+#: src/reader.c:1521

 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:1596
+#: src/reader.c:1541

 #, 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:1701
+#: src/reader.c:1646

 #, 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:1713
+#: src/reader.c:1658

 #, 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:1764
+#: src/reader.c:1709

 #, 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:1777
+#: src/reader.c:1722

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 

-#: src/reader.c:1779
+#: src/reader.c:1724

 #, 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"

diff --git a/po/ru.po b/po/ru.po
index d339adff7315fdbf4b7c45b16a163045822cdffb..83bdc2e4bc994987d4ce367a01cde1eea209a8c9 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-10-16 19:27+0200\n"
+"POT-Creation-Date: 2000-10-16 20:27+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"


@@ -231,49 +231,49 @@ msgstr "%s: 
 msgid "too many gotos (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
 
 msgid "too many gotos (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
 

-#: src/lex.c:82
+#: src/lex.c:83

 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 
 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 

-#: src/lex.c:111 src/reader.c:215
+#: src/lex.c:112 src/reader.c:269

 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 
 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 

-#: src/lex.c:139
+#: src/lex.c:144

 msgid "unexpected end of file"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
 msgid "unexpected end of file"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 

-#: src/lex.c:162
+#: src/lex.c:167

 msgid "unescaped newline in constant"
 msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
 
 msgid "unescaped newline in constant"
 msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
 

-#: src/lex.c:204
+#: src/lex.c:209

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
 

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

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
 

-#: src/lex.c:241
+#: src/lex.c:246

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
 

-#: src/lex.c:410
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
-
-#: src/lex.c:489
+#: src/lex.c:340

 msgid "unterminated type name at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"
 
 msgid "unterminated type name at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"
 

-#: src/lex.c:492
+#: src/lex.c:343

 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 

+#: src/lex.c:447
+msgid "use \"...\" for multi-character literal tokens"
+msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
+

 #: src/main.c:104
 #, c-format
 msgid "%s: internal error: %s\n"
 #: src/main.c:104
 #, c-format
 msgid "%s: internal error: %s\n"


@@ -283,7 +283,7 @@ msgstr "%s: 
 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"
 

-#: src/output.c:1009
+#: src/output.c:983

 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)"
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)"


@@ -385,215 +385,215 @@ msgstr "   
 msgid "   Skipping to next %c"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c"
 
 msgid "   Skipping to next %c"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c"
 

-#: src/reader.c:136 src/reader.c:151
+#: src/reader.c:133 src/reader.c:145
+msgid "invalid $ value"
+msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
+
+#: src/reader.c:170 src/reader.c:185

 msgid "unterminated string at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ"
 
 msgid "unterminated string at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ"
 

-#: src/reader.c:139
+#: src/reader.c:173

 msgid "unterminated string"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
 
 msgid "unterminated string"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
 

-#: src/reader.c:271 src/reader.c:1021 src/reader.c:1174
+#: src/reader.c:325 src/reader.c:387

 #, fuzzy, c-format
 msgid "%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
 
 #, fuzzy, c-format
 msgid "%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
 

-#: src/reader.c:321
+#: src/reader.c:364
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
+
+#: src/reader.c:380
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
+
+#: src/reader.c:433

 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
 
 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
 

-#: src/reader.c:362 src/reader.c:515 src/reader.c:565
+#: src/reader.c:480 src/reader.c:596 src/reader.c:646

 #, c-format
 msgid "Premature EOF after %s"
 msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s"
 
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s"
 

-#: src/reader.c:379
+#: src/reader.c:497

 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""
 

-#: src/reader.c:382
+#: src/reader.c:500

 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:404 src/reader.c:584
+#: src/reader.c:522 src/reader.c:665

 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 

-#: src/reader.c:414 src/reader.c:530 src/reader.c:591 src/reader.c:1280
+#: src/reader.c:532 src/reader.c:611 src/reader.c:672 src/reader.c:1224

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
 

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

 #, 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:441 src/reader.c:638
+#: src/reader.c:559 src/reader.c:719

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 

-#: src/reader.c:443 src/reader.c:1258
+#: src/reader.c:561 src/reader.c:1202

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 

-#: src/reader.c:466 src/reader.c:478
-msgid "invalid $ value"
-msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
-
-#: src/reader.c:500
+#: src/reader.c:581

 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
 
 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
 

-#: src/reader.c:535
+#: src/reader.c:616

 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:580
+#: src/reader.c:661

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
 

-#: src/reader.c:604
+#: src/reader.c:685

 #, 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:614
+#: src/reader.c:695

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 

-#: src/reader.c:679 src/reader.c:1031 src/reader.c:1103
+#: src/reader.c:756 src/reader.c:1034 src/reader.c:1104

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "ÎÅÐÁÒÎÁÑ `{'"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "ÎÅÐÁÒÎÁÑ `{'"
 

-#: src/reader.c:727
-#, c-format
-msgid "argument of %expect is not an integer"
+#: src/reader.c:788
+#, fuzzy
+msgid "argument of %%expect is not an integer"

 msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
 msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 

-#: src/reader.c:773
+#: src/reader.c:835

 #, 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:797
+#: src/reader.c:859

 #, 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:896
+#: src/reader.c:959

 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 

-#: src/reader.c:901
+#: src/reader.c:964

 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 
 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 

-#: src/reader.c:906
+#: src/reader.c:969

 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 

-#: src/reader.c:997 src/reader.c:1150
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
-
-#: src/reader.c:1013 src/reader.c:1166
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
-
-#: src/reader.c:1183
+#: src/reader.c:1127

 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 

-#: src/reader.c:1345
+#: src/reader.c:1289

 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:1352
+#: src/reader.c:1296

 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 
 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 

-#: src/reader.c:1383
+#: src/reader.c:1327

 #, 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:1484
+#: src/reader.c:1429

 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 

-#: src/reader.c:1492
+#: src/reader.c:1437

 #, fuzzy
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ"
 
 #, fuzzy
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ"
 

-#: src/reader.c:1501
+#: src/reader.c:1446

 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 

-#: src/reader.c:1515
+#: src/reader.c:1460

 #, 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:1521
+#: src/reader.c:1466

 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 

-#: src/reader.c:1565
+#: src/reader.c:1510

 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 

-#: src/reader.c:1573
+#: src/reader.c:1518

 #, 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:1576
+#: src/reader.c:1521

 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 

-#: src/reader.c:1596
+#: src/reader.c:1541

 #, 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:1701
+#: src/reader.c:1646

 #, 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:1713
+#: src/reader.c:1658

 #, 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:1764
+#: src/reader.c:1709

 #, 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:1777
+#: src/reader.c:1722

 #, 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:1779
+#: src/reader.c:1724

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"