X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/fdb5fc386307aa48213d22bb734ff211928c4dda..fbbf9b3bb99ef505b55d5d1ba8b98f98226dc358:/po/et.po

diff --git a/po/et.po b/po/et.po
index a4e48c41..3b3385b1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,103 +1,107 @@
 # Estonian translations for bison.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Toomas Soome <tsoome@ut.ee>, 2000.
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Toomas Soome <tsoome@ut.ee>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-08-03 11:05+0200\n"
-"PO-Revision-Date: 2000-04-11 22:19+02:00\n"
+"Project-Id-Version: bison 1.28d\n"
+"POT-Creation-Date: 2001-12-05 10:46+0100\n"
+"PO-Revision-Date: 2001-08-29 17:06+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/LR0.c:207
+#: src/LR0.c:189
 #, c-format
 msgid "too many states (max %d)"
 msgstr "liiga palju olekuid (maks %d)"
 
-#: src/complain.c:110
+#: lib/error.c:128 lib/error.c:156 src/complain.c:96
+msgid "Unknown system error"
+msgstr "Tundmatu süsteemi viga"
+
+#: src/complain.c:150
 msgid "warning: "
-msgstr ""
+msgstr "hoiatus: "
 
-#: src/complain.c:198 src/complain.c:239
-#, fuzzy
+#: src/complain.c:238
 msgid "fatal error: "
-msgstr "fataalne viga: %s\n"
+msgstr "fataalne viga: "
 
-#: src/conflicts.c:49
+#: src/conflicts.c:44
 #, 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:115 src/conflicts.c:138
+#: src/conflicts.c:94 src/conflicts.c:119
 msgid "reduce"
 msgstr "redutseerimine"
 
-#: src/conflicts.c:121 src/conflicts.c:134
+#: src/conflicts.c:101 src/conflicts.c:115
 msgid "shift"
 msgstr "nihutamine"
 
-#: src/conflicts.c:142
+#: src/conflicts.c:123
 msgid "an error"
 msgstr "viga"
 
-#: src/conflicts.c:422
-msgid " 1 shift/reduce conflict"
-msgstr " 1 nihutamine/redutseerimine konflikt"
-
-#: src/conflicts.c:427
-#, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d nihutamine/redutseerimine konflikti"
+#: src/conflicts.c:302
+#, fuzzy, c-format
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] " %d nihutamine/redutseerimine konflikti"
 
-#: src/conflicts.c:433
-msgid " and"
+#: src/conflicts.c:309
+#, fuzzy
+msgid "and"
 msgstr " ja"
 
-#: src/conflicts.c:439
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 redutseerimine/redutseerimine konflikt"
-
-#: src/conflicts.c:444
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d redutseerimine/redutseerimine konflikti"
+#: src/conflicts.c:315
+#, fuzzy, c-format
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] " %d redutseerimine/redutseerimine konflikti"
 
-#: src/conflicts.c:481
-#, c-format
-msgid "State %d contains"
+#: src/conflicts.c:340
+#, fuzzy, c-format
+msgid "State %d contains "
 msgstr "Olek %d sisaldab"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:387
 msgid "conflicts: "
 msgstr "konfliktid: "
 
-#: src/conflicts.c:495
+#: src/conflicts.c:389
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"
 
-#: src/conflicts.c:499
+#: src/conflicts.c:393
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"
 
-#: src/conflicts.c:504
+#: src/conflicts.c:398 src/reduce.c:508
 #, c-format
-msgid "%s contains"
-msgstr "%s sisaldab"
+msgid "%s contains "
+msgstr "%s sisaldab "
+
+#: src/conflicts.c:405
+#, fuzzy, c-format
+msgid "expected %d shift/reduce conflict\n"
+msgid_plural "expected %d shift/reduce conflicts\n"
+msgstr[0] " %d nihutamine/redutseerimine konflikti"
 
-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:457 src/conflicts.c:534
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 
-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:461 src/print.c:154
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -106,52 +110,37 @@ msgstr ""
 "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:515 src/conflicts.c:528
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 
-#: src/conflicts.c:732
+#: src/conflicts.c:544
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 
-#: src/derives.c:44
-#, fuzzy
-msgid "DERIVES"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
-
-#: src/derives.c:49
-#, c-format
-msgid "%s derives"
-msgstr "%s derives"
-
-#: src/files.c:98
+#: src/files.c:144
 #, c-format
 msgid "cannot open file `%s'"
-msgstr ""
+msgstr "faili `%s' ei saa avada"
 
-#: src/files.c:117
+#: src/files.c:163
 msgid "cannot close file"
-msgstr ""
+msgstr "faili ei õnnestu sulgeda"
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
-#: src/getargs.c:81
+#: src/getargs.c:55
 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison genereerib parsereid LALR(1) grammatikatele.\n"
 
-#: src/getargs.c:85
+#: src/getargs.c:59
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "Kasuta: %s [VÕTI]...FAIL\n"
 
-#: src/getargs.c:89
+#: src/getargs.c:63
 msgid ""
 "If a long option shows an argument as mandatory, then it is mandatory\n"
 "for the equivalent short option also.  Similarly for optional arguments.\n"
@@ -159,7 +148,7 @@ msgstr ""
 "Kui pikk võti näitab, et argument on kohustuslik, siis on see kohustuslik \n"
 "ka lühikese võtme korral. Sama ka vabalt valitavate võtmete korral.\n"
 
-#: src/getargs.c:95
+#: src/getargs.c:69
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
@@ -171,8 +160,7 @@ msgstr ""
 "  -V, --version   esita versiooniinfo ja lõpeta töö\n"
 "  -y, --yacc      emuleeri POSIX yacc\n"
 
-#: src/getargs.c:102
-#, fuzzy
+#: src/getargs.c:76
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
@@ -184,607 +172,566 @@ msgid ""
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 "Parser:\n"
+"  -S, --skeleton=FAIL        kasutatava skeleti kirjeldus\n"
 "  -t, --debug                varusta parser silumisinfoga\n"
+"      --locations            luba asukohtade arvestamine\n"
 "  -p, --name-prefix=PREFIKS  lisa välissümbolite nimedele PREFIKS\n"
 "  -l, --no-lines             ära genereeri `#line' direktiive\n"
 "  -n, --no-parser            genereeri ainult tabelid\n"
-"  -r, --raw                  sümbolite number alates 3\n"
 "  -k, --token-table          lisa ka sümbolite nimede tabel\n"
 
-#: src/getargs.c:114
+#: src/getargs.c:88
+#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
 "  -v, --verbose              also produce an explanation of the automaton\n"
 "  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n"
-"  -o, --output-file=FILE     leave output to FILE\n"
+"  -o, --output=FILE          leave output to FILE\n"
+"  -g, --graph                also produce a VCG description of the "
+"automaton\n"
 msgstr ""
 "Väljund:\n"
 "  -d, --defines              loo ka päisfail\n"
 "  -v, --verbose              väljasta automaadi kohta selgitusi\n"
 "  -b, --file-prefix=PREFIKS  kasuta väljundfailide nimedes PREFIKSit\n"
 "  -o, --output-file=FAIL     jäta väljund FAILi\n"
+"  -g, --graph                loo automaadi kirjeldus VCG graafina\n"
 
-#: src/getargs.c:122
+#: src/getargs.c:98
 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:136
+#: src/getargs.c:112
 #, c-format
 msgid "bison (GNU Bison) %s"
-msgstr ""
+msgstr "bison (GNU Bison) %s"
 
-#: src/getargs.c:141
+#: src/getargs.c:117
 msgid ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 msgstr ""
+"Autoriõigus 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, "
+"Inc.\n"
 
-#: src/getargs.c:145
+#: src/getargs.c:121
 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 ""
+"See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
+"PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
 
-#: src/getargs.c:202 src/lex.c:633
+#: src/getargs.c:191 src/lex.c:665
 #, c-format
 msgid "`%s' is no longer supported"
-msgstr ""
+msgstr "`%s' ei ole enam toetatud"
 
-#: src/getargs.c:226
+#: src/getargs.c:215
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr ""
+msgstr "Lisainfo saamiseks proovige `%s --help'.\n"
 
-#: src/getargs.c:233
+#: src/getargs.c:223
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: puudub grammatikafail\n"
 
-#: src/getargs.c:237
+#: src/getargs.c:227
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
 
-#: src/lalr.c:312
+#: src/lalr.c:255
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 
-#: src/lex.c:70
+#: src/lex.c:77
 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"
 
-#: src/lex.c:99 src/reader.c:270
+#: src/lex.c:106 src/reader.c:304
 msgid "unterminated comment"
 msgstr "lõpetamata kommentaar"
 
-#: src/lex.c:131
+#: src/lex.c:138
 msgid "unexpected end of file"
 msgstr "ootamatu faililõpp"
 
-#: src/lex.c:160
+#: src/lex.c:167
 msgid "unescaped newline in constant"
 msgstr "paojadata reavahetus konstandis"
 
-#: src/lex.c:202
+#: src/lex.c:209
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
 
-#: src/lex.c:227
+#: src/lex.c:234
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
 
-#: src/lex.c:239
+#: src/lex.c:246
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "tundmatu paojada: `\\' järgneb `%s'"
 
-#: src/lex.c:335
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "lõpetamata tüübinimi faili lõpus"
 
-#: src/lex.c:338
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"
 
-#: src/lex.c:430
+#: src/lex.c:439
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
 
-#: src/main.c:104
+#: src/lex.c:637
 #, c-format
-msgid "%s: internal error: %s\n"
-msgstr "%s: sisemine viga: %s\n"
+msgid "`%s' supports no argument: %s"
+msgstr ""
 
-#: src/nullable.c:52
-msgid "Entering set_nullable"
-msgstr "Entering set_nullable"
+#: src/lex.c:654
+#, fuzzy, c-format
+msgid "`%s' requires an argument"
+msgstr "%s: võti `%s' nõuab argumenti\n"
 
-#: src/output.c:993
+#: src/output.c:760
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ületati maksimaalset tabelisuurust (%d)"
 
-#: src/print.c:38
+#: src/print.c:39
 #, c-format
 msgid " type %d is %s\n"
 msgstr " tüüp %d on %s\n"
 
-#: src/print.c:86
+#: src/print.c:88
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (reegel %d)"
 
-#: src/print.c:112
+#: src/print.c:108
 msgid "    $default\taccept\n"
 msgstr "    $default\taktsepteerin\n"
 
-#: src/print.c:114
+#: src/print.c:110
 msgid "    NO ACTIONS\n"
 msgstr "    TEGEVUSI POLE\n"
 
-#: src/print.c:133
+#: src/print.c:124
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tliigu olekule %d\n"
 
-#: src/print.c:136
+#: src/print.c:127
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
 
-#: src/print.c:160
+#: src/print.c:142
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
 
-#: src/print.c:190
+#: src/print.c:169
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tliigu olekule %d\n"
 
-#: src/print.c:202
-#, fuzzy, c-format
+#: src/print.c:180
+#, c-format
 msgid "state %d"
-msgstr ""
-"\n"
-"\n"
-"olek %d\n"
-"\n"
+msgstr "olek %d"
 
-#: src/print.c:233
-#, fuzzy
+#. rule # : LHS -> RHS
+#: src/print.c:211
 msgid "Grammar"
+msgstr "Grammatika"
+
+#: src/print.c:212
+msgid "Number, Line, Rule"
 msgstr ""
-"\n"
-"Grammatika\n"
 
-#: src/print.c:240
-#, c-format
-msgid "rule %-4d %s ->"
+#: src/print.c:217
+#, fuzzy, c-format
+msgid "  %3d %3d %s ->"
 msgstr "reegel %-4d %s ->"
 
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* tühi */"
+#: src/print.c:224
+msgid "empty"
+msgstr ""
 
-#: src/print.c:253
-#, fuzzy
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:231
 msgid "Terminals, with rules where they appear"
-msgstr ""
-"\n"
-"Terminalid, koos reeglitega, kus nad ilmuvad\n"
-"\n"
+msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
 
-#: src/print.c:302
-#, fuzzy
+#: src/print.c:256
 msgid "Nonterminals, with rules where they appear"
-msgstr ""
-"\n"
-"Mitteterminalid, koos reeglitega, kus nad ilmuvad\n"
-"\n"
+msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
 
-#: src/print.c:329
+#: src/print.c:282
 msgid " on left:"
 msgstr " vasakul:"
 
-#: src/print.c:344
+#: src/print.c:297
 msgid " on right:"
 msgstr " paremal:"
 
-#: src/reader.c:79
+#. If something has been added in the NODE_OBSTACK after
+#. the declaration of the label, then we need a `\n'.
+#. if (obstack_object_size (node_obstack) > node_output_size)
+#. obstack_sgrow (node_obstack, "\n");
+#.
+#: src/print_graph.c:146
+#, c-format
+msgid "%-4s\terror (nonassociative)"
+msgstr "%-4s\tviga (mitteassotsiatiivne)"
+
+#.
+#. if (obstack_object_size (node_obstack) > node_output_size)
+#. obstack_sgrow (node_obstack, "\n");
+#.
+#: src/print_graph.c:161
+#, c-format
+msgid "$default\treduce using rule %d (%s)"
+msgstr "$default\tredutseerin kasutades reeglit %d (%s)"
+
+#: src/reader.c:91
 msgid "   Skipping to next \\n"
 msgstr "   Liigun järgmisele \\n"
 
-#: src/reader.c:81
+#: src/reader.c:93
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Liigun järgmisele %c"
 
-#: src/reader.c:132 src/reader.c:144
+#: src/reader.c:144 src/reader.c:156
 msgid "invalid $ value"
 msgstr "vigane $ väärtus"
 
-#: src/reader.c:170 src/reader.c:185
+#: src/reader.c:183 src/reader.c:198
 msgid "unterminated string at end of file"
 msgstr "lõpetamata sõne faili lõpus"
 
-#: src/reader.c:173
+#: src/reader.c:186
 msgid "unterminated string"
 msgstr "lõpetamata sõne"
 
-#: src/reader.c:326 src/reader.c:390
-#, fuzzy, c-format
+#: src/reader.c:360 src/reader.c:424
+#, c-format
 msgid "%s is invalid"
-msgstr "@%s on vigane"
+msgstr "%s on vigane"
 
-#: src/reader.c:366
+#: src/reader.c:400
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' $$ ei oma deklareeritud tüüpi"
 
-#: src/reader.c:383
+#: src/reader.c:417
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d `%s' ei oma deklareeritud tüüpi"
 
-#: src/reader.c:437
+#: src/reader.c:476
 msgid "unterminated `%{' definition"
 msgstr "lõpetamata `%{' definitsioon"
 
-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:521 src/reader.c:636 src/reader.c:686 src/reader.c:956
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Enneaegne EOF peale %s"
 
-#: src/reader.c:499
+#: src/reader.c:538
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
-msgstr ""
+msgstr "sümbolit `%s' on kasutatud enam kui kord literaal sõnena"
 
-#: src/reader.c:502
+#: src/reader.c:541
 #, c-format
 msgid "symbol `%s' given more than one literal string"
-msgstr ""
+msgstr "sümbolile `%s' on antud enam kui üks literaal sõne"
 
-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:562 src/reader.c:705
 #, c-format
 msgid "symbol %s redefined"
 msgstr "sümbol %s on uuesti defineeritud"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231
+#: src/reader.c:572 src/reader.c:651 src/reader.c:712 src/reader.c:1374
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"
 
-#: src/reader.c:544
+#: src/reader.c:581
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ei ole %s sees lubatud"
 
-#: src/reader.c:561 src/reader.c:721
-#, fuzzy, c-format
+#: src/reader.c:599 src/reader.c:765
+#, c-format
 msgid "multiple %s declarations"
-msgstr "korduvad %start deklaratsioonid"
+msgstr "korduvad %s deklaratsioonid"
 
-#: src/reader.c:563 src/reader.c:1209
-#, fuzzy, c-format
+#: src/reader.c:601 src/reader.c:936 src/reader.c:951 src/reader.c:984
+#: src/reader.c:1003 src/reader.c:1352
+#, c-format
 msgid "invalid %s declaration"
-msgstr "vigane %start deklaratsioon"
+msgstr "vigane %s deklaratsioon"
 
-#: src/reader.c:583
+#: src/reader.c:621
 msgid "%type declaration has no <typename>"
 msgstr "%type deklaratsioonis puudub <tüübinimi>"
 
-#: src/reader.c:618
+#: src/reader.c:656
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "vigane %%type deklaratsioon, element: %s"
 
-#: src/reader.c:663
+#: src/reader.c:701
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s prioriteedi uus definitsioon"
 
-#: src/reader.c:687
+#: src/reader.c:724
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
 
-#: src/reader.c:697
+#: src/reader.c:734
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"
 
-#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106
-#, fuzzy, c-format
+#: src/reader.c:809 src/reader.c:1191 src/reader.c:1263
+#, c-format
 msgid "unmatched %s"
-msgstr "puudub `{'"
+msgstr "puudub %s"
 
-#: src/reader.c:791
-#, fuzzy, c-format
+#: src/reader.c:843
+#, c-format
 msgid "argument of %%expect is not an integer"
-msgstr "%expect argument ei ole täisarv"
+msgstr "%%expect argument ei ole täisarv"
 
-#: src/reader.c:838
+#: src/reader.c:889
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "tundmatu element %s, eeldasin identifikaatorit"
 
-#: src/reader.c:862
+#: src/reader.c:911
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "eeldasin %s asemel sõnekonstanti"
 
-#: src/reader.c:951
+#: src/reader.c:1108
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tundmatu: %s"
 
-#: src/reader.c:956
+#: src/reader.c:1113
 msgid "no input grammar"
 msgstr "sisendgrammatikat pole"
 
-#: src/reader.c:961
+#: src/reader.c:1118
 #, c-format
 msgid "unknown character: %s"
 msgstr "tundmatu sümbol: %s"
 
-#: src/reader.c:1129
+#: src/reader.c:1286
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "lõpetamata %guard klausel"
 
-#: src/reader.c:1296
+#: src/reader.c:1439
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
 
-#: src/reader.c:1303
+#: src/reader.c:1446
 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"
 
-#: src/reader.c:1334
+#: src/reader.c:1474
 #, 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:1436
+#: src/reader.c:1574
 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 
-#: src/reader.c:1444
-#, fuzzy, c-format
+#: src/reader.c:1582
+#, c-format
 msgid "%%guard present but %%semantic_parser not specified"
-msgstr "%guard on määratud, aga %semantic_parser ei ole"
+msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
 
-#: src/reader.c:1453
+#: src/reader.c:1591
 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 
-#: src/reader.c:1467
+#: src/reader.c:1605
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
-#: src/reader.c:1473
+#: src/reader.c:1611
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
-#: src/reader.c:1517
+#: src/reader.c:1655
 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 
-#: src/reader.c:1525
+#: src/reader.c:1663
 #, 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:1528
+#: src/reader.c:1666
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
-#: src/reader.c:1552
+#: src/reader.c:1674
 #, 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:1657
+#: src/reader.c:1783
+#, 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:1836
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 
-#: src/reader.c:1669
+#: src/reader.c:1848
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
 
-#: src/reader.c:1720
-#, 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:1733
+#: src/reader.c:1884
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"
 
-#: src/reader.c:1735
+#: src/reader.c:1886
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"
 
-#: src/reduce.c:404
-#, fuzzy
+#: src/reduce.c:409
 msgid "Useless nonterminals:"
-msgstr ""
-"Kasutamata mitteterminalid:\n"
-"\n"
+msgstr "Kasutamata mitteterminalid:"
 
-#: src/reduce.c:419
-#, fuzzy
+#: src/reduce.c:422
 msgid "Terminals which are not used:"
-msgstr ""
-"\n"
-"\n"
-"Terminalid, mida ei kasutatud:\n"
-"\n"
+msgstr "Terminalid, mida ei kasutatud:"
 
-#: src/reduce.c:430
-#, fuzzy
+#: src/reduce.c:433
 msgid "Useless rules:"
-msgstr ""
-"\n"
-"\n"
-"Kasutamata reeglid:\n"
-"\n"
-
-#: src/reduce.c:459
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-"Muutujad\n"
-"--------\n"
-"\n"
-
-#: src/reduce.c:461
-msgid "Value  Sprec    Sassoc    Tag\n"
-msgstr "Value  Sprec    Sassoc    Tag\n"
-
-#: src/reduce.c:466
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-"Reeglid\n"
-"-------\n"
-"\n"
+msgstr "Kasutamata reeglid:"
 
-#: src/reduce.c:477
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-"Interpreteeritud reeglid\n"
-"------------------------\n"
-"\n"
-
-#: src/reduce.c:494
-#, c-format
-msgid "%d rules never reduced\n"
-msgstr "%d reeglit ei redutseeritud\n"
-
-#: src/reduce.c:496
-#, c-format
-msgid "%s contains "
-msgstr "%s sisaldab "
+#: src/reduce.c:503
+#, fuzzy, c-format
+msgid "%d rule never reduced\n"
+msgid_plural "%d rules never reduced\n"
+msgstr[0] "%d reeglit ei redutseeritud\n"
 
-#: src/reduce.c:500
-#, c-format
-msgid "%d useless nonterminal%s"
-msgstr "%d kasutamata mitteterminali%s"
+#: src/reduce.c:511
+#, fuzzy, c-format
+msgid "%d useless nonterminal"
+msgid_plural "%d useless nonterminals"
+msgstr[0] "%d kasutamata mitteterminali%s"
 
-#: src/reduce.c:505
+#: src/reduce.c:517
 msgid " and "
 msgstr " ja "
 
-#: src/reduce.c:509
-#, c-format
-msgid "%d useless rule%s"
-msgstr "%d kasutamata reeglit%s"
+#: src/reduce.c:520
+#, fuzzy, c-format
+msgid "%d useless rule"
+msgid_plural "%d useless rules"
+msgstr[0] "%d kasutamata reeglit%s"
 
-#: src/reduce.c:542
+#: src/reduce.c:551
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
 
-#: src/reduce.c:555
-#, 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/error.c:117
-msgid "Unknown system error"
-msgstr ""
-
-#: lib/getopt.c:675
+#: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: võti `%s' on segane\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:719
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: võti `--%s' ei luba argumenti\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:724
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: võti `%c%s' ei luba argumenti\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:742 lib/getopt.c:915
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: võti `%s' nõuab argumenti\n"
 
 #. --option
-#: lib/getopt.c:752
+#: lib/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: tundmatu võti `--%s'\n"
 
 #. +option or -option
-#: lib/getopt.c:756
+#: lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: tundmatu võti `%c%s'\n"
 
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
+#: lib/getopt.c:801
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: lubamatu võti -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:804
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: vigane võti -- %c\n"
 
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:834 lib/getopt.c:964
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: võti nõuab argumenti -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:881
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: võti `-W %s' on segane\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:899
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: võti `-W %s' ei luba argumenti\n"
 
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
-#: lib/obstack.c:477 lib/xmalloc.c:66
-#, fuzzy
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
 msgid "memory exhausted"
-msgstr "%s: mälu on otsas\n"
+msgstr "mälu on otsas"
 
 #. Get translations for open and closing quotation marks.
 #.
@@ -800,115 +747,76 @@ msgstr "%s: m
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:274
 msgid "`"
-msgstr ""
+msgstr "`"
 
-#: lib/quotearg.c:260
+#: lib/quotearg.c:275
 msgid "'"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "%s: mälu on otsas\n"
-
-#~ msgid "$%s is invalid"
-#~ msgstr "$%s on vigane"
-
-#~ msgid "multiple %union declarations"
-#~ msgstr "korduvad %union deklaratsioonid"
+msgstr "'"
 
-#~ msgid "unterminated comment at end of file"
-#~ msgstr "lõpetamata kommentaar faili lõpus"
-
-#~ msgid "unmatched close-brace (`}')"
-#~ msgstr "puudub sulgev loogeline sulg (`}')"
-
-#~ msgid "unmatched right brace (`}')"
-#~ msgstr "puudub sulgev loogeline sulg (`}')"
-
-#~ msgid "ill-formed %type declaration"
-#~ msgstr "vigaselt formeeritud %type deklaratsioon"
+#~ msgid "%s: internal error: %s\n"
+#~ msgstr "%s: sisemine viga: %s\n"
 
 #~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "FIRSTS\n"
+#~ "Variables\n"
+#~ "---------\n"
 #~ "\n"
 #~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "FIRSTS\n"
+#~ "Muutujad\n"
+#~ "--------\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "%s firsts\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "%s firsts\n"
-#~ "\n"
+#~ msgid "Value  Sprec    Sassoc    Tag\n"
+#~ msgstr "Value  Sprec    Sassoc    Tag\n"
 
 #~ msgid ""
+#~ "Rules\n"
+#~ "-----\n"
 #~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "FDERIVES\n"
 #~ msgstr ""
+#~ "Reeglid\n"
+#~ "-------\n"
 #~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "FDERIVES\n"
 
 #~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "%s derives\n"
+#~ "Rules interpreted\n"
+#~ "-----------------\n"
 #~ "\n"
 #~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "%s derives\n"
+#~ "Interpreteeritud reeglid\n"
+#~ "------------------------\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
-#~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-#~ "       [--verbose] [--version] [--help] [--yacc]\n"
-#~ "       [--no-parser] [--token-table]\n"
-#~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
-#~ "       [--output=outfile] grammar-file\n"
-#~ msgstr ""
-#~ "Kasuta: %s [-dhklntvyV] [-b faili-prefiks] [-o väljundfail] [-p nime-"
-#~ "prefiks]\n"
-#~ "        [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
-#~ "        [--verbose] [--version] [--help] [--yacc]\n"
-#~ "        [--no-parser] [--token-table]\n"
-#~ "        [--file-prefix=prefiks] [--name-prefix=prefiks]\n"
-#~ "        [--output=väljundfail] grammatika-fail\n"
+#~ msgid " 1 shift/reduce conflict"
+#~ msgstr " 1 nihutamine/redutseerimine konflikt"
+
+#~ msgid " 1 reduce/reduce conflict"
+#~ msgstr " 1 redutseerimine/redutseerimine konflikt"
+
+#~ msgid "%s contains"
+#~ msgstr "%s sisaldab"
 
-#~ msgid "gotos"
-#~ msgstr "gotod"
+#~ msgid "DERIVES"
+#~ msgstr "DERIVES"
 
-#~ msgid "\"%s\", line %d: %s\n"
-#~ msgstr "\"%s\", rida %d: %s\n"
+#~ msgid "%s derives"
+#~ msgstr "%s derives"
 
-#~ msgid "error: %s\n"
-#~ msgstr "viga: %s\n"
+#~ msgid "Entering set_nullable"
+#~ msgstr "Entering set_nullable"
 
-#~ msgid "(\"%s\", line %d) error: %s\n"
-#~ msgstr "(\"%s\", rida %d) viga: %s\n"
+#~ msgid ""
+#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+#~ msgstr ""
+#~ "redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d "
+#~ "reeglit%s.\n"
 
-#~ msgid "limit of %d exceeded, too many %s"
-#~ msgstr "limiit %d ületatud, liiga palju %s"
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* tühi */"
 
-#~ msgid "unterminated comment in `%{' definition"
-#~ msgstr "lõpetamata kommentaar `%{' definitsioonis"
+#~ msgid "multiple %%header_extension declarations"
+#~ msgstr "korduvad %%header_extension eklaratsioonid"
 
-#~ msgid "invalid @-construct"
-#~ msgstr "vigane @-konstruktsioon"
+#~ msgid "multiple %%source_extension declarations"
+#~ msgstr "korduvad %%source_extension deklaratsioonid"