X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9503bbd27df7c6d8c2e6ad0c3b4d42248a1061f1..88ab880d90020666c39614a01e388eee5c6505e8:/po/ja.po

diff --git a/po/ja.po b/po/ja.po
index 2440c72b..a027e675 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"
-"POT-Creation-Date: 2002-09-04 11:54+0200\n"
-"PO-Revision-Date: 2001-12-10 15:59+0900\n"
+"POT-Creation-Date: 2003-04-29 10:05+0200\n"
+"PO-Revision-Date: 2002-10-29 01:00-05:00\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -14,93 +14,98 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/complain.c:89 lib/error.c:128 lib/error.c:156
+#: src/complain.c:56 lib/error.c:135 lib/error.c:163
 msgid "Unknown system error"
 msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à¥¨¥é¡¼"
 
-#: src/complain.c:123 src/complain.c:152
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: src/complain.c:252 src/complain.c:282
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "Ã×̿Ū¥¨¥é¡¼: "
 
-#: src/conflicts.c:72
+#: src/conflicts.c:75
 #, fuzzy, c-format
 msgid "    Conflict between rule %d and token %s resolved as shift"
 msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n"
 
-#: src/conflicts.c:80
+#: src/conflicts.c:83
 #, fuzzy, c-format
 msgid "    Conflict between rule %d and token %s resolved as reduce"
 msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n"
 
-#: src/conflicts.c:87
+#: src/conflicts.c:90
 #, fuzzy, c-format
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n"
 
-#: src/conflicts.c:402
+#: src/conflicts.c:398
 #, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
-
-#: src/conflicts.c:409
-msgid "and"
-msgstr "¤ª¤è¤Ó"
-
-#: src/conflicts.c:415
-#, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d ´Ô¸µ/´Ô¸µ¾×ÆÍ"
-
-#: src/conflicts.c:435
-msgid "conflicts: "
-msgstr "¾×ÆÍ: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:437
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
 
-#: src/conflicts.c:441
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d ´Ô¸µ/´Ô¸µ"
 
-#: src/conflicts.c:460
-#, c-format
-msgid "State %d contains "
-msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "¾õÂÖ %d"
 
-#: src/conflicts.c:537
+#: src/conflicts.c:498
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "ËÜÍè %d ¸Ä¤Î¥·¥Õ¥È/´Ô¸µ¾×ÆͤǤ¢¤ë¤Ï¤º¤Ç¤¹\n"
 
-#: src/files.c:114
+#: src/conflicts.c:503
+#, fuzzy
+msgid "expected 0 reduce/reduce conflicts"
+msgstr "%d ´Ô¸µ/´Ô¸µ¾×ÆÍ"
+
+#: src/files.c:99
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "¥Õ¥¡¥¤¥ë `%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: src/files.c:133
+#: src/files.c:115
+#, fuzzy
+msgid "I/O error"
+msgstr "¥¨¥é¡¼"
+
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "¥Õ¥¡¥¤¥ë¤òÊĤ¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: src/getargs.c:157
+#: src/files.c:336
+#, fuzzy, c-format
+msgid "conflicting outputs to file %s"
+msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
+
+#: src/getargs.c:182
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "`%s --help' ¤Ç¾ÜºÙ¾ðÊó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤\n"
+
+#: src/getargs.c:188
 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison ¤Ï LALR(1) ʸˡ¤Î¹½Ê¸²òÀÏ´ï¤òÀ¸À®¤·¤Þ¤¹¡£\n"
 
-#: src/getargs.c:161
+#: src/getargs.c:192
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... ¥Õ¥¡¥¤¥ë\n"
 
-#: src/getargs.c:165
+#: src/getargs.c:196
 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"
@@ -108,7 +113,7 @@ msgstr ""
 "¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤Çɬ¿Ü¤Î°ú¿ô¤¬¼¨¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢Æ±¤¸°ÕÌ£¤Î¥·¥ç¡¼¥È¥ª¥×¥·¥ç¥ó\n"
 "¤Ç¤âƱÍͤËɬ¿Ü¤Î°ú¿ô¤È¤Ê¤ê¤Þ¤¹¡£É¬¿Ü¤Ç¤Ê¤¤ÁªÂòŪ°ú¿ô¤Ç¤âƱÍͤǤ¹¡£\n"
 
-#: src/getargs.c:171
+#: src/getargs.c:202
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
@@ -120,7 +125,7 @@ msgstr ""
 "  -V, --version   ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë\n"
 "  -y, --yacc      POSIX yacc ¤ò¥¨¥ß¥å¥ì¥¤¥È¤¹¤ë\n"
 
-#: src/getargs.c:178
+#: src/getargs.c:209
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
@@ -140,7 +145,7 @@ msgstr ""
 "  -n, --no-parser            ¥Æ¡¼¥Ö¥ë¤Î¤ß¤òÀ¸À®¤¹¤ë\n"
 "  -k, --token-table          ¥È¡¼¥¯¥ó̾¤Î¥Æ¡¼¥Ö¥ë¤ò´Þ¤á¤ë\n"
 
-#: src/getargs.c:190
+#: src/getargs.c:221
 #, fuzzy
 msgid ""
 "Output:\n"
@@ -159,7 +164,7 @@ msgstr ""
 "  -o, --output=FILE          ½ÐÎÏÀè¤ò FILE ¤È¤¹¤ë\n"
 "  -g, --graph                ¥ª¡¼¥È¥Þ¥È¥ó¤Î VCG µ­½Ò»Ò¤âºîÀ®¤¹¤ë\n"
 
-#: src/getargs.c:201
+#: src/getargs.c:232
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -170,26 +175,26 @@ msgid ""
 "  `none'         disable the report\n"
 msgstr ""
 
-#: src/getargs.c:212
+#: src/getargs.c:243
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï <bug-bison@gnu.org> ¤Þ¤Ç¡£\n"
 
-#: src/getargs.c:226
+#: src/getargs.c:260
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr "bison (GNU Bison) %s"
 
-#: src/getargs.c:228
+#: src/getargs.c:262
 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
-#: src/getargs.c:232
+#: src/getargs.c:266
 #, 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:234
+#: src/getargs.c:268
 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"
@@ -200,297 +205,260 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹ -- Ê£À½¤Ë¤Ä¤¤¤Æ¤Î¾ò·ï¤Ï¥½¡¼¥¹¤ò¸«¤Þ¤·¤ç¤¦¡£\n"
 "°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó -- ¾¦¶ÈÀ­¤äÌÜŪŬ¹çÀ­¤Ë¤Ä¤¤¤Æ¤ÎÊݾڤ¹¤é¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: src/getargs.c:395
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "`%s --help' ¤Ç¾ÜºÙ¾ðÊó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤\n"
-
-#: src/getargs.c:402
+#: src/getargs.c:424
 #, c-format
-msgid "%s: no grammar file given\n"
-msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
+msgid "missing operand after `%s'"
+msgstr ""
 
-#: src/getargs.c:406
+#: src/getargs.c:426
 #, c-format
-msgid "%s: extra arguments ignored after `%s'\n"
-msgstr "%s: `%s' ¤Î¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n"
+msgid "extra operand `%s'"
+msgstr ""
 
-#: src/gram.c:139
+#: src/gram.c:143
 msgid "empty"
 msgstr "¶õ"
 
-#: src/gram.c:233
+#: src/gram.c:237
 msgid "Grammar"
 msgstr "ʸˡ"
 
-#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
+#: src/gram.c:325 src/reduce.c:394
 #, fuzzy
 msgid "warning"
 msgstr "·Ù¹ð: "
 
-#: src/lalr.c:91
-#, c-format
-msgid "too many gotos (max %d)"
-msgstr "goto ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
-
-#: src/main.c:117
+#: src/main.c:124
 #, fuzzy
 msgid "rule never reduced because of conflicts"
 msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ"
 
-#: src/parse-gram.y:344
+#: src/parse-gram.y:335
 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 
-#: src/print.c:46
+#: src/parse-gram.y:458
+msgid "missing identifier in parameter declaration"
+msgstr ""
+
+#: src/print.c:49
 #, c-format
 msgid " type %d is %s\n"
 msgstr " ¥¿¥¤¥× %d ¤Ï %s ¤Ç¤¹\n"
 
-#: src/print.c:162
+#: src/print.c:165
 #, fuzzy, c-format
 msgid "shift, and go to state %d\n"
 msgstr "    %-4s\t¥·¥Õ¥È¡¢¤ª¤è¤Ó¾õÂÖ %d ¤Ø\n"
 
-#: src/print.c:164
+#: src/print.c:167
 #, fuzzy, c-format
 msgid "go to state %d\n"
-msgstr "    %-4s\t¾õÂÖ %d ¤Ø\n"
+msgstr "    $   \t¾õÂÖ %d ¤Ø\n"
 
-#: src/print.c:201
+#: src/print.c:204
 #, fuzzy
 msgid "error (nonassociative)\n"
 msgstr "%-4s\t¥¨¥é¡¼ (Èó·ë¹ç)"
 
-#: src/print.c:290
+#: src/print.c:292
 #, fuzzy, c-format
 msgid "reduce using rule %d (%s)"
 msgstr "$default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)"
 
-#: src/print.c:293
+#: src/print.c:294
 msgid "accept"
 msgstr ""
 
-#: src/print.c:324 src/print.c:390
+#: src/print.c:325 src/print.c:391
 msgid "$default"
 msgstr ""
 
-#: src/print.c:419
+#: src/print.c:420
 #, c-format
 msgid "state %d"
 msgstr "¾õÂÖ %d"
 
-#: src/print.c:453
+#: src/print.c:456
 msgid "Terminals, with rules where they appear"
 msgstr "½Ð¸½°ÌÃ֤ε¬Â§¤Ë¤è¤ë½ªÃ¼"
 
-#: src/print.c:480
+#: src/print.c:483
 msgid "Nonterminals, with rules where they appear"
 msgstr "½Ð¸½°ÌÃ֤ε¬Â§¤Ë¤è¤ëÈó½ªÃ¼"
 
-#: src/print.c:509
+#: src/print.c:512
 msgid " on left:"
 msgstr " º¸ÊÕ:"
 
-#: src/print.c:524
+#: src/print.c:527
 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 
-#: src/print.c:552
+#: src/print.c:555
 #, fuzzy
 msgid "Rules never reduced"
 msgstr "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n"
 
-#: src/reader.c:52
+#: src/reader.c:53
 #, c-format
 msgid "multiple %s declarations"
 msgstr "%s ¤¬Ê£¿ô¸ÄÀë¸À¤µ¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:141
+#: src/reader.c:138
 #, c-format
-msgid "result type clash on merge function %s: `%s' vs. `%s'"
+msgid "result type clash on merge function %s: <%s> != <%s>"
 msgstr ""
 
-#: src/reader.c:239
+#: src/reader.c:236
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹"
 
-#: src/reader.c:264
-#, c-format
-msgid "type clash (`%s' `%s') on default action"
+#: src/reader.c:265
+#, fuzzy, c-format
+msgid "type clash on default action: <%s> != <%s>"
 msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹"
 
-#: src/reader.c:272
+#: src/reader.c:271
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó"
 
-#: src/reader.c:343
-msgid "two @prec's in a row"
-msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
-
-#: src/reader.c:353
-#, c-format
-msgid "%%dprec affects only GLR parsers"
-msgstr ""
-
-#: src/reader.c:355
+#: src/reader.c:341 src/reader.c:355 src/reader.c:368
 #, c-format
-msgid "%%dprec must be followed by positive number"
+msgid "only one %s allowed per rule"
 msgstr ""
 
-#: src/reader.c:357
+#: src/reader.c:351 src/reader.c:366
 #, c-format
-msgid "only one %%dprec allowed per rule"
+msgid "%s affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:368
-#, c-format
-msgid "%%merge affects only GLR parsers"
-msgstr ""
-
-#: src/reader.c:370
+#: src/reader.c:353
 #, c-format
-msgid "only one %%merge allowed per rule"
+msgid "%s must be followed by positive number"
 msgstr ""
 
-#: src/reader.c:513
+#: src/reader.c:510
 msgid "no rules in the input grammar"
 msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:545
-#, c-format
-msgid "too many symbols (tokens plus nonterminals); maximum %d"
-msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó + Èó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %d"
-
-#: src/reduce.c:239
+#: src/reduce.c:242
 #, fuzzy
 msgid "useless rule"
 msgstr "%d ¸Ä¤Î̵°ÕÌ£¤Êµ¬Â§"
 
-#: src/reduce.c:302
-#, fuzzy
-msgid "useless nonterminal"
-msgstr "%d ¸Ä¤Î̵°ÕÌ£¤ÊÈó½ªÃ¼»Ò"
+#: src/reduce.c:303
+#, fuzzy, c-format
+msgid "useless nonterminal: %s"
+msgstr "̵°ÕÌ£¤ÊÈó½ªÃ¼»Ò:"
 
-#: src/reduce.c:349
+#: src/reduce.c:351
 #, fuzzy
 msgid "Useless nonterminals"
 msgstr "̵°ÕÌ£¤ÊÈó½ªÃ¼»Ò:"
 
-#: src/reduce.c:362
+#: src/reduce.c:364
 #, fuzzy
 msgid "Terminals which are not used"
 msgstr "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:"
 
-#: src/reduce.c:371
+#: src/reduce.c:373
 #, fuzzy
 msgid "Useless rules"
 msgstr "̵°ÕÌ£¤Êµ¬Â§:"
 
-#: src/reduce.c:387
+#: src/reduce.c:389
 #, c-format
 msgid "%d rule never reduced\n"
 msgid_plural "%d rules never reduced\n"
 msgstr[0] "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n"
 
-#: src/reduce.c:395
+#: src/reduce.c:397
 #, c-format
 msgid "%d useless nonterminal"
 msgid_plural "%d useless nonterminals"
 msgstr[0] "%d ¸Ä¤Î̵°ÕÌ£¤ÊÈó½ªÃ¼»Ò"
 
-#: src/reduce.c:401
+#: src/reduce.c:403
 msgid " and "
 msgstr "¤ª¤è¤Ó"
 
-#: src/reduce.c:404
+#: src/reduce.c:406
 #, c-format
 msgid "%d useless rule"
 msgid_plural "%d useless rules"
 msgstr[0] "%d ¸Ä¤Î̵°ÕÌ£¤Êµ¬Â§"
 
-#: src/reduce.c:435
+#: src/reduce.c:436
 #, fuzzy, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó"
 
-#: src/scan-gram.l:202
-#, c-format
-msgid ": invalid character: `%c'\n"
+#: src/scan-gram.l:160
+msgid "stray `,' treated as white space"
 msgstr ""
 
-#: src/scan-gram.l:246
-#, fuzzy
-msgid ": unexpected end of file in a comment\n"
-msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
+#: src/scan-gram.l:219
+#, fuzzy, c-format
+msgid "invalid directive: %s"
+msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s"
 
-#: src/scan-gram.l:274 src/scan-gram.l:412
-#, fuzzy
-msgid ": unexpected end of file in a string\n"
-msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
+#: src/scan-gram.l:239 src/scan-gram.l:795 src/scan-gram.l:863
+#, c-format
+msgid "integer out of range: %s"
+msgstr ""
 
-#: src/scan-gram.l:311 src/scan-gram.l:383
-#, fuzzy
-msgid ": unexpected end of file in a character\n"
-msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
+#: src/scan-gram.l:281
+#, fuzzy, c-format
+msgid "invalid character: %s"
+msgstr "̤ÃΤÎʸ»ú: %s"
 
-#: src/scan-gram.l:332
+#: src/scan-gram.l:410 src/scan-gram.l:420 src/scan-gram.l:439
 #, fuzzy, c-format
-msgid ": invalid escape: %s\n"
-msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
+msgid "invalid escape sequence: %s"
+msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s"
 
-#: src/scan-gram.l:353
+#: src/scan-gram.l:444
 #, fuzzy, c-format
-msgid ": unrecognized escape: %s\n"
+msgid "unrecognized escape sequence: %s"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
 
-#: src/scan-gram.l:473
-#, fuzzy
-msgid ": unexpected end of file in a braced code\n"
-msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
-
-#: src/scan-gram.l:502
-#, fuzzy
-msgid ": unexpected end of file in a prologue\n"
-msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
+#: src/scan-gram.l:532
+#, c-format
+msgid "missing `{' in `%s'"
+msgstr ""
 
-#: src/scan-gram.l:560
+#: src/scan-gram.l:767
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/scan-gram.l:577 src/scan-gram.l:664
-#, fuzzy, c-format
-msgid "invalid value: %s%d"
-msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
-
-#: src/scan-gram.l:584
+#: src/scan-gram.l:786
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d ¸Ä¤Î `%s' ¤¬Àë¸À¤µ¤ì¤¿·¿¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/scan-gram.l:595 src/scan-gram.l:612 src/scan-gram.l:671
-#: src/scan-gram.l:688
-#, c-format
-msgid "%s is invalid"
-msgstr "%s ¤ÏÉÔŬÀڤǤ¹"
+#: src/scan-gram.l:830 src/scan-gram.l:897
+#, fuzzy, c-format
+msgid "invalid value: %s"
+msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
 
-#: src/state.c:145
-#, c-format
-msgid "too many states (max %d)"
-msgstr "¾õÂÖ¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
+#: src/scan-gram.l:985
+#, fuzzy, c-format
+msgid "missing `%s' at end of file"
+msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
 
-#: src/symlist.c:97 src/symlist.c:109
+#: src/symlist.c:97 src/symlist.c:108
 msgid "invalid $ value"
 msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
 
-#: src/symtab.c:81
+#: src/symtab.c:84
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 
-#: src/symtab.c:98 src/symtab.c:117
+#: src/symtab.c:101 src/symtab.c:119
 #, fuzzy, c-format
 msgid "%s redeclaration for %s"
 msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
@@ -500,232 +468,265 @@ msgstr "%s 
 msgid "redefining precedence of %s"
 msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
 
-#: src/symtab.c:157
+#: src/symtab.c:156
 #, c-format
 msgid "symbol %s redefined"
 msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 
-#: src/symtab.c:180
+#: src/symtab.c:179
 #, fuzzy, c-format
 msgid "redefining user token number of %s"
 msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
 
-#: src/symtab.c:225
+#: src/symtab.c:206
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ"
 "¤»¤ó"
 
-#: src/symtab.c:244
+#: src/symtab.c:231
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr "¥·¥ó¥Ü¥ë `%s' ¤Ï¥ê¥Æ¥é¥ëʸ»úÎó¤È¤·¤ÆÊ£¿ô²ó»È¤ï¤ì¤Þ¤·¤¿"
 
-#: src/symtab.c:247
+#: src/symtab.c:234
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr "¥·¥ó¥Ü¥ë `%s' ¤ÏÊ£¿ô¤Î¥ê¥Æ¥é¥ëʸ»úÎó¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿"
 
-#: src/symtab.c:281
+#: src/symtab.c:270
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
-#: src/symtab.c:293
+#: src/symtab.c:282
 #, fuzzy, c-format
 msgid "conflicting associativities for %s (%s) and %s (%s)"
 msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
-#: src/symtab.c:363
+#: src/symtab.c:367
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %d ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 
-#: src/symtab.c:568
+#: src/symtab.c:590
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/symtab.c:572
+#: src/symtab.c:594
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
 
-#: lib/argmatch.c:161
+#: lib/argmatch.c:135
 #, fuzzy, c-format
 msgid "invalid argument %s for %s"
-msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
+msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s"
 
-#: lib/argmatch.c:162
+#: lib/argmatch.c:136
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr ""
 
-#: lib/argmatch.c:181
+#: lib/argmatch.c:155
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/bitset_stats.c:226
+#: lib/bitset_stats.c:178
 #, c-format
-msgid "%d bitset_allocs, %d freed (%.2f%%).\n"
+msgid "%u bitset_allocs, %u freed (%.2f%%).\n"
 msgstr ""
 
-#: lib/bitset_stats.c:229
+#: lib/bitset_stats.c:181
 #, c-format
-msgid "%d bitset_sets, %d cached (%.2f%%)\n"
+msgid "%u bitset_sets, %u cached (%.2f%%)\n"
 msgstr ""
 
-#: lib/bitset_stats.c:232
+#: lib/bitset_stats.c:184
 #, c-format
-msgid "%d bitset_resets, %d cached (%.2f%%)\n"
+msgid "%u bitset_resets, %u cached (%.2f%%)\n"
 msgstr ""
 
-#: lib/bitset_stats.c:235
+#: lib/bitset_stats.c:187
 #, c-format
-msgid "%d bitset_tests, %d cached (%.2f%%)\n"
+msgid "%u bitset_tests, %u cached (%.2f%%)\n"
 msgstr ""
 
-#: lib/bitset_stats.c:239
+#: lib/bitset_stats.c:191
 #, c-format
-msgid "%d bitset_lists\n"
+msgid "%u bitset_lists\n"
 msgstr ""
 
-#: lib/bitset_stats.c:241
+#: lib/bitset_stats.c:193
 msgid "count log histogram\n"
 msgstr ""
 
-#: lib/bitset_stats.c:244
+#: lib/bitset_stats.c:196
 msgid "size log histogram\n"
 msgstr ""
 
-#: lib/bitset_stats.c:247
+#: lib/bitset_stats.c:199
 msgid "density histogram\n"
 msgstr ""
 
-#: lib/bitset_stats.c:264
+#: lib/bitset_stats.c:213
 msgid ""
 "Bitset statistics:\n"
 "\n"
 msgstr ""
 
-#: lib/bitset_stats.c:267
+#: lib/bitset_stats.c:216
 #, c-format
-msgid "Accumulated runs = %d\n"
+msgid "Accumulated runs = %u\n"
 msgstr ""
 
-#: lib/bitset_stats.c:311
+#: lib/bitset_stats.c:260 lib/bitset_stats.c:265
 msgid "Could not read stats file."
 msgstr ""
 
-#: lib/bitset_stats.c:313
+#: lib/bitset_stats.c:262
 msgid "Bad stats file size.\n"
 msgstr ""
 
-#: lib/bitset_stats.c:339
+#: lib/bitset_stats.c:288 lib/bitset_stats.c:290
 msgid "Could not write stats file."
 msgstr ""
 
-#: lib/bitset_stats.c:343
+#: lib/bitset_stats.c:293
 msgid "Could not open stats file for writing."
 msgstr ""
 
-#: lib/getopt.c:662
+#: lib/getopt.c:688 lib/getopt.c:700
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
-#: lib/getopt.c:687
+#: lib/getopt.c:733 lib/getopt.c:737
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n"
 
-#: lib/getopt.c:692
+#: lib/getopt.c:746 lib/getopt.c:751
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n"
 
-#: lib/getopt.c:710 lib/getopt.c:883
+#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n"
 
-#: lib/getopt.c:739
+#: lib/getopt.c:838 lib/getopt.c:841
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `--%s' ¤Ç¤¹\n"
 
-#: lib/getopt.c:743
+#: lib/getopt.c:849 lib/getopt.c:852
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `%c%s' ¤Ç¤¹\n"
 
-#: lib/getopt.c:769
+#: lib/getopt.c:899 lib/getopt.c:902
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: Äê³Ê³°¤Î¥ª¥×¥·¥ç¥ó -- %c\n"
 
-#: lib/getopt.c:772
+#: lib/getopt.c:908 lib/getopt.c:911
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ÉÔŬÀڤʥª¥×¥·¥ç¥ó -- %c\n"
 
-#: lib/getopt.c:802 lib/getopt.c:932
+#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n"
 
-#: lib/getopt.c:849
+#: lib/getopt.c:1021 lib/getopt.c:1032
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
-#: lib/getopt.c:867
+#: lib/getopt.c:1056 lib/getopt.c:1068
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n"
 
-#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:66
+#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63
 msgid "memory exhausted"
 msgstr "¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿"
 
-#: lib/quotearg.c:274
+#: lib/quotearg.c:236
 msgid "`"
 msgstr "`"
 
-#: lib/quotearg.c:275
+#: lib/quotearg.c:237
 msgid "'"
 msgstr "'"
 
-#: lib/timevar.c:466
+#: lib/subpipe.c:187
+#, c-format
+msgid "subsidiary program `%s' could not be invoked"
+msgstr ""
+
+#: lib/subpipe.c:189
+#, c-format
+msgid "subsidiary program `%s' not found"
+msgstr ""
+
+#: lib/subpipe.c:191
+#, c-format
+msgid "subsidiary program `%s' failed"
+msgstr ""
+
+#: lib/subpipe.c:192
+#, c-format
+msgid "subsidiary program `%s' failed (exit status %d)"
+msgstr ""
+
+#: lib/timevar.c:476
 msgid ""
 "\n"
 "Execution times (seconds)\n"
 msgstr ""
 
-#: lib/timevar.c:516
+#: lib/timevar.c:526
 msgid " TOTAL                 :"
 msgstr ""
 
-#: lib/timevar.c:552
+#: lib/timevar.c:562
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr ""
 
-#~ msgid "%s contains "
-#~ msgstr "%s ¤ÎÃæ¿È¤Ï"
+#~ msgid "too many states (max %d)"
+#~ msgstr "¾õÂÖ¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 
-#~ msgid "    $default\taccept\n"
-#~ msgstr "    $default\taccept\n"
+#~ msgid "reduce"
+#~ msgstr "´Ô¸µ"
 
-#~ msgid "    NO ACTIONS\n"
-#~ msgstr "    Æ°ºî̵¤·\n"
+#~ msgid "shift"
+#~ msgstr "¥·¥Õ¥È"
 
-#~ msgid "   (rule %d)"
-#~ msgstr "   (µ¬Â§ %d)"
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
 
-#~ msgid "    %-4s\terror (nonassociative)\n"
-#~ msgstr "    %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n"
+#~ msgid "and"
+#~ msgstr "¤ª¤è¤Ó"
+
+#~ msgid "State %d contains "
+#~ msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï "
+
+#~ msgid "conflicts: "
+#~ msgstr "¾×ÆÍ: "
+
+#~ msgid "%s contains "
+#~ msgstr "%s ¤ÎÃæ¿È¤Ï"
+
+#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+#~ msgstr "    %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n"
 
 #~ msgid ""
 #~ "    $default\treduce using rule %d (%s)\n"
@@ -734,20 +735,23 @@ msgstr ""
 #~ "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 #~ "\n"
 
-#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
-#~ msgstr "    %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n"
-
 #~ msgid "    %-4s\treduce using rule %d (%s)\n"
 #~ msgstr "    %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 
 #~ msgid "    $default\treduce using rule %d (%s)\n"
 #~ msgstr "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 
-#~ msgid "Number, Line, Rule"
-#~ msgstr "ÈÖ¹æ,   ¹Ô, µ¬Â§"
+#~ msgid "`%s' is no longer supported"
+#~ msgstr "`%s' ¤ÏºÇÁ᥵¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó"
 
-#~ msgid "  %3d %3d %s ->"
-#~ msgstr "  %3d %3d %s ->"
+#~ msgid "%s: no grammar file given\n"
+#~ msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
+
+#~ msgid "%s: extra arguments ignored after `%s'\n"
+#~ msgstr "%s: `%s' ¤Î¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n"
+
+#~ msgid "too many gotos (max %d)"
+#~ msgstr "goto ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 
 #~ msgid "unexpected `/' found and ignored"
 #~ msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿"
@@ -755,6 +759,9 @@ msgstr ""
 #~ msgid "unterminated comment"
 #~ msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹"
 
+#~ msgid "unexpected end of file"
+#~ msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
+
 #~ msgid "unescaped newline in constant"
 #~ msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹"
 
@@ -782,8 +789,29 @@ msgstr ""
 #~ msgid "`%s' requires an argument"
 #~ msgstr "`%s' ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹"
 
-#~ msgid "`%s' is no longer supported"
-#~ msgstr "`%s' ¤ÏºÇÁ᥵¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó"
+#~ msgid "maximum table size (%d) exceeded"
+#~ msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%d) ¤òĶ¤¨¤Þ¤·¤¿"
+
+#~ msgid "   (rule %d)"
+#~ msgstr "   (µ¬Â§ %d)"
+
+#~ msgid "    $default\taccept\n"
+#~ msgstr "    $default\taccept\n"
+
+#~ msgid "    NO ACTIONS\n"
+#~ msgstr "    Æ°ºî̵¤·\n"
+
+#~ msgid "    %-4s\terror (nonassociative)\n"
+#~ msgstr "    %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n"
+
+#~ msgid "    %-4s\tgo to state %d\n"
+#~ msgstr "    %-4s\t¾õÂÖ %d ¤Ø\n"
+
+#~ msgid "Number, Line, Rule"
+#~ msgstr "ÈÖ¹æ,   ¹Ô, µ¬Â§"
+
+#~ msgid "  %3d %3d %s ->"
+#~ msgstr "  %3d %3d %s ->"
 
 #~ msgid "   Skipping to next \\n"
 #~ msgstr "   ¼¡¤Î \\n ¤Ë¥¹¥­¥Ã¥×"
@@ -791,18 +819,24 @@ msgstr ""
 #~ msgid "   Skipping to next %c"
 #~ msgstr "   ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×"
 
-#~ msgid "unterminated string at end of file"
-#~ msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
-
 #~ msgid "unterminated string"
 #~ msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó"
 
+#~ msgid "%s is invalid"
+#~ msgstr "%s ¤ÏÉÔŬÀڤǤ¹"
+
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
+
 #~ msgid "Premature EOF after %s"
 #~ msgstr "%s ¤Î¸å¤í¤ËÁ᤯¤â EOF ¤¬¤¢¤ê¤Þ¤¹"
 
 #~ msgid "`%s' is invalid in %s"
 #~ msgstr "`%s' ¤Ï %s Æâ¤Ç¤ÏÉÔŬÀڤǤ¹"
 
+#~ msgid "invalid %s declaration"
+#~ msgstr "%s ¤ÎÀë¸À¤¬ÉÔŬÀڤǤ¹"
+
 #~ msgid "%type declaration has no <typename>"
 #~ msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó"
 
@@ -818,14 +852,20 @@ msgstr ""
 #~ msgid "unmatched %s"
 #~ msgstr "Âбþ¤Î¤Ê¤¤ %s ¤Ç¤¹"
 
-#~ msgid "invalid %s declaration"
-#~ msgstr "%s ¤ÎÀë¸À¤¬ÉÔŬÀڤǤ¹"
+#~ msgid "argument of %%expect is not an integer"
+#~ msgstr "%%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
 
 #~ msgid "no input grammar"
 #~ msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
 
-#~ msgid "unknown character: %s"
-#~ msgstr "̤ÃΤÎʸ»ú: %s"
+#~ msgid "unterminated %guard clause"
+#~ msgstr "%guard À᤬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #~ msgid "ill-formed rule: initial symbol not followed by colon"
 #~ msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
@@ -833,44 +873,17 @@ msgstr ""
 #~ msgid "grammar starts with vertical bar"
 #~ msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
 
-#~ msgid "invalid input: %s"
-#~ msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s"
-
-#~ msgid "two actions at end of one rule"
-#~ msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
-
-#~ msgid "reduce"
-#~ msgstr "´Ô¸µ"
-
-#~ msgid "shift"
-#~ msgstr "¥·¥Õ¥È"
-
-#~ msgid "an error"
-#~ msgstr "¥¨¥é¡¼"
-
-#~ msgid "unterminated `%{' definition"
-#~ msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#~ msgid "argument of %%expect is not an integer"
-#~ msgstr "%%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
-
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
-
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
+#~ msgid "two @prec's in a row"
+#~ msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#~ msgid "maximum table size (%d) exceeded"
-#~ msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%d) ¤òĶ¤¨¤Þ¤·¤¿"
-
-#~ msgid "    $   \tgo to state %d\n"
-#~ msgstr "    $   \t¾õÂÖ %d ¤Ø\n"
+#~ msgid "two actions at end of one rule"
+#~ msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
 
-#~ msgid "unterminated %guard clause"
-#~ msgstr "%guard À᤬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
+#~ msgid "too many symbols (tokens plus nonterminals); maximum %d"
+#~ msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó + Èó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %d"
 
 #~ msgid ""
 #~ "\n"