Regenerate.

po/ja.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"
-"POT-Creation-Date: 2002-12-24 00:30-0800\n"
+"POT-Creation-Date: 2002-12-28 19:00-0800\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
+#: src/conflicts.c:398
 #, c-format
-msgid "%d shift/reduce conflict"
-msgid_plural "%d shift/reduce conflicts"
-msgstr[0] "%d シフト/還元衝突"
+msgid "conflicts: %d shift/reduce, %d reduce/reduce\n"
+msgstr ""
 
-#: src/conflicts.c:410
-msgid "and"
-msgstr "および"
-
-#: src/conflicts.c:416
-#, c-format
-msgid "%d reduce/reduce conflict"
-msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] "%d 還元/還元衝突"
-
-#: src/conflicts.c:436
-msgid "conflicts: "
-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 ""
@@ -395,7 +390,7 @@ 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 はどの文にも由来しません"
@@ -714,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 の中身は"