summaryrefslogtreecommitdiffstats
path: root/po/quilt.pot
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2004-08-11 06:56:14 +0000
committerAndreas Gruenbacher <agruen@suse.de>2004-08-11 06:56:14 +0000
commit43aa979ee8baa61370731e8aa73023123126752f (patch)
treeb3bc80d80c51b2971f81949565804bf365fc4f7d /po/quilt.pot
parent136d596201b1298da493b5190940cd5ea5d4c0db (diff)
downloadquilt-43aa979ee8baa61370731e8aa73023123126752f.tar.gz
- Fix wrong pop command help text.
Diffstat (limited to 'po/quilt.pot')
-rw-r--r--po/quilt.pot25
1 files changed, 13 insertions, 12 deletions
diff --git a/po/quilt.pot b/po/quilt.pot
index 5d2b40c..c95e75e 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -36,20 +36,20 @@ msgstr ""
#: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76
#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/files.in:69
-#: ../quilt/next.in:62 ../quilt/pop.in:128 ../quilt/previous.in:62
+#: ../quilt/next.in:62 ../quilt/pop.in:129 ../quilt/previous.in:62
#: ../quilt/push.in:145 ../quilt/refresh.in:129 ../quilt/remove.in:53
#: ../quilt/unapplied.in:62
msgid "Patch %s is not in series\\n"
msgstr ""
#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/files.in:89
-#: ../quilt/pop.in:149 ../quilt/refresh.in:135 ../quilt/remove.in:74
+#: ../quilt/pop.in:150 ../quilt/refresh.in:135 ../quilt/remove.in:74
msgid "Patch %s is not applied\\n"
msgstr ""
#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
#: ../quilt/files.in:76 ../quilt/fold.in:79 ../quilt/fork.in:65
-#: ../quilt/pop.in:184 ../quilt/push.in:182 ../quilt/push.in:220
+#: ../quilt/pop.in:185 ../quilt/push.in:182 ../quilt/push.in:221
#: ../quilt/refresh.in:143 ../quilt/remove.in:81
msgid "No patches applied\\n"
msgstr ""
@@ -376,11 +376,12 @@ msgstr ""
#: ../quilt/pop.in:25
msgid ""
"\n"
-"Remove patch(es) from the series file. Without options, the topmost\n"
-"patch is removed. When a number is specified, remove the specified\n"
-"number of patches. When a patch name is specified, remove all patches\n"
-"up to and including the specified patch. Patch names may include the\n"
-"patches/ prefix, which means that filename completion can be used.\n"
+"Remove patch(es) from the stack of applied patches. Without options,\n"
+"the topmost patch is removed. When a number is specified, remove the\n"
+"specified number of patches. When a patch name is specified, remove all\n"
+"patches up to and including the specified patch. Patch names may\n"
+"include the patches/ prefix, which means that filename completion can be\n"
+"used.\n"
"\n"
"-a\tRemove all applied patches.\n"
"\n"
@@ -395,15 +396,15 @@ msgid ""
"-v\tVerbose operation.\n"
msgstr ""
-#: ../quilt/pop.in:159
+#: ../quilt/pop.in:160
msgid "No patch removed\\n"
msgstr ""
-#: ../quilt/pop.in:175 ../quilt/push.in:211
+#: ../quilt/pop.in:176 ../quilt/push.in:212
msgid "Interrupted by user\\n"
msgstr ""
-#: ../quilt/pop.in:191 ../quilt/push.in:222
+#: ../quilt/pop.in:192 ../quilt/push.in:223
msgid "Now at patch %s\\n"
msgstr ""
@@ -720,7 +721,7 @@ msgid "Usage: %s [-fRq] patchname\\n"
msgstr ""
#: ../scripts/rpatch.in:100
-msgid "Patch %s does not remove cleanly (enforce with -f)\\n"
+msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
msgstr ""
#: ../scripts/rpatch.in:123