- quilt/mail.in: Remove stray getopt line. If --subject is given,

  actually fill in the subject in the message template.

1 files changed, 17 insertions, 13 deletions

diff --git a/po/quilt.pot b/po/quilt.pot
index 4a7fc1f..ee730e5 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -46,16 +46,16 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr ""
 
-#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:109 quilt/diff.in:160
-#: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
-#: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
-#: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
-#: quilt/unapplied.in:62
+#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62
+#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116
+#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:246 quilt/previous.in:62
+#: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53
+#: quilt/rename.in:63 quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr ""
 
-#: quilt/add.in:99 quilt/diff.in:239 quilt/graph.in:121 quilt/pop.in:261
-#: quilt/refresh.in:154 quilt/remove.in:74
+#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121
+#: quilt/pop.in:261 quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr ""
 
@@ -87,14 +87,18 @@ msgid "File %s added to patch %s\\n"
 msgstr ""
 
 #: quilt/annotate.in:22
-msgid "Usage: quilt annotate {file}\\n"
+msgid "Usage: quilt [-p patch] annotate {file}\\n"
 msgstr ""
 
 #: quilt/annotate.in:25
 msgid ""
 "\n"
 "Print an annotated listing of the specified file showing which\n"
-"patches modify which lines.\n"
+"patches modify which lines. Only applied patches are included.\n"
+"\n"
+"-p patch\n"
+"\tStop checking for changes at the specified rather than the\n"
+"\ttopmost patch.\n"
 msgstr ""
 
 #: quilt/applied.in:22
@@ -244,11 +248,11 @@ msgstr ""
 msgid "More recent patches modify files in patch %s\\n"
 msgstr ""
 
-#: quilt/edit.in:13
+#: quilt/edit.in:24
 msgid "Usage: quilt edit file ...\\n"
 msgstr ""
 
-#: quilt/edit.in:16
+#: quilt/edit.in:27
 msgid ""
 "\n"
 "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n"
@@ -965,7 +969,7 @@ msgstr ""
 msgid "Failed to rename %s to %s: %s\n"
 msgstr ""
 
-#: scripts/patchfns.in:733
+#: scripts/patchfns.in:727
 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 "
@@ -973,7 +977,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: scripts/patchfns.in:810
+#: scripts/patchfns.in:812
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"