- Get rid of the apatch and rpatch helper scripts: Integrate them

  in the push and pop commands. This should bring a small
  performance improvement.

1 files changed, 66 insertions, 68 deletions

diff --git a/po/ja.po b/po/ja.po
index ffcda8c..473e729 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -66,20 +66,20 @@ msgstr ""
 
 #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76
 #: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62
-#: ../quilt/pop.in:129 ../quilt/previous.in:62 ../quilt/push.in:145
+#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:265
 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:150
+#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252
 #: ../quilt/refresh.in:135 ../quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "パッチ %s は適用されていません\\n"
 
 #: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65
-#: ../quilt/pop.in:185 ../quilt/push.in:182 ../quilt/push.in:221
-#: ../quilt/refresh.in:143 ../quilt/remove.in:81
+#: ../quilt/pop.in:286 ../quilt/push.in:303 ../quilt/refresh.in:143
+#: ../quilt/remove.in:81
 msgid "No patches applied\\n"
 msgstr "適用されているパッチはありません\\n"
 
@@ -243,7 +243,7 @@ msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
 msgid "Cannot change into directory %s\\n"
 msgstr "ディレクトリ %s に移動できません\\n"
 
-#: ../quilt/diff.in:318 ../scripts/rpatch.in:62
+#: ../quilt/diff.in:318 ../quilt/pop.in:115 ../scripts/rpatch.in:62
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
 
@@ -251,7 +251,7 @@ msgstr "テンポラリディレクトリへのファイルコピーに失敗し
 msgid "Cannot change to temporary directory\\n"
 msgstr "テンポラリディレクトリに移動できません\\n"
 
-#: ../quilt/diff.in:348 ../scripts/rpatch.in:85
+#: ../quilt/diff.in:348 ../quilt/pop.in:138 ../scripts/rpatch.in:85
 msgid "Failed to patch temporary files\\n"
 msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
 
@@ -548,15 +548,25 @@ msgstr ""
 "\n"
 "-v\t詳細に表示。\n"
 
-#: ../quilt/pop.in:160
+#: ../quilt/pop.in:153 ../scripts/rpatch.in:100
+msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
+msgstr ""
+"パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n"
+"けてはずしてください)\\n"
+
+#: ../quilt/pop.in:176 ../scripts/rpatch.in:123
+msgid "Removing patch %s\\n"
+msgstr "パッチ %s を削除します\\n"
+
+#: ../quilt/pop.in:260 ../scripts/rpatch.in:179
+msgid "Patch %s needs to be refreshed first.\\n"
+msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n"
+
+#: ../quilt/pop.in:270
 msgid "No patch removed\\n"
 msgstr "適用されているパッチはありません\\n"
 
-#: ../quilt/pop.in:176 ../quilt/push.in:212
-msgid "Interrupted by user\\n"
-msgstr "ユーザによって中断されました\\n"
-
-#: ../quilt/pop.in:192 ../quilt/push.in:223
+#: ../quilt/pop.in:293 ../quilt/push.in:321
 msgid "Now at patch %s\\n"
 msgstr "現在位置はパッチ %s です"
 
@@ -625,25 +635,44 @@ msgstr ""
 "\tまま残す。\n"
 "\n"
 
-#: ../quilt/push.in:87
+#: ../quilt/push.in:59 ../scripts/apatch.in:29
+msgid "Interrupted by user; patch %s was not applied.\\n"
+msgstr "ユーザによって中断されました。パッチ % は適用されていません。\\n"
+
+#: ../quilt/push.in:71 ../scripts/apatch.in:41
+msgid "Patch %s appears to be empty\\n"
+msgstr "パッチ %sは、空のようです\\n"
+
+#: ../quilt/push.in:109 ../scripts/apatch.in:79
+msgid "Applying patch %s\\n"
+msgstr "パッチ %s を適用しています\\n"
+
+#: ../quilt/push.in:159 ../scripts/apatch.in:130
+msgid "Patch %s appears to be empty, applied\\n"
+msgstr "パッチ %s は、空のようですが、適用しました\\n"
+
+#: ../quilt/push.in:163 ../scripts/apatch.in:134
+msgid "Applied patch %s (forced; needs refresh)\\n"
+msgstr ""
+"パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n"
+
+#: ../quilt/push.in:168 ../scripts/apatch.in:139
+msgid "Patch %s does not apply (enforce with -f)\\n"
+msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n"
+
+#: ../quilt/push.in:207
 msgid "Patch %s not found in file series\\n"
 msgstr "パッチ %s が seriesファイル内で見つかりません。\\n"
 
-#: ../quilt/push.in:168
+#: ../quilt/push.in:282
 msgid "Patch %s is already applied\\n"
 msgstr "パッチ %s は、すでに適用済です\\n"
 
-#: ../quilt/push.in:187
-msgid ""
-"The topmost patch %s is not in the series file anymore;\n"
-"cannot determine the next patch from the series file.\n"
-"Please pop -f the top patch and check your series file.\\n"
-msgstr ""
-"最上位パッチが seriesファイルの中にないため、次のパッチを seriesファイ\n"
-"ルから選択することができません。pop -fを行ない、seriesファイルをチェッ\n"
-"クしてください。\\n"
+#: ../quilt/push.in:291 ../scripts/apatch.in:197
+msgid "The topmost patch %s needs to be refreshed first.\\n"
+msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"
 
-#: ../quilt/push.in:193
+#: ../quilt/push.in:305
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 "seriesファイルのパッチはすべて適用されています。\n"
@@ -942,36 +971,7 @@ msgstr ""
 msgid "Usage: $0 [-fqv] patchname\\n"
 msgstr "使い方: $0 [-fqv] パッチ名\\n"
 
-#: ../scripts/apatch.in:29
-msgid "Interrupted by user; patch %s was not applied.\\n"
-msgstr "ユーザによって中断されました。パッチ % は適用されていません。\\n"
-
-#: ../scripts/apatch.in:41
-msgid "Patch %s appears to be empty\\n"
-msgstr "パッチ %sは、空のようです\\n"
-
-#: ../scripts/apatch.in:81
-msgid "Applying patch %s\\n"
-msgstr "パッチ %s を適用しています\\n"
-
-#: ../scripts/apatch.in:117
-msgid "Patch %s appears to be empty, applied\\n"
-msgstr "パッチ %s は、空のようですが、適用しました\\n"
-
-#: ../scripts/apatch.in:121
-msgid "Applied patch %s (forced; needs refresh)\\n"
-msgstr ""
-"パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n"
-
-#: ../scripts/apatch.in:126
-msgid "Patch %s does not apply (enforce with -f)\\n"
-msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n"
-
-#: ../scripts/apatch.in:184
-msgid "The topmost patch %s needs to be refreshed first.\\n"
-msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"
-
-#: ../scripts/patchfns.in:702
+#: ../scripts/patchfns.in:703
 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 "
@@ -983,7 +983,7 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: ../scripts/patchfns.in:769
+#: ../scripts/patchfns.in:770
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -995,16 +995,14 @@ msgstr ""
 msgid "Usage: %s [-fRq] patchname\\n"
 msgstr "使い方: %s [-fRq] パッチ名\\n"
 
-#: ../scripts/rpatch.in:100
-msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
-msgstr ""
-"パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n"
-"けてはずしてください)\\n"
-
-#: ../scripts/rpatch.in:123
-msgid "Removing patch %s\\n"
-msgstr "パッチ %s を削除します\\n"
-
-#: ../scripts/rpatch.in:179
-msgid "Patch %s needs to be refreshed first.\\n"
-msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n"
+#~ msgid "Interrupted by user\\n"
+#~ msgstr "ユーザによって中断されました\\n"
+
+#~ msgid ""
+#~ "The topmost patch %s is not in the series file anymore;\n"
+#~ "cannot determine the next patch from the series file.\n"
+#~ "Please pop -f the top patch and check your series file.\\n"
+#~ msgstr ""
+#~ "最上位パッチが seriesファイルの中にないため、次のパッチを seriesファイ\n"
+#~ "ルから選択することができません。pop -fを行ない、seriesファイルをチェッ\n"
+#~ "クしてください。\\n"