* src/reader.c (copy_comment2): New function, same as former

[bison.git] / po / ru.po

diff --git a/po/ru.po b/po/ru.po
index e2526120894d16a8a1d57b78ec7b24ee7528faa4..6502292698600f3dc7fb4fdaa2a121909fcb4c13 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,58 +1,28 @@
 # ðÅÒÅ×ÏÄ ÓÏÏÂÝÅÎÉÊ bison.
 # Copyright (C) 1999 Free Software Foundation, Inc.
-# Dmitry S. Sivachenko <dima@Chg.RU>, 1999.
+# Dmitry S. Sivachenko <dima@Chg.RU>, 1999,2000.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 1999-06-14 18:19-0400\n"
-"PO-Revision-Date: 1999-07-12 12:18\n"
+"Project-Id-Version: bison 1.28a\n"
+"POT-Creation-Date: 2000-04-14 15:35+0200\n"
+"PO-Revision-Date: 2000-04-12 13:16+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: src/LR0.c:377
+#, c-format
+msgid "too many states (max %d)"
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)"
+
 #: src/allocate.c:59 src/allocate.c:75
 #, c-format
 msgid "%s: memory exhausted\n"
 msgstr "%s: ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
 
-#: src/closure.c:315
-msgid ""
-"\n"
-"\n"
-"\n"
-"FIRSTS\n"
-"\n"
-msgstr ""
-
-#: src/closure.c:319
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s firsts\n"
-"\n"
-msgstr ""
-
-#: src/closure.c:337
-msgid ""
-"\n"
-"\n"
-"\n"
-"FDERIVES\n"
-msgstr ""
-
-#: src/closure.c:341
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s derives\n"
-"\n"
-msgstr ""
-
 #: src/conflicts.c:199 src/conflicts.c:223
 msgid "reduce"
 msgstr "×Ù×ÏÄ"
@@ -151,127 +121,156 @@ msgid ""
 "DERIVES\n"
 "\n"
 msgstr ""
+"\n"
+"\n"
+"\n"
+"DERIVES\n"
+"\n"
 
 #: src/derives.c:110
 #, c-format
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"
 
-#: src/getargs.c:68
-#, fuzzy, c-format
+#. Some efforts were made to ease the translators' task, please
+#. continue.
+#: src/getargs.c:69
+msgid "GNU bison generates parsers for LALR(1) grammars.\n"
+msgstr "GNU bison ÇÅÎÅÒÉÒÕÅÔ ÁÎÁÌÉÚÁÔÏÒÙ ÄÌÑ ÇÒÁÍÍÁÔÉË LALR(1).\n"
+
+#: src/getargs.c:73
+#, c-format
+msgid "Usage: %s [OPTION]... FILE\n"
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþé]... æáêì\n"
+
+#: src/getargs.c:77
+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"
+msgstr ""
+"åÓÌÉ ÄÌÉÎÎÁÑ ÆÏÒÍÁ ËÌÀÞÁ ÏÐÒÅÄÅÌÑÅÔ ÁÒÇÕÍÅÎÔ ËÁË ÏÂÑÚÁÔÅÌØÎÙÊ, ÔÏ ÏÎ ÔÁËÖÅ\n"
+"Ñ×ÌÑÅÔÓÑ ÏÂÑÚÁÔÅÌØÎÙÍ ÄÌÑ ËÏÒÏÔËÏÊ ÆÏÒÍÙ.  ôÏ ÖÅ ËÁÓÁÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ\n"
+"ÁÒÇÕÍÅÎÔÏ×.\n"
+
+#: src/getargs.c:83
+msgid ""
+"Operation modes:\n"
+"  -h, --help      display this help and exit\n"
+"  -V, --version   output version information and exit\n"
+"  -y, --yacc      emulate POSIX yacc\n"
+msgstr ""
+"òÅÖÉÍÙ ÆÕÎËÃÉÏÎÉÒÏ×ÁÎÉÑ:\n"
+"  -h, --help      ×Ù×ÅÓÔÉ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n"
+"  -V, --version   ×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
+"  -y, --yacc      ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n"
+
+#: src/getargs.c:90
+msgid ""
+"Parser:\n"
+"  -t, --debug                instrument the parser for debugging\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 ""
+"áÎÁÌÉÚÁÔÏÒ:\n"
+"  -t, --debug                ÎÁÓÔÒÏÉÔØ ÁÎÁÌÉÚÁÔÏÒ ÄÌÑ ÏÔÌÁÄËÉ\n"
+"  -p, --name-prefix=ðòåæéëó  ÐÏÄÓÔÁ×ÉÔØ ðòåæéëó ÄÌÑ ×ÎÅÛÎÉÈ ÓÉÍ×ÏÌÏ×\n"
+"  -l, --no-lines             ÎÅ ÇÅÎÅÒÉÒÏ×ÁÔØ ÄÉÒÅËÔÉ×Ù `#line'\n"
+"  -n, --no-parser            ÇÅÎÅÒÉÒÏ×ÁÔØ ÔÏÌØËÏ ÔÁÂÌÉÃÙ\n"
+"  -r, --raw                  ÎÕÍÅÒÏ×ÁÔØ ÌÅËÓÅÍÙ, ÎÁÞÉÎÁÑ Ó 3\n"
+"  -k, --token-table          ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n"
+
+#: src/getargs.c:101
 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"
-"\n"
-"Report bugs to bug-bison@gnu.org\n"
+"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"
 msgstr ""
-"éÓÐÏÌØÚÏ×ÁÎÉÅ: %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"
+"÷Ù×ÏÄ:\n"
+"  -d, --defines              ÓÏÚÄÁÔØ ÔÁËÖÅ ÆÁÊÌ ÚÁÇÏÌÏ×ËÏ×\n"
+"  -v, --verbose              ÓÏÚÄÁÔØ ÔÁËÖÅ ÐÏÑÓÎÅÎÉÑ × Á×ÔÏÍÁÔÕ\n"
+"  -b, --file-prefix=ðòåæéëó  ÕËÁÚÁÔØ ðòåæéëó ÄÌÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×\n"
+"  -o, --output-file=æáêì     ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ × æáêì\n"
+
+#: src/getargs.c:109
+msgid "Report bugs to <bug-bison@gnu.org>.\n"
+msgstr "ïÛÉÂËÉ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ <bug-bison@gnu.org>.\n"
 
-#: src/getargs.c:161
+#: src/getargs.c:195
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n"
 
-#: src/getargs.c:165
+#: src/getargs.c:199
 #, c-format
-msgid "%s: extra arguments ignored after '%s'\n"
-msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ '%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"
+msgid "%s: extra arguments ignored after `%s'\n"
+msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"
 
-#: src/lalr.c:294
-msgid "gotos"
-msgstr "ÂÅÚÕÓÌÏ×ÎÙÈ ÐÅÒÅÈÏÄÏ×"
+#: src/lalr.c:293
+#, c-format
+msgid "too many gotos (max %d)"
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
 
-#: src/lex.c:119
+#: src/lex.c:115
 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 
-#: src/lex.c:148 src/reader.c:1105 src/reader.c:1330
+#: src/lex.c:144 src/reader.c:256
 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 
-#: src/lex.c:176
-msgid "Unexpected end of file"
-msgstr "îÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ"
+#: src/lex.c:172
+msgid "unexpected end of file"
+msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
-#: src/lex.c:197
+#: src/lex.c:193
 msgid "unescaped newline in constant"
 msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
 
-#: src/lex.c:229
+#: src/lex.c:225
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
 
-#: src/lex.c:253
+#: src/lex.c:250
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
 
-#: src/lex.c:263
+#: src/lex.c:261
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
 
-#: src/lex.c:396
+#: src/lex.c:394
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
 
-#: src/lex.c:475
+#: src/lex.c:473
 msgid "unterminated type name at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"
 
-#: src/lex.c:478
+#: src/lex.c:476
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 
-#: src/main.c:152
-#, fuzzy, c-format
-msgid "%s: fatal error: "
-msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: %s\n"
-
-#: src/main.c:154
-#, fuzzy, c-format
-msgid "%s:%d: fatal error: "
-msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: %s\n"
-
-#: src/main.c:185
+#: src/main.c:136
 #, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/main.c:187
-#, c-format
-msgid "%s:%d: "
-msgstr ""
-
-#: src/main.c:252
-#, c-format
-msgid "too many %s (max %d)"
-msgstr ""
-
-#: src/main.c:262
-#, fuzzy, c-format
 msgid "%s: internal error: %s\n"
-msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ, %s\n"
+msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n"
 
 #: src/nullable.c:55
 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"
 
-#: src/output.c:1190
+#: src/output.c:1207
 #, c-format
-msgid "maximum table size (%s) exceeded"
-msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%s)"
+msgid "maximum table size (%d) exceeded"
+msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)"
 
 #: src/print.c:85
 #, c-format
@@ -372,242 +371,219 @@ msgstr " 
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 
-#: src/reader.c:145
+#: src/reader.c:154
 msgid "   Skipping to next \\n"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n"
 
-#: src/reader.c:147
+#: src/reader.c:156
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c"
 
-#: src/reader.c:323
+#: src/reader.c:180 src/reader.c:195
+msgid "unterminated string at end of file"
+msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ"
+
+#: src/reader.c:183
+msgid "unterminated string"
+msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
+
+#: src/reader.c:444
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
-#: src/reader.c:328
+#: src/reader.c:449
 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 
-#: src/reader.c:332
+#: src/reader.c:452
 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 
-#: src/reader.c:381 src/reader.c:396 src/reader.c:1041 src/reader.c:1273
-msgid "unterminated string at end of file"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ"
-
-#: src/reader.c:384 src/reader.c:1044 src/reader.c:1056 src/reader.c:1267
-#: src/reader.c:1281
-msgid "unterminated string"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
-
-#: src/reader.c:445
-msgid "unterminated comment in `%{' definition"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ÏÐÒÅÄÅÌÅÎÉÉ `%{'"
-
-#: src/reader.c:456
+#: src/reader.c:504
 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
 
-#: src/reader.c:534 src/reader.c:755
+#: src/reader.c:545 src/reader.c:733 src/reader.c:782
+#, c-format
+msgid "Premature EOF after %s"
+msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s"
+
+#: src/reader.c:582 src/reader.c:804
 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 
-#: src/reader.c:544 src/reader.c:700 src/reader.c:762 src/reader.c:1804
+#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
 
-#: src/reader.c:554
+#: src/reader.c:602
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
 
-#: src/reader.c:602
+#: src/reader.c:650
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
 
-#: src/reader.c:624
+#: src/reader.c:672
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 
-#: src/reader.c:646
-#, c-format
-msgid "multiple %start declarations"
+#: src/reader.c:694 src/reader.c:855
+#, fuzzy, c-format
+msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 
-#: src/reader.c:648
-#, c-format
-msgid "invalid %start declaration"
+#: src/reader.c:696 src/reader.c:1649
+#, fuzzy, c-format
+msgid "invalid %s declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 
-#: src/reader.c:668
+#: src/reader.c:716
 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
 
-#: src/reader.c:705
-msgid "invalid %%type declaration due to item: `%s'"
-msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: `%s'"
+#: src/reader.c:753
+msgid "invalid %%type declaration due to item: %s"
+msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s"
 
-#: src/reader.c:751
+#: src/reader.c:800
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
 
-#: src/reader.c:774
+#: src/reader.c:823
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"
 
-#: src/reader.c:784
+#: src/reader.c:833
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 
-#: src/reader.c:808
-#, c-format
-msgid "multiple %union declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
-
-#: src/reader.c:866
-msgid "unterminated comment at end of file"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"
-
-#: src/reader.c:892
-msgid "unmatched close-brace (`}')"
-msgstr "ÎÅÐÁÒÎÁÑ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
+#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276
+#, fuzzy, c-format
+msgid "unmatched %s"
+msgstr "ÎÅÐÁÒÎÁÑ `{'"
 
-#: src/reader.c:936
+#: src/reader.c:941
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
-#: src/reader.c:947
+#: src/reader.c:973
+#, c-format
+msgid "@%s is invalid"
+msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
+
+#: src/reader.c:988 src/reader.c:1000
 msgid "invalid $ value"
 msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"
 
-#: src/reader.c:1027
-msgid "unmatched right brace (`}')"
-msgstr "ÎÅÐÁÒÎÁÑ ÐÒÁ×ÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
-
-#: src/reader.c:1143 src/reader.c:1368
+#: src/reader.c:1106 src/reader.c:1246
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
-#: src/reader.c:1159 src/reader.c:1383
+#: src/reader.c:1122 src/reader.c:1262
 #, c-format
-msgid "$%s of `%s' has no declared type"
-msgstr "$%s × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
+msgid "$%d of `%s' has no declared type"
+msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
-#: src/reader.c:1163 src/reader.c:1388
+#: src/reader.c:1127 src/reader.c:1267
 #, c-format
 msgid "$%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË $%s"
 
-#: src/reader.c:1177
+#: src/reader.c:1136
 #, c-format
-msgid "@%s is invalid"
-msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
-
-#: src/reader.c:1187
-msgid "unterminated %%guard clause"
-msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %%guard"
-
-#: src/reader.c:1402
-msgid "invalid @-construct"
-msgstr "ÎÅ×ÅÒÎÁÑ @-ËÏÎÓÔÒÕËÃÉÑ"
+msgid "unterminated %guard clause"
+msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 
-#: src/reader.c:1412
-msgid "unmatched `{'"
-msgstr "ÎÅÐÁÒÎÁÑ `{'"
-
-#: src/reader.c:1498
+#: src/reader.c:1362
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 
-#: src/reader.c:1505
+#: src/reader.c:1369
 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 
-#: src/reader.c:1536
+#: src/reader.c:1400
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reader.c:1634
+#: src/reader.c:1498
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
-#: src/reader.c:1642
-msgid "%%guard present but %%semantic_parser not specified"
-msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
+#: src/reader.c:1507
+#, c-format
+msgid "%guard present but %semantic_parser not specified"
+msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ"
 
-#. This case never occurs -wjh
-#: src/reader.c:1650
+#: src/reader.c:1516
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
-#: src/reader.c:1662
+#: src/reader.c:1531
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: src/reader.c:1668
+#: src/reader.c:1537
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
-#: src/reader.c:1712
+#: src/reader.c:1581
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 
-#: src/reader.c:1720
+#: src/reader.c:1589
 #, c-format
-msgid "too many symbols (tokens plus nonterminals); maximum %s"
-msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %s"
+msgid "too many symbols (tokens plus nonterminals); maximum %d"
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
 
-#: src/reader.c:1723
+#: src/reader.c:1592
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
-#: src/reader.c:1741
+#: src/reader.c:1610
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 
-#: src/reader.c:1780
-msgid "ill-formed %type declaration"
-msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %type"
-
-#: src/reader.c:1859
+#: src/reader.c:1728
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 
-#: src/reader.c:1868
+#: src/reader.c:1740
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 
-#: src/reader.c:1915
+#: src/reader.c:1791
 #, c-format
-msgid "tokens %s and %s both assigned number %s"
-msgstr "ÏÂÏÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %s"
+msgid "tokens %s and %s both assigned number %d"
+msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 
-#: src/reader.c:1929
+#: src/reader.c:1805
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 
-#: src/reader.c:1931
+#: src/reader.c:1807
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
@@ -617,15 +593,15 @@ msgstr "
 msgid "Start symbol %s does not derive any sentence"
 msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
 
-#: src/reduce.c:154
-#, fuzzy, c-format
+#: src/reduce.c:155
+#, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
 msgstr ""
-"reduced %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ "
+"×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ "
 "×Ù×ÏÄÁ%s.\n"
 
-#: src/reduce.c:492
+#: src/reduce.c:493
 msgid ""
 "Useless nonterminals:\n"
 "\n"
@@ -633,7 +609,7 @@ msgstr ""
 "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:\n"
 "\n"
 
-#: src/reduce.c:504
+#: src/reduce.c:505
 msgid ""
 "\n"
 "\n"
@@ -645,7 +621,7 @@ msgstr ""
 "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:\n"
 "\n"
 
-#: src/reduce.c:513
+#: src/reduce.c:514
 msgid ""
 "\n"
 "\n"
@@ -657,7 +633,7 @@ msgstr ""
 "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:\n"
 "\n"
 
-#: src/reduce.c:541
+#: src/reduce.c:542
 msgid ""
 "Variables\n"
 "---------\n"
@@ -667,11 +643,11 @@ msgstr ""
 "----------\n"
 "\n"
 
-#: src/reduce.c:542
+#: src/reduce.c:543
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"
 
-#: src/reduce.c:547
+#: src/reduce.c:548
 msgid ""
 "Rules\n"
 "-----\n"
@@ -681,7 +657,7 @@ msgstr ""
 "-------\n"
 "\n"
 
-#: src/reduce.c:557
+#: src/reduce.c:558
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -691,97 +667,100 @@ msgstr ""
 "--------------------------\n"
 "\n"
 
-#: src/reduce.c:573
+#: src/reduce.c:574
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n"
 
-#: src/reduce.c:575
+#: src/reduce.c:576
 #, c-format
 msgid "%s contains "
 msgstr "%s ÓÏÄÅÒÖÉÔ "
 
-#: src/reduce.c:579
+#: src/reduce.c:580
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s"
 
-#: src/reduce.c:584
+#: src/reduce.c:585
 msgid " and "
 msgstr " É "
 
-#: src/reduce.c:588
+#: src/reduce.c:589
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s"
 
-#: src/getopt.c:680
+#: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
 
-#: src/getopt.c:704
+#: lib/getopt.c:700
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: src/getopt.c:709
+#: lib/getopt.c:705
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: src/getopt.c:726 src/getopt.c:899
+#: lib/getopt.c:723 lib/getopt.c:896
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ\n"
 
 #. --option
-#: src/getopt.c:755
+#: lib/getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
 
 #. +option or -option
-#: src/getopt.c:759
+#: lib/getopt.c:756
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
 
 #. 1003.2 specifies the format of this message.
-#: src/getopt.c:785
+#: lib/getopt.c:782
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
 
-#: src/getopt.c:788
+#: lib/getopt.c:785
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
 
 #. 1003.2 specifies the format of this message.
-#: src/getopt.c:818 src/getopt.c:948
+#: lib/getopt.c:815 lib/getopt.c:945
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ËÌÀÞ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ -- %c\n"
 
-#: src/getopt.c:865
-#, fuzzy, c-format
+#: lib/getopt.c:862
+#, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
+msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n"
 
-#: src/getopt.c:883
-#, fuzzy, c-format
+#: lib/getopt.c:880
+#, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+
+#~ msgid "multiple %union declarations"
+#~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
 
-#~ msgid "\"%s\", line %d: %s\n"
-#~ msgstr "\"%s\", ÓÔÒÏËÁ %d: %s\n"
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"
 
-#~ msgid "error: %s\n"
-#~ msgstr "ÏÛÉÂËÁ: %s\n"
+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "ÎÅÐÁÒÎÁÑ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
 
-#~ msgid "(\"%s\", line %d) error: %s\n"
-#~ msgstr "(\"%s\", ÓÔÒÏËÁ %d) ÏÛÉÂËÁ: %s\n"
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "ÎÅÐÁÒÎÁÑ ÐÒÁ×ÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
 
-#~ msgid "limit of %d exceeded, too many %s"
-#~ msgstr "ÌÉÍÉÔ × %d ÉÓÞÅÒÐÁÎ, ÓÌÉÛËÏÍ ÍÎÏÇÏ %s"
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %type"