From fc62e92dc29f99abb83ba642aaff25a28ca7bda5 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com"
 <blakeross%telocity.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 31 Mar 2007 22:19:46 +0000
Subject: [PATCH] 108099, 75338 - overhaul of main menu and context menus.
 r=ben sr=hewitt a=asa/brendan

git-svn-id: svn://10.0.0.236/trunk@223404 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../en-US/chrome/mailnews/addressbook/abMainWindow.dtd     | 4 ++--
 .../locales/en-US/chrome/mailnews/mailTasksOverlay.dtd     | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
index 28c335280c8..3b837021b95 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -24,9 +24,9 @@ Rights Reserved.
 <!-- Menus:  the . means that the menu item isn't implemented yet -->
 
 <!-- File Menu -->
-<!ENTITY newCard.label                                  "New Address Book Card...">
+<!ENTITY newCard.label                                  "Address Book Card...">
 <!-- LOCALIZATION NOTE (newCard.accesskey) : DONT_TRANSLATE -->  
-<!ENTITY newCard.accesskey                              "n">  
+<!ENTITY newCard.accesskey                              "C">  
 <!ENTITY newListCmd.label                               "Mailing List...">
 <!-- LOCALIZATION NOTE (newListCmd.accesskey) : DONT_TRANSLATE -->  
 <!ENTITY newListCmd.accesskey                           "L">  
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/mailTasksOverlay.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/mailTasksOverlay.dtd
index 5b5f2d646e0..b2a8d8a91bb 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/mailTasksOverlay.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/mailTasksOverlay.dtd
@@ -13,3 +13,10 @@
 <!ENTITY taskMessenger.tooltip  "Mail &amp; Newsgroups">
 <!ENTITY taskAddressBook.tooltip  "Address Book">
 
+<!-- searchAddressesCmd is also used by addressbook -->
+<!ENTITY searchAddressesCmd.label                       "Search Addresses...">
+<!ENTITY searchAddressesCmd.accesskey                   "A">
+
+<!ENTITY searchMailCmd.label "Search Messages...">
+<!ENTITY searchMailCmd.accesskey "M">
+<!ENTITY searchMailCmd.key "f">