- 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, 65 insertions, 67 deletions

diff --git a/po/de.po b/po/de.po
index 73d611c..111f130 100644
--- a/po/de.po
+++ b/po/de.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 "Patch %s ist nicht in der series-Datei enthalten\\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 "Patch %s ist nicht angewandt\\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 "Keine Patches angewandt\\n"
 
@@ -248,7 +248,7 @@ msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
 msgid "Cannot change into directory %s\\n"
 msgstr "Kann nicht in Verzeichnis %s wechseln\\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 "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
 
@@ -256,7 +256,7 @@ msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
 msgid "Cannot change to temporary directory\\n"
 msgstr "Kann nicht in temporäres Verzeichnis wechseln\\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 "Konnte temporäre Dateien nicht patchen\\n"
 
@@ -557,15 +557,25 @@ msgstr ""
 "\n"
 "-v\tViele Meldungen ausgeben.\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 ""
+"Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen "
+"erzwingen mit -f)\\n"
+
+#: ../quilt/pop.in:176 ../scripts/rpatch.in:123
+msgid "Removing patch %s\\n"
+msgstr "Entferne patch %s\\n"
+
+#: ../quilt/pop.in:260 ../scripts/rpatch.in:179
+msgid "Patch %s needs to be refreshed first.\\n"
+msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
+
+#: ../quilt/pop.in:270
 msgid "No patch removed\\n"
 msgstr "Kein Patch entfernt\\n"
 
-#: ../quilt/pop.in:176 ../quilt/push.in:212
-msgid "Interrupted by user\\n"
-msgstr "Unterbrechung durch Benutzer\\n"
-
-#: ../quilt/pop.in:192 ../quilt/push.in:223
+#: ../quilt/pop.in:293 ../quilt/push.in:321
 msgid "Now at patch %s\\n"
 msgstr "Jetzt in Patch %s\\n"
 
@@ -637,25 +647,43 @@ msgstr ""
 "\tErlaubt GNU patch, interaktiv Fragen zu stellen. Wenn diese Option\n"
 "\tnicht angegeben wird, wird die Option -f an GNU patch übergeben.\n"
 
-#: ../quilt/push.in:87
+#: ../quilt/push.in:59 ../scripts/apatch.in:29
+msgid "Interrupted by user; patch %s was not applied.\\n"
+msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
+
+#: ../quilt/push.in:71 ../scripts/apatch.in:41
+msgid "Patch %s appears to be empty\\n"
+msgstr "Patch %s scheint leer zu sein\\n"
+
+#: ../quilt/push.in:109 ../scripts/apatch.in:79
+msgid "Applying patch %s\\n"
+msgstr "Wende Patch %s an\\n"
+
+#: ../quilt/push.in:159 ../scripts/apatch.in:130
+msgid "Patch %s appears to be empty, applied\\n"
+msgstr "Patch %s scheint leer zu sein, angewandt\\n"
+
+#: ../quilt/push.in:163 ../scripts/apatch.in:134
+msgid "Applied patch %s (forced; needs refresh)\\n"
+msgstr "Patch %s angewandt (erzwungen, muß aufgefrischt werden (Refresh))\\n"
+
+#: ../quilt/push.in:168 ../scripts/apatch.in:139
+msgid "Patch %s does not apply (enforce with -f)\\n"
+msgstr "Patch %s läßt sich nicht anwenden (erzwingen mit -f)\\n"
+
+#: ../quilt/push.in:207
 msgid "Patch %s not found in file series\\n"
 msgstr "Patch %s nicht in series-Datei gefunden\\n"
 
-#: ../quilt/push.in:168
+#: ../quilt/push.in:282
 msgid "Patch %s is already applied\\n"
 msgstr "Patch %s ist bereits angewandt\\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 ""
-"Der oberste Patch $top ist nicht mehr in der series-Datei;\n"
-"kann den nächsten Patch nicht ermitteln. Bitte entfernen Sie\n"
-"mit pop -f den obersten Patch, und überprüfen Sie die series-Datei.\\n"
+#: ../quilt/push.in:291 ../scripts/apatch.in:197
+msgid "The topmost patch %s needs to be refreshed first.\\n"
+msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
 
-#: ../quilt/push.in:193
+#: ../quilt/push.in:305
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 
@@ -958,35 +986,7 @@ msgstr ""
 msgid "Usage: $0 [-fqv] patchname\\n"
 msgstr "Verwendung: $0 [-fqv] patchname\\n"
 
-#: ../scripts/apatch.in:29
-msgid "Interrupted by user; patch %s was not applied.\\n"
-msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
-
-#: ../scripts/apatch.in:41
-msgid "Patch %s appears to be empty\\n"
-msgstr "Patch %s scheint leer zu sein\\n"
-
-#: ../scripts/apatch.in:81
-msgid "Applying patch %s\\n"
-msgstr "Wende Patch %s an\\n"
-
-#: ../scripts/apatch.in:117
-msgid "Patch %s appears to be empty, applied\\n"
-msgstr "Patch %s scheint leer zu sein, angewandt\\n"
-
-#: ../scripts/apatch.in:121
-msgid "Applied patch %s (forced; needs refresh)\\n"
-msgstr "Patch %s angewandt (erzwungen, muß aufgefrischt werden (Refresh))\\n"
-
-#: ../scripts/apatch.in:126
-msgid "Patch %s does not apply (enforce with -f)\\n"
-msgstr "Patch %s läßt sich nicht anwenden (erzwingen mit -f)\\n"
-
-#: ../scripts/apatch.in:184
-msgid "The topmost patch %s needs to be refreshed first.\\n"
-msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\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 "
@@ -999,7 +999,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\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"
@@ -1011,16 +1011,14 @@ msgstr ""
 msgid "Usage: %s [-fRq] patchname\\n"
 msgstr "Verwendung: %s [-fRq] patchname\\n"
 
-#: ../scripts/rpatch.in:100
-msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
-msgstr ""
-"Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen "
-"erzwingen mit -f)\\n"
-
-#: ../scripts/rpatch.in:123
-msgid "Removing patch %s\\n"
-msgstr "Entferne patch %s\\n"
-
-#: ../scripts/rpatch.in:179
-msgid "Patch %s needs to be refreshed first.\\n"
-msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
+#~ msgid "Interrupted by user\\n"
+#~ msgstr "Unterbrechung durch Benutzer\\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 ""
+#~ "Der oberste Patch $top ist nicht mehr in der series-Datei;\n"
+#~ "kann den nächsten Patch nicht ermitteln. Bitte entfernen Sie\n"
+#~ "mit pop -f den obersten Patch, und überprüfen Sie die series-Datei.\\n"