- Japanese translation update from Yasushi SHOJI

  <yashi@atmark-techno.com>.

6 files changed, 141 insertions, 118 deletions

diff --git a/po/de.po b/po/de.po
index 6f0b5ea..a0021cc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -924,12 +924,12 @@ msgid "Applying patch %s\\n"
 msgstr "Wende Patch %s an\\n"
 
 #: quilt/push.in:189
-msgid "Patch %s does not exist, applied\\n"
-msgstr "Patch %s existiert nicht; wird angewandt\\n"
+msgid "Patch %s does not exist; applied empty patch\\n"
+msgstr "Patch %s existiert nicht; wende leeren patch an\\n"
 
 #: quilt/push.in:193
-msgid "Patch %s appears to be empty, applied\\n"
-msgstr "Patch %s scheint leer zu sein, angewandt\\n"
+msgid "Patch %s appears to be empty; applied\\n"
+msgstr "Patch %s scheint leer zu sein; angewandt\\n"
 
 #: quilt/push.in:197
 msgid "Applied patch %s (forced; needs refresh)\\n"
diff --git a/po/fr.po b/po/fr.po
index 08d30ae..ba45d49 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -943,11 +943,12 @@ msgid "Applying patch %s\\n"
 msgstr "Application de %s\\n"
 
 #: quilt/push.in:189
-msgid "Patch %s does not exist, applied\\n"
+#, fuzzy
+msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Le patch %s n'existe pas, appliqué\\n"
 
 #: quilt/push.in:193
-msgid "Patch %s appears to be empty, applied\\n"
+msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Le patch %s semble vide. Il a été appliqué.\\n"
 
 #: quilt/push.in:197
diff --git a/po/ja.po b/po/ja.po
index cdece6f..df72570 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: quilt 0.33\n"
-"PO-Revision-Date: 2005-03-07 07:09+0900\n"
+"PO-Revision-Date: 2005-07-25 14:57+0900\n"
 "Last-Translator: Yasushi SHOJI <yashi@atmark-techno.com>\n"
 "Language-Team: Quilt\n"
 "MIME-Version: 1.0\n"
@@ -18,14 +18,13 @@ msgstr "使�方: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 
 #: bin/quilt.in:24
 msgid "       quilt --version"
-msgstr ""
+msgstr "       quilt --version"
 
 #: bin/quilt.in:26
 msgid "Commands are:"
 msgstr "コマンド一覧:"
 
 #: bin/quilt.in:31
-#, fuzzy
 msgid ""
 "\n"
 "Global options:\n"
@@ -50,7 +49,10 @@ msgstr ""
 "--quiltrc file\n"
 "\t~/.quiltrc (存在���場��代�り� /etc/quiltrc) 以外�コン\n"
 "\tフィギュレーションファイルを指定。内容�詳細����� PDF�ド\n"
-"\tキュメントを�照。"
+"\tキュメントを�照。\n"
+"\n"
+"--version\n"
+"\t�ージョン情報を出力��終了。"
 
 #: quilt/add.in:22
 msgid "Usage: quilt add [-p patch] {file} ...\\n"
@@ -108,7 +110,7 @@ msgstr "ファイル %s ã�¯ã€�パッãƒ� %s ã�«ã‚ˆã�£ã�¦ã�™ã�§ã�«å¤‰æ›´ã�•ã‚Œã�¦ã
 
 #: quilt/add.in:137
 msgid "Cannot add symbolic link %s\\n"
-msgstr "シンボリックファイル %s�追加����ん"
+msgstr "シンボリックファイル %s �追加����ん"
 
 #: quilt/add.in:144
 msgid "Failed to back up file %s\\n"
@@ -119,9 +121,8 @@ msgid "File %s added to patch %s\\n"
 msgstr "ファイル %s をパッ� %s �追加����\\n"
 
 #: quilt/annotate.in:22
-#, fuzzy
 msgid "Usage: quilt annotate {file}\\n"
-msgstr "使�方: quilt patches {ファイル}\\n"
+msgstr "使�方: quilt annotate {ファイル}\\n"
 
 #: quilt/annotate.in:25
 msgid ""
@@ -129,6 +130,9 @@ msgid ""
 "Print an annotated listing of the specified file showing which\n"
 "patches modify which lines.\n"
 msgstr ""
+"\n"
+"指定�れ�ファイルを���パッ����行を変更������註釈付��出力��"
+"�\n"
 
 #: quilt/applied.in:22
 msgid "Usage: quilt applied [patch]\\n"
@@ -153,7 +157,6 @@ msgid "Usage: quilt delete [patch | -n]\\n"
 msgstr "使�方: quilt delete [パッ� | -n]\\n"
 
 #: quilt/delete.in:25
-#, fuzzy
 msgid ""
 "\n"
 "Remove the specified or topmost patch from the series file.  If the\n"
@@ -167,37 +170,37 @@ msgstr ""
 "指定�れ�パッ�����最上��パッ�をシリーズファイル�ら削除���。\n"
 "パッ������用�れ��る場���最��パッ�を外���。( �状�最\n"
 "上��パッ���削除�る�������ん。) \n"
+"\n"
+"-n\t最上�パッ�や指定�れ�パッ������最上�パッ��次�パッ�を\n"
+"\t削除���。\n"
 
 #: quilt/delete.in:88
-#, fuzzy
 msgid "No next patch\\n"
-msgstr "�在�置�パッ� %s ��"
+msgstr "次�パッ���り��ん"
 
 #: quilt/delete.in:106
 msgid "Patch %s is currently applied\\n"
 msgstr "パッ� %s ��在�用�れ����。\\n"
 
 #: quilt/delete.in:113
-#, fuzzy
 msgid "Removed patch %s\\n"
-msgstr "パッ� %s を削除���\\n"
+msgstr "パッ� %s �削除�れ���\\n"
 
 #: quilt/delete.in:115
 msgid "Failed to remove patch %s\\n"
-msgstr "パッ� %sを削除�る���失敗����。\\n"
+msgstr "パッ� %s を削除�る���失敗����。\\n"
 
 #: quilt/diff.in:24
-#, fuzzy
 msgid ""
 "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
 "patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] "
 "[--color] [file ...]\\n"
 msgstr ""
 "使�方: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-"
-"P パッ�] [--snapshot] [--diff=utility] [--color] [ファイル ...]\\n"
+"P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--"
+"sort] [--color] [file ...]\\n"
 
 #: quilt/diff.in:28
-#, fuzzy
 msgid ""
 "\n"
 "Produces a diff of the specified file(s) in the topmost or specified\n"
@@ -244,7 +247,7 @@ msgid ""
 "--sort\tSort files by their name instead of preserving the original order.\n"
 msgstr ""
 "\n"
-"最上�����指定�れ�パッ���指定�れ�ファイル�差分を作��る。\n"
+"最上����指定�れ�パッ���指定�れ�ファイル�差分を作��る。\n"
 "ファイル�指定�れ����場���変更�れ�ファイル������れる。\n"
 "\n"
 "-p n\t-p n スタイル�パッ�を作� (-p0 ��� -p1�サ�ート�れ��る)\n"
@@ -257,6 +260,9 @@ msgstr ""
 "--no-timestamps\n"
 "\tパッ�ヘッダ�タイムスタンプを����。\n"
 "\n"
+"--no-index\n"
+"\tIndex: �行を出力���。\n"
+"\n"
 "-z\t最上�����指定�れ�パッ��関連��変更を�標準出力�表示。\n"
 "\n"
 "-R\treverse diffを作�。\n"
@@ -278,6 +284,8 @@ msgstr ""
 "\n"
 "--color[=always|auto|never]\n"
 "\tシンタックス�色付�指定。\n"
+"\n"
+"--sort\t順番を�������順�ファイルを並���る。\n"
 
 #: quilt/diff.in:231
 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n"
@@ -302,7 +310,7 @@ msgstr "テン�ラリファイル��パッ��用�失敗����\\n
 
 #: quilt/diff.in:386
 msgid "File %s is not being modified\\n"
-msgstr "ファイル %s�変更�れ����ん\\n"
+msgstr "ファイル %s �変更�れ����ん\\n"
 
 #: quilt/diff.in:406 quilt/refresh.in:201
 msgid "Diff failed, aborting\\n"
@@ -310,7 +318,7 @@ msgstr "差分�失敗����。異常終了���\\n"
 
 #: quilt/diff.in:413
 msgid "More recent patches modify files in patch %s\\n"
-msgstr "最近�パッ���パッ� %s内�ファイルを変更�����\\n"
+msgstr "最近�パッ���パッ� %s 内�ファイルを変更�����\\n"
 
 #: quilt/edit.in:13
 msgid "Usage: quilt edit file ...\\n"
@@ -413,18 +421,28 @@ msgid ""
 "dash-and-number, the number is further incremented (e.g., patch.diff,\n"
 "patch-2.diff, patch-3.diff).\n"
 msgstr ""
+"\n"
+"最上�パッ�をフォーク�る。パッ�をフォーク�る����内容�コピーを別��"
+"��作��る����新����を元�方�����使用�る。�れ�パッ�を変更"
+"���れ��ら����元��ージョンも残���れ��ら��場��便利��る"
+"(例: 別シリーズ��使用や�程��存) 。典型的�コマンド�順番�����fork�"
+"edit�refresh��る。\n"
+"\n"
+"new_name�指定�れ����場��フォーク��パッ����在�パッ���後� \\"
+"\"-2\\\"�付�。���パッ��� -番��終���る場��番��値�1増�る "
+"(例: patch.diff�patch-2.diff�patch-3.diff)。\n"
 
 #: quilt/fork.in:99
 msgid "Patch %s exists already, please choose a new name\\n"
-msgstr "パッ� %s����存在���。新����を�ん�����\\n"
+msgstr "パッ� %s ����存在���。新����を�ん�����\\n"
 
 #: quilt/fork.in:111
 msgid "Fork of patch %s to patch %s failed\\n"
-msgstr "パッ� %s�らパッ� %s��分��失敗����\\n"
+msgstr "パッ� %s �らパッ� %s ��分��失敗����\\n"
 
 #: quilt/fork.in:117
 msgid "Fork of patch %s created as %s\\n"
-msgstr "パッ� %s�分�� %s�作��れ���\\n"
+msgstr "パッ� %s �分�� %s �作��れ���\\n"
 
 #: quilt/graph.in:22
 msgid ""
@@ -515,13 +533,12 @@ msgstr ""
 "シュ記��後�渡������る。\n"
 
 #: quilt/header.in:24
-#, fuzzy
 msgid ""
 "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-"
 "trailing-whitespace] [patch]\\n"
 msgstr ""
-"使�方: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] "
-"[パッ�]\\n"
+"使�方: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-"
+"trailing-whitespace] [patch]\\n"
 
 #: quilt/header.in:28
 msgid ""
@@ -542,16 +559,30 @@ msgid ""
 "--backup\n"
 "\tCreate a backup copy of the old version of a patch as patch~.\n"
 msgstr ""
+"\n"
+"最上����指定�れ�パッ��ヘッダを出力���変更�る。\n"
+"\n"
+"-a, -r, -e\n"
+"\tパッ��ヘッダ�追加 (-a) ���ヘッダを変更 (-r)�$EDITOR (%s)を\n"
+"\t使��編集 (-e)�る。オプション�指定�れ����場��パッ��\n"
+"\tヘッダを出力�る。\n"
+"\n"
+"--strip-diffstat\n"
+"\tdiffstat�出力をヘッダ�ら削除�る。\n"
+"\n"
+"--strip-trailing-whitespace\n"
+"\t末尾�空白文字をヘッダ�ら削除�る。\n"
+"\n"
+"--backup\n"
+"\t���ージョン�パッ���ックアップコピーを patch~���作��る。\n"
 
 #: quilt/header.in:192
-#, fuzzy
 msgid "Replaced header of patch %s\\n"
-msgstr "パッ� %s をリフレッシュ����\\n"
+msgstr "パッ� %s �ヘッダを変更����\\n"
 
 #: quilt/header.in:195
-#, fuzzy
 msgid "Appended text to header of patch %s\\n"
-msgstr "パッ� %s �作��失敗����\\n"
+msgstr "パッ� %s �ヘッダ�追加����\\n"
 
 #: quilt/import.in:22
 msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
@@ -597,11 +628,11 @@ msgstr "パッ� %s �����存在���。-f�置���る��
 
 #: quilt/import.in:104
 msgid "Replacing patch %s with new version\\n"
-msgstr "パッ� % を新���ージョン�置�����\\n"
+msgstr "パッ� %s を新���ージョン�置�����\\n"
 
 #: quilt/import.in:107
 msgid "Importing patch %s (stored as %s)\\n"
-msgstr "パッ� %s を�り込ん���� (%s����存�れ��)\\n"
+msgstr "パッ� %s を�り込ん���� (%s ����存�れ��)\\n"
 
 #: quilt/import.in:115
 msgid "Failed to import patch %s\\n"
@@ -620,7 +651,6 @@ msgstr ""
 "[--bcc ...] [--subject ...]\\n"
 
 #: quilt/mail.in:28
-#, fuzzy
 msgid ""
 "\n"
 "Create mail messages from all patches in the series file, and either store\n"
@@ -642,17 +672,17 @@ msgid ""
 "\tAppend a recipient to the To, Cc, or Bcc header.\n"
 msgstr ""
 "\n"
-"シリーズファイル内��る����パッ��らメールを作��る。mailboxファ\n"
-"イル����存�������り出������る。説明文�テンプレート作\n"
-"�����エディタ�実行�れる。詳細����� @DOCSUBDIR@/README.MAIL\n"
-"を�照。\n"
+"シリーズファイル内��る����パッ��らメールを作��る。\n"
+"mailboxファイル����存�������り出������る。\n"
+"説明文�テンプレート作�����エディタ�実行�れる。\n"
+"詳細����� %sを�照。\n"
 "\n"
 "--mbox ファイル\n"
 "\t全メッセージを指定�れ�ファイル� mbox形���存。後�例��\n"
 "\tformail��を使���信�る�����る。\n"
 "\n"
 "--send\n"
-"\t@MTA@を使���直接メッセージを�信�る。\n"
+"\t%s を使���直接メッセージを�信�る。\n"
 "\n"
 "--from, --subject\n"
 "\t使用�る From�Subjectヘッダ�値。\n"
@@ -726,7 +756,6 @@ msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
 msgstr "使�方: quilt pop [-afRqv] [数字|パッ�]\\n"
 
 #: quilt/pop.in:25
-#, fuzzy
 msgid ""
 "\n"
 "Remove patch(es) from the stack of applied patches.  Without options,\n"
@@ -761,8 +790,8 @@ msgstr ""
 "-f\t�題��るパッ��も�処�を進�る。�ックアップファイルを使���\n"
 "\tパッ���用�れる��状態�復旧�る。\n"
 "\n"
-"-R\t\\`patch -R'を����パッ�を����変更点�正常�元�戻る��を\n"
-"\t確�。\n"
+"-R\t必�パッ��正常����る�検証�る (タイムスタンプ��ェック�\n"
+"\t�存���)\n"
 "\n"
 "-q\t表示を抑制。\n"
 "\n"
@@ -775,13 +804,12 @@ msgstr ""
 "����������)\\n"
 
 #: quilt/pop.in:181
-#, fuzzy
 msgid "Patch %s appears to be empty, removing\\n"
-msgstr "パッ� %s��空�よ���\\n"
+msgstr "パッ� %s ��空�よ���。�����\\n"
 
 #: quilt/pop.in:185
 msgid "Removing patch %s\\n"
-msgstr "パッ� %s を削除���\\n"
+msgstr "パッ� %s を�����\\n"
 
 #: quilt/pop.in:269
 msgid "Patch %s needs to be refreshed first.\\n"
@@ -814,7 +842,6 @@ msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n"
 msgstr "使�方: quilt push [-afqv] [--leave-rejects] [数字|パッ�]\\n"
 
 #: quilt/push.in:27
-#, fuzzy
 msgid ""
 "\n"
 "Apply patch(es) from the series file.  Without options, the next patch\n"
@@ -882,11 +909,12 @@ msgstr "パッ� %s を�用�����\\n"
 
 #: quilt/push.in:189
 #, fuzzy
-msgid "Patch %s does not exist, applied\\n"
-msgstr "パッ� %s ��用�れ����ん\\n"
+msgid "Patch %s does not exist; applied empty patch\\n"
+msgstr "パッ� %s �存在���ん。状態��変更���\\n"
 
 #: quilt/push.in:193
-msgid "Patch %s appears to be empty, applied\\n"
+#, fuzzy
+msgid "Patch %s appears to be empty; applied\\n"
 msgstr "パッ� %s �空�よ������用����\\n"
 
 #: quilt/push.in:197
@@ -916,16 +944,14 @@ msgstr ""
 "seriesファイル�パッ������用�れ����。最終パッ�� %s ��。\\n"
 
 #: quilt/refresh.in:22
-#, fuzzy
 msgid ""
 "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] "
 "[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
 msgstr ""
-"使�方: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] "
-"[パッ�]\\n"
+"使�方: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--"
+"diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
 
 #: quilt/refresh.in:26
-#, fuzzy
 msgid ""
 "\n"
 "Refreshes the specified patch, or the topmost patch by default.\n"
@@ -989,15 +1015,23 @@ msgstr ""
 "--no-timestamps\n"
 "\tパッ�ヘッダ�タイムスタンプを����。\n"
 "\n"
+"--no-index\n"
+"\tIndex: �行を出力���。\n"
+"\n"
 "--diffstat\n"
 "\tdiffstat�セクションをパッ��先頭部分�追加����既存� \n"
 "\tdiffstatセクションを上書��る。\n"
 "\n"
-"-f\tスタック�一番上���パッ��リフレッシュを強��る\n"
+"-f\tスタック�一番上���パッ��リフレッシュを強��る。\n"
 "\n"
 "--backup\n"
 "\t�ックアップ用�コピー������ージョン�パッ�を patch~�\n"
 "\t形�作��る。\n"
+"\n"
+"--sort\t順番を�������順�ファイルを並���る。\n"
+"\n"
+"--strip-trailing-whitespace\n"
+"\t末尾�空白文字を削除�る。\n"
 
 #: quilt/refresh.in:173
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
@@ -1015,6 +1049,7 @@ msgstr ""
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
+"--strip-trailing-whitespace �影�����るファイル��る場��使���ん"
 
 #: quilt/refresh.in:219
 msgid "Nothing in patch %s\\n"
@@ -1061,9 +1096,8 @@ msgid "File %s removed from patch %s\\n"
 msgstr "ファイル %s を�パッ� %s �ら削除����\\n"
 
 #: quilt/rename.in:22
-#, fuzzy
 msgid "Usage: quilt rename [-p patch] new_name\\n"
-msgstr "使�方: quilt remove [-p パッ�] {ファイル} ...\\n"
+msgstr "使�方: quilt rename [-p patch] new_name\\n"
 
 #: quilt/rename.in:25
 msgid ""
@@ -1073,21 +1107,23 @@ msgid ""
 "-p patch\n"
 "\tPatch to rename.\n"
 msgstr ""
+"\n"
+"最上����指定�れ�パッ����を変更�る\n"
+"\n"
+"-p patch\n"
+"\t��を変更�る patch\n"
 
 #: quilt/rename.in:96
-#, fuzzy
 msgid "Patch %s exists already, please choose a different name\\n"
-msgstr "パッ� %s����存在���。新����を�ん�����\\n"
+msgstr "パッ� %s ����存在���。新����を�ん�����\\n"
 
 #: quilt/rename.in:110
-#, fuzzy
 msgid "Renaming of patch %s to %s failed\\n"
-msgstr "パッ� %s�らパッ� %s��分��失敗����\\n"
+msgstr "パッ� %s �ら %s�����変更�失敗����\\n"
 
 #: quilt/rename.in:116
-#, fuzzy
 msgid "Patch %s renamed to %s\\n"
-msgstr "パッ� %s�分�� %s�作��れ���\\n"
+msgstr "パッ� %s �ら %s ���を変更����\\n"
 
 #: quilt/series.in:22
 msgid "Usage: quilt series [-v]\\n"
@@ -1251,37 +1287,37 @@ msgstr ""
 #: scripts/edmail.in:81
 #, perl-format
 msgid "Display name '%s' contains unpaired parentheses\n"
-msgstr ""
+msgstr "表示用��� '%s' �対��ら��括弧を�ん����\n"
 
 #: scripts/edmail.in:85
 #, perl-format
 msgid "Display name '%s' contains invalid characters\n"
-msgstr ""
+msgstr "表示用��� '%s' ��正�文字を�ん����\n"
 
 #: scripts/edmail.in:89
 #, perl-format
 msgid "Display name '%s' contains non-printable or 8-bit characters\n"
-msgstr ""
+msgstr "表示用��� '%s' ���刷文字��� 8 bit�文字を�ん����\n"
 
 #: scripts/edmail.in:95
 #, perl-format
 msgid "Delivery address '%s' is invalid\n"
-msgstr ""
+msgstr "��先�アドレス '%s' ��正��\n"
 
 #: scripts/parse-patch.in:50
 #, perl-format
 msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr ""
+msgstr "使���: %s {-s|-u} section file [< replacement]\n"
 
 #: scripts/parse-patch.in:97 scripts/parse-patch.in:104
 #, perl-format
 msgid "File %s disappeared!\n"
-msgstr ""
+msgstr "ファイル %s �消����!\n"
 
 #: scripts/parse-patch.in:150 scripts/parse-patch.in:156
-#, fuzzy, perl-format
+#, perl-format
 msgid "Failed to rename %s to %s: %s\n"
-msgstr "パッ� %s �作��失敗����\\n"
+msgstr "パッ� %s �ら %s�����変更�失敗����: %s\n"
 
 #: scripts/patchfns.in:732
 msgid ""
@@ -1306,57 +1342,34 @@ msgstr ""
 #: scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
-msgstr ""
+msgstr "書�: %s [p num] [-n] [patch]\n"
 
 #: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92
 #, perl-format
 msgid "%s: I'm confused.\n"
-msgstr ""
+msgstr "%s: 混乱����\n"
 
 #: scripts/remove-trailing-ws.in:113
 #, perl-format
 msgid "Warning: trailing whitespace in line %s of %s\n"
-msgstr ""
+msgstr "警告: %2$s � %1$s 行目末尾�空白文字��り��\n"
 
 #: scripts/remove-trailing-ws.in:116
 #, perl-format
 msgid "Warning: trailing whitespace in lines %s of %s\n"
-msgstr ""
+msgstr "警告: %2$s � %1$s 行目末尾�空白文字��り��\n"
 
 #: scripts/remove-trailing-ws.in:120
 #, perl-format
 msgid "Removing trailing whitespace from line %s of %s\n"
-msgstr ""
+msgstr "%2$s � %1$s 行目末尾��る空白文字を削除���\n"
 
 #: scripts/remove-trailing-ws.in:123
 #, perl-format
 msgid "Removing trailing whitespace from lines %s of %s\n"
-msgstr ""
+msgstr "%2$s � %1$s 行目末尾��る空白文字を削除���\n"
 
 #: scripts/remove-trailing-ws.in:143
-#, fuzzy, perl-format
+#, perl-format
 msgid "Renaming %s to %s: %s\n"
-msgstr "パッ� %s�らパッ� %s��分��失敗����\\n"
-
-#~ msgid "Cannot change into directory %s\\n"
-#~ msgstr "ディレクトリ %s �移動����ん\\n"
-
-#~ msgid "Cannot change to temporary directory\\n"
-#~ msgstr "テン�ラリディレクトリ�移動����ん\\n"
-
-#~ msgid "Cannot change to source directory\\n"
-#~ msgstr "ソースディレクトリ�移動����ん\\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Fork the topmost patch. If new_name is missing, the name of the\n"
-#~ "forked patch will be the current patch name, followed by \\\"-2\\\".\n"
-#~ "If the patch name already ends in a dash-and-number, the number is\n"
-#~ "further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff).\n"
-#~ msgstr ""
-#~ "\n"
-#~ "最上��パッ�を分�。new_name�指定�れ����場��分���パッ��\n"
-#~ "��在�パッ���後� \\\"-2\\\"�付�。���パッ����イフン�番�"
-#~ "�\n"
-#~ "終���る場��番��値�1増�る (例: patch.diff�patch-2.diff�\n"
-#~ "patch-3.diff)。\n"
+msgstr "%s �ら %s ���を変更����: %s\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index caab8c1..3b85f74 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -635,11 +635,11 @@ msgid "Applying patch %s\\n"
 msgstr ""
 
 #: quilt/push.in:189
-msgid "Patch %s does not exist, applied\\n"
+msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr ""
 
 #: quilt/push.in:193
-msgid "Patch %s appears to be empty, applied\\n"
+msgid "Patch %s appears to be empty; applied\\n"
 msgstr ""
 
 #: quilt/push.in:197
diff --git a/quilt.changes b/quilt.changes
index a91f432..5f21c19 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Jul 25 09:41:19 CEST 2005 - agruen@suse.de
+
+- Japanese translation update from Yasushi SHOJI
+  <yashi@atmark-techno.com>.
+
+-------------------------------------------------------------------
 Sun Jul 24 16:46:54 CEST 2005 - khali@linux-fr.org
 
 - Let the perl scripts (edmail, parse-patch and
@@ -315,8 +321,8 @@ Sun Mar  6 22:56:12 CET 2005 - agruen@suse.de
 -------------------------------------------------------------------
 Fri Feb 24 13:12:57 CET 2005 - mquinson@debian.org
 
-- quilt add: Add check to ensure that no symlink will be added since we fail
-  to backup them properly (see #295913 in Debian).
+- quilt add: Add check to ensure that no symlink will be added
+  since we fail to backup them properly (see #295913 in Debian).
 
 -------------------------------------------------------------------
 Fri Feb 18 11:01:57 CET 2005 - agruen@suse.de
@@ -339,7 +345,8 @@ Sun Feb  6 01:15:03 CET 2005 - agruen@suse.de
 - Update of the Japanese translation from Yasushi SHOJI
   <yashi@atmark-techno.com> -- thank you.
 - Don't leak so many temporary files in the push command.
-- Include command names in tempfile names to find leaks more easily.
+- Include command names in tempfile names to find leaks more
+  easily.
 
 -------------------------------------------------------------------
 Wed Feb  2 17:35:19 CET 2005 - agruen@suse.de
@@ -396,8 +403,8 @@ Thu Jan 20 12:36:25 CET 2005 - mquinson@debian.org
 
 - fix the bash completion file: 
   - does not complete on dir anymore, just files.
-  - use string comparison when dealing with BASH_VERSION, it may contain
-    letters.
+  - use string comparison when dealing with BASH_VERSION, it may
+    contain letters.
 
 -------------------------------------------------------------------
 Tue Jan 11 03:53:19 CET 2005 - agruen@suse.de
@@ -670,9 +677,10 @@ Fri Jun 11 00:43:07 PDT 2004 - mquinson@tuxfamily.org
   feature I was about reimplementing ;)
 - Document all options from the pdf into the man page.
 - update the bash completion stuff so that :
-  - it does not kill the shell when completing in a tree not matching the
-    meta data version.
-  - it does not move the current directory around, seeking for patches/
+  - it does not kill the shell when completing in a tree not
+    matching the meta data version.
+  - it does not move the current directory around, seeking for
+    patches/
   - it completes on the new commands (grep graph upgrade)
 - Various output messages polishing (and translation fuzzying)
 - French translation unfuzzying
@@ -1242,7 +1250,8 @@ Fri Feb 14 15:53:52 CET 2003 - agruen@suse.de
 Fri Feb 14 14:10:39 CET 2003 - martin.quinson@tuxfamily.org
 
 - Implement i18n, along with the french l10n.
-- It was long enough that we didn't release, so bump the version number.
+- It was long enough that we didn't release, so bump the version
+  number.
 
 -------------------------------------------------------------------
 Sat Feb  8 15:43:26 CET 2003 - agruen@suse.de
diff --git a/quilt/push.in b/quilt/push.in
index cf71b0f..b1a79ee 100644
--- a/quilt/push.in
+++ b/quilt/push.in
@@ -186,11 +186,11 @@ add_patch()
 
 		if ! [ -e $patch_file ]
 		then
-			printf $"Patch %s does not exist, applied\n" \
+			printf $"Patch %s does not exist; applied empty patch\n" \
 			       "$(print_patch $patch)"
 		elif [ -z "$(shopt -s nullglob ; echo "$QUILT_PC/$patch/"*)" ]
 		then
-			printf $"Patch %s appears to be empty, applied\n" \
+			printf $"Patch %s appears to be empty; applied\n" \
 			       "$(print_patch $patch)"
 		elif [ $status -ne 0 ]
 		then