From 6e812400659e2e1895f1a7a260bed59b790af03a Mon Sep 17 00:00:00 2001
From: "hewitt%netscape.com"
 <hewitt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 4 Dec 2001 23:30:25 +0000
Subject: [PATCH] 93839 - tooltiptext should work without specifying tooltip,
 r=pinkerton, sr=hyatt

git-svn-id: svn://10.0.0.236/trunk@109682 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../help/resources/content/help.xul           |  17 +-
 .../extensions/irc/xul/content/chatzilla.xul  |   1 -
 mozilla/extensions/irc/xul/content/static.js  |  53 +-
 .../p3p/resources/content/pref-P3P.xul        | 884 +++++++-----------
 .../p3p/resources/content/privacyOverlay.xul  |   2 +-
 .../resources/content/venkman-menus.xul       |  17 +-
 .../resources/content/venkman-static.js       |  36 -
 .../venkman/resources/content/venkman.xul     |   2 +-
 .../content/walletNavigatorOverlay.xul        |   3 -
 .../content/abSelectAddressesDialog.xul       |   5 +-
 .../resources/content/addressbook.xul         |  24 +-
 .../content/mail3PaneWindowVertLayout.xul     |  52 +-
 .../resources/content/mailTasksOverlay.xul    |   4 +-
 .../resources/content/mailWindowOverlay.xul   |  30 +-
 .../base/resources/content/messageWindow.xul  |   4 +-
 .../base/resources/content/messenger.xul      |  54 +-
 .../resources/content/msgHdrViewOverlay.js    |   4 +-
 .../resources/content/msgHdrViewOverlay.xul   |   5 +-
 .../resources/content/MsgComposeCommands.js   |   1 -
 .../resources/content/messengercompose.xul    |  19 +-
 .../resources/content/securityOverlay.xul     |   2 +-
 mozilla/themes/classic/global/win/global.css  |   6 -
 mozilla/themes/modern/global/global.css       |   4 -
 .../resources/content/navWidgetBindings.xml   |   8 +-
 .../resources/content/navigator-toolbars.xul  |   3 +-
 .../browser/resources/content/toolbarTest.xul |   6 +-
 26 files changed, 484 insertions(+), 762 deletions(-)

diff --git a/mozilla/extensions/help/resources/content/help.xul b/mozilla/extensions/help/resources/content/help.xul
index 6c954db4edb..32a318cf2f1 100644
--- a/mozilla/extensions/help/resources/content/help.xul
+++ b/mozilla/extensions/help/resources/content/help.xul
@@ -38,10 +38,9 @@
   <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
 
-  <popupset id="aTooltipSet">
-    <popup id="backMenu" position="after_start" onpopupshowing="return createBackMenu(event);" oncommand="gotoHistoryIndex(event);"/>
-    <popup id="forwardMenu" position="after_start" onpopupshowing="return createForwardMenu(event);" oncommand="gotoHistoryIndex(event);"/>
-  </popupset>
+  <popup id="backMenu" position="after_start" onpopupshowing="return createBackMenu(event);" oncommand="gotoHistoryIndex(event);"/>
+  <popup id="forwardMenu" position="after_start" onpopupshowing="return createForwardMenu(event);" oncommand="gotoHistoryIndex(event);"/>
+
   <popupset id="contentAreaContextSet"/>
   <broadcasterset id="helpBroadcasters">
     <broadcaster id="canGoBack"    disabled="true"/>
@@ -84,32 +83,32 @@
     <!-- button bar -->
     <toolbox id="help-toolbox" class="toolbox-top" deferattached="true">
       <toolbar id="helpToolbar" class="toolbar-primary" 
-            	grippytooltip="aTooltip" grippytooltiptext="&toolbar.tooltip;"
+            	grippytooltiptext="&toolbar.tooltip;"
               tbalign="stretch" persist="collapsed">
 
         <toolbarbutton id="helpBackButton" type="menu-button" class="toolbarbutton-1"
                        label="&backBtn.label;" crop="right"
                        oncommand="if (event.target==this) goBack(); else gotoHistoryIndex(event);"
                        observes="canGoBack" context="backMenu" 
-                       tooltip="aTooltip" tooltiptext="&backButton.tooltip;">
+                       tooltiptext="&backButton.tooltip;">
           <menupopup context="" onpopupshowing="createBackMenu(event);"/>
         </toolbarbutton>
         <toolbarbutton id="helpForwardButton" type="menu-button" class="toolbarbutton-1"
                        label="&fwdBtn.label;" crop="right"
-                       tooltip="aTooltip" tooltiptext="&forwardButton.tooltip;"
+                       tooltiptext="&forwardButton.tooltip;"
                        oncommand="if (event.target==this) goForward(); else gotoHistoryIndex(event);"
                        observes="canGoForward" context="forwardMenu">
           <menupopup context="" onpopupshowing="createForwardMenu(event);"/>
         </toolbarbutton>
         <toolbarbutton id="helpHomeButton" class="toolbarbutton-1"
                 label="&homeBtn.label;" oncommand="goHome();"
-                tooltip="aTooltip" tooltiptext="&homeBtn.tooltip;"/>
+                tooltiptext="&homeBtn.tooltip;"/>
 
         <spacer flex="1"/>
 
         <toolbarbutton id="print" class="toolbarbutton-1"
                        label="&printButton.label;" oncommand="print();"
-                       tooltip="aTooltip" tooltiptext="&printButton.tooltip;"/>
+                       tooltiptext="&printButton.tooltip;"/>
       </toolbar>
     </toolbox>
 
diff --git a/mozilla/extensions/irc/xul/content/chatzilla.xul b/mozilla/extensions/irc/xul/content/chatzilla.xul
index 8da67c8db20..b56c037a309 100644
--- a/mozilla/extensions/irc/xul/content/chatzilla.xul
+++ b/mozilla/extensions/irc/xul/content/chatzilla.xul
@@ -117,7 +117,6 @@
         <vbox flex="1">
           <toolbox id="header-bar-tbox" crop="right" persist="collapsed">
             <toolbar class="chromeclass-toolbar" id="header-bar-tbar"
-              grippytooltip="aTooltip"
               grippytooltiptext="&header.tooltip;" crop="right">
               <hbox flex="1" class="header-box">
                 <vbox flex="1%">
diff --git a/mozilla/extensions/irc/xul/content/static.js b/mozilla/extensions/irc/xul/content/static.js
index dc055602859..bc207e9efef 100644
--- a/mozilla/extensions/irc/xul/content/static.js
+++ b/mozilla/extensions/irc/xul/content/static.js
@@ -779,36 +779,33 @@ function playSound (file)
 
 function fillInTooltip(tipElement, id)
 {
-    const XULNS =
-        "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-    const XLinkNS = "http://www.w3.org/1999/xlink";
-    const Node = { ELEMENT_NODE : 1 }; // XXX Components.interfaces.Node;
-    
-    var retVal = false;
-    var tipNode = document.getElementById(id);
-    while (tipNode.hasChildNodes())
-        tipNode.removeChild(tipNode.firstChild);
-    var titleText = "";
-    var XLinkTitleText = "";
-    while (!titleText && !XLinkTitleText && tipElement) {
-        if (tipElement.nodeType == Node.ELEMENT_NODE) {
-            titleText = tipElement.getAttribute("title");
-            XLinkTitleText = tipElement.getAttributeNS(XLinkNS, "title");
-        }
-        tipElement = tipElement.parentNode;
+  const XLinkNS = "http://www.w3.org/1999/xlink";
+
+  var retVal = false;
+
+  var titleText = null;
+  var XLinkTitleText = null;
+  
+  while (!titleText && !XLinkTitleText && tipElement) {
+    if (tipElement.nodeType == Node.ELEMENT_NODE) {
+      titleText = tipElement.getAttribute("title");
+      XLinkTitleText = tipElement.getAttributeNS(XLinkNS, "title");
     }
-    var texts = [titleText, XLinkTitleText];
-    for (var i = 0; i < texts.length; ++i) {
-        var t = texts[i];
-        if (t && t.search(/\S/) >= 0) {
-            var tipLineElem =
-                tipNode.ownerDocument.createElementNS(XULNS, "text");
-            tipLineElem.setAttribute("value", t);
-            tipNode.appendChild(tipLineElem);
-            retVal = true;
-        }
+    tipElement = tipElement.parentNode;
+  }
+
+  var texts = [titleText, XLinkTitleText];
+  var tipNode = document.getElementById(id);
+
+  for (var i = 0; i < texts.length; ++i) {
+    var t = texts[i];
+    if (t && t.search(/\S/) >= 0) {
+      tipNode.setAttribute("label", t);
+      retVal = true;
     }
-    return retVal;
+  }
+
+  return retVal;
 }
 
 /* timer-based mainloop */
diff --git a/mozilla/extensions/p3p/resources/content/pref-P3P.xul b/mozilla/extensions/p3p/resources/content/pref-P3P.xul
index 9546907dc6e..101fe6cc8d0 100644
--- a/mozilla/extensions/p3p/resources/content/pref-P3P.xul
+++ b/mozilla/extensions/p3p/resources/content/pref-P3P.xul
@@ -459,7 +459,7 @@
               <description>&physical.tip;</description>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption value="&purpose.label;" tooltip="purposetip"/>
+                <caption value="&purpose.label;" tooltiptext="&purpose.tip;"/>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -468,25 +468,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox>
-                        <caption value="&superadmin.label;" tooltip="superadmintip"/>
-                        <checkbox id="P3PPhysicalAdmin" label="admin" tooltip="admintip"
+                        <caption value="&superadmin.label;" tooltiptext="&superadmin.tip;"/>
+                        <checkbox id="P3PPhysicalAdmin" label="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.physical.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPhysicalHistorical" label="historical" tooltip="historicaltip"
+                        <checkbox id="P3PPhysicalHistorical" label="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.physical.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox>
-                        <caption value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PPhysicalDevelop" value="develop" tooltip="developtip"
+                        <caption value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PPhysicalDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.physical.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPhysicalPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PPhysicalPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.physical.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPhysicalIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PPhysicalIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.physical.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -495,31 +495,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PPhysicalCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PPhysicalCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.physical.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPhysicalTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PPhysicalTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.physical.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPhysicalPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PPhysicalPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.physical.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPhysicalIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PPhysicalIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.physical.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PPhysicalCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PPhysicalCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.physical.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPhysicalContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PPhysicalContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.physical.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPhysicalTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PPhysicalTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.physical.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -528,7 +528,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PPhysicalOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PPhysicalOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.physical.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -538,8 +538,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PPhysicalSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PPhysicalSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.physical.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -551,7 +551,7 @@
               <html>&location.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -560,25 +560,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PLocationAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PLocationAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.location.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PLocationHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PLocationHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.location.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PLocationDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PLocationDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.location.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PLocationPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PLocationPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.location.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PLocationIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PLocationIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.location.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -587,31 +587,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PLocationCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PLocationCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.location.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PLocationTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PLocationTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.location.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PLocationPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PLocationPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.location.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PLocationIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PLocationIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.location.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PLocationCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PLocationCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.location.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PLocationContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PLocationContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.location.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PLocationTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PLocationTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.location.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -620,7 +620,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PLocationOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PLocationOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.location.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -630,8 +630,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PLocationSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PLocationSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.location.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -649,7 +649,7 @@
               <html>&online.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -658,25 +658,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3POnlineAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3POnlineAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.online.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3POnlineHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3POnlineHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.online.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3POnlineDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3POnlineDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.online.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3POnlinePseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3POnlinePseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.online.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3POnlineIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3POnlineIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.online.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -685,31 +685,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3POnlineCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3POnlineCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.online.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3POnlineTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3POnlineTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.online.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3POnlinePseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3POnlinePseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.online.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3POnlineIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3POnlineIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.online.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3POnlineCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3POnlineCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.online.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3POnlineContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3POnlineContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.online.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3POnlineTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3POnlineTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.online.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -718,7 +718,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3POnlineOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3POnlineOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.online.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -728,8 +728,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3POnlineSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3POnlineSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.online.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -747,7 +747,7 @@
               <html>&computer.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -756,25 +756,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PComputerAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PComputerAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.computer.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PComputerHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PComputerHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.computer.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PComputerDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PComputerDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.computer.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PComputerPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PComputerPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.computer.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PComputerIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PComputerIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.computer.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -783,31 +783,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PComputerCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PComputerCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.computer.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PComputerTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PComputerTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.computer.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PComputerPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PComputerPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.computer.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PComputerIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PComputerIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.computer.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PComputerCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PComputerCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.computer.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PComputerContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PComputerContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.computer.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PComputerTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PComputerTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.computer.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -816,7 +816,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PComputerOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PComputerOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.computer.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -826,8 +826,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PComputerSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PComputerSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.computer.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -839,7 +839,7 @@
               <html>&state.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -848,25 +848,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PStateAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PStateAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.state.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PStateHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PStateHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.state.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PStateDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PStateDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.state.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PStatePseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PStatePseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.state.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PStateIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PStateIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.state.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -875,31 +875,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PStateCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PStateCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.state.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PStateTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PStateTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.state.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PStatePseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PStatePseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.state.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PStateIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PStateIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.state.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PStateCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PStateCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.state.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PStateContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PStateContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.state.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PStateTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PStateTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.state.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -908,7 +908,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PStateOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PStateOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.state.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -918,8 +918,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PStateSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PStateSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.state.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -931,7 +931,7 @@
               <html>&uniqueid.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -940,25 +940,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PUniqueIDAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PUniqueIDAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PUniqueIDHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PUniqueIDHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PUniqueIDDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PUniqueIDDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PUniqueIDPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PUniqueIDPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PUniqueIDIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PUniqueIDIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -967,31 +967,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PUniqueIDCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PUniqueIDCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PUniqueIDTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PUniqueIDTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PUniqueIDPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PUniqueIDPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PUniqueIDIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PUniqueIDIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PUniqueIDCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PUniqueIDCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PUniqueIDContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PUniqueIDContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PUniqueIDTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PUniqueIDTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1000,7 +1000,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PUniqueIDOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PUniqueIDOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.uniqueid.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1010,8 +1010,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PUniqueIDSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PUniqueIDSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.uniqueid.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1023,7 +1023,7 @@
               <html>&government.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1032,25 +1032,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PGovernmentAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PGovernmentAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.government.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PGovernmentHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PGovernmentHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.government.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PGovernmentDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PGovernmentDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.government.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PGovernmentPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PGovernmentPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.government.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PGovernmentIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PGovernmentIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.government.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1059,31 +1059,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PGovernmentCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PGovernmentCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.government.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PGovernmentTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PGovernmentTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.government.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PGovernmentPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PGovernmentPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.government.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PGovernmentIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PGovernmentIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.government.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PGovernmentCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PGovernmentCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.government.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PGovernmentContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PGovernmentContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.government.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PGovernmentTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PGovernmentTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.government.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1092,7 +1092,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PGovernmentOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PGovernmentOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.government.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1102,8 +1102,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PGovernmentSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PGovernmentSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.government.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1121,7 +1121,7 @@
               <html>&purchase.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1130,25 +1130,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PPurchaseAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PPurchaseAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.purchase.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPurchaseHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PPurchaseHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.purchase.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PPurchaseDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PPurchaseDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.purchase.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPurchasePseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PPurchasePseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.purchase.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPurchaseIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PPurchaseIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.purchase.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1157,31 +1157,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PPurchaseCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PPurchaseCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.purchase.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPurchaseTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PPurchaseTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.purchase.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPurchasePseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PPurchasePseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.purchase.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPurchaseIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PPurchaseIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.purchase.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PPurchaseCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PPurchaseCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.purchase.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPurchaseContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PPurchaseContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.purchase.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPurchaseTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PPurchaseTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.purchase.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1190,7 +1190,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PPurchaseOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PPurchaseOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.purchase.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1200,8 +1200,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PPurchaseSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PPurchaseSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.purchase.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1219,7 +1219,7 @@
               <html>&financial.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1228,25 +1228,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PFinancialAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PFinancialAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.financial.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PFinancialHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PFinancialHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.financial.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PFinancialDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PFinancialDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.financial.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PFinancialPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PFinancialPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.financial.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PFinancialIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PFinancialIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.financial.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1255,31 +1255,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PFinancialCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PFinancialCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.financial.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PFinancialTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PFinancialTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.financial.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PFinancialPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PFinancialPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.financial.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PFinancialIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PFinancialIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.financial.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PFinancialCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PFinancialCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.financial.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PFinancialContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PFinancialContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.financial.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PFinancialTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PFinancialTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.financial.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1288,7 +1288,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PFinancialOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PFinancialOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.financial.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1298,8 +1298,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PFinancialSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PFinancialSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.financial.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1311,7 +1311,7 @@
               <html>&health.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1320,25 +1320,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PHealthAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PHealthAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.health.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PHealthHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PHealthHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.health.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PHealthDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PHealthDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.health.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PHealthPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PHealthPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.health.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PHealthIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PHealthIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.health.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1347,31 +1347,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PHealthCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PHealthCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.health.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PHealthTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PHealthTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.health.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PHealthPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PHealthPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.health.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PHealthIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PHealthIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.health.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PHealthCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PHealthCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.health.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PHealthContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PHealthContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.health.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PHealthTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PHealthTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.health.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1380,7 +1380,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PHealthOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PHealthOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.health.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1390,8 +1390,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PHealthSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PHealthSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.health.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1403,7 +1403,7 @@
               <html>&political.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1412,25 +1412,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PPoliticalAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PPoliticalAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.political.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPoliticalHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PPoliticalHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.political.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PPoliticalDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PPoliticalDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.political.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPoliticalPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PPoliticalPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.political.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPoliticalIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PPoliticalIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.political.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1439,31 +1439,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PPoliticalCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PPoliticalCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.political.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPoliticalTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PPoliticalTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.political.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPoliticalPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PPoliticalPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.political.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPoliticalIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PPoliticalIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.political.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PPoliticalCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PPoliticalCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.political.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPoliticalContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PPoliticalContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.political.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPoliticalTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PPoliticalTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.political.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1472,7 +1472,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PPoliticalOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PPoliticalOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.political.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1482,8 +1482,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PPoliticalSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PPoliticalSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.political.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1501,7 +1501,7 @@
               <html>&navigation.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1510,25 +1510,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PNavigationAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PNavigationAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.navigation.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PNavigationHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PNavigationHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.navigation.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PNavigationDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PNavigationDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.navigation.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PNavigationPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PNavigationPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.navigation.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PNavigationIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PNavigationIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.navigation.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1537,31 +1537,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PNavigationCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PNavigationCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.navigation.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PNavigationTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PNavigationTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.navigation.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PNavigationPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PNavigationPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.navigation.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PNavigationIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PNavigationIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.navigation.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PNavigationCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PNavigationCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.navigation.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PNavigationContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PNavigationContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.navigation.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PNavigationTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PNavigationTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.navigation.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1570,7 +1570,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PNavigationOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PNavigationOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.navigation.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1580,8 +1580,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PNavigationSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PNavigationSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.navigation.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1593,7 +1593,7 @@
               <html>&interactive.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1602,25 +1602,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PInteractiveAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PInteractiveAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.interactive.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PInteractiveHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PInteractiveHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.interactive.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PInteractiveDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PInteractiveDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.interactive.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PInteractivePseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PInteractivePseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.interactive.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PInteractiveIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PInteractiveIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.interactive.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1629,31 +1629,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PInteractiveCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PInteractiveCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.interactive.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PInteractiveTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PInteractiveTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.interactive.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PInteractivePseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PInteractivePseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.interactive.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PInteractiveIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PInteractiveIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.interactive.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PInteractiveCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PInteractiveCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.interactive.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PInteractiveContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PInteractiveContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.interactive.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PInteractiveTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PInteractiveTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.interactive.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1662,7 +1662,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PInteractiveOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PInteractiveOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.interactive.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1672,8 +1672,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PInteractiveSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PInteractiveSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.interactive.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1691,7 +1691,7 @@
               <html>&demographic.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1700,25 +1700,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PDemographicAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PDemographicAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.demographic.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PDemographicHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PDemographicHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.demographic.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PDemographicDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PDemographicDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.demographic.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PDemographicPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PDemographicPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.demographic.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PDemographicIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PDemographicIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.demographic.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1727,31 +1727,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PDemographicCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PDemographicCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.demographic.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PDemographicTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PDemographicTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.demographic.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PDemographicPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PDemographicPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.demographic.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PDemographicIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PDemographicIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.demographic.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PDemographicCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PDemographicCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.demographic.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PDemographicContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PDemographicContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.demographic.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PDemographicTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PDemographicTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.demographic.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1760,7 +1760,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PDemographicOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PDemographicOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.demographic.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1770,8 +1770,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PDemographicSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PDemographicSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.demographic.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1783,7 +1783,7 @@
               <html>&preference.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1792,25 +1792,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PPreferenceAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PPreferenceAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.preference.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPreferenceHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PPreferenceHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.preference.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PPreferenceDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PPreferenceDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.preference.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPreferencePseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PPreferencePseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.preference.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPreferenceIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PPreferenceIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.preference.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1819,31 +1819,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PPreferenceCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PPreferenceCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.preference.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPreferenceTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PPreferenceTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.preference.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPreferencePseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PPreferencePseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.preference.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPreferenceIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PPreferenceIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.preference.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PPreferenceCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PPreferenceCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.preference.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPreferenceContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PPreferenceContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.preference.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPreferenceTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PPreferenceTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.preference.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1852,7 +1852,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PPreferenceOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PPreferenceOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.preference.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1862,8 +1862,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PPreferenceSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PPreferenceSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.preference.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1881,7 +1881,7 @@
               <html>&content.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1890,25 +1890,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PContentAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3PContentAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.content.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PContentHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3PContentHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.content.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3PContentDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3PContentDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.content.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3PContentPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3PContentPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.content.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3PContentIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3PContentIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.content.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1917,31 +1917,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3PContentCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3PContentCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.content.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3PContentTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3PContentTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.content.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3PContentPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3PContentPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.content.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3PContentIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3PContentIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.content.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3PContentCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3PContentCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.content.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3PContentContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3PContentContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.content.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3PContentTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3PContentTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.content.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -1950,7 +1950,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3PContentOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3PContentOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.content.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -1960,8 +1960,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3PContentSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3PContentSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.content.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -1979,7 +1979,7 @@
               <html>&other.tip;</html>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption><text value="&purpose.label;" tooltiptext="&purpose.tip;"/></caption>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1988,25 +1988,25 @@
                   <rows>
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3POtherAdmin" value="admin" tooltip="admintip"
+                        <caption><text value="&superadmin.label;" tooltiptext="&superadmin.tip;"/></caption>
+                        <checkbox id="P3POtherAdmin" value="admin" tooltiptext="&admin.tip;"
                                   preftype="bool" prefstring="P3P.other.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3POtherHistorical" value="historical" tooltip="historicaltip"
+                        <checkbox id="P3POtherHistorical" value="historical" tooltiptext="&historical.tip;"
                                   preftype="bool" prefstring="P3P.other.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
-                        <checkbox id="P3POtherDevelop" value="develop" tooltip="developtip"
+                        <caption><text value="&superdevelopment.label;" tooltiptext="&superdevelopment.tip;"/></caption>
+                        <checkbox id="P3POtherDevelop" value="develop" tooltiptext="&develop.tip;"
                                   preftype="bool" prefstring="P3P.other.develop" prefattribute="checked"
                                   />
-                        <checkbox id="P3POtherPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
+                        <checkbox id="P3POtherPseudo-analysis" value="pseudo-analysis" tooltiptext="&pseudo-analysis.tip;"
                                   preftype="bool" prefstring="P3P.other.pseudo-analysis" prefattribute="checked"
                                   />
-                        <checkbox id="P3POtherIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
+                        <checkbox id="P3POtherIndividual-analysis" value="individual-analysis" tooltiptext="&individual-analysis.tip;"
                                   preftype="bool" prefstring="P3P.other.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -2015,31 +2015,31 @@
 
                     <row flex="1">
                       <groupbox orient="vertical">
-                        <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
-                        <checkbox id="P3POtherCustomization" value="customization" tooltip="customizationtip"
+                        <caption><text value="&supercustomize.label;" tooltiptext="&supercustomize.tip;"/></caption>
+                        <checkbox id="P3POtherCustomization" value="customization" tooltiptext="&customization.tip;"
                                   preftype="bool" prefstring="P3P.other.customization" prefattribute="checked"
                                   />
-                        <checkbox id="P3POtherTailoring" value="tailoring" tooltip="tailoringtip"
+                        <checkbox id="P3POtherTailoring" value="tailoring" tooltiptext="&tailoring.tip;"
                                   preftype="bool" prefstring="P3P.other.tailoring" prefattribute="checked"
                                   />
-                        <checkbox id="P3POtherPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
+                        <checkbox id="P3POtherPseudo-decision" value="pseudo-decision" tooltiptext="&pseudo-decision.tip;"
                                   preftype="bool" prefstring="P3P.other.pseudo-decision" prefattribute="checked"
                                   />
-                        <checkbox id="P3POtherIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
+                        <checkbox id="P3POtherIndividual-decision" value="individual-decision" tooltiptext="&individual-decision.tip;"
                                   preftype="bool" prefstring="P3P.other.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
-                        <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
-                        <checkbox id="P3POtherCurrent" value="current" tooltip="currenttip"
+                        <caption><text value="&supercontact.label;" tooltiptext="&supercontact.tip;"/></caption>
+                        <checkbox id="P3POtherCurrent" value="current" tooltiptext="&current.tip;"
                                   preftype="bool" prefstring="P3P.other.current" prefattribute="checked"
                                   />
-                        <checkbox id="P3POtherContact" value="contact" tooltip="contacttip"
+                        <checkbox id="P3POtherContact" value="contact" tooltiptext="&contact.tip;"
                                   preftype="bool" prefstring="P3P.other.contact" prefattribute="checked"
                                   />
-                        <checkbox id="P3POtherTelemarketing" value="telemarketing" tooltip="telemarketingtip"
+                        <checkbox id="P3POtherTelemarketing" value="telemarketing" tooltiptext="&telemarketing.tip;"
                                   preftype="bool" prefstring="P3P.other.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
@@ -2048,7 +2048,7 @@
 
                     <row flex="1">
                       <vbox>
-                        <checkbox id="P3POtherOther-purpose" value="other-purpose" tooltip="other-purposetip"
+                        <checkbox id="P3POtherOther-purpose" value="other-purpose" tooltiptext="&other-purpose.tip;"
                                   preftype="bool" prefstring="P3P.other.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
@@ -2058,8 +2058,8 @@
               </groupbox>
 
               <groupbox orient="vertical">
-                <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
-                <checkbox id="P3POtherSharing" value="&sharing.label;" tooltip="sharingtip"
+                <caption><text value="&sharingtitle.label;" tooltiptext="&sharingtitle.tip;"/></caption>
+                <checkbox id="P3POtherSharing" value="&sharing.label;" tooltiptext="&sharing.tip;"
                           preftype="bool" prefstring="P3P.other.sharing" prefattribute="checked"
                           />
               </groupbox>
@@ -2071,210 +2071,6 @@
       <separator/>
       <checkbox id="showhelp" value="&showhelp.label;"/>
 
-      <popupset>
-        <popup id="purposetip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&purpose.tip;</html>
-          </window>
-        </popup>
-        <popup id="sharingtitletip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&sharingtitle.tip;</html>
-          </window>
-        </popup>
-
-        <popup id="superadmintip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&superadmin.tip;</html>
-          </window>
-        </popup>
-        <popup id="superdevelopmenttip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&superdevelopment.tip;</html>
-          </window>
-        </popup>
-        <popup id="supercustomizetip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&supercustomize.tip;</html>
-          </window>
-        </popup>
-        <popup id="supercontacttip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&supercontact.tip;</html>
-          </window>
-        </popup>
-        <popup id="currenttip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&current.tip;</html>
-          </window>
-        </popup>
-        <popup id="admintip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&admin.tip;</html>
-          </window>
-        </popup>
-        <popup id="developtip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&develop.tip;</html>
-          </window>
-        </popup>
-        <popup id="customizationtip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&customization.tip;</html>
-          </window>
-        </popup>
-        <popup id="tailoringtip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&tailoring.tip;</html>
-          </window>
-        </popup>
-        <popup id="pseudo-analysistip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&pseudo-analysis.tip;</html>
-          </window>
-        </popup>
-        <popup id="pseudo-decisiontip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&pseudo-decision.tip;</html>
-          </window>
-        </popup>
-        <popup id="individual-analysistip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&individual-analysis.tip;</html>
-          </window>
-        </popup>
-        <popup id="individual-decisiontip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&individual-decision.tip;</html>
-          </window>
-        </popup>
-        <popup id="contacttip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&contact.tip;</html>
-          </window>
-        </popup>
-        <popup id="historicaltip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&historical.tip;</html>
-          </window>
-        </popup>
-        <popup id="telemarketingtip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&telemarketing.tip;</html>
-          </window>
-        </popup>
-        <popup id="other-purposetip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&other-purpose.tip;</html>
-          </window>
-        </popup>
-        <popup id="sharingtip"
-               onpopupshowing="return parent.document.getElementById( 'showhelp' ).checked"
-               >
-          <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                  width="300px"
-                  height="100px"
-                  style="border: thin solid black">
-            <html>&sharing.tip;</html>
-          </window>
-        </popup>
-      </popupset>
-
     </vbox>
   </vbox>
 </window>
diff --git a/mozilla/extensions/p3p/resources/content/privacyOverlay.xul b/mozilla/extensions/p3p/resources/content/privacyOverlay.xul
index daaf8283e09..4afbdd2b1bf 100644
--- a/mozilla/extensions/p3p/resources/content/privacyOverlay.xul
+++ b/mozilla/extensions/p3p/resources/content/privacyOverlay.xul
@@ -31,6 +31,6 @@
 
   <script type="application/x-javascript" src="chrome://communicator/content/privacyUI.js" />
 
-  <statusbarpanel id="privacy-button" onclick="displayPrivacyInfo()" tooltip="aTooltip"/>
+  <statusbarpanel id="privacy-button" onclick="displayPrivacyInfo()"/>
 
 </overlay>
diff --git a/mozilla/extensions/venkman/resources/content/venkman-menus.xul b/mozilla/extensions/venkman/resources/content/venkman-menus.xul
index 9be929c6681..053cd7275da 100644
--- a/mozilla/extensions/venkman/resources/content/venkman-menus.xul
+++ b/mozilla/extensions/venkman/resources/content/venkman-menus.xul
@@ -126,12 +126,9 @@
       <keyset id="tasksKeys"/>
     </keyset>
 
-    <!-- Tooltips -->
-    <popupset id="aTooltipSet"/>
-  
     <!-- Main menu bar -->
     <toolbox flex="1">
-      <menubar id="main-menubar" persist="collapsed" grippytooltip="aTooltip"
+      <menubar id="main-menubar" persist="collapsed"
         grippytooltiptext="&MenuBar.tooltip;">
 
         <!-- File menu -->
@@ -214,24 +211,24 @@
 
       <!-- Debug toolbar -->
       <toolbar class="toolbar-primary chromeclass-toolbar" id="main-toolbar"
-        grippytooltip="aTooltip" grippytooltiptext="&DebugBar.tooltip;">
+        grippytooltiptext="&DebugBar.tooltip;">
         <hbox id="main-toolbar-buttons">
           <toolbarbutton class="toolbarbutton-1" id="stop-button"
             label="&Stop.label;" observes="cmd_stop"
-            tooltip="aTooltip" tooltiptext="&Stop.tooltip;"/>
+            tooltiptext="&Stop.tooltip;"/>
           <toolbarseparator class="toolbarseparator-primary"/>
           <toolbarbutton class="toolbarbutton-1" id="cont-button"
             label="&Cont.label;" observes="cmd_cont"
-            tooltip="aTooltip" tooltiptext="&Cont.tooltip;"/>
+            tooltiptext="&Cont.tooltip;"/>
           <toolbarbutton class="toolbarbutton-1" id="step-over-button"
             label="&StepOver.label;" observes="cmd_step_over"
-            tooltip="aTooltip" tooltiptext="&StepOver.tooltip;"/>
+            tooltiptext="&StepOver.tooltip;"/>
           <toolbarbutton class="toolbarbutton-1" id="step-in-button"
             label="&StepIn.label;" observes="cmd_step_in"
-            tooltip="aTooltip" tooltiptext="&StepIn.tooltip;"/>
+            tooltiptext="&StepIn.tooltip;"/>
           <toolbarbutton class="toolbarbutton-1" id="step-out-button"
             label="&StepOut.label;" observes="cmd_step_out"
-            tooltip="aTooltip" tooltiptext="&StepOut.tooltip;"/>
+            tooltiptext="&StepOut.tooltip;"/>
         </hbox>
       </toolbar>
         
diff --git a/mozilla/extensions/venkman/resources/content/venkman-static.js b/mozilla/extensions/venkman/resources/content/venkman-static.js
index d7616f578f9..e827e52e0c8 100644
--- a/mozilla/extensions/venkman/resources/content/venkman-static.js
+++ b/mozilla/extensions/venkman/resources/content/venkman-static.js
@@ -292,42 +292,6 @@ function evalInTargetScope (script)
     }
 }
 
-    
-function fillInTooltip(tipElement)
-{
-    const XULNS =
-        "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-    const XLinkNS = "http://www.w3.org/1999/xlink";
-    const Node = { ELEMENT_NODE : 1 }; // XXX Components.interfaces.Node;
-    
-    var retVal = false;
-    var tipNode = document.getElementById("tooltipBox");
-    while (tipNode.hasChildNodes())
-        tipNode.removeChild(tipNode.firstChild);
-    var titleText = "";
-    var XLinkTitleText = "";
-    while (!titleText && !XLinkTitleText && tipElement) {
-        if (tipElement.nodeType == Node.ELEMENT_NODE) {
-            titleText = tipElement.getAttribute("title");
-            XLinkTitleText = tipElement.getAttributeNS(XLinkNS, "title");
-        }
-        tipElement = tipElement.parentNode;
-    }
-    var texts = [titleText, XLinkTitleText];
-    for (var i = 0; i < texts.length; ++i) {
-        var t = texts[i];
-        if (t.search(/\S/) >= 0) {
-            var tipLineElem =
-                tipNode.ownerDocument.createElementNS(XULNS, "text");
-            tipLineElem.setAttribute("value", t);
-            tipNode.appendChild(tipLineElem);
-            retVal = true;
-        }
-    }
-    
-    return retVal;
-}
-
 function formatException (ex)
 {
     if (ex instanceof BadMojo)
diff --git a/mozilla/extensions/venkman/resources/content/venkman.xul b/mozilla/extensions/venkman/resources/content/venkman.xul
index e211f9bd2c4..8e7124610f9 100644
--- a/mozilla/extensions/venkman/resources/content/venkman.xul
+++ b/mozilla/extensions/venkman/resources/content/venkman.xul
@@ -151,7 +151,7 @@
         <!-- console view -->
 
         <vbox id="console-box" flex="50" persist="width">
-          <iframe id="output-iframe" flex="1" tooltip="aTooltip"
+          <iframe id="output-iframe" flex="1"
             ondraggesture=
               "nsDragAndDrop.startDrag(event, contentAreaDNDObserver);"
             src="chrome://venkman/content/venkman-output-window.html"
diff --git a/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul b/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul
index ac5d5716fc2..4ff39f0d37c 100644
--- a/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul
+++ b/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul
@@ -139,21 +139,18 @@
               id="formPrefill"
               oncommand="formPrefill();"
               label="  &formPrefill.label;  "
-              tooltip="aTooltip"
               tooltiptext="&formPrefill.tooltip;"/>
       <toolbarseparator/>
       <button class="button-toolbar-4"
               id="formCapture"
               oncommand="formCapture();"
               label="  &formCapture.label;  "
-              tooltip="aTooltip"
               tooltiptext="&formCapture.tooltip;"/>
       <toolbarseparator/>
       <button class="button-toolbar-4"
               id="formShow"
               oncommand="formShow(); initToolbarItems();"
               label="  &formView.label;  "
-              tooltip="aTooltip"
               tooltiptext="&formView.tooltip;"/>
       <toolbarseparator/>
     </toolbar>
diff --git a/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul b/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
index 6eefc6f1ffe..b202cf7ff31 100644
--- a/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
@@ -45,7 +45,6 @@ Rights Reserved.
 
 
   <keyset id="dialogKeys"/>
-  <popupset id="aTooltipSet"/>
 
   <!-- Main box, 3 pane and majority of buttons -->
   <hbox flex="100%">
@@ -99,9 +98,9 @@ Rights Reserved.
     <vbox id="rightColumnButtonBox">
       <vbox flex="50%">
         <spacer class="third-column-spacer"/>
-        <button id="new" label="&newButton.label;" tooltip="aTooltip" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard('dirTree')"/> 
+        <button id="new" label="&newButton.label;" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard('dirTree')"/> 
         <spacer class="third-column-spacer"/>
-        <button id="edit" label="&editButton.label;" tooltip="aTooltip" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditCard()"/> 
+        <button id="edit" label="&editButton.label;" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditCard()"/> 
         <spacer flex="100%"/>
       </vbox>
       <vbox flex="50%">
diff --git a/mozilla/mailnews/addrbook/resources/content/addressbook.xul b/mozilla/mailnews/addrbook/resources/content/addressbook.xul
index bfe51bab3cd..a55e035d060 100644
--- a/mozilla/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mozilla/mailnews/addrbook/resources/content/addressbook.xul
@@ -108,12 +108,10 @@ Rights Reserved.
   <key id="key_properties" key="&propertiesCmd.key;" command="cmd_properties" modifiers="accel"/>
 </keyset>
 
-<popupset id="aTooltipSet">
-  <popup id="sidebarPopup"/>
-</popupset>
+<popup id="sidebarPopup"/>
 
 <toolbox class="toolbox-top">
-	<menubar id="ab-menubar" grippytooltip="aTooltip" grippytooltiptext="&menuBar.tooltip;">
+	<menubar id="ab-menubar" grippytooltiptext="&menuBar.tooltip;">
 		<menu id="menu_File">
 			<menupopup id="menu_FilePopup">
         <menuitem label="&newCard.label;" accesskey="&newCard.accesskey;" oncommand="AbNewCard('dirTree')"/>
@@ -216,14 +214,14 @@ Rights Reserved.
 	</menubar>
 	
 	<!-- toolbar -->
-		<toolbar class="chromeclass-toolbar toolbar-primary" id="abToolbar" persist="collapsed" grippytooltip="aTooltip" grippytooltiptext="&addressbookToolbar.tooltip;">
+		<toolbar class="chromeclass-toolbar toolbar-primary" id="abToolbar" persist="collapsed" grippytooltiptext="&addressbookToolbar.tooltip;">
 			<hbox id="toolbar_button_box">
-        <toolbarbutton class="toolbarbutton-1" id="button-newcard" label="&newcardButton.label;" tooltip="aTooltip" tooltiptext="&newcardButton.tooltip;" oncommand="AbNewCard('dirTree');"/>
-        <toolbarbutton class="toolbarbutton-1" id="button-newlist" label="&newlistButton.label;" tooltip="aTooltip" tooltiptext="&newlistButton.tooltip;" oncommand="AbNewList('dirTree');"/>
+        <toolbarbutton class="toolbarbutton-1" id="button-newcard" label="&newcardButton.label;" tooltiptext="&newcardButton.tooltip;" oncommand="AbNewCard('dirTree');"/>
+        <toolbarbutton class="toolbarbutton-1" id="button-newlist" label="&newlistButton.label;" tooltiptext="&newlistButton.tooltip;" oncommand="AbNewList('dirTree');"/>
             	<toolbarseparator class="toolbarseparator-primary"/>
-        <toolbarbutton class="toolbarbutton-1" id="button-editcard" label="&editButton.label;" tooltip="aTooltip" tooltiptext="&editButton.tooltip;" oncommand="goDoCommand('button_edit');"/>
-        <toolbarbutton class="toolbarbutton-1" id="button-newmessage" label="&newmsgButton.label;" tooltip="aTooltip" tooltiptext="&newmsgButton.tooltip;" oncommand="AbNewMessage();"/>
-        <toolbarbutton class="toolbarbutton-1" id="button-delete" observes="button_delete" label="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" oncommand="goDoCommand('button_delete');"/>
+        <toolbarbutton class="toolbarbutton-1" id="button-editcard" label="&editButton.label;" tooltiptext="&editButton.tooltip;" oncommand="goDoCommand('button_edit');"/>
+        <toolbarbutton class="toolbarbutton-1" id="button-newmessage" label="&newmsgButton.label;" tooltiptext="&newmsgButton.tooltip;" oncommand="AbNewMessage();"/>
+        <toolbarbutton class="toolbarbutton-1" id="button-delete" observes="button_delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" oncommand="goDoCommand('button_delete');"/>
 
         <vbox flex="100%">
           <spacer flex="1"/> 
@@ -232,12 +230,12 @@ Rights Reserved.
           <spacer flex="1"/--> 
         </vbox>
 
-        <!--button id="button_stop" class="other28" align="top" label="&stopButton.label;" tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" disabled="true" oncommand="AbStop()"/>
-        <button id="button_search" class="other28" align="top" label="&searchButton.label;" disabled="true" tooltip="aTooltip" tooltiptext="&searchButton.tooltip;" oncommand="AbSearch()"/-->
+        <!--button id="button_stop" class="other28" align="top" label="&stopButton.label;" tooltiptext="&stopButton.tooltip;" disabled="true" oncommand="AbStop()"/>
+        <button id="button_search" class="other28" align="top" label="&searchButton.label;" disabled="true" tooltiptext="&searchButton.tooltip;" oncommand="AbSearch()"/-->
      </hbox>
 
      <hbox id="throbber-box" align="center">
-      <button id="navigator-throbber" oncommand='goClickThrobber("addressbook.throbber.url")' tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
+      <button id="navigator-throbber" oncommand="goClickThrobber('addressbook.throbber.url')" tooltiptext="&throbber.tooltip;">
         <observes element="broadcaster_throbber" attribute="busy"/>
       </button>
      </hbox>
diff --git a/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul b/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
index e08146b6ca9..659cf715bba 100644
--- a/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
+++ b/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
@@ -112,36 +112,34 @@ Rights Reserved.
   <keyset id="tasksKeys"/>
 </keyset>
 
-<popupset id="aTooltipSet">
-  <popup id="threadPaneContext"/>
-  <popup id="folderPaneContext"/>
-  <popup id="attachmentTreeContext"/>
+<popup id="threadPaneContext"/>
+<popup id="folderPaneContext"/>
+<popup id="attachmentTreeContext"/>
+<tooltip id="attachmentTreeTooltip"/>
 
-  <popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
-      <menuitem label="&AddToAddressBook.label;"
-                accesskey="&AddToAddressBook.accesskey;"
-                oncommand="AddNodeToAddressBook(document.popupNode)"/>
-      <menuitem label="&SendMailTo.label;"
-                accesskey="&SendMailTo.accesskey;"
-                oncommand="SendMailToNode(document.popupNode)"/>
-      <menuitem label="&CopyEmailAddress.label;"
-                accesskey="&CopyEmailAddress.accesskey;"
-                oncommand="CopyEmailAddress(document.popupNode)"/>
-      <menuitem label="&CreateFilter.label;"
-                accesskey="&CreateFilter.accesskey;"
-                oncommand="CreateFilter(document.popupNode)"
-                observes="cmd_createFilterFromPopup"/>  
-  </popup>
+<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
+    <menuitem label="&AddToAddressBook.label;"
+              accesskey="&AddToAddressBook.accesskey;"
+              oncommand="AddNodeToAddressBook(document.popupNode)"/>
+    <menuitem label="&SendMailTo.label;"
+              accesskey="&SendMailTo.accesskey;"
+              oncommand="SendMailToNode(document.popupNode)"/>
+    <menuitem label="&CopyEmailAddress.label;"
+              accesskey="&CopyEmailAddress.accesskey;"
+              oncommand="CopyEmailAddress(document.popupNode)"/>
+    <menuitem label="&CreateFilter.label;"
+              accesskey="&CreateFilter.accesskey;"
+              oncommand="CreateFilter(document.popupNode)"
+              observes="cmd_createFilterFromPopup"/>  
+</popup>
 
-  <popup id="allHeadersPopup"  onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
-    <hbox id="allHeadersPopupContainer">
-    </hbox>
-  </popup>
+<popup id="allHeadersPopup"  onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
+  <hbox id="allHeadersPopupContainer">
+  </hbox>
+</popup>
 
-  <popup id="messagePaneContext"/>
-  <popup id="sidebarPopup"/>
-  <popup id="folderTooltip"/>
-</popupset>
+<popup id="messagePaneContext"/>
+<popup id="sidebarPopup"/>
 
   <toolbox id="mailToolbarToolbox" class="toolbox-top">
     <menubar id="mailMenubar"/>
diff --git a/mozilla/mailnews/base/resources/content/mailTasksOverlay.xul b/mozilla/mailnews/base/resources/content/mailTasksOverlay.xul
index 1723cc744c3..60ccb868de3 100644
--- a/mozilla/mailnews/base/resources/content/mailTasksOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailTasksOverlay.xul
@@ -61,9 +61,9 @@
 
   <hbox id="component-bar">
     <toolbarbutton class="taskbutton" id="mini-mail" oncommand="toMessengerWindow()" 
-            position="2" tooltip="aTooltip" tooltiptext="&taskMessenger.tooltip;"/>
+            position="2" tooltiptext="&taskMessenger.tooltip;"/>
     <toolbarbutton class="taskbutton" id="mini-addr" oncommand="toAddressBook();"
-            position="4" tooltip="aTooltip" tooltiptext="&taskAddressBook.tooltip;"/>
+            position="4" tooltiptext="&taskAddressBook.tooltip;"/>
   </hbox>
   
   <menupopup id="taskPopup">
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 6c93fa12543..d1583c3d51f 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -785,7 +785,7 @@ Rights Reserved.
 
 </popup>
 
-<menubar id="mailMenubar" grippytooltip="aTooltip" grippytooltiptext="&menuBar.tooltip;">
+<menubar id="mailMenubar" grippytooltiptext="&menuBar.tooltip;">
   <menu id="menu_File" >
     <menupopup id="menu_FilePopup" onpopupshowing="file_init();">
       <menuitem label="&newMsgCmd.label;"
@@ -1267,11 +1267,11 @@ Rights Reserved.
 </menubar>
 
 <toolbox id="mailToolbarToolbox">
-  <toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed" grippytooltip="aTooltip" grippytooltiptext="&mailToolbar.tooltip;">
+  <toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed" grippytooltiptext="&mailToolbar.tooltip;">
     <hbox id="toolbar_button_box">
       <toolbarbutton type="menu-button" id="button-getmsg" 
                      class="toolbarbutton-1"
-                     label="&getMsgButton.label;" crop="right" tooltip="aTooltip" 
+                     label="&getMsgButton.label;" crop="right"
                      sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
                      sortDirection="ascending"
                      tooltiptext="&getMsgButton.tooltip;" 
@@ -1296,16 +1296,16 @@ Rights Reserved.
           </template>
           <menupopup/>
       </toolbarbutton>
-      <toolbarbutton id="button-newmsg" class="toolbarbutton-1" label="&newMsgButton.label;" tooltip="aTooltip" tooltiptext="&newMsgButton.tooltip;" oncommand="MsgNewMessage(event)"/>
+      <toolbarbutton id="button-newmsg" class="toolbarbutton-1" label="&newMsgButton.label;" tooltiptext="&newMsgButton.tooltip;" oncommand="MsgNewMessage(event)"/>
       <toolbarseparator class="toolbarseparator-primary"/>
-      <toolbarbutton id="button-reply" class="toolbarbutton-1" label="&replyButton.label;" tooltip="aTooltip" tooltiptext="&replyButton.tooltip;" observes="button_reply" oncommand="MsgReplyMessage(event)"/>
-      <toolbarbutton class="toolbarbutton-1" id="button-replyall" label="&replyAllButton.label;" tooltip="aTooltip" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" oncommand="MsgReplyToAllMessage(event)"/>
-      <toolbarbutton class="toolbarbutton-1" id="button-forward" label="&forwardButton.label;" tooltip="aTooltip"  tooltiptext="&forwardButton.tooltip;" observes="button_forward" oncommand="MsgForwardMessage(event)"/>
+      <toolbarbutton id="button-reply" class="toolbarbutton-1" label="&replyButton.label;" tooltiptext="&replyButton.tooltip;" observes="button_reply" oncommand="MsgReplyMessage(event)"/>
+      <toolbarbutton class="toolbarbutton-1" id="button-replyall" label="&replyAllButton.label;" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" oncommand="MsgReplyToAllMessage(event)"/>
+      <toolbarbutton class="toolbarbutton-1" id="button-forward" label="&forwardButton.label;" tooltiptext="&forwardButton.tooltip;" observes="button_forward" oncommand="MsgForwardMessage(event)"/>
       <toolbarseparator class="toolbarseparator-primary"/>
       <toolbarbutton type="menu" id="button-file" class="toolbarbutton-1" 
                   label="&fileButton.label;" observes="button_file"
                   datasources="rdf:null" 
-                  tooltip="aTooltip" tooltiptext="&fileButton.tooltip;"
+                  tooltiptext="&fileButton.tooltip;"
                   sortResource="http://home.netscape.com/NC-rdf#FolderTreeName" sortDirection="ascending">
         <template> 
         <rule nc:NoSelect="true" iscontainer="true" isempty="false">
@@ -1369,10 +1369,10 @@ Rights Reserved.
         </template>
         <menupopup/>
       </toolbarbutton>
-      <toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;"  oncommand="goDoCommand('cmd_nextUnreadMsg')" tooltip="aTooltip" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
-      <toolbarbutton class="toolbarbutton-1" id="button-delete" label="&deleteButton.label;"  tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/>
+      <toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;"  oncommand="goDoCommand('cmd_nextUnreadMsg')" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
+      <toolbarbutton class="toolbarbutton-1" id="button-delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/>
       <toolbarbutton type="menu-button" id="button-mark" class="toolbarbutton-1" label="&markButton.label;" hidden="true" oncommand="goDoCommand('button_mark')"
-                  crop="right" observes="button_mark" tooltip="aTooltip" tooltiptext="&markButton.tooltip;">  
+                  crop="right" observes="button_mark" tooltiptext="&markButton.tooltip;">  
             <menupopup onpopupshowing="InitMessageMark()">
                 <menuitem type="checkbox" key="key_toggleRead" id="markReadToolbarItem" label="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" observes="cmd_markAsRead" default="true" />
                 <menuitem label="&markThreadAsReadCmd.label;"  accesskey="&markThreadAsReadCmd.accesskey;" observes="cmd_markThreadAsRead"/>
@@ -1382,15 +1382,15 @@ Rights Reserved.
             </menupopup>
       </toolbarbutton>
       <toolbarbutton id="button-print" type="menu-button" class="toolbarbutton-1" label="&printButton.label;" 
-                  crop="right" observes="button_print" oncommand="goDoCommand('cmd_print')" tooltip="aTooltip" tooltiptext="&printButton.tooltip;">  
+                  crop="right" observes="button_print" oncommand="goDoCommand('cmd_print')" tooltiptext="&printButton.tooltip;">  
         <menupopup id="printMenu">
           <menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" default="true"/>
           </menupopup>
       </toolbarbutton>
-      <toolbarbutton class="toolbarbutton-1" id="button-stop" label="&stopButton.label;"  tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" oncommand="MsgStop();"/>
+      <toolbarbutton class="toolbarbutton-1" id="button-stop" label="&stopButton.label;" tooltiptext="&stopButton.tooltip;" oncommand="MsgStop();"/>
       <spacer flex="1"/>
             <hbox id="throbber-box" align="center">
-                <button id="navigator-throbber" oncommand='goClickThrobber("messenger.throbber.url")' tooltip="aTooltip" tooltiptext="&throbber.tooltip;"/>
+                <button id="navigator-throbber" oncommand="goClickThrobber('messenger.throbber.url')" tooltiptext="&throbber.tooltip;"/>
             </hbox>
     </hbox>
   </toolbar>
@@ -1399,7 +1399,7 @@ Rights Reserved.
 <hbox id="searchBox" persist="collapsed" align="center">
   <label id="searchCriteria" value="&SearchSubjectOrSender.label;"/>
   <textbox id="searchInput" flex ="1" oninput = "onSearchInput(event);" />
-  <button id="advancedButton" label="&advancedButton.label;" tooltip="aTooltip" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"/>
+  <button id="advancedButton" label="&advancedButton.label;" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"/>
 </hbox>
 
 <statusbar class="chromeclass-status" id="status-bar"> 
diff --git a/mozilla/mailnews/base/resources/content/messageWindow.xul b/mozilla/mailnews/base/resources/content/messageWindow.xul
index 38693544008..aafe789934a 100644
--- a/mozilla/mailnews/base/resources/content/messageWindow.xul
+++ b/mozilla/mailnews/base/resources/content/messageWindow.xul
@@ -117,10 +117,8 @@ Rights Reserved.
 
     <popup id="messagePaneContext"/>
   </popupset>
-  <popupset id="aTooltipSet">
-    <popup id="attachmentTreeContext"/>
-  </popupset>
 
+  <popup id="attachmentTreeContext"/>
 
   <toolbox id="mailToolbarToolbox">
     <menubar id="mailMenubar"/>
diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul
index 8809066526e..d9821b0f7f7 100644
--- a/mozilla/mailnews/base/resources/content/messenger.xul
+++ b/mozilla/mailnews/base/resources/content/messenger.xul
@@ -114,38 +114,34 @@ Rights Reserved.
   <keyset id="tasksKeys"/>
 </keyset>
 
-<popupset id="aTooltipSet">
+<popup id="threadPaneContext"/>
+<popup id="folderPaneContext"/>
+<popup id="attachmentTreeContext"/>
+<tooltip id="attachmentTreeTooltip"/>
 
-  <popup id="threadPaneContext"/>
-  <popup id="folderPaneContext"/>
-  <popup id="attachmentTreeContext"/>
-  <popup id="attachmentTreeTooltip"/>
+<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
+    <menuitem label="&AddToAddressBook.label;"
+              accesskey="&AddToAddressBook.accesskey;"
+              oncommand="AddNodeToAddressBook(document.popupNode)"/>
+    <menuitem label="&SendMailTo.label;"
+              accesskey="&SendMailTo.accesskey;"
+              oncommand="SendMailToNode(document.popupNode)"/>
+    <menuitem label="&CopyEmailAddress.label;"
+              accesskey="&CopyEmailAddress.accesskey;"
+              oncommand="CopyEmailAddress(document.popupNode)"/>  
+    <menuitem label="&CreateFilter.label;"
+              accesskey="&CreateFilter.accesskey;"
+              oncommand="CreateFilter(document.popupNode)"
+              observes="cmd_createFilterFromPopup"/>  
+</popup>
 
-  <popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
-      <menuitem label="&AddToAddressBook.label;"
-                accesskey="&AddToAddressBook.accesskey;"
-                oncommand="AddNodeToAddressBook(document.popupNode)"/>
-      <menuitem label="&SendMailTo.label;"
-                accesskey="&SendMailTo.accesskey;"
-                oncommand="SendMailToNode(document.popupNode)"/>
-      <menuitem label="&CopyEmailAddress.label;"
-                accesskey="&CopyEmailAddress.accesskey;"
-                oncommand="CopyEmailAddress(document.popupNode)"/>  
-      <menuitem label="&CreateFilter.label;"
-                accesskey="&CreateFilter.accesskey;"
-                oncommand="CreateFilter(document.popupNode)"
-                observes="cmd_createFilterFromPopup"/>  
-  </popup>
+<popup id="allHeadersPopup"  onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
+  <hbox id="allHeadersPopupContainer">
+  </hbox>
+</popup>
 
-  <popup id="allHeadersPopup"  onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
-    <hbox id="allHeadersPopupContainer">
-    </hbox>
-  </popup>
-
-  <popup id="messagePaneContext"/>
-  <popup id="folderTooltip"/>
-  <popup id="sidebarPopup"/>
-</popupset>
+<popup id="messagePaneContext"/>
+<popup id="sidebarPopup"/>
 
   <toolbox id="mailToolbarToolbox" class="toolbox-top">
     <menubar id="mailMenubar"/>
diff --git a/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.js b/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.js
index 1831de91c8c..6660696ebed 100644
--- a/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.js
+++ b/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.js
@@ -857,8 +857,8 @@ function displayAttachmentsForCollapsedView()
 function FillInAttachmentTooltip(cellNode)
 {
   var attachmentName = cellNode.getAttribute("label");
-  var textNode = document.getElementById("attachmentTreeTooltipText");
-  textNode.setAttribute('value', attachmentName);
+  var tooltipNode = document.getElementById("attachmentTreeTooltip");
+  tooltipNode.setAttribute("label", attachmentName);
   return true;
 }
 
diff --git a/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul b/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul
index a54e918e818..f87c4be8170 100644
--- a/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul
@@ -48,9 +48,8 @@ Rights Reserved.
   <menuitem label="&saveAllAttachmentsCmd.label;" oncommand="SaveAllAttachments();"/>
 </popup>
 
-<popup id="attachmentTreeTooltip" class="tooltip" onpopupshowing="return FillInAttachmentTooltip(document.tooltipNode);" > 
-    <label id="attachmentTreeTooltipText"/>
-</popup>
+<tooltip id="attachmentTreeTooltip"
+         onpopupshowing="return FillInAttachmentTooltip(document.tooltipNode);"/> 
 
 <hbox id="msgHeaderView" persist="state">
 
diff --git a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
index 82f32b39e0a..9bc13b6cbd0 100644
--- a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
+++ b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
@@ -2047,7 +2047,6 @@ function AddAttachment(attachment)
       attachment.name = gMsgCompose.AttachmentPrettyName(attachment.url);
     cell.setAttribute("label", attachment.name);    //use for display only
     cell.attachment = attachment;   //full attachment object stored here
-    cell.setAttribute("tooltip", "aTooltip");
     try {
       cell.setAttribute("tooltiptext", unescape(attachment.url));
     }
diff --git a/mozilla/mailnews/compose/resources/content/messengercompose.xul b/mozilla/mailnews/compose/resources/content/messengercompose.xul
index 0abe6e564b1..30e5689c6e7 100644
--- a/mozilla/mailnews/compose/resources/content/messengercompose.xul
+++ b/mozilla/mailnews/compose/resources/content/messengercompose.xul
@@ -140,7 +140,6 @@
   <popup id="TextColorPopup"/>
   <popup id="BackColorPopup"/>
 </popupset>
-<popupset id="aTooltipSet"/>
 
 <keyset id="tasksKeys">
   <!-- File Menu -->
@@ -178,7 +177,7 @@
 </popupset>
 
   <toolbox class="toolbox-top">
-    <menubar id="compose-menubar" grippytooltip="aTooltip" grippytooltiptext="&menuBar.tooltip;">
+    <menubar id="compose-menubar" grippytooltiptext="&menuBar.tooltip;">
       <menu id="menu_File">
         <menupopup id="menu_FilePopup">
           <menuitem label="&newMessage.label;" accesskey="&newMessage.accesskey;" key="key_newMessage" oncommand="goOpenNewMessage();"/>
@@ -353,11 +352,11 @@
       <menu id="menu_Help"/>
     </menubar>
 
-    <toolbar class="toolbar-primary chromeclass-toolbar" id="composeToolbar" persist="collapsed" grippytooltip="aTooltip" grippytooltiptext="&mailToolbar.tooltip;">
+    <toolbar class="toolbar-primary chromeclass-toolbar" id="composeToolbar" persist="collapsed" grippytooltiptext="&mailToolbar.tooltip;">
       <hbox id="toolbar_button_box">
        <toolbarbutton class="toolbarbutton-1"
                id="button-send" label="&sendButton.label;"
-               tooltip="aTooltip" tooltiptext="&sendButton.tooltip;" 
+               tooltiptext="&sendButton.tooltip;" 
                command="cmd_sendButton"
                now_label="&sendButton.label;"
                now_tooltiptext="&sendButton.tooltip;"
@@ -368,11 +367,11 @@
        <toolbarseparator class="toolbarseparator-primary"/>
        <toolbarbutton class="toolbarbutton-1"
                id="button-address" label="&addressButton.label;" 
-               tooltip="aTooltip" tooltiptext="&addressButton.tooltip;" 
+               tooltiptext="&addressButton.tooltip;" 
                command="cmd_selectAddress"/>
        <toolbarbutton class="toolbarbutton-1"
                id="button-attach" label="&attachButton.label;" 
-               tooltip="aTooltip" tooltiptext="&attachButton.tooltip;" 
+               tooltiptext="&attachButton.tooltip;" 
                command="cmd_attachFile"/>
        <toolbarbutton class="toolbarbutton-1"
                id="spellingButton" label="&spellingButton.label;" 
@@ -380,19 +379,19 @@
        <toolbarseparator class="toolbarseparator-primary"/>
        <toolbarbutton class="toolbarbutton-1"
                id="button-save" label="&saveButton.label;" 
-               tooltip="aTooltip" tooltiptext="&saveButton.tooltip;" 
+               tooltiptext="&saveButton.tooltip;" 
                command="cmd_saveDefault"/>
        <spacer flex="1"/>
        <hbox id="throbber-box" align="center">
          <button id="navigator-throbber" 
-               oncommand="goClickThrobber('compose.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
+               oncommand="goClickThrobber('compose.throbber.url')" tooltiptext="&throbber.tooltip;">
            <observes element="broadcaster_throbber" attribute="busy"/>
          </button>
        </hbox>
        </hbox>
     </toolbar>
   
-    <toolbar id="MsgHeadersToolbar" persist="collapsed" tborient="vertical" tbalign="stretch" flex="1" grippytooltip="aTooltip" grippytooltiptext="&addressBar.tooltip;">
+    <toolbar id="MsgHeadersToolbar" persist="collapsed" tborient="vertical" tbalign="stretch" flex="1" grippytooltiptext="&addressBar.tooltip;">
       <hbox id="msgheaderstoolbar-box" flex="1">
         <vbox flex="75">
           <hbox align="center">
@@ -431,7 +430,7 @@
     </toolbar>
   
     <!-- These toolbar items get filled out from the editorOverlay -->
-    <toolbar class="chromeclass-toolbar" id="FormatToolbar" persist="collapsed" tbautostretch="never" grippytooltip="aTooltip" grippytooltiptext="&formatToolbar.tooltip;">
+    <toolbar class="chromeclass-toolbar" id="FormatToolbar" persist="collapsed" tbautostretch="never" grippytooltiptext="&formatToolbar.tooltip;">
       <menulist id="ParagraphSelect"/>
       <menulist id="FontFaceSelect"/>
       <stack id="ColorButtons"/>
diff --git a/mozilla/netwerk/resources/content/securityOverlay.xul b/mozilla/netwerk/resources/content/securityOverlay.xul
index 6edcc78fc72..5fa4d8b28c2 100644
--- a/mozilla/netwerk/resources/content/securityOverlay.xul
+++ b/mozilla/netwerk/resources/content/securityOverlay.xul
@@ -9,6 +9,6 @@
 
   <script type="application/x-javascript" src="chrome://communicator/content/securityUI.js" />
 
-  <statusbarpanel id="security-button" onclick="displayPageInfo()" tooltip="aTooltip" tooltiptext="&lockIcon.label;"/>    
+  <statusbarpanel id="security-button" onclick="displayPageInfo()" tooltiptext="&lockIcon.label;"/>    
       
 </overlay>
diff --git a/mozilla/themes/classic/global/win/global.css b/mozilla/themes/classic/global/win/global.css
index 43a46279fb0..29ed146b7b4 100644
--- a/mozilla/themes/classic/global/win/global.css
+++ b/mozilla/themes/classic/global/win/global.css
@@ -238,9 +238,3 @@ caption
     background-color      : -moz-Dialog;
   }
 
-.tooltip-label
-  {
-    margin                : 0px;
-  }
-  
-  
diff --git a/mozilla/themes/modern/global/global.css b/mozilla/themes/modern/global/global.css
index 54f6903ed88..aeebb942f4a 100644
--- a/mozilla/themes/modern/global/global.css
+++ b/mozilla/themes/modern/global/global.css
@@ -215,10 +215,6 @@ caption {
 
 /* ::::: miscellaneous ::::: */
 
-.tooltip-label {
-  margin: 0px;
-}
-
 .toolbar-focustarget {
   -moz-user-focus: ignore !important;
 }
diff --git a/mozilla/xpfe/browser/resources/content/navWidgetBindings.xml b/mozilla/xpfe/browser/resources/content/navWidgetBindings.xml
index dc5df221bb6..d2df768b5e4 100644
--- a/mozilla/xpfe/browser/resources/content/navWidgetBindings.xml
+++ b/mozilla/xpfe/browser/resources/content/navWidgetBindings.xml
@@ -15,9 +15,9 @@
         <xul:menulist editable="true" class="location-field" flex="1"
                       autocomplete="true" timeout="300" searchSessionType="urlbar"
                       inherits="label=content"
-                      tooltip="aTooltip" tooltiptext="" ubattr="field"/>
+                      tooltiptext="" ubattr="field"/>
         <xul:button class="button-toolbar-3 go-button" label="Go" 
-                    ubattr="go-button" tooltip="aTooltip" tooltiptext="Go"/> 
+                    ubattr="go-button" tooltiptext="Go"/> 
         <xul:box class="urlbar-post-buttons">
           <children includes="button"/>
         </xul:box>
@@ -48,7 +48,7 @@
       <xul:box align="center" flex="1" class="menulist-container">
         <xul:image class="menulist-icon" inherits="src" emattr="icon"/>
         <xul:textbox class="menulist-editable-textbox plain" flex="1" emattr="field"
-                       inherits="autocomplete,searchSessionType,timeout,tooltip=fieldtooltip,tooltiptext=fieldtooltiptext,value"/>
+                       inherits="autocomplete,searchSessionType,timeout,tooltiptext=fieldtooltiptext,value"/>
         <xul:menubutton class="menulist-editable-menubutton menubutton-icon" emattr="menubutton">
           <xul:menupopup class="menulist-editable-menupopup" emattr="menupopup"
                          popupalign="topright" popupanchor="bottomright">
@@ -116,7 +116,7 @@
     <content>
       <xul:menubutton id="back-button" label="Back" buttontooltiptext="Go Back"
                       oncommand="gotoHistoryIndex(event);" buttonaction="BrowserBack();" context="backMenu"
-                      class="menubutton-dual toolbar top" crop="right" tooltip="aTooltip" observes="canGoBack">  
+                      class="menubutton-dual toolbar top" crop="right" observes="canGoBack">  
         <xul:menupopup onpopupshowing="BrowserBackMenu(event);"/>
       </xul:menubutton>
     </content>
diff --git a/mozilla/xpfe/browser/resources/content/navigator-toolbars.xul b/mozilla/xpfe/browser/resources/content/navigator-toolbars.xul
index b6f5c193a91..a71b979504a 100644
--- a/mozilla/xpfe/browser/resources/content/navigator-toolbars.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator-toolbars.xul
@@ -36,7 +36,6 @@
     <rule NC:Element="toolbar">
       <toolbar uri="..."
                class="http://home.netscape.com/NC-rdf#Class"
-               grippytooltip="aTooltip"
                grippytooltiptext="http://home.netscape.com/NC-rdf#Name"/>
     </rule>
     -->
@@ -62,7 +61,7 @@
       </bindings>
       <action>
         <toolbar uri="?item" class="?item-class" 
-                 grippytooltip="aTooltip" grippytooltiptext="?item-name"/>
+                 grippytooltiptext="?item-name"/>
       </action>
     </rule>
     
diff --git a/mozilla/xpfe/browser/resources/content/toolbarTest.xul b/mozilla/xpfe/browser/resources/content/toolbarTest.xul
index 039761ec360..ef6d3dc712c 100644
--- a/mozilla/xpfe/browser/resources/content/toolbarTest.xul
+++ b/mozilla/xpfe/browser/resources/content/toolbarTest.xul
@@ -11,8 +11,6 @@
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         orient="vertical" onload="resetToolbars();">
 
-  <popupset id="aTooltipSet"/>
-        
   <script>
   <![CDATA[
   var rdfs = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
@@ -135,7 +133,7 @@
         </bindings>
         <action>
           <toolbar uri="?item" class="?item-class" 
-                   grippytooltip="aTooltip" grippytooltiptext="?item-name"/>
+                   grippytooltiptext="?item-name"/>
         </action>
       </rule>
 
@@ -181,7 +179,7 @@
         </bindings>
         <action>
           <button uri="?items" class="?item-class button-toolbar bookmarkitem" label="?uri"
-                  tooltip="aTooltip" tooltiptext="?item-name" 
+                  tooltiptext="?item-name" 
                   src="?item-icon" type="?item-icon" crop="right"/>
         </action>
       </rule>