X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4fd2214bc6cc74e5ad81b223784cd07c8bf48108..5346290247ba1532a5fb8bc7982fb1dae1651936:/po/ja.po

diff --git a/po/ja.po b/po/ja.po
index 381f961d..ad661f51 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"
-"POT-Creation-Date: 2002-05-25 18:12+0200\n"
+"POT-Creation-Date: 2002-06-11 10:09+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"
@@ -31,64 +31,62 @@ 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"
 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"
@@ -103,16 +101,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"
@@ -120,7 +118,7 @@ msgstr ""
 "¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤Çɬ¿Ü¤Î°ú¿ô¤¬¼¨¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢Æ±¤¸°ÕÌ£¤Î¥·¥ç¡¼¥È¥ª¥×¥·¥ç¥ó\n"
 "¤Ç¤âƱÍͤËɬ¿Ü¤Î°ú¿ô¤È¤Ê¤ê¤Þ¤¹¡£É¬¿Ü¤Ç¤Ê¤¤ÁªÂòŪ°ú¿ô¤Ç¤âƱÍͤǤ¹¡£\n"
 
-#: src/getargs.c:111
+#: src/getargs.c:113
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
@@ -132,7 +130,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"
@@ -152,7 +150,7 @@ msgstr ""
 "  -n, --no-parser            ¥Æ¡¼¥Ö¥ë¤Î¤ß¤òÀ¸À®¤¹¤ë\n"
 "  -k, --token-table          ¥È¡¼¥¯¥ó̾¤Î¥Æ¡¼¥Ö¥ë¤ò´Þ¤á¤ë\n"
 
-#: src/getargs.c:130
+#: src/getargs.c:132
 #, fuzzy
 msgid ""
 "Output:\n"
@@ -163,11 +161,22 @@ msgid ""
 "  -o, --output=FILE          leave output to FILE\n"
 "  -g, --graph                also produce a VCG description of the "
 "automaton\n"
-"\n"
+msgstr ""
+"½ÐÎÏ:\n"
+"  -d, --defines              ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤âºîÀ®¤¹¤ë\n"
+"  -v, --verbose              ¥ª¡¼¥È¥Þ¥È¥ó¤Î²òÀâ¤âºîÀ®¤¹¤ë\n"
+"  -b, --file-prefix=PREFIX   ½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î PREFIX(ÀÜƬ¼­) ¤ò»ØÄꤹ¤ë\n"
+"  -o, --output=FILE          ½ÐÎÏÀè¤ò FILE ¤È¤¹¤ë\n"
+"  -g, --graph                ¥ª¡¼¥È¥Þ¥È¥ó¤Î VCG µ­½Ò»Ò¤âºîÀ®¤¹¤ë\n"
+
+#: src/getargs.c:143
+#, fuzzy
+msgid ""
 "THINGS is a list of comma separated words that can include:\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 ""
@@ -178,26 +187,26 @@ msgstr ""
 "  -o, --output=FILE          ½ÐÎÏÀè¤ò FILE ¤È¤¹¤ë\n"
 "  -g, --graph                ¥ª¡¼¥È¥Þ¥È¥ó¤Î VCG µ­½Ò»Ò¤âºîÀ®¤¹¤ë\n"
 
-#: src/getargs.c:148
+#: src/getargs.c:154
 msgid "Report bugs to <bug-bison@gnu.org>.\n"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï <bug-bison@gnu.org> ¤Þ¤Ç¡£\n"
 
-#: src/getargs.c:162
+#: src/getargs.c:168
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr "bison (GNU Bison) %s"
 
-#: src/getargs.c:164
+#: src/getargs.c:170
 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
-#: src/getargs.c:168
+#: src/getargs.c:174
 #, 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:176
 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"
@@ -208,17 +217,17 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹ -- Ê£À½¤Ë¤Ä¤¤¤Æ¤Î¾ò·ï¤Ï¥½¡¼¥¹¤ò¸«¤Þ¤·¤ç¤¦¡£\n"
 "°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó -- ¾¦¶ÈÀ­¤äÌÜŪŬ¹çÀ­¤Ë¤Ä¤¤¤Æ¤ÎÊݾڤ¹¤é¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: src/getargs.c:273
+#: src/getargs.c:279
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "`%s --help' ¤Ç¾ÜºÙ¾ðÊó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: src/getargs.c:282
+#: src/getargs.c:288
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/getargs.c:286
+#: src/getargs.c:292
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: `%s' ¤Î¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n"
@@ -228,60 +237,60 @@ msgstr "%s: `%s' 
 msgid "too many gotos (max %d)"
 msgstr "goto ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 
-#: src/lex.c:77
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿"
 
-#: src/lex.c:106 src/reader.c:480
+#: src/lex.c:107 src/reader.c:307
 msgid "unterminated comment"
 msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹"
 
-#: src/lex.c:138
+#: src/lex.c:139
 msgid "unexpected end of file"
 msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
 
-#: src/lex.c:157
+#: src/lex.c:158
 msgid "unescaped newline in constant"
 msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/lex.c:196
+#: src/lex.c:197
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "8 ¿Ê¿ô¤ÎÃͤ¬ 0...255 ¤ÎÈϰϳ°¤Ç¤¹: `\\%o'"
 
-#: src/lex.c:221
+#: src/lex.c:222
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "16 ¿Ê¿ô¤ÎÃͤ¬ 255 ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹: `\\x%x'"
 
-#: src/lex.c:233
+#: src/lex.c:234
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹: `\\' ¤Î¸å¤Ë `%s'"
 
-#: src/lex.c:264
+#: src/lex.c:265
 msgid "unterminated type name at end of file"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¡¢¥Õ¥¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
 
-#: src/lex.c:267
+#: src/lex.c:268
 msgid "unterminated type name"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/lex.c:359
+#: src/lex.c:360
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦"
 
-#: src/lex.c:575
+#: src/lex.c:566
 #, c-format
 msgid "`%s' supports no argument: %s"
 msgstr "`%s' ¤Ï°ú¿ô¤ò¼õ¤±ÉÕ¤±¤Þ¤»¤ó: %s"
 
-#: src/lex.c:593
+#: src/lex.c:584
 #, c-format
 msgid "`%s' requires an argument"
 msgstr "`%s' ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹"
 
-#: src/lex.c:604
+#: src/lex.c:595
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ¤ÏºÇÁ᥵¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó"
@@ -348,263 +357,192 @@ 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 " ±¦ÊÕ:"
 
-#: src/reader.c:100
-#, c-format
-msgid "symbol %s is used, but is not defined as a token and has no rules"
-msgstr ""
-"¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ"
-"¤»¤ó"
-
-#: src/reader.c:119
-#, c-format
-msgid "symbol `%s' used more than once as a literal string"
-msgstr "¥·¥ó¥Ü¥ë `%s' ¤Ï¥ê¥Æ¥é¥ëʸ»úÎó¤È¤·¤ÆÊ£¿ô²ó»È¤ï¤ì¤Þ¤·¤¿"
-
-#: src/reader.c:122
-#, c-format
-msgid "symbol `%s' given more than one literal string"
-msgstr "¥·¥ó¥Ü¥ë `%s' ¤ÏÊ£¿ô¤Î¥ê¥Æ¥é¥ëʸ»úÎó¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿"
-
-#: src/reader.c:157
-#, c-format
-msgid "conflicting precedences for %s and %s"
-msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
-
-#: src/reader.c:168
-#, c-format
-msgid "conflicting assoc values for %s and %s"
-msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
-
-#: src/reader.c:236
-#, c-format
-msgid "tokens %s and %s both assigned number %d"
-msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %d ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
-
-#: src/reader.c:256
+#: src/reader.c:83
 msgid "   Skipping to next \\n"
 msgstr "   ¼¡¤Î \\n ¤Ë¥¹¥­¥Ã¥×"
 
-#: src/reader.c:258
+#: src/reader.c:85
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×"
 
-#: src/reader.c:309 src/reader.c:321
+#: src/reader.c:136 src/reader.c:148
 msgid "invalid $ value"
 msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
 
-#: src/reader.c:370 src/reader.c:385
+#: src/reader.c:197 src/reader.c:212
 msgid "unterminated string at end of file"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
 
-#: src/reader.c:373
+#: src/reader.c:200
 msgid "unterminated string"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó"
 
-#: src/reader.c:514 src/reader.c:573
+#: src/reader.c:341 src/reader.c:399
 #, fuzzy, c-format
 msgid "invalid value: %s%d"
 msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
 
-#: src/reader.c:523 src/reader.c:591
+#: src/reader.c:350 src/reader.c:417
 #, c-format
 msgid "%s is invalid"
 msgstr "%s ¤ÏÉÔŬÀڤǤ¹"
 
-#: src/reader.c:559
+#: src/reader.c:385
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/reader.c:579
+#: src/reader.c:405
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d ¸Ä¤Î `%s' ¤¬Àë¸À¤µ¤ì¤¿·¿¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:641
+#: src/reader.c:467
 msgid "unterminated `%{' definition"
 msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099
+#: src/reader.c:510 src/reader.c:599 src/reader.c:645 src/reader.c:805
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "%s ¤Î¸å¤í¤ËÁ᤯¤â EOF ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/reader.c:711 src/reader.c:866
-#, c-format
-msgid "symbol %s redefined"
-msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
-
-#: src/reader.c:723 src/reader.c:811 src/reader.c:877
-#, c-format
-msgid "type redeclaration for %s"
-msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
-
-#: src/reader.c:741
+#: src/reader.c:544
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ¤Ï %s Æâ¤Ç¤ÏÉÔŬÀڤǤ¹"
 
-#: src/reader.c:759 src/reader.c:923
+#: src/reader.c:562 src/reader.c:707
 #, c-format
 msgid "multiple %s declarations"
 msgstr "%s ¤¬Ê£¿ô¸ÄÀë¸À¤µ¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127
-#: src/reader.c:1141
+#: src/reader.c:564 src/reader.c:785 src/reader.c:800 src/reader.c:833
+#: src/reader.c:847
 #, c-format
 msgid "invalid %s declaration"
 msgstr "%s ¤ÎÀë¸À¤¬ÉÔŬÀڤǤ¹"
 
-#: src/reader.c:781
+#: src/reader.c:584
 msgid "%type declaration has no <typename>"
 msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/reader.c:816
+#: src/reader.c:614
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "¥¢¥¤¥Æ¥à¤Î°Ù¤Î %%type Àë¸À¤¬ÉÔŬÀڤǤ¹: %s"
 
-#: src/reader.c:862
-#, c-format
-msgid "redefining precedence of %s"
-msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
-
-#: src/reader.c:889
+#: src/reader.c:673
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "ÉÔŬÀڤʥƥ­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹"
 
-#: src/reader.c:899
+#: src/reader.c:683
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s"
 
-#: src/reader.c:956 src/reader.c:1316
+#: src/reader.c:740 src/reader.c:1021
 #, c-format
 msgid "unmatched %s"
 msgstr "Âбþ¤Î¤Ê¤¤ %s ¤Ç¤¹"
 
-#: src/reader.c:985
+#: src/reader.c:769
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
 
-#: src/reader.c:1031
-#, c-format
-msgid "unrecognized item %s, expected an identifier"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
-
-#: src/reader.c:1053
-#, c-format
-msgid "expected string constant instead of %s"
-msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
-
-#: src/reader.c:1249
+#: src/reader.c:951
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
 
-#: src/reader.c:1254
+#: src/reader.c:956
 msgid "no input grammar"
 msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
 
-#: src/reader.c:1259
+#: src/reader.c:961
 #, c-format
 msgid "unknown character: %s"
 msgstr "̤ÃΤÎʸ»ú: %s"
 
-#: src/reader.c:1411
-msgid "ill-formed rule: initial symbol not followed by colon"
-msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
-
-#: src/reader.c:1418
-msgid "grammar starts with vertical bar"
-msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
-
-#: src/reader.c:1446
+#: src/reader.c:1129
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹"
 
-#: src/reader.c:1476 src/reader.c:1586
-msgid "previous rule lacks an ending `;'"
-msgstr ""
-
-#: src/reader.c:1554
+#: src/reader.c:1181
 msgid "two @prec's in a row"
 msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: src/reader.c:1564
-msgid "two actions at end of one rule"
-msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
-
-#: src/reader.c:1578
+#: src/reader.c:1206
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹"
 
-#: src/reader.c:1584
+#: src/reader.c:1213
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó"
 
-#: src/reader.c:1592
+#: src/reader.c:1263
+msgid "ill-formed rule: initial symbol not followed by colon"
+msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
+
+#: src/reader.c:1269
+msgid "grammar starts with vertical bar"
+msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
+
+#: src/reader.c:1302 src/reader.c:1342
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1348
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s"
 
-#: src/reader.c:1599
+#: src/reader.c:1355
 msgid "no rules in the input grammar"
 msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:1620
+#: src/reader.c:1377
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó + Èó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %d"
 
-#: src/reader.c:1723
-#, c-format
-msgid "the start symbol %s is undefined"
-msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: src/reader.c:1725
-#, c-format
-msgid "the start symbol %s is a token"
-msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
-
 #: src/reduce.c:338
 msgid "Useless nonterminals:"
 msgstr "̵°ÕÌ£¤ÊÈó½ªÃ¼»Ò:"
@@ -711,6 +649,59 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ msgid "two actions at end of one rule"
+#~ msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
+
+#~ msgid "symbol %s redefined"
+#~ msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
+
+#~ msgid "type redeclaration for %s"
+#~ msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
+
+#~ msgid "redefining precedence of %s"
+#~ msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
+
+#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
+
+#~ msgid "symbol %s is used, but is not defined as a token and has no rules"
+#~ msgstr ""
+#~ "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á"
+#~ "¤Þ¤»¤ó"
+
+#~ msgid "symbol `%s' used more than once as a literal string"
+#~ msgstr "¥·¥ó¥Ü¥ë `%s' ¤Ï¥ê¥Æ¥é¥ëʸ»úÎó¤È¤·¤ÆÊ£¿ô²ó»È¤ï¤ì¤Þ¤·¤¿"
+
+#~ msgid "symbol `%s' given more than one literal string"
+#~ msgstr "¥·¥ó¥Ü¥ë `%s' ¤ÏÊ£¿ô¤Î¥ê¥Æ¥é¥ëʸ»úÎó¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿"
+
+#~ msgid "conflicting precedences for %s and %s"
+#~ msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
+
+#~ msgid "conflicting assoc values for %s and %s"
+#~ msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
+
+#~ msgid "tokens %s and %s both assigned number %d"
+#~ msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %d ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
+
+#~ msgid "the start symbol %s is undefined"
+#~ msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#~ msgid "the start symbol %s is a token"
+#~ msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
+
+#~ msgid "reduce"
+#~ msgstr "´Ô¸µ"
+
+#~ msgid "shift"
+#~ msgstr "¥·¥Õ¥È"
+
+#~ msgid "an error"
+#~ msgstr "¥¨¥é¡¼"
+
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"