- fold command: Add -R option.

- Update German translation.

6 files changed, 201 insertions, 140 deletions

diff --git a/po/de.po b/po/de.po
index f302bdb..45529c3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -181,7 +181,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "Kein Patch %s\\n"
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:581
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:593
 msgid "Patch %s is currently applied\\n"
 msgstr "Patch %s ist momentan angewandt\\n"
 
@@ -322,7 +322,7 @@ msgstr ""
 "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden."
 "\\n"
 
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:312
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:315
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
 
@@ -390,8 +390,8 @@ msgstr ""
 "\n"
 
 #: quilt/fold.in:22
-msgid "Usage: quilt fold [-p strip-level]\\n"
-msgstr "Verwendung: quilt fold [-p strip-ebenen]\\n"
+msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n"
+msgstr "Verwendung: quilt fold [-R] [-q] [-f] [-p strip-ebenen]\\n"
 
 #: quilt/fold.in:25
 msgid ""
@@ -401,6 +401,8 @@ msgid ""
 "patch, the patch is applied with the specified strip level (which\n"
 "defaults to 1).\n"
 "\n"
+"-R\tApply patch in reverse.\n"
+"\n"
 "-q\tQuiet operation.\n"
 "\n"
 "-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
@@ -416,6 +418,8 @@ msgstr ""
 "obersten Patch enthalten sind, und wendet dann den neuen Patch\n"
 "mit der angegebenen Anzahl an Strip-Ebenen an (Standardwert = 1).\n"
 "\n"
+"-r\tPatch vekehrt herum anwenden.\n"
+"\n"
 "-q\tWenige Meldungen ausgeben.\n"
 "\n"
 "-f\tAnwenden erzwingen, selbst wenn dabei Fehler auftreten. Wenn -q nicht\n"
@@ -426,7 +430,7 @@ msgstr ""
 "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n"
 "\tentfernt werden sollen.\n"
 
-#: quilt/fold.in:123
+#: quilt/fold.in:129
 msgid "File %s may be corrupted\\n"
 msgstr "Datei %s ist möglicherweise defekt\\n"
 
@@ -723,17 +727,21 @@ msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
 #: quilt/mail.in:24
 msgid ""
 "Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--"
-"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
+"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
+"[first_patch [last_patch]]\\n"
 msgstr ""
 "Verwendung: quilt mail {--mbox datei|--send} [-m text] [--prefix prefix] [--"
-"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
+"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] [first_patch [last_patch]]\\n"
 
 #: quilt/mail.in:27
 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 introduction. Please see %s for details.\n"
+"Create mail messages from a specified range of patches, or all patches in\n"
+"the series file, and either store them in a mailbox file, or send them\n"
+"immediately. The editor is opened with a template for the introduction.\n"
+"Please see %s for details.\n"
+"When specifying a range of patches, a first patch name of \\`-' is\n"
+"equivalent to specifying the first applied patch.\n"
 "\n"
 "-m text\n"
 "\tText to use as the text in the introduction. When this option is\n"
@@ -767,6 +775,8 @@ msgstr ""
 "speichere sie in einer Mailbox-Datei, oder versende sie sofort. Der Editor\n"
 "wird mit der Vorlage einer Einleitung geöffnet. Für Details siehe\n"
 "%s.\n"
+"Wenn ein Bereich von Patches angegeben wird, kann \\`-' für den ersten Patch\n"
+"verwendet werden.\n"
 "\n"
 "-m text\n"
 "\tText, der für die Einleitung verwendet werden soll. Wenn\n"
@@ -794,28 +804,28 @@ msgstr ""
 "--to, --cc, --bcc\n"
 "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n"
 
-#: quilt/mail.in:181
+#: quilt/mail.in:184
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 "Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender."
 
-#: quilt/mail.in:342
+#: quilt/mail.in:345
 msgid "Unable to extract a subject header from %s\\n"
 msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n"
 
-#: quilt/mail.in:365
+#: quilt/mail.in:368
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n"
 
-#: quilt/mail.in:407
+#: quilt/mail.in:410
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n"
 
-#: quilt/mail.in:410
+#: quilt/mail.in:413
 msgid "Introduction has no subject header\\n"
 msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n"
 
-#: quilt/mail.in:500
+#: quilt/mail.in:503
 msgid "Introduction saved as %s\\n"
 msgstr "Einleitung gespeichert als %s\\n"
 
@@ -937,11 +947,11 @@ msgstr ""
 "\n"
 "-v\tViele Meldungen ausgeben.\n"
 
-#: quilt/pop.in:98 quilt/scripts/patchfns.in:882
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:894
 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:905
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:917
 msgid "Failed to patch temporary files\\n"
 msgstr "Konnte temporäre Dateien nicht patchen\\n"
 
@@ -967,7 +977,7 @@ msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n"
 msgid "No patch removed\\n"
 msgstr "Kein Patch entfernt\\n"
 
-#: quilt/pop.in:267 quilt/scripts/patchfns.in:496
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:508
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
@@ -1279,8 +1289,7 @@ msgstr ""
 "\n"
 "Änderungen an den angegebenen Datei(en) im obersten oder angegebenen Patch\n"
 "zurücknehmen. Änderungen in Dateien, die durch Patches über dem angegebenen\n"
-"Patch verändert werden, können nicht zurückgenommen werden."
-"\n"
+"Patch verändert werden, können nicht zurückgenommen werden.\n"
 "-P patch\n"
 "\tPatch, aus dem Dateien entfernt werden sollen.\n"
 
@@ -1306,27 +1315,27 @@ 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/patchfns.in:483
+#: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495
 msgid "No patches in series\\n"
 msgstr "Keine Patches in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:532
+#: quilt/scripts/patchfns.in:544
 msgid "Patch %s is not in series\\n"
 msgstr "Patch %s ist nicht in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:560
+#: quilt/scripts/patchfns.in:572
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
 
-#: quilt/scripts/patchfns.in:597
+#: quilt/scripts/patchfns.in:609
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 
-#: quilt/scripts/patchfns.in:619
+#: quilt/scripts/patchfns.in:631
 msgid "Patch %s does not exist\\n"
 msgstr "Patch %s existiert nicht\\n"
 
-#: quilt/scripts/patchfns.in:938
+#: quilt/scripts/patchfns.in:950
 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 "
@@ -1339,7 +1348,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: quilt/scripts/patchfns.in:1023
+#: quilt/scripts/patchfns.in:1035
 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 a360460..6fb604d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -90,7 +90,7 @@ msgstr "Le fichier %s est situ� en dessous de %s\\n"
 msgid "File %s is already in patch %s\\n"
 msgstr "Le fichier %s est d�j� dans le patch %s\\n"
 
-#: quilt/add.in:111 quilt/remove.in:82
+#: quilt/add.in:111 quilt/revert.in:83
 msgid "File %s modified by patch %s\\n"
 msgstr "Le fichier %s est modifi� par le patch %s\\n"
 
@@ -324,7 +324,7 @@ msgstr ""
 "Impossible de cr�er des patches avec -p%s. Veuillez sp�cifier -p0 ou -p1 � "
 "la place\\n"
 
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:312
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:315
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Le patch %s n'est pas appliqu� avant %s\\n."
 
@@ -391,7 +391,8 @@ msgstr ""
 "\tpremier patch appliqu�.\n"
 
 #: quilt/fold.in:22
-msgid "Usage: quilt fold [-p strip-level]\\n"
+#, fuzzy
+msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n"
 msgstr "Usage : quilt fold [-p strip-level]\\n"
 
 #: quilt/fold.in:25
@@ -403,6 +404,8 @@ msgid ""
 "patch, the patch is applied with the specified strip level (which\n"
 "defaults to 1).\n"
 "\n"
+"-R\tApply patch in reverse.\n"
+"\n"
 "-q\tQuiet operation.\n"
 "\n"
 "-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
@@ -422,7 +425,7 @@ msgstr ""
 "\tNombre de niveaux de r�pertoires � retirer lors de l'application du \n"
 "\tpatch.\n"
 
-#: quilt/fold.in:123
+#: quilt/fold.in:129
 msgid "File %s may be corrupted\\n"
 msgstr "Le fichier %s est peut-�tre corrompu\\n"
 
@@ -718,19 +721,25 @@ msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer %s dans le fichier de s�rie.\\n"
 
 #: quilt/mail.in:24
+#, fuzzy
 msgid ""
 "Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--"
-"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
+"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
+"[first_patch [last_patch]]\\n"
 msgstr ""
 "Usage : quilt mail {--mbox fichier|--send} [-m texte] [--prefix pr�fixe] [--"
 "sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 
 #: quilt/mail.in:27
+#, 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 introduction. Please see %s for details.\n"
+"Create mail messages from a specified range of patches, or all patches in\n"
+"the series file, and either store them in a mailbox file, or send them\n"
+"immediately. The editor is opened with a template for the introduction.\n"
+"Please see %s for details.\n"
+"When specifying a range of patches, a first patch name of \\`-' is\n"
+"equivalent to specifying the first applied patch.\n"
 "\n"
 "-m text\n"
 "\tText to use as the text in the introduction. When this option is\n"
@@ -795,28 +804,28 @@ msgstr ""
 "\tAjoute un destinataire dans le champ d'en-t�te A, Copie ou Copie\n"
 "\tcach�e, respectivement.\n"
 
-#: quilt/mail.in:181
+#: quilt/mail.in:184
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr "Impossible de d�terminer l'adresse d'exp�diteur. Utilisez --sender."
 
-#: quilt/mail.in:342
+#: quilt/mail.in:345
 msgid "Unable to extract a subject header from %s\\n"
 msgstr "Impossible d'extraire une ligne de sujet de %s\\n"
 
-#: quilt/mail.in:365
+#: quilt/mail.in:368
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr "Les patches %s ont des sujets dupliqu�s.\\n"
 
-#: quilt/mail.in:407
+#: quilt/mail.in:410
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr ""
 "L'introduction n'a pas de ligne de sujet (sauvegard� en tant que %s)\\n"
 
-#: quilt/mail.in:410
+#: quilt/mail.in:413
 msgid "Introduction has no subject header\\n"
 msgstr "L'introduction ne contient pas de ligne de sujet\\n"
 
-#: quilt/mail.in:500
+#: quilt/mail.in:503
 msgid "Introduction saved as %s\\n"
 msgstr "Introduction sauvegard�e en tant que %s\\n"
 
@@ -1243,39 +1252,6 @@ msgstr "Patch %s inchang�\\n"
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s rafra�chi\\n"
 
-#: quilt/remove.in:22
-msgid "Usage: quilt remove [-P patch] {file} ...\\n"
-msgstr "Usage : quilt remove [-P patch] {fichier} ...\\n"
-
-#: quilt/remove.in:25
-msgid ""
-"\n"
-"Remove one or more files from the topmost or named patch.  Files that\n"
-"are modified by patches on top of the specified patch cannot be removed.\n"
-"\n"
-"-P patch\n"
-"\tRemove named files from the named patch.\n"
-msgstr ""
-"\n"
-"Retire un ou plusieurs fichiers du patch au sommet ou du patch sp�cifi�.\n"
-"Des fichiers modifi�s par des patches plus haut dans la s�rie ne peuvent\n"
-"pas �tre retir�s. \n"
-"\n"
-"-P patch\n"
-"\tPatch duquel les fichiers doivent �tre retir�s.\n"
-
-#: quilt/remove.in:73
-msgid "File %s is not in patch %s\\n"
-msgstr "Le fichier %s n'est pas dans le patch %s.\\n"
-
-#: quilt/remove.in:91
-msgid "Failed to remove file %s from patch %s\\n"
-msgstr "Impossible d'enlever le fichier %s du patch %s.\\n"
-
-#: quilt/remove.in:105
-msgid "File %s removed from patch %s\\n"
-msgstr "Le fichier %s a �t� enlev� du patch %s.\\n"
-
 #: quilt/rename.in:22
 msgid "Usage: quilt rename [-P patch] new_name\\n"
 msgstr "Usage : quilt rename [-P patch] nouveau_nom\\n"
@@ -1306,6 +1282,44 @@ msgstr "Le renommage de %s en %s a �chou�\\n"
 msgid "Patch %s renamed to %s\\n"
 msgstr "Patch %s renomm� en %s\\n"
 
+#: quilt/revert.in:22
+#, fuzzy
+msgid "Usage: quilt revert [-P patch] {file} ...\\n"
+msgstr "Usage : quilt remove [-P patch] {fichier} ...\\n"
+
+#: quilt/revert.in:25
+#, fuzzy
+msgid ""
+"\n"
+"Revert the changes to one or more files in the topmost or named patch.\n"
+"Changes in files that are modified by patches on top of the specified patch\n"
+"cannot be reverted.\n"
+"\n"
+"-P patch\n"
+"\tRevert changes in the named patch.\n"
+msgstr ""
+"\n"
+"Retire un ou plusieurs fichiers du patch au sommet ou du patch sp�cifi�.\n"
+"Des fichiers modifi�s par des patches plus haut dans la s�rie ne peuvent\n"
+"pas �tre retir�s. \n"
+"\n"
+"-P patch\n"
+"\tPatch duquel les fichiers doivent �tre retir�s.\n"
+
+#: quilt/revert.in:74
+msgid "File %s is not in patch %s\\n"
+msgstr "Le fichier %s n'est pas dans le patch %s.\\n"
+
+#: quilt/revert.in:92
+#, fuzzy
+msgid "Failed to revert changed to %s in patch %s\\n"
+msgstr "Impossible d'enlever le fichier %s du patch %s.\\n"
+
+#: quilt/revert.in:106
+#, fuzzy
+msgid "Changes to %s in patch %s reverted\\n"
+msgstr "Impossible d'inserer %s dans le fichier de s�rie.\\n"
+
 #: quilt/scripts/edmail.in:83
 #, perl-format
 msgid "Display name `%s' contains unpaired parentheses\n"
@@ -1564,6 +1578,9 @@ msgstr ""
 "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 "File %s removed from patch %s\\n"
+#~ msgstr "Le fichier %s a �t� enlev� du patch %s.\\n"
+
 #~ msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
 #~ msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
 
diff --git a/po/ja.po b/po/ja.po
index 08efa57..a52eee5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -87,7 +87,7 @@ msgstr "ファイル %s は、%s 以下にあります\\n"
 msgid "File %s is already in patch %s\\n"
 msgstr "ファイル %s は、すでにパッチ %s に含まれています\\n"
 
-#: quilt/add.in:111 quilt/remove.in:82
+#: quilt/add.in:111 quilt/revert.in:83
 msgid "File %s modified by patch %s\\n"
 msgstr "ファイル %s は、パッチ %s によってすでに変更されています\\n"
 
@@ -312,7 +312,7 @@ msgstr ""
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr "-p%s でパッチの差分はとれません。-p0か -p1を指定してください\\n"
 
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:312
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:315
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
 
@@ -379,7 +379,8 @@ msgstr ""
 "\n"
 
 #: quilt/fold.in:22
-msgid "Usage: quilt fold [-p strip-level]\\n"
+#, fuzzy
+msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n"
 msgstr "使い方: quilt fold [-p strip-level]\\n"
 
 #: quilt/fold.in:25
@@ -391,6 +392,8 @@ msgid ""
 "patch, the patch is applied with the specified strip level (which\n"
 "defaults to 1).\n"
 "\n"
+"-R\tApply patch in reverse.\n"
+"\n"
 "-q\tQuiet operation.\n"
 "\n"
 "-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
@@ -408,7 +411,7 @@ msgstr ""
 "-p strip-level\n"
 "\tパッチを適用するときに、ファイル名から省くパス名要素の数\n"
 
-#: quilt/fold.in:123
+#: quilt/fold.in:129
 msgid "File %s may be corrupted\\n"
 msgstr "ファイル %s は壊れている可能性があります\\n"
 
@@ -692,19 +695,25 @@ msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
 
 #: quilt/mail.in:24
+#, fuzzy
 msgid ""
 "Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--"
-"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
+"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
+"[first_patch [last_patch]]\\n"
 msgstr ""
 "使い方: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--"
 "sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 
 #: quilt/mail.in:27
+#, 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 introduction. Please see %s for details.\n"
+"Create mail messages from a specified range of patches, or all patches in\n"
+"the series file, and either store them in a mailbox file, or send them\n"
+"immediately. The editor is opened with a template for the introduction.\n"
+"Please see %s for details.\n"
+"When specifying a range of patches, a first patch name of \\`-' is\n"
+"equivalent to specifying the first applied patch.\n"
 "\n"
 "-m text\n"
 "\tText to use as the text in the introduction. When this option is\n"
@@ -764,29 +773,29 @@ msgstr ""
 "--to, --cc, --bcc\n"
 "\tToやCC、BCCへの受信者の追加。\n"
 
-#: quilt/mail.in:181
+#: quilt/mail.in:184
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 "エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n"
 "を使用してください。"
 
-#: quilt/mail.in:342
+#: quilt/mail.in:345
 msgid "Unable to extract a subject header from %s\\n"
 msgstr "%s から件名を取り出せません。\\n"
 
-#: quilt/mail.in:365
+#: quilt/mail.in:368
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr "パッチ %s の件名が重複しています。\\n"
 
-#: quilt/mail.in:407
+#: quilt/mail.in:410
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr "序文に件名がありません(%s として保存されました)\\n"
 
-#: quilt/mail.in:410
+#: quilt/mail.in:413
 msgid "Introduction has no subject header\\n"
 msgstr "序文に件名がありません\\n"
 
-#: quilt/mail.in:500
+#: quilt/mail.in:503
 msgid "Introduction saved as %s\\n"
 msgstr "序文は %s という名前で保存されました\\n"
 
@@ -1201,38 +1210,6 @@ msgstr "パッチ %s に変更はありません\\n"
 msgid "Refreshed patch %s\\n"
 msgstr "パッチ %s をリフレッシュしました\\n"
 
-#: quilt/remove.in:22
-msgid "Usage: quilt remove [-P patch] {file} ...\\n"
-msgstr "使い方: quilt remove [-P パッチ] {ファイル} ...\\n"
-
-#: quilt/remove.in:25
-msgid ""
-"\n"
-"Remove one or more files from the topmost or named patch.  Files that\n"
-"are modified by patches on top of the specified patch cannot be removed.\n"
-"\n"
-"-P patch\n"
-"\tRemove named files from the named patch.\n"
-msgstr ""
-"\n"
-"指定されたファイルを最上位パッチまたは指定されたパッチから削除する。指\n"
-"定されたファイルがより上のパッチで変更されている場合は、削除できない。\n"
-"\n"
-"-P パッチ\n"
-"\tファイルを削除するパッチを指定。\n"
-
-#: quilt/remove.in:73
-msgid "File %s is not in patch %s\\n"
-msgstr "ファイル %s は、パッチ %s に含まれていません\\n"
-
-#: quilt/remove.in:91
-msgid "Failed to remove file %s from patch %s\\n"
-msgstr "ファイル %s を、パッチ %s から削除することに失敗しました\\n"
-
-#: quilt/remove.in:105
-msgid "File %s removed from patch %s\\n"
-msgstr "ファイル %s を、パッチ %s から削除しました\\n"
-
 #: quilt/rename.in:22
 msgid "Usage: quilt rename [-P patch] new_name\\n"
 msgstr "使い方: quilt rename [-P patch] new_name\\n"
@@ -1263,6 +1240,43 @@ msgstr "パッチ %s から %s への名前の変更に失敗しました\\n"
 msgid "Patch %s renamed to %s\\n"
 msgstr "パッチ %s から %s へ名前を変更しました\\n"
 
+#: quilt/revert.in:22
+#, fuzzy
+msgid "Usage: quilt revert [-P patch] {file} ...\\n"
+msgstr "使い方: quilt remove [-P パッチ] {ファイル} ...\\n"
+
+#: quilt/revert.in:25
+#, fuzzy
+msgid ""
+"\n"
+"Revert the changes to one or more files in the topmost or named patch.\n"
+"Changes in files that are modified by patches on top of the specified patch\n"
+"cannot be reverted.\n"
+"\n"
+"-P patch\n"
+"\tRevert changes in the named patch.\n"
+msgstr ""
+"\n"
+"指定されたファイルを最上位パッチまたは指定されたパッチから削除する。指\n"
+"定されたファイルがより上のパッチで変更されている場合は、削除できない。\n"
+"\n"
+"-P パッチ\n"
+"\tファイルを削除するパッチを指定。\n"
+
+#: quilt/revert.in:74
+msgid "File %s is not in patch %s\\n"
+msgstr "ファイル %s は、パッチ %s に含まれていません\\n"
+
+#: quilt/revert.in:92
+#, fuzzy
+msgid "Failed to revert changed to %s in patch %s\\n"
+msgstr "ファイル %s を、パッチ %s から削除することに失敗しました\\n"
+
+#: quilt/revert.in:106
+#, fuzzy
+msgid "Changes to %s in patch %s reverted\\n"
+msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
+
 #: quilt/scripts/edmail.in:83
 #, perl-format
 msgid "Display name `%s' contains unpaired parentheses\n"
@@ -1519,3 +1533,6 @@ msgstr ""
 "現在作業中のツリーを作成した quiltと同じバージョンの quiltで \\`quilt\n"
 "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n"
 "トリを削除し、最初からパッチをあて直してください。\\n"
+
+#~ msgid "File %s removed from patch %s\\n"
+#~ msgstr "ファイル %s を、パッチ %s から削除しました\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 8199d6f..37711c9 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:312
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:315
 msgid "Patch %s not applied before patch %s\\n"
 msgstr ""
 
@@ -256,7 +256,7 @@ msgid ""
 msgstr ""
 
 #: quilt/fold.in:22
-msgid "Usage: quilt fold [-p strip-level]\\n"
+msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n"
 msgstr ""
 
 #: quilt/fold.in:25
@@ -267,6 +267,8 @@ msgid ""
 "patch, the patch is applied with the specified strip level (which\n"
 "defaults to 1).\n"
 "\n"
+"-R\tApply patch in reverse.\n"
+"\n"
 "-q\tQuiet operation.\n"
 "\n"
 "-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
@@ -277,7 +279,7 @@ msgid ""
 "\twhen applying patchfile.\n"
 msgstr ""
 
-#: quilt/fold.in:123
+#: quilt/fold.in:129
 msgid "File %s may be corrupted\\n"
 msgstr ""
 
@@ -477,15 +479,19 @@ msgstr ""
 #: quilt/mail.in:24
 msgid ""
 "Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--"
-"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
+"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
+"[first_patch [last_patch]]\\n"
 msgstr ""
 
 #: quilt/mail.in:27
 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 introduction. Please see %s for details.\n"
+"Create mail messages from a specified range of patches, or all patches in\n"
+"the series file, and either store them in a mailbox file, or send them\n"
+"immediately. The editor is opened with a template for the introduction.\n"
+"Please see %s for details.\n"
+"When specifying a range of patches, a first patch name of \\`-' is\n"
+"equivalent to specifying the first applied patch.\n"
 "\n"
 "-m text\n"
 "\tText to use as the text in the introduction. When this option is\n"
@@ -515,27 +521,27 @@ msgid ""
 "\tAppend a recipient to the To, Cc, or Bcc header.\n"
 msgstr ""
 
-#: quilt/mail.in:181
+#: quilt/mail.in:184
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 
-#: quilt/mail.in:342
+#: quilt/mail.in:345
 msgid "Unable to extract a subject header from %s\\n"
 msgstr ""
 
-#: quilt/mail.in:365
+#: quilt/mail.in:368
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr ""
 
-#: quilt/mail.in:407
+#: quilt/mail.in:410
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr ""
 
-#: quilt/mail.in:410
+#: quilt/mail.in:413
 msgid "Introduction has no subject header\\n"
 msgstr ""
 
-#: quilt/mail.in:500
+#: quilt/mail.in:503
 msgid "Introduction saved as %s\\n"
 msgstr ""
 
diff --git a/quilt.changes b/quilt.changes
index 594fde7..2717b11 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu May  3 18:56:44 CEST 2007 - agruen@suse.de
+
+- fold command: Add -R option.
+- Update German translation.
+
+-------------------------------------------------------------------
 Sat Apr 28 00:51:22 CEST 2007 - agruen@suse.de
 
 - Try to clean up the force-apply and interactive-apply logic
diff --git a/quilt/fold.in b/quilt/fold.in
index f2b967a..f3526f1 100644
--- a/quilt/fold.in
+++ b/quilt/fold.in
@@ -19,7 +19,7 @@ fi
 
 usage()
 {
-	printf $"Usage: quilt fold [-p strip-level]\n"
+	printf $"Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\n"
 	if [ x$1 = x-h ]
 	then
 		printf $"
@@ -28,6 +28,8 @@ After making sure that all files modified are part of the topmost
 patch, the patch is applied with the specified strip level (which
 defaults to 1).
 
+-R	Apply patch in reverse.
+
 -q	Quiet operation.
 
 -f	Force apply, even if the patch has rejects. Unless in quiet mode,
@@ -44,7 +46,7 @@ defaults to 1).
 	fi
 }
 
-options=`getopt -o p:qfh -- "$@"`
+options=`getopt -o Rp:qfh -- "$@"`
 
 if [ $? -ne 0 ]
 then
@@ -56,6 +58,9 @@ eval set -- "$options"
 while true
 do
 	case "$1" in
+	-R)
+		opt_reverse=1
+		shift ;;
 	-f)
 		opt_force=1
 		shift ;;
@@ -79,16 +84,17 @@ then
 fi
 
 : ${opt_strip_level:=1}
-[ -n "$opt_quiet" ] && silent=-s
-[ -z "$opt_force" -o -n "$opt_quiet" ] && force_apply=-f
+[ -n "$opt_quiet" ] && patch_args="$patch_args -s"
+[ -z "$opt_force" -o -n "$opt_quiet" ] && patch_args="$patch_args -f"
+[ -n "$opt_reverse" ] && patch_args="$patch_args -R"
 
 top=$(find_top_patch) || exit 1
 
 trap "failed=1" SIGINT
 
 workdir=$(gen_tempfile -d $PWD)
-patch -d ${SUBDIR:-.} $QUILT_PATCH_OPTS -p$opt_strip_level $silent \
-      --backup --prefix="$workdir/$SUBDIR" -E $force_apply \
+patch -d ${SUBDIR:-.} $QUILT_PATCH_OPTS -p$opt_strip_level \
+      --backup --prefix="$workdir/$SUBDIR" -E $patch_args \
 || failed=1
 
 [ -n "$opt_force" ] && failed=