- quilt/import.in, quilt/scripts/patchfns.in: Implement import -R

  for reverse-applying a patch. Original patch contributed by
  Randy Dunlap.

4 files changed, 114 insertions, 92 deletions

diff --git a/po/de.po b/po/de.po
index 578e176..9e62df7 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:559
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:579
 msgid "Patch %s is currently applied\\n"
 msgstr "Patch %s ist momentan angewandt\\n"
 
@@ -608,13 +608,16 @@ msgid "Appended text to header of patch %s\\n"
 msgstr "Text an Header von Patch %s angefügt\\n"
 
 #: quilt/import.in:22
+#, fuzzy
 msgid ""
-"Usage: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchfile ...\\n"
+"Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..."
+"\\n"
 msgstr ""
 "Verwendung: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] "
 "[patchdatei] ...\\n"
 
 #: quilt/import.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Import external patches.  The patches will be inserted following the\n"
@@ -623,6 +626,9 @@ msgid ""
 "-p num\n"
 "\tNumber of directory levels to strip when applying (default=1)\n"
 "\n"
+"-R\n"
+"\tApply patch in reverse.\n"
+"\n"
 "-P patch\n"
 "\tPatch filename to use inside quilt. This option can only be\n"
 "\tused when importing a single patch.\n"
@@ -654,51 +660,51 @@ msgstr ""
 "\tOption angegeben werden. Diese Option ist nur in Kombination mit -f "
 "wirksam.\n"
 
-#: quilt/import.in:68
+#: quilt/import.in:71
 msgid "Patch headers differ:\\n"
 msgstr "Die Patch-Header unterscheiden sich:\\n"
 
-#: quilt/import.in:71
+#: quilt/import.in:74
 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
 msgstr ""
 "Bitte verwenden Sie die Option -d {o|a|n} um anzugeben, welche Patch-Header "
 "erhalten bleiben sollen.\\n"
 
-#: quilt/import.in:133
+#: quilt/import.in:139
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr ""
 "Die Option \\`-P' kann nur beim Importieren eines einzelnen Patches "
 "verwendet werden\\n"
 
-#: quilt/import.in:153
+#: quilt/import.in:168
 msgid "Patch %s is applied\\n"
 msgstr "Patch %s ist angewandt\\n"
 
-#: quilt/import.in:162
+#: quilt/import.in:177
 msgid "Patch %s already exists in series.\\n"
 msgstr "Patch %s existiert bereits in der series-Datei\\n"
 
-#: quilt/import.in:168
+#: quilt/import.in:183
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n"
 
-#: quilt/import.in:179
+#: quilt/import.in:194
 msgid "Replacing patch %s with new version\\n"
 msgstr "Ersetze Patch %s durch neuere Version\\n"
 
-#: quilt/import.in:183
+#: quilt/import.in:198
 msgid "Importing patch %s\\n"
 msgstr "Importiere patch %s\\n"
 
-#: quilt/import.in:185
+#: quilt/import.in:200
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Importiere Patch %s (abgelegt als %s)\\n"
 
-#: quilt/import.in:198
+#: quilt/import.in:213
 msgid "Failed to import patch %s\\n"
 msgstr "Konnte Patch %s nicht importieren\\n"
 
-#: quilt/import.in:207 quilt/refresh.in:328
+#: quilt/import.in:222 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"
 
@@ -919,11 +925,11 @@ msgstr ""
 "\n"
 "-v\tViele Meldungen ausgeben.\n"
 
-#: quilt/pop.in:98 quilt/scripts/patchfns.in:860
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:880
 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
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:903
 msgid "Failed to patch temporary files\\n"
 msgstr "Konnte temporäre Dateien nicht patchen\\n"
 
@@ -949,7 +955,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:474
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:494
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
@@ -1293,27 +1299,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:461
+#: quilt/scripts/patchfns.in:481
 msgid "No patches in series\\n"
 msgstr "Keine Patches in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:510
+#: quilt/scripts/patchfns.in:530
 msgid "Patch %s is not in series\\n"
 msgstr "Patch %s ist nicht in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:538
+#: quilt/scripts/patchfns.in:558
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
 
-#: quilt/scripts/patchfns.in:575
+#: quilt/scripts/patchfns.in:595
 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:597
+#: quilt/scripts/patchfns.in:617
 msgid "Patch %s does not exist\\n"
 msgstr "Patch %s existiert nicht\\n"
 
-#: quilt/scripts/patchfns.in:916
+#: quilt/scripts/patchfns.in:936
 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 "
@@ -1326,7 +1332,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: quilt/scripts/patchfns.in:1001
+#: quilt/scripts/patchfns.in:1021
 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 223943b..b72a516 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -181,7 +181,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "Pas de patch suivant\\n"
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:559
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:579
 msgid "Patch %s is currently applied\\n"
 msgstr "Le patch %s est actuellement appliqu�\\n"
 
@@ -612,13 +612,16 @@ msgid "Appended text to header of patch %s\\n"
 msgstr "Texte ajout� � la fin de l'en-t�te du patch %s\\n"
 
 #: quilt/import.in:22
+#, fuzzy
 msgid ""
-"Usage: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchfile ...\\n"
+"Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..."
+"\\n"
 msgstr ""
 "Usage : quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] "
 "fichier_de_patch ...\\n"
 
 #: quilt/import.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Import external patches.  The patches will be inserted following the\n"
@@ -627,6 +630,9 @@ msgid ""
 "-p num\n"
 "\tNumber of directory levels to strip when applying (default=1)\n"
 "\n"
+"-R\n"
+"\tApply patch in reverse.\n"
+"\n"
 "-P patch\n"
 "\tPatch filename to use inside quilt. This option can only be\n"
 "\tused when importing a single patch.\n"
@@ -659,49 +665,49 @@ msgstr ""
 "\ten-t�tes, cette option doit �tre sp�cifi�e. Cette option n'est\n"
 "\teffective que lorsque -f est utilis�.\n"
 
-#: quilt/import.in:68
+#: quilt/import.in:71
 msgid "Patch headers differ:\\n"
 msgstr "Les en-t�tes des patches diff�rent :\\n"
 
-#: quilt/import.in:71
+#: quilt/import.in:74
 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
 msgstr ""
 "Veuillez utiliser -d {o|a|n} pour sp�cifier quel(s) en-t�te(s) conserver.\\n"
 
-#: quilt/import.in:133
+#: quilt/import.in:139
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr ""
 "L'option � -P � ne peut �tre utilis� que lors de l'import d'un seul patch.\\n"
 
-#: quilt/import.in:153
+#: quilt/import.in:168
 msgid "Patch %s is applied\\n"
 msgstr "Le patch %s n'est pas appliqu�\\n"
 
-#: quilt/import.in:162
+#: quilt/import.in:177
 msgid "Patch %s already exists in series.\\n"
 msgstr "Le patch %s existe d�j� dans la s�rie.\\n"
 
-#: quilt/import.in:168
+#: quilt/import.in:183
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n"
 
-#: quilt/import.in:179
+#: quilt/import.in:194
 msgid "Replacing patch %s with new version\\n"
 msgstr "Remplacement du patch %s avec la nouvelle version\\n"
 
-#: quilt/import.in:183
+#: quilt/import.in:198
 msgid "Importing patch %s\\n"
 msgstr "Import du patch %s\\n"
 
-#: quilt/import.in:185
+#: quilt/import.in:200
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Import du patch %s (enregistr� dans %s)\\n"
 
-#: quilt/import.in:198
+#: quilt/import.in:213
 msgid "Failed to import patch %s\\n"
 msgstr "Impossible d'importer le patch %s\\n"
 
-#: quilt/import.in:207 quilt/refresh.in:328
+#: quilt/import.in:222 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"
 
@@ -931,11 +937,11 @@ msgstr ""
 "\n"
 "-v\tOp�re verbeusement.\n"
 
-#: quilt/pop.in:98 quilt/scripts/patchfns.in:860
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:880
 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
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:903
 msgid "Failed to patch temporary files\\n"
 msgstr "Impossible de patcher les fichiers temporaires\\n"
 
@@ -961,7 +967,7 @@ msgstr "Le patch %s doit �tre rafraichi au pr�alable.\\n"
 msgid "No patch removed\\n"
 msgstr "Aucun patch retir�\\n"
 
-#: quilt/pop.in:267 quilt/scripts/patchfns.in:474
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:494
 msgid "No patches applied\\n"
 msgstr "Aucun patch n'est appliqu�\\n"
 
@@ -1306,27 +1312,27 @@ 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/patchfns.in:461
+#: quilt/scripts/patchfns.in:481
 msgid "No patches in series\\n"
 msgstr "Aucun patch dans la s�rie\\n"
 
-#: quilt/scripts/patchfns.in:510
+#: quilt/scripts/patchfns.in:530
 msgid "Patch %s is not in series\\n"
 msgstr "Le patch %s n'est pas dans la s�rie\\n"
 
-#: quilt/scripts/patchfns.in:538
+#: quilt/scripts/patchfns.in:558
 msgid "Patch %s is not applied\\n"
 msgstr "Le patch %s n'est pas appliqu�\\n"
 
-#: quilt/scripts/patchfns.in:575
+#: quilt/scripts/patchfns.in:595
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "La s�rie est compl�tement appliqu�e. Le dernier patch est %s.\\n"
 
-#: quilt/scripts/patchfns.in:597
+#: quilt/scripts/patchfns.in:617
 msgid "Patch %s does not exist\\n"
 msgstr "Le patch %s n'existe pas\\n"
 
-#: quilt/scripts/patchfns.in:916
+#: quilt/scripts/patchfns.in:936
 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 "
@@ -1338,7 +1344,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:1001
+#: quilt/scripts/patchfns.in:1021
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/ja.po b/po/ja.po
index 75a611e..10272c1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -177,7 +177,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "次のパッチはありません\\n"
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:559
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:579
 msgid "Patch %s is currently applied\\n"
 msgstr "パッチ %s は現在適用されています\\n"
 
@@ -589,13 +589,16 @@ msgid "Appended text to header of patch %s\\n"
 msgstr "パッチ %s のヘッダに追加しました\\n"
 
 #: quilt/import.in:22
+#, fuzzy
 msgid ""
-"Usage: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchfile ...\\n"
+"Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..."
+"\\n"
 msgstr ""
 "使い方: quilt import [-p num] [-P パッチ] [-f] [-d {o|a|n}] パッチファイ"
 "ル ...\\n"
 
 #: quilt/import.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Import external patches.  The patches will be inserted following the\n"
@@ -604,6 +607,9 @@ msgid ""
 "-p num\n"
 "\tNumber of directory levels to strip when applying (default=1)\n"
 "\n"
+"-R\n"
+"\tApply patch in reverse.\n"
+"\n"
 "-P patch\n"
 "\tPatch filename to use inside quilt. This option can only be\n"
 "\tused when importing a single patch.\n"
@@ -634,48 +640,48 @@ msgstr ""
 "\tがある場合は必ずこのオプションを指定する必要がある。このオプショ\n"
 "\tンは -fが指定された時のみ有効。\n"
 
-#: quilt/import.in:68
+#: quilt/import.in:71
 msgid "Patch headers differ:\\n"
 msgstr "パッチヘッダの差異:\\n"
 
-#: quilt/import.in:71
+#: quilt/import.in:74
 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
 msgstr ""
 "どのパッチヘッダを残すか、オプション -d {o|a|n}を使って指定してください"
 
-#: quilt/import.in:133
+#: quilt/import.in:139
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr "オプション \\`-P'は、パッチを一つだけ取り込むときのみ有効です\\n"
 
-#: quilt/import.in:153
+#: quilt/import.in:168
 msgid "Patch %s is applied\\n"
 msgstr "パッチ %s は、すでに適用されています\\n"
 
-#: quilt/import.in:162
+#: quilt/import.in:177
 msgid "Patch %s already exists in series.\\n"
 msgstr "パッチ %s は、すでに seriesの中にあります\\n"
 
-#: quilt/import.in:168
+#: quilt/import.in:183
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "パッチ %s は、すでに存在します。-fで置き換えることができます\\n"
 
-#: quilt/import.in:179
+#: quilt/import.in:194
 msgid "Replacing patch %s with new version\\n"
 msgstr "パッチ %s を新しいバージョンに置き換えます\\n"
 
-#: quilt/import.in:183
+#: quilt/import.in:198
 msgid "Importing patch %s\\n"
 msgstr "パッチ %s を取り込みます\\n"
 
-#: quilt/import.in:185
+#: quilt/import.in:200
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "パッチ %s を取り込んでいます (%s として保存されます)\\n"
 
-#: quilt/import.in:198
+#: quilt/import.in:213
 msgid "Failed to import patch %s\\n"
 msgstr "パッチ %s の取り込みに失敗しました\\n"
 
-#: quilt/import.in:207 quilt/refresh.in:328
+#: quilt/import.in:222 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
 
@@ -896,11 +902,11 @@ msgstr ""
 "\n"
 "-v\t詳細に表示。\n"
 
-#: quilt/pop.in:98 quilt/scripts/patchfns.in:860
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:880
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
 
-#: quilt/pop.in:122 quilt/scripts/patchfns.in:883
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:903
 msgid "Failed to patch temporary files\\n"
 msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
 
@@ -926,7 +932,7 @@ msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n"
 msgid "No patch removed\\n"
 msgstr "適用されているパッチはありません\\n"
 
-#: quilt/pop.in:267 quilt/scripts/patchfns.in:474
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:494
 msgid "No patches applied\\n"
 msgstr "適用されているパッチはありません\\n"
 
@@ -1263,28 +1269,28 @@ msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます
 msgid "Delivery address `%s' is invalid\n"
 msgstr "配送先のアドレス `%s' が不正です\n"
 
-#: quilt/scripts/patchfns.in:461
+#: quilt/scripts/patchfns.in:481
 msgid "No patches in series\\n"
 msgstr "シリーズに登録されているパッチがありません\\n"
 
-#: quilt/scripts/patchfns.in:510
+#: quilt/scripts/patchfns.in:530
 msgid "Patch %s is not in series\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: quilt/scripts/patchfns.in:538
+#: quilt/scripts/patchfns.in:558
 msgid "Patch %s is not applied\\n"
 msgstr "パッチ %s は適用されていません\\n"
 
-#: quilt/scripts/patchfns.in:575
+#: quilt/scripts/patchfns.in:595
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n"
 
-#: quilt/scripts/patchfns.in:597
+#: quilt/scripts/patchfns.in:617
 msgid "Patch %s does not exist\\n"
 msgstr "パッチ %s が存在しません\\n"
 
-#: quilt/scripts/patchfns.in:916
+#: quilt/scripts/patchfns.in:936
 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 "
@@ -1296,7 +1302,7 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: quilt/scripts/patchfns.in:1001
+#: quilt/scripts/patchfns.in:1021
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 486c1b3..52fe917 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -119,7 +119,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr ""
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:559
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:579
 msgid "Patch %s is currently applied\\n"
 msgstr ""
 
@@ -397,7 +397,8 @@ msgstr ""
 
 #: quilt/import.in:22
 msgid ""
-"Usage: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchfile ...\\n"
+"Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..."
+"\\n"
 msgstr ""
 
 #: quilt/import.in:25
@@ -409,6 +410,9 @@ msgid ""
 "-p num\n"
 "\tNumber of directory levels to strip when applying (default=1)\n"
 "\n"
+"-R\n"
+"\tApply patch in reverse.\n"
+"\n"
 "-P patch\n"
 "\tPatch filename to use inside quilt. This option can only be\n"
 "\tused when importing a single patch.\n"
@@ -421,47 +425,47 @@ msgid ""
 "\tmust be specified. This option is only effective when -f is used.\n"
 msgstr ""
 
-#: quilt/import.in:68
+#: quilt/import.in:71
 msgid "Patch headers differ:\\n"
 msgstr ""
 
-#: quilt/import.in:71
+#: quilt/import.in:74
 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
 msgstr ""
 
-#: quilt/import.in:133
+#: quilt/import.in:139
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr ""
 
-#: quilt/import.in:153
+#: quilt/import.in:168
 msgid "Patch %s is applied\\n"
 msgstr ""
 
-#: quilt/import.in:162
+#: quilt/import.in:177
 msgid "Patch %s already exists in series.\\n"
 msgstr ""
 
-#: quilt/import.in:168
+#: quilt/import.in:183
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr ""
 
-#: quilt/import.in:179
+#: quilt/import.in:194
 msgid "Replacing patch %s with new version\\n"
 msgstr ""
 
-#: quilt/import.in:183
+#: quilt/import.in:198
 msgid "Importing patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:185
+#: quilt/import.in:200
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr ""
 
-#: quilt/import.in:198
+#: quilt/import.in:213
 msgid "Failed to import patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:207 quilt/refresh.in:328
+#: quilt/import.in:222 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr ""
 
@@ -611,11 +615,11 @@ msgid ""
 "-v\tVerbose operation.\n"
 msgstr ""
 
-#: quilt/pop.in:98 quilt/scripts/patchfns.in:860
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:880
 msgid "Failed to copy files to temporary directory\\n"
 msgstr ""
 
-#: quilt/pop.in:122 quilt/scripts/patchfns.in:883
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:903
 msgid "Failed to patch temporary files\\n"
 msgstr ""
 
@@ -639,7 +643,7 @@ msgstr ""
 msgid "No patch removed\\n"
 msgstr ""
 
-#: quilt/pop.in:267 quilt/scripts/patchfns.in:474
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:494
 msgid "No patches applied\\n"
 msgstr ""
 
@@ -877,27 +881,27 @@ msgstr ""
 msgid "Delivery address `%s' is invalid\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:461
+#: quilt/scripts/patchfns.in:481
 msgid "No patches in series\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:510
+#: quilt/scripts/patchfns.in:530
 msgid "Patch %s is not in series\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:538
+#: quilt/scripts/patchfns.in:558
 msgid "Patch %s is not applied\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:575
+#: quilt/scripts/patchfns.in:595
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:597
+#: quilt/scripts/patchfns.in:617
 msgid "Patch %s does not exist\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:916
+#: quilt/scripts/patchfns.in:936
 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 "
@@ -905,7 +909,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:1001
+#: quilt/scripts/patchfns.in:1021
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"