Clean up some text. Closes: #2466.

diff --git a/OPS b/OPS
index 1db524a8a1da24becf801591a41cabd5b74a72b4..27d1fa1c9d54c5301c5eeb23f8b1d88782cfbdd5 100644 (file)
--- a/OPS
+++ b/OPS
@@ -9,12 +9,12 @@ OP_BROWSER_NEW_FILE "select a new file in this directory"
 OP_BROWSER_VIEW_FILE "view file"
 OP_BROWSER_TELL "display the currently selected file's name"
 OP_BROWSER_SUBSCRIBE "subscribe to current mailbox (IMAP only)"
-OP_BROWSER_UNSUBSCRIBE "unsubscribe to current mailbox (IMAP only)"
+OP_BROWSER_UNSUBSCRIBE "unsubscribe from current mailbox (IMAP only)"
 OP_BROWSER_TOGGLE_LSUB "toggle view all/subscribed mailboxes (IMAP only)"
 OP_BUFFY_LIST "list mailboxes with new mail"
 OP_CHANGE_DIRECTORY "change directories"
 OP_CHECK_NEW "check mailboxes for new mail"
-OP_COMPOSE_ATTACH_FILE "attach a file(s) to this message"
+OP_COMPOSE_ATTACH_FILE "attach file(s) to this message"
 OP_COMPOSE_ATTACH_MESSAGE "attach message(s) to this message"
 OP_COMPOSE_EDIT_BCC "edit the BCC list"
 OP_COMPOSE_EDIT_CC "edit the CC list"

diff --git a/OPS.PGP b/OPS.PGP
index 8ab7eb1deaa7eb35f2a362d31296b1ecd9af11c3..0558ed79e17155ec0de7dacd0fda82139a88e7d0 100644 (file)
--- a/OPS.PGP
+++ b/OPS.PGP
@@ -3,4 +3,4 @@ OP_COMPOSE_PGP_MENU "show PGP options"
 OP_MAIL_KEY "mail a PGP public key"
 OP_VERIFY_KEY "verify a PGP public key"
 OP_VIEW_ID "view the key's user id"
-OP_CHECK_TRADITIONAL "check for classic pgp"
+OP_CHECK_TRADITIONAL "check for classic PGP"

diff --git a/doc/manual.xml.tail b/doc/manual.xml.tail
index f3626f4602a0b2e8c2a2920329e63ef9fec1c96c..631d2de25e3e7afd1481f636a5ca3400392defd9 100644 (file)
--- a/doc/manual.xml.tail
+++ b/doc/manual.xml.tail
@@ -84,7 +84,7 @@ bindings for all menus (except as noted).
 <row><entry>bounce-message</entry><entry>b</entry><entry>remail a message to another user</entry></row>
 <row><entry>change-folder</entry><entry>c</entry><entry>open a different folder</entry></row>
 <row><entry>change-folder-readonly</entry><entry>ESC c</entry><entry>open a different folder in read only mode</entry></row>
-<row><entry>check-traditional-pgp</entry><entry>ESC P</entry><entry>check for classic pgp</entry></row>
+<row><entry>check-traditional-pgp</entry><entry>ESC P</entry><entry>check for classic PGP</entry></row>
 <row><entry>clear-flag</entry><entry>W</entry><entry>clear a status flag from a message</entry></row>
 <row><entry>copy-message</entry><entry>C</entry><entry>copy a message to a file/mailbox</entry></row>
 <row><entry>create-alias</entry><entry>a</entry><entry>create an alias from a message sender</entry></row>
@@ -174,7 +174,7 @@ bindings for all menus (except as noted).
 <row><entry>bounce-message</entry><entry>b</entry><entry>remail a message to another user</entry></row>
 <row><entry>change-folder</entry><entry>c</entry><entry>open a different folder</entry></row>
 <row><entry>change-folder-readonly</entry><entry>ESC c</entry><entry>open a different folder in read only mode</entry></row>
-<row><entry>check-traditional-pgp</entry><entry>ESC P</entry><entry>check for classic pgp</entry></row>
+<row><entry>check-traditional-pgp</entry><entry>ESC P</entry><entry>check for classic PGP</entry></row>
 <row><entry>copy-message</entry><entry>C</entry><entry>copy a message to a file/mailbox</entry></row>
 <row><entry>create-alias</entry><entry>a</entry><entry>create an alias from a message sender</entry></row>
 <row><entry>decode-copy</entry><entry>ESC C</entry><entry>decode a message and copy it to a file/mailbox</entry></row>
@@ -440,7 +440,7 @@ bindings for all menus (except as noted).
 <row><entry>toggle-mailboxes</entry><entry>TAB</entry><entry>toggle whether to browse mailboxes or all files</entry></row>
 <row><entry>view-file</entry><entry>SPACE</entry><entry>view file</entry></row>
 <row><entry>subscribe</entry><entry>s</entry><entry>subscribe to current mailbox (IMAP Only)</entry></row>
-<row><entry>unsubscribe</entry><entry>u</entry><entry>unsubscribe to current mailbox (IMAP Only)</entry></row>
+<row><entry>unsubscribe</entry><entry>u</entry><entry>unsubscribe from current mailbox (IMAP Only)</entry></row>
 <row><entry>toggle-subscribed</entry><entry>T</entry><entry>toggle view all/subscribed mailboxes (IMAP Only)</entry></row>
 </tbody>
 </tgroup>
@@ -451,12 +451,12 @@ bindings for all menus (except as noted).
 </sect2>
 
 <sect2>
-<title>pgp</title>
+<title>PGP</title>
 
 <para>
 
 <table>
-<title>Default pgp menu function bindings</title>
+<title>Default PGP menu function bindings</title>
 <tgroup cols="3">
 <thead>
 <row><entry>Function</entry><entry>Default key</entry><entry>Description</entry></row>

diff --git a/pgpkey.c b/pgpkey.c
index a83542eb172bf178f1782addc5e9cd6f27a240f1..96248eb94292aad847b3746efb8d8f8a1a51344d 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -749,7 +749,7 @@ BODY *pgp_make_key_attachment (char *tempf)
     return NULL;
   }
 
-  mutt_message _("Invoking pgp...");
+  mutt_message _("Invoking PGP...");
 
   
   if ((thepid =