- Update the German translation.

5 files changed, 208 insertions, 201 deletions

diff --git a/po/de.po b/po/de.po
index 4830cf3..578e176 100644
--- a/po/de.po
+++ b/po/de.po
@@ -309,40 +309,32 @@ msgstr ""
 "--sort\tSortiere Dateien im Patch nach ihrem namen, statt die ursprüngliche\n"
 "\tReihenfolge zu erhalten.\n"
 
-#: quilt/diff.in:217
+#: quilt/diff.in:218
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "Die Optionen \\`--combine', \\`--snapshot', und \\`-z' können nicht "
 "kombiniert werden.\\n"
 
-#: quilt/diff.in:231
+#: quilt/diff.in:232
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden."
 "\\n"
 
-#: quilt/diff.in:265 quilt/files.in:105
+#: quilt/diff.in:266 quilt/files.in:105
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
 
-#: quilt/diff.in:315 quilt/pop.in:98
-msgid "Failed to copy files to temporary directory\\n"
-msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
-
-#: quilt/diff.in:339 quilt/pop.in:122
-msgid "Failed to patch temporary files\\n"
-msgstr "Konnte temporäre Dateien nicht patchen\\n"
-
-#: quilt/diff.in:358
+#: quilt/diff.in:326
 msgid "File %s is not being modified\\n"
 msgstr "Datei %s wird nicht verändert.\\n"
 
-#: quilt/diff.in:378 quilt/refresh.in:188
+#: quilt/diff.in:346 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr "Diff fehlgeschlagen, Abbruch.\\n"
 
-#: quilt/diff.in:385
+#: quilt/diff.in:353
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n"
 
@@ -456,19 +448,19 @@ msgstr ""
 "refresh.\n"
 "\n"
 "Wenn neuer_name fehlt, wird der Name des ursprünglichen Patches verwendet,\n"
-"gefolgt von \\`-2'.  Falls der name bereits in Strick-Nummer endet, wird "
+"gefolgt von \\`-2'.  Falls der name bereits in Strich-Nummer endet, wird "
 "die\n"
 "Nummer erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n"
 
-#: quilt/fork.in:88
+#: quilt/fork.in:84
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n"
 
-#: quilt/fork.in:100
+#: quilt/fork.in:96
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "Fehler beim Aufspalten von %s auf %s\\n"
 
-#: quilt/fork.in:106
+#: quilt/fork.in:102 quilt/refresh.in:341
 msgid "Fork of patch %s created as %s\\n"
 msgstr "Neue Version von %s erstellt als %s\\n"
 
@@ -706,7 +698,7 @@ msgstr "Importiere Patch %s (abgelegt als %s)\\n"
 msgid "Failed to import patch %s\\n"
 msgstr "Konnte Patch %s nicht importieren\\n"
 
-#: quilt/import.in:207
+#: quilt/import.in:207 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
 
@@ -836,11 +828,11 @@ msgstr ""
 "im vorgesehenen Wurzelverzeichnis, falls Quilt ein Verzeichnis zu weit oben\n"
 "im Verzeichnisbaum verwendet.\n"
 
-#: quilt/new.in:70
+#: quilt/new.in:70 quilt/refresh.in:179
 msgid "Patch %s exists already\\n"
 msgstr "Patch %s existiert bereits\\n"
 
-#: quilt/new.in:81
+#: quilt/new.in:81 quilt/refresh.in:337
 msgid "Failed to create patch %s\\n"
 msgstr "Konnte Patch %s nicht erzeugen\\n"
 
@@ -927,10 +919,18 @@ msgstr ""
 "\n"
 "-v\tViele Meldungen ausgeben.\n"
 
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:860
+msgid "Failed to copy files to temporary directory\\n"
+msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
+
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:883
+msgid "Failed to patch temporary files\\n"
+msgstr "Konnte temporäre Dateien nicht patchen\\n"
+
 #: quilt/pop.in:140
 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 "
+"Patch %s kann nicht entfernt werden (Patch aktualisieren oder entfernen "
 "erzwingen mit -f)\\n"
 
 #: quilt/pop.in:165
@@ -943,7 +943,7 @@ msgstr "Entferne patch %s\\n"
 
 #: quilt/pop.in:241
 msgid "Patch %s needs to be refreshed first.\\n"
-msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
+msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n"
 
 #: quilt/pop.in:251
 msgid "No patch removed\\n"
@@ -1053,7 +1053,7 @@ msgstr "Patch %s scheint leer zu sein; angewandt\\n"
 
 #: quilt/push.in:219
 msgid "Applied patch %s (forced; needs refresh)\\n"
-msgstr "Patch %s angewandt (erzwungen, muss aufgefrischt werden (Refresh))\\n"
+msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (Refresh))\\n"
 
 #: quilt/push.in:229
 msgid "Patch %s can be reverse-applied\\n"
@@ -1065,17 +1065,17 @@ msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n"
 
 #: quilt/push.in:353
 msgid "The topmost patch %s needs to be refreshed first.\\n"
-msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
+msgstr "Der oberste Patch %s muss zuerst aktualisiert werden (Refresh).\\n"
 
 #: quilt/refresh.in:22
 msgid ""
-"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
-"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
-"whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
+"[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
+"trailing-whitespace] [patch]\\n"
 msgstr ""
-"Verwendung: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
-"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
-"whitespace] [patch]\\n"
+"Verwendung: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] "
+"[-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--"
+"strip-trailing-whitespace] [patch]\\n"
 
 #: quilt/refresh.in:26
 msgid ""
@@ -1103,6 +1103,11 @@ msgid ""
 "\ta context diff (-c, -C) with num lines of context. The number of\n"
 "\tcontext lines defaults to 3.\n"
 "\n"
+"-z[new_name]\n"
+"\tCreate a new patch containing the changes instead of refreshing the\n"
+"\ttopmost patch. If no new name is specified, \\`-2' is added to the\n"
+"\toriginal patch name, etc. (See the fork command.)\n"
+"\n"
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\n"
@@ -1128,14 +1133,14 @@ msgstr ""
 "Patch-Datei, die vor dem eigentlichen Patch steht, bleibt dabei\n"
 "erhalten.\n"
 "\n"
-"Es können beliebige angewandte Patches aufgefrischt werden. Wenn\n"
+"Es können beliebige angewandte Patches aktualisiert werden. Wenn\n"
 "Patches, die nach dem angegebenen Patch angewandt sind, dieselben\n"
 "Dateien verändern, die auch dieser Patch verändert, bricht dieses Script\n"
-"normalerweise ab. Mit der Option -f kann das Auffrischen trotzdem\n"
+"normalerweise ab. Mit der Option -f kann das Aktalisieren trotzdem\n"
 "erzwungen werden. Dann wird für jede Datei, die später noch verändert\n"
 "wurde, eine Warnung ausgegeben, und nur Änderungen in Dateien, die\n"
 "danach nicht von anderen Patches weiter verändert werden, werden beim\n"
-"Auffrischen berücksichtigt.\n"
+"Aktalisieren berücksichtigt.\n"
 "\n"
 "-p n\tErzeuge einen -p n Patch (n=0 oder n=1 werden unterstützt).\n"
 "\n"
@@ -1148,6 +1153,11 @@ msgstr ""
 "\tein Context Diff (-c, -C) mit anzahl Kontextzeilen. Die Anzahl der\n"
 "\tKontextzeilen ist 3, wenn nicht anders angegeben.\n"
 "\n"
+"-z[neuer_name]\n"
+"\tErzeuge einen neuen Patch mit den Änderungen, statt den obersten\n"
+"\tPatch zu aktualisieren. Wenn kein neuer Name angegeben wird, wird\n"
+"\t\\`-2' an den Namen angehängt, usw (siehe das fork-Kommando).\n"
+"\n"
 "--no-timestamps\n"
 "\tKeine Zeitstempel in Patches angeben.\n"
 "\n"
@@ -1158,7 +1168,7 @@ msgstr ""
 "\tFüge dem Patch-Kopf einen diffstat-Abschnitt hinzu, oder ersetzte den\n"
 "\tbestehenden Abschnitt.\n"
 "\n"
-"-f\tErzwinge das Auffrischen eines Patches, der sich nicht an oberster\n"
+"-f\tErzwinge das Aktalisieren eines Patches, der sich nicht an oberster\n"
 "\tPosition befindet.\n"
 "\n"
 "--no-timestamps\n"
@@ -1174,37 +1184,41 @@ msgstr ""
 "--strip-trailing-whitespace\n"
 "\tEntferne Whitespace an Zeilenenden.\n"
 
-#: quilt/refresh.in:159
+#: quilt/refresh.in:165
+msgid "Can only refresh the topmost patch with -z currently\\n"
+msgstr "Kann nur den obersten Patch mit -z aktualisieren\\n"
+
+#: quilt/refresh.in:196
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
-"Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -"
-"p1 angeben\\n"
+"Kann Patches mit Level -p$opt_strip_level nicht aktualisieren, bitte -p0 "
+"oder -p1 angeben\\n"
 
-#: quilt/refresh.in:194
+#: quilt/refresh.in:234
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
-"Später angewandte Patches verändern Dateien von %s. Auffrischen mit -f "
+"Später angewandte Patches verändern Dateien von %s. Aktalisieren mit -f "
 "erzwingen.\\n"
 
-#: quilt/refresh.in:200
+#: quilt/refresh.in:240
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "Kann --strip-trailing-whitespace nicht für Patches verwenden, die Dateien "
 "enthalten, die danach von anderen Patches weiter verändert werden.\\n"
 
-#: quilt/refresh.in:206
+#: quilt/refresh.in:246
 msgid "Nothing in patch %s\\n"
 msgstr "Patch %s ist leer\\n"
 
-#: quilt/refresh.in:284
+#: quilt/refresh.in:319
 msgid "Patch %s is unchanged\\n"
 msgstr "Patch %s ist unverändert\\n"
 
-#: quilt/refresh.in:290
+#: quilt/refresh.in:345
 msgid "Refreshed patch %s\\n"
-msgstr "Patch %s aufgefrischt\\n"
+msgstr "Patch %s aktualisiert\\n"
 
 #: quilt/remove.in:22
 msgid "Usage: quilt remove [-P patch] {file} ...\\n"
@@ -1256,7 +1270,6 @@ msgstr ""
 "\n"
 "-P patch\n"
 "\tPatch, der umbenannt werden soll.\n"
-"\n"
 
 #: quilt/rename.in:84
 msgid "Patch %s exists already, please choose a different name\\n"
@@ -1280,21 +1293,6 @@ msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n"
 msgid "Delivery address `%s' is invalid\n"
 msgstr "Zustelladresse `%s' ist ungültig\n"
 
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr "Verwendung: %s {-s|-u} abschnitt datei [< ersetzung]\n"
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr "Datei %s ist verschwunden\n"
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "Konnte %s nicht auf %s umbenennen: %s\n"
-
 #: quilt/scripts/patchfns.in:461
 msgid "No patches in series\\n"
 msgstr "Keine Patches in der series-Datei\\n"
@@ -1315,7 +1313,7 @@ msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 msgid "Patch %s does not exist\\n"
 msgstr "Patch %s existiert nicht\\n"
 
-#: quilt/scripts/patchfns.in:857
+#: quilt/scripts/patchfns.in:916
 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 "
@@ -1328,7 +1326,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: quilt/scripts/patchfns.in:942
+#: quilt/scripts/patchfns.in:1001
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/fr.po b/po/fr.po
index c69cd44..223943b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -311,40 +311,32 @@ msgstr ""
 "--sort\tTrie les fichiers par leur nom au lieu de pr�server leur ordre\n"
 "\td'origine.\n"
 
-#: quilt/diff.in:217
+#: quilt/diff.in:218
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "Les options �--combine�, �--snapshot� et �-z� ne peuvent pas �tre combin�es."
 "\\n"
 
-#: quilt/diff.in:231
+#: quilt/diff.in:232
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Impossible de cr�er des patches avec -p%s. Veuillez sp�cifier -p0 ou -p1 � "
 "la place\\n"
 
-#: quilt/diff.in:265 quilt/files.in:105
+#: quilt/diff.in:266 quilt/files.in:105
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Le patch %s n'est pas appliqu� avant %s\\n."
 
-#: quilt/diff.in:315 quilt/pop.in:98
-msgid "Failed to copy files to temporary directory\\n"
-msgstr "Impossible de copier les fichiers dans le r�pertoire temporaire\\n"
-
-#: quilt/diff.in:339 quilt/pop.in:122
-msgid "Failed to patch temporary files\\n"
-msgstr "Impossible de patcher les fichiers temporaires\\n"
-
-#: quilt/diff.in:358
+#: quilt/diff.in:326
 msgid "File %s is not being modified\\n"
 msgstr "Le fichier %s n'est pas modifi�.\\n"
 
-#: quilt/diff.in:378 quilt/refresh.in:188
+#: quilt/diff.in:346 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr "Le diff a �chou�. Abandon.\\n"
 
-#: quilt/diff.in:385
+#: quilt/diff.in:353
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "Attention: un patch plus recent modifie des fichiers communs � %s\\n"
 
@@ -463,15 +455,15 @@ msgstr ""
 "tiret suivi d'un nombre, ce nombre est augment� � la place (par\n"
 "exemple : patch.diff, patch-2.diff, patch-3.diff).\n"
 
-#: quilt/fork.in:88
+#: quilt/fork.in:84
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr "Le patch %s existe d�j�, veuillez choisir un nouveau nom\\n"
 
-#: quilt/fork.in:100
+#: quilt/fork.in:96
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "Le fork de %s en %s a �chou�\\n"
 
-#: quilt/fork.in:106
+#: quilt/fork.in:102 quilt/refresh.in:341
 msgid "Fork of patch %s created as %s\\n"
 msgstr "Le fork de %s a �t� cr�� en tant que %s\\n"
 
@@ -709,7 +701,7 @@ msgstr "Import du patch %s (enregistr� dans %s)\\n"
 msgid "Failed to import patch %s\\n"
 msgstr "Impossible d'importer le patch %s\\n"
 
-#: quilt/import.in:207
+#: quilt/import.in:207 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer %s dans le fichier de s�rie.\\n"
 
@@ -842,11 +834,11 @@ msgstr ""
 "r�pertoire devant �tre la racine si quilt choisi un r�pertoire trop haut\n"
 "dans l'arborescence.\n"
 
-#: quilt/new.in:70
+#: quilt/new.in:70 quilt/refresh.in:179
 msgid "Patch %s exists already\\n"
 msgstr "Le patch %s existe d�j�\\n"
 
-#: quilt/new.in:81
+#: quilt/new.in:81 quilt/refresh.in:337
 msgid "Failed to create patch %s\\n"
 msgstr "Impossible de cr�er le patch %s\\n"
 
@@ -939,6 +931,14 @@ msgstr ""
 "\n"
 "-v\tOp�re verbeusement.\n"
 
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:860
+msgid "Failed to copy files to temporary directory\\n"
+msgstr "Impossible de copier les fichiers dans le r�pertoire temporaire\\n"
+
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:883
+msgid "Failed to patch temporary files\\n"
+msgstr "Impossible de patcher les fichiers temporaires\\n"
+
 #: quilt/pop.in:140
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
@@ -1088,16 +1088,18 @@ msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Le patch au sommet %s doit �tre rafraichi au pr�alable.\\n"
 
 #: quilt/refresh.in:22
+#, fuzzy
 msgid ""
-"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
-"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
-"whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
+"[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
+"trailing-whitespace] [patch]\\n"
 msgstr ""
 "Usage : quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-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"
@@ -1123,6 +1125,11 @@ msgid ""
 "\ta context diff (-c, -C) with num lines of context. The number of\n"
 "\tcontext lines defaults to 3.\n"
 "\n"
+"-z[new_name]\n"
+"\tCreate a new patch containing the changes instead of refreshing the\n"
+"\ttopmost patch. If no new name is specified, \\`-2' is added to the\n"
+"\toriginal patch name, etc. (See the fork command.)\n"
+"\n"
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\n"
@@ -1190,35 +1197,39 @@ msgstr ""
 "--strip-trailing-whitespace\n"
 "\tSupprime les espaces � la fin des lignes.\n"
 
-#: quilt/refresh.in:159
+#: quilt/refresh.in:165
+msgid "Can only refresh the topmost patch with -z currently\\n"
+msgstr ""
+
+#: quilt/refresh.in:196
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Impossible de rafra�chir des patchs avec -p%s. Veuillez sp�cifier -p0 ou -p1 "
 "� la place.\\n"
 
-#: quilt/refresh.in:194
+#: quilt/refresh.in:234
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "Des fichiers plus r�cents modifient les m�mes fichiers que %s.\n"
 "Forcez le rafra�chissement avec -f.\\n"
 
-#: quilt/refresh.in:200
+#: quilt/refresh.in:240
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "Impossible d'utiliser --strip-trailing-whitespace sur un patch dont\n"
 "certains fichiers sont masqu�s.\\n"
 
-#: quilt/refresh.in:206
+#: quilt/refresh.in:246
 msgid "Nothing in patch %s\\n"
 msgstr "Le patch %s ne contient rien\\n"
 
-#: quilt/refresh.in:284
+#: quilt/refresh.in:319
 msgid "Patch %s is unchanged\\n"
 msgstr "Patch %s inchang�\\n"
 
-#: quilt/refresh.in:290
+#: quilt/refresh.in:345
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s rafra�chi\\n"
 
@@ -1295,21 +1306,6 @@ msgstr "Le nom `%s' est mal parenth�s�\n"
 msgid "Delivery address `%s' is invalid\n"
 msgstr "L'adresse de destination `%s' est invalide\n"
 
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr "Le fichier %s a disparu !\n"
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "Impossible de renommer %s en %s : %s\n"
-
 #: quilt/scripts/patchfns.in:461
 msgid "No patches in series\\n"
 msgstr "Aucun patch dans la s�rie\\n"
@@ -1330,7 +1326,7 @@ msgstr "La s�rie est compl�tement appliqu�e. Le dernier patch est %s.\\n"
 msgid "Patch %s does not exist\\n"
 msgstr "Le patch %s n'existe pas\\n"
 
-#: quilt/scripts/patchfns.in:857
+#: quilt/scripts/patchfns.in:916
 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 "
@@ -1342,7 +1338,7 @@ msgstr ""
 "format %s (inclus). Veuillez retirer vos patches avec la version \n"
 "utilis�e pour les appliquer avant d'installer une version plus ancienne.\\n"
 
-#: quilt/scripts/patchfns.in:942
+#: quilt/scripts/patchfns.in:1001
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1557,3 +1553,12 @@ msgstr ""
 "Veuillez retirer tous les patchs en utilisant � quilt pop -a � avec la \n"
 "version utilis�e pour cr�er cet arbre de travail, ou effacez le r�pertoire\n"
 "%s et r�appliquez compl�tement vos patchs.\\n"
+
+#~ msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+#~ msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
+
+#~ msgid "File %s disappeared!\n"
+#~ msgstr "Le fichier %s a disparu !\n"
+
+#~ msgid "Failed to rename %s to %s: %s\n"
+#~ msgstr "Impossible de renommer %s en %s : %s\n"
diff --git a/po/ja.po b/po/ja.po
index 4c974e0..f78e013 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -302,37 +302,29 @@ msgstr ""
 "\n"
 "--sort\t順番を保持せず、名前順にファイルを並び換える。\n"
 
-#: quilt/diff.in:217
+#: quilt/diff.in:218
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "オプション \\`--combine'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n"
 
-#: quilt/diff.in:231
+#: quilt/diff.in:232
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr "-p%s でパッチの差分はとれません。-p0か -p1を指定してください\\n"
 
-#: quilt/diff.in:265 quilt/files.in:105
+#: quilt/diff.in:266 quilt/files.in:105
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
 
-#: quilt/diff.in:315 quilt/pop.in:98
-msgid "Failed to copy files to temporary directory\\n"
-msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
-
-#: quilt/diff.in:339 quilt/pop.in:122
-msgid "Failed to patch temporary files\\n"
-msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
-
-#: quilt/diff.in:358
+#: quilt/diff.in:326
 msgid "File %s is not being modified\\n"
 msgstr "ファイル %s は変更されていません\\n"
 
-#: quilt/diff.in:378 quilt/refresh.in:188
+#: quilt/diff.in:346 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr "差分に失敗しました。異常終了します\\n"
 
-#: quilt/diff.in:385
+#: quilt/diff.in:353
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "警告: 最近のパッチが、パッチ %s 内のファイルを変更しています\\n"
 
@@ -444,15 +436,15 @@ msgstr ""
 "\\`-2' が付く。すでにパッチ名が -番号で終っている場合、番号の値が1増える "
 "(例: patch.diff、patch-2.diff、patch-3.diff)。\n"
 
-#: quilt/fork.in:88
+#: quilt/fork.in:84
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr "パッチ %s はすでに存在します。新しい名前を選んでください\\n"
 
-#: quilt/fork.in:100
+#: quilt/fork.in:96
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "パッチ %s からパッチ %s への分岐に失敗しました\\n"
 
-#: quilt/fork.in:106
+#: quilt/fork.in:102 quilt/refresh.in:341
 msgid "Fork of patch %s created as %s\\n"
 msgstr "パッチ %s の分岐で %s が作成されました\\n"
 
@@ -683,7 +675,7 @@ msgstr "パッチ %s を取り込んでいます (%s として保存されます
 msgid "Failed to import patch %s\\n"
 msgstr "パッチ %s の取り込みに失敗しました\\n"
 
-#: quilt/import.in:207
+#: quilt/import.in:207 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
 
@@ -812,11 +804,11 @@ msgstr ""
 "たディレクトリより上のディレクトリを Quilt が間違って選んでしまった場\n"
 "合は、正しい場所に %s ディレクトリを作成すること。\n"
 
-#: quilt/new.in:70
+#: quilt/new.in:70 quilt/refresh.in:179
 msgid "Patch %s exists already\\n"
 msgstr "パッチ %s は、すでに存在します\\n"
 
-#: quilt/new.in:81
+#: quilt/new.in:81 quilt/refresh.in:337
 msgid "Failed to create patch %s\\n"
 msgstr "パッチ %s の作成に失敗しました\\n"
 
@@ -904,6 +896,14 @@ msgstr ""
 "\n"
 "-v\t詳細に表示。\n"
 
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:860
+msgid "Failed to copy files to temporary directory\\n"
+msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
+
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:883
+msgid "Failed to patch temporary files\\n"
+msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
+
 #: quilt/pop.in:140
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
@@ -1048,16 +1048,18 @@ msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"
 
 #: quilt/refresh.in:22
+#, fuzzy
 msgid ""
-"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
-"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
-"whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
+"[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
+"trailing-whitespace] [patch]\\n"
 msgstr ""
 "使い方: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
 "timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
 "whitespace] [パッチ]\\n"
 
 #: quilt/refresh.in:26
+#, fuzzy
 msgid ""
 "\n"
 "Refreshes the specified patch, or the topmost patch by default.\n"
@@ -1083,6 +1085,11 @@ msgid ""
 "\ta context diff (-c, -C) with num lines of context. The number of\n"
 "\tcontext lines defaults to 3.\n"
 "\n"
+"-z[new_name]\n"
+"\tCreate a new patch containing the changes instead of refreshing the\n"
+"\ttopmost patch. If no new name is specified, \\`-2' is added to the\n"
+"\toriginal patch name, etc. (See the fork command.)\n"
+"\n"
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\n"
@@ -1147,33 +1154,37 @@ msgstr ""
 "--strip-trailing-whitespace\n"
 "\t末尾の空白文字を削除する。\n"
 
-#: quilt/refresh.in:159
+#: quilt/refresh.in:165
+msgid "Can only refresh the topmost patch with -z currently\\n"
+msgstr ""
+
+#: quilt/refresh.in:196
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "-p%s ではリフレッシュすることができません。-p0または -p1を指定してください\\n"
 
-#: quilt/refresh.in:194
+#: quilt/refresh.in:234
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "より最近のパッチがパッチ %s のファイルに変更を加えています。リフレッシュを実"
 "行する場合は -f オプションを使用してください。\\n"
 
-#: quilt/refresh.in:200
+#: quilt/refresh.in:240
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "--strip-trailing-whitespace は影になっているファイルがある場合は使えません"
 
-#: quilt/refresh.in:206
+#: quilt/refresh.in:246
 msgid "Nothing in patch %s\\n"
 msgstr "パッチ %s にはなにも含まれていません\\n"
 
-#: quilt/refresh.in:284
+#: quilt/refresh.in:319
 msgid "Patch %s is unchanged\\n"
 msgstr "パッチ %s に変更はありません\\n"
 
-#: quilt/refresh.in:290
+#: quilt/refresh.in:345
 msgid "Refreshed patch %s\\n"
 msgstr "パッチ %s をリフレッシュしました\\n"
 
@@ -1249,21 +1260,6 @@ msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます
 msgid "Delivery address `%s' is invalid\n"
 msgstr "配送先のアドレス `%s' が不正です\n"
 
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr "使いかた: %s {-s|-u} section file [< replacement]\n"
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr "ファイル %s が消えました!\n"
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n"
-
 #: quilt/scripts/patchfns.in:461
 msgid "No patches in series\\n"
 msgstr "シリーズに登録されているパッチがありません\\n"
@@ -1285,7 +1281,7 @@ msgstr ""
 msgid "Patch %s does not exist\\n"
 msgstr "パッチ %s が存在しません\\n"
 
-#: quilt/scripts/patchfns.in:857
+#: quilt/scripts/patchfns.in:916
 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 "
@@ -1297,7 +1293,7 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: quilt/scripts/patchfns.in:942
+#: quilt/scripts/patchfns.in:1001
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1510,3 +1506,12 @@ msgstr ""
 "現在作業中のツリーを作成した quiltと同じバージョンの quiltで \\`quilt\n"
 "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n"
 "トリを削除し、最初からパッチをあて直してください。\\n"
+
+#~ msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+#~ msgstr "使いかた: %s {-s|-u} section file [< replacement]\n"
+
+#~ msgid "File %s disappeared!\n"
+#~ msgstr "ファイル %s が消えました!\n"
+
+#~ msgid "Failed to rename %s to %s: %s\n"
+#~ msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index e41b887..486c1b3 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -197,36 +197,28 @@ msgid ""
 "--sort\tSort files by their name instead of preserving the original order.\n"
 msgstr ""
 
-#: quilt/diff.in:217
+#: quilt/diff.in:218
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 
-#: quilt/diff.in:231
+#: quilt/diff.in:232
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 
-#: quilt/diff.in:265 quilt/files.in:105
+#: quilt/diff.in:266 quilt/files.in:105
 msgid "Patch %s not applied before patch %s\\n"
 msgstr ""
 
-#: quilt/diff.in:315 quilt/pop.in:98
-msgid "Failed to copy files to temporary directory\\n"
-msgstr ""
-
-#: quilt/diff.in:339 quilt/pop.in:122
-msgid "Failed to patch temporary files\\n"
-msgstr ""
-
-#: quilt/diff.in:358
+#: quilt/diff.in:326
 msgid "File %s is not being modified\\n"
 msgstr ""
 
-#: quilt/diff.in:378 quilt/refresh.in:188
+#: quilt/diff.in:346 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr ""
 
-#: quilt/diff.in:385
+#: quilt/diff.in:353
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr ""
 
@@ -304,15 +296,15 @@ msgid ""
 "patch-2.diff, patch-3.diff).\n"
 msgstr ""
 
-#: quilt/fork.in:88
+#: quilt/fork.in:84
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr ""
 
-#: quilt/fork.in:100
+#: quilt/fork.in:96
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr ""
 
-#: quilt/fork.in:106
+#: quilt/fork.in:102 quilt/refresh.in:341
 msgid "Fork of patch %s created as %s\\n"
 msgstr ""
 
@@ -469,7 +461,7 @@ msgstr ""
 msgid "Failed to import patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:207
+#: quilt/import.in:207 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr ""
 
@@ -555,11 +547,11 @@ msgid ""
 "in the directory tree.\n"
 msgstr ""
 
-#: quilt/new.in:70
+#: quilt/new.in:70 quilt/refresh.in:179
 msgid "Patch %s exists already\\n"
 msgstr ""
 
-#: quilt/new.in:81
+#: quilt/new.in:81 quilt/refresh.in:337
 msgid "Failed to create patch %s\\n"
 msgstr ""
 
@@ -619,6 +611,14 @@ msgid ""
 "-v\tVerbose operation.\n"
 msgstr ""
 
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:860
+msgid "Failed to copy files to temporary directory\\n"
+msgstr ""
+
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:883
+msgid "Failed to patch temporary files\\n"
+msgstr ""
+
 #: quilt/pop.in:140
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
@@ -729,9 +729,9 @@ msgstr ""
 
 #: quilt/refresh.in:22
 msgid ""
-"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
-"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
-"whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
+"[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
+"trailing-whitespace] [patch]\\n"
 msgstr ""
 
 #: quilt/refresh.in:26
@@ -760,6 +760,11 @@ msgid ""
 "\ta context diff (-c, -C) with num lines of context. The number of\n"
 "\tcontext lines defaults to 3.\n"
 "\n"
+"-z[new_name]\n"
+"\tCreate a new patch containing the changes instead of refreshing the\n"
+"\ttopmost patch. If no new name is specified, \\`-2' is added to the\n"
+"\toriginal patch name, etc. (See the fork command.)\n"
+"\n"
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\n"
@@ -781,29 +786,33 @@ msgid ""
 "\tStrip trailing whitespace at the end of lines.\n"
 msgstr ""
 
-#: quilt/refresh.in:159
+#: quilt/refresh.in:165
+msgid "Can only refresh the topmost patch with -z currently\\n"
+msgstr ""
+
+#: quilt/refresh.in:196
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 
-#: quilt/refresh.in:194
+#: quilt/refresh.in:234
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 
-#: quilt/refresh.in:200
+#: quilt/refresh.in:240
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 
-#: quilt/refresh.in:206
+#: quilt/refresh.in:246
 msgid "Nothing in patch %s\\n"
 msgstr ""
 
-#: quilt/refresh.in:284
+#: quilt/refresh.in:319
 msgid "Patch %s is unchanged\\n"
 msgstr ""
 
-#: quilt/refresh.in:290
+#: quilt/refresh.in:345
 msgid "Refreshed patch %s\\n"
 msgstr ""
 
@@ -868,21 +877,6 @@ msgstr ""
 msgid "Delivery address `%s' is invalid\n"
 msgstr ""
 
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr ""
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr ""
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr ""
-
 #: quilt/scripts/patchfns.in:461
 msgid "No patches in series\\n"
 msgstr ""
@@ -903,7 +897,7 @@ msgstr ""
 msgid "Patch %s does not exist\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:857
+#: quilt/scripts/patchfns.in:916
 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 "
@@ -911,7 +905,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:942
+#: quilt/scripts/patchfns.in:1001
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/quilt.changes b/quilt.changes
index a098f2f..54c7a13 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Wed Jan 31 10:46:32 PST 2007 - agruen@suse.de
+
+- Update the German translation.
+
+-------------------------------------------------------------------
 Thu Oct 19 20:49:23 CEST 2006 - agruen@suse.de
 
 - Refresh command: add -z option, which refreshes changes into a