Bug 511308 - "make autoconfig the default new account UI" [r=bienvenu]
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -824,29 +824,31 @@
<menu id="menu_File">
<menupopup id="menu_FilePopup" onpopupshowing="file_init();">
<menu id="menu_New">
<menupopup id="menu_NewPopup" onpopupshowing="menu_new_init();">
<menuitem id="newNewMsgCmd" label="&newNewMsgCmd.label;"
accesskey="&newNewMsgCmd.accesskey;"
key="key_newMessage2"
oncommand="MsgNewMessage(null);"/>
- <menuitem id="newMailAccountMenuItem"
- label="&newMailAccountCmd.label;"
- accesskey="&newMailAccountCmd.accesskey;"
- oncommand="NewMailAccount(msgWindow);"/>
<menuitem id="menu_newFolder" label="&newFolderCmd.label;"
oncommand="gFolderTreeController.newFolder();"
accesskey="&newFolderCmd.accesskey;"/>
<menuitem id="menu_newVirtualFolder" label="&newVirtualFolderCmd.label;"
oncommand="gFolderTreeController.newVirtualFolder();"
accesskey="&newVirtualFolderCmd.accesskey;"/>
- <menuitem id="newAccountMenuItem" label="&newAccountCmd.label;"
- accesskey="&newAccountCmd.accesskey;"
- oncommand="MsgAccountWizard();"/>
+ <menuseparator id="newAccountPopupMenuSeparator"/>
+ <menuitem id="newMailAccountMenuItem"
+ label="&newEmailAccountCmd.label;"
+ accesskey="&newEmailAccountCmd.accesskey;"
+ oncommand="NewMailAccount(msgWindow);"/>
+ <menuitem id="newAccountMenuItem"
+ label="&newOtherAccountsCmd.label;"
+ accesskey="&newOtherAccountsCmd.accesskey;"
+ oncommand="MsgAccountWizard();"/>
<menuseparator id="newPopupMenuSeparator"/>
<menuitem id="menu_newCard"/>
</menupopup>
</menu>
<menuitem id="openMessageFileMenuitem" label="&openMessageFileCmd.label;"
accesskey="&openMessageFileCmd.accesskey;"
oncommand="MsgOpenFromFile();"/>
<menu id="fileAttachmentMenu" label="&openAttachmentCmd.label;" accesskey="&openAttachmentCmd.accesskey;" disabled="true" persist="hidden">
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -4,20 +4,20 @@
<!-- File Menu -->
<!ENTITY newFolderCmd.label "Folder…">
<!ENTITY newFolderCmd.accesskey "F">
<!ENTITY closeTabCmd.label "Close Tab">
<!ENTITY closeTabCmd.accesskey "e">
<!ENTITY newVirtualFolderCmd.label "Saved Search…">
<!ENTITY newVirtualFolderCmd.accesskey "S">
-<!ENTITY newAccountCmd.label "Account…">
-<!ENTITY newAccountCmd.accesskey "A">
-<!ENTITY newMailAccountCmd.label "Mail Account (Quick Setup)…">
-<!ENTITY newMailAccountCmd.accesskey "Q">
+<!ENTITY newOtherAccountsCmd.label "Other Accounts…">
+<!ENTITY newOtherAccountsCmd.accesskey "O">
+<!ENTITY newEmailAccountCmd.label "Mail Account…">
+<!ENTITY newEmailAccountCmd.accesskey "A">
<!ENTITY openMessageFileCmd.label "Open Saved Message…">
<!ENTITY openMessageFileCmd.accesskey "O">
<!ENTITY openAttachmentCmd.label "Attachments">
<!ENTITY openAttachmentCmd.accesskey "A">
<!ENTITY saveAsMenu.label "Save As">
<!ENTITY saveAsMenu.accesskey "S">
<!ENTITY saveAsFileCmd.label "File">
<!ENTITY saveAsFileCmd.accesskey "F">