diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-04-15 12:43:15 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2006-04-15 12:43:15 +0000 |
| commit | 785167244689ec57f068011b9390be509f58e1fb (patch) | |
| tree | 83804971f0173dda7d13e8a4be6cd98fe4d01646 /po/quilt.pot | |
| parent | b91802032a0ab98fc306a02f6c70ccb1be0edc67 (diff) | |
| download | quilt-785167244689ec57f068011b9390be509f58e1fb.tar.gz | |
- quilt/scripts/patchfns.in: Fix broken return in function
find_applied_patch, which was causing a bogus error message
on failed pop.
- test/three.test: Test failed pop.
Diffstat (limited to 'po/quilt.pot')
| -rw-r--r-- | po/quilt.pot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 95f3fa2..7e006e9 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -121,7 +121,7 @@ msgstr "" msgid "No patches in series\\n" msgstr "" -#: quilt/delete.in:101 quilt/scripts/patchfns.in:539 +#: quilt/delete.in:101 quilt/scripts/patchfns.in:540 msgid "Patch %s is currently applied\\n" msgstr "" @@ -881,19 +881,19 @@ msgstr "" msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:518 +#: quilt/scripts/patchfns.in:519 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:555 +#: quilt/scripts/patchfns.in:556 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:577 +#: quilt/scripts/patchfns.in:578 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:832 +#: quilt/scripts/patchfns.in:833 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 " @@ -901,7 +901,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:917 +#: quilt/scripts/patchfns.in:918 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" |