msgid ""
msgstr ""
"Project-Id-Version: bison 1.33b\n"
-"POT-Creation-Date: 2002-06-27 13:54+0200\n"
+"POT-Creation-Date: 2002-06-30 19:37+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"
"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/LR0.c:197
-#, 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"
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:375
+#: src/conflicts.c:379
#, c-format
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:382
+#: src/conflicts.c:386
msgid "and"
msgstr "ja"
-#: src/conflicts.c:388
+#: src/conflicts.c:392
#, c-format
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:413
+#: src/conflicts.c:417
#, c-format
msgid "State %d contains "
msgstr "Olek %d sisaldab "
-#: src/conflicts.c:460
+#: src/conflicts.c:490
msgid "conflicts: "
msgstr "konfliktid: "
-#: src/conflicts.c:462
+#: src/conflicts.c:492
#, c-format
msgid " %d shift/reduce"
msgstr " %d nihutamine/redutseerimine"
-#: src/conflicts.c:466
+#: src/conflicts.c:496
#, c-format
msgid " %d reduce/reduce"
msgstr " %d redutseerimine/redutseerimine"
-#: src/conflicts.c:471
+#: src/conflicts.c:501
#, c-format
msgid "%s contains "
msgstr "%s sisaldab "
-#: src/conflicts.c:478
+#: src/conflicts.c:508
#, c-format
msgid "expected %d shift/reduce conflict\n"
msgid_plural "expected %d shift/reduce conflicts\n"
msgid "cannot close file"
msgstr "faili ei õnnestu sulgeda"
-#: src/getargs.c:100
+#: 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:104
+#: src/getargs.c:103
#, c-format
msgid "Usage: %s [OPTION]... FILE\n"
msgstr "Kasuta: %s [VÕTI]...FAIL\n"
-#: src/getargs.c:108
+#: 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"
"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:114
+#: src/getargs.c:113
msgid ""
"Operation modes:\n"
" -h, --help display this help and exit\n"
" -V, --version esita versiooniinfo ja lõpeta töö\n"
" -y, --yacc emuleeri POSIX yacc\n"
-#: src/getargs.c:121
+#: src/getargs.c:120
msgid ""
"Parser:\n"
" -S, --skeleton=FILE specify the skeleton to use\n"
" -n, --no-parser genereeri ainult tabelid\n"
" -k, --token-table lisa ka sümbolite nimede tabel\n"
-#: src/getargs.c:133
+#: src/getargs.c:132
#, fuzzy
msgid ""
"Output:\n"
" -o, --output-file=FAIL jäta väljund FAILi\n"
" -g, --graph loo automaadi kirjeldus VCG graafina\n"
-#: src/getargs.c:144
+#: src/getargs.c:143
msgid ""
"THINGS is a list of comma separated words that can include:\n"
" `state' describe the states\n"
" `none' disable the report\n"
msgstr ""
-#: src/getargs.c:155
+#: src/getargs.c:154
msgid "Report bugs to <bug-bison@gnu.org>.\n"
msgstr "Teatage palun vigadest aadressil <bug-bison@gnu.org>.\n"
-#: src/getargs.c:169
+#: src/getargs.c:168
#, c-format
msgid "bison (GNU Bison) %s"
msgstr "bison (GNU Bison) %s"
-#: src/getargs.c:171
+#: src/getargs.c:170
msgid "Written by Robert Corbett and Richard Stallman.\n"
msgstr ""
-#: src/getargs.c:175
+#: 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:177
+#: 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"
"See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
"PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
-#: src/getargs.c:280
+#: src/getargs.c:333
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Lisainfo saamiseks proovige `%s --help'.\n"
-#: src/getargs.c:289
+#: src/getargs.c:340
#, c-format
msgid "%s: no grammar file given\n"
msgstr "%s: puudub grammatikafail\n"
-#: src/getargs.c:293
+#: src/getargs.c:344
#, c-format
msgid "%s: extra arguments ignored after `%s'\n"
msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
-#: src/lalr.c:174
+#: src/lalr.c:102
#, c-format
msgid "too many gotos (max %d)"
msgstr "liiga palju gotosid (maks %d)"
msgid " type %d is %s\n"
msgstr " tüüp %d on %s\n"
-#: src/print.c:98
-#, c-format
-msgid " (rule %d)"
-msgstr " (reegel %d)"
-
-#: src/print.c:119
-#, 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"
-#: src/print.c:136
-#, c-format
-msgid " %-4s\terror (nonassociative)\n"
-msgstr " %-4s\tviga (mitteassotsiatiivne)\n"
-
-#: src/print.c:160
-#, 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"
-#: src/print.c:184 src/print.c:218
-#, c-format
-msgid ""
-" $default\treduce using rule %d (%s)\n"
-"\n"
-msgstr ""
-" $default\tredutseerin kasutades reeglit %d (%s)\n"
-"\n"
-
-#: src/print.c:213 src/print.c:288
-#, 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:269 src/print.c:282
-#, 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:297
-#, 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:313
+#: src/print.c:405
msgid " $default\taccept\n"
msgstr " $default\taktsepteerin\n"
-#: src/print.c:315
+#: src/print.c:407
msgid " NO ACTIONS\n"
msgstr " TEGEVUSI POLE\n"
-#: src/print.c:328
+#: src/print.c:428
#, c-format
msgid "state %d"
msgstr "olek %d"
-#: src/print.c:364
+#: src/print.c:462
msgid "Terminals, with rules where they appear"
msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
-#: src/print.c:389
+#: src/print.c:489
msgid "Nonterminals, with rules where they appear"
msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
-#: src/print.c:417
+#: src/print.c:518
msgid " on left:"
msgstr " vasakul:"
-#: src/print.c:432
+#: src/print.c:533
msgid " on right:"
msgstr " paremal:"
msgid "multiple %s declarations"
msgstr "korduvad %s deklaratsioonid"
-#: src/reader.c:203
+#: src/reader.c:139
+#, c-format
+msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgstr ""
+
+#: 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:228
+#: src/reader.c:262
#, c-format
msgid "type clash (`%s' `%s') on default action"
msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
-#: src/reader.c:236
+#: 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:307
+#: src/reader.c:341
msgid "two @prec's in a row"
msgstr "kaks @prec ühel real"
-#: src/reader.c:448
+#: src/reader.c:351
+#, c-format
+msgid "%%dprec affects only GLR parsers"
+msgstr ""
+
+#: src/reader.c:353
+#, c-format
+msgid "%%dprec must be followed by positive number"
+msgstr ""
+
+#: src/reader.c:355
+#, c-format
+msgid "only one %%dprec allowed per rule"
+msgstr ""
+
+#: src/reader.c:366
+#, c-format
+msgid "%%merge affects only GLR parsers"
+msgstr ""
+
+#: src/reader.c:368
+#, c-format
+msgid "only one %%merge allowed per rule"
+msgstr ""
+
+#: src/reader.c:507
msgid "no rules in the input grammar"
msgstr "sisendgrammatikas pole reegleid"
-#: src/reader.c:480
+#: src/reader.c:539
#, c-format
msgid "too many symbols (tokens plus nonterminals); maximum %d"
msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
-#: src/reduce.c:239 src/reduce.c:305 src/reduce.c:396
+#: src/reduce.c:243 src/reduce.c:309 src/reduce.c:400
#, fuzzy
msgid "warning"
msgstr "hoiatus: "
-#: src/reduce.c:239
+#: src/reduce.c:243
#, fuzzy
msgid "useless rule"
msgstr "%d kasutamata reegel"
-#: src/reduce.c:305
+#: src/reduce.c:309
#, fuzzy
msgid "useless nonterminal"
msgstr "%d kasutamata mitteterminal"
-#: src/reduce.c:352
+#: src/reduce.c:356
msgid "Useless nonterminals:"
msgstr "Kasutamata mitteterminalid:"
-#: src/reduce.c:365
+#: src/reduce.c:369
msgid "Terminals which are not used:"
msgstr "Terminalid, mida ei kasutatud:"
-#: src/reduce.c:374
+#: src/reduce.c:378
#, fuzzy
msgid "Useless rules"
msgstr "Kasutamata reeglid:"
-#: src/reduce.c:391
+#: src/reduce.c:395
#, c-format
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:399
+#: src/reduce.c:403
#, c-format
msgid "%d useless nonterminal"
msgid_plural "%d useless nonterminals"
msgstr[0] "%d kasutamata mitteterminal"
msgstr[1] "%d kasutamata mitteterminali"
-#: src/reduce.c:405
+#: src/reduce.c:409
msgid " and "
msgstr " ja "
-#: src/reduce.c:408
+#: src/reduce.c:412
#, c-format
msgid "%d useless rule"
msgid_plural "%d useless rules"
msgstr[0] "%d kasutamata reegel"
msgstr[1] "%d kasutamata reeglit"
-#: src/reduce.c:438
+#: src/reduce.c:442
#, c-format
msgid "Start symbol %s does not derive any sentence"
msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
-#: scan-gram.l:556
+#: scan-gram.l:559
#, c-format
msgid "$$ of `%s' has no declared type"
msgstr "`%s' $$ ei oma deklareeritud tüüpi"
-#: scan-gram.l:573 scan-gram.l:660
+#: scan-gram.l:576 scan-gram.l:663
#, fuzzy, c-format
msgid "invalid value: %s%d"
msgstr "vigane @ väärtus"
-#: scan-gram.l:580
+#: 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:591 scan-gram.l:608 scan-gram.l:667 scan-gram.l:684
+#: 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"
msgid "'"
msgstr "'"
+#~ msgid "too many states (max %d)"
+#~ msgstr "liiga palju olekuid (maks %d)"
+
+#~ msgid " (rule %d)"
+#~ msgstr " (reegel %d)"
+
+#~ msgid " %-4s\terror (nonassociative)\n"
+#~ msgstr " %-4s\tviga (mitteassotsiatiivne)\n"
+
+#~ msgid ""
+#~ " $default\treduce using rule %d (%s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ " $default\tredutseerin kasutades reeglit %d (%s)\n"
+#~ "\n"
+
+#~ msgid " %-4s\t[reduce using rule %d (%s)]\n"
+#~ msgstr " %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
+
+#~ msgid " %-4s\treduce using rule %d (%s)\n"
+#~ msgstr " %-4s\tredutseerin kasutades reeglit %d (%s)\n"
+
+#~ msgid " $default\treduce using rule %d (%s)\n"
+#~ msgstr " $default\tredutseerin kasutades reeglit %d (%s)\n"
+
#~ msgid "invalid $ value"
#~ msgstr "vigane $ väärtus"
#~ msgid " $ \tgo to state %d\n"
#~ msgstr " $ \tliigu olekule %d\n"
-#~ msgid "%-4s\terror (nonassociative)"
-#~ msgstr "%-4s\tviga (mitteassotsiatiivne)"
-
-#~ msgid "$default\treduce using rule %d (%s)"
-#~ msgstr "$default\tredutseerin kasutades reeglit %d (%s)"
-
#~ msgid "unterminated %guard clause"
#~ msgstr "lõpetamata %guard klausel"