Index: evolution/ui/evolution-mail-message.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-message.xml,v
retrieving revision 1.76
diff -u -p -r1.76 evolution-mail-message.xml
--- evolution/ui/evolution-mail-message.xml	17 Aug 2005 14:35:32 -0000	1.76
+++ evolution/ui/evolution-mail-message.xml	23 Sep 2005 14:35:38 -0000
@@ -45,17 +45,17 @@
      accel="*Control*bracketleft"/>
 
     <cmd name="MessageApplyFilters"
-     _tip="Apply filter rules to the selected messages"
+     _tip="Apply filter rules to the selected message(s)"
      accel="*Control*y"
      pixtype="pixbuf"/>
 
     <cmd name="MessageCopy"
-     _tip="Copy selected messages to another folder"
+     _tip="Copy selected message(s) to another folder"
      accel="*Control**Shift*y"
      pixtype="pixbuf"/>
 
     <cmd name="MessageDelete"
-     _tip="Mark the selected messages for deletion"
+     _tip="Mark the selected message(s) for deletion"
      accel="*Control*d"
      pixtype="stock" pixname="gtk-delete"/>
 
@@ -65,21 +65,10 @@
      pixtype="pixbuf"/>
 
     <cmd name="MessageForward"
-     _tip="Forward the selected message to someone"
+     _tip="Forward the selected message(s) to someone"
      accel="*Control*f"
      pixtype="pixbuf"/>
 
-    <cmd name="MessageForwardAttached"
-     _tip="Forward the selected message to someone as an attachment"
-     accel="*Control*j"/>
-
-    <cmd name="MessageForwardInline"
-     _tip="Forward the selected message in the body of a new message"
-     accel="*Control**Shift*j"/>
-
-    <cmd name="MessageForwardQuoted"
-     _tip="Forward the selected message quoted like a reply"/>
-
     <cmd name="MessageMarkAsRead"
      _tip="Mark the selected message(s) as having been read"
      accel="*Control*k"
@@ -106,7 +95,7 @@
      pixtype="pixbuf"/>
 
     <cmd name="MessageFilterJunk"
-     _tip="Filter the selected messages for junk status"
+     _tip="Filter the selected message(s) for junk status"
      pixtype="pixbuf"/>
 
     <cmd name="MailCompose"
@@ -120,10 +109,10 @@
      pixtype="pixbuf"/>
 
     <cmd name="MessageEdit"
-     _tip="Open the selected message in the composer for editing"/>
+     _tip="Open the selected message(s) in the composer for editing"/>
 
     <cmd name="MessageOpen"
-     _tip="Open the selected message in a new window"
+     _tip="Open the selected message(s) in a new window"
      accel="*Control*o"
      pixtype="pixbuf"/>
 
@@ -154,7 +143,7 @@
      pixtype="pixbuf"/>
 
     <cmd name="MessageSaveAs"
-     _tip="Save the message as a text file"
+     _tip="Save the message(s) as a text file"
      accel="*Control*s"
      pixtype="stock" pixname="gtk-save-as"/>
 
@@ -164,7 +153,7 @@
      pixtype="stock" pixname="gtk-find"/>
 
     <cmd name="MessageUndelete"
-     _tip="Un-delete the selected messages"
+     _tip="Undelete the selected message(s)"
      accel="*Control**Shift*d"
      pixtype="stock" pixname="gtk-undelete"/>
 
@@ -211,7 +200,7 @@
      _tip="Create a Search Folder for this subject"/>
 
     <cmd name="ViewFullHeaders"
-     _tip="Show message with all email headers"
+     _tip="Show message(s) with all email headers"
      type="toggle" state="0"/>
 
     <cmd name="ViewLoadImages"
