* src/output.c (symbol_printers_output): Fix typo that led

[bison.git] / po / ja.po

diff --git a/po/ja.po b/po/ja.po
index 40b92d28606355216a08964463bdb745ef70358c..70dd30ad8fcd2ed0289c72eb37b9c8349a72c4f2 100644 (file)
--- 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-12-13 03:47-0800\n"
+"POT-Creation-Date: 2003-01-09 10:29+0100\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"
@@ -18,11 +18,11 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à¥¨¥é¡¼"
 
-#: src/complain.c:80 src/complain.c:97
+#: src/complain.c:79 src/complain.c:94
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: src/complain.c:159 src/complain.c:177
+#: src/complain.c:150 src/complain.c:166
 msgid "fatal error: "
 msgstr "Ã×̿Ū¥¨¥é¡¼: "
 
@@ -41,61 +41,56 @@ msgstr "
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n"
 
-#: src/conflicts.c:403
-#, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
-
-#: src/conflicts.c:410
-msgid "and"
-msgstr "¤ª¤è¤Ó"
-
-#: src/conflicts.c:416
+#: src/conflicts.c:398
 #, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d ´Ô¸µ/´Ô¸µ¾×ÆÍ"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-msgstr "¾×ÆÍ: "
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:438
-#, c-format
-msgid " %d shift/reduce"
+#: src/conflicts.c:401
+#, fuzzy, c-format
+msgid "conflicts: %d shift/reduce\n"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
 
-#: src/conflicts.c:442
-#, c-format
-msgid " %d reduce/reduce"
+#: src/conflicts.c:403
+#, fuzzy, c-format
+msgid "conflicts: %d reduce/reduce\n"
 msgstr " %d ´Ô¸µ/´Ô¸µ"
 
-#: src/conflicts.c:461
-#, c-format
-msgid "State %d contains "
-msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï "
+#: src/conflicts.c:421
+#, fuzzy, c-format
+msgid "State %d "
+msgstr "¾õÂÖ %d"
 
-#: src/conflicts.c:538
+#: 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:98
+#: 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:114
+#: src/files.c:115
 #, fuzzy
 msgid "I/O error"
 msgstr "¥¨¥é¡¼"
 
-#: src/files.c:117
+#: src/files.c:118
 msgid "cannot close file"
 msgstr "¥Õ¥¡¥¤¥ë¤òÊĤ¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
+#: 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"
@@ -210,12 +205,12 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹ -- Ê£À½¤Ë¤Ä¤¤¤Æ¤Î¾ò·ï¤Ï¥½¡¼¥¹¤ò¸«¤Þ¤·¤ç¤¦¡£\n"
 "°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó -- ¾¦¶ÈÀ­¤äÌÜŪŬ¹çÀ­¤Ë¤Ä¤¤¤Æ¤ÎÊݾڤ¹¤é¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: src/getargs.c:423
+#: src/getargs.c:424
 #, c-format
 msgid "missing operand after `%s'"
 msgstr ""
 
-#: src/getargs.c:425
+#: src/getargs.c:426
 #, c-format
 msgid "extra operand `%s'"
 msgstr ""
@@ -238,11 +233,11 @@ msgstr "
 msgid "rule never reduced because of conflicts"
 msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ"
 
-#: src/parse-gram.y:336
+#: src/parse-gram.y:334
 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 
-#: src/parse-gram.y:468
+#: src/parse-gram.y:457
 msgid "missing identifier in parameter declaration"
 msgstr ""
 
@@ -395,56 +390,61 @@ msgid "%d useless rule"
 msgid_plural "%d useless rules"
 msgstr[0] "%d ¸Ä¤Î̵°ÕÌ£¤Êµ¬Â§"
 
-#: src/reduce.c:436
+#: src/reduce.c:435
 #, fuzzy, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó"
 
-#: src/scan-gram.l:208
+#: src/scan-gram.l:157
+msgid "stray `,' treated as white space"
+msgstr ""
+
+#: src/scan-gram.l:216
 #, fuzzy, c-format
 msgid "invalid directive: %s"
 msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s"
 
-#: src/scan-gram.l:216
-msgid "stray `,' treated as white space"
-msgstr ""
-
-#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798
+#: src/scan-gram.l:236 src/scan-gram.l:785 src/scan-gram.l:853
 #, c-format
 msgid "integer out of range: %s"
 msgstr ""
 
-#: src/scan-gram.l:276
+#: src/scan-gram.l:281
 #, fuzzy, c-format
 msgid "invalid character: %s"
 msgstr "̤ÃΤÎʸ»ú: %s"
 
-#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429
+#: src/scan-gram.l:405 src/scan-gram.l:415 src/scan-gram.l:434
 #, fuzzy, c-format
 msgid "invalid escape sequence: %s"
 msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s"
 
-#: src/scan-gram.l:434
+#: src/scan-gram.l:439
 #, fuzzy, c-format
 msgid "unrecognized escape sequence: %s"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
 
-#: src/scan-gram.l:699
+#: src/scan-gram.l:524
+#, c-format
+msgid "missing `{' in `%s'"
+msgstr ""
+
+#: src/scan-gram.l:757
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/scan-gram.l:718
+#: src/scan-gram.l:776
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d ¸Ä¤Î `%s' ¤¬Àë¸À¤µ¤ì¤¿·¿¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/scan-gram.l:744 src/scan-gram.l:815
+#: src/scan-gram.l:820 src/scan-gram.l:887
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ"
 
-#: src/scan-gram.l:928
+#: src/scan-gram.l:978
 #, fuzzy, c-format
 msgid "missing `%s' at end of file"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
@@ -495,27 +495,27 @@ msgstr "
 msgid "symbol `%s' given more than one literal string"
 msgstr "¥·¥ó¥Ü¥ë `%s' ¤ÏÊ£¿ô¤Î¥ê¥Æ¥é¥ëʸ»úÎó¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿"
 
-#: src/symtab.c:269
+#: src/symtab.c:270
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
-#: src/symtab.c:281
+#: src/symtab.c:282
 #, fuzzy, c-format
 msgid "conflicting associativities for %s (%s) and %s (%s)"
 msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
-#: src/symtab.c:366
+#: src/symtab.c:367
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %d ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 
-#: src/symtab.c:589
+#: src/symtab.c:590
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/symtab.c:593
+#: src/symtab.c:594
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
@@ -709,6 +709,19 @@ msgstr ""
 #~ msgid "shift"
 #~ msgstr "¥·¥Õ¥È"
 
+#~ msgid "%d shift/reduce conflict"
+#~ msgid_plural "%d shift/reduce conflicts"
+#~ msgstr[0] "%d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ"
+
+#~ msgid "and"
+#~ msgstr "¤ª¤è¤Ó"
+
+#~ msgid "State %d contains "
+#~ msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï "
+
+#~ msgid "conflicts: "
+#~ msgstr "¾×ÆÍ: "
+
 #~ msgid "%s contains "
 #~ msgstr "%s ¤ÎÃæ¿È¤Ï"