1 files changed, 166 insertions, 164 deletions

diff --git a/po/ja.po b/po/ja.po
index 57521a8..5a1bd26 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,19 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bin/quilt:23
+#: bin/quilt.in:23
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr "使い方: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 
-#: bin/quilt:24
+#: bin/quilt.in:24
 msgid "       quilt --version"
 msgstr ""
 
-#: bin/quilt:26
+#: bin/quilt.in:26
 msgid "Commands are:"
 msgstr "コマンド一覧:"
 
-#: bin/quilt:31
+#: bin/quilt.in:31
 #, fuzzy
 msgid ""
 "\n"
@@ -52,11 +52,11 @@ msgstr ""
 "\tフィギュレーションファイルを指定。内容の詳細については PDFのド\n"
 "\tキュメントを参照。"
 
-#: quilt/add:22
+#: quilt/add.in:22
 msgid "Usage: quilt add [-p patch] {file} ...\\n"
 msgstr "使い方: quilt add [-p パッチ] {file} ...\\n"
 
-#: quilt/add:25
+#: quilt/add.in:25
 msgid ""
 "\n"
 "Add one or more files to the topmost or named patch.  Files must be\n"
@@ -74,65 +74,67 @@ msgstr ""
 "-p patch\n"
 "\tファイルを追加するパッチ\n"
 
-#: quilt/add:48 quilt/add:54
+#: quilt/add.in:48 quilt/add.in:54
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n"
 
-#: quilt/add:78 quilt/applied:62 quilt/delete:97 quilt/diff:160 quilt/diff:171
-#: quilt/graph:116 quilt/header:135 quilt/next:62 quilt/pop:246
-#: quilt/previous:62 quilt/push:312 quilt/refresh:148 quilt/remove:53
-#: quilt/rename:63 quilt/unapplied:62
+#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:97 quilt/diff.in:160
+#: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
+#: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
+#: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
+#: quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: quilt/add:99 quilt/diff:239 quilt/graph:121 quilt/pop:261 quilt/refresh:154
-#: quilt/remove:74
+#: quilt/add.in:99 quilt/diff.in:239 quilt/graph.in:121 quilt/pop.in:261
+#: quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "パッチ %s は適用されていません\\n"
 
-#: quilt/add:106 quilt/delete:76 quilt/diff:247 quilt/files:103 quilt/fold:79
-#: quilt/fork:72 quilt/graph:131 quilt/header:142 quilt/pop:295 quilt/push:350
-#: quilt/refresh:162 quilt/remove:81 quilt/rename:85
+#: quilt/add.in:106 quilt/delete.in:76 quilt/diff.in:247 quilt/files.in:103
+#: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142
+#: quilt/pop.in:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81
+#: quilt/rename.in:85
 msgid "No patches applied\\n"
 msgstr "適用されているパッチはありません\\n"
 
-#: quilt/add:121
+#: quilt/add.in:121
 msgid "File %s is already in patch %s\\n"
 msgstr "ファイル %s は、すでにパッチ %s に含まれています\\n"
 
-#: quilt/add:129 quilt/remove:100
+#: quilt/add.in:129 quilt/remove.in:100
 msgid "File %s modified by patch %s\\n"
 msgstr "ファイル %s は、パッチ %s によってすでに変更されています\\n"
 
-#: quilt/add:137
+#: quilt/add.in:137
 msgid "Cannot add symbolic link %s\\n"
 msgstr "シンボリックファイル %sは追加できません"
 
-#: quilt/add:144
+#: quilt/add.in:144
 msgid "Failed to back up file %s\\n"
 msgstr "ファイル %s のバックアップに失敗しました\\n"
 
-#: quilt/add:155
+#: quilt/add.in:155
 msgid "File %s added to patch %s\\n"
 msgstr "ファイル %s をパッチ %s に追加しました\\n"
 
-#: quilt/annotate:22
+#: quilt/annotate.in:22
 #, fuzzy
 msgid "Usage: quilt annotate {file}\\n"
 msgstr "使い方: quilt patches {ファイル}\\n"
 
-#: quilt/annotate:25
+#: quilt/annotate.in:25
 msgid ""
 "\n"
 "Print an annotated listing of the specified file showing which\n"
 "patches modify which lines.\n"
 msgstr ""
 
-#: quilt/applied:22
+#: quilt/applied.in:22
 msgid "Usage: quilt applied [patch]\\n"
 msgstr "使い方: quilt applied [パッチ]\\n"
 
-#: quilt/applied:25
+#: quilt/applied.in:25
 msgid ""
 "\n"
 "Print a list of applied patches, or all patches up to and including the\n"
@@ -142,15 +144,15 @@ msgstr ""
 "適用されているパッチの一覧を表示します。指定されたパッチがある場合は、\n"
 "seriesファイル内のパッチ一覧の中から指定されたパッチまでを表示します。\n"
 
-#: quilt/applied:67
+#: quilt/applied.in:67
 msgid "Patch is not applied\\n"
 msgstr "パッチは適用されていません\\n"
 
-#: quilt/delete:22
+#: quilt/delete.in:22
 msgid "Usage: quilt delete [patch | -n]\\n"
 msgstr "使い方: quilt delete [パッチ | -n]\\n"
 
-#: quilt/delete:25
+#: quilt/delete.in:25
 #, fuzzy
 msgid ""
 "\n"
@@ -166,25 +168,25 @@ msgstr ""
 "パッチがすでに適用されている場合は、最初にパッチを外します。( 現状、最\n"
 "上位のパッチしか削除することはできません。) \n"
 
-#: quilt/delete:88
+#: quilt/delete.in:88
 #, fuzzy
 msgid "No next patch\\n"
 msgstr "現在位置はパッチ %s です"
 
-#: quilt/delete:106
+#: quilt/delete.in:106
 msgid "Patch %s is currently applied\\n"
 msgstr "パッチ %s は現在適用されています。\\n"
 
-#: quilt/delete:113
+#: quilt/delete.in:113
 #, fuzzy
 msgid "Removed patch %s\\n"
 msgstr "パッチ %s を削除します\\n"
 
-#: quilt/delete:115
+#: quilt/delete.in:115
 msgid "Failed to remove patch %s\\n"
 msgstr "パッチ %sを削除することに失敗しました。\\n"
 
-#: quilt/diff:24
+#: quilt/diff.in:24
 #, fuzzy
 msgid ""
 "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
@@ -194,7 +196,7 @@ msgstr ""
 "使い方: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-"
 "P パッチ] [--snapshot] [--diff=utility] [--color] [ファイル ...]\\n"
 
-#: quilt/diff:28
+#: quilt/diff.in:28
 #, fuzzy
 msgid ""
 "\n"
@@ -277,44 +279,44 @@ msgstr ""
 "--color[=always|auto|never]\n"
 "\tシンタックスの色付け指定。\n"
 
-#: quilt/diff:231
+#: quilt/diff.in:231
 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "オプション \\`-c patch'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n"
 
-#: quilt/diff:258
+#: quilt/diff.in:258
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr "-p%sでパッチの差分はとれません。-p0か -p1を指定してください\\n"
 
-#: quilt/diff:293 quilt/files:122
+#: quilt/diff.in:293 quilt/files.in:122
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
 
-#: quilt/diff:343 quilt/pop:114
+#: quilt/diff.in:343 quilt/pop.in:114
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
 
-#: quilt/diff:367 quilt/pop:138
+#: quilt/diff.in:367 quilt/pop.in:138
 msgid "Failed to patch temporary files\\n"
 msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
 
-#: quilt/diff:386
+#: quilt/diff.in:386
 msgid "File %s is not being modified\\n"
 msgstr "ファイル %sは変更されていません\\n"
 
-#: quilt/diff:406 quilt/refresh:201
+#: quilt/diff.in:406 quilt/refresh.in:201
 msgid "Diff failed, aborting\\n"
 msgstr "差分に失敗しました。異常終了します\\n"
 
-#: quilt/diff:413
+#: quilt/diff.in:413
 msgid "More recent patches modify files in patch %s\\n"
 msgstr "最近のパッチが、パッチ %s内のファイルを変更しています\\n"
 
-#: quilt/edit:13
+#: quilt/edit.in:13
 msgid "Usage: quilt edit file ...\\n"
 msgstr "使い方: quilt edit ファイル ...\\n"
 
-#: quilt/edit:16
+#: quilt/edit.in:16
 msgid ""
 "\n"
 "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n"
@@ -323,11 +325,11 @@ msgstr ""
 "\n"
 "最上位のパッチに指定されたファイルを追加後、\\$EDITOR (%s) を使って編集。\n"
 
-#: quilt/files:22
+#: quilt/files.in:22
 msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n"
 msgstr "使い方: quilt files [-v] [-a] [-l] [--combine パッチ] [パッチ]\\n"
 
-#: quilt/files:25
+#: quilt/files.in:25
 msgid ""
 "\n"
 "Print the list of files that the topmost or specified patch changes.\n"
@@ -360,15 +362,15 @@ msgstr ""
 "\tことになる。\n"
 "\n"
 
-#: quilt/files:76 quilt/files:96
+#: quilt/files.in:76 quilt/files.in:96
 msgid "Patch %s is not in series file\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: quilt/fold:22
+#: quilt/fold.in:22
 msgid "Usage: quilt fold [-p strip-level]\\n"
 msgstr "使い方: quilt fold [-p strip-level]\\n"
 
-#: quilt/fold:25
+#: quilt/fold.in:25
 msgid ""
 "\n"
 "Integrate the patch read from standard input into the topmost patch:\n"
@@ -388,15 +390,15 @@ msgstr ""
 "-p strip-level\n"
 "\tパッチを適用するときに、ファイル名から省くパス名要素の数\n"
 
-#: quilt/fold:116
+#: quilt/fold.in:116
 msgid "File %s may be corrupted\\n"
 msgstr "ファイル %s は壊れている可能性があります\\n"
 
-#: quilt/fork:22
+#: quilt/fork.in:22
 msgid "Usage: quilt fork [new_name]\\n"
 msgstr "使い方: quilt fork [new_name]\\n"
 
-#: quilt/fork:25
+#: quilt/fork.in:25
 msgid ""
 "\n"
 "Fork the topmost patch.  Forking a patch means creating a verbatim copy\n"
@@ -412,19 +414,19 @@ msgid ""
 "patch-2.diff, patch-3.diff).\n"
 msgstr ""
 
-#: quilt/fork:99
+#: quilt/fork.in:99
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr "パッチ %sはすでに存在します。新しい名前を選んでください\\n"
 
-#: quilt/fork:111
+#: quilt/fork.in:111
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "パッチ %sからパッチ %sへの分岐に失敗しました\\n"
 
-#: quilt/fork:117
+#: quilt/fork.in:117
 msgid "Fork of patch %s created as %s\\n"
 msgstr "パッチ %sの分岐で %sが作成されました\\n"
 
-#: quilt/graph:22
+#: quilt/graph.in:22
 msgid ""
 "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] "
 "[patch]\\n"
@@ -432,7 +434,7 @@ msgstr ""
 "使い方: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] "
 "[パッチ]\\n\""
 
-#: quilt/graph:26
+#: quilt/graph.in:26
 msgid ""
 "\n"
 "Generate a dot(1) directed graph showing the dependencies between\n"
@@ -488,11 +490,11 @@ msgstr ""
 "\n"
 "-T ps\t直接ポストスクリプトファイルを生成する。\n"
 
-#: quilt/grep:22
+#: quilt/grep.in:22
 msgid "Usage: quilt grep [-h|options] {pattern}\\n"
 msgstr "使い方: quilt grep [-h|options] {パターン}\\n"
 
-#: quilt/grep:25
+#: quilt/grep.in:25
 msgid ""
 "\n"
 "Grep through the source files, recursively, skipping patches and quilt\n"
@@ -512,7 +514,7 @@ msgstr ""
 "-hを渡すことができる。ダッシュ記号で始まる検索パターンは2つ目の二重ダッ\n"
 "シュ記号の後に渡すことができる。\n"
 
-#: quilt/header:24
+#: quilt/header.in:24
 #, fuzzy
 msgid ""
 "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-"
@@ -521,7 +523,7 @@ msgstr ""
 "使い方: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] "
 "[パッチ]\\n"
 
-#: quilt/header:28
+#: quilt/header.in:28
 msgid ""
 "\n"
 "Print or change the header of the topmost or specified patch.\n"
@@ -541,21 +543,21 @@ msgid ""
 "\tCreate a backup copy of the old version of a patch as patch~.\n"
 msgstr ""
 
-#: quilt/header:192
+#: quilt/header.in:192
 #, fuzzy
 msgid "Replaced header of patch %s\\n"
 msgstr "パッチ %s をリフレッシュしました\\n"
 
-#: quilt/header:195
+#: quilt/header.in:195
 #, fuzzy
 msgid "Appended text to header of patch %s\\n"
 msgstr "パッチ %s の作成に失敗しました\\n"
 
-#: quilt/import:22
+#: quilt/import.in:22
 msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
 msgstr "使い方: quilt import [-f] [-p num] [-n パッチ] パッチファイル ...\\n"
 
-#: quilt/import:25
+#: quilt/import.in:25
 msgid ""
 "\n"
 "Import external patches.\n"
@@ -581,35 +583,35 @@ msgstr ""
 "\n"
 "-f\t存在するパッチの上書き、またはアップデート。\n"
 
-#: quilt/import:74
+#: quilt/import.in:74
 msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr "オプション \\`-n'は、パッチを一つだけ取り込むときのみ有効です。\\n"
 
-#: quilt/import:92
+#: quilt/import.in:92
 msgid "Patch %s is applied\\n"
 msgstr "パッチ %s は、すでに適用されています\\n"
 
-#: quilt/import:100
+#: quilt/import.in:100
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "パッチ %s は、すでに存在します。-fで置き換えることができます。\\n"
 
-#: quilt/import:104
+#: quilt/import.in:104
 msgid "Replacing patch %s with new version\\n"
 msgstr "パッチ % を新しいバージョンに置き換えます\\n"
 
-#: quilt/import:107
+#: quilt/import.in:107
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "パッチ %s を取り込んでいます (%sとして保存されます)\\n"
 
-#: quilt/import:115
+#: quilt/import.in:115
 msgid "Failed to import patch %s\\n"
 msgstr "パッチ %s の取り込みに失敗しました\\n"
 
-#: quilt/import:122
+#: quilt/import.in:122
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
 
-#: quilt/mail:25
+#: quilt/mail.in:25
 msgid ""
 "Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--"
 "bcc ...] [--subject ...]\\n"
@@ -617,21 +619,21 @@ msgstr ""
 "使い方: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] "
 "[--bcc ...] [--subject ...]\\n"
 
-#: quilt/mail:28
+#: quilt/mail.in:28
 #, fuzzy
 msgid ""
 "\n"
 "Create mail messages from all patches in the series file, and either store\n"
 "them in a mailbox file, or send them immediately. The editor is opened\n"
 "with a template for the introductory message. Please see the file\n"
-"/usr/share/doc/quilt-0.41/README.MAIL for details.\n"
+"%s for details.\n"
 "\n"
 "--mbox file\n"
 "\tStore all messages in the specified file in mbox format. The mbox\n"
 "\tcan later be sent using formail, for example.\n"
 "\n"
 "--send\n"
-"\tSend the messages directly using /usr/sbin/sendmail.\n"
+"\tSend the messages directly using @MTA@.\n"
 "\n"
 "--from, --subject\n"
 "\tThe values for the From and Subject headers to use.\n"
@@ -658,11 +660,11 @@ msgstr ""
 "--to, --cc, --bcc\n"
 "\tToやCC、BCCへの受信者の追加。\n"
 
-#: quilt/new:22
+#: quilt/new.in:22
 msgid "Usage: quilt new {patchname}\\n"
 msgstr "使い方: quilt new {パッチ名}\\n"
 
-#: quilt/new:25
+#: quilt/new.in:25
 msgid ""
 "\n"
 "Create a new patch with the specified file name, and insert it after the\n"
@@ -673,23 +675,23 @@ msgstr ""
 "追加される場所は、現在最上位のパッチの次です。\n"
 "\n"
 
-#: quilt/new:64
+#: quilt/new.in:64
 msgid "Patch %s exists already\\n"
 msgstr "パッチ %s は、すでに存在します\\n"
 
-#: quilt/new:75
+#: quilt/new.in:75
 msgid "Failed to create patch %s\\n"
 msgstr "パッチ %s の作成に失敗しました\\n"
 
-#: quilt/new:78
+#: quilt/new.in:78
 msgid "Patch %s is now on top\\n"
 msgstr "パッチ %s を最上位にしました\\n"
 
-#: quilt/next:22
+#: quilt/next.in:22
 msgid "Usage: quilt next [patch]\\n"
 msgstr "使い方: quilt next [パッチ]\\n"
 
-#: quilt/next:25
+#: quilt/next.in:25
 msgid ""
 "\n"
 "Print the name of the next patch after the specified or topmost patch in\n"
@@ -698,11 +700,11 @@ msgstr ""
 "\n"
 "最上位または指定されたパッチの次のパッチ名を表示。\n"
 
-#: quilt/patches:22
+#: quilt/patches.in:22
 msgid "Usage: quilt patches {file}\\n"
 msgstr "使い方: quilt patches {ファイル}\\n"
 
-#: quilt/patches:25
+#: quilt/patches.in:25
 msgid ""
 "\n"
 "Print the list of patches that modify the specified file. (Uses a\n"
@@ -719,11 +721,11 @@ msgstr ""
 "\n"
 "-v\t詳細で見やすい表示。\n"
 
-#: quilt/pop:22
+#: quilt/pop.in:22
 msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
 msgstr "使い方: quilt pop [-afRqv] [数字|パッチ]\\n"
 
-#: quilt/pop:25
+#: quilt/pop.in:25
 #, fuzzy
 msgid ""
 "\n"
@@ -766,38 +768,38 @@ msgstr ""
 "\n"
 "-v\t詳細に表示。\n"
 
-#: quilt/pop:156
+#: quilt/pop.in:156
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
 "パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n"
 "けてはずしてください)\\n"
 
-#: quilt/pop:181
+#: quilt/pop.in:181
 #, fuzzy
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr "パッチ %sは、空のようです\\n"
 
-#: quilt/pop:185
+#: quilt/pop.in:185
 msgid "Removing patch %s\\n"
 msgstr "パッチ %s を削除します\\n"
 
-#: quilt/pop:269
+#: quilt/pop.in:269
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n"
 
-#: quilt/pop:279
+#: quilt/pop.in:279
 msgid "No patch removed\\n"
 msgstr "適用されているパッチはありません\\n"
 
-#: quilt/pop:302 quilt/push:372
+#: quilt/pop.in:302 quilt/push.in:372
 msgid "Now at patch %s\\n"
 msgstr "現在位置はパッチ %s です"
 
-#: quilt/previous:22
+#: quilt/previous.in:22
 msgid "Usage: quilt previous [patch]\\n"
 msgstr "使い方: quilt previous [パッチ]\\n"
 
-#: quilt/previous:25
+#: quilt/previous.in:25
 msgid ""
 "\n"
 "Print the name of the previous patch before the specified or topmost\n"
@@ -807,11 +809,11 @@ msgstr ""
 "最上位のパッチの前のパッチ名を表示。パッチ名が指定されたときは、指定\n"
 "されたパッチの前のパッチ名を表示。\n"
 
-#: quilt/push:24
+#: quilt/push.in:24
 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n"
 msgstr "使い方: quilt push [-afqv] [--leave-rejects] [数字|パッチ]\\n"
 
-#: quilt/push:27
+#: quilt/push.in:27
 #, fuzzy
 msgid ""
 "\n"
@@ -840,7 +842,7 @@ msgid ""
 "\tpatch program.\n"
 "\n"
 "--color[=always|auto|never]\n"
-"        Use syntax coloring.\n"
+"\tUse syntax coloring.\n"
 msgstr ""
 "\n"
 "seriesに登録されているパッチを適用する。オプションが無い場合は series \n"
@@ -870,50 +872,50 @@ msgstr ""
 "        シンタックスの色付けを行なう。\n"
 "\n"
 
-#: quilt/push:64
+#: quilt/push.in:64
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "ユーザによって中断されました。パッチ % は適用されていません。\\n"
 
-#: quilt/push:157
+#: quilt/push.in:157
 msgid "Applying patch %s\\n"
 msgstr "パッチ %s を適用しています\\n"
 
-#: quilt/push:189
+#: quilt/push.in:189
 #, fuzzy
 msgid "Patch %s does not exist, applied\\n"
 msgstr "パッチ %s は適用されていません\\n"
 
-#: quilt/push:193
+#: quilt/push.in:193
 msgid "Patch %s appears to be empty, applied\\n"
 msgstr "パッチ %s は空のようですが、適用しました\\n"
 
-#: quilt/push:197
+#: quilt/push.in:197
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 "パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n"
 
-#: quilt/push:202
+#: quilt/push.in:202
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n"
 
-#: quilt/push:241
+#: quilt/push.in:241
 msgid "Patch %s not found in file series\\n"
 msgstr "パッチ %s が seriesファイル内で見つかりません。\\n"
 
-#: quilt/push:329
+#: quilt/push.in:329
 msgid "Patch %s is already applied\\n"
 msgstr "パッチ %s は、すでに適用済です\\n"
 
-#: quilt/push:338
+#: quilt/push.in:338
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"
 
-#: quilt/push:352
+#: quilt/push.in:352
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n"
 
-#: quilt/refresh:22
+#: quilt/refresh.in:22
 #, fuzzy
 msgid ""
 "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] "
@@ -922,7 +924,7 @@ msgstr ""
 "使い方: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] "
 "[パッチ]\\n"
 
-#: quilt/refresh:26
+#: quilt/refresh.in:26
 #, fuzzy
 msgid ""
 "\n"
@@ -963,7 +965,7 @@ msgid ""
 "--sort\tSort files by their name instead of preserving the original order.\n"
 "\n"
 "--strip-trailing-whitespace\n"
-"\tStrip trailing whitespace at the end of lines of the generated patch.\n"
+"\tStrip trailing whitespace at the end of lines.\n"
 msgstr ""
 "\n"
 "指定されたパッチを作成し直す。これをリフレッシュすると呼ぶ。デフォルト\n"
@@ -997,40 +999,40 @@ msgstr ""
 "\tバックアップ用のコピーとして古いバージョンのパッチを patch~の\n"
 "\t形で作成する。\n"
 
-#: quilt/refresh:173
+#: quilt/refresh.in:173
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "-p%sではリフレッシュすることができません。-p0または -p1を指定してください\\n"
 
-#: quilt/refresh:207
+#: quilt/refresh.in:207
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "より最近のパッチがパッチ %sのファイルに変更を加えています。リフレッシュを実行"
 "する場合は -f オプションを使用してください。\\n"
 
-#: quilt/refresh:213
+#: quilt/refresh.in:213
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 
-#: quilt/refresh:219
+#: quilt/refresh.in:219
 msgid "Nothing in patch %s\\n"
 msgstr "パッチ %s にはなにも含まれていません\\n"
 
-#: quilt/refresh:296
+#: quilt/refresh.in:296
 msgid "Patch %s is unchanged\\n"
 msgstr "パッチ % に変更はありません\\n"
 
-#: quilt/refresh:301
+#: quilt/refresh.in:301
 msgid "Refreshed patch %s\\n"
 msgstr "パッチ %s をリフレッシュしました\\n"
 
-#: quilt/remove:22
+#: quilt/remove.in:22
 msgid "Usage: quilt remove [-p patch] {file} ...\\n"
 msgstr "使い方: quilt remove [-p パッチ] {ファイル} ...\\n"
 
-#: quilt/remove:25
+#: quilt/remove.in:25
 msgid ""
 "\n"
 "Remove one or more files from the topmost or named patch.  Files that\n"
@@ -1046,24 +1048,24 @@ msgstr ""
 "-p パッチ\n"
 "\tファイルを削除するパッチを指定。\n"
 
-#: quilt/remove:91
+#: quilt/remove.in:91
 msgid "File %s is not in patch %s\\n"
 msgstr "ファイル %sは、パッチ %sに含まれていません\\n"
 
-#: quilt/remove:109
+#: quilt/remove.in:109
 msgid "Failed to remove file %s from patch %s\\n"
 msgstr "ファイル %s を、パッチ %s から削除することに失敗しました\\n"
 
-#: quilt/remove:123
+#: quilt/remove.in:123
 msgid "File %s removed from patch %s\\n"
 msgstr "ファイル %s を、パッチ %s から削除しました\\n"
 
-#: quilt/rename:22
+#: quilt/rename.in:22
 #, fuzzy
 msgid "Usage: quilt rename [-p patch] new_name\\n"
 msgstr "使い方: quilt remove [-p パッチ] {ファイル} ...\\n"
 
-#: quilt/rename:25
+#: quilt/rename.in:25
 msgid ""
 "\n"
 "Rename the topmost or named patch.\n"
@@ -1072,26 +1074,26 @@ msgid ""
 "\tPatch to rename.\n"
 msgstr ""
 
-#: quilt/rename:96
+#: quilt/rename.in:96
 #, fuzzy
 msgid "Patch %s exists already, please choose a different name\\n"
 msgstr "パッチ %sはすでに存在します。新しい名前を選んでください\\n"
 
-#: quilt/rename:110
+#: quilt/rename.in:110
 #, fuzzy
 msgid "Renaming of patch %s to %s failed\\n"
 msgstr "パッチ %sからパッチ %sへの分岐に失敗しました\\n"
 
-#: quilt/rename:116
+#: quilt/rename.in:116
 #, fuzzy
 msgid "Patch %s renamed to %s\\n"
 msgstr "パッチ %sの分岐で %sが作成されました\\n"
 
-#: quilt/series:22
+#: quilt/series.in:22
 msgid "Usage: quilt series [-v]\\n"
 msgstr "使い方: quilt series [-v]\\n"
 
-#: quilt/series:25
+#: quilt/series.in:25
 msgid ""
 "\n"
 "Print the names of all patches in the series file.\n"
@@ -1104,12 +1106,12 @@ msgstr ""
 "-v\t詳細で見やすい表示。\n"
 "\n"
 
-#: quilt/setup:27
+#: quilt/setup.in:27
 msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n"
 msgstr ""
 "使い方: quilt setup [-d path-prefix] [-v] {specファイル|seriesファイル}\\n"
 
-#: quilt/setup:30
+#: quilt/setup.in:30
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1126,33 +1128,33 @@ msgstr ""
 "\n"
 "-v\t詳細なデバッグ表示\n"
 
-#: quilt/setup:96
+#: quilt/setup.in:96
 msgid "Directory %s exists\\n"
 msgstr "ディレクトリ %s は、すでに存在します\\n"
 
-#: quilt/setup:102
+#: quilt/setup.in:102
 msgid "File %s exists\\n"
 msgstr "ファイル %s は、すでに存在します\\n"
 
-#: quilt/setup:118
+#: quilt/setup.in:118
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま"
 "す\\n"
 
-#: quilt/setup:121
+#: quilt/setup.in:121
 msgid "The -v option will show rpm's output\\n"
 msgstr "-vオプションを使って、rpmの出力を表示できます"
 
-#: quilt/setup:155
+#: quilt/setup.in:155
 msgid "Unpacking archive %s\\n"
 msgstr "アーカイブ %sを展開しています\\n"
 
-#: quilt/snapshot:22
+#: quilt/snapshot.in:22
 msgid "Usage: quilt snapshot [-d]\\n"
 msgstr "使い方: quilt snapshot [-d]\\n"
 
-#: quilt/snapshot:25
+#: quilt/snapshot.in:25
 msgid ""
 "\n"
 "Take a snapshot of the current working state.  After taking the snapshot,\n"
@@ -1171,11 +1173,11 @@ msgstr ""
 "-d\t現在のスナップショットを削除。\n"
 "\n"
 
-#: quilt/top:22
+#: quilt/top.in:22
 msgid "Usage: quilt top\\n"
 msgstr "使い方: quilt top\\n"
 
-#: quilt/top:25
+#: quilt/top.in:25
 msgid ""
 "\n"
 "Print the name of the topmost patch on the current stack of applied\n"
@@ -1184,11 +1186,11 @@ msgstr ""
 "\n"
 "現在適用されているパッチスタックの最上位パッチ名を表示\n"
 
-#: quilt/unapplied:22
+#: quilt/unapplied.in:22
 msgid "Usage: quilt unapplied [patch]\\n"
 msgstr "使い方: quilt unapplied [パッチ]\\n"
 
-#: quilt/unapplied:25
+#: quilt/unapplied.in:25
 msgid ""
 "\n"
 "Print a list of patches that are not applied, or all patches that follow\n"
@@ -1198,11 +1200,11 @@ msgstr ""
 "適用されていないパッチを表示。パッチが指定された場合は、指定されたパッ\n"
 "チ以降で適用されていないパッチを表示。\n"
 
-#: quilt/upgrade:25
+#: quilt/upgrade.in:25
 msgid "Usage: quilt upgrade\\n"
 msgstr "使い方: quilt upgrade\\n"
 
-#: quilt/upgrade:28
+#: quilt/upgrade.in:28
 msgid ""
 "\n"
 "Upgrade the meta-data in a working tree from an old version of quilt to the\n"
@@ -1218,7 +1220,7 @@ msgstr ""
 "場合のみ必要。変更が確認された場合、quiltから \\`quilt upgrade'の実行が\n"
 "要求される。\n"
 
-#: quilt/upgrade:67
+#: quilt/upgrade.in:67
 msgid ""
 "The quilt meta-data in %s are already in the version %s format; nothing to do"
 "\\n"
@@ -1226,15 +1228,15 @@ msgstr ""
 "%s内の quiltメタデータはすでに version %s フォーマットのため、処理する必要が"
 "ありません。\\n"
 
-#: quilt/upgrade:71
+#: quilt/upgrade.in:71
 msgid "Converting meta-data to version %s\\n"
 msgstr "メタデータを version %sに変更中です\\n"
 
-#: quilt/upgrade:102
+#: quilt/upgrade.in:102
 msgid "Conversion failed\\n"
 msgstr "変更に失敗しました\\n"
 
-#: quilt/upgrade:103
+#: quilt/upgrade.in:103
 msgid ""
 "\n"
 "Please remove all patches using \\`quilt pop -a' from the quilt version used "
@@ -1246,42 +1248,42 @@ msgstr ""
 "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n"
 "トリを削除し、最初からパッチをあて直してください。\\n"
 
-#: scripts/edmail:64
+#: scripts/edmail.in:64
 #, perl-format
 msgid "Display name '%s' contains unpaired parentheses\n"
 msgstr ""
 
-#: scripts/edmail:68
+#: scripts/edmail.in:68
 #, perl-format
 msgid "Display name '%s' contains invalid characters\n"
 msgstr ""
 
-#: scripts/edmail:72
+#: scripts/edmail.in:72
 #, perl-format
 msgid "Display name '%s' contains non-printable or 8-bit characters\n"
 msgstr ""
 
-#: scripts/edmail:78
+#: scripts/edmail.in:78
 #, perl-format
 msgid "Delivery address '%s' is invalid\n"
 msgstr ""
 
-#: scripts/parse-patch:33
+#: scripts/parse-patch.in:33
 #, perl-format
 msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
 msgstr ""
 
-#: scripts/parse-patch:80 scripts/parse-patch:87
+#: scripts/parse-patch.in:80 scripts/parse-patch.in:87
 #, perl-format
 msgid "File %s disappeared!\n"
 msgstr ""
 
-#: scripts/parse-patch:133 scripts/parse-patch:139
+#: scripts/parse-patch.in:133 scripts/parse-patch.in:139
 #, fuzzy, perl-format
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "パッチ %s の作成に失敗しました\\n"
 
-#: scripts/patchfns:732
+#: scripts/patchfns.in:732
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1293,7 +1295,7 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: scripts/patchfns:809
+#: scripts/patchfns.in:809
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1301,37 +1303,37 @@ msgstr ""
 "現在作業中のディレクトリは古いバージョンの quiltによって作られたもので"
 "す。'quilt upgrade'を実行してください。\\n"
 
-#: scripts/remove-trailing-ws:26
+#: scripts/remove-trailing-ws.in:26
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws:48 scripts/remove-trailing-ws:75
+#: scripts/remove-trailing-ws.in:48 scripts/remove-trailing-ws.in:75
 #, perl-format
 msgid "%s: I'm confused.\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws:96
+#: scripts/remove-trailing-ws.in:96
 #, perl-format
 msgid "Warning: trailing whitespace in line %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws:99
+#: scripts/remove-trailing-ws.in:99
 #, perl-format
 msgid "Warning: trailing whitespace in lines %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws:103
+#: scripts/remove-trailing-ws.in:103
 #, perl-format
 msgid "Removing trailing whitespace from line %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws:106
+#: scripts/remove-trailing-ws.in:106
 #, perl-format
 msgid "Removing trailing whitespace from lines %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws:126
+#: scripts/remove-trailing-ws.in:126
 #, fuzzy, perl-format
 msgid "Renaming %s to %s: %s\n"
 msgstr "パッチ %sからパッチ %sへの分岐に失敗しました\\n"