msgid ""
msgstr ""
"Project-Id-Version: GNU bison 1.30f\n"
-"POT-Creation-Date: 2002-05-25 18:12+0200\n"
+"POT-Creation-Date: 2002-05-27 08:28+0200\n"
"PO-Revision-Date: 2001-12-10 15:59+0900\n"
"Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
"Language-Team: Japanese <ja@li.org>\n"
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"
msgstr[0] "%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"
msgstr[0] "%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"
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"
"¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤Çɬ¿Ü¤Î°ú¿ô¤¬¼¨¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢Æ±¤¸°ÕÌ£¤Î¥·¥ç¡¼¥È¥ª¥×¥·¥ç¥ó\n"
"¤Ç¤âƱÍͤËɬ¿Ü¤Î°ú¿ô¤È¤Ê¤ê¤Þ¤¹¡£É¬¿Ü¤Ç¤Ê¤¤ÁªÂòŪ°ú¿ô¤Ç¤âƱÍͤǤ¹¡£\n"
-#: src/getargs.c:111
+#: src/getargs.c:113
msgid ""
"Operation modes:\n"
" -h, --help display this help and exit\n"
" -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"
" -n, --no-parser ¥Æ¡¼¥Ö¥ë¤Î¤ß¤òÀ¸À®¤¹¤ë\n"
" -k, --token-table ¥È¡¼¥¯¥ó̾¤Î¥Æ¡¼¥Ö¥ë¤ò´Þ¤á¤ë\n"
-#: src/getargs.c:130
+#: src/getargs.c:132
#, fuzzy
msgid ""
"Output:\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 ""
" -o, --output=FILE ½ÐÎÏÀè¤ò FILE ¤È¤¹¤ë\n"
" -g, --graph ¥ª¡¼¥È¥Þ¥È¥ó¤Î 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 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"
"¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹ -- Ê£À½¤Ë¤Ä¤¤¤Æ¤Î¾ò·ï¤Ï¥½¡¼¥¹¤ò¸«¤Þ¤·¤ç¤¦¡£\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"
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 " ±¦ÊÕ:"
msgid "'"
msgstr "'"
+#~ msgid "reduce"
+#~ msgstr "´Ô¸µ"
+
+#~ msgid "shift"
+#~ msgstr "¥·¥Õ¥È"
+
+#~ msgid "an error"
+#~ msgstr "¥¨¥é¡¼"
+
#~ msgid "%%guard present but %%semantic_parser not specified"
#~ msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"