- quilt/delete.in: Add options -r (remove patch file) and --backup

  (backup rather than remove.) Patch from Joe Green.

4 files changed, 97 insertions, 31 deletions

diff --git a/po/de.po b/po/de.po
index 46530b4..a2399fb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -82,7 +82,7 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n"
 
-#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:97 quilt/diff.in:160
+#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:109 quilt/diff.in:160
 #: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
 #: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
 #: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
@@ -95,7 +95,7 @@ msgstr "Patch %s ist nicht in der series-Datei enthalten\\n"
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
 
-#: quilt/add.in:106 quilt/delete.in:76 quilt/diff.in:247 quilt/files.in:103
+#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:247 quilt/files.in:103
 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142
 #: quilt/pop.in:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81
 #: quilt/rename.in:85
@@ -155,10 +155,11 @@ msgid "Patch is not applied\\n"
 msgstr "Patch ist nicht angewandt\\n"
 
 #: quilt/delete.in:22
-msgid "Usage: quilt delete [patch | -n]\\n"
-msgstr "Verwendung: quilt delete [patch | -n]\\n"
+msgid "Usage: quilt delete [-r] [--backup] [patch | -n]\\n"
+msgstr "Verwendung: quilt delete [-r] [--backup] [patch | -n]\\n"
 
 #: quilt/delete.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove the specified or topmost patch from the series file.  If the\n"
@@ -167,6 +168,12 @@ msgid ""
 "\n"
 "-n\tDelete the next patch after topmost, rather than the specified\n"
 "\tor topmost patch.\n"
+"\n"
+"-r\tRemove the deleted patch file from the patches directory as well.\n"
+"\n"
+"--backup\n"
+"\tRename the patch file to patch~ rather than deleting it.\n"
+"\tIgnored if not used with \\\"-r\\\".\n"
 msgstr ""
 "\n"
 "Löscht den obersten oder angegebenen Patch aus der series-Datei. Falls\n"
@@ -176,22 +183,32 @@ msgstr ""
 "-n\tLösche den nächsten (dem obersten folgenden) Patch statt des obersten\n"
 "\toder angegebenen.\n"
 
-#: quilt/delete.in:88
+#: quilt/delete.in:100
 msgid "No next patch\\n"
 msgstr "Kein Patch %s\\n"
 
-#: quilt/delete.in:106
+#: quilt/delete.in:118
 msgid "Patch %s is currently applied\\n"
 msgstr "Patch %s ist momentan angewandt\\n"
 
-#: quilt/delete.in:113
+#: quilt/delete.in:125
 msgid "Removed patch %s\\n"
 msgstr "Entferne Patch %s\\n"
 
-#: quilt/delete.in:115
+#: quilt/delete.in:127
 msgid "Failed to remove patch %s\\n"
 msgstr "Konnte Patch %s nicht entfernen\\n"
 
+#: quilt/delete.in:138
+#, fuzzy
+msgid "Failed to backup patch file \\\"%s\\\"\\n"
+msgstr "Konnte Datei %s nicht sichern\\n"
+
+#: quilt/delete.in:145
+#, fuzzy
+msgid "Failed to remove patch file \\\"%s\\\"\\n"
+msgstr "Konnte Patch %s nicht entfernen\\n"
+
 #: quilt/diff.in:24
 msgid ""
 "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
diff --git a/po/fr.po b/po/fr.po
index 6afa2cf..ce4d0b9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -82,7 +82,7 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "Le fichier %s est situé en dessous de %s\\n"
 
-#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:97 quilt/diff.in:160
+#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:109 quilt/diff.in:160
 #: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
 #: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
 #: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
@@ -95,7 +95,7 @@ msgstr "Le patch %s n'est pas dans la série\\n"
 msgid "Patch %s is not applied\\n"
 msgstr "Le patch %s n'est pas appliqué\\n"
 
-#: quilt/add.in:106 quilt/delete.in:76 quilt/diff.in:247 quilt/files.in:103
+#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:247 quilt/files.in:103
 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142
 #: quilt/pop.in:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81
 #: quilt/rename.in:85
@@ -155,10 +155,11 @@ msgid "Patch is not applied\\n"
 msgstr "Le patch n'est pas appliqué\\n"
 
 #: quilt/delete.in:22
-msgid "Usage: quilt delete [patch | -n]\\n"
-msgstr "Usage : quilt delete [patch | -n]\\n"
+msgid "Usage: quilt delete [-r] [--backup] [patch | -n]\\n"
+msgstr "Usage : quilt delete [-r] [--backup] [patch | -n]\\n"
 
 #: quilt/delete.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove the specified or topmost patch from the series file.  If the\n"
@@ -167,6 +168,12 @@ msgid ""
 "\n"
 "-n\tDelete the next patch after topmost, rather than the specified\n"
 "\tor topmost patch.\n"
+"\n"
+"-r\tRemove the deleted patch file from the patches directory as well.\n"
+"\n"
+"--backup\n"
+"\tRename the patch file to patch~ rather than deleting it.\n"
+"\tIgnored if not used with \\\"-r\\\".\n"
 msgstr ""
 "\n"
 "Efface le patch spécifié (ou celui au sommet de la pile) de la série \n"
@@ -176,22 +183,32 @@ msgstr ""
 "-n\tEfface le patch qui suit celui qui est au sommet, au lieu du\n"
 "\tpatch spécifié ou de celui qui est au sommet.\n"
 
-#: quilt/delete.in:88
+#: quilt/delete.in:100
 msgid "No next patch\\n"
 msgstr "Pas de patch suivant\\n"
 
-#: quilt/delete.in:106
+#: quilt/delete.in:118
 msgid "Patch %s is currently applied\\n"
 msgstr "Le patch %s est actuellement appliqué\\n"
 
-#: quilt/delete.in:113
+#: quilt/delete.in:125
 msgid "Removed patch %s\\n"
 msgstr "Patch %s retiré\\n"
 
-#: quilt/delete.in:115
+#: quilt/delete.in:127
 msgid "Failed to remove patch %s\\n"
 msgstr "Impossible de retirer le patch %s\\n"
 
+#: quilt/delete.in:138
+#, fuzzy
+msgid "Failed to backup patch file \\\"%s\\\"\\n"
+msgstr "Impossible de faire une copie de sécurité de %s\\n"
+
+#: quilt/delete.in:145
+#, fuzzy
+msgid "Failed to remove patch file \\\"%s\\\"\\n"
+msgstr "Impossible de retirer le patch %s\\n"
+
 #: quilt/diff.in:24
 msgid ""
 "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
diff --git a/po/ja.po b/po/ja.po
index a748a0c..ef9a761 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -80,7 +80,7 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "ファイル \\`%s'��\\`%s'以下��り��\\n"
 
-#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:97 quilt/diff.in:160
+#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:109 quilt/diff.in:160
 #: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
 #: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
 #: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
@@ -93,7 +93,7 @@ msgstr "パッ� %s � series�中��り��ん\\n"
 msgid "Patch %s is not applied\\n"
 msgstr "パッ� %s ��用�れ����ん\\n"
 
-#: quilt/add.in:106 quilt/delete.in:76 quilt/diff.in:247 quilt/files.in:103
+#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:247 quilt/files.in:103
 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142
 #: quilt/pop.in:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81
 #: quilt/rename.in:85
@@ -153,10 +153,12 @@ msgid "Patch is not applied\\n"
 msgstr "パッ���用�れ����ん\\n"
 
 #: quilt/delete.in:22
-msgid "Usage: quilt delete [patch | -n]\\n"
-msgstr "使�方: quilt delete [パッ� | -n]\\n"
+#, fuzzy
+msgid "Usage: quilt delete [-r] [--backup] [patch | -n]\\n"
+msgstr "使�方: quilt delete [-r] [--backup] [パッ� | -n]\\n"
 
 #: quilt/delete.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove the specified or topmost patch from the series file.  If the\n"
@@ -165,6 +167,12 @@ msgid ""
 "\n"
 "-n\tDelete the next patch after topmost, rather than the specified\n"
 "\tor topmost patch.\n"
+"\n"
+"-r\tRemove the deleted patch file from the patches directory as well.\n"
+"\n"
+"--backup\n"
+"\tRename the patch file to patch~ rather than deleting it.\n"
+"\tIgnored if not used with \\\"-r\\\".\n"
 msgstr ""
 "\n"
 "指定�れ�パッ�����最上��パッ�をシリーズファイル�ら削除���。\n"
@@ -174,22 +182,32 @@ msgstr ""
 "-n\t最上�パッ�や指定�れ�パッ������最上�パッ��次�パッ�を\n"
 "\t削除���。\n"
 
-#: quilt/delete.in:88
+#: quilt/delete.in:100
 msgid "No next patch\\n"
 msgstr "次�パッ���り��ん"
 
-#: quilt/delete.in:106
+#: quilt/delete.in:118
 msgid "Patch %s is currently applied\\n"
 msgstr "パッ� %s ��在�用�れ����。\\n"
 
-#: quilt/delete.in:113
+#: quilt/delete.in:125
 msgid "Removed patch %s\\n"
 msgstr "パッ� %s �削除�れ���\\n"
 
-#: quilt/delete.in:115
+#: quilt/delete.in:127
 msgid "Failed to remove patch %s\\n"
 msgstr "パッ� %s を削除�る���失敗����。\\n"
 
+#: quilt/delete.in:138
+#, fuzzy
+msgid "Failed to backup patch file \\\"%s\\\"\\n"
+msgstr "ファイル %s ��ックアップ�失敗����\\n"
+
+#: quilt/delete.in:145
+#, fuzzy
+msgid "Failed to remove patch file \\\"%s\\\"\\n"
+msgstr "パッ� %s を削除�る���失敗����。\\n"
+
 #: quilt/diff.in:24
 msgid ""
 "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
diff --git a/po/quilt.pot b/po/quilt.pot
index d5bb012..38c841b 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -46,7 +46,7 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr ""
 
-#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:97 quilt/diff.in:160
+#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:109 quilt/diff.in:160
 #: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
 #: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
 #: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
@@ -59,7 +59,7 @@ msgstr ""
 msgid "Patch %s is not applied\\n"
 msgstr ""
 
-#: quilt/add.in:106 quilt/delete.in:76 quilt/diff.in:247 quilt/files.in:103
+#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:247 quilt/files.in:103
 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142
 #: quilt/pop.in:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81
 #: quilt/rename.in:85
@@ -113,7 +113,7 @@ msgid "Patch is not applied\\n"
 msgstr ""
 
 #: quilt/delete.in:22
-msgid "Usage: quilt delete [patch | -n]\\n"
+msgid "Usage: quilt delete [-r] [--backup] [patch | -n]\\n"
 msgstr ""
 
 #: quilt/delete.in:25
@@ -125,24 +125,38 @@ msgid ""
 "\n"
 "-n\tDelete the next patch after topmost, rather than the specified\n"
 "\tor topmost patch.\n"
+"\n"
+"-r\tRemove the deleted patch file from the patches directory as well.\n"
+"\n"
+"--backup\n"
+"\tRename the patch file to patch~ rather than deleting it.\n"
+"\tIgnored if not used with \\\"-r\\\".\n"
 msgstr ""
 
-#: quilt/delete.in:88
+#: quilt/delete.in:100
 msgid "No next patch\\n"
 msgstr ""
 
-#: quilt/delete.in:106
+#: quilt/delete.in:118
 msgid "Patch %s is currently applied\\n"
 msgstr ""
 
-#: quilt/delete.in:113
+#: quilt/delete.in:125
 msgid "Removed patch %s\\n"
 msgstr ""
 
-#: quilt/delete.in:115
+#: quilt/delete.in:127
 msgid "Failed to remove patch %s\\n"
 msgstr ""
 
+#: quilt/delete.in:138
+msgid "Failed to backup patch file \\\"%s\\\"\\n"
+msgstr ""
+
+#: quilt/delete.in:145
+msgid "Failed to remove patch file \\\"%s\\\"\\n"
+msgstr ""
+
 #: quilt/diff.in:24
 msgid ""
 "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "