diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-06-27 20:20:58 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-06-27 20:20:58 +0000 |
| commit | cdc2a8419fb367c46447e183153e7f6ed2317be1 (patch) | |
| tree | d6bb9e797f1f1b3a49a48f248bc6fbf7d6b8de4d /po/quilt.pot | |
| parent | f13ba80fd3cbb8866459fe900758da2061b93e05 (diff) | |
| download | quilt-cdc2a8419fb367c46447e183153e7f6ed2317be1.tar.gz | |
- quilt/push.in: Fix a bug introduced with the -p ab support.
- test/dir-a-b.test: Add a regression test case for this fix.
Diffstat (limited to 'po/quilt.pot')
| -rw-r--r-- | po/quilt.pot | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 2067d0c..78b5337 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -21,7 +21,9 @@ msgid "" "--quiltrc file\n" "\tUse the specified configuration file instead of ~/.quiltrc (or\n" "\t/etc/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n" -"\tdocumentation for details about its possible contents.\n" +"\tdocumentation for details about its possible contents. The\n" +"\tspecial value \\\"-\\\" causes quilt not to read any configuration\n" +"\tfile.\n" "\n" "--version\n" "\tPrint the version number and exit immediately." @@ -117,11 +119,11 @@ msgstr "" msgid "No next patch\\n" msgstr "" -#: quilt/delete.in:95 quilt/scripts/patchfns.in:461 +#: quilt/delete.in:95 quilt/scripts/patchfns.in:475 msgid "No patches in series\\n" msgstr "" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:559 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:573 msgid "Patch %s is currently applied\\n" msgstr "" @@ -641,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:488 msgid "No patches applied\\n" msgstr "" @@ -885,23 +887,23 @@ msgstr "" msgid "Failed to rename %s to %s: %s\n" msgstr "" -#: quilt/scripts/patchfns.in:510 +#: quilt/scripts/patchfns.in:524 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:538 +#: quilt/scripts/patchfns.in:552 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:575 +#: quilt/scripts/patchfns.in:589 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:597 +#: quilt/scripts/patchfns.in:611 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:857 +#: quilt/scripts/patchfns.in:871 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 " @@ -909,7 +911,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:942 +#: quilt/scripts/patchfns.in:956 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" |