X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1addd145c26bc7d7637a5f06221fb3055e9cd03a..c6f1a33c06db52ed122d0922885602cf37f99941:/po/et.po

diff --git a/po/et.po b/po/et.po
index c40af7cd..77979cbe 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,139 +1,114 @@
 # 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: 2000-12-14 11:46+0100\n"
-"PO-Revision-Date: 2000-04-11 22:19+02:00\n"
+"Project-Id-Version: bison 1.33b\n"
+"POT-Creation-Date: 2002-07-09 14:54+0200\n"
+"PO-Revision-Date: 2002-03-05 16:27+0200\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/LR0.c:207
-#, c-format
-msgid "too many states (max %d)"
-msgstr "liiga palju olekuid (maks %d)"
+#: src/complain.c:99 lib/error.c:128 lib/error.c:156
+msgid "Unknown system error"
+msgstr "Tundmatu süsteemi viga"
 
-#: 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"
+#: src/complain.c:148 src/complain.c:197
+msgid "warning: "
+msgstr "hoiatus: "
 
-#: src/conflicts.c:116 src/conflicts.c:139
-msgid "reduce"
-msgstr "redutseerimine"
+#: src/complain.c:329 src/complain.c:362
+msgid "fatal error: "
+msgstr "fataalne viga: "
 
-#: src/conflicts.c:122 src/conflicts.c:135
-msgid "shift"
-msgstr "nihutamine"
+#: src/conflicts.c:72
+#, fuzzy, c-format
+msgid "    Conflict between rule %d and token %s resolved as shift"
+msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
 
-#: src/conflicts.c:143
-msgid "an error"
-msgstr "viga"
+#: src/conflicts.c:80
+#, fuzzy, c-format
+msgid "    Conflict between rule %d and token %s resolved as reduce"
+msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
 
-#: src/conflicts.c:419
-msgid " 1 shift/reduce conflict"
-msgstr " 1 nihutamine/redutseerimine konflikt"
+#: src/conflicts.c:87
+#, fuzzy, c-format
+msgid "    Conflict between rule %d and token %s resolved as an error"
+msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
 
-#: src/conflicts.c:421
+#: src/conflicts.c:403
 #, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d nihutamine/redutseerimine konflikti"
-
-#: src/conflicts.c:424
-msgid " and"
-msgstr " ja"
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] "%d nihutamine/redutseerimine konflikt"
+msgstr[1] "%d nihutamine/redutseerimine konflikti"
 
-#: src/conflicts.c:427
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 redutseerimine/redutseerimine konflikt"
+#: src/conflicts.c:410
+msgid "and"
+msgstr "ja"
 
-#: src/conflicts.c:429
+#: src/conflicts.c:416
 #, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d redutseerimine/redutseerimine konflikti"
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] "%d redutseerimine/redutseerimine konflikt"
+msgstr[1] "%d redutseerimine/redutseerimine konflikti"
 
-#: src/conflicts.c:461
+#: src/conflicts.c:441
 #, c-format
-msgid "State %d contains"
-msgstr "Olek %d sisaldab"
+msgid "State %d contains "
+msgstr "Olek %d sisaldab "
 
-#. If invoked with `--yacc', use the output format specified by
-#. POSIX.
-#: src/conflicts.c:472
+#: src/conflicts.c:514
 msgid "conflicts: "
 msgstr "konfliktid: "
 
-#: src/conflicts.c:474
+#: src/conflicts.c:516
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"
 
-#: src/conflicts.c:478
+#: src/conflicts.c:520
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"
 
-#: src/conflicts.c:483
+#: src/conflicts.c:525
 #, 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"
-
-#: src/conflicts.c:579 src/print.c:170
-#, c-format
-msgid ""
-"    $default\treduce using rule %d (%s)\n"
-"\n"
-msgstr ""
-"    $default\tredutseerin kasutades reeglit %d (%s)\n"
-"\n"
+msgid "%s contains "
+msgstr "%s sisaldab "
 
-#: src/conflicts.c:668 src/conflicts.c:682
+#: src/conflicts.c:532
 #, c-format
-msgid "    %-4s\treduce using rule %d (%s)\n"
-msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
+msgid "expected %d shift/reduce conflict\n"
+msgid_plural "expected %d shift/reduce conflicts\n"
+msgstr[0] "eeldasime %d nihutamine/redutseerimine konflikti\n"
+msgstr[1] "eeldasime %d nihutamine/redutseerimine konflikti\n"
 
-#: src/conflicts.c:709
+#: src/files.c:157
 #, c-format
-msgid "    $default\treduce using rule %d (%s)\n"
-msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
+msgid "cannot open file `%s'"
+msgstr "faili `%s' ei saa avada"
 
-#: 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:176
+msgid "cannot close file"
+msgstr "faili ei õnnestu sulgeda"
 
-#. Some efforts were made to ease the translators' task, please
-#. continue.
-#: src/getargs.c:74
+#: src/getargs.c:99
 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison genereerib parsereid LALR(1) grammatikatele.\n"
 
-#: src/getargs.c:78
+#: src/getargs.c:103
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "Kasuta: %s [VÕTI]...FAIL\n"
 
-#: src/getargs.c:82
+#: src/getargs.c:107
 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"
@@ -141,7 +116,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:88
+#: src/getargs.c:113
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
@@ -153,742 +128,576 @@ msgstr ""
 "  -V, --version   esita versiooniinfo ja lõpeta töö\n"
 "  -y, --yacc      emuleeri POSIX yacc\n"
 
-#: src/getargs.c:95
-#, fuzzy
+#: src/getargs.c:120
 msgid ""
 "Parser:\n"
+"  -S, --skeleton=FILE        specify the skeleton to use\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"
-"  -r, --raw                  number the tokens from 3\n"
 "  -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:107
+#: src/getargs.c:132
+#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
-"  -v, --verbose              also produce an explanation of the automaton\n"
+"  -r, --report=THINGS        also produce details on the automaton\n"
+"  -v, --verbose              same as `--report=state'\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:115
+#: src/getargs.c:143
+msgid ""
+"THINGS is a list of comma separated words that can include:\n"
+"  `state'        describe the states\n"
+"  `itemset'      complete the core item sets with their closure\n"
+"  `lookahead'    explicitly associate lookaheads to items\n"
+"  `solved'       describe shift/reduce conflicts solving\n"
+"  `all'          include all the above information\n"
+"  `none'         disable the report\n"
+msgstr ""
+
+#: src/getargs.c:154
 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:129
+#: src/getargs.c:168
 #, c-format
 msgid "bison (GNU Bison) %s"
+msgstr "bison (GNU Bison) %s"
+
+#: src/getargs.c:170
+msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
-#: src/getargs.c:134
-msgid "Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
+#: src/getargs.c:174
+#, fuzzy, c-format
+msgid "Copyright (C) %d Free Software Foundation, Inc.\n"
 msgstr ""
+"Autoriõigus 1984, 1986, 1989, 1992, 2000, 2001, 2002\n"
+"Free Software Foundation, Inc.\n"
 
-#: src/getargs.c:138
+#: src/getargs.c:176
 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:217
+#: src/getargs.c:333
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr ""
+msgstr "Lisainfo saamiseks proovige `%s --help'.\n"
 
-#: src/getargs.c:225
+#: src/getargs.c:340
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: puudub grammatikafail\n"
 
-#: src/getargs.c:229
+#: src/getargs.c:344
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
 
-#: src/lalr.c:312
+#: src/lalr.c:110
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 
-#: src/lex.c:83
-msgid "unexpected `/' found and ignored"
-msgstr "leidsin ja ignoreerin ootamatu `/'"
-
-#: src/lex.c:112 src/reader.c:301
-msgid "unterminated comment"
-msgstr "lõpetamata kommentaar"
-
-#: src/lex.c:144
-msgid "unexpected end of file"
-msgstr "ootamatu faililõpp"
-
-#: src/lex.c:167
-msgid "unescaped newline in constant"
-msgstr "paojadata reavahetus konstandis"
-
-#: 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:234
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
+#: parse-gram.y:344
+msgid "POSIX forbids declarations in the grammar"
+msgstr ""
 
-#: src/lex.c:246
+#: src/print.c:46
 #, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "tundmatu paojada: `\\' järgneb `%s'"
-
-#: src/lex.c:340
-msgid "unterminated type name at end of file"
-msgstr "lõpetamata tüübinimi faili lõpus"
-
-#: src/lex.c:343
-msgid "unterminated type name"
-msgstr "lõpetamata tüübinimi"
-
-#: src/lex.c:447
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
+msgid " type %d is %s\n"
+msgstr " tüüp %d on %s\n"
 
-#: src/main.c:104
-#, c-format
-msgid "%s: internal error: %s\n"
-msgstr "%s: sisemine viga: %s\n"
+#: src/print.c:162
+#, fuzzy, c-format
+msgid "shift, and go to state %d\n"
+msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
 
-#: src/nullable.c:52
-msgid "Entering set_nullable"
-msgstr "Entering set_nullable"
+#: src/print.c:164
+#, fuzzy, c-format
+msgid "go to state %d\n"
+msgstr "    %-4s\tliigu olekule %d\n"
 
-#: src/output.c:1002
-#, c-format
-msgid "maximum table size (%d) exceeded"
-msgstr "ületati maksimaalset tabelisuurust (%d)"
+#: src/print.c:201
+#, fuzzy
+msgid "error (nonassociative)\n"
+msgstr "%-4s\tviga (mitteassotsiatiivne)"
 
-#: src/print.c:38
-#, c-format
-msgid " type %d is %s\n"
-msgstr " tüüp %d on %s\n"
+#: src/print.c:290
+#, fuzzy, c-format
+msgid "reduce using rule %d (%s)"
+msgstr "$default\tredutseerin kasutades reeglit %d (%s)"
 
-#: src/print.c:86
-#, c-format
-msgid "   (rule %d)"
-msgstr "   (reegel %d)"
+#: src/print.c:323 src/print.c:386
+msgid "$default"
+msgstr ""
 
-#: src/print.c:112
+#: src/print.c:405
 msgid "    $default\taccept\n"
 msgstr "    $default\taktsepteerin\n"
 
-#: src/print.c:114
+#: src/print.c:407
 msgid "    NO ACTIONS\n"
 msgstr "    TEGEVUSI POLE\n"
 
-#. I.e. strcmp(tags[symbol],"$")==0
-#: src/print.c:132
-#, c-format
-msgid "    $   \tgo to state %d\n"
-msgstr "    $   \tliigu olekule %d\n"
-
-#: src/print.c:134
-#, c-format
-msgid "    %-4s\tshift, and go to state %d\n"
-msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
-
-#: src/print.c:158
-#, c-format
-msgid "    %-4s\terror (nonassociative)\n"
-msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
-
-#: src/print.c:186
+#: src/print.c:428
 #, c-format
-msgid "    %-4s\tgo to state %d\n"
-msgstr "    %-4s\tliigu olekule %d\n"
-
-#: src/print.c:198
-#, fuzzy, c-format
 msgid "state %d"
-msgstr ""
-"\n"
-"\n"
-"olek %d\n"
-"\n"
+msgstr "olek %d"
 
-#: src/print.c:228
-#, fuzzy
-msgid "Grammar"
-msgstr ""
-"\n"
-"Grammatika\n"
-
-#: src/print.c:234
-#, c-format
-msgid "rule %-4d %s ->"
-msgstr "reegel %-4d %s ->"
-
-#: src/print.c:240
-msgid "\t\t/* empty */"
-msgstr "\t\t/* tühi */"
-
-#: src/print.c:246
-#, fuzzy
+#: src/print.c:462
 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:296
-#, fuzzy
+#: src/print.c:489
 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:323
+#: src/print.c:518
 msgid " on left:"
 msgstr " vasakul:"
 
-#: src/print.c:338
+#: src/print.c:533
 msgid " on right:"
 msgstr " paremal:"
 
-#: src/reader.c:82
-msgid "   Skipping to next \\n"
-msgstr "   Liigun järgmisele \\n"
-
-#: src/reader.c:84
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Liigun järgmisele %c"
-
-#: src/reader.c:135 src/reader.c:147
-msgid "invalid $ value"
-msgstr "vigane $ väärtus"
-
-#: src/reader.c:176 src/reader.c:194
-msgid "unterminated string at end of file"
-msgstr "lõpetamata sõne faili lõpus"
-
-#: src/reader.c:179
-msgid "unterminated string"
-msgstr "lõpetamata sõne"
-
-#: src/reader.c:368 src/reader.c:448
-#, fuzzy, c-format
-msgid "%s is invalid"
-msgstr "@%s on vigane"
-
-#: src/reader.c:416
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "`%s' $$ ei oma deklareeritud tüüpi"
-
-#: src/reader.c:441
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d `%s' ei oma deklareeritud tüüpi"
-
-#: src/reader.c:495
-msgid "unterminated `%{' definition"
-msgstr "lõpetamata `%{' definitsioon"
-
-#: src/reader.c:540 src/reader.c:656 src/reader.c:706
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "Enneaegne EOF peale %s"
-
-#: src/reader.c:557
-#, c-format
-msgid "symbol `%s' used more than once as a literal string"
-msgstr ""
-
-#: src/reader.c:560
-#, c-format
-msgid "symbol `%s' given more than one literal string"
-msgstr ""
-
-#: src/reader.c:582 src/reader.c:725
-#, c-format
-msgid "symbol %s redefined"
-msgstr "sümbol %s on uuesti defineeritud"
-
-#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1296
+#: src/reader.c:53
 #, c-format
-msgid "type redeclaration for %s"
-msgstr "%s tüübi uuesti deklareerimine"
-
-#: src/reader.c:602
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "`%s' ei ole %s sees lubatud"
-
-#: src/reader.c:619 src/reader.c:779
-#, fuzzy, c-format
 msgid "multiple %s declarations"
-msgstr "korduvad %start deklaratsioonid"
-
-#: src/reader.c:621 src/reader.c:1274
-#, fuzzy, c-format
-msgid "invalid %s declaration"
-msgstr "vigane %start deklaratsioon"
-
-#: src/reader.c:641
-msgid "%type declaration has no <typename>"
-msgstr "%type deklaratsioonis puudub <tüübinimi>"
-
-#: src/reader.c:676
-msgid "invalid %%type declaration due to item: %s"
-msgstr "vigane %%type deklaratsioon, element: %s"
-
-#: src/reader.c:721
-#, c-format
-msgid "redefining precedence of %s"
-msgstr "%s prioriteedi uus definitsioon"
-
-#: src/reader.c:745
-#, c-format
-msgid "invalid text (%s) - number should be after identifier"
-msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
-
-#: src/reader.c:755
-#, c-format
-msgid "unexpected item: %s"
-msgstr "ootamatu element: %s"
-
-#: src/reader.c:817 src/reader.c:1104 src/reader.c:1176
-#, fuzzy, c-format
-msgid "unmatched %s"
-msgstr "puudub `{'"
-
-#: src/reader.c:849
-#, fuzzy
-msgid "argument of %%expect is not an integer"
-msgstr "%expect argument ei ole täisarv"
+msgstr "korduvad %s deklaratsioonid"
 
-#: src/reader.c:896
+#: src/reader.c:139
 #, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "tundmatu element %s, eeldasin identifikaatorit"
-
-#: src/reader.c:920
-#, c-format
-msgid "expected string constant instead of %s"
-msgstr "eeldasin %s asemel sõnekonstanti"
-
-#: src/reader.c:1020
-#, c-format
-msgid "unrecognized: %s"
-msgstr "tundmatu: %s"
-
-#: src/reader.c:1025
-msgid "no input grammar"
-msgstr "sisendgrammatikat pole"
-
-#: src/reader.c:1030
-#, c-format
-msgid "unknown character: %s"
-msgstr "tundmatu sümbol: %s"
-
-#: src/reader.c:1199
-#, c-format
-msgid "unterminated %guard clause"
-msgstr "lõpetamata %guard klausel"
-
-#: src/reader.c:1361
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
-
-#: src/reader.c:1368
-msgid "grammar starts with vertical bar"
-msgstr "grammatika algab püstkriipsuga"
+msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgstr ""
 
-#: src/reader.c:1399
+#: src/reader.c:237
 #, 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:1501
-msgid "two @prec's in a row"
-msgstr "kaks @prec ühel real"
-
-#: src/reader.c:1509
-#, fuzzy
-msgid "%%guard present but %%semantic_parser not specified"
-msgstr "%guard on määratud, aga %semantic_parser ei ole"
-
-#: src/reader.c:1518
-msgid "two actions at end of one rule"
-msgstr "kaks tegevust ühe reegli lõpus"
-
-#: src/reader.c:1532
+#: src/reader.c:262
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
-#: src/reader.c:1538
+#: src/reader.c:270
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
-#: src/reader.c:1582
-#, c-format
-msgid "invalid input: %s"
-msgstr "vigane sisend: %s"
+#: src/reader.c:341
+msgid "two @prec's in a row"
+msgstr "kaks @prec ühel real"
 
-#: src/reader.c:1590
+#: src/reader.c:351
 #, 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:1593
-msgid "no rules in the input grammar"
-msgstr "sisendgrammatikas pole reegleid"
+msgid "%%dprec affects only GLR parsers"
+msgstr ""
 
-#: src/reader.c:1617
+#: src/reader.c:353
 #, c-format
-msgid "symbol %s is used, but is not defined as a token and has no rules"
+msgid "%%dprec must be followed by positive number"
 msgstr ""
-"kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad "
-"reeglid"
 
-#: src/reader.c:1723
+#: src/reader.c:355
 #, c-format
-msgid "conflicting precedences for %s and %s"
-msgstr "%s ja %s omavad konfliktseid prioriteete"
+msgid "only one %%dprec allowed per rule"
+msgstr ""
 
-#: src/reader.c:1735
+#: src/reader.c:366
 #, c-format
-msgid "conflicting assoc values for %s and %s"
-msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
+msgid "%%merge affects only GLR parsers"
+msgstr ""
 
-#: src/reader.c:1786
+#: src/reader.c:368
 #, c-format
-msgid "tokens %s and %s both assigned number %d"
-msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
+msgid "only one %%merge allowed per rule"
+msgstr ""
 
-#: src/reader.c:1799
-#, c-format
-msgid "the start symbol %s is undefined"
-msgstr "stardisümbol %s ei ole defineeritud"
+#: src/reader.c:512
+msgid "no rules in the input grammar"
+msgstr "sisendgrammatikas pole reegleid"
 
-#: src/reader.c:1801
+#: src/reader.c:544
 #, c-format
-msgid "the start symbol %s is a token"
-msgstr "stardisümbol %s on märk"
+msgid "too many symbols (tokens plus nonterminals); maximum %d"
+msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
 
-#: src/reduce.c:404
+#: src/reduce.c:243 src/reduce.c:309 src/reduce.c:400
 #, fuzzy
-msgid "Useless nonterminals:"
-msgstr ""
-"Kasutamata mitteterminalid:\n"
-"\n"
+msgid "warning"
+msgstr "hoiatus: "
 
-#: src/reduce.c:418
+#: src/reduce.c:243
 #, fuzzy
-msgid "Terminals which are not used:"
-msgstr ""
-"\n"
-"\n"
-"Terminalid, mida ei kasutatud:\n"
-"\n"
+msgid "useless rule"
+msgstr "%d kasutamata reegel"
 
-#: src/reduce.c:429
+#: src/reduce.c:309
 #, fuzzy
-msgid "Useless rules:"
-msgstr ""
-"\n"
-"\n"
-"Kasutamata reeglid:\n"
-"\n"
+msgid "useless nonterminal"
+msgstr "%d kasutamata mitteterminal"
 
-#: src/reduce.c:459
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-"Muutujad\n"
-"--------\n"
-"\n"
-
-#: src/reduce.c:460
-msgid "Value  Sprec    Sassoc    Tag\n"
-msgstr "Value  Sprec    Sassoc    Tag\n"
+#: src/reduce.c:356
+msgid "Useless nonterminals:"
+msgstr "Kasutamata mitteterminalid:"
 
-#: src/reduce.c:464
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-"Reeglid\n"
-"-------\n"
-"\n"
+#: src/reduce.c:369
+msgid "Terminals which are not used:"
+msgstr "Terminalid, mida ei kasutatud:"
 
-#: src/reduce.c:474
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-"Interpreteeritud reeglid\n"
-"------------------------\n"
-"\n"
+#: src/reduce.c:378
+#, fuzzy
+msgid "Useless rules"
+msgstr "Kasutamata reeglid:"
 
-#: src/reduce.c:492
+#: src/reduce.c:395
 #, c-format
-msgid "%d rules never reduced\n"
-msgstr "%d reeglit ei redutseeritud\n"
+msgid "%d rule never reduced\n"
+msgid_plural "%d rules never reduced\n"
+msgstr[0] "%d reegel ei redutseeru\n"
+msgstr[1] "%d reeglit ei redutseeru\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:403
 #, c-format
-msgid "%s contains "
-msgstr "%s sisaldab "
+msgid "%d useless nonterminal"
+msgid_plural "%d useless nonterminals"
+msgstr[0] "%d kasutamata mitteterminal"
+msgstr[1] "%d kasutamata mitteterminali"
 
-#: src/reduce.c:498
-#, c-format
-msgid "%d useless nonterminal%s"
-msgstr "%d kasutamata mitteterminali%s"
-
-#: src/reduce.c:503
+#: src/reduce.c:409
 msgid " and "
 msgstr " ja "
 
-#: src/reduce.c:507
+#: src/reduce.c:412
 #, c-format
-msgid "%d useless rule%s"
-msgstr "%d kasutamata reeglit%s"
+msgid "%d useless rule"
+msgid_plural "%d useless rules"
+msgstr[0] "%d kasutamata reegel"
+msgstr[1] "%d kasutamata reeglit"
 
-#: src/reduce.c:540
+#: src/reduce.c:442
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
 
-#: src/reduce.c:553
+#: scan-gram.l:559
 #, c-format
-msgid ""
-"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr ""
-"redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d "
-"reeglit%s.\n"
+msgid "$$ of `%s' has no declared type"
+msgstr "`%s' $$ ei oma deklareeritud tüüpi"
 
-#: lib/error.c:102
-msgid "Unknown system error"
-msgstr ""
+#: scan-gram.l:576 scan-gram.l:663
+#, fuzzy, c-format
+msgid "invalid value: %s%d"
+msgstr "vigane @ väärtus"
+
+#: scan-gram.l:583
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d `%s' ei oma deklareeritud tüüpi"
 
-#: lib/getopt.c:675
+#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:670 scan-gram.l:687
+#, c-format
+msgid "%s is invalid"
+msgstr "%s on vigane"
+
+#: 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"
 
-#: lib/obstack.c:477
-#, fuzzy
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
 msgid "memory exhausted"
-msgstr "%s: mälu on otsas\n"
-
-#. Get translations for open and closing quotation marks.
-#.
-#. The message catalog should translate "`" to a left
-#. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
-#.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. 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:262
+msgstr "mälu on otsas"
+
+#: lib/quotearg.c:274
 msgid "`"
-msgstr ""
+msgstr "`"
 
-#: lib/quotearg.c:263
+#: lib/quotearg.c:275
 msgid "'"
-msgstr ""
-
-#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
-#. before exiting when memory is exhausted.  Goes through gettext.
-#: lib/xmalloc.c:66
-#, 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 "too many states (max %d)"
+#~ msgstr "liiga palju olekuid (maks %d)"
 
-#~ msgid "unmatched close-brace (`}')"
-#~ msgstr "puudub sulgev loogeline sulg (`}')"
+#~ msgid "   (rule %d)"
+#~ msgstr "   (reegel %d)"
 
-#~ msgid "unmatched right brace (`}')"
-#~ msgstr "puudub sulgev loogeline sulg (`}')"
-
-#~ msgid "ill-formed %type declaration"
-#~ msgstr "vigaselt formeeritud %type deklaratsioon"
+#~ msgid "    %-4s\terror (nonassociative)\n"
+#~ msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
 
 #~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "FIRSTS\n"
+#~ "    $default\treduce using rule %d (%s)\n"
 #~ "\n"
 #~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "FIRSTS\n"
+#~ "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "%s firsts\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "%s firsts\n"
-#~ "\n"
+#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+#~ msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "FDERIVES\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "FDERIVES\n"
+#~ msgid "    %-4s\treduce using rule %d (%s)\n"
+#~ msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "%s derives\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "%s derives\n"
-#~ "\n"
+#~ msgid "    $default\treduce using rule %d (%s)\n"
+#~ msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\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"
+#~ msgid "invalid $ value"
+#~ msgstr "vigane $ väärtus"
+
+#~ msgid "Grammar"
+#~ msgstr "Grammatika"
+
+#~ msgid "Number, Line, Rule"
+#~ msgstr "Number, rida, reegel"
+
+#~ msgid "  %3d %3d %s ->"
+#~ msgstr "  %3d %3d %s ->"
+
+#~ msgid "empty"
+#~ msgstr "tühi"
+
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "leidsin ja ignoreerin ootamatu `/'"
+
+#~ msgid "unterminated comment"
+#~ msgstr "lõpetamata kommentaar"
+
+#~ msgid "unexpected end of file"
+#~ msgstr "ootamatu faililõpp"
+
+#~ msgid "unescaped newline in constant"
+#~ msgstr "paojadata reavahetus konstandis"
+
+#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
+
+#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
+
+#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgstr "tundmatu paojada: `\\' järgneb `%s'"
+
+#~ msgid "unterminated type name at end of file"
+#~ msgstr "lõpetamata tüübinimi faili lõpus"
+
+#~ msgid "unterminated type name"
+#~ msgstr "lõpetamata tüübinimi"
+
+#~ msgid "use \"...\" for multi-character literal tokens"
+#~ msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
+
+#~ msgid "`%s' supports no argument: %s"
+#~ msgstr "`%s' ei toeta argumente: %s"
+
+#~ msgid "`%s' requires an argument"
+#~ msgstr "võti `%s' nõuab argumenti"
+
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "`%s' ei ole enam toetatud"
+
+#~ msgid "   Skipping to next \\n"
+#~ msgstr "   Liigun järgmisele \\n"
+
+#~ msgid "   Skipping to next %c"
+#~ msgstr "   Liigun järgmisele %c"
+
+#~ msgid "unterminated string at end of file"
+#~ msgstr "lõpetamata sõne faili lõpus"
+
+#~ msgid "unterminated string"
+#~ msgstr "lõpetamata sõne"
+
+#~ msgid "Premature EOF after %s"
+#~ msgstr "Enneaegne EOF peale %s"
+
+#~ msgid "`%s' is invalid in %s"
+#~ msgstr "`%s' ei ole %s sees lubatud"
+
+#~ msgid "%type declaration has no <typename>"
+#~ msgstr "%type deklaratsioonis puudub <tüübinimi>"
+
+#~ msgid "invalid %%type declaration due to item: %s"
+#~ msgstr "vigane %%type deklaratsioon, element: %s"
+
+#~ msgid "invalid text (%s) - number should be after identifier"
+#~ msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
+
+#~ msgid "unexpected item: %s"
+#~ msgstr "ootamatu element: %s"
+
+#~ msgid "unmatched %s"
+#~ msgstr "puudub %s"
+
+#~ msgid "invalid %s declaration"
+#~ msgstr "vigane %s deklaratsioon"
+
+#~ msgid "unrecognized: %s"
+#~ msgstr "tundmatu: %s"
+
+#~ msgid "no input grammar"
+#~ msgstr "sisendgrammatikat pole"
+
+#~ msgid "unknown character: %s"
+#~ msgstr "tundmatu sümbol: %s"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "grammatika algab püstkriipsuga"
+
+#~ msgid "previous rule lacks an ending `;'"
+#~ msgstr "eelmisel reeglil puudub lõpetav `;'"
+
+#~ msgid "invalid input: %s"
+#~ msgstr "vigane sisend: %s"
+
+#~ msgid "two actions at end of one rule"
+#~ msgstr "kaks tegevust ühe reegli lõpus"
+
+#~ msgid "reduce"
+#~ msgstr "redutseerimine"
+
+#~ msgid "shift"
+#~ msgstr "nihutamine"
+
+#~ msgid "an error"
+#~ msgstr "viga"
+
+#~ msgid "symbol %s is used, but is not defined as a token and has no rules"
 #~ 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"
+#~ "kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel "
+#~ "puuduvad reeglid"
+
+#~ msgid "symbol `%s' used more than once as a literal string"
+#~ msgstr "sümbolit `%s' on kasutatud enam kui kord literaal sõnena"
+
+#~ msgid "symbol `%s' given more than one literal string"
+#~ msgstr "sümbolile `%s' on antud enam kui üks literaal sõne"
+
+#~ msgid "conflicting precedences for %s and %s"
+#~ msgstr "%s ja %s omavad konfliktseid prioriteete"
+
+#~ msgid "conflicting assoc values for %s and %s"
+#~ msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
+
+#~ msgid "tokens %s and %s both assigned number %d"
+#~ msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
+
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "lõpetamata `%{' definitsioon"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "sümbol %s on uuesti defineeritud"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "%s tüübi uuesti deklareerimine"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "%s prioriteedi uus definitsioon"
+
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "%%expect argument ei ole täisarv"
 
-#~ msgid "gotos"
-#~ msgstr "gotod"
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "tundmatu element %s, eeldasin identifikaatorit"
 
-#~ msgid "fatal error: %s\n"
-#~ msgstr "fataalne viga: %s\n"
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "eeldasin %s asemel sõnekonstanti"
 
-#~ msgid "\"%s\", line %d: %s\n"
-#~ msgstr "\"%s\", rida %d: %s\n"
+#~ msgid "the start symbol %s is undefined"
+#~ msgstr "stardisümbol %s ei ole defineeritud"
 
-#~ msgid "error: %s\n"
-#~ msgstr "viga: %s\n"
+#~ msgid "the start symbol %s is a token"
+#~ msgstr "stardisümbol %s on märk"
 
-#~ msgid "(\"%s\", line %d) error: %s\n"
-#~ msgstr "(\"%s\", rida %d) viga: %s\n"
+#~ msgid "%%guard present but %%semantic_parser not specified"
+#~ msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
 
-#~ msgid "limit of %d exceeded, too many %s"
-#~ msgstr "limiit %d ületatud, liiga palju %s"
+#~ msgid "maximum table size (%d) exceeded"
+#~ msgstr "ületati maksimaalset tabelisuurust (%d)"
 
-#~ msgid "unterminated comment in `%{' definition"
-#~ msgstr "lõpetamata kommentaar `%{' definitsioonis"
+#~ msgid "    $   \tgo to state %d\n"
+#~ msgstr "    $   \tliigu olekule %d\n"
 
-#~ msgid "invalid @-construct"
-#~ msgstr "vigane @-konstruktsioon"
+#~ msgid "unterminated %guard clause"
+#~ msgstr "lõpetamata %guard klausel"