From 30870bd7cd1daa0c3a68df5e8f08c1c44542d70d Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@suse.de>
Date: Wed, 11 Aug 2004 12:32:14 +0000
Subject: - Merge improvement to files command from Dean Roehrich: Allow to  
 list all files modified, or all files modified by a range of   patches. - Fix
 pop command help.

---
 po/quilt.pot | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'po/quilt.pot')

diff --git a/po/quilt.pot b/po/quilt.pot
index 1f815e3..09c3038 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -35,20 +35,19 @@ msgid ""
 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:129 ../quilt/previous.in:62
-#: ../quilt/push.in:145 ../quilt/refresh.in:129 ../quilt/remove.in:53
-#: ../quilt/unapplied.in:62
+#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../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:150 ../quilt/refresh.in:135 ../quilt/remove.in:74
+#: ../quilt/add.in:75 ../quilt/diff.in:221 ../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/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65
 #: ../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"
@@ -161,7 +160,7 @@ msgstr ""
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 
-#: ../quilt/diff.in:275
+#: ../quilt/diff.in:275 ../quilt/files.in:122
 msgid "Patch %s not applied before patch %s\\n"
 msgstr ""
 
@@ -209,7 +208,7 @@ msgid ""
 msgstr ""
 
 #: ../quilt/files.in:22
-msgid "Usage: quilt files [-v] [patch]\\n"
+msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n"
 msgstr ""
 
 #: ../quilt/files.in:25
@@ -217,11 +216,21 @@ msgid ""
 "\n"
 "Print the list of files that the topmost or specified patch changes.\n"
 "\n"
+"-a\tList all files in all applied patches.\n"
+"\n"
+"-l\tAdd patch name to output.\n"
+"\n"
 "-v\tVerbose, more user friendly output.\n"
+"\n"
+"--combine patch\n"
+"\tCreate a listing for all patches between this patch and\n"
+"\tthe topmost applied patch. A patch name of \\\"-\\\" is equivalent\n"
+"\tto specifying the first applied patch.\n"
+"\n"
 msgstr ""
 
-#: ../quilt/files.in:85
-msgid "Patch %s is not applied (no verbose output)\\n"
+#: ../quilt/files.in:76 ../quilt/files.in:96
+msgid "Patch %s is not in series file\\n"
 msgstr ""
 
 #: ../quilt/fold.in:22
@@ -374,10 +383,10 @@ msgid ""
 "\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"
+"specified number of patches.  When a patch name is specified, remove\n"
+"patches until the specified patch end up on top of the stack.  Patch\n"
+"names may include the patches/ prefix, which means that filename\n"
+"completion can be used.\n"
 "\n"
 "-a\tRemove all applied patches.\n"
 "\n"
-- 
cgit