Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port Bug #221472 to thunderbird: Move current attach items to submenu of File. Remove the vCard menu item from the Options menu since we have it under File / Attachments now.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@148159 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2003-10-20 17:11:29 +00:00
parent 3ce308d13f
commit dbce9291be
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/mail/components/compose/content/messengercompose.xul
View File

@@ -210,7 +210,8 @@
<menuitem label="&delete.label;" accesskey="&delete.accesskey;" command="cmd_delete"/>
<menuitem label="&selectAll.label;" accesskey="&selectAll.accesskey;" command="cmd_selectAll"/>
<menuseparator/>
<menuitem label="&attachFileCmd.label;" accesskey="&attachFileCmd.accesskey;" command="cmd_attachFile"/>
<menuitem label="&attachFile.label;" accesskey="&attachFile.accesskey;" command="cmd_attachFile"/>
<menuitem label="&attachPage.label;" accesskey="&attachPage.accesskey;" command="cmd_attachPage"/>
</popup>
<popup id="aTooltip" class="tooltip" onpopupshowing="return FillInTooltip(document.tooltipNode);" >
@@ -240,8 +241,14 @@
oncommand="window.openDialog('chrome://messenger/content/addressbook/abNewCardDialog.xul', '', 'chrome,resizable=no,titlebar,modal');"/>
</menupopup>
</menu>
<menuitem label="&attachFileCmd.label;" accesskey="&attachFileCmd.accesskey;" command="cmd_attachFile"/>
<menuitem label="&attachPageCmd.label;" accesskey="&attachPageCmd.accesskey;" command="cmd_attachPage"/>
<menu label="&attachMenu.label;" accesskey="&attachMenu.accesskey;">
<menupopup>
<menuitem label="&attachFileCmd.label;" accesskey="&attachFileCmd.accesskey;" command="cmd_attachFile"/>
<menuitem label="&attachPageCmd.label;" accesskey="&attachPageCmd.accesskey;" command="cmd_attachPage"/>
<menuseparator/>
<menuitem type="checkbox" label="&attachVCardCmd.label;" accesskey="&attachVCardCmd.accesskey;" command="cmd_attachVCard"/>
</menupopup>
</menu>
<menuitem id="offlineGoOfflineCmd" hidden="true" label="&offlineGoOfflineCmd.label;" accesskey="&offlineGoOfflineCmd.accesskey;" observes="Communicator:WorkMode"/>
<menuitem id="menu_close" label="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" command="cmd_close"/>
<menuseparator/>
@@ -349,7 +356,6 @@
<menuitem label="&quoteCmd.label;" accesskey="&quoteCmd.accesskey;" command="cmd_quoteMessage"/>
<menuseparator/>
<menuitem id="returnReceiptMenu" type="checkbox" label="&returnReceiptMenu.label;" accesskey="&returnReceiptMenu.accesskey;" checked="false" oncommand="ToggleReturnReceipt(event.target)"/>
<menuitem type="checkbox" label="&attachVCardMenu.label;" accesskey="&attachVCardMenu.accesskey;" command="cmd_attachVCard"/>
<menuseparator/>
<menu id="outputFormatMenu" label="&outputFormatMenu.label;" accesskey="&outputFormatMenu.accesskey;" oncommand="OutputFormatMenuSelect(event.target)">
<menupopup>
@@ -471,10 +477,10 @@
tooltiptext="&attachButton.tooltip;"
command="cmd_attachFile">
<menupopup>
<menuitem label="&attachFileButton.label;" accesskey="&attachFileCmd.accesskey;" command="cmd_attachFile"/>
<menuitem label="&attachPageButton.label;" accesskey="&attachPageCmd.accesskey;" command="cmd_attachPage"/>
<menuitem label="&attachFileCmd.label;" accesskey="&attachFileCmd.accesskey;" command="cmd_attachFile"/>
<menuitem label="&attachPageCmd.label;" accesskey="&attachPageCmd.accesskey;" command="cmd_attachPage"/>
<menuseparator/>
<menuitem type="checkbox" label="&attachVCardButton.label;" accesskey="&attachVCardCmd.accesskey;" command="cmd_attachVCard"/>
<menuitem type="checkbox" label="&attachVCardCmd.label;" accesskey="&attachVCardCmd.accesskey;" command="cmd_attachVCard"/>
</menupopup>
</toolbarbutton>

23
mozilla/mail/components/compose/locale/messengercompose.dtd
View File

@@ -11,16 +11,15 @@
<!ENTITY newMessage.accesskey "M">
<!ENTITY newCard.label "Address Book Card...">
<!ENTITY newCard.accesskey "c">
<!ENTITY attachFileCmd.label "Attach File...">
<!ENTITY attachMenu.label "Attach">
<!ENTITY attachMenu.accesskey "t">
<!ENTITY attachFileCmd.label "File(s)...">
<!ENTITY attachFileCmd.accesskey "F">
<!ENTITY attachFileButton.label "File(s)...">
<!ENTITY attachPageCmd.label "Attach Web Page...">
<!ENTITY attachPageCmd.label "Web Page...">
<!ENTITY attachPageCmd.accesskey "W">
<!ENTITY attachPageButton.label "Web Page...">
<!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
<!ENTITY attachVCardCmd.label "Personal Card (vCard)">
<!ENTITY attachVCardCmd.accesskey "P">
<!--LOCALIZATION NOTE attachVCardButton.label Don't translate the term 'vCard' -->
<!ENTITY attachVCardButton.label "Personal Card (vCard)">
<!ENTITY closeCmd.label "Close">
<!ENTITY closeCmd.key "W">
<!ENTITY closeCmd.accesskey "c">
@@ -121,9 +120,9 @@
<!ENTITY quoteCmd.label "Quote Message">
<!ENTITY quoteCmd.accesskey "Q">
<!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
<!ENTITY attachVCardMenu.label "Attach Personal Card (vCard)">
<!ENTITY attachVCardMenu.accesskey "v">
<!--LOCALIZATION NOTE attachVCard.label Don't translate the term 'vCard' -->
<!ENTITY attachVCard.label "Attach Personal Card (vCard)">
<!ENTITY attachVCard.accesskey "v">
<!ENTITY returnReceiptMenu.label "Return Receipt">
<!ENTITY returnReceiptMenu.accesskey "t">
@@ -247,6 +246,10 @@
<!ENTITY delete.accesskey "D">
<!ENTITY selectAll.label "Select All">
<!ENTITY selectAll.accesskey "A">
<!ENTITY attachFile.label "Attach File(s)...">
<!ENTITY attachFile.accesskey "F">
<!ENTITY attachPage.label "Attach Web Page...">
<!ENTITY attachPage.accesskey "W">
<!-- Title for the address picker panel -->
<!ENTITY addressesSidebarTitle.label "Contacts">