Bug 1596669 - Remove Thunderbird usage of `stringbundleset` element. r=khushil
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Mon, 18 Nov 2019 22:32:02 +0100
changeset 36674 1628c49941d6699b96b2fff5688c9b8625133f4b
parent 36673 2a0f5703a010e69efcaf1bdde30f17e890ce03a0
child 36675 f5bd174b047b170cec34c4a4b465efb182fec971
push id2534
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:52:51 +0000
treeherdercomm-beta@055c50840778 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhushil
bugs1596669
Bug 1596669 - Remove Thunderbird usage of `stringbundleset` element. r=khushil grep -rEl '</?stringbundleset' --exclude-dir=.hg --exclude-dir=suite --exclude-dir=editor . | xargs sed -i -e '/stringbundleset/d' -e 's/ <stringbundle/ <stringbundle/g' ... and manual indention fixups
calendar/base/content/dialogs/calendar-event-dialog.xul
mail/base/content/ABSearchDialog.xul
mail/base/content/FilterListDialog.xul
mail/base/content/charsetOverlay.xul
mail/base/content/hiddenWindow.xul
mail/base/content/messageWindow.xul
mail/base/content/messenger.xul
mail/base/content/newTagDialog.xul
mail/components/accountcreation/content/emailWizard.xul
mail/components/activity/content/activity.xul
mail/components/addrbook/content/abContactsPanel.xul
mail/components/addrbook/content/abEditCardDialog.xul
mail/components/addrbook/content/abEditListDialog.xul
mail/components/addrbook/content/abMailListDialog.xul
mail/components/addrbook/content/abNewCardDialog.xul
mail/components/addrbook/content/addressbook.xul
mail/components/compose/content/messengercompose.xul
mail/components/preferences/applicationManager.xul
mail/extensions/mailviews/content/mailViewSetup.xul
mailnews/addrbook/content/abAddressBookNameDialog.xul
mailnews/base/content/msgPrintEngine.xul
mailnews/base/content/newFolderDialog.xul
mailnews/base/content/renameFolderDialog.xul
mailnews/base/content/virtualFolderListEdit.xul
mailnews/base/content/virtualFolderProperties.xul
mailnews/base/prefs/content/am-copies.inc.xul
mailnews/base/search/content/CustomHeaders.xul
mailnews/base/search/content/FilterEditor.xul
mailnews/extensions/smime/content/am-smime.inc.xul
--- a/calendar/base/content/dialogs/calendar-event-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog.xul
@@ -39,20 +39,17 @@
   <!-- Javascript includes -->
   <script src="chrome://lightning/content/lightning-item-panel.js"/>
   <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
   <script src="chrome://calendar/content/calendar-ui-utils.js"/>
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://messenger/content/toolbarIconColor.js"/>
   <script src="chrome://messenger/content/customizable-toolbar.js"/>
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="languageBundle"
-                  src="chrome://global/locale/languageNames.properties"/>
-  </stringbundleset>
+  <stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
 
   <!-- Command updater -->
   <commandset id="globalEditMenuItems"
               commandupdater="true"
               events="focus"
               oncommandupdate="goUpdateGlobalEditMenuItems()"/>
   <commandset id="selectEditMenuItems"
               commandupdater="true"
--- a/mail/base/content/ABSearchDialog.xul
+++ b/mail/base/content/ABSearchDialog.xul
@@ -23,22 +23,20 @@
         onunload="searchOnUnload();"
         onclose="onSearchStop();"
         windowtype="mailnews:absearch"
         title="&abSearchDialogTitle.label;"
         style="width: 52em; height: 34em;"
         lightweightthemes="true"
         persist="screenX screenY width height sizemode">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-    <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
+  <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 
   <script src="chrome://global/content/nsDragAndDrop.js"/>
   <script src="chrome://messenger/content/mailWindow.js"/>
   <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://messenger/content/commandglue.js"/>
   <script src="chrome://messenger/content/ABSearchDialog.js"/>
   <script src="chrome://messenger/content/addressbook/abResultsPane.js"/>
--- a/mail/base/content/FilterListDialog.xul
+++ b/mail/base/content/FilterListDialog.xul
@@ -22,20 +22,18 @@
   persist="width height screenX screenY"
   title="&window.title;">
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/button-menu-button.js"/>
   <script src="chrome://messenger/content/searchWidgets.js"/>
   <script src="chrome://messenger/content/FilterListDialog.js"/>
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 
   <keyset>
     <key key="&closeCmd.key;" modifiers="accel" oncommand="if (onFilterClose()) { window.close(); }"/>
     <key keycode="VK_ESCAPE" oncommand="if (onFilterClose()) { window.close(); }"/>
   </keyset>
 
   <hbox id="filterHeader" align="center">
     <label value="&filtersForPrefix.label;"
--- a/mail/base/content/charsetOverlay.xul
+++ b/mail/base/content/charsetOverlay.xul
@@ -9,19 +9,16 @@
     var {CharsetMenu} = ChromeUtils.import("resource://gre/modules/CharsetMenu.jsm");
 
     function UpdateCharsetMenu(aCharset, aNode) {
       var bundle = document.getElementById("charsetBundle");
       CharsetMenu.update(aNode, bundle.getString(aCharset.toLowerCase()));
     }
   </script>
 
-  <stringbundleset>
-    <stringbundle id="charsetBundle"
-                  src="chrome://communicator/content/labelsencodings.properties"/>
-  </stringbundleset>
+  <stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
 
   <menu id="charsetMenu"
         data-l10n-id="menu-view-charset">
     <menupopup id="charsetPopup"
                onpopupshowing="CharsetMenu.build(this, true, this.getAttribute('detectors') != 'false');"/>
   </menu>
 </overlay>
--- a/mail/base/content/hiddenWindow.xul
+++ b/mail/base/content/hiddenWindow.xul
@@ -59,26 +59,23 @@
 <script src="chrome://messenger/content/quickFilterBar.js"/>
 <script src="chrome://messenger/content/newmailaccount/uriListener.js"/>
 <script src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
 <script src="chrome://messenger/content/customizable-toolbar.js"/>
 #ifdef XP_MACOSX
 <script src="chrome://global/content/macWindowMenu.js"/>
 #endif
 
+<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
+<stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
+<stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
+<stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
 
-<stringbundleset id="stringbundleset">
-  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-  <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
-  <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
-  <stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
-</stringbundleset>
-
-  <!-- keys are appended from the overlay -->
+<!-- keys are appended from the overlay -->
 <keyset id="mailKeys">
 #include mainKeySet.inc.xul
   <keyset id="tasksKeys">
     <key id="key_newMessage" key="&newMessageCmd.key;" command="cmd_newMessage"
          modifiers="accel,shift"/>
     <key id="key_newMessage2" key="&newMessageCmd2.key;" command="cmd_newMessage"
          modifiers="accel"/>
   </keyset>
--- a/mail/base/content/messageWindow.xul
+++ b/mail/base/content/messageWindow.xul
@@ -63,25 +63,22 @@
         onresize="OnResizeExpandedHeaderView()"
         persist="width height screenX screenY sizemode"
         toggletoolbar="true"
         windowtype="mail:messageWindow"
         macanimationtype="document"
         lightweightthemes="true"
         fullscreenbutton="true">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-    <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
-    <stringbundle id="bundle_editContact"
-                  src="chrome://messenger/locale/editContactOverlay.properties"/>
-    <stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
-    <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+  <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
+  <stringbundle id="bundle_editContact" src="chrome://messenger/locale/editContactOverlay.properties"/>
+  <stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
+  <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
 
   <linkset>
     <html:link rel="localization" href="toolkit/main-window/findbar.ftl"/>
     <html:link rel="localization" href="messenger/menubar.ftl"/>
   </linkset>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://messenger/content/commandglue.js"/>
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -84,29 +84,26 @@
         screenX="10" screenY="10"
         persist="width height screenX screenY sizemode"
         toggletoolbar="true"
         windowtype="mail:3pane"
         macanimationtype="document"
         lightweightthemes="true"
         fullscreenbutton="true">
 
-<stringbundleset id="stringbundleset">
-  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
-  <stringbundle id="chatBundle" src="chrome://messenger/locale/chat.properties"/>
-  <stringbundle id="bundle_dateformat" src="chrome://chat/locale/dateFormat.properties"/>
-  <stringbundle id="bundle_places" src="chrome://places/locale/places.properties"/>
-  <stringbundle id="bundle_editContact"
-                src="chrome://messenger/locale/editContactOverlay.properties"/>
-  <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
-  <stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
-  <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
-</stringbundleset>
+<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
+<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+<stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
+<stringbundle id="chatBundle" src="chrome://messenger/locale/chat.properties"/>
+<stringbundle id="bundle_dateformat" src="chrome://chat/locale/dateFormat.properties"/>
+<stringbundle id="bundle_places" src="chrome://places/locale/places.properties"/>
+<stringbundle id="bundle_editContact" src="chrome://messenger/locale/editContactOverlay.properties"/>
+<stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
+<stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
+<stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
 
 <linkset>
   <html:link rel="localization" href="toolkit/main-window/findbar.ftl"/>
   <html:link rel="localization" href="messenger/menubar.ftl"/>
 </linkset>
 
 <script src="chrome://global/content/globalOverlay.js"/>
 <script src="chrome://global/content/editMenuOverlay.js"/>
--- a/mail/base/content/newTagDialog.xul
+++ b/mail/base/content/newTagDialog.xul
@@ -9,19 +9,17 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/newTagDialog.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&newTagDialog1.title;"
         onload="onLoad();">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/newTagDialog.js"/>
   <label id="nameLabel"
          value="&name.label;"
          accesskey="&name.accesskey;"
          control="name"/>
--- a/mail/components/accountcreation/content/emailWizard.xul
+++ b/mail/components/accountcreation/content/emailWizard.xul
@@ -20,26 +20,21 @@
         id="autoconfigWizard"
         windowtype="mail:autoconfig"
         title="&emailWizard.title;"
         onload="gEmailConfigWizard.onLoad();"
         onkeypress="gEmailConfigWizard.onKeyDown(event);"
         onclose="gEmailConfigWizard.onWizardShutdown();"
         onunload="gEmailConfigWizard.onWizardShutdown();">
 
-  <stringbundleset>
-    <stringbundle id="bundle_brand"
-          src="chrome://branding/locale/brand.properties"/>
-    <stringbundle id="strings"
-          src="chrome://messenger/locale/accountCreation.properties"/>
-    <stringbundle id="utilstrings"
-          src="chrome://messenger/locale/accountCreationUtil.properties"/>
-    <stringbundle id="bundle_messenger"
-          src="chrome://messenger/locale/messenger.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
+  <stringbundle id="strings" src="chrome://messenger/locale/accountCreation.properties"/>
+  <stringbundle id="utilstrings" src="chrome://messenger/locale/accountCreationUtil.properties"/>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/accountcreation/util.js"/>
   <script src="chrome://messenger/content/accountcreation/accountConfig.js"/>
   <script src="chrome://messenger/content/accountcreation/emailWizard.js"/>
   <script src="chrome://messenger/content/accountcreation/sanitizeDatatypes.js"/>
   <script src="chrome://messenger/content/accountcreation/fetchhttp.js"/>
   <script src="chrome://messenger/content/accountcreation/readFromXML.js"/>
--- a/mail/components/activity/content/activity.xul
+++ b/mail/components/activity/content/activity.xul
@@ -35,20 +35,17 @@
         onclose="return closeWindow(false);">
 
   <script src="chrome://messenger/content/activity.js"/>
   <script src="chrome://messenger/content/activity-widgets.js"/>
   <script src="chrome://global/content/contentAreaUtils.js"/>
   <script src="chrome://global/content/nsDragAndDrop.js"/>
   <script src="chrome://global/content/globalOverlay.js"/>
 
-  <stringbundleset id="activitySet">
-    <stringbundle id="brandStrings"
-                  src="chrome://branding/locale/brand.properties"/>
-  </stringbundleset>
+  <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
 
   <!-- Use this commandset for command which do not depend on focus or
        selection -->
   <commandset id="generalCommands">
     <command id="cmd_selectAllActivities"
              oncommand="activityObject.selectAll();"/>
     <command id="cmd_clearList" oncommand="activityObject.clearActivityList();"/>
   </commandset>
--- a/mail/components/addrbook/content/abContactsPanel.xul
+++ b/mail/components/addrbook/content/abContactsPanel.xul
@@ -15,19 +15,17 @@
 ]>
 
 <window id="abContactsPanel"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="AbPanelLoad();"
         onunload="AbPanelUnload();"
         selectedaddresses="true">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
   <script src="chrome://global/content/nsDragAndDrop.js"/>
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://communicator/content/utilityOverlay.js"/>
   <script src="chrome://messenger/content/addressbook/addressbook.js"/>
   <script src="chrome://messenger/content/addressbook/abDragDrop.js"/>
   <script src="chrome://messenger/content/addressbook/abCommon.js"/>
--- a/mail/components/addrbook/content/abEditCardDialog.xul
+++ b/mail/components/addrbook/content/abEditCardDialog.xul
@@ -10,19 +10,17 @@
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/abCard.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         id="abcardWindow"
         icon="abcardWindow"
         onload="OnLoadEditCard()">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
   <script src="chrome://messenger/content/addressbook/abCommon.js"/>
   <script src="chrome://messenger/content/addressbook/abCard.js"/>
   <script><![CDATA[
     document.addEventListener("dialogcancel", EditCardCancelButton);
   ]]></script>
 
 #include abCard.inc.xul
--- a/mail/components/addrbook/content/abEditListDialog.xul
+++ b/mail/components/addrbook/content/abEditListDialog.xul
@@ -11,19 +11,17 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         id="ablistWindow"
         onload="OnLoadEditList();"
         ondragover="DragOverAddressListTree(event);"
         ondrop="DropOnAddressListTree(event);">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <!-- move needed functions into a single js file -->
   <script src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
   <script src="chrome://messenger/content/addressbook/abCommon.js"/>
   <script src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
 
--- a/mail/components/addrbook/content/abMailListDialog.xul
+++ b/mail/components/addrbook/content/abMailListDialog.xul
@@ -11,19 +11,17 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         id="ablistWindow"
         title="&mailListWindowAdd.title;"
         onload="OnLoadNewMailList();"
         ondragover="DragOverAddressListTree(event);"
         ondrop="DropOnAddressListTree(event);">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <!-- move needed functions into a single js file -->
   <script src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
   <script src="chrome://messenger/content/addressbook/abCommon.js"/>
   <script src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
   <script><![CDATA[
--- a/mail/components/addrbook/content/abNewCardDialog.xul
+++ b/mail/components/addrbook/content/abNewCardDialog.xul
@@ -16,19 +16,17 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         id="abcardWindow"
         icon="abcardWindow"
         windowtype="mailnews:newcarddialog"
         onload="OnLoadNewCard()">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
   <script src="chrome://messenger/content/addressbook/abCommon.js"/>
   <script src="chrome://messenger/content/addressbook/abCard.js"/>
   <script><![CDATA[
     document.addEventListener("dialogaccept", NewCardOKButton);
     document.addEventListener("dialogcancel", NewCardCancelButton);
   ]]></script>
 
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -27,21 +27,19 @@
     macanimationtype="document"
     persist="width height screenX screenY sizemode"
     toggletoolbar="true"
     onload="OnLoadAddressBook()"
     onunload="OnUnloadAddressBook()"
     lightweightthemes="true"
     fullscreenbutton="true">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 
 <script src="chrome://messenger/content/button-menu-button.js"/>
 <script src="chrome://messenger/content/jsTreeView.js"/>
 <script src="chrome://messenger/content/addressbook/abTrees.js"/>
 <script src="chrome://messenger/content/accountUtils.js"/>
 <script src="chrome://messenger/content/mailCore.js"/>
 <script src="chrome://messenger/content/addressbook/addressbook.js"/>
 <script src="chrome://messenger/content/addressbook/map-list.js"/>
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -45,23 +45,21 @@
         title="&msgComposeWindow.title;"
         windowtype="msgcompose"
         macanimationtype="document"
         toggletoolbar="true"
         persist="screenX screenY width height sizemode"
         lightweightthemes="true"
         fullscreenbutton="true">
 
-<stringbundleset id="stringbundleset">
   <stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
-  <stringbundle id="bundle_messenger"   src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="brandBundle"        src="chrome://branding/locale/brand.properties"/>
-  <stringbundle id="bundle_comp_smime"  src="chrome://messenger-smime/locale/msgCompSMIMEOverlay.properties"/>
-  <stringbundle id="charsetBundle"      src="chrome://communicator/content/labelsencodings.properties"/>
-</stringbundleset>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+  <stringbundle id="brandBundle" src="chrome://branding/locale/brand.properties"/>
+  <stringbundle id="bundle_comp_smime" src="chrome://messenger-smime/locale/msgCompSMIMEOverlay.properties"/>
+  <stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
 
 <linkset>
   <html:link rel="localization" href="toolkit/main-window/findbar.ftl"/>
   <html:link rel="localization" href="messenger/menubar.ftl"/>
 </linkset>
 
 <script src="chrome://global/content/globalOverlay.js"/>
 <script src="chrome://global/content/editMenuOverlay.js"/>
--- a/mail/components/preferences/applicationManager.xul
+++ b/mail/components/preferences/applicationManager.xul
@@ -26,22 +26,18 @@
              oncommand="gAppManagerDialog.remove();"
              disabled="true"/>
   </commandset>
 
   <keyset id="appManagerKeyset">
     <key id="delete" keycode="VK_DELETE" command="cmd_delete"/>
   </keyset>
 
-  <stringbundleset id="appManagerBundleset">
-    <stringbundle id="appManagerBundle"
-                  src="chrome://messenger/locale/preferences/applicationManager.properties"/>
-    <stringbundle id="bundlePreferences"
-                  src="chrome://messenger/locale/preferences/preferences.properties"/>
-  </stringbundleset>
+  <stringbundle id="appManagerBundle" src="chrome://messenger/locale/preferences/applicationManager.properties"/>
+  <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
 
   <description id="appDescription"/>
   <separator class="thin"/>
   <hbox flex="1">
     <richlistbox id="appList"
                  onselect="gAppManagerDialog.onSelect();"
                  flex="1"
                  style="min-height: 150px;"/>
--- a/mail/extensions/mailviews/content/mailViewSetup.xul
+++ b/mail/extensions/mailviews/content/mailViewSetup.xul
@@ -20,19 +20,17 @@
         onunload="mailViewOnUnLoad();"
         buttons="accept,cancel"
         buttonalign="end"
         windowtype="mailnews:mailview"
         title="&mailViewSetupTitle.label;"
         style="width: 52em; height: 22em;"
         persist="screenX screenY width height">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://messenger/content/mailViewSetup.js"/>
   <script src="chrome://messenger/content/searchTerm.js"/>
   <script src="chrome://messenger/content/searchWidgets.js"/>
   <script src="chrome://messenger/content/dateFormat.js"/>
 
   <vbox flex="1">
--- a/mailnews/addrbook/content/abAddressBookNameDialog.xul
+++ b/mailnews/addrbook/content/abAddressBookNameDialog.xul
@@ -8,20 +8,17 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/abAddressBookNameDialog.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         style="width: 36em;"
         onload="abNameOnLoad();">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_addressBook"
-                  src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
 
   <hbox align="center" class="input-container">
     <label id="nameLabel" control="name" value="&name.label;"
            accesskey="&name.accesskey;"/>
--- a/mailnews/base/content/msgPrintEngine.xul
+++ b/mailnews/base/content/msgPrintEngine.xul
@@ -11,20 +11,18 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="OnLoadPrintEngine()"
         width="750"
         height="500"
         screenX="10" screenY="10"
         persist="width height screenX screenY sizemode"
         windowtype="mail:printEngine">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
   <!-- Provide shortcut keys for toolkit's print preview; commands will be overridden by printUtils.js -->
   <key id="printKb" key="&printCmd.key;" command="cmd_print" modifiers="accel"/>
   <key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
 
   <script src="chrome://global/content/printUtils.js"/>
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://messenger/content/msgPrintEngine.js"/>
--- a/mailnews/base/content/newFolderDialog.xul
+++ b/mailnews/base/content/newFolderDialog.xul
@@ -15,17 +15,16 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&newFolderDialog.title;"
         onload="onLoad();"
         buttonlabelaccept="&accept.label;"
         buttonaccesskeyaccept="&accept.accesskey;">
 
-  <stringbundleset id="stringbundleset"/>
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/newFolderDialog.js"/>
 
     <label id="nameLabel" value="&name.label;" accesskey="&name.accesskey;"
            control="name"/>
     <html:input id="name"
                 type="text"
--- a/mailnews/base/content/renameFolderDialog.xul
+++ b/mailnews/base/content/renameFolderDialog.xul
@@ -10,17 +10,16 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&renameFolderDialog.title;"
         buttonlabelaccept="&accept.label;"
         buttonaccesskeyaccept="&accept.accesskey;"
         onload="onLoad();">
 
-  <stringbundleset id="stringbundleset"/>
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/renameFolderDialog.js"/>
 
   <label id="nameLabel" value="&rename.label;" accesskey="&rename.accesskey;"
          control="name"/>
   <html:input id="name"
               type="text"
--- a/mailnews/base/content/virtualFolderListEdit.xul
+++ b/mailnews/base/content/virtualFolderListEdit.xul
@@ -14,19 +14,17 @@
         windowtype="mailnews:virtualFolderList"
         style="width: 27em; height: 25em;"
         persist="width height screenX screenY"
         onload="gSelectVirtual.load();">
 
   <script src="chrome://messenger/content/virtualFolderListEdit.js"/>
   <script src="chrome://messenger/content/folderPane.js"/>
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
   <label control="folderPickerTree">&virtualFolderDesc.label;</label>
 
     <tree id="folderPickerTree"
           flex="1"
           hidecolumnpicker="true"
           seltype="multiple"
           disableKeyNavigation="true"
--- a/mailnews/base/content/virtualFolderProperties.xul
+++ b/mailnews/base/content/virtualFolderProperties.xul
@@ -25,21 +25,19 @@
         buttons="accept,cancel"
         newFolderAcceptButtonLabel="&newFolderButton.label;"
         newFolderAcceptButtonAccessKey="&newFolderButton.accesskey;"
         editFolderAcceptButtonLabel="&editFolderButton.label;"
         editFolderAcceptButtonAccessKey="&editFolderButton.accesskey;"
         style="width: 50em; height: 28em;"
         windowtype="mailnews:virtualFolderProperties">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_search"    src="chrome://messenger/locale/search.properties"/>
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-    <stringbundle id="bundle_folder"    src="chrome://messenger/locale/folderWidgets.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+  <stringbundle id="bundle_folder" src="chrome://messenger/locale/folderWidgets.properties"/>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/searchWidgets.js"/>
   <script src="chrome://messenger/content/mailCommands.js"/>
   <script src="chrome://messenger/content/commandglue.js"/>
   <script src="chrome://messenger/content/virtualFolderProperties.js"/>
   <script src="chrome://messenger/content/searchTerm.js"/>
--- a/mailnews/base/prefs/content/am-copies.inc.xul
+++ b/mailnews/base/prefs/content/am-copies.inc.xul
@@ -1,16 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
   <vbox flex="1" id="copiesAndFolders">
-    <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-    </stringbundleset>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
     <label id="identity.fccFolder" hidden="true" wsm_persist="true"
            pref="true" preftype="string" prefattribute="value"
            prefstring="mail.identity.%identitykey%.fcc_folder"/>
     <label id="identity.draftFolder" hidden="true" wsm_persist="true"
            pref="true" preftype="string" prefattribute="value"
            prefstring="mail.identity.%identitykey%.draft_folder"/>
     <label id="identity.archiveFolder" hidden="true" wsm_persist="true"
--- a/mailnews/base/search/content/CustomHeaders.xul
+++ b/mailnews/base/search/content/CustomHeaders.xul
@@ -14,20 +14,18 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="onLoad();"
         style="width: 30em; height: 25em;"
         persist="width height screenX screenY"
         title="&window.title;"
         buttons="accept,cancel,extra1,extra2">
 
-  <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
   <stringbundle id="bundle_custom" src="chrome://messenger/locale/custom.properties"/>
-  </stringbundleset>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/CustomHeaders.js"/>
 
   <hbox flex="1">
     <vbox flex="1">
       <label id="headerInputLabel"
--- a/mailnews/base/search/content/FilterEditor.xul
+++ b/mailnews/base/search/content/FilterEditor.xul
@@ -20,21 +20,19 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&window.title;"
         style="&filterEditorDialog.dimensions;"
         windowtype="mailnews:filtereditor"
         persist="width height screenX screenY"
         buttons="accept,cancel"
         onload="filterEditorOnLoad();">
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-    <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
-    <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
-  </stringbundleset>
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+  <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
+  <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/searchWidgets.js"/>
   <script src="chrome://messenger/content/mailWindowOverlay.js"/>
   <script src="chrome://messenger/content/mailCommands.js"/>
   <script src="chrome://messenger/content/FilterEditor.js"/>
   <script src="chrome://messenger/content/searchTerm.js"/>
--- a/mailnews/extensions/smime/content/am-smime.inc.xul
+++ b/mailnews/extensions/smime/content/am-smime.inc.xul
@@ -1,18 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
     <vbox id="smimeEditing">
 
-      <stringbundleset>
-        <stringbundle id="bundle_smime" src="chrome://messenger/locale/am-smime.properties"/>
-        <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-      </stringbundleset>
+      <stringbundle id="bundle_smime" src="chrome://messenger/locale/am-smime.properties"/>
+      <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 
       <label hidden="true" wsm_persist="true" id="identity.encryptionpolicy"/>
 
       <description>&securityHeading.label;</description>
 
       <groupbox id="signing.titlebox">
         <label class="header">&signingGroupTitle.label;</label>