* data/bison.c++: Use C++ ostreams.

[bison.git] / po / ru.po

diff --git a/po/ru.po b/po/ru.po
index 6fe8d68650352733c5777d48f1a8f89b340462ea..e305a5ee2912b4ff9184bd77e284c5e7fa75858b 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"
-"POT-Creation-Date: 2002-05-25 18:12+0200\n"
+"POT-Creation-Date: 2002-05-27 08:28+0200\n"
 "PO-Revision-Date: 2002-01-25 12:19+0300\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -32,25 +32,25 @@ msgstr "
 msgid "fatal error: "
 msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "
 
-#: src/conflicts.c:48
-#, c-format
-msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
+#: src/conflicts.c:67
+#, fuzzy, c-format
+msgid "    Conflict between rule %d and token %s resolved as shift"
 msgstr ""
 "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"
 
-#: src/conflicts.c:115 src/conflicts.c:137
-msgid "reduce"
-msgstr "×Ù×ÏÄ"
-
-#: src/conflicts.c:120 src/conflicts.c:132
-msgid "shift"
-msgstr "ÓÄ×ÉÇ"
+#: src/conflicts.c:75
+#, fuzzy, c-format
+msgid "    Conflict between rule %d and token %s resolved as reduce"
+msgstr ""
+"ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"
 
-#: src/conflicts.c:142
-msgid "an error"
-msgstr "ÏÛÉÂËÁ"
+#: src/conflicts.c:82
+#, fuzzy, c-format
+msgid "    Conflict between rule %d and token %s resolved as an error"
+msgstr ""
+"ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"
 
-#: src/conflicts.c:284
+#: src/conflicts.c:362
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
@@ -58,11 +58,11 @@ msgstr[0] "%d 
 msgstr[1] "%d ËÏÎÆÌÉËÔÁ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 msgstr[2] "%d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 
-#: src/conflicts.c:291
+#: src/conflicts.c:369
 msgid "and"
 msgstr "É"
 
-#: src/conflicts.c:297
+#: src/conflicts.c:375
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
@@ -70,31 +70,31 @@ msgstr[0] "%d 
 msgstr[1] "%d ËÏÎÆÌÉËÔÁ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 msgstr[2] "%d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 
-#: src/conflicts.c:322
+#: src/conflicts.c:400
 #, c-format
 msgid "State %d contains "
 msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ "
 
-#: src/conflicts.c:369
+#: src/conflicts.c:447
 msgid "conflicts: "
 msgstr "ËÏÎÆÌÉËÔÙ: "
 
-#: src/conflicts.c:371
+#: src/conflicts.c:449
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
 
-#: src/conflicts.c:375
+#: src/conflicts.c:453
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
 
-#: src/conflicts.c:380 src/reduce.c:397
+#: src/conflicts.c:458 src/reduce.c:397
 #, c-format
 msgid "%s contains "
 msgstr "%s ÓÏÄÅÒÖÉÔ "
 
-#: src/conflicts.c:387
+#: src/conflicts.c:465
 #, c-format
 msgid "expected %d shift/reduce conflict\n"
 msgid_plural "expected %d shift/reduce conflicts\n"
@@ -111,16 +111,16 @@ msgstr "
 msgid "cannot close file"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"
 
-#: src/getargs.c:97
+#: src/getargs.c:99
 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison ÇÅÎÅÒÉÒÕÅÔ ÁÎÁÌÉÚÁÔÏÒÙ ÄÌÑ ÇÒÁÍÍÁÔÉË LALR(1).\n"
 
-#: src/getargs.c:101
+#: src/getargs.c:103
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþé]... æáêì\n"
 
-#: src/getargs.c:105
+#: 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"
@@ -129,7 +129,7 @@ msgstr ""
 "Ñ×ÌÑÅÔÓÑ ÏÂÑÚÁÔÅÌØÎÙÍ ÄÌÑ ËÏÒÏÔËÏÊ ÆÏÒÍÙ.  ôÏ ÖÅ ËÁÓÁÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ\n"
 "ÁÒÇÕÍÅÎÔÏ×.\n"
 
-#: src/getargs.c:111
+#: src/getargs.c:113
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
@@ -141,7 +141,7 @@ msgstr ""
 "  -V, --version   ×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
 "  -y, --yacc      ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n"
 
-#: src/getargs.c:118
+#: src/getargs.c:120
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
@@ -161,7 +161,7 @@ msgstr ""
 "  -n, --no-parser            ÇÅÎÅÒÉÒÏ×ÁÔØ ÔÏÌØËÏ ÔÁÂÌÉÃÙ\n"
 "  -k, --token-table          ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n"
 
-#: src/getargs.c:130
+#: src/getargs.c:132
 #, fuzzy
 msgid ""
 "Output:\n"
@@ -177,6 +177,7 @@ msgid ""
 "  `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 ""
@@ -188,27 +189,27 @@ msgstr ""
 "  -g, --graph                ÓÏÚÄÁÔØ ÔÁËÖÅ ÐÏÑÓÎÅÎÉÑ Ë Á×ÔÏÍÁÔÕ × ×ÉÄÅ \n"
 "VCG-ÇÒÁÆÁ\n"
 
-#: src/getargs.c:148
+#: src/getargs.c:151
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "ïÛÉÂËÉ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ <bug-bison@gnu.org>.\n"
 
-#: src/getargs.c:162
+#: src/getargs.c:165
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr "bison (GNU Bison) %s"
 
-#: src/getargs.c:164
+#: src/getargs.c:167
 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
-#: src/getargs.c:168
+#: src/getargs.c:171
 #, fuzzy, c-format
 msgid "Copyright (C) %d Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002\n"
 "Free Software Foundation, Inc.\n"
 
-#: src/getargs.c:170
+#: src/getargs.c:173
 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"
@@ -219,17 +220,17 @@ msgstr ""
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"
 
-#: src/getargs.c:273
+#: src/getargs.c:276
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "éÓÐÏÌØÚÕÊÔÅ `%s --help' ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: src/getargs.c:282
+#: src/getargs.c:285
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n"
 
-#: src/getargs.c:286
+#: src/getargs.c:289
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"
@@ -359,36 +360,36 @@ msgstr "    
 msgid "state %d"
 msgstr "ÓÏÓÔÏÑÎÉÅ %d"
 
-#: src/print.c:395
+#: src/print.c:398
 msgid "Grammar"
 msgstr "çÒÁÍÍÁÔÉËÁ"
 
-#: src/print.c:396
+#: src/print.c:399
 msgid "Number, Line, Rule"
 msgstr "îÏÍÅÒ, óÔÒÏËÁ, ðÒÁ×ÉÌÏ"
 
-#: src/print.c:399
+#: src/print.c:402
 #, c-format
 msgid "  %3d %3d %s ->"
 msgstr "  %3d %3d %s ->"
 
-#: src/print.c:406
+#: src/print.c:409
 msgid "empty"
 msgstr "ÐÕÓÔÏ"
 
-#: src/print.c:413
+#: src/print.c:416
 msgid "Terminals, with rules where they appear"
 msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
-#: src/print.c:436
+#: src/print.c:439
 msgid "Nonterminals, with rules where they appear"
 msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
-#: src/print.c:462
+#: src/print.c:465
 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"
 
-#: src/print.c:477
+#: src/print.c:480
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 
@@ -727,6 +728,15 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ msgid "reduce"
+#~ msgstr "×Ù×ÏÄ"
+
+#~ msgid "shift"
+#~ msgstr "ÓÄ×ÉÇ"
+
+#~ msgid "an error"
+#~ msgstr "ÏÛÉÂËÁ"
+
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"