* src/reader.c (parse_expect_decl): Keep `count' within the size

of `buffer'.
From Neil Booth.

diff --git a/ChangeLog b/ChangeLog
index 2b91be7b6f0d4dc6a084548c1d9a32c30f785128..7a28f3d29e3179f863707fe8baa37c3f99088d03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-04  Akim Demaille  <akim@epita.fr>
+
+       * src/reader.c (parse_expect_decl): Keep `count' within the size
+       of `buffer'.
+       From Neil Booth.
+

 2000-10-02  Paul Eggert  <eggert@twinsun.com>
 
        * bison.s1 (yyparse): Assign the default value
 2000-10-02  Paul Eggert  <eggert@twinsun.com>
 
        * bison.s1 (yyparse): Assign the default value

diff --git a/Makefile.am b/Makefile.am
index bc0e9eaab612d94c4552a1de786d5c19ad477074..4e180ff034bc69d0ce1afc62d749827a034ab53d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = intl po lib src doc m4 tests
 
 
 SUBDIRS = intl po lib src doc m4 tests
 

-EXTRA_DIST = REFERENCES configure.bat OChangeLog
+EXTRA_DIST = REFERENCES configure.bat OChangeLog THANKS

 
 DISTCLEANFILES = intl/libintl.h
 
 DISTCLEANFILES = intl/libintl.h

diff --git a/THANKS b/THANKS
new file mode 100644 (file)
index 0000000..239ffb6
--- /dev/null
+++ b/THANKS
@@ -0,0 +1,15 @@
+Daniel Hagerty         hag@gnu.org
+David J. MacKenzie     djm@gnu.org
+Jesse Thilo            jthilo@gnu.org
+Jim Meyering           meyering@gnu.org
+Neil Booth             NeilB@earthling.net
+Noah Friedman                  friedman@gnu.org
+Paul Eggert            eggert@twinsun.com
+Richard Stallman       rms@gnu.org
+
+Many people are not named here because we lost track of them.  We
+thank them!  Please, help us keeping this list up to date.
+
+Local Variables:
+mode: text
+End:

diff --git a/po/de.po b/po/de.po
index 5e824edcc74d9fa1e71a69049daccea662c51c59..ce4f016ed459952cbb911b17db0f89ce702c2399 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-09-21 10:30+0200\n"
+"POT-Creation-Date: 2000-10-02 12:34+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"


@@ -13,87 +13,82 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:212
+#: src/LR0.c:207

 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 

-#: src/allocate.c:58 src/allocate.c:74
-#, c-format
-msgid "%s: memory exhausted\n"
-msgstr "%s: Hauptspeicher erschöpft\n"
-
-#: src/conflicts.c:64
+#: src/conflicts.c:50

 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"
 
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"
 

-#: src/conflicts.c:130 src/conflicts.c:153
+#: src/conflicts.c:116 src/conflicts.c:139

 msgid "reduce"
 msgstr "durch Reduzierung gelöst"
 
 msgid "reduce"
 msgstr "durch Reduzierung gelöst"
 

-#: src/conflicts.c:136 src/conflicts.c:149
+#: src/conflicts.c:122 src/conflicts.c:135

 msgid "shift"
 msgstr "durch Schieben gelöst"
 
 msgid "shift"
 msgstr "durch Schieben gelöst"
 

-#: src/conflicts.c:157
+#: src/conflicts.c:143

 msgid "an error"
 msgstr "als Fehler betrachtet"
 
 msgid "an error"
 msgstr "als Fehler betrachtet"
 

-#. If invoked under the name `yacc', use the output format
-#. specified by POSIX.
-#: src/conflicts.c:446
-msgid "conflicts: "
-msgstr "Konflikte: "
-
-#: src/conflicts.c:448
-#, c-format
-msgid " %d shift/reduce"
-msgstr " %d Schiebe/Reduziere"
-
-#: src/conflicts.c:452
-#, c-format
-msgid " %d reduce/reduce"
-msgstr " %d Reduziere/Reduziere"
-
-#: src/conflicts.c:457
-#, c-format
-msgid "%s contains"
-msgstr "%s enthält"
-
-#: src/conflicts.c:460 src/conflicts.c:525
+#: src/conflicts.c:419

 msgid " 1 shift/reduce conflict"
 msgstr " 1 Schiebe/Reduziere Konflikt"
 
 msgid " 1 shift/reduce conflict"
 msgstr " 1 Schiebe/Reduziere Konflikt"
 

-#: src/conflicts.c:462 src/conflicts.c:527
+#: src/conflicts.c:421

 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d Schiebe/Reduziere Konflikte"
 
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d Schiebe/Reduziere Konflikte"
 

-#: src/conflicts.c:465 src/conflicts.c:530
+#: src/conflicts.c:424

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

-#: src/conflicts.c:468 src/conflicts.c:533
+#: src/conflicts.c:427

 msgid " 1 reduce/reduce conflict"
 msgstr " 1 Reduziere/Reduziere Konflikt"
 
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 Reduziere/Reduziere Konflikt"
 

-#: src/conflicts.c:470 src/conflicts.c:535
+#: src/conflicts.c:429

 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d Reduziere/Reduziere Konflikte"
 
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d Reduziere/Reduziere Konflikte"
 

-#: src/conflicts.c:522
+#: src/conflicts.c:461

 #, c-format
 msgid "State %d contains"
 msgstr "Zustand %d enthält"
 
 #, c-format
 msgid "State %d contains"
 msgstr "Zustand %d enthält"
 

-#: src/conflicts.c:629 src/conflicts.c:749
+#. If invoked with `--yacc', use the output format specified by
+#. POSIX.
+#: src/conflicts.c:472
+msgid "conflicts: "
+msgstr "Konflikte: "
+
+#: src/conflicts.c:474
+#, c-format
+msgid " %d shift/reduce"
+msgstr " %d Schiebe/Reduziere"
+
+#: src/conflicts.c:478
+#, c-format
+msgid " %d reduce/reduce"
+msgstr " %d Reduziere/Reduziere"
+
+#: src/conflicts.c:483
+#, c-format
+msgid "%s contains"
+msgstr "%s enthält"
+
+#: src/conflicts.c:568 src/conflicts.c:688

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduziere mit Regel %d (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduziere mit Regel %d (%s)]\n"
 

-#: src/conflicts.c:640 src/print.c:222
+#: src/conflicts.c:579 src/print.c:170

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -102,26 +97,21 @@ msgstr ""
 "    $default\treduziere mit Regel %d (%s)\n"
 "\n"
 
 "    $default\treduziere mit Regel %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:729 src/conflicts.c:743
+#: src/conflicts.c:668 src/conflicts.c:682

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduziere mit Tegel %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduziere mit Tegel %d (%s)\n"
 

-#: src/conflicts.c:770
+#: src/conflicts.c:709

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"
 
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"
 

-#: src/derives.c:42
-msgid ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
+#: src/derives.c:44
+msgid "DERIVES"

 msgstr ""
 
 msgstr ""
 

-#: src/derives.c:46
+#: src/derives.c:49

 #, c-format
 msgid "%s derives"
 msgstr "%s leitet ab"
 #, c-format
 msgid "%s derives"
 msgstr "%s leitet ab"


@@ -155,6 +145,7 @@ msgstr ""
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"

+"      --locations            enable locations computation\n"

 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"
 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"


@@ -162,7 +153,7 @@ msgid ""
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 

-#: src/getargs.c:106
+#: src/getargs.c:107

 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"


@@ -171,469 +162,443 @@ msgid ""
 "  -o, --output-file=FILE     leave output to FILE\n"
 msgstr ""
 
 "  -o, --output-file=FILE     leave output to FILE\n"
 msgstr ""
 

-#: src/getargs.c:114
+#: src/getargs.c:115

 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.

-#: src/getargs.c:128
+#: src/getargs.c:129

 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 

-#: src/getargs.c:133
+#: src/getargs.c:134

 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 
 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 

-#: src/getargs.c:137
+#: src/getargs.c:138

 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:231
+#: src/getargs.c:217
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ""
+
+#: src/getargs.c:225

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: keine Grammatik-Datei angegeben\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: keine Grammatik-Datei angegeben\n"
 

-#: src/getargs.c:235
+#: src/getargs.c:229

 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n"
 
 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n"
 

-#: src/lalr.c:292
+#: src/lalr.c:312

 #, c-format
 msgid "too many gotos (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr ""
 

-#: src/lex.c:105
+#: src/lex.c:84

 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:134 src/reader.c:285
+#: src/lex.c:113 src/reader.c:216

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

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

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

 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:215
+#: src/lex.c:206

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

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

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

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
 

-#: src/lex.c:463
+#: src/lex.c:489

 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:466
+#: src/lex.c:492

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

-#: src/main.c:139
+#: src/main.c:123

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

-#: src/nullable.c:55
+#: src/nullable.c:52

 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"
 
 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"
 

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

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

-#: src/print.c:84
+#: src/print.c:38

 #, c-format
 msgid " type %d is %s\n"
 msgstr " Typ %d ist %s\n"
 
 #, c-format
 msgid " type %d is %s\n"
 msgstr " Typ %d ist %s\n"
 

-#: src/print.c:92
-#, c-format
-msgid ""
-"\n"
-"\n"
-"state %d\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"Zustand %d\n"
-"\n"
-
-#: src/print.c:137
+#: src/print.c:86

 #, c-format
 msgid "   (rule %d)"
 msgstr "   (Regel %d)"
 
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (Regel %d)"
 

-#: src/print.c:164
+#: src/print.c:112

 msgid "    $default\taccept\n"
 msgstr "    $default\takzeptiere\n"
 
 msgid "    $default\taccept\n"
 msgstr "    $default\takzeptiere\n"
 

-#: src/print.c:166
+#: src/print.c:114

 msgid "    NO ACTIONS\n"
 msgstr "    KEINE AKTIONEN\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
 msgid "    NO ACTIONS\n"
 msgstr "    KEINE AKTIONEN\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0

-#: src/print.c:184
+#: src/print.c:132

 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tgehe zu Zustand %d über\n"
 
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tgehe zu Zustand %d über\n"
 

-#: src/print.c:186
+#: src/print.c:134

 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tSchiebe und gehe zu Zustand %d über\n"
 
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tSchiebe und gehe zu Zustand %d über\n"
 

-#: src/print.c:210
+#: src/print.c:158

 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tFehler (nicht assoziativ)\n"
 
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tFehler (nicht assoziativ)\n"
 

-#: src/print.c:238
+#: src/print.c:186

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tgehe zu Zustand %d über\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tgehe zu Zustand %d über\n"
 

-#. rule # : LHS -> RHS
-#: src/print.c:264
-msgid ""
+#: src/print.c:198
+#, fuzzy, c-format
+msgid "state %d"
+msgstr ""
+"\n"
+"\n"
+"Zustand %d\n"

 "\n"
 "\n"

-"Grammar\n"
+
+#: src/print.c:228
+#, fuzzy
+msgid "Grammar"

 msgstr ""
 "\n"
 "Grammatik\n"
 
 msgstr ""
 "\n"
 "Grammatik\n"
 

-#: src/print.c:269
+#: src/print.c:234

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "Regel %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "Regel %-4d %s ->"
 

-#: src/print.c:275
+#: src/print.c:240

 msgid "\t\t/* empty */"
 msgstr "\t\t/* leer */"
 
 msgid "\t\t/* empty */"
 msgstr "\t\t/* leer */"
 

-#. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:280
-msgid ""
-"\n"
-"Terminals, with rules where they appear\n"
-"\n"
+#: src/print.c:246
+#, fuzzy
+msgid "Terminals, with rules where they appear"

 msgstr ""
 "\n"
 "Terminale und die Regeln un denen sie verwendet werden\n"
 "\n"
 
 msgstr ""
 "\n"
 "Terminale und die Regeln un denen sie verwendet werden\n"
 "\n"
 

-#: src/print.c:328
-msgid ""
-"\n"
-"Nonterminals, with rules where they appear\n"
-"\n"
+#: src/print.c:296
+#, fuzzy
+msgid "Nonterminals, with rules where they appear"

 msgstr ""
 "\n"
 "Nicht-Terminal und die Regeln in denen sie verwendet werden\n"
 "\n"
 
 msgstr ""
 "\n"
 "Nicht-Terminal und die Regeln in denen sie verwendet werden\n"
 "\n"
 

-#: src/print.c:354
+#: src/print.c:323

 msgid " on left:"
 msgstr " auf der linken Seite:"
 
 msgid " on left:"
 msgstr " auf der linken Seite:"
 

-#: src/print.c:369
+#: src/print.c:338

 msgid " on right:"
 msgstr " auf der rechten Seite:"
 
 msgid " on right:"
 msgstr " auf der rechten Seite:"
 

-#: src/reader.c:153
+#: src/reader.c:81

 msgid "   Skipping to next \\n"
 msgstr "   Überspringe Zeichen bis zum nächsten \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   Überspringe Zeichen bis zum nächsten \\n"
 

-#: src/reader.c:155
+#: src/reader.c:83

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Überspringe Zeichen bis zum nächten %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Überspringe Zeichen bis zum nächten %c"
 

-#: src/reader.c:209 src/reader.c:224
+#: src/reader.c:137 src/reader.c:152

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

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

-#: src/reader.c:480
+#: src/reader.c:269

 #, c-format
 #, c-format

-msgid "unrecognized: %s"
-msgstr "unbekannt: %s"
-
-#: src/reader.c:485
-msgid "no input grammar"
-msgstr "keine Eingabe-Grammatik"
-
-#: src/reader.c:488
-#, c-format
-msgid "unknown character: %s"
-msgstr "unbekanntes Zeichen: %s"
+msgid "@%s is invalid"
+msgstr "@%s ist unzulässig"

 
 

-#: src/reader.c:540
+#: src/reader.c:318

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

-#: src/reader.c:581 src/reader.c:769 src/reader.c:818
+#: src/reader.c:359 src/reader.c:504 src/reader.c:554

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

-#: src/reader.c:618 src/reader.c:840
+#: src/reader.c:393 src/reader.c:573

 #, 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:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709
+#: src/reader.c:403 src/reader.c:519 src/reader.c:580 src/reader.c:1259

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

 #, 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:686
-#, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
-
-#: src/reader.c:708
-#, c-format
-msgid "expected string constant instead of %s"
-msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
-
-#: src/reader.c:730 src/reader.c:891
+#: src/reader.c:430 src/reader.c:627

 #, 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:732 src/reader.c:1685
+#: src/reader.c:432 src/reader.c:1237

 #, 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:752
+#: src/reader.c:455 src/reader.c:467
+msgid "invalid $ value"
+msgstr "unzulässiger $ Wert"
+
+#: src/reader.c:489

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

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

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

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

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

-#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312
+#: src/reader.c:668 src/reader.c:1014 src/reader.c:1086

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

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

-#: src/reader.c:1009
+#: src/reader.c:762

 #, c-format
 #, c-format

-msgid "@%s is invalid"
-msgstr "@%s ist unzulässig"
+msgid "unrecognized item %s, expected an identifier"
+msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"

 
 

-#: src/reader.c:1024 src/reader.c:1036
-msgid "invalid $ value"
-msgstr "unzulässiger $ Wert"
+#: src/reader.c:786
+#, c-format
+msgid "expected string constant instead of %s"
+msgstr "hier wird eine Zeichenkette erwartet, nicht %s"

 
 

-#: src/reader.c:1142 src/reader.c:1282
+#: src/reader.c:885
+#, c-format
+msgid "unrecognized: %s"
+msgstr "unbekannt: %s"
+
+#: src/reader.c:890
+msgid "no input grammar"
+msgstr "keine Eingabe-Grammatik"
+
+#: src/reader.c:893
+#, c-format
+msgid "unknown character: %s"
+msgstr "unbekanntes Zeichen: %s"
+
+#: src/reader.c:984 src/reader.c:1133

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

-#: src/reader.c:1158 src/reader.c:1298
+#: src/reader.c:1000 src/reader.c:1149

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

-#: src/reader.c:1163 src/reader.c:1303
+#: src/reader.c:1005 src/reader.c:1154

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

-#: src/reader.c:1172
+#: src/reader.c:1162

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

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

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

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

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

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

-#: src/reader.c:1552
+#: src/reader.c:1479

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

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

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

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

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

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

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

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

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

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

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

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

-#: src/reduce.c:142
-#, c-format
-msgid "Start symbol %s does not derive any sentence"
-msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"
-
-#: src/reduce.c:156
-#, c-format
-msgid ""
-"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr ""
-"Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d "
-"Produktionen.\n"
-
-#: src/reduce.c:494
-msgid ""
-"Useless nonterminals:\n"
-"\n"
+#: src/reduce.c:404
+#, fuzzy
+msgid "Useless nonterminals:"

 msgstr ""
 "Nutzlose Nicht-Terminale:\n"
 "\n"
 
 msgstr ""
 "Nutzlose Nicht-Terminale:\n"
 "\n"
 

-#: src/reduce.c:506
-msgid ""
-"\n"
-"\n"
-"Terminals which are not used:\n"
-"\n"
+#: src/reduce.c:418
+#, fuzzy
+msgid "Terminals which are not used:"

 msgstr ""
 "\n"
 "\n"
 "Nicht genutzte Terminale:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "Nicht genutzte Terminale:\n"
 "\n"
 

-#: src/reduce.c:515
-msgid ""
-"\n"
-"\n"
-"Useless rules:\n"
-"\n"
+#: src/reduce.c:429
+#, fuzzy
+msgid "Useless rules:"

 msgstr ""
 "\n"
 "\n"
 "Ungenutzte Regeln:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "Ungenutzte Regeln:\n"
 "\n"
 

-#: src/reduce.c:544
+#: src/reduce.c:459

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


@@ -643,11 +608,11 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:545
+#: src/reduce.c:460

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

-#: src/reduce.c:550
+#: src/reduce.c:464

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


@@ -657,7 +622,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:560
+#: src/reduce.c:474

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


@@ -667,30 +632,43 @@ msgstr ""
 "----------------------\n"
 "\n"
 
 "----------------------\n"
 "\n"
 

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

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

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

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

-#: src/reduce.c:583
+#: src/reduce.c:498

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

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

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

-#: src/reduce.c:592
+#: src/reduce.c:507

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

+#: src/reduce.c:540
+#, c-format
+msgid "Start symbol %s does not derive any sentence"
+msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"
+
+#: src/reduce.c:553
+#, c-format
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d "
+"Produktionen.\n"
+

 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"


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

+#~ msgid "%s: memory exhausted\n"
+#~ msgstr "%s: Hauptspeicher erschöpft\n"
+

 #~ msgid "unmatched close-brace (`}')"
 #~ msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
 
 #~ msgid "unmatched close-brace (`}')"
 #~ msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
 

diff --git a/po/es.po b/po/es.po
index f5a746adccb8886e995751f7b391148c35d874a5..d2024f8e162ce86c75e63f1974647da5bac2a9e6 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-09-21 10:30+0200\n"
+"POT-Creation-Date: 2000-10-02 12:34+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"


@@ -38,38 +38,60 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:212
+#: src/LR0.c:207

 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 

-#: src/allocate.c:58 src/allocate.c:74
-#, c-format
-msgid "%s: memory exhausted\n"
-msgstr "%s: memoria agotada\n"
-
-#: src/conflicts.c:64
+#: src/conflicts.c:50

 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "El conflicto en el estado %s entre la regla %d y el terminal %s se resuelve "
 "como %s.\n"
 
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "El conflicto en el estado %s entre la regla %d y el terminal %s se resuelve "
 "como %s.\n"
 

-#: src/conflicts.c:130 src/conflicts.c:153
+#: src/conflicts.c:116 src/conflicts.c:139

 msgid "reduce"
 msgstr "reduce"
 
 msgid "reduce"
 msgstr "reduce"
 

-#: src/conflicts.c:136 src/conflicts.c:149
+#: src/conflicts.c:122 src/conflicts.c:135

 msgid "shift"
 msgstr "desplaza"
 
 msgid "shift"
 msgstr "desplaza"
 

-#: src/conflicts.c:157
+#: src/conflicts.c:143

 msgid "an error"
 msgstr "un error"
 
 msgid "an error"
 msgstr "un error"
 

-#. If invoked under the name `yacc', use the output format
-#. specified by POSIX.
-#: src/conflicts.c:446
+#: src/conflicts.c:419
+msgid " 1 shift/reduce conflict"
+msgstr " 1 conflicto desplazamiento/reducción"
+
+#: src/conflicts.c:421
+#, c-format
+msgid " %d shift/reduce conflicts"
+msgstr " %d conflictos desplazamiento/reducción"
+
+#: src/conflicts.c:424
+msgid " and"
+msgstr " y"
+
+#: src/conflicts.c:427
+msgid " 1 reduce/reduce conflict"
+msgstr " 1 conflicto reducción/reducción"
+
+#: src/conflicts.c:429
+#, c-format
+msgid " %d reduce/reduce conflicts"
+msgstr " %d conflictos reducción/reducción"
+
+#: src/conflicts.c:461
+#, c-format
+msgid "State %d contains"
+msgstr "El estado %d contiene"
+
+#. If invoked with `--yacc', use the output format specified by
+#. POSIX.
+#: src/conflicts.c:472

 msgid "conflicts: "
 msgstr "conflictos: "
 
 msgid "conflicts: "
 msgstr "conflictos: "
 


@@ -85,7 +107,7 @@ msgstr "conflictos: "
 # ok
 # ngp
 #
 # ok
 # ngp
 #

-#: src/conflicts.c:448
+#: src/conflicts.c:474

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"


@@ -102,49 +124,22 @@ msgstr " %d desplazamiento(s)/reducci
 #
 # ok
 # ngp
 #
 # ok
 # ngp

-#: src/conflicts.c:452
+#: src/conflicts.c:478

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"
 

-#: src/conflicts.c:457
+#: src/conflicts.c:483

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

-#: src/conflicts.c:460 src/conflicts.c:525
-msgid " 1 shift/reduce conflict"
-msgstr " 1 conflicto desplazamiento/reducción"
-
-#: src/conflicts.c:462 src/conflicts.c:527
-#, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d conflictos desplazamiento/reducción"
-
-#: src/conflicts.c:465 src/conflicts.c:530
-msgid " and"
-msgstr " y"
-
-#: src/conflicts.c:468 src/conflicts.c:533
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 conflicto reducción/reducción"
-
-#: src/conflicts.c:470 src/conflicts.c:535
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d conflictos reducción/reducción"
-
-#: src/conflicts.c:522
-#, c-format
-msgid "State %d contains"
-msgstr "El estado %d contiene"
-
-#: src/conflicts.c:629 src/conflicts.c:749
+#: src/conflicts.c:568 src/conflicts.c:688

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduce usando la regla  %d (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduce usando la regla  %d (%s)]\n"
 

-#: src/conflicts.c:640 src/print.c:222
+#: src/conflicts.c:579 src/print.c:170

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -153,30 +148,26 @@ msgstr ""
 "    $default\treduce usando la regla %d (%s)\n"
 "\n"
 
 "    $default\treduce usando la regla %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:729 src/conflicts.c:743
+#: src/conflicts.c:668 src/conflicts.c:682

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduce usando la regla  %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduce usando la regla  %d (%s)\n"
 

-#: src/conflicts.c:770
+#: src/conflicts.c:709

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduce usando la regla %d (%s)\n"
 
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduce usando la regla %d (%s)\n"
 

-#: src/derives.c:42
-msgid ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
+#: src/derives.c:44
+#, fuzzy
+msgid "DERIVES"

 msgstr ""
 "\n"
 "\n"
 "\n"
 "DERIVACIONES\n"
 
 msgstr ""
 "\n"
 "\n"
 "\n"
 "DERIVACIONES\n"
 

-#: src/derives.c:46
+#: src/derives.c:49

 #, c-format
 msgid "%s derives"
 msgstr "%s deriva"
 #, c-format
 msgid "%s derives"
 msgstr "%s deriva"


@@ -210,6 +201,7 @@ msgstr ""
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"

+"      --locations            enable locations computation\n"

 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"
 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"


@@ -217,7 +209,7 @@ msgid ""
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 

-#: src/getargs.c:106
+#: src/getargs.c:107

 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"


@@ -226,99 +218,104 @@ msgid ""
 "  -o, --output-file=FILE     leave output to FILE\n"
 msgstr ""
 
 "  -o, --output-file=FILE     leave output to FILE\n"
 msgstr ""
 

-#: src/getargs.c:114
+#: src/getargs.c:115

 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.

-#: src/getargs.c:128
+#: src/getargs.c:129

 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 

-#: src/getargs.c:133
+#: src/getargs.c:134

 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 
 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 

-#: src/getargs.c:137
+#: src/getargs.c:138

 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

+#: src/getargs.c:217
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ""
+

 # Me parece menos "computadora" decir "ningún fichero de gramática" - cll
 #
 # Me parece menos "computadora" decir "ningún fichero de gramática" - cll
 #

-#: src/getargs.c:231
+#: src/getargs.c:225

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: no se ha especificado ningún fichero de gramática\n"
 
 # Ignorar es no saber, to ignore es no hacer caso, que no es lo mismo. sv
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: no se ha especificado ningún fichero de gramática\n"
 
 # Ignorar es no saber, to ignore es no hacer caso, que no es lo mismo. sv

-#: src/getargs.c:235
+#: src/getargs.c:229

 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n"
 
 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n"
 

-#: src/lalr.c:292
+#: src/lalr.c:312

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

-#: src/lex.c:105
+#: src/lex.c:84

 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:134 src/reader.c:285
+#: src/lex.c:113 src/reader.c:216

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

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

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

 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:215
+#: src/lex.c:206

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

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

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
 
 # ¿multicarácter o multicaracteres? sv
 #, 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:384
+#: src/lex.c:410

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "use \"...\" para terminales literales multicarácter"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "use \"...\" para terminales literales multicarácter"
 

-#: src/lex.c:463
+#: src/lex.c:489

 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:466
+#: src/lex.c:492

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

-#: src/main.c:139
+#: src/main.c:123

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

-#: src/nullable.c:55
+#: src/nullable.c:52

 msgid "Entering set_nullable"
 msgstr "Entrando set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "Entrando set_nullable"
 


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

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

-#: src/print.c:84
+#: src/print.c:38

 #, c-format
 msgid " type %d is %s\n"
 msgstr " el tipo %d es %s\n"
 
 #, c-format
 msgid " type %d is %s\n"
 msgstr " el tipo %d es %s\n"
 

-#: src/print.c:92
-#, c-format
-msgid ""
-"\n"
-"\n"
-"state %d\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"estado %d\n"
-"\n"
-
-#: src/print.c:137
+#: src/print.c:86

 #, c-format
 msgid "   (rule %d)"
 msgstr "   (regla %d)"
 
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (regla %d)"
 

-#: src/print.c:164
+#: src/print.c:112

 msgid "    $default\taccept\n"
 msgstr "    $default\taceptar\n"
 
 msgid "    $default\taccept\n"
 msgstr "    $default\taceptar\n"
 

-#: src/print.c:166
+#: src/print.c:114

 msgid "    NO ACTIONS\n"
 msgstr "    SIN ACCIONES\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
 msgid "    NO ACTIONS\n"
 msgstr "    SIN ACCIONES\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0

-#: src/print.c:184
+#: src/print.c:132

 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tir al estado %d\n"
 
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tir al estado %d\n"
 

-#: src/print.c:186
+#: src/print.c:134

 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tdesplazar e ir al estado %d\n"
 
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tdesplazar e ir al estado %d\n"
 

-#: src/print.c:210
+#: src/print.c:158

 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terror (no asociativo)\n"
 
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terror (no asociativo)\n"
 

-#: src/print.c:238
+#: src/print.c:186

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tir al estado %d\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tir al estado %d\n"
 

-#. rule # : LHS -> RHS
-#: src/print.c:264
-msgid ""
+#: src/print.c:198
+#, fuzzy, c-format
+msgid "state %d"
+msgstr ""
+"\n"

 "\n"
 "\n"

-"Grammar\n"
+"estado %d\n"
+"\n"
+
+#: src/print.c:228
+#, fuzzy
+msgid "Grammar"

 msgstr ""
 "\n"
 "Gramática\n"
 
 msgstr ""
 "\n"
 "Gramática\n"
 

-#: src/print.c:269
+#: src/print.c:234

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regla %-4d %s ->"
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regla %-4d %s ->"


@@ -403,129 +394,103 @@ msgstr "regla %-4d %s ->"
 # como `vacía/o' - cll
 # según el código indica reglas vacías por eso lo puse así
 # ngp
 # como `vacía/o' - cll
 # según el código indica reglas vacías por eso lo puse así
 # ngp

-#: src/print.c:275
+#: src/print.c:240

 msgid "\t\t/* empty */"
 msgstr "\t\t/* vacía */"
 
 msgid "\t\t/* empty */"
 msgstr "\t\t/* vacía */"
 

-#. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:280
-msgid ""
-"\n"
-"Terminals, with rules where they appear\n"
-"\n"
+#: src/print.c:246
+#, fuzzy
+msgid "Terminals, with rules where they appear"

 msgstr ""
 "\n"
 "Terminales con las reglas donde aparecen\n"
 "\n"
 
 msgstr ""
 "\n"
 "Terminales con las reglas donde aparecen\n"
 "\n"
 

-#: src/print.c:328
-msgid ""
-"\n"
-"Nonterminals, with rules where they appear\n"
-"\n"
+#: src/print.c:296
+#, fuzzy
+msgid "Nonterminals, with rules where they appear"

 msgstr ""
 "\n"
 "No terminales con las reglas donde aparecen\n"
 
 msgstr ""
 "\n"
 "No terminales con las reglas donde aparecen\n"
 

-#: src/print.c:354
+#: src/print.c:323

 msgid " on left:"
 msgstr " en la izquierda:"
 
 msgid " on left:"
 msgstr " en la izquierda:"
 

-#: src/print.c:369
+#: src/print.c:338

 msgid " on right:"
 msgstr " en la derecha:"
 
 msgid " on right:"
 msgstr " en la derecha:"
 

-#: src/reader.c:153
+#: src/reader.c:81

 msgid "   Skipping to next \\n"
 msgstr "   Saltando al siguiente \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   Saltando al siguiente \\n"
 

-#: src/reader.c:155
+#: src/reader.c:83

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saltando al siguiente %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saltando al siguiente %c"
 

-#: src/reader.c:209 src/reader.c:224
+#: src/reader.c:137 src/reader.c:152

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

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

-#: src/reader.c:480
-#, c-format
-msgid "unrecognized: %s"
-msgstr "no reconocido: %s"
-
-#: src/reader.c:485
-msgid "no input grammar"
-msgstr "no hay gramática de entrada"
-
-#: src/reader.c:488
+#: src/reader.c:269

 #, c-format
 #, c-format

-msgid "unknown character: %s"
-msgstr "carácter desconocido: %s"
+msgid "@%s is invalid"
+msgstr "@%s no es válido"

 
 

-#: src/reader.c:540
+#: src/reader.c:318

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

-#: src/reader.c:581 src/reader.c:769 src/reader.c:818
+#: src/reader.c:359 src/reader.c:504 src/reader.c:554

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

-#: src/reader.c:618 src/reader.c:840
+#: src/reader.c:393 src/reader.c:573

 #, 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:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709
+#: src/reader.c:403 src/reader.c:519 src/reader.c:580 src/reader.c:1259

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

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

-# No te recomiendo que emplees participios para expresar acciones (¡si
-# me oyera mi antigua profesora de lengua, lloraría de emoción! :). En
-# vez de eso, emplea las conjugaciones habituales, que para eso están :)
-# - cll
-# ok - ngp
-#
-#: src/reader.c:686
-#, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "no se reconoce el ítem %s, se esperaba un identificador"
-
-#: src/reader.c:708
-#, c-format
-msgid "expected string constant instead of %s"
-msgstr "se esperaba una cadena constante en lugar de %s"
-
-#: src/reader.c:730 src/reader.c:891
+#: src/reader.c:430 src/reader.c:627

 #, 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:732 src/reader.c:1685
+#: src/reader.c:432 src/reader.c:1237

 #, 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:752
+#: src/reader.c:455 src/reader.c:467
+msgid "invalid $ value"
+msgstr "valor $ no válido"
+
+#: src/reader.c:489

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

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

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


@@ -534,7 +499,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:859
+#: src/reader.c:593

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


@@ -544,42 +509,63 @@ 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:869
+#: src/reader.c:603

 #, 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:932 src/reader.c:1095 src/reader.c:1312
+#: src/reader.c:668 src/reader.c:1014 src/reader.c:1086

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

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

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

-#: src/reader.c:1009
+# No te recomiendo que emplees participios para expresar acciones (¡si
+# me oyera mi antigua profesora de lengua, lloraría de emoción! :). En
+# vez de eso, emplea las conjugaciones habituales, que para eso están :)
+# - cll
+# ok - ngp
+#
+#: src/reader.c:762

 #, c-format
 #, c-format

-msgid "@%s is invalid"
-msgstr "@%s no es válido"
+msgid "unrecognized item %s, expected an identifier"
+msgstr "no se reconoce el ítem %s, se esperaba un identificador"

 
 

-#: src/reader.c:1024 src/reader.c:1036
-msgid "invalid $ value"
-msgstr "valor $ no válido"
+#: src/reader.c:786
+#, c-format
+msgid "expected string constant instead of %s"
+msgstr "se esperaba una cadena constante en lugar de %s"

 
 

-#: src/reader.c:1142 src/reader.c:1282
+#: src/reader.c:885
+#, c-format
+msgid "unrecognized: %s"
+msgstr "no reconocido: %s"
+
+#: src/reader.c:890
+msgid "no input grammar"
+msgstr "no hay gramática de entrada"
+
+#: src/reader.c:893
+#, c-format
+msgid "unknown character: %s"
+msgstr "carácter desconocido: %s"
+
+#: src/reader.c:984 src/reader.c:1133

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

-#: src/reader.c:1158 src/reader.c:1298
+#: src/reader.c:1000 src/reader.c:1149

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

-#: src/reader.c:1163 src/reader.c:1303
+#: src/reader.c:1005 src/reader.c:1154

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


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

-#: src/reader.c:1172
+#: src/reader.c:1162

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

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

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

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

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

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

-#: src/reader.c:1552
+#: src/reader.c:1479

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

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

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

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

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

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

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

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

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

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

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

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

-#: src/reduce.c:142
-#, c-format
-msgid "Start symbol %s does not derive any sentence"
-msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia"
-
-# ¡¡No sé cómo resolver el problema!!
-#
-# Como corrector, me veo obligado a hacer una corrección ¡¡a tu comentario!!:
-#
-# ¡¡No sé cómo resolver el problema!!
-#
-# Esto es: `cómo' va acentuado y, además, `problema' podría ser hebreo,
-# pero no español - cll
-#
-# Te recomiendo `la reducción de %s' en vez de seguir el estilo inglés y
-# usar participios - cll
-# un error lo tiene cualquiera - ngp
-#: src/reduce.c:156
-#, c-format
-msgid ""
-"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr ""
-"la reducción de %s define %d terminal%s, %d no terminal%s, y %d "
-"produccion%s.\n"
-
-#: src/reduce.c:494
-msgid ""
-"Useless nonterminals:\n"
-"\n"
+#: src/reduce.c:404
+#, fuzzy
+msgid "Useless nonterminals:"

 msgstr ""
 "No terminales sin uso:\n"
 "\n"
 
 msgstr ""
 "No terminales sin uso:\n"
 "\n"
 

-#: src/reduce.c:506
-msgid ""
-"\n"
-"\n"
-"Terminals which are not used:\n"
-"\n"
+#: src/reduce.c:418
+#, fuzzy
+msgid "Terminals which are not used:"

 msgstr ""
 "\n"
 "\n"
 "Terminales que no se usan:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "Terminales que no se usan:\n"
 "\n"
 

-#: src/reduce.c:515
-msgid ""
-"\n"
-"\n"
-"Useless rules:\n"
-"\n"
+#: src/reduce.c:429
+#, fuzzy
+msgid "Useless rules:"

 msgstr ""
 "\n"
 "\n"
 "Reglas sin uso:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "Reglas sin uso:\n"
 "\n"
 

-#: src/reduce.c:544
+#: src/reduce.c:459

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


@@ -746,11 +700,11 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:545
+#: src/reduce.c:460

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

-#: src/reduce.c:550
+#: src/reduce.c:464

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


@@ -760,7 +714,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:560
+#: src/reduce.c:474

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


@@ -770,30 +724,55 @@ msgstr ""
 "--------------------\n"
 "\n"
 
 "--------------------\n"
 "\n"
 

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

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

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

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

-#: src/reduce.c:583
+#: src/reduce.c:498

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

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

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

-#: src/reduce.c:592
+#: src/reduce.c:507

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

+#: src/reduce.c:540
+#, c-format
+msgid "Start symbol %s does not derive any sentence"
+msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia"
+
+# ¡¡No sé cómo resolver el problema!!
+#
+# Como corrector, me veo obligado a hacer una corrección ¡¡a tu comentario!!:
+#
+# ¡¡No sé cómo resolver el problema!!
+#
+# Esto es: `cómo' va acentuado y, además, `problema' podría ser hebreo,
+# pero no español - cll
+#
+# Te recomiendo `la reducción de %s' en vez de seguir el estilo inglés y
+# usar participios - cll
+# un error lo tiene cualquiera - ngp
+#: src/reduce.c:553
+#, c-format
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"la reducción de %s define %d terminal%s, %d no terminal%s, y %d "
+"produccion%s.\n"
+

 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"


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

+#~ msgid "%s: memory exhausted\n"
+#~ msgstr "%s: memoria agotada\n"
+

 #~ msgid "unmatched close-brace (`}')"
 #~ msgstr "llave de cierre (`}') desemparejada"
 
 #~ msgid "unmatched close-brace (`}')"
 #~ msgstr "llave de cierre (`}') desemparejada"
 

diff --git a/po/et.po b/po/et.po
index 502a737fa1f21131a0c4b480ac788dbaf89a02fe..e2996c2f0f5f22081315a657aac52727c9b5350d 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-09-21 10:30+0200\n"
+"POT-Creation-Date: 2000-10-02 12:34+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"


@@ -13,87 +13,82 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:212
+#: src/LR0.c:207

 #, c-format
 msgid "too many states (max %d)"
 msgstr "liiga palju olekuid (maks %d)"
 
 #, c-format
 msgid "too many states (max %d)"
 msgstr "liiga palju olekuid (maks %d)"
 

-#: src/allocate.c:58 src/allocate.c:74
-#, c-format
-msgid "%s: memory exhausted\n"
-msgstr "%s: mälu on otsas\n"
-
-#: src/conflicts.c:64
+#: src/conflicts.c:50

 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
 
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
 

-#: src/conflicts.c:130 src/conflicts.c:153
+#: src/conflicts.c:116 src/conflicts.c:139

 msgid "reduce"
 msgstr "redutseerimine"
 
 msgid "reduce"
 msgstr "redutseerimine"
 

-#: src/conflicts.c:136 src/conflicts.c:149
+#: src/conflicts.c:122 src/conflicts.c:135

 msgid "shift"
 msgstr "nihutamine"
 
 msgid "shift"
 msgstr "nihutamine"
 

-#: src/conflicts.c:157
+#: src/conflicts.c:143

 msgid "an error"
 msgstr "viga"
 
 msgid "an error"
 msgstr "viga"
 

-#. If invoked under the name `yacc', use the output format
-#. specified by POSIX.
-#: src/conflicts.c:446
-msgid "conflicts: "
-msgstr "konfliktid: "
-
-#: src/conflicts.c:448
-#, c-format
-msgid " %d shift/reduce"
-msgstr " %d nihutamine/redutseerimine"
-
-#: src/conflicts.c:452
-#, c-format
-msgid " %d reduce/reduce"
-msgstr " %d redutseerimine/redutseerimine"
-
-#: src/conflicts.c:457
-#, c-format
-msgid "%s contains"
-msgstr "%s sisaldab"
-
-#: src/conflicts.c:460 src/conflicts.c:525
+#: src/conflicts.c:419

 msgid " 1 shift/reduce conflict"
 msgstr " 1 nihutamine/redutseerimine konflikt"
 
 msgid " 1 shift/reduce conflict"
 msgstr " 1 nihutamine/redutseerimine konflikt"
 

-#: src/conflicts.c:462 src/conflicts.c:527
+#: src/conflicts.c:421

 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d nihutamine/redutseerimine konflikti"
 
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d nihutamine/redutseerimine konflikti"
 

-#: src/conflicts.c:465 src/conflicts.c:530
+#: src/conflicts.c:424

 msgid " and"
 msgstr " ja"
 
 msgid " and"
 msgstr " ja"
 

-#: src/conflicts.c:468 src/conflicts.c:533
+#: src/conflicts.c:427

 msgid " 1 reduce/reduce conflict"
 msgstr " 1 redutseerimine/redutseerimine konflikt"
 
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 redutseerimine/redutseerimine konflikt"
 

-#: src/conflicts.c:470 src/conflicts.c:535
+#: src/conflicts.c:429

 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d redutseerimine/redutseerimine konflikti"
 
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d redutseerimine/redutseerimine konflikti"
 

-#: src/conflicts.c:522
+#: src/conflicts.c:461

 #, c-format
 msgid "State %d contains"
 msgstr "Olek %d sisaldab"
 
 #, c-format
 msgid "State %d contains"
 msgstr "Olek %d sisaldab"
 

-#: src/conflicts.c:629 src/conflicts.c:749
+#. If invoked with `--yacc', use the output format specified by
+#. POSIX.
+#: src/conflicts.c:472
+msgid "conflicts: "
+msgstr "konfliktid: "
+
+#: src/conflicts.c:474
+#, c-format
+msgid " %d shift/reduce"
+msgstr " %d nihutamine/redutseerimine"
+
+#: src/conflicts.c:478
+#, c-format
+msgid " %d reduce/reduce"
+msgstr " %d redutseerimine/redutseerimine"
+
+#: src/conflicts.c:483
+#, c-format
+msgid "%s contains"
+msgstr "%s sisaldab"
+
+#: src/conflicts.c:568 src/conflicts.c:688

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 

-#: src/conflicts.c:640 src/print.c:222
+#: src/conflicts.c:579 src/print.c:170

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -102,23 +97,19 @@ msgstr ""
 "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"
 
 "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:729 src/conflicts.c:743
+#: src/conflicts.c:668 src/conflicts.c:682

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 

-#: src/conflicts.c:770
+#: src/conflicts.c:709

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 

-#: src/derives.c:42
-msgid ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
+#: src/derives.c:44
+#, fuzzy
+msgid "DERIVES"

 msgstr ""
 "\n"
 "\n"
 msgstr ""
 "\n"
 "\n"


@@ -126,7 +117,7 @@ msgstr ""
 "DERIVES\n"
 "\n"
 
 "DERIVES\n"
 "\n"
 

-#: src/derives.c:46
+#: src/derives.c:49

 #, c-format
 msgid "%s derives"
 msgstr "%s derives"
 #, c-format
 msgid "%s derives"
 msgstr "%s derives"


@@ -163,9 +154,11 @@ msgstr ""
 "  -y, --yacc      emuleeri POSIX yacc\n"
 
 #: src/getargs.c:95
 "  -y, --yacc      emuleeri POSIX yacc\n"
 
 #: src/getargs.c:95

+#, fuzzy

 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"

+"      --locations            enable locations computation\n"

 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"
 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"


@@ -180,7 +173,7 @@ msgstr ""
 "  -r, --raw                  sümbolite number alates 3\n"
 "  -k, --token-table          lisa ka sümbolite nimede tabel\n"
 
 "  -r, --raw                  sümbolite number alates 3\n"
 "  -k, --token-table          lisa ka sümbolite nimede tabel\n"
 

-#: src/getargs.c:106
+#: src/getargs.c:107

 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"


@@ -194,463 +187,437 @@ msgstr ""
 "  -b, --file-prefix=PREFIKS  kasuta väljundfailide nimedes PREFIKSit\n"
 "  -o, --output-file=FAIL     jäta väljund FAILi\n"
 
 "  -b, --file-prefix=PREFIKS  kasuta väljundfailide nimedes PREFIKSit\n"
 "  -o, --output-file=FAIL     jäta väljund FAILi\n"
 

-#: src/getargs.c:114
+#: src/getargs.c:115

 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "Teatage palun vigadest aadressil <bug-bison@gnu.org>.\n"
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "Teatage palun vigadest aadressil <bug-bison@gnu.org>.\n"
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.

-#: src/getargs.c:128
+#: src/getargs.c:129

 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 

-#: src/getargs.c:133
+#: src/getargs.c:134

 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 
 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 

-#: src/getargs.c:137
+#: src/getargs.c:138

 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:231
+#: src/getargs.c:217
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ""
+
+#: src/getargs.c:225

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: puudub grammatikafail\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: puudub grammatikafail\n"
 

-#: src/getargs.c:235
+#: src/getargs.c:229

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
 
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
 

-#: src/lalr.c:292
+#: src/lalr.c:312

 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 

-#: src/lex.c:105
+#: src/lex.c:84

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

-#: src/lex.c:134 src/reader.c:285
+#: src/lex.c:113 src/reader.c:216

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

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

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

-#: src/lex.c:183
+#: src/lex.c:164

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

-#: src/lex.c:215
+#: src/lex.c:206

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

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

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

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
 

-#: src/lex.c:463
+#: src/lex.c:489

 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:466
+#: src/lex.c:492

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

-#: src/main.c:139
+#: src/main.c:123

 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: sisemine viga: %s\n"
 
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: sisemine viga: %s\n"
 

-#: src/nullable.c:55
+#: src/nullable.c:52

 msgid "Entering set_nullable"
 msgstr "Entering set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "Entering set_nullable"
 

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

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

-#: src/print.c:84
+#: src/print.c:38

 #, c-format
 msgid " type %d is %s\n"
 msgstr " tüüp %d on %s\n"
 
 #, c-format
 msgid " type %d is %s\n"
 msgstr " tüüp %d on %s\n"
 

-#: src/print.c:92
-#, c-format
-msgid ""
-"\n"
-"\n"
-"state %d\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"olek %d\n"
-"\n"
-
-#: src/print.c:137
+#: src/print.c:86

 #, c-format
 msgid "   (rule %d)"
 msgstr "   (reegel %d)"
 
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (reegel %d)"
 

-#: src/print.c:164
+#: src/print.c:112

 msgid "    $default\taccept\n"
 msgstr "    $default\taktsepteerin\n"
 
 msgid "    $default\taccept\n"
 msgstr "    $default\taktsepteerin\n"
 

-#: src/print.c:166
+#: src/print.c:114

 msgid "    NO ACTIONS\n"
 msgstr "    TEGEVUSI POLE\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
 msgid "    NO ACTIONS\n"
 msgstr "    TEGEVUSI POLE\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0

-#: src/print.c:184
+#: src/print.c:132

 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tliigu olekule %d\n"
 
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tliigu olekule %d\n"
 

-#: src/print.c:186
+#: src/print.c:134

 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
 
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
 

-#: src/print.c:210
+#: src/print.c:158

 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
 
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
 

-#: src/print.c:238
+#: src/print.c:186

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tliigu olekule %d\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tliigu olekule %d\n"
 

-#. rule # : LHS -> RHS
-#: src/print.c:264
-msgid ""
+#: src/print.c:198
+#, fuzzy, c-format
+msgid "state %d"
+msgstr ""
+"\n"

 "\n"
 "\n"

-"Grammar\n"
+"olek %d\n"
+"\n"
+
+#: src/print.c:228
+#, fuzzy
+msgid "Grammar"

 msgstr ""
 "\n"
 "Grammatika\n"
 
 msgstr ""
 "\n"
 "Grammatika\n"
 

-#: src/print.c:269
+#: src/print.c:234

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "reegel %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "reegel %-4d %s ->"
 

-#: src/print.c:275
+#: src/print.c:240

 msgid "\t\t/* empty */"
 msgstr "\t\t/* tühi */"
 
 msgid "\t\t/* empty */"
 msgstr "\t\t/* tühi */"
 

-#. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:280
-msgid ""
-"\n"
-"Terminals, with rules where they appear\n"
-"\n"
+#: src/print.c:246
+#, fuzzy
+msgid "Terminals, with rules where they appear"

 msgstr ""
 "\n"
 "Terminalid, koos reeglitega, kus nad ilmuvad\n"
 "\n"
 
 msgstr ""
 "\n"
 "Terminalid, koos reeglitega, kus nad ilmuvad\n"
 "\n"
 

-#: src/print.c:328
-msgid ""
-"\n"
-"Nonterminals, with rules where they appear\n"
-"\n"
+#: src/print.c:296
+#, fuzzy
+msgid "Nonterminals, with rules where they appear"

 msgstr ""
 "\n"
 "Mitteterminalid, koos reeglitega, kus nad ilmuvad\n"
 "\n"
 
 msgstr ""
 "\n"
 "Mitteterminalid, koos reeglitega, kus nad ilmuvad\n"
 "\n"
 

-#: src/print.c:354
+#: src/print.c:323

 msgid " on left:"
 msgstr " vasakul:"
 
 msgid " on left:"
 msgstr " vasakul:"
 

-#: src/print.c:369
+#: src/print.c:338

 msgid " on right:"
 msgstr " paremal:"
 
 msgid " on right:"
 msgstr " paremal:"
 

-#: src/reader.c:153
+#: src/reader.c:81

 msgid "   Skipping to next \\n"
 msgstr "   Liigun järgmisele \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   Liigun järgmisele \\n"
 

-#: src/reader.c:155
+#: src/reader.c:83

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Liigun järgmisele %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Liigun järgmisele %c"
 

-#: src/reader.c:209 src/reader.c:224
+#: src/reader.c:137 src/reader.c:152

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

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

-#: src/reader.c:480
-#, c-format
-msgid "unrecognized: %s"
-msgstr "tundmatu: %s"
-
-#: src/reader.c:485
-msgid "no input grammar"
-msgstr "sisendgrammatikat pole"
-
-#: src/reader.c:488
+#: src/reader.c:269

 #, c-format
 #, c-format

-msgid "unknown character: %s"
-msgstr "tundmatu sümbol: %s"
+msgid "@%s is invalid"
+msgstr "@%s on vigane"

 
 

-#: src/reader.c:540
+#: src/reader.c:318

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

-#: src/reader.c:581 src/reader.c:769 src/reader.c:818
+#: src/reader.c:359 src/reader.c:504 src/reader.c:554

 #, 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:618 src/reader.c:840
+#: src/reader.c:393 src/reader.c:573

 #, 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:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709
+#: src/reader.c:403 src/reader.c:519 src/reader.c:580 src/reader.c:1259

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

 #, 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:686
-#, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "tundmatu element %s, eeldasin identifikaatorit"
-
-#: src/reader.c:708
-#, c-format
-msgid "expected string constant instead of %s"
-msgstr "eeldasin %s asemel sõnekonstanti"
-
-#: src/reader.c:730 src/reader.c:891
+#: src/reader.c:430 src/reader.c:627

 #, 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:732 src/reader.c:1685
+#: src/reader.c:432 src/reader.c:1237

 #, 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:752
+#: src/reader.c:455 src/reader.c:467
+msgid "invalid $ value"
+msgstr "vigane $ väärtus"
+
+#: src/reader.c:489

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

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

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

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

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

-#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312
+#: src/reader.c:668 src/reader.c:1014 src/reader.c:1086

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

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

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

-#: src/reader.c:1009
+#: src/reader.c:762

 #, c-format
 #, c-format

-msgid "@%s is invalid"
-msgstr "@%s on vigane"
+msgid "unrecognized item %s, expected an identifier"
+msgstr "tundmatu element %s, eeldasin identifikaatorit"

 
 

-#: src/reader.c:1024 src/reader.c:1036
-msgid "invalid $ value"
-msgstr "vigane $ väärtus"
+#: src/reader.c:786
+#, c-format
+msgid "expected string constant instead of %s"
+msgstr "eeldasin %s asemel sõnekonstanti"
+
+#: src/reader.c:885
+#, c-format
+msgid "unrecognized: %s"
+msgstr "tundmatu: %s"

 
 

-#: src/reader.c:1142 src/reader.c:1282
+#: src/reader.c:890
+msgid "no input grammar"
+msgstr "sisendgrammatikat pole"
+
+#: src/reader.c:893
+#, c-format
+msgid "unknown character: %s"
+msgstr "tundmatu sümbol: %s"
+
+#: src/reader.c:984 src/reader.c:1133

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

-#: src/reader.c:1158 src/reader.c:1298
+#: src/reader.c:1000 src/reader.c:1149

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

-#: src/reader.c:1163 src/reader.c:1303
+#: src/reader.c:1005 src/reader.c:1154

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

-#: src/reader.c:1172
+#: src/reader.c:1162

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

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

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

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

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

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

-#: src/reader.c:1552
+#: src/reader.c:1479

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

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

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

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

-#: src/reader.c:1625
+#: src/reader.c:1551

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

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

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

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

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

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

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

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

-#: src/reduce.c:142
-#, c-format
-msgid "Start symbol %s does not derive any sentence"
-msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
-
-#: src/reduce.c:156
-#, c-format
-msgid ""
-"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr ""
-"redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d "
-"reeglit%s.\n"
-
-#: src/reduce.c:494
-msgid ""
-"Useless nonterminals:\n"
-"\n"
+#: src/reduce.c:404
+#, fuzzy
+msgid "Useless nonterminals:"

 msgstr ""
 "Kasutamata mitteterminalid:\n"
 "\n"
 
 msgstr ""
 "Kasutamata mitteterminalid:\n"
 "\n"
 

-#: src/reduce.c:506
-msgid ""
-"\n"
-"\n"
-"Terminals which are not used:\n"
-"\n"
+#: src/reduce.c:418
+#, fuzzy
+msgid "Terminals which are not used:"

 msgstr ""
 "\n"
 "\n"
 "Terminalid, mida ei kasutatud:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "Terminalid, mida ei kasutatud:\n"
 "\n"
 

-#: src/reduce.c:515
-msgid ""
-"\n"
-"\n"
-"Useless rules:\n"
-"\n"
+#: src/reduce.c:429
+#, fuzzy
+msgid "Useless rules:"

 msgstr ""
 "\n"
 "\n"
 "Kasutamata reeglid:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "Kasutamata reeglid:\n"
 "\n"
 

-#: src/reduce.c:544
+#: src/reduce.c:459

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


@@ -660,11 +627,11 @@ msgstr ""
 "--------\n"
 "\n"
 
 "--------\n"
 "\n"
 

-#: src/reduce.c:545
+#: src/reduce.c:460

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

-#: src/reduce.c:550
+#: src/reduce.c:464

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


@@ -674,7 +641,7 @@ msgstr ""
 "-------\n"
 "\n"
 
 "-------\n"
 "\n"
 

-#: src/reduce.c:560
+#: src/reduce.c:474

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


@@ -684,30 +651,43 @@ msgstr ""
 "------------------------\n"
 "\n"
 
 "------------------------\n"
 "\n"
 

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

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reeglit ei redutseeritud\n"
 
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reeglit ei redutseeritud\n"
 

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

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

-#: src/reduce.c:583
+#: src/reduce.c:498

 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d kasutamata mitteterminali%s"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d kasutamata mitteterminali%s"
 

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

 msgid " and "
 msgstr " ja "
 
 msgid " and "
 msgstr " ja "
 

-#: src/reduce.c:592
+#: src/reduce.c:507

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d kasutamata reeglit%s"
 
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d kasutamata reeglit%s"
 

+#: src/reduce.c:540
+#, c-format
+msgid "Start symbol %s does not derive any sentence"
+msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
+
+#: src/reduce.c:553
+#, c-format
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d "
+"reeglit%s.\n"
+

 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"


@@ -767,6 +747,9 @@ msgstr "%s: v
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: võti `-W %s' ei luba argumenti\n"
 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: võti `-W %s' ei luba argumenti\n"
 

+#~ msgid "%s: memory exhausted\n"
+#~ msgstr "%s: mälu on otsas\n"
+

 #~ msgid "multiple %union declarations"
 #~ msgstr "korduvad %union deklaratsioonid"
 
 #~ msgid "multiple %union declarations"
 #~ msgstr "korduvad %union deklaratsioonid"
 

diff --git a/po/fr.po b/po/fr.po
index 88424e272e09c19e61fb53a7958841a6033e59dc..165a119399e43c87032719d6c13a87759d4b71e1 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-09-21 10:30+0200\n"
+"POT-Creation-Date: 2000-10-02 12:34+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"


@@ -13,88 +13,83 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:212
+#: src/LR0.c:207

 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 

-#: src/allocate.c:58 src/allocate.c:74
-#, c-format
-msgid "%s: memory exhausted\n"
-msgstr "%s: mémoire épuisée\n"
-
-#: src/conflicts.c:64
+#: src/conflicts.c:50

 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 

-#: src/conflicts.c:130 src/conflicts.c:153
+#: src/conflicts.c:116 src/conflicts.c:139

 msgid "reduce"
 msgstr "réduction"
 
 msgid "reduce"
 msgstr "réduction"
 

-#: src/conflicts.c:136 src/conflicts.c:149
+#: src/conflicts.c:122 src/conflicts.c:135

 msgid "shift"
 msgstr "décalage"
 
 msgid "shift"
 msgstr "décalage"
 

-#: src/conflicts.c:157
+#: src/conflicts.c:143

 msgid "an error"
 msgstr "une erreur"
 
 msgid "an error"
 msgstr "une erreur"
 

-#. If invoked under the name `yacc', use the output format
-#. specified by POSIX.
-#: src/conflicts.c:446
-msgid "conflicts: "
-msgstr "conflits: "
-
-#: src/conflicts.c:448
-#, c-format
-msgid " %d shift/reduce"
-msgstr " %d décalage/réduction"
-
-#: src/conflicts.c:452
-#, c-format
-msgid " %d reduce/reduce"
-msgstr " %d réduction/réduction"
-
-#: src/conflicts.c:457
-#, c-format
-msgid "%s contains"
-msgstr "%s contient"
-
-#: src/conflicts.c:460 src/conflicts.c:525
+#: src/conflicts.c:419

 msgid " 1 shift/reduce conflict"
 msgstr " 1 conflit décalage/réduction"
 
 msgid " 1 shift/reduce conflict"
 msgstr " 1 conflit décalage/réduction"
 

-#: src/conflicts.c:462 src/conflicts.c:527
+#: src/conflicts.c:421

 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d conflits décalage/réduction"
 
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d conflits décalage/réduction"
 

-#: src/conflicts.c:465 src/conflicts.c:530
+#: src/conflicts.c:424

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

-#: src/conflicts.c:468 src/conflicts.c:533
+#: src/conflicts.c:427

 msgid " 1 reduce/reduce conflict"
 msgstr "1 conflit réduction/réduction"
 
 msgid " 1 reduce/reduce conflict"
 msgstr "1 conflit réduction/réduction"
 

-#: src/conflicts.c:470 src/conflicts.c:535
+#: src/conflicts.c:429

 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d conflits réduction/réduction"
 
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d conflits réduction/réduction"
 

-#: src/conflicts.c:522
+#: src/conflicts.c:461

 #, c-format
 msgid "State %d contains"
 msgstr "L'état %d contient"
 
 #, c-format
 msgid "State %d contains"
 msgstr "L'état %d contient"
 

-#: src/conflicts.c:629 src/conflicts.c:749
+#. If invoked with `--yacc', use the output format specified by
+#. POSIX.
+#: src/conflicts.c:472
+msgid "conflicts: "
+msgstr "conflits: "
+
+#: src/conflicts.c:474
+#, c-format
+msgid " %d shift/reduce"
+msgstr " %d décalage/réduction"
+
+#: src/conflicts.c:478
+#, c-format
+msgid " %d reduce/reduce"
+msgstr " %d réduction/réduction"
+
+#: src/conflicts.c:483
+#, c-format
+msgid "%s contains"
+msgstr "%s contient"
+
+#: src/conflicts.c:568 src/conflicts.c:688

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[réduction par la règle %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[réduction par la règle %d (%s)\n"
 

-#: src/conflicts.c:640 src/print.c:222
+#: src/conflicts.c:579 src/print.c:170

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -103,23 +98,19 @@ msgstr ""
 "    $défaut\tréduction par la règle %d (%s)\n"
 "\n"
 
 "    $défaut\tréduction par la règle %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:729 src/conflicts.c:743
+#: src/conflicts.c:668 src/conflicts.c:682

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tréduction par la règle %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tréduction par la règle %d (%s)\n"
 

-#: src/conflicts.c:770
+#: src/conflicts.c:709

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $défaut\tréduction par la règle %d (%s)\n"
 
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $défaut\tréduction par la règle %d (%s)\n"
 

-#: src/derives.c:42
-msgid ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
+#: src/derives.c:44
+#, fuzzy
+msgid "DERIVES"

 msgstr ""
 "\n"
 "\n"
 msgstr ""
 "\n"
 "\n"


@@ -127,7 +118,7 @@ msgstr ""
 "DERIVES\n"
 "\n"
 
 "DERIVES\n"
 "\n"
 

-#: src/derives.c:46
+#: src/derives.c:49

 #, c-format
 msgid "%s derives"
 msgstr "%s dérive"
 #, c-format
 msgid "%s derives"
 msgstr "%s dérive"


@@ -161,6 +152,7 @@ msgstr ""
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"

+"      --locations            enable locations computation\n"

 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"
 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"


@@ -168,7 +160,7 @@ msgid ""
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 

-#: src/getargs.c:106
+#: src/getargs.c:107

 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"


@@ -177,466 +169,440 @@ msgid ""
 "  -o, --output-file=FILE     leave output to FILE\n"
 msgstr ""
 
 "  -o, --output-file=FILE     leave output to FILE\n"
 msgstr ""
 

-#: src/getargs.c:114
+#: src/getargs.c:115

 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.

-#: src/getargs.c:128
+#: src/getargs.c:129

 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 

-#: src/getargs.c:133
+#: src/getargs.c:134

 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 
 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 

-#: src/getargs.c:137
+#: src/getargs.c:138

 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:231
+#: src/getargs.c:217
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ""
+
+#: src/getargs.c:225

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: grammaire manquante\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: grammaire manquante\n"
 

-#: src/getargs.c:235
+#: src/getargs.c:229

 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: paramètres supplémentaires ignorés après «%s»\n"
 
 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: paramètres supplémentaires ignorés après «%s»\n"
 

-#: src/lalr.c:292
+#: src/lalr.c:312

 #, c-format
 msgid "too many gotos (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr ""
 

-#: src/lex.c:105
+#: src/lex.c:84

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

-#: src/lex.c:134 src/reader.c:285
+#: src/lex.c:113 src/reader.c:216

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

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

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

 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:215
+#: src/lex.c:206

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

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

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

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
 

-#: src/lex.c:463
+#: src/lex.c:489

 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:466
+#: src/lex.c:492

 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 
 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 

-#: src/main.c:139
+#: src/main.c:123

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

-#: src/nullable.c:55
+#: src/nullable.c:52

 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 

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

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

-#: src/print.c:84
+#: src/print.c:38

 #, c-format
 msgid " type %d is %s\n"
 msgstr " le type %d est %s\n"
 
 #, c-format
 msgid " type %d is %s\n"
 msgstr " le type %d est %s\n"
 

-#: src/print.c:92
-#, c-format
-msgid ""
-"\n"
-"\n"
-"state %d\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"état %d\n"
-"\n"
-
-#: src/print.c:137
+#: src/print.c:86

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

-#: src/print.c:164
+#: src/print.c:112

 msgid "    $default\taccept\n"
 msgstr "    $défaut\taccepter\n"
 
 msgid "    $default\taccept\n"
 msgstr "    $défaut\taccepter\n"
 

-#: src/print.c:166
+#: src/print.c:114

 msgid "    NO ACTIONS\n"
 msgstr "    PAS D'ACTION\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
 msgid "    NO ACTIONS\n"
 msgstr "    PAS D'ACTION\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0

-#: src/print.c:184
+#: src/print.c:132

 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \taller à l'état %d\n"
 
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \taller à l'état %d\n"
 

-#: src/print.c:186
+#: src/print.c:134

 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tdécalage et aller à l'état %d\n"
 
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tdécalage et aller à l'état %d\n"
 

-#: src/print.c:210
+#: src/print.c:158

 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terreur (non-associatif)\n"
 
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terreur (non-associatif)\n"
 

-#: src/print.c:238
+#: src/print.c:186

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\taller à l'état %d\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\taller à l'état %d\n"
 

-#. rule # : LHS -> RHS
-#: src/print.c:264
-msgid ""
+#: src/print.c:198
+#, fuzzy, c-format
+msgid "state %d"
+msgstr ""
+"\n"

 "\n"
 "\n"

-"Grammar\n"
+"état %d\n"
+"\n"
+
+#: src/print.c:228
+#, fuzzy
+msgid "Grammar"

 msgstr ""
 "\n"
 "Grammaire\n"
 
 msgstr ""
 "\n"
 "Grammaire\n"
 

-#: src/print.c:269
+#: src/print.c:234

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "règle %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "règle %-4d %s ->"
 

-#: src/print.c:275
+#: src/print.c:240

 msgid "\t\t/* empty */"
 msgstr "\t\t/* epsilon */"
 
 msgid "\t\t/* empty */"
 msgstr "\t\t/* epsilon */"
 

-#. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:280
-msgid ""
-"\n"
-"Terminals, with rules where they appear\n"
-"\n"
+#: src/print.c:246
+#, fuzzy
+msgid "Terminals, with rules where they appear"

 msgstr ""
 "\n"
 "Terminaux, suivis des règles où ils apparaissent\n"
 "\n"
 
 msgstr ""
 "\n"
 "Terminaux, suivis des règles où ils apparaissent\n"
 "\n"
 

-#: src/print.c:328
-msgid ""
-"\n"
-"Nonterminals, with rules where they appear\n"
-"\n"
+#: src/print.c:296
+#, fuzzy
+msgid "Nonterminals, with rules where they appear"

 msgstr ""
 "\n"
 "Catégories, suivis des règles où elles apparaissent\n"
 "\n"
 
 msgstr ""
 "\n"
 "Catégories, suivis des règles où elles apparaissent\n"
 "\n"
 

-#: src/print.c:354
+#: src/print.c:323

 msgid " on left:"
 msgstr " à gauche:"
 
 msgid " on left:"
 msgstr " à gauche:"
 

-#: src/print.c:369
+#: src/print.c:338

 msgid " on right:"
 msgstr " à droite:"
 
 msgid " on right:"
 msgstr " à droite:"
 

-#: src/reader.c:153
+#: src/reader.c:81

 msgid "   Skipping to next \\n"
 msgstr "   Saut jusqu'au prochain \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   Saut jusqu'au prochain \\n"
 

-#: src/reader.c:155
+#: src/reader.c:83

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saut jusqu'au prochain %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saut jusqu'au prochain %c"
 

-#: src/reader.c:209 src/reader.c:224
+#: src/reader.c:137 src/reader.c:152

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

 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:480
-#, c-format
-msgid "unrecognized: %s"
-msgstr "non reconnu: %s"
-
-#: src/reader.c:485
-msgid "no input grammar"
-msgstr "aucune grammaire en entrée"
-
-#: src/reader.c:488
+#: src/reader.c:269

 #, c-format
 #, c-format

-msgid "unknown character: %s"
-msgstr "caractère inconnu: %s"
+msgid "@%s is invalid"
+msgstr "@%s n'est pas valide"

 
 

-#: src/reader.c:540
+#: src/reader.c:318

 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:581 src/reader.c:769 src/reader.c:818
+#: src/reader.c:359 src/reader.c:504 src/reader.c:554

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

-#: src/reader.c:618 src/reader.c:840
+#: src/reader.c:393 src/reader.c:573

 #, 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:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709
+#: src/reader.c:403 src/reader.c:519 src/reader.c:580 src/reader.c:1259

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

 #, 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:686
-#, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "item %s non reconnu, un identificateur est attendu"
-
-#: src/reader.c:708
-#, c-format
-msgid "expected string constant instead of %s"
-msgstr "chaîne de caractères constante attendue plutôt que %s"
-
-#: src/reader.c:730 src/reader.c:891
+#: src/reader.c:430 src/reader.c:627

 #, 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:732 src/reader.c:1685
+#: src/reader.c:432 src/reader.c:1237

 #, 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:752
+#: src/reader.c:455 src/reader.c:467
+msgid "invalid $ value"
+msgstr "la valeur de symbole $ n'est pas valide"
+
+#: src/reader.c:489

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

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

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

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

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

-#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312
+#: src/reader.c:668 src/reader.c:1014 src/reader.c:1086

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

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

-#: src/reader.c:1009
+#: src/reader.c:762

 #, c-format
 #, c-format

-msgid "@%s is invalid"
-msgstr "@%s n'est pas valide"
+msgid "unrecognized item %s, expected an identifier"
+msgstr "item %s non reconnu, un identificateur est attendu"

 
 

-#: src/reader.c:1024 src/reader.c:1036
-msgid "invalid $ value"
-msgstr "la valeur de symbole $ n'est pas valide"
+#: src/reader.c:786
+#, c-format
+msgid "expected string constant instead of %s"
+msgstr "chaîne de caractères constante attendue plutôt que %s"

 
 

-#: src/reader.c:1142 src/reader.c:1282
+#: src/reader.c:885
+#, c-format
+msgid "unrecognized: %s"
+msgstr "non reconnu: %s"
+
+#: src/reader.c:890
+msgid "no input grammar"
+msgstr "aucune grammaire en entrée"
+
+#: src/reader.c:893
+#, c-format
+msgid "unknown character: %s"
+msgstr "caractère inconnu: %s"
+
+#: src/reader.c:984 src/reader.c:1133

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

-#: src/reader.c:1158 src/reader.c:1298
+#: src/reader.c:1000 src/reader.c:1149

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

-#: src/reader.c:1163 src/reader.c:1303
+#: src/reader.c:1005 src/reader.c:1154

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

-#: src/reader.c:1172
+#: src/reader.c:1162

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

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

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

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

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

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

-#: src/reader.c:1552
+#: src/reader.c:1479

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

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

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

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

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

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

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

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

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

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

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

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

-#: src/reduce.c:142
-#, c-format
-msgid "Start symbol %s does not derive any sentence"
-msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"
-
-#: src/reduce.c:156
-#, c-format
-msgid ""
-"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr ""
-"la réduction de %s définit %d terminal%s, %d catégorie%s et %d "
-"production%s.\n"
-
-#: src/reduce.c:494
-msgid ""
-"Useless nonterminals:\n"
-"\n"
+#: src/reduce.c:404
+#, fuzzy
+msgid "Useless nonterminals:"

 msgstr ""
 "Catégories non productives:\n"
 "\n"
 
 msgstr ""
 "Catégories non productives:\n"
 "\n"
 

-#: src/reduce.c:506
-msgid ""
-"\n"
-"\n"
-"Terminals which are not used:\n"
-"\n"
+#: src/reduce.c:418
+#, fuzzy
+msgid "Terminals which are not used:"

 msgstr ""
 "\n"
 "\n"
 "Terminaux non utilisés:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "Terminaux non utilisés:\n"
 "\n"
 

-#: src/reduce.c:515
-msgid ""
-"\n"
-"\n"
-"Useless rules:\n"
-"\n"
+#: src/reduce.c:429
+#, fuzzy
+msgid "Useless rules:"

 msgstr ""
 "\n"
 "\n"
 "Règles non productives:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "Règles non productives:\n"
 "\n"
 

-#: src/reduce.c:544
+#: src/reduce.c:459

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


@@ -646,11 +612,11 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:545
+#: src/reduce.c:460

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

-#: src/reduce.c:550
+#: src/reduce.c:464

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


@@ -660,7 +626,7 @@ msgstr ""
 "------\n"
 "\n"
 
 "------\n"
 "\n"
 

-#: src/reduce.c:560
+#: src/reduce.c:474

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


@@ -670,30 +636,43 @@ msgstr ""
 "-------------------\n"
 "\n"
 
 "-------------------\n"
 "\n"
 

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

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

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

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

-#: src/reduce.c:583
+#: src/reduce.c:498

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

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

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

-#: src/reduce.c:592
+#: src/reduce.c:507

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

+#: src/reduce.c:540
+#, c-format
+msgid "Start symbol %s does not derive any sentence"
+msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"
+
+#: src/reduce.c:553
+#, c-format
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"la réduction de %s définit %d terminal%s, %d catégorie%s et %d "
+"production%s.\n"
+

 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"


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

+#~ msgid "%s: memory exhausted\n"
+#~ msgstr "%s: mémoire épuisée\n"
+

 #~ msgid "unmatched close-brace (`}')"
 #~ msgstr "accolade fermante `}' non appariée"
 
 #~ msgid "unmatched close-brace (`}')"
 #~ msgstr "accolade fermante `}' non appariée"
 

diff --git a/po/ja.po b/po/ja.po
index b9fd88db0fb36b39ac38a2433b816c637725cbb5..e51e470418761f73e7f6f33703de6282813f91ea 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-09-21 10:30+0200\n"
+"POT-Creation-Date: 2000-10-02 12:34+0200\n"

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


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

-#: src/LR0.c:212
+#: src/LR0.c:207

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

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

 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n"
 
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n"
 

-#: src/conflicts.c:130 src/conflicts.c:153
+#: src/conflicts.c:116 src/conflicts.c:139

 msgid "reduce"
 msgstr "´Ô¸µ"
 
 msgid "reduce"
 msgstr "´Ô¸µ"
 

-#: src/conflicts.c:136 src/conflicts.c:149
+#: src/conflicts.c:122 src/conflicts.c:135

 msgid "shift"
 msgstr "¥·¥Õ¥È"
 
 msgid "shift"
 msgstr "¥·¥Õ¥È"
 

-#: src/conflicts.c:157
+#: src/conflicts.c:143

 msgid "an error"
 msgstr "¥¨¥é¡¼"
 
 msgid "an error"
 msgstr "¥¨¥é¡¼"
 

-#. If invoked under the name `yacc', use the output format
-#. specified by POSIX.
-#: src/conflicts.c:446
-msgid "conflicts: "
-msgstr "¾×ÆÍ: "
-
-#: src/conflicts.c:448
-#, c-format
-msgid " %d shift/reduce"
-msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
-
-#: src/conflicts.c:452
-#, c-format
-msgid " %d reduce/reduce"
-msgstr " %d ´Ô¸µ/´Ô¸µ"
-
-#: src/conflicts.c:457
-#, c-format
-msgid "%s contains"
-msgstr "%s ¤Ë¤Ï¡¢"
-
-#: src/conflicts.c:460 src/conflicts.c:525
+#: src/conflicts.c:419

 msgid " 1 shift/reduce conflict"
 msgstr " 1 ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
 
 msgid " 1 shift/reduce conflict"
 msgstr " 1 ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
 

-#: src/conflicts.c:462 src/conflicts.c:527
+#: src/conflicts.c:421

 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
 
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
 

-#: src/conflicts.c:465 src/conflicts.c:530
+#: src/conflicts.c:424

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

-#: src/conflicts.c:468 src/conflicts.c:533
+#: src/conflicts.c:427

 msgid " 1 reduce/reduce conflict"
 msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ"
 
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ"
 

-#: src/conflicts.c:470 src/conflicts.c:535
+#: src/conflicts.c:429

 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d ´Ô¸µ/´Ô¸µ¾×ÆÍ"
 
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d ´Ô¸µ/´Ô¸µ¾×ÆÍ"
 

-#: src/conflicts.c:522
+#: src/conflicts.c:461

 #, c-format
 msgid "State %d contains"
 msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï"
 
 #, c-format
 msgid "State %d contains"
 msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï"
 

-#: src/conflicts.c:629 src/conflicts.c:749
+#. If invoked with `--yacc', use the output format specified by
+#. POSIX.
+#: src/conflicts.c:472
+msgid "conflicts: "
+msgstr "¾×ÆÍ: "
+
+#: src/conflicts.c:474
+#, c-format
+msgid " %d shift/reduce"
+msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
+
+#: src/conflicts.c:478
+#, c-format
+msgid " %d reduce/reduce"
+msgstr " %d ´Ô¸µ/´Ô¸µ"
+
+#: src/conflicts.c:483
+#, c-format
+msgid "%s contains"
+msgstr "%s ¤Ë¤Ï¡¢"
+
+#: src/conflicts.c:568 src/conflicts.c:688

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n"
 

-#: src/conflicts.c:640 src/print.c:222
+#: src/conflicts.c:579 src/print.c:170

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -102,23 +97,19 @@ msgstr ""
 "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 "\n"
 
 "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 "\n"
 

-#: src/conflicts.c:729 src/conflicts.c:743
+#: src/conflicts.c:668 src/conflicts.c:682

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 

-#: src/conflicts.c:770
+#: src/conflicts.c:709

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

-#: src/derives.c:42
-msgid ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
+#: src/derives.c:44
+#, fuzzy
+msgid "DERIVES"

 msgstr ""
 "\n"
 "\n"
 msgstr ""
 "\n"
 "\n"


@@ -126,7 +117,7 @@ msgstr ""
 "DERIVES\n"
 "\n"
 
 "DERIVES\n"
 "\n"
 

-#: src/derives.c:46
+#: src/derives.c:49

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


@@ -160,6 +151,7 @@ msgstr ""
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"

+"      --locations            enable locations computation\n"

 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"
 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"


@@ -167,7 +159,7 @@ msgid ""
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 

-#: src/getargs.c:106
+#: src/getargs.c:107

 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"


@@ -176,465 +168,439 @@ msgid ""
 "  -o, --output-file=FILE     leave output to FILE\n"
 msgstr ""
 
 "  -o, --output-file=FILE     leave output to FILE\n"
 msgstr ""
 

-#: src/getargs.c:114
+#: src/getargs.c:115

 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.

-#: src/getargs.c:128
+#: src/getargs.c:129

 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 

-#: src/getargs.c:133
+#: src/getargs.c:134

 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 
 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 

-#: src/getargs.c:137
+#: src/getargs.c:138

 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:231
+#: src/getargs.c:217
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ""
+
+#: src/getargs.c:225

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

-#: src/getargs.c:235
+#: src/getargs.c:229

 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: '%s' ¤è¤ê¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n"
 
 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: '%s' ¤è¤ê¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n"
 

-#: src/lalr.c:292
+#: src/lalr.c:312

 #, fuzzy, c-format
 msgid "too many gotos (max %d)"
 msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 
 #, fuzzy, c-format
 msgid "too many gotos (max %d)"
 msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 

-#: src/lex.c:105
+#: src/lex.c:84

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

-#: src/lex.c:134 src/reader.c:285
+#: src/lex.c:113 src/reader.c:216

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

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

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

-#: src/lex.c:183
+#: src/lex.c:164

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

-#: src/lex.c:215
+#: src/lex.c:206

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

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

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

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

-#: src/lex.c:463
+#: src/lex.c:489

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

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

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

-#: src/main.c:139
+#: src/main.c:123

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

-#: src/nullable.c:55
+#: src/nullable.c:52

 msgid "Entering set_nullable"
 msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹"
 
 msgid "Entering set_nullable"
 msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹"
 

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

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

-#: src/print.c:84
+#: src/print.c:38

 #, c-format
 msgid " type %d is %s\n"
 msgstr " ¥¿¥¤¥× %d ¤Ï %s ¤Ç¤¹\n"
 
 #, c-format
 msgid " type %d is %s\n"
 msgstr " ¥¿¥¤¥× %d ¤Ï %s ¤Ç¤¹\n"
 

-#: src/print.c:92
-#, c-format
-msgid ""
-"\n"
-"\n"
-"state %d\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"¾õÂÖ %d\n"
-"\n"
-
-#: src/print.c:137
+#: src/print.c:86

 #, c-format
 msgid "   (rule %d)"
 msgstr "   (µ¬Â§ %d)"
 
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (µ¬Â§ %d)"
 

-#: src/print.c:164
+#: src/print.c:112

 msgid "    $default\taccept\n"
 msgstr "    $default\taccept\n"
 
 msgid "    $default\taccept\n"
 msgstr "    $default\taccept\n"
 

-#: src/print.c:166
+#: src/print.c:114

 msgid "    NO ACTIONS\n"
 msgstr "    Æ°ºî̵¤·\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
 msgid "    NO ACTIONS\n"
 msgstr "    Æ°ºî̵¤·\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0

-#: src/print.c:184
+#: src/print.c:132

 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \t¾õÂÖ %d ¤Ø\n"
 
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \t¾õÂÖ %d ¤Ø\n"
 

-#: src/print.c:186
+#: src/print.c:134

 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\t¥·¥Õ¥È¡¢¤ª¤è¤Ó¾õÂÖ %d ¤Ø\n"
 
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\t¥·¥Õ¥È¡¢¤ª¤è¤Ó¾õÂÖ %d ¤Ø\n"
 

-#: src/print.c:210
+#: src/print.c:158

 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n"
 
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n"
 

-#: src/print.c:238
+#: src/print.c:186

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\t¾õÂÖ %d ¤Ø\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\t¾õÂÖ %d ¤Ø\n"
 

-#. rule # : LHS -> RHS
-#: src/print.c:264
-msgid ""
+#: src/print.c:198
+#, fuzzy, c-format
+msgid "state %d"
+msgstr ""
+"\n"

 "\n"
 "\n"

-"Grammar\n"
+"¾õÂÖ %d\n"
+"\n"
+
+#: src/print.c:228
+#, fuzzy
+msgid "Grammar"

 msgstr ""
 "\n"
 "ʸˡ\n"
 
 msgstr ""
 "\n"
 "ʸˡ\n"
 

-#: src/print.c:269
+#: src/print.c:234

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "µ¬Â§ %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "µ¬Â§ %-4d %s ->"
 

-#: src/print.c:275
+#: src/print.c:240

 msgid "\t\t/* empty */"
 msgstr "\t\t/* ¶õ */"
 
 msgid "\t\t/* empty */"
 msgstr "\t\t/* ¶õ */"
 

-#. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:280
-msgid ""
-"\n"
-"Terminals, with rules where they appear\n"
-"\n"
+#: src/print.c:246
+#, fuzzy
+msgid "Terminals, with rules where they appear"

 msgstr ""
 "\n"
 "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 
 msgstr ""
 "\n"
 "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 

-#: src/print.c:328
-msgid ""
-"\n"
-"Nonterminals, with rules where they appear\n"
-"\n"
+#: src/print.c:296
+#, fuzzy
+msgid "Nonterminals, with rules where they appear"

 msgstr ""
 "\n"
 "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 
 msgstr ""
 "\n"
 "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 

-#: src/print.c:354
+#: src/print.c:323

 msgid " on left:"
 msgstr " º¸ÊÕ:"
 
 msgid " on left:"
 msgstr " º¸ÊÕ:"
 

-#: src/print.c:369
+#: src/print.c:338

 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 
 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 

-#: src/reader.c:153
+#: src/reader.c:81

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

-#: src/reader.c:155
+#: src/reader.c:83

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

-#: src/reader.c:209 src/reader.c:224
+#: src/reader.c:137 src/reader.c:152

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

-#: src/reader.c:212
+#: src/reader.c:140

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

-#: src/reader.c:480
-#, c-format
-msgid "unrecognized: %s"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
-
-#: src/reader.c:485
-msgid "no input grammar"
-msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
-
-#: src/reader.c:488
+#: src/reader.c:269

 #, c-format
 #, c-format

-msgid "unknown character: %s"
-msgstr "̤ÃΤÎʸ»ú: %s"
+msgid "@%s is invalid"
+msgstr "@%s ¤Ï̵¸ú¤Ç¤¹"

 
 

-#: src/reader.c:540
+#: src/reader.c:318

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

-#: src/reader.c:581 src/reader.c:769 src/reader.c:818
+#: src/reader.c:359 src/reader.c:504 src/reader.c:554

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

-#: src/reader.c:618 src/reader.c:840
+#: src/reader.c:393 src/reader.c:573

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

-#: src/reader.c:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709
+#: src/reader.c:403 src/reader.c:519 src/reader.c:580 src/reader.c:1259

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

-#: src/reader.c:638
+#: src/reader.c:413

 #, 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:686
-#, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
-
-#: src/reader.c:708
-#, c-format
-msgid "expected string constant instead of %s"
-msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
-
-#: src/reader.c:730 src/reader.c:891
+#: src/reader.c:430 src/reader.c:627

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

-#: src/reader.c:732 src/reader.c:1685
+#: src/reader.c:432 src/reader.c:1237

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

-#: src/reader.c:752
+#: src/reader.c:455 src/reader.c:467
+msgid "invalid $ value"
+msgstr "̵¸ú¤Ê $ ¤ÎÃÍ"
+
+#: src/reader.c:489

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

-#: src/reader.c:789
+#: src/reader.c:524

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

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

-#: src/reader.c:859
+#: src/reader.c:593

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

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

-#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312
+#: src/reader.c:668 src/reader.c:1014 src/reader.c:1086

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

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

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

-#: src/reader.c:1009
+#: src/reader.c:762

 #, c-format
 #, c-format

-msgid "@%s is invalid"
-msgstr "@%s ¤Ï̵¸ú¤Ç¤¹"
+msgid "unrecognized item %s, expected an identifier"
+msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"

 
 

-#: src/reader.c:1024 src/reader.c:1036
-msgid "invalid $ value"
-msgstr "̵¸ú¤Ê $ ¤ÎÃÍ"
+#: src/reader.c:786
+#, c-format
+msgid "expected string constant instead of %s"
+msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"

 
 

-#: src/reader.c:1142 src/reader.c:1282
+#: src/reader.c:885
+#, c-format
+msgid "unrecognized: %s"
+msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
+
+#: src/reader.c:890
+msgid "no input grammar"
+msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
+
+#: src/reader.c:893
+#, c-format
+msgid "unknown character: %s"
+msgstr "̤ÃΤÎʸ»ú: %s"
+
+#: src/reader.c:984 src/reader.c:1133

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

-#: src/reader.c:1158 src/reader.c:1298
+#: src/reader.c:1000 src/reader.c:1149

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

-#: src/reader.c:1163 src/reader.c:1303
+#: src/reader.c:1005 src/reader.c:1154

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

-#: src/reader.c:1172
+#: src/reader.c:1162

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

-#: src/reader.c:1398
+#: src/reader.c:1321

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

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

-#: src/reader.c:1436
+#: src/reader.c:1359

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

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

-#: src/reader.c:1543
+#: src/reader.c:1470

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

-#: src/reader.c:1552
+#: src/reader.c:1479

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

-#: src/reader.c:1567
+#: src/reader.c:1493

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

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

-#: src/reader.c:1617
+#: src/reader.c:1543

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

-#: src/reader.c:1625
+#: src/reader.c:1551

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

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

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

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

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

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

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

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

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

-#: src/reduce.c:142
-#, c-format
-msgid "Start symbol %s does not derive any sentence"
-msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó"
-
-#: src/reduce.c:156
-#, c-format
-msgid ""
-"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr ""
-"´Ô¸µ¥Õ¥¡¥¤¥ë %s ¤Ç %d ¸Ä¤Î½ªÃ¼»Ò%.0s, %d ¸Ä¤ÎÈó½ªÃ¼»Ò%.0s, %d "
-"¸Ä¤Îµ¬Â§%.0s¤¬ÄêµÁ¤µ¤ì¤Þ¤·¤¿\n"
-
-#: src/reduce.c:494
-msgid ""
-"Useless nonterminals:\n"
-"\n"
+#: src/reduce.c:404
+#, fuzzy
+msgid "Useless nonterminals:"

 msgstr ""
 "ÉÔ»ÈÍÑÈó½ªÃ¼»Ò:\n"
 "\n"
 
 msgstr ""
 "ÉÔ»ÈÍÑÈó½ªÃ¼»Ò:\n"
 "\n"
 

-#: src/reduce.c:506
-msgid ""
-"\n"
-"\n"
-"Terminals which are not used:\n"
-"\n"
+#: src/reduce.c:418
+#, fuzzy
+msgid "Terminals which are not used:"

 msgstr ""
 "\n"
 "\n"
 "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n"
 "\n"
 

-#: src/reduce.c:515
-msgid ""
-"\n"
-"\n"
-"Useless rules:\n"
-"\n"
+#: src/reduce.c:429
+#, fuzzy
+msgid "Useless rules:"

 msgstr ""
 "\n"
 "\n"
 "ÉÔ»ÈÍѵ¬Â§:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "ÉÔ»ÈÍѵ¬Â§:\n"
 "\n"
 

-#: src/reduce.c:544
+#: src/reduce.c:459

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


@@ -644,11 +610,11 @@ msgstr ""
 "---------\n"
 "\n"
 
 "---------\n"
 "\n"
 

-#: src/reduce.c:545
+#: src/reduce.c:460

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

-#: src/reduce.c:550
+#: src/reduce.c:464

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


@@ -658,7 +624,7 @@ msgstr ""
 "-----\n"
 "\n"
 
 "-----\n"
 "\n"
 

-#: src/reduce.c:560
+#: src/reduce.c:474

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


@@ -668,30 +634,43 @@ msgstr ""
 "-----------------\n"
 "\n"
 
 "-----------------\n"
 "\n"
 

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

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

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

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

-#: src/reduce.c:583
+#: src/reduce.c:498

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

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

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

-#: src/reduce.c:592
+#: src/reduce.c:507

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

+#: src/reduce.c:540
+#, c-format
+msgid "Start symbol %s does not derive any sentence"
+msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó"
+
+#: src/reduce.c:553
+#, c-format
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"´Ô¸µ¥Õ¥¡¥¤¥ë %s ¤Ç %d ¸Ä¤Î½ªÃ¼»Ò%.0s, %d ¸Ä¤ÎÈó½ªÃ¼»Ò%.0s, %d "
+"¸Ä¤Îµ¬Â§%.0s¤¬ÄêµÁ¤µ¤ì¤Þ¤·¤¿\n"
+

 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"


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

+#~ msgid "%s: memory exhausted\n"
+#~ msgstr "%s: ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿\n"
+

 #~ msgid ""
 #~ "\n"
 #~ "\n"
 #~ msgid ""
 #~ "\n"
 #~ "\n"

diff --git a/po/nl.po b/po/nl.po
index e529871fa9d43519116733f09013038cc2c330f2..1f6d57eb5904df564ee14d1fe9e1912f50cd3c7a 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-09-21 10:30+0200\n"
+"POT-Creation-Date: 2000-10-02 12:34+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"


@@ -13,87 +13,82 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:212
+#: src/LR0.c:207

 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 

-#: src/allocate.c:58 src/allocate.c:74
-#, c-format
-msgid "%s: memory exhausted\n"
-msgstr "%s: geen geheugen meer beschikbaar\n"
-
-#: src/conflicts.c:64
+#: src/conflicts.c:50

 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Conflict in stadium %d tussen regel %d en teken %s opgelost als %s.\n"
 
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Conflict in stadium %d tussen regel %d en teken %s opgelost als %s.\n"
 

-#: src/conflicts.c:130 src/conflicts.c:153
+#: src/conflicts.c:116 src/conflicts.c:139

 msgid "reduce"
 msgstr "reduceer"
 
 msgid "reduce"
 msgstr "reduceer"
 

-#: src/conflicts.c:136 src/conflicts.c:149
+#: src/conflicts.c:122 src/conflicts.c:135

 msgid "shift"
 msgstr "verschuif"
 
 msgid "shift"
 msgstr "verschuif"
 

-#: src/conflicts.c:157
+#: src/conflicts.c:143

 msgid "an error"
 msgstr "een fout"
 
 msgid "an error"
 msgstr "een fout"
 

-#. If invoked under the name `yacc', use the output format
-#. specified by POSIX.
-#: src/conflicts.c:446
-msgid "conflicts: "
-msgstr "conflictueerd: "
-
-#: src/conflicts.c:448
-#, c-format
-msgid " %d shift/reduce"
-msgstr " %d vershuif/reduceer"
-
-#: src/conflicts.c:452
-#, c-format
-msgid " %d reduce/reduce"
-msgstr " %d reduceer/reduceer"
-
-#: src/conflicts.c:457
-#, c-format
-msgid "%s contains"
-msgstr "%s bevat"
-
-#: src/conflicts.c:460 src/conflicts.c:525
+#: src/conflicts.c:419

 msgid " 1 shift/reduce conflict"
 msgstr " 1 verschuif/reduceer conflict"
 
 msgid " 1 shift/reduce conflict"
 msgstr " 1 verschuif/reduceer conflict"
 

-#: src/conflicts.c:462 src/conflicts.c:527
+#: src/conflicts.c:421

 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d verschuif/reduceer conflicten"
 
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d verschuif/reduceer conflicten"
 

-#: src/conflicts.c:465 src/conflicts.c:530
+#: src/conflicts.c:424

 msgid " and"
 msgstr " en"
 
 msgid " and"
 msgstr " en"
 

-#: src/conflicts.c:468 src/conflicts.c:533
+#: src/conflicts.c:427

 msgid " 1 reduce/reduce conflict"
 msgstr " 1 reduceer/reduceer conflict"
 
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 reduceer/reduceer conflict"
 

-#: src/conflicts.c:470 src/conflicts.c:535
+#: src/conflicts.c:429

 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d reduceer/reduceer conflicten"
 
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d reduceer/reduceer conflicten"
 

-#: src/conflicts.c:522
+#: src/conflicts.c:461

 #, c-format
 msgid "State %d contains"
 msgstr "Stadium %d bevat"
 
 #, c-format
 msgid "State %d contains"
 msgstr "Stadium %d bevat"
 

-#: src/conflicts.c:629 src/conflicts.c:749
+#. If invoked with `--yacc', use the output format specified by
+#. POSIX.
+#: src/conflicts.c:472
+msgid "conflicts: "
+msgstr "conflictueerd: "
+
+#: src/conflicts.c:474
+#, c-format
+msgid " %d shift/reduce"
+msgstr " %d vershuif/reduceer"
+
+#: src/conflicts.c:478
+#, c-format
+msgid " %d reduce/reduce"
+msgstr " %d reduceer/reduceer"
+
+#: src/conflicts.c:483
+#, c-format
+msgid "%s contains"
+msgstr "%s bevat"
+
+#: src/conflicts.c:568 src/conflicts.c:688

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduceer gebruikt regel %d (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduceer gebruikt regel %d (%s)]\n"
 

-#: src/conflicts.c:640 src/print.c:222
+#: src/conflicts.c:579 src/print.c:170

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -102,23 +97,19 @@ msgstr ""
 "    $default\treduce using rule %d (%s)\n"
 "\n"
 
 "    $default\treduce using rule %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:729 src/conflicts.c:743
+#: src/conflicts.c:668 src/conflicts.c:682

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr ""
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr ""
 

-#: src/conflicts.c:770
+#: src/conflicts.c:709

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr ""
 
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr ""
 

-#: src/derives.c:42
-msgid ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
+#: src/derives.c:44
+#, fuzzy
+msgid "DERIVES"

 msgstr ""
 "\n"
 "\n"
 msgstr ""
 "\n"
 "\n"


@@ -126,7 +117,7 @@ msgstr ""
 "AFGELEIDEN\n"
 "\n"
 
 "AFGELEIDEN\n"
 "\n"
 

-#: src/derives.c:46
+#: src/derives.c:49

 #, c-format
 msgid "%s derives"
 msgstr "%s afgeleiden"
 #, c-format
 msgid "%s derives"
 msgstr "%s afgeleiden"


@@ -160,6 +151,7 @@ msgstr ""
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"

+"      --locations            enable locations computation\n"

 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"
 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"


@@ -167,7 +159,7 @@ msgid ""
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 

-#: src/getargs.c:106
+#: src/getargs.c:107

 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"


@@ -176,466 +168,440 @@ msgid ""
 "  -o, --output-file=FILE     leave output to FILE\n"
 msgstr ""
 
 "  -o, --output-file=FILE     leave output to FILE\n"
 msgstr ""
 

-#: src/getargs.c:114
+#: src/getargs.c:115

 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.

-#: src/getargs.c:128
+#: src/getargs.c:129

 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 

-#: src/getargs.c:133
+#: src/getargs.c:134

 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 
 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 

-#: src/getargs.c:137
+#: src/getargs.c:138

 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:231
+#: src/getargs.c:217
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ""
+
+#: src/getargs.c:225

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: geen grammatica bestand gegeven\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: geen grammatica bestand gegeven\n"
 

-#: src/getargs.c:235
+#: src/getargs.c:229

 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: extra argumenten genegeerd na '%s'\n"
 
 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: extra argumenten genegeerd na '%s'\n"
 

-#: src/lalr.c:292
+#: src/lalr.c:312

 #, c-format
 msgid "too many gotos (max %d)"
 msgstr ""
 
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr ""
 

-#: src/lex.c:105
+#: src/lex.c:84

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

-#: src/lex.c:134 src/reader.c:285
+#: src/lex.c:113 src/reader.c:216

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

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

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

-#: src/lex.c:183
+#: src/lex.c:164

 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:215
+#: src/lex.c:206

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

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

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

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
 

-#: src/lex.c:463
+#: src/lex.c:489

 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:466
+#: src/lex.c:492

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

-#: src/main.c:139
+#: src/main.c:123

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

-#: src/nullable.c:55
+#: src/nullable.c:52

 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"
 
 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"
 

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

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

-#: src/print.c:84
+#: src/print.c:38

 #, c-format
 msgid " type %d is %s\n"
 msgstr ""
 
 #, c-format
 msgid " type %d is %s\n"
 msgstr ""
 

-#: src/print.c:92
-#, c-format
-msgid ""
-"\n"
-"\n"
-"state %d\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"stadium %d\n"
-"\n"
-
-#: src/print.c:137
+#: src/print.c:86

 #, c-format
 msgid "   (rule %d)"
 msgstr "   (regel %d)"
 
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (regel %d)"
 

-#: src/print.c:164
+#: src/print.c:112

 msgid "    $default\taccept\n"
 msgstr ""
 
 msgid "    $default\taccept\n"
 msgstr ""
 

-#: src/print.c:166
+#: src/print.c:114

 msgid "    NO ACTIONS\n"
 msgstr "    GEEN AKTIES\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
 msgid "    NO ACTIONS\n"
 msgstr "    GEEN AKTIES\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0

-#: src/print.c:184
+#: src/print.c:132

 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr ""
 
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr ""
 

-#: src/print.c:186
+#: src/print.c:134

 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr ""
 
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr ""
 

-#: src/print.c:210
+#: src/print.c:158

 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr ""
 
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr ""
 

-#: src/print.c:238
+#: src/print.c:186

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr ""
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr ""
 

-#. rule # : LHS -> RHS
-#: src/print.c:264
-msgid ""
+#: src/print.c:198
+#, fuzzy, c-format
+msgid "state %d"
+msgstr ""
+"\n"

 "\n"
 "\n"

-"Grammar\n"
+"stadium %d\n"
+"\n"
+
+#: src/print.c:228
+#, fuzzy
+msgid "Grammar"

 msgstr ""
 "\n"
 "Grammatica\n"
 
 msgstr ""
 "\n"
 "Grammatica\n"
 

-#: src/print.c:269
+#: src/print.c:234

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regel %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regel %-4d %s ->"
 

-#: src/print.c:275
+#: src/print.c:240

 msgid "\t\t/* empty */"
 msgstr ""
 
 msgid "\t\t/* empty */"
 msgstr ""
 

-#. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:280
-msgid ""
-"\n"
-"Terminals, with rules where they appear\n"
-"\n"
+#: src/print.c:246
+#, fuzzy
+msgid "Terminals, with rules where they appear"

 msgstr ""
 "\n"
 "Terminals, met regels waar ze voorkomen\n"
 "\n"
 
 msgstr ""
 "\n"
 "Terminals, met regels waar ze voorkomen\n"
 "\n"
 

-#: src/print.c:328
-msgid ""
-"\n"
-"Nonterminals, with rules where they appear\n"
-"\n"
+#: src/print.c:296
+#, fuzzy
+msgid "Nonterminals, with rules where they appear"

 msgstr ""
 "\n"
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"
 
 msgstr ""
 "\n"
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"
 

-#: src/print.c:354
+#: src/print.c:323

 msgid " on left:"
 msgstr " links:"
 
 msgid " on left:"
 msgstr " links:"
 

-#: src/print.c:369
+#: src/print.c:338

 msgid " on right:"
 msgstr " rechts:"
 
 msgid " on right:"
 msgstr " rechts:"
 

-#: src/reader.c:153
+#: src/reader.c:81

 msgid "   Skipping to next \\n"
 msgstr "   Verder naar volgende \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   Verder naar volgende \\n"
 

-#: src/reader.c:155
+#: src/reader.c:83

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Verder naar volgende %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Verder naar volgende %c"
 

-#: src/reader.c:209 src/reader.c:224
+#: src/reader.c:137 src/reader.c:152

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

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

-#: src/reader.c:480
-#, c-format
-msgid "unrecognized: %s"
-msgstr "onbekend: %s"
-
-#: src/reader.c:485
-msgid "no input grammar"
-msgstr "geen invoer grammatica"
-
-#: src/reader.c:488
+#: src/reader.c:269

 #, c-format
 #, c-format

-msgid "unknown character: %s"
-msgstr "onbekend karakter: %s"
+msgid "@%s is invalid"
+msgstr "@%s is onjuist"

 
 

-#: src/reader.c:540
+#: src/reader.c:318

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

-#: src/reader.c:581 src/reader.c:769 src/reader.c:818
+#: src/reader.c:359 src/reader.c:504 src/reader.c:554

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

-#: src/reader.c:618 src/reader.c:840
+#: src/reader.c:393 src/reader.c:573

 #, 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:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709
+#: src/reader.c:403 src/reader.c:519 src/reader.c:580 src/reader.c:1259

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

 #, 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:686
-#, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "onbekend item %s, verwacht een identifier"
-
-#: src/reader.c:708
-#, c-format
-msgid "expected string constant instead of %s"
-msgstr "verwacht string constante in plaats van %s"
-
-#: src/reader.c:730 src/reader.c:891
+#: src/reader.c:430 src/reader.c:627

 #, 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:732 src/reader.c:1685
+#: src/reader.c:432 src/reader.c:1237

 #, 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:752
+#: src/reader.c:455 src/reader.c:467
+msgid "invalid $ value"
+msgstr "onjuiste $ waarde"
+
+#: src/reader.c:489

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

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

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

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

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

-#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312
+#: src/reader.c:668 src/reader.c:1014 src/reader.c:1086

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

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

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

-#: src/reader.c:1009
+#: src/reader.c:762

 #, c-format
 #, c-format

-msgid "@%s is invalid"
-msgstr "@%s is onjuist"
+msgid "unrecognized item %s, expected an identifier"
+msgstr "onbekend item %s, verwacht een identifier"

 
 

-#: src/reader.c:1024 src/reader.c:1036
-msgid "invalid $ value"
-msgstr "onjuiste $ waarde"
+#: src/reader.c:786
+#, c-format
+msgid "expected string constant instead of %s"
+msgstr "verwacht string constante in plaats van %s"

 
 

-#: src/reader.c:1142 src/reader.c:1282
+#: src/reader.c:885
+#, c-format
+msgid "unrecognized: %s"
+msgstr "onbekend: %s"
+
+#: src/reader.c:890
+msgid "no input grammar"
+msgstr "geen invoer grammatica"
+
+#: src/reader.c:893
+#, c-format
+msgid "unknown character: %s"
+msgstr "onbekend karakter: %s"
+
+#: src/reader.c:984 src/reader.c:1133

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

-#: src/reader.c:1158 src/reader.c:1298
+#: src/reader.c:1000 src/reader.c:1149

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

-#: src/reader.c:1163 src/reader.c:1303
+#: src/reader.c:1005 src/reader.c:1154

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

-#: src/reader.c:1172
+#: src/reader.c:1162

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

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

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

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

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

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

-#: src/reader.c:1552
+#: src/reader.c:1479

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

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

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

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

-#: src/reader.c:1625
+#: src/reader.c:1551

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

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

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

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

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

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

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

-#: src/reader.c:1844
+#: src/reader.c:1756

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

-#: src/reduce.c:142
-#, c-format
-msgid "Start symbol %s does not derive any sentence"
-msgstr "Start symbool %s is niet afkomstig uit een zin"
-
-#: src/reduce.c:156
-#, c-format
-msgid ""
-"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr ""
-"gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d "
-"productie%s.\n"
-
-#: src/reduce.c:494
-msgid ""
-"Useless nonterminals:\n"
-"\n"
+#: src/reduce.c:404
+#, fuzzy
+msgid "Useless nonterminals:"

 msgstr ""
 "Onbruikbare niet terminals:\n"
 "\n"
 
 msgstr ""
 "Onbruikbare niet terminals:\n"
 "\n"
 

-#: src/reduce.c:506
-msgid ""
-"\n"
-"\n"
-"Terminals which are not used:\n"
-"\n"
+#: src/reduce.c:418
+#, fuzzy
+msgid "Terminals which are not used:"

 msgstr ""
 "\n"
 "\n"
 "Terminals welke niet worden gebruikt:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "Terminals welke niet worden gebruikt:\n"
 "\n"
 

-#: src/reduce.c:515
-msgid ""
-"\n"
-"\n"
-"Useless rules:\n"
-"\n"
+#: src/reduce.c:429
+#, fuzzy
+msgid "Useless rules:"

 msgstr ""
 "\n"
 "\n"
 "Onbruikbare regels:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "Onbruikbare regels:\n"
 "\n"
 

-#: src/reduce.c:544
+#: src/reduce.c:459

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


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

-#: src/reduce.c:545
+#: src/reduce.c:460

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

-#: src/reduce.c:550
+#: src/reduce.c:464

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


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

-#: src/reduce.c:560
+#: src/reduce.c:474

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


@@ -669,30 +635,43 @@ msgstr ""
 "-----------------------\n"
 "\n"
 
 "-----------------------\n"
 "\n"
 

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

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d regels nooit gereduceerd\n"
 
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d regels nooit gereduceerd\n"
 

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

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

-#: src/reduce.c:583
+#: src/reduce.c:498

 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d onbruikbare niet terminal%s"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d onbruikbare niet terminal%s"
 

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

 msgid " and "
 msgstr " en "
 
 msgid " and "
 msgstr " en "
 

-#: src/reduce.c:592
+#: src/reduce.c:507

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"
 
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"
 

+#: src/reduce.c:540
+#, c-format
+msgid "Start symbol %s does not derive any sentence"
+msgstr "Start symbool %s is niet afkomstig uit een zin"
+
+#: src/reduce.c:553
+#, c-format
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d "
+"productie%s.\n"
+

 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"


@@ -752,6 +731,9 @@ msgstr "%s: optie `%s' is niet eenduidig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 

+#~ msgid "%s: memory exhausted\n"
+#~ msgstr "%s: geen geheugen meer beschikbaar\n"
+

 #~ msgid "unmatched close-brace (`}')"
 #~ msgstr "niet overeenkomstige afsluit-haakje (`}')"
 
 #~ msgid "unmatched close-brace (`}')"
 #~ msgstr "niet overeenkomstige afsluit-haakje (`}')"
 

diff --git a/po/ru.po b/po/ru.po
index a195624ccf996c5e3173cd5a3613c4077feee108..8ec717bbbf9373395d940fe089bd47ef79272ab5 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-09-21 10:30+0200\n"
+"POT-Creation-Date: 2000-10-02 12:34+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"


@@ -13,88 +13,83 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:212
+#: src/LR0.c:207

 #, c-format
 msgid "too many states (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)"
 
 #, c-format
 msgid "too many states (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)"
 

-#: src/allocate.c:58 src/allocate.c:74
-#, c-format
-msgid "%s: memory exhausted\n"
-msgstr "%s: ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
-
-#: src/conflicts.c:64
+#: src/conflicts.c:50

 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"
 
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"
 

-#: src/conflicts.c:130 src/conflicts.c:153
+#: src/conflicts.c:116 src/conflicts.c:139

 msgid "reduce"
 msgstr "×Ù×ÏÄ"
 
 msgid "reduce"
 msgstr "×Ù×ÏÄ"
 

-#: src/conflicts.c:136 src/conflicts.c:149
+#: src/conflicts.c:122 src/conflicts.c:135

 msgid "shift"
 msgstr "ÓÄ×ÉÇ"
 
 msgid "shift"
 msgstr "ÓÄ×ÉÇ"
 

-#: src/conflicts.c:157
+#: src/conflicts.c:143

 msgid "an error"
 msgstr "ÏÛÉÂËÁ"
 
 msgid "an error"
 msgstr "ÏÛÉÂËÁ"
 

-#. If invoked under the name `yacc', use the output format
-#. specified by POSIX.
-#: src/conflicts.c:446
-msgid "conflicts: "
-msgstr "ËÏÎÆÌÉËÔÙ: "
-
-#: src/conflicts.c:448
-#, c-format
-msgid " %d shift/reduce"
-msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
-
-#: src/conflicts.c:452
-#, c-format
-msgid " %d reduce/reduce"
-msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
-
-#: src/conflicts.c:457
-#, c-format
-msgid "%s contains"
-msgstr "%s ÓÏÄÅÒÖÉÔ"
-
-#: src/conflicts.c:460 src/conflicts.c:525
+#: src/conflicts.c:419

 msgid " 1 shift/reduce conflict"
 msgstr " 1 ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 
 msgid " 1 shift/reduce conflict"
 msgstr " 1 ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 

-#: src/conflicts.c:462 src/conflicts.c:527
+#: src/conflicts.c:421

 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 

-#: src/conflicts.c:465 src/conflicts.c:530
+#: src/conflicts.c:424

 msgid " and"
 msgstr " É"
 
 msgid " and"
 msgstr " É"
 

-#: src/conflicts.c:468 src/conflicts.c:533
+#: src/conflicts.c:427

 msgid " 1 reduce/reduce conflict"
 msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 

-#: src/conflicts.c:470 src/conflicts.c:535
+#: src/conflicts.c:429

 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 

-#: src/conflicts.c:522
+#: src/conflicts.c:461

 #, c-format
 msgid "State %d contains"
 msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ"
 
 #, c-format
 msgid "State %d contains"
 msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ"
 

-#: src/conflicts.c:629 src/conflicts.c:749
+#. If invoked with `--yacc', use the output format specified by
+#. POSIX.
+#: src/conflicts.c:472
+msgid "conflicts: "
+msgstr "ËÏÎÆÌÉËÔÙ: "
+
+#: src/conflicts.c:474
+#, c-format
+msgid " %d shift/reduce"
+msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
+
+#: src/conflicts.c:478
+#, c-format
+msgid " %d reduce/reduce"
+msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
+
+#: src/conflicts.c:483
+#, c-format
+msgid "%s contains"
+msgstr "%s ÓÏÄÅÒÖÉÔ"
+
+#: src/conflicts.c:568 src/conflicts.c:688

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n"
 

-#: src/conflicts.c:640 src/print.c:222
+#: src/conflicts.c:579 src/print.c:170

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -103,23 +98,19 @@ msgstr ""
 "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 "\n"
 
 "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:729 src/conflicts.c:743
+#: src/conflicts.c:668 src/conflicts.c:682

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 

-#: src/conflicts.c:770
+#: src/conflicts.c:709

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 

-#: src/derives.c:42
-msgid ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
+#: src/derives.c:44
+#, fuzzy
+msgid "DERIVES"

 msgstr ""
 "\n"
 "\n"
 msgstr ""
 "\n"
 "\n"


@@ -127,7 +118,7 @@ msgstr ""
 "DERIVES\n"
 "\n"
 
 "DERIVES\n"
 "\n"
 

-#: src/derives.c:46
+#: src/derives.c:49

 #, c-format
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"
 #, c-format
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"


@@ -165,9 +156,11 @@ msgstr ""
 "  -y, --yacc      ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n"
 
 #: src/getargs.c:95
 "  -y, --yacc      ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n"
 
 #: src/getargs.c:95

+#, fuzzy

 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"
 msgid ""
 "Parser:\n"
 "  -t, --debug                instrument the parser for debugging\n"

+"      --locations            enable locations computation\n"

 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"
 "  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n"
 "  -l, --no-lines             don't generate `#line' directives\n"
 "  -n, --no-parser            generate the tables only\n"


@@ -182,7 +175,7 @@ msgstr ""
 "  -r, --raw                  ÎÕÍÅÒÏ×ÁÔØ ÌÅËÓÅÍÙ, ÎÁÞÉÎÁÑ Ó 3\n"
 "  -k, --token-table          ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n"
 
 "  -r, --raw                  ÎÕÍÅÒÏ×ÁÔØ ÌÅËÓÅÍÙ, ÎÁÞÉÎÁÑ Ó 3\n"
 "  -k, --token-table          ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n"
 

-#: src/getargs.c:106
+#: src/getargs.c:107

 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"


@@ -196,462 +189,436 @@ msgstr ""
 "  -b, --file-prefix=ðòåæéëó  ÕËÁÚÁÔØ ðòåæéëó ÄÌÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×\n"
 "  -o, --output-file=æáêì     ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ × æáêì\n"
 
 "  -b, --file-prefix=ðòåæéëó  ÕËÁÚÁÔØ ðòåæéëó ÄÌÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×\n"
 "  -o, --output-file=æáêì     ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ × æáêì\n"
 

-#: src/getargs.c:114
+#: src/getargs.c:115

 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "ïÛÉÂËÉ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ <bug-bison@gnu.org>.\n"
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "ïÛÉÂËÉ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ <bug-bison@gnu.org>.\n"
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.

-#: src/getargs.c:128
+#: src/getargs.c:129

 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 

-#: src/getargs.c:133
+#: src/getargs.c:134

 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 
 msgid ""
 "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 

-#: src/getargs.c:137
+#: src/getargs.c:138

 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:231
+#: src/getargs.c:217
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ""
+
+#: src/getargs.c:225

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n"
 

-#: src/getargs.c:235
+#: src/getargs.c:229

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"
 
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"
 

-#: src/lalr.c:292
+#: src/lalr.c:312

 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
 
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
 

-#: src/lex.c:105
+#: src/lex.c:84

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

-#: src/lex.c:134 src/reader.c:285
+#: src/lex.c:113 src/reader.c:216

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

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

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

-#: src/lex.c:183
+#: src/lex.c:164

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

-#: src/lex.c:215
+#: src/lex.c:206

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

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

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

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

-#: src/lex.c:463
+#: src/lex.c:489

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

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

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

-#: src/main.c:139
+#: src/main.c:123

 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n"
 
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n"
 

-#: src/nullable.c:55
+#: src/nullable.c:52

 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"
 

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

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

-#: src/print.c:84
+#: src/print.c:38

 #, c-format
 msgid " type %d is %s\n"
 msgstr " ÔÉÐ %d Ñ×ÌÑÅÔÓÑ %s\n"
 
 #, c-format
 msgid " type %d is %s\n"
 msgstr " ÔÉÐ %d Ñ×ÌÑÅÔÓÑ %s\n"
 

-#: src/print.c:92
-#, c-format
-msgid ""
-"\n"
-"\n"
-"state %d\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"ÓÏÓÔÏÑÎÉÅ %d\n"
-"\n"
-
-#: src/print.c:137
+#: src/print.c:86

 #, c-format
 msgid "   (rule %d)"
 msgstr "   (ÐÒÁ×ÉÌÏ %d)"
 
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (ÐÒÁ×ÉÌÏ %d)"
 

-#: src/print.c:164
+#: src/print.c:112

 msgid "    $default\taccept\n"
 msgstr "    $default\tÐÒÉÎÑÔÉÅ\n"
 
 msgid "    $default\taccept\n"
 msgstr "    $default\tÐÒÉÎÑÔÉÅ\n"
 

-#: src/print.c:166
+#: src/print.c:114

 msgid "    NO ACTIONS\n"
 msgstr "    îåô äåêóô÷éê\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0
 msgid "    NO ACTIONS\n"
 msgstr "    îåô äåêóô÷éê\n"
 
 #. I.e. strcmp(tags[symbol],"$")==0

-#: src/print.c:184
+#: src/print.c:132

 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 

-#: src/print.c:186
+#: src/print.c:134

 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tÓÄ×ÉÇ, É ÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tÓÄ×ÉÇ, É ÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 

-#: src/print.c:210
+#: src/print.c:158

 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n"
 
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n"
 

-#: src/print.c:238
+#: src/print.c:186

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 

-#. rule # : LHS -> RHS
-#: src/print.c:264
-msgid ""
+#: src/print.c:198
+#, fuzzy, c-format
+msgid "state %d"
+msgstr ""
+"\n"

 "\n"
 "\n"

-"Grammar\n"
+"ÓÏÓÔÏÑÎÉÅ %d\n"
+"\n"
+
+#: src/print.c:228
+#, fuzzy
+msgid "Grammar"

 msgstr ""
 "\n"
 "çÒÁÍÍÁÔÉËÁ\n"
 
 msgstr ""
 "\n"
 "çÒÁÍÍÁÔÉËÁ\n"
 

-#: src/print.c:269
+#: src/print.c:234

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->"
 

-#: src/print.c:275
+#: src/print.c:240

 msgid "\t\t/* empty */"
 msgstr "\t\t/* ÐÕÓÔÏ */"
 
 msgid "\t\t/* empty */"
 msgstr "\t\t/* ÐÕÓÔÏ */"
 

-#. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:280
-msgid ""
-"\n"
-"Terminals, with rules where they appear\n"
-"\n"
+#: src/print.c:246
+#, fuzzy
+msgid "Terminals, with rules where they appear"

 msgstr ""
 "\n"
 "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
 "\n"
 
 msgstr ""
 "\n"
 "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
 "\n"
 

-#: src/print.c:328
-msgid ""
-"\n"
-"Nonterminals, with rules where they appear\n"
-"\n"
+#: src/print.c:296
+#, fuzzy
+msgid "Nonterminals, with rules where they appear"

 msgstr ""
 "\n"
 "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
 "\n"
 
 msgstr ""
 "\n"
 "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
 "\n"
 

-#: src/print.c:354
+#: src/print.c:323

 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"
 
 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"
 

-#: src/print.c:369
+#: src/print.c:338

 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 

-#: src/reader.c:153
+#: src/reader.c:81

 msgid "   Skipping to next \\n"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n"
 
 msgid "   Skipping to next \\n"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n"
 

-#: src/reader.c:155
+#: src/reader.c:83

 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c"
 
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c"
 

-#: src/reader.c:209 src/reader.c:224
+#: src/reader.c:137 src/reader.c:152

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

-#: src/reader.c:212
+#: src/reader.c:140

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

-#: src/reader.c:480
-#, c-format
-msgid "unrecognized: %s"
-msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
-
-#: src/reader.c:485
-msgid "no input grammar"
-msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
-
-#: src/reader.c:488
+#: src/reader.c:269

 #, c-format
 #, c-format

-msgid "unknown character: %s"
-msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
+msgid "@%s is invalid"
+msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"

 
 

-#: src/reader.c:540
+#: src/reader.c:318

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

-#: src/reader.c:581 src/reader.c:769 src/reader.c:818
+#: src/reader.c:359 src/reader.c:504 src/reader.c:554

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

-#: src/reader.c:618 src/reader.c:840
+#: src/reader.c:393 src/reader.c:573

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

-#: src/reader.c:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709
+#: src/reader.c:403 src/reader.c:519 src/reader.c:580 src/reader.c:1259

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

-#: src/reader.c:638
+#: src/reader.c:413

 #, 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:686
-#, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
-
-#: src/reader.c:708
-#, c-format
-msgid "expected string constant instead of %s"
-msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
-
-#: src/reader.c:730 src/reader.c:891
+#: src/reader.c:430 src/reader.c:627

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

-#: src/reader.c:732 src/reader.c:1685
+#: src/reader.c:432 src/reader.c:1237

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

-#: src/reader.c:752
+#: src/reader.c:455 src/reader.c:467
+msgid "invalid $ value"
+msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
+
+#: src/reader.c:489

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

-#: src/reader.c:789
+#: src/reader.c:524

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

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

-#: src/reader.c:859
+#: src/reader.c:593

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

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

-#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312
+#: src/reader.c:668 src/reader.c:1014 src/reader.c:1086

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

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

 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 

-#: src/reader.c:1009
+#: src/reader.c:762

 #, c-format
 #, c-format

-msgid "@%s is invalid"
-msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
+msgid "unrecognized item %s, expected an identifier"
+msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"

 
 

-#: src/reader.c:1024 src/reader.c:1036
-msgid "invalid $ value"
-msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
+#: src/reader.c:786
+#, c-format
+msgid "expected string constant instead of %s"
+msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
+
+#: src/reader.c:885
+#, c-format
+msgid "unrecognized: %s"
+msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"

 
 

-#: src/reader.c:1142 src/reader.c:1282
+#: src/reader.c:890
+msgid "no input grammar"
+msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
+
+#: src/reader.c:893
+#, c-format
+msgid "unknown character: %s"
+msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
+
+#: src/reader.c:984 src/reader.c:1133

 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 

-#: src/reader.c:1158 src/reader.c:1298
+#: src/reader.c:1000 src/reader.c:1149

 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 

-#: src/reader.c:1163 src/reader.c:1303
+#: src/reader.c:1005 src/reader.c:1154

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

-#: src/reader.c:1172
+#: src/reader.c:1162

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

-#: src/reader.c:1398
+#: src/reader.c:1321

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

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

-#: src/reader.c:1436
+#: src/reader.c:1359

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

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

-#: src/reader.c:1543
+#: src/reader.c:1470

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

-#: src/reader.c:1552
+#: src/reader.c:1479

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

-#: src/reader.c:1567
+#: src/reader.c:1493

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

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

-#: src/reader.c:1617
+#: src/reader.c:1543

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

-#: src/reader.c:1625
+#: src/reader.c:1551

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

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

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

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

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

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

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

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

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

-#: src/reduce.c:142
-#, c-format
-msgid "Start symbol %s does not derive any sentence"
-msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
-
-#: src/reduce.c:156
-#, c-format
-msgid ""
-"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr ""
-"×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ "
-"×Ù×ÏÄÁ%s.\n"
-
-#: src/reduce.c:494
-msgid ""
-"Useless nonterminals:\n"
-"\n"
+#: src/reduce.c:404
+#, fuzzy
+msgid "Useless nonterminals:"

 msgstr ""
 "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:\n"
 "\n"
 
 msgstr ""
 "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:\n"
 "\n"
 

-#: src/reduce.c:506
-msgid ""
-"\n"
-"\n"
-"Terminals which are not used:\n"
-"\n"
+#: src/reduce.c:418
+#, fuzzy
+msgid "Terminals which are not used:"

 msgstr ""
 "\n"
 "\n"
 "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:\n"
 "\n"
 

-#: src/reduce.c:515
-msgid ""
-"\n"
-"\n"
-"Useless rules:\n"
-"\n"
+#: src/reduce.c:429
+#, fuzzy
+msgid "Useless rules:"

 msgstr ""
 "\n"
 "\n"
 "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:\n"
 "\n"
 
 msgstr ""
 "\n"
 "\n"
 "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:\n"
 "\n"
 

-#: src/reduce.c:544
+#: src/reduce.c:459

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


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

-#: src/reduce.c:545
+#: src/reduce.c:460

 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"
 
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"
 

-#: src/reduce.c:550
+#: src/reduce.c:464

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


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

-#: src/reduce.c:560
+#: src/reduce.c:474

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


@@ -685,30 +652,43 @@ msgstr ""
 "--------------------------\n"
 "\n"
 
 "--------------------------\n"
 "\n"
 

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

 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n"
 
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n"
 

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

 #, c-format
 msgid "%s contains "
 msgstr "%s ÓÏÄÅÒÖÉÔ "
 
 #, c-format
 msgid "%s contains "
 msgstr "%s ÓÏÄÅÒÖÉÔ "
 

-#: src/reduce.c:583
+#: src/reduce.c:498

 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s"
 
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s"
 

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

 msgid " and "
 msgstr " É "
 
 msgid " and "
 msgstr " É "
 

-#: src/reduce.c:592
+#: src/reduce.c:507

 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s"
 
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s"
 

+#: src/reduce.c:540
+#, c-format
+msgid "Start symbol %s does not derive any sentence"
+msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
+
+#: src/reduce.c:553
+#, c-format
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ "
+"×Ù×ÏÄÁ%s.\n"
+

 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"


@@ -768,6 +748,9 @@ msgstr "%s: 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 

+#~ msgid "%s: memory exhausted\n"
+#~ msgstr "%s: ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
+

 #~ msgid "multiple %union declarations"
 #~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
 
 #~ msgid "multiple %union declarations"
 #~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
 

diff --git a/src/reader.c b/src/reader.c
index 498dd6d613a1ba40fabe4b7a2c19f7198c6034f4..e4ba16c88f911bf26dec1931d2091ea4f706e60a 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -704,7 +704,7 @@ parse_expect_decl (void)
   count = 0;
   while (c >= '0' && c <= '9')
     {
   count = 0;
   while (c >= '0' && c <= '9')
     {

-      if (count < 20)
+      if (count < sizeof(buffer) - 1)

        buffer[count++] = c;
       c = getc (finput);
     }
        buffer[count++] = c;
       c = getc (finput);
     }