Bug 286108: Remove/change double entities; p=p.franc@gmail.com, r=gandalf,a=bsmedberg

mail/base/content/mailWindowOverlay.xul

@@ -1956,7 +1956,7 @@
     <image id="junkBarImage"/>
     <description flex="1" class="msgNotificationBarText">&junkBarMessage.label;</description>
     <spacer flex="1"/>
-    <button label="&notJunkButton.label;" oncommand="JunkSelectedMessages(false);"/>
+    <button label="&junkBarButton.label;" oncommand="JunkSelectedMessages(false);"/>
   </hbox>
 
   <hbox id="remoteContentBar" class="msgNotificationBar" align="center">

mail/locales/en-US/chrome/messenger/messenger.dtd

@@ -10,8 +10,6 @@
 <!ENTITY newAccountCmd.label "Account...">
 <!ENTITY newAccountCmd.accesskey "A">
 <!ENTITY openMessageMenu.label "Open">
-<!ENTITY openMessageWindowCmd.label "Open Message">
-<!ENTITY openMessageWindowCmd.accesskey "s">
 <!ENTITY openMessageFileCmd.label "Open Saved Message...">
 <!ENTITY openMessageFileCmd.accesskey "O">
 <!ENTITY openAttachmentCmd.label "Attachments">
@@ -249,6 +247,8 @@
 <!ENTITY searchMailCmd.label "Search Messages...">
 <!ENTITY searchMailCmd.accesskey "M">
 <!ENTITY searchMailCmd.key "f">
+<!ENTITY searchAddressesCmd.label "Search Addresses...">
+<!ENTITY searchAddressesCmd.accesskey "S">
 
 <!-- Go Menu -->
 <!ENTITY goMenu.label "Go">
@@ -395,11 +395,6 @@
 <!ENTITY addressBookCmd.label "Address Book">  
 <!ENTITY addressBookCmd.accesskey "a">
 <!ENTITY addressBookCmd.commandkey "2">
-<!ENTITY searchMailCmd.label "Search Messages...">
-<!ENTITY searchMailCmd.accesskey "e">
-<!ENTITY searchMailCmd.key "f">
-<!ENTITY searchAddressesCmd.label "Search Addresses...">
-<!ENTITY searchAddressesCmd.accesskey "S">
 <!ENTITY junkMailCmd.label "Junk Mail Controls...">
 <!ENTITY junkMailCmd.accesskey "J">
 <!ENTITY runJunkControls.label "Run Junk Mail Controls on Folder">
@@ -464,8 +459,6 @@
 <!-- Folder Pane -->
 <!ENTITY folderPaneHeader.label "Folders">
 <!ENTITY folderColumn.label "Name">
-<!ENTITY unreadColumn.label "Unread">
-<!ENTITY totalColumn.label "Total">
 <!ENTITY folderSizeColumn.label "Size">
 
 <!-- Folder Pane Context Menu -->
@@ -595,7 +588,7 @@
 
 <!-- Junk Bar -->
 <!ENTITY junkBarMessage.label "&brandShortName; thinks this message is junk.">
-<!ENTITY notJunkButton.label "This is Not Junk">
+<!ENTITY junkBarButton.label "This is Not Junk">
 <!ENTITY junkInfoButton.label "?">
 
 <!-- Remote Content Bar -->

mail/locales/en-US/chrome/messenger/preferences/downloads.dtd

@@ -16,9 +16,6 @@
 <!ENTITY configureActions.accesskey   "V">
 <!ENTITY fileTypesDescription.label   "&brandShortName; can automatically save or open attachments of certain types.">
 
-<!ENTITY fileTypes.label              "File Types">
-<!-- XXX this text string could improve --> 
-<!ENTITY fileTypesDescription.label   "Automatically perform the associated action with each of the following file types:">
 <!ENTITY fileTypeColName.label        "File Type">
 <!ENTITY fileHandlerColName.label     "Application">
 <!ENTITY editFileHandler.label        "Change Action...">