X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c29240e74b6f81a3bc37a3b0e718479b2e7f16c3..f9abaa2c4c5c77c5b6bdcfc0149c0af5adc8cc39:/po/et.po?ds=sidebyside

diff --git a/po/et.po b/po/et.po
index 502a737f..33d3e7af 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,148 +1,122 @@
 # 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-09-21 10:30+0200\n"
-"PO-Revision-Date: 2000-04-11 22:19+02:00\n"
+"Project-Id-Version: bison 1.28d\n"
+"POT-Creation-Date: 2002-02-25 15:48+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:212
+#: src/LR0.c:194
 #, c-format
 msgid "too many states (max %d)"
 msgstr "liiga palju olekuid (maks %d)"
 
-#: src/allocate.c:58 src/allocate.c:74
-#, c-format
-msgid "%s: memory exhausted\n"
-msgstr "%s: mälu on otsas\n"
+#: lib/error.c:128 lib/error.c:156 src/complain.c:99
+msgid "Unknown system error"
+msgstr "Tundmatu süsteemi viga"
+
+#: src/complain.c:150
+msgid "warning: "
+msgstr "hoiatus: "
+
+#: src/complain.c:238
+msgid "fatal error: "
+msgstr "fataalne viga: "
 
-#: src/conflicts.c:64
+#: src/conflicts.c:46
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
 
-#: src/conflicts.c:130 src/conflicts.c:153
+#: src/conflicts.c:111 src/conflicts.c:133
 msgid "reduce"
 msgstr "redutseerimine"
 
-#: src/conflicts.c:136 src/conflicts.c:149
+#: src/conflicts.c:116 src/conflicts.c:128
 msgid "shift"
 msgstr "nihutamine"
 
-#: src/conflicts.c:157
+#: src/conflicts.c:138
 msgid "an error"
 msgstr "viga"
 
-#. If invoked under the name `yacc', use the output format
-#. specified by POSIX.
-#: src/conflicts.c:446
+#: src/conflicts.c:291
+#, fuzzy, c-format
+msgid "%d shift/reduce conflict"
+msgid_plural "%d shift/reduce conflicts"
+msgstr[0] " %d nihutamine/redutseerimine konflikti"
+
+#: src/conflicts.c:298
+#, fuzzy
+msgid "and"
+msgstr " ja"
+
+#: src/conflicts.c:304
+#, fuzzy, c-format
+msgid "%d reduce/reduce conflict"
+msgid_plural "%d reduce/reduce conflicts"
+msgstr[0] " %d redutseerimine/redutseerimine konflikti"
+
+#: src/conflicts.c:329
+#, 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:376
 msgid "conflicts: "
 msgstr "konfliktid: "
 
-#: src/conflicts.c:448
+#: src/conflicts.c:378
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"
 
-#: src/conflicts.c:452
+#: src/conflicts.c:382
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"
 
-#: src/conflicts.c:457
-#, c-format
-msgid "%s contains"
-msgstr "%s sisaldab"
-
-#: src/conflicts.c:460 src/conflicts.c:525
-msgid " 1 shift/reduce conflict"
-msgstr " 1 nihutamine/redutseerimine konflikt"
-
-#: src/conflicts.c:462 src/conflicts.c:527
+#: src/conflicts.c:387 src/reduce.c:499
 #, c-format
-msgid " %d shift/reduce conflicts"
-msgstr " %d nihutamine/redutseerimine konflikti"
-
-#: src/conflicts.c:465 src/conflicts.c:530
-msgid " and"
-msgstr " ja"
-
-#: src/conflicts.c:468 src/conflicts.c:533
-msgid " 1 reduce/reduce conflict"
-msgstr " 1 redutseerimine/redutseerimine konflikt"
-
-#: src/conflicts.c:470 src/conflicts.c:535
-#, c-format
-msgid " %d reduce/reduce conflicts"
-msgstr " %d redutseerimine/redutseerimine konflikti"
-
-#: src/conflicts.c:522
-#, c-format
-msgid "State %d contains"
-msgstr "Olek %d sisaldab"
-
-#: src/conflicts.c:629 src/conflicts.c:749
-#, c-format
-msgid "    %-4s\t[reduce using rule %d (%s)]\n"
-msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
-
-#: src/conflicts.c:640 src/print.c:222
-#, 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:729 src/conflicts.c:743
-#, c-format
-msgid "    %-4s\treduce using rule %d (%s)\n"
-msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
+#: src/conflicts.c:394
+#, 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:770
+#: src/files.c:159
 #, c-format
-msgid "    $default\treduce using rule %d (%s)\n"
-msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
-
-#: src/derives.c:42
-msgid ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
+msgid "cannot open file `%s'"
+msgstr "faili `%s' ei saa avada"
 
-#: src/derives.c:46
-#, c-format
-msgid "%s derives"
-msgstr "%s derives"
+#: src/files.c:178
+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:56
 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:60
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "Kasuta: %s [VÕTI]...FAIL\n"
 
-#: src/getargs.c:82
+#: src/getargs.c:64
 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"
@@ -150,7 +124,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:70
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
@@ -162,708 +136,684 @@ msgstr ""
 "  -V, --version   esita versiooniinfo ja lõpeta töö\n"
 "  -y, --yacc      emuleeri POSIX yacc\n"
 
-#: src/getargs.c:95
+#: src/getargs.c:77
 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:106
+#: src/getargs.c:89
+#, 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:114
+#: src/getargs.c:99
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "Teatage palun vigadest aadressil <bug-bison@gnu.org>.\n"
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
-#: src/getargs.c:128
+#: src/getargs.c:113
 #, c-format
 msgid "bison (GNU Bison) %s"
+msgstr "bison (GNU Bison) %s"
+
+#: src/getargs.c:115
+msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
-#: src/getargs.c:133
-msgid ""
-"Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"
+#: src/getargs.c:119
+#, 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"
 
-#: src/getargs.c:137
+#: 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:200 src/lex.c:599
+#, c-format
+msgid "`%s' is no longer supported"
+msgstr "`%s' ei ole enam toetatud"
 
-#: src/getargs.c:231
+#: src/getargs.c:224
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Lisainfo saamiseks proovige `%s --help'.\n"
+
+#: src/getargs.c:233
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: puudub grammatikafail\n"
 
-#: src/getargs.c:235
+#: src/getargs.c:237
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
 
-#: src/lalr.c:292
+#: src/lalr.c:175
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 
-#: src/lex.c:105
+#: src/lex.c:77
 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"
 
-#: src/lex.c:134 src/reader.c:285
+#: src/lex.c:106 src/reader.c:302
 msgid "unterminated comment"
 msgstr "lõpetamata kommentaar"
 
-#: src/lex.c:162
+#: src/lex.c:138
 msgid "unexpected end of file"
 msgstr "ootamatu faililõpp"
 
-#: src/lex.c:183
+#: src/lex.c:157
 msgid "unescaped newline in constant"
 msgstr "paojadata reavahetus konstandis"
 
-#: src/lex.c:215
+#: 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:240
+#: 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:251
+#: src/lex.c:233
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "tundmatu paojada: `\\' järgneb `%s'"
 
-#: src/lex.c:384
-msgid "use \"...\" for multi-character literal tokens"
-msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
-
-#: src/lex.c:463
+#: src/lex.c:264
 msgid "unterminated type name at end of file"
 msgstr "lõpetamata tüübinimi faili lõpus"
 
-#: src/lex.c:466
+#: src/lex.c:267
 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"
 
-#: src/main.c:139
+#: src/lex.c:359
+msgid "use \"...\" for multi-character literal tokens"
+msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
+
+#: src/lex.c:571
 #, c-format
-msgid "%s: internal error: %s\n"
-msgstr "%s: sisemine viga: %s\n"
+msgid "`%s' supports no argument: %s"
+msgstr ""
 
-#: src/nullable.c:55
-msgid "Entering set_nullable"
-msgstr "Entering set_nullable"
+#: src/lex.c:588
+#, fuzzy, c-format
+msgid "`%s' requires an argument"
+msgstr "%s: võti `%s' nõuab argumenti\n"
 
-#: src/output.c:1236
+#: src/output.c:792
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ületati maksimaalset tabelisuurust (%d)"
 
-#: src/print.c:84
+#: src/print.c:44
 #, c-format
 msgid " type %d is %s\n"
 msgstr " tüüp %d on %s\n"
 
-#: src/print.c:92
-#, c-format
-msgid ""
-"\n"
-"\n"
-"state %d\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"olek %d\n"
-"\n"
-
-#: src/print.c:137
+#: src/print.c:106
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (reegel %d)"
 
-#: src/print.c:164
-msgid "    $default\taccept\n"
-msgstr "    $default\taktsepteerin\n"
-
-#: src/print.c:166
-msgid "    NO ACTIONS\n"
-msgstr "    TEGEVUSI POLE\n"
-
-#. I.e. strcmp(tags[symbol],"$")==0
-#: src/print.c:184
-#, c-format
-msgid "    $   \tgo to state %d\n"
-msgstr "    $   \tliigu olekule %d\n"
-
-#: src/print.c:186
+#: 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:210
+#: src/print.c:144
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
 
-#: src/print.c:238
+#: src/print.c:168
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tliigu olekule %d\n"
 
-#. rule # : LHS -> RHS
-#: src/print.c:264
+#: src/print.c:192 src/print.c:228
+#, c-format
 msgid ""
+"    $default\treduce using rule %d (%s)\n"
 "\n"
-"Grammar\n"
 msgstr ""
+"    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"
-"Grammatika\n"
 
-#: src/print.c:269
+#: src/print.c:224 src/print.c:301
 #, c-format
-msgid "rule %-4d %s ->"
-msgstr "reegel %-4d %s ->"
+msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 
-#: src/print.c:275
-msgid "\t\t/* empty */"
-msgstr "\t\t/* tühi */"
+#: src/print.c:282 src/print.c:295
+#, c-format
+msgid "    %-4s\treduce using rule %d (%s)\n"
+msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 
-#. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:280
-msgid ""
-"\n"
-"Terminals, with rules where they appear\n"
-"\n"
+#: src/print.c:311
+#, c-format
+msgid "    $default\treduce using rule %d (%s)\n"
+msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
+
+#: src/print.c:327
+msgid "    $default\taccept\n"
+msgstr "    $default\taktsepteerin\n"
+
+#: src/print.c:329
+msgid "    NO ACTIONS\n"
+msgstr "    TEGEVUSI POLE\n"
+
+#: src/print.c:342
+#, c-format
+msgid "state %d"
+msgstr "olek %d"
+
+#. rule # : LHS -> RHS
+#: src/print.c:373
+msgid "Grammar"
+msgstr "Grammatika"
+
+#: src/print.c:374
+msgid "Number, Line, Rule"
 msgstr ""
-"\n"
-"Terminalid, koos reeglitega, kus nad ilmuvad\n"
-"\n"
 
-#: src/print.c:328
-msgid ""
-"\n"
-"Nonterminals, with rules where they appear\n"
-"\n"
+#: src/print.c:379
+#, fuzzy, c-format
+msgid "  %3d %3d %s ->"
+msgstr "reegel %-4d %s ->"
+
+#: src/print.c:386
+msgid "empty"
 msgstr ""
-"\n"
-"Mitteterminalid, koos reeglitega, kus nad ilmuvad\n"
-"\n"
 
-#: src/print.c:354
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:393
+msgid "Terminals, with rules where they appear"
+msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
+
+#: src/print.c:416
+msgid "Nonterminals, with rules where they appear"
+msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
+
+#: src/print.c:442
 msgid " on left:"
 msgstr " vasakul:"
 
-#: src/print.c:369
+#: src/print.c:457
 msgid " on right:"
 msgstr " paremal:"
 
-#: src/reader.c:153
+#: src/reader.c:100
 msgid "   Skipping to next \\n"
 msgstr "   Liigun järgmisele \\n"
 
-#: src/reader.c:155
+#: src/reader.c:102
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Liigun järgmisele %c"
 
-#: src/reader.c:209 src/reader.c:224
+#: 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:212
+#: src/reader.c:195
 msgid "unterminated string"
 msgstr "lõpetamata sõne"
 
-#: src/reader.c:480
+#: 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 "unrecognized: %s"
-msgstr "tundmatu: %s"
+msgid "%s is invalid"
+msgstr "%s on vigane"
 
-#: src/reader.c:485
-msgid "no input grammar"
-msgstr "sisendgrammatikat pole"
+#: src/reader.c:391
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "`%s' $$ ei oma deklareeritud tüüpi"
 
-#: src/reader.c:488
+#: src/reader.c:415
 #, c-format
-msgid "unknown character: %s"
-msgstr "tundmatu sümbol: %s"
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d `%s' ei oma deklareeritud tüüpi"
 
-#: src/reader.c:540
+#: src/reader.c:473
 msgid "unterminated `%{' definition"
 msgstr "lõpetamata `%{' definitsioon"
 
-#: src/reader.c:581 src/reader.c:769 src/reader.c:818
+#: src/reader.c:518 src/reader.c:636 src/reader.c:686 src/reader.c:933
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Enneaegne EOF peale %s"
 
-#: src/reader.c:618 src/reader.c:840
+#: 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:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709
+#: 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:638
+#: src/reader.c:581
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ei ole %s sees lubatud"
 
-#: src/reader.c:686
-#, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "tundmatu element %s, eeldasin identifikaatorit"
-
-#: src/reader.c:708
+#: src/reader.c:599 src/reader.c:758
 #, c-format
-msgid "expected string constant instead of %s"
-msgstr "eeldasin %s asemel sõnekonstanti"
-
-#: src/reader.c:730 src/reader.c:891
-#, fuzzy, c-format
 msgid "multiple %s declarations"
-msgstr "korduvad %start deklaratsioonid"
+msgstr "korduvad %s deklaratsioonid"
 
-#: src/reader.c:732 src/reader.c:1685
-#, fuzzy, c-format
+#: src/reader.c:601 src/reader.c:913 src/reader.c:928 src/reader.c:961
+#: src/reader.c:975 src/reader.c:1178
+#, c-format
 msgid "invalid %s declaration"
-msgstr "vigane %start deklaratsioon"
+msgstr "vigane %s deklaratsioon"
 
-#: src/reader.c:752
+#: src/reader.c:621
 msgid "%type declaration has no <typename>"
 msgstr "%type deklaratsioonis puudub <tüübinimi>"
 
-#: src/reader.c:789
+#: src/reader.c:656
+#, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "vigane %%type deklaratsioon, element: %s"
 
-#: src/reader.c:836
+#: src/reader.c:701
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s prioriteedi uus definitsioon"
 
-#: src/reader.c:859
+#: 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:869
+#: src/reader.c:734
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"
 
-#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312
-#, fuzzy, c-format
+#: src/reader.c:790 src/reader.c:1149
+#, c-format
 msgid "unmatched %s"
-msgstr "puudub `{'"
+msgstr "puudub %s"
 
-#: src/reader.c:977
+#: src/reader.c:819
 #, c-format
-msgid "argument of %expect is not an integer"
-msgstr "%expect argument ei ole täisarv"
+msgid "argument of %%expect is not an integer"
+msgstr "%%expect argument ei ole täisarv"
 
-#: src/reader.c:1009
+#: src/reader.c:865
 #, c-format
-msgid "@%s is invalid"
-msgstr "@%s on vigane"
-
-#: src/reader.c:1024 src/reader.c:1036
-msgid "invalid $ value"
-msgstr "vigane $ väärtus"
+msgid "unrecognized item %s, expected an identifier"
+msgstr "tundmatu element %s, eeldasin identifikaatorit"
 
-#: src/reader.c:1142 src/reader.c:1282
+#: src/reader.c:887
 #, c-format
-msgid "$$ of `%s' has no declared type"
-msgstr "`%s' $$ ei oma deklareeritud tüüpi"
+msgid "expected string constant instead of %s"
+msgstr "eeldasin %s asemel sõnekonstanti"
 
-#: src/reader.c:1158 src/reader.c:1298
+#: src/reader.c:1080
 #, c-format
-msgid "$%d of `%s' has no declared type"
-msgstr "$%d `%s' ei oma deklareeritud tüüpi"
+msgid "unrecognized: %s"
+msgstr "tundmatu: %s"
 
-#: src/reader.c:1163 src/reader.c:1303
-#, c-format
-msgid "$%s is invalid"
-msgstr "$%s on vigane"
+#: src/reader.c:1085
+msgid "no input grammar"
+msgstr "sisendgrammatikat pole"
 
-#: src/reader.c:1172
+#: src/reader.c:1090
 #, c-format
-msgid "unterminated %guard clause"
-msgstr "lõpetamata %guard klausel"
+msgid "unknown character: %s"
+msgstr "tundmatu sümbol: %s"
 
-#: src/reader.c:1398
+#: src/reader.c:1265
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
 
-#: src/reader.c:1405
+#: src/reader.c:1272
 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"
 
-#: src/reader.c:1436
+#: src/reader.c:1300
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s jaoks on antud reegel, aga see on märk"
 
-#: src/reader.c:1534
+#: src/reader.c:1405
 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 
-#: src/reader.c:1543
+#: src/reader.c:1414
 #, c-format
-msgid "%guard present but %semantic_parser not specified"
-msgstr "%guard on määratud, aga %semantic_parser ei ole"
+msgid "%%guard present but %%semantic_parser not specified"
+msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
 
-#: src/reader.c:1552
+#: src/reader.c:1424
 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 
-#: src/reader.c:1567
+#: src/reader.c:1438
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
-#: src/reader.c:1573
+#: src/reader.c:1444
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
-#: src/reader.c:1617
+#: src/reader.c:1450
 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 
-#: src/reader.c:1625
-#, c-format
-msgid "too many symbols (tokens plus nonterminals); maximum %d"
-msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
-
-#: src/reader.c:1628
+#: src/reader.c:1457
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
-#: src/reader.c:1646
+#: src/reader.c:1465
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad "
 "reeglid"
 
-#: src/reader.c:1765
+#: src/reader.c:1487
+#, 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:1551
+#, 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:1601
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 
-#: src/reader.c:1777
+#: src/reader.c:1613
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
 
-#: src/reader.c:1828
-#, c-format
-msgid "tokens %s and %s both assigned number %d"
-msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
-
-#: src/reader.c:1842
+#: src/reader.c:1650
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"
 
-#: src/reader.c:1844
+#: src/reader.c:1652
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"
 
-#: src/reduce.c:142
-#, c-format
-msgid "Start symbol %s does not derive any sentence"
-msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
-
-#: src/reduce.c:156
-#, c-format
-msgid ""
-"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
-msgstr ""
-"redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d "
-"reeglit%s.\n"
-
-#: src/reduce.c:494
-msgid ""
-"Useless nonterminals:\n"
-"\n"
-msgstr ""
-"Kasutamata mitteterminalid:\n"
-"\n"
-
-#: src/reduce.c:506
-msgid ""
-"\n"
-"\n"
-"Terminals which are not used:\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"Terminalid, mida ei kasutatud:\n"
-"\n"
-
-#: src/reduce.c:515
-msgid ""
-"\n"
-"\n"
-"Useless rules:\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"Kasutamata reeglid:\n"
-"\n"
-
-#: src/reduce.c:544
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-"Muutujad\n"
-"--------\n"
-"\n"
+#: src/reader.c:1672
+#, fuzzy, c-format
+msgid "too many items (max %d)"
+msgstr "liiga palju olekuid (maks %d)"
 
-#: src/reduce.c:545
-msgid "Value  Sprec    Sassoc    Tag\n"
-msgstr "Value  Sprec    Sassoc    Tag\n"
+#: src/reduce.c:398
+msgid "Useless nonterminals:"
+msgstr "Kasutamata mitteterminalid:"
 
-#: src/reduce.c:550
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-"Reeglid\n"
-"-------\n"
-"\n"
-
-#: src/reduce.c:560
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-"Interpreteeritud reeglid\n"
-"------------------------\n"
-"\n"
+#: src/reduce.c:411
+msgid "Terminals which are not used:"
+msgstr "Terminalid, mida ei kasutatud:"
 
-#: src/reduce.c:577
-#, c-format
-msgid "%d rules never reduced\n"
-msgstr "%d reeglit ei redutseeritud\n"
+#: src/reduce.c:422
+msgid "Useless rules:"
+msgstr "Kasutamata reeglid:"
 
-#: src/reduce.c:579
-#, c-format
-msgid "%s contains "
-msgstr "%s sisaldab "
+#: src/reduce.c:494
+#, 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:583
-#, c-format
-msgid "%d useless nonterminal%s"
-msgstr "%d kasutamata mitteterminali%s"
+#: src/reduce.c:502
+#, fuzzy, c-format
+msgid "%d useless nonterminal"
+msgid_plural "%d useless nonterminals"
+msgstr[0] "%d kasutamata mitteterminali%s"
 
-#: src/reduce.c:588
+#: src/reduce.c:508
 msgid " and "
 msgstr " ja "
 
-#: src/reduce.c:592
+#: src/reduce.c:511
+#, fuzzy, c-format
+msgid "%d useless rule"
+msgid_plural "%d useless rules"
+msgstr[0] "%d kasutamata reeglit%s"
+
+#: src/reduce.c:542
 #, c-format
-msgid "%d useless rule%s"
-msgstr "%d kasutamata reeglit%s"
+msgid "Start symbol %s does not derive any sentence"
+msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
 
-#: 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"
 
-#~ msgid "multiple %union declarations"
-#~ msgstr "korduvad %union deklaratsioonid"
-
-#~ 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"
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted.  Goes through gettext.
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
+msgid "memory exhausted"
+msgstr "mälu on otsas"
+
+#. 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:274
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:275
+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 "unterminated %guard clause"
+#~ msgstr "lõpetamata %guard klausel"
+
+#~ msgid "    $   \tgo to state %d\n"
+#~ msgstr "    $   \tliigu olekule %d\n"
+
+#~ 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 "gotos"
-#~ msgstr "gotod"
+#~ msgid "%s contains"
+#~ msgstr "%s sisaldab"
 
-#~ msgid "fatal error: %s\n"
-#~ msgstr "fataalne viga: %s\n"
+#~ 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"