* lib/timevar.c (get_time): Include children time.

[bison.git] / po / et.po

diff --git a/po/et.po b/po/et.po
index 6412401c96126ae41868446d2ac8768eafd39ad7..77979cbef220378514bb140e3631660d9c39ecd3 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -4,115 +4,111 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: bison 1.28d\n"
-"POT-Creation-Date: 2002-03-19 09:29+0100\n"
-"PO-Revision-Date: 2001-08-29 17:06+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"
 "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:195
-#, c-format
-msgid "too many states (max %d)"
-msgstr "liiga palju olekuid (maks %d)"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

 
 #: src/complain.c:99 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemi viga"
 
 
 #: src/complain.c:99 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemi viga"
 

-#: src/complain.c:150
+#: src/complain.c:148 src/complain.c:197

 msgid "warning: "
 msgstr "hoiatus: "
 
 msgid "warning: "
 msgstr "hoiatus: "
 

-#: src/complain.c:238
+#: src/complain.c:329 src/complain.c:362

 msgid "fatal error: "
 msgstr "fataalne viga: "
 
 msgid "fatal error: "
 msgstr "fataalne viga: "
 

-#: src/conflicts.c:47
-#, c-format
-msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
+#: 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"
 
 msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
 

-#: src/conflicts.c:112 src/conflicts.c:134
-msgid "reduce"
-msgstr "redutseerimine"
-
-#: src/conflicts.c:117 src/conflicts.c:129
-msgid "shift"
-msgstr "nihutamine"
-
-#: src/conflicts.c:139
-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:280
+#: src/conflicts.c:87

 #, fuzzy, c-format
 #, 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:403
+#, c-format

 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"

-msgstr[0] " %d nihutamine/redutseerimine konflikti"
+msgstr[0] "%d nihutamine/redutseerimine konflikt"
+msgstr[1] "%d nihutamine/redutseerimine konflikti"

 
 

-#: src/conflicts.c:287
-#, fuzzy
+#: src/conflicts.c:410

 msgid "and"
 msgid "and"

-msgstr " ja"
+msgstr "ja"

 
 

-#: src/conflicts.c:293
-#, fuzzy, c-format
+#: src/conflicts.c:416
+#, c-format

 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"

-msgstr[0] " %d redutseerimine/redutseerimine konflikti"
+msgstr[0] "%d redutseerimine/redutseerimine konflikt"
+msgstr[1] "%d redutseerimine/redutseerimine konflikti"

 
 

-#: src/conflicts.c:318
-#, fuzzy, c-format
+#: src/conflicts.c:441
+#, c-format

 msgid "State %d contains "
 msgid "State %d contains "

-msgstr "Olek %d sisaldab"
+msgstr "Olek %d sisaldab "

 
 

-#: src/conflicts.c:365
+#: src/conflicts.c:514

 msgid "conflicts: "
 msgstr "konfliktid: "
 
 msgid "conflicts: "
 msgstr "konfliktid: "
 

-#: src/conflicts.c:367
+#: src/conflicts.c:516

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

-#: src/conflicts.c:371
+#: src/conflicts.c:520

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

-#: src/conflicts.c:376 src/reduce.c:457
+#: src/conflicts.c:525

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

-#: src/conflicts.c:383
-#, fuzzy, c-format
+#: src/conflicts.c:532
+#, c-format

 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"

-msgstr[0] " %d nihutamine/redutseerimine konflikti"
+msgstr[0] "eeldasime %d nihutamine/redutseerimine konflikti\n"
+msgstr[1] "eeldasime %d nihutamine/redutseerimine konflikti\n"

 
 

-#: src/files.c:159
+#: src/files.c:157

 #, c-format
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"
 
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"
 

-#: src/files.c:178
+#: src/files.c:176

 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"
 
 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"
 

-#: src/getargs.c:56
+#: src/getargs.c:99

 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison genereerib parsereid LALR(1) grammatikatele.\n"
 
 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison genereerib parsereid LALR(1) grammatikatele.\n"
 

-#: src/getargs.c:60
+#: src/getargs.c:103

 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "Kasuta: %s [VÕTI]...FAIL\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "Kasuta: %s [VÕTI]...FAIL\n"
 

-#: src/getargs.c:64
+#: 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"
 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"


@@ -120,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"
 
 "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:70
+#: src/getargs.c:113

 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"


@@ -132,7 +128,7 @@ msgstr ""
 "  -V, --version   esita versiooniinfo ja lõpeta töö\n"
 "  -y, --yacc      emuleeri POSIX yacc\n"
 
 "  -V, --version   esita versiooniinfo ja lõpeta töö\n"
 "  -y, --yacc      emuleeri POSIX yacc\n"
 

-#: src/getargs.c:77
+#: src/getargs.c:120

 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"


@@ -152,12 +148,13 @@ msgstr ""
 "  -n, --no-parser            genereeri ainult tabelid\n"
 "  -k, --token-table          lisa ka sümbolite nimede tabel\n"
 
 "  -n, --no-parser            genereeri ainult tabelid\n"
 "  -k, --token-table          lisa ka sümbolite nimede tabel\n"
 

-#: src/getargs.c:89
+#: src/getargs.c:132

 #, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
 #, 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          leave output to FILE\n"
 "  -g, --graph                also produce a VCG description of the "
 "  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n"
 "  -o, --output=FILE          leave output to FILE\n"
 "  -g, --graph                also produce a VCG description of the "


@@ -170,27 +167,38 @@ msgstr ""
 "  -o, --output-file=FAIL     jäta väljund FAILi\n"
 "  -g, --graph                loo automaadi kirjeldus VCG graafina\n"
 
 "  -o, --output-file=FAIL     jäta väljund FAILi\n"
 "  -g, --graph                loo automaadi kirjeldus VCG graafina\n"
 

-#: src/getargs.c:99
+#: 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"
 
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "Teatage palun vigadest aadressil <bug-bison@gnu.org>.\n"
 

-#: src/getargs.c:113
+#: src/getargs.c:168

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

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

 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 

-#: src/getargs.c:119
+#: src/getargs.c:174

 #, fuzzy, c-format
 msgid "Copyright (C) %d Free Software Foundation, Inc.\n"
 msgstr ""
 #, fuzzy, c-format
 msgid "Copyright (C) %d Free Software Foundation, Inc.\n"
 msgstr ""

-"Autoriõigus 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, "
-"Inc.\n"
+"Autoriõigus 1984, 1986, 1989, 1992, 2000, 2001, 2002\n"
+"Free Software Foundation, Inc.\n"

 
 

-#: src/getargs.c:121
+#: 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"
 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"


@@ -198,417 +206,164 @@ msgstr ""
 "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
 
 "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
 

-#: src/getargs.c:200 src/lex.c:595
-#, c-format
-msgid "`%s' is no longer supported"
-msgstr "`%s' ei ole enam toetatud"
-
-#: src/getargs.c:224
+#: src/getargs.c:333

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisainfo saamiseks proovige `%s --help'.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisainfo saamiseks proovige `%s --help'.\n"
 

-#: src/getargs.c:233
+#: src/getargs.c:340

 #, 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:237
+#: src/getargs.c:344

 #, 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:172
+#: src/lalr.c:110

 #, 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:77
-msgid "unexpected `/' found and ignored"
-msgstr "leidsin ja ignoreerin ootamatu `/'"
-
-#: src/lex.c:106 src/reader.c:302
-msgid "unterminated comment"
-msgstr "lõpetamata kommentaar"
-
-#: src/lex.c:138
-msgid "unexpected end of file"
-msgstr "ootamatu faililõpp"
-
-#: src/lex.c:157
-msgid "unescaped newline in constant"
-msgstr "paojadata reavahetus konstandis"
-
-#: src/lex.c:196
-#, c-format
-msgid "octal value outside range 0...255: `\\%o'"
-msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
-
-#: src/lex.c:221
-#, c-format
-msgid "hexadecimal value above 255: `\\x%x'"
-msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
-
-#: src/lex.c:233
-#, c-format
-msgid "unknown escape sequence: `\\' followed by `%s'"
-msgstr "tundmatu paojada: `\\' järgneb `%s'"
-
-#: src/lex.c:264
-msgid "unterminated type name at end of file"
-msgstr "lõpetamata tüübinimi faili lõpus"
-
-#: src/lex.c:267
-msgid "unterminated type name"
-msgstr "lõpetamata tüübinimi"
-
-#: src/lex.c:359
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
-
-#: src/lex.c:567
-#, c-format
-msgid "`%s' supports no argument: %s"
+#: parse-gram.y:344
+msgid "POSIX forbids declarations in the grammar"

 msgstr ""
 
 msgstr ""
 

-#: src/lex.c:584
-#, fuzzy, c-format
-msgid "`%s' requires an argument"
-msgstr "%s: võti `%s' nõuab argumenti\n"
-
-#: src/output.c:795
-#, c-format
-msgid "maximum table size (%d) exceeded"
-msgstr "ületati maksimaalset tabelisuurust (%d)"
-
-#: src/print.c:45
+#: src/print.c:46

 #, 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:107
-#, c-format
-msgid "   (rule %d)"
-msgstr "   (reegel %d)"
-
-#: src/print.c:128
-#, c-format
-msgid "    %-4s\tshift, and go to state %d\n"
+#: src/print.c:162
+#, fuzzy, c-format
+msgid "shift, and go to state %d\n"

 msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
 
 msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
 

-#: src/print.c:145
-#, c-format
-msgid "    %-4s\terror (nonassociative)\n"
-msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
-
-#: src/print.c:169
-#, c-format
-msgid "    %-4s\tgo to state %d\n"
+#: src/print.c:164
+#, fuzzy, c-format
+msgid "go to state %d\n"

 msgstr "    %-4s\tliigu olekule %d\n"
 
 msgstr "    %-4s\tliigu olekule %d\n"
 

-#: src/print.c:193 src/print.c:226
-#, c-format
-msgid ""
-"    $default\treduce using rule %d (%s)\n"
-"\n"
-msgstr ""
-"    $default\tredutseerin kasutades reeglit %d (%s)\n"
-"\n"
-
-#: src/print.c:222 src/print.c:295
-#, c-format
-msgid "    %-4s\t[reduce using rule %d (%s)]\n"
-msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
+#: src/print.c:201
+#, fuzzy
+msgid "error (nonassociative)\n"
+msgstr "%-4s\tviga (mitteassotsiatiivne)"

 
 

-#: src/print.c:276 src/print.c:289
-#, c-format
-msgid "    %-4s\treduce using rule %d (%s)\n"
-msgstr "    %-4s\tredutseerin kasutades reeglit %d (%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:304
-#, c-format
-msgid "    $default\treduce using rule %d (%s)\n"
-msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
+#: src/print.c:323 src/print.c:386
+msgid "$default"
+msgstr ""

 
 

-#: src/print.c:320
+#: src/print.c:405

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

-#: src/print.c:322
+#: src/print.c:407

 msgid "    NO ACTIONS\n"
 msgstr "    TEGEVUSI POLE\n"
 
 msgid "    NO ACTIONS\n"
 msgstr "    TEGEVUSI POLE\n"
 

-#: src/print.c:335
+#: src/print.c:428

 #, c-format
 msgid "state %d"
 msgstr "olek %d"
 
 #, c-format
 msgid "state %d"
 msgstr "olek %d"
 

-#: src/print.c:366
-msgid "Grammar"
-msgstr "Grammatika"
-
-#: src/print.c:367
-msgid "Number, Line, Rule"
-msgstr ""
-
-#: src/print.c:372
-#, fuzzy, c-format
-msgid "  %3d %3d %s ->"
-msgstr "reegel %-4d %s ->"
-
-#: src/print.c:379
-msgid "empty"
-msgstr ""
-
-#: src/print.c:386
+#: src/print.c:462

 msgid "Terminals, with rules where they appear"
 msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
 
 msgid "Terminals, with rules where they appear"
 msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
 

-#: src/print.c:409
+#: src/print.c:489

 msgid "Nonterminals, with rules where they appear"
 msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
 
 msgid "Nonterminals, with rules where they appear"
 msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
 

-#: src/print.c:435
+#: src/print.c:518

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

-#: src/print.c:450
+#: src/print.c:533

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

-#: src/reader.c:100
-msgid "   Skipping to next \\n"
-msgstr "   Liigun järgmisele \\n"
-
-#: src/reader.c:102
-#, c-format
-msgid "   Skipping to next %c"
-msgstr "   Liigun järgmisele %c"
-
-#: src/reader.c:153 src/reader.c:165
-msgid "invalid $ value"
-msgstr "vigane $ väärtus"
-
-#: src/reader.c:192 src/reader.c:207
-msgid "unterminated string at end of file"
-msgstr "lõpetamata sõne faili lõpus"
-
-#: src/reader.c:195
-msgid "unterminated string"
-msgstr "lõpetamata sõne"
-
-#: src/reader.c:337 src/reader.c:401
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "vigane $ väärtus"
-
-#: src/reader.c:351 src/reader.c:423
-#, c-format
-msgid "%s is invalid"
-msgstr "%s on vigane"
-
-#: src/reader.c:391
-#, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "`%s' $$ ei oma deklareeritud tüüpi"
-
-#: src/reader.c:415
-#, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d `%s' ei oma deklareeritud tüüpi"
-
-#: src/reader.c:473
-msgid "unterminated `%{' definition"
-msgstr "lõpetamata `%{' definitsioon"
-
-#: src/reader.c:518 src/reader.c:636 src/reader.c:686 src/reader.c:934
-#, c-format
-msgid "Premature EOF after %s"
-msgstr "Enneaegne EOF peale %s"
-
-#: src/reader.c:535
-#, c-format
-msgid "symbol `%s' used more than once as a literal string"
-msgstr "sümbolit `%s' on kasutatud enam kui kord literaal sõnena"
-
-#: src/reader.c:538
-#, c-format
-msgid "symbol `%s' given more than one literal string"
-msgstr "sümbolile `%s' on antud enam kui üks literaal sõne"
-
-#: src/reader.c:559 src/reader.c:705
-#, c-format
-msgid "symbol %s redefined"
-msgstr "sümbol %s on uuesti defineeritud"
-
-#: src/reader.c:569 src/reader.c:651 src/reader.c:712
-#, c-format
-msgid "type redeclaration for %s"
-msgstr "%s tüübi uuesti deklareerimine"
-
-#: src/reader.c:581
-#, c-format
-msgid "`%s' is invalid in %s"
-msgstr "`%s' ei ole %s sees lubatud"
-
-#: src/reader.c:599 src/reader.c:758
+#: src/reader.c:53

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

-#: src/reader.c:601 src/reader.c:914 src/reader.c:929 src/reader.c:962
-#: src/reader.c:976 src/reader.c:1179
-#, c-format
-msgid "invalid %s declaration"
-msgstr "vigane %s deklaratsioon"
-
-#: src/reader.c:621
-msgid "%type declaration has no <typename>"
-msgstr "%type deklaratsioonis puudub <tüübinimi>"
-
-#: src/reader.c:656
-#, c-format
-msgid "invalid %%type declaration due to item: %s"
-msgstr "vigane %%type deklaratsioon, element: %s"
-
-#: src/reader.c:701
-#, c-format
-msgid "redefining precedence of %s"
-msgstr "%s prioriteedi uus definitsioon"
-
-#: 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:734
-#, c-format
-msgid "unexpected item: %s"
-msgstr "ootamatu element: %s"
-
-#: src/reader.c:791 src/reader.c:1150
-#, c-format
-msgid "unmatched %s"
-msgstr "puudub %s"
-
-#: src/reader.c:820
-#, c-format
-msgid "argument of %%expect is not an integer"
-msgstr "%%expect argument ei ole täisarv"
-
-#: src/reader.c:866
-#, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "tundmatu element %s, eeldasin identifikaatorit"
-
-#: src/reader.c:888
-#, c-format
-msgid "expected string constant instead of %s"
-msgstr "eeldasin %s asemel sõnekonstanti"
-
-#: src/reader.c:1081
-#, c-format
-msgid "unrecognized: %s"
-msgstr "tundmatu: %s"
-
-#: src/reader.c:1086
-msgid "no input grammar"
-msgstr "sisendgrammatikat pole"
-
-#: src/reader.c:1091
+#: src/reader.c:139

 #, c-format
 #, c-format

-msgid "unknown character: %s"
-msgstr "tundmatu sümbol: %s"
-
-#: src/reader.c:1266
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
-
-#: src/reader.c:1273
-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:1301
+#: 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"
 
 #, 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:1331 src/reader.c:1450
-msgid "previous rule lacks an ending `;'"
-msgstr ""
-
-#: src/reader.c:1409
-msgid "two @prec's in a row"
-msgstr "kaks @prec ühel real"
-
-#: src/reader.c:1418
-#, c-format
-msgid "%%guard present but %%semantic_parser not specified"
-msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
-
-#: src/reader.c:1428
-msgid "two actions at end of one rule"
-msgstr "kaks tegevust ühe reegli lõpus"
-
-#: src/reader.c:1442
+#: src/reader.c:262

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

 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:1456
-#, c-format
-msgid "invalid input: %s"
-msgstr "vigane sisend: %s"
-
-#: src/reader.c:1463
-msgid "no rules in the input grammar"
-msgstr "sisendgrammatikas pole reegleid"
+#: src/reader.c:341
+msgid "two @prec's in a row"
+msgstr "kaks @prec ühel real"

 
 

-#: src/reader.c:1471
+#: src/reader.c:351

 #, c-format
 #, c-format

-msgid "symbol %s is used, but is not defined as a token and has no rules"
+msgid "%%dprec affects only GLR parsers"

 msgstr ""
 msgstr ""

-"kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad "
-"reeglid"

 
 

-#: src/reader.c:1493
+#: src/reader.c:353

 #, c-format
 #, c-format

-msgid "too many symbols (tokens plus nonterminals); maximum %d"
-msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
+msgid "%%dprec must be followed by positive number"
+msgstr ""

 
 

-#: src/reader.c:1557
+#: src/reader.c:355

 #, c-format
 #, 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 %%dprec allowed per rule"
+msgstr ""

 
 

-#: src/reader.c:1607
+#: src/reader.c:366

 #, c-format
 #, c-format

-msgid "conflicting precedences for %s and %s"
-msgstr "%s ja %s omavad konfliktseid prioriteete"
+msgid "%%merge affects only GLR parsers"
+msgstr ""

 
 

-#: src/reader.c:1619
+#: src/reader.c:368

 #, c-format
 #, c-format

-msgid "conflicting assoc values for %s and %s"
-msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
+msgid "only one %%merge allowed per rule"
+msgstr ""

 
 

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

 #, c-format
 #, 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/reader.c:1678
-#, fuzzy, c-format
-msgid "too many items (max %d)"
-msgstr "liiga palju olekuid (maks %d)"
+#: src/reduce.c:243 src/reduce.c:309 src/reduce.c:400
+#, fuzzy
+msgid "warning"
+msgstr "hoiatus: "
+
+#: src/reduce.c:243
+#, fuzzy
+msgid "useless rule"
+msgstr "%d kasutamata reegel"
+
+#: src/reduce.c:309
+#, fuzzy
+msgid "useless nonterminal"
+msgstr "%d kasutamata mitteterminal"

 
 #: src/reduce.c:356
 msgid "Useless nonterminals:"
 
 #: src/reduce.c:356
 msgid "Useless nonterminals:"


@@ -618,37 +373,61 @@ msgstr "Kasutamata mitteterminalid:"
 msgid "Terminals which are not used:"
 msgstr "Terminalid, mida ei kasutatud:"
 
 msgid "Terminals which are not used:"
 msgstr "Terminalid, mida ei kasutatud:"
 

-#: src/reduce.c:380
-msgid "Useless rules:"
+#: src/reduce.c:378
+#, fuzzy
+msgid "Useless rules"

 msgstr "Kasutamata reeglid:"
 
 msgstr "Kasutamata reeglid:"
 

-#: src/reduce.c:452
-#, fuzzy, c-format
+#: src/reduce.c:395
+#, c-format

 msgid "%d rule never reduced\n"
 msgid_plural "%d rules never reduced\n"
 msgid "%d rule never reduced\n"
 msgid_plural "%d rules never reduced\n"

-msgstr[0] "%d reeglit ei redutseeritud\n"
+msgstr[0] "%d reegel ei redutseeru\n"
+msgstr[1] "%d reeglit ei redutseeru\n"

 
 

-#: src/reduce.c:460
-#, fuzzy, c-format
+#: src/reduce.c:403
+#, c-format

 msgid "%d useless nonterminal"
 msgid_plural "%d useless nonterminals"
 msgid "%d useless nonterminal"
 msgid_plural "%d useless nonterminals"

-msgstr[0] "%d kasutamata mitteterminali%s"
+msgstr[0] "%d kasutamata mitteterminal"
+msgstr[1] "%d kasutamata mitteterminali"

 
 

-#: src/reduce.c:466
+#: src/reduce.c:409

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

-#: src/reduce.c:469
-#, fuzzy, c-format
+#: src/reduce.c:412
+#, c-format

 msgid "%d useless rule"
 msgid_plural "%d useless rules"
 msgid "%d useless rule"
 msgid_plural "%d useless rules"

-msgstr[0] "%d kasutamata reeglit%s"
+msgstr[0] "%d kasutamata reegel"
+msgstr[1] "%d kasutamata reeglit"

 
 

-#: src/reduce.c:500
+#: src/reduce.c:442

 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
 
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
 

+#: scan-gram.l:559
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "`%s' $$ ei oma deklareeritud tüüpi"
+
+#: 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"
+
+#: 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"
 #: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"


@@ -716,80 +495,209 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
 msgid "'"
 msgstr "'"
 

-#~ msgid "%-4s\terror (nonassociative)"
-#~ msgstr "%-4s\tviga (mitteassotsiatiivne)"
-
-#~ msgid "$default\treduce using rule %d (%s)"
-#~ msgstr "$default\tredutseerin kasutades reeglit %d (%s)"
+#~ msgid "too many states (max %d)"
+#~ msgstr "liiga palju olekuid (maks %d)"

 
 

-#~ msgid "unterminated %guard clause"
-#~ msgstr "lõpetamata %guard klausel"
-
-#~ msgid "    $   \tgo to state %d\n"
-#~ msgstr "    $   \tliigu olekule %d\n"
+#~ msgid "   (rule %d)"
+#~ msgstr "   (reegel %d)"

 
 

-#~ msgid "%s: internal error: %s\n"
-#~ msgstr "%s: sisemine viga: %s\n"
+#~ msgid "    %-4s\terror (nonassociative)\n"
+#~ msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"

 
 #~ msgid ""
 
 #~ msgid ""

-#~ "Variables\n"
-#~ "---------\n"
+#~ "    $default\treduce using rule %d (%s)\n"

 #~ "\n"
 #~ msgstr ""
 #~ "\n"
 #~ msgstr ""

-#~ "Muutujad\n"
-#~ "--------\n"
+#~ "    $default\tredutseerin kasutades reeglit %d (%s)\n"

 #~ "\n"
 
 #~ "\n"
 

-#~ msgid "Value  Sprec    Sassoc    Tag\n"
-#~ msgstr "Value  Sprec    Sassoc    Tag\n"
+#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+#~ msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"

 
 

-#~ msgid ""
-#~ "Rules\n"
-#~ "-----\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Reeglid\n"
-#~ "-------\n"
-#~ "\n"
+#~ msgid "    %-4s\treduce using rule %d (%s)\n"
+#~ msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"

 
 

-#~ msgid ""
-#~ "Rules interpreted\n"
-#~ "-----------------\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Interpreteeritud reeglid\n"
-#~ "------------------------\n"
-#~ "\n"
+#~ msgid "    $default\treduce using rule %d (%s)\n"
+#~ msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"

 
 

-#~ msgid " 1 shift/reduce conflict"
-#~ msgstr " 1 nihutamine/redutseerimine konflikt"
+#~ msgid "invalid $ value"
+#~ msgstr "vigane $ väärtus"

 
 

-#~ msgid " 1 reduce/reduce conflict"
-#~ msgstr " 1 redutseerimine/redutseerimine konflikt"
+#~ msgid "Grammar"
+#~ msgstr "Grammatika"

 
 

-#~ msgid "%s contains"
-#~ msgstr "%s sisaldab"
+#~ msgid "Number, Line, Rule"
+#~ msgstr "Number, rida, reegel"

 
 

-#~ msgid "DERIVES"
-#~ msgstr "DERIVES"
+#~ msgid "  %3d %3d %s ->"
+#~ msgstr "  %3d %3d %s ->"

 
 

-#~ msgid "%s derives"
-#~ msgstr "%s derives"
+#~ msgid "empty"
+#~ msgstr "tühi"

 
 

-#~ msgid "Entering set_nullable"
-#~ msgstr "Entering set_nullable"
+#~ msgid "unexpected `/' found and ignored"
+#~ msgstr "leidsin ja ignoreerin ootamatu `/'"

 
 

-#~ msgid ""
-#~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+#~ 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 ""
 #~ msgstr ""

-#~ "redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d "
-#~ "reeglit%s.\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 "\t\t/* empty */"
-#~ msgstr "\t\t/* tühi */"
+#~ msgid "tokens %s and %s both assigned number %d"
+#~ msgstr "märkidele %s ja %s on mõlemale omistatud number %d"

 
 

-#~ msgid "multiple %%header_extension declarations"
-#~ msgstr "korduvad %%header_extension eklaratsioonid"
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "lõpetamata `%{' definitsioon"

 
 

-#~ msgid "multiple %%source_extension declarations"
-#~ msgstr "korduvad %%source_extension deklaratsioonid"
+#~ 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 "unrecognized item %s, expected an identifier"
+#~ msgstr "tundmatu element %s, eeldasin identifikaatorit"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "eeldasin %s asemel sõnekonstanti"
+
+#~ msgid "the start symbol %s is undefined"
+#~ msgstr "stardisümbol %s ei ole defineeritud"
+
+#~ msgid "the start symbol %s is a token"
+#~ msgstr "stardisümbol %s on märk"
+
+#~ msgid "%%guard present but %%semantic_parser not specified"
+#~ msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
+
+#~ msgid "maximum table size (%d) exceeded"
+#~ msgstr "ületati maksimaalset tabelisuurust (%d)"
+
+#~ msgid "    $   \tgo to state %d\n"
+#~ msgstr "    $   \tliigu olekule %d\n"
+
+#~ msgid "unterminated %guard clause"
+#~ msgstr "lõpetamata %guard klausel"