diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
index e3244018144..cd14c4c2541 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
@@ -52,20 +52,17 @@
     <columns><column/><column/><column/></columns>
     <rows>
       <row valign="baseline" text-align="right" autostretch="never">
-        <text class="label align-right" text-align="right" value="&numRowsEditField.label;"
-            tooltip="aTooltip" tooltiptext="&numRowsEditField.tooltip;" />
+        <text class="label align-right" text-align="right" value="&numRowsEditField.label;" />
         <textfield class="narrow" id="rowsInput" onkeyup="forceInteger(this.id)" />
         <spring/>
       </row>
       <row valign="baseline" text-align="right" autostretch="never">
-        <text class="label align-right" value="&numColumnsEditField.label;"
-            tooltip="aTooltip" tooltiptext="&numColumnsEditField.tooltip;" />
+        <text class="label align-right" value="&numColumnsEditField.label;" />
         <textfield class="narrow" id="columnsInput" onkeyup="forceInteger(this.id)" />
         <spring/>
       </row>
       <row valign="baseline" text-align="right" autostretch="never">
-        <text class="label align-right" value="&widthEditField.label;"
-            tooltip="aTooltip" tooltiptext="&widthEditField.tooltip;" />
+        <text class="label align-right" value="&widthEditField.label;" />
         <textfield class="narrow" id="widthInput" onkeyup="forceInteger(this.id)" />
         <menulist id="widthPixelOrPercentMenulist"><menupopup/></menulist>
           <!-- child elements are appended by JS -->
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdDialogOverlay.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EdDialogOverlay.dtd
index 2794dddb4e4..1e01f074e84 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EdDialogOverlay.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EdDialogOverlay.dtd
@@ -21,5 +21,5 @@
   -->
 
 <!ENTITY AdvancedEditButton.label "Advanced Edit...">
-<!ENTITY AdvancedEditButton.tooltip "Add or modify HTML and style attributes, and JavaScript events for this object">
+<!ENTITY AdvancedEditButton.tooltip "Add or modify HTML elements, style attributes, and JavaScript">
 <!ENTITY chooseButton.label "Choose File...">
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd
index 2ff4ecbbdc7..4ca47157cc8 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd
@@ -24,14 +24,11 @@
 <!ENTITY windowTitle.label "Insert Table">
 
 <!ENTITY numRowsEditField.label "Number of rows:">
-<!ENTITY numRowsEditField.tooltip "Number of rows tooltip">
 <!ENTITY numColumnsEditField.label "Number of columns:">
-<!ENTITY numColumnsEditField.tooltip "Number of columns tooltip">
 <!ENTITY widthEditField.label "Table width:">
-<!ENTITY widthEditField.tooltip "Table width tooltip">
 <!ENTITY heightEditField.label "Table height:">
-<!ENTITY heightEditField.tooltip "Table height tooltip">
+<!ENTITY heightEditField.tooltip "Type a number, then choose pixels or a percentage of the window">
 <!ENTITY borderEditField.label "Border:">
-<!ENTITY borderEditField.tooltip "Border tooltip">
+<!ENTITY borderEditField.tooltip "Type a number for the table's border, or type zero (0) for no border">
 <!ENTITY pixels.label "pixels">
-<!ENTITY AdvancedEditButton.tooltip "Edit additional properties for this new table">
+<!ENTITY AdvancedEditButton.tooltip "Add or modify HTML elements, style attributes, and JavaScript">