diff options
author | Jean Delvare <khali@linux-fr.org> | 2007-02-21 20:34:50 +0000 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2007-02-21 20:34:50 +0000 |
commit | 231705824f9bd2dbab1d5e8fa296668924f72c52 (patch) | |
tree | 56d5aac5b42cc8ad193bd79672b3d40b17ba8f4c /po/quilt.pot | |
parent | db51d46f254b07e68a079577cbc2b66f64efaadd (diff) | |
download | quilt-231705824f9bd2dbab1d5e8fa296668924f72c52.tar.gz |
- quilt/import.in, quilt/scripts/patchfns.in: Implement import -R
for reverse-applying a patch. Original patch contributed by
Randy Dunlap.
Diffstat (limited to 'po/quilt.pot')
-rw-r--r-- | po/quilt.pot | 50 |
1 files changed, 27 insertions, 23 deletions
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" |