diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-08-26 10:20:48 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2005-08-26 10:20:48 +0000 |
| commit | 1fa42ff47b7d655f106dd654e8830091c8d6b3a3 (patch) | |
| tree | c97f7a95403fa2c9aeb1dbcfcf8d059d1c5aa8ec /po/quilt.pot | |
| parent | 398320a0614fca46140cd715dcdf7dd370357d28 (diff) | |
| download | quilt-1fa42ff47b7d655f106dd654e8830091c8d6b3a3.tar.gz | |
- quilt/delete.in: Add options -r (remove patch file) and --backup
(backup rather than remove.) Patch from Joe Green.
Diffstat (limited to 'po/quilt.pot')
| -rw-r--r-- | po/quilt.pot | 28 |
1 files changed, 21 insertions, 7 deletions
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 " |