diff --git a/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd b/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd
index 269617befec..f4ff216b8cb 100644
--- a/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd
+++ b/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd
@@ -14,7 +14,7 @@
    - 
    - The Initial Developer of the Original Code is Netscape
    - Communications Corporation. Portions created by Netscape are
-   - Copyright (C) 1999 Netscape Communications Corporation. All
+   - Copyright (C) 1999-2000 Netscape Communications Corporation. All
    - Rights Reserved.
    - 
    - Contributor(s):
@@ -269,7 +269,7 @@
 <!ENTITY formatmenu.accesskey "o">
 
 <!-- Font Face SubMenu -->
-<!ENTITY FontFaceSelect.tooltip "Font tooltip for formatting toolbar">
+<!ENTITY FontFaceSelect.tooltip "Choose a font from the drop-down list">
 <!ENTITY fontfaceMenu.label "Font">
 <!ENTITY formatfontmenu.accesskey "f">
 <!ENTITY fontVarWidth.label "Variable Width">
@@ -284,7 +284,7 @@
 <!ENTITY fontcourier.accesskey "c">
 
 <!-- Font Size SubMenu -->
-<!ENTITY FontSizeSelect.tooltip "Font Size tooltip for formatting toolbar">
+<!ENTITY FontSizeSelect.tooltip "Choose a font size">
 <!ENTITY decreaseFontSize.label "Decrease">
 <!ENTITY decreasefontsize.accesskey "d">
 <!ENTITY decreaseFontSize.keybinding "[">
@@ -423,7 +423,7 @@ Menu item text for "[Page|Table|Cell] Background color" is filled from
 <!ENTITY listprops.accesskey "l">
 
 <!-- Shared by Heading and Paragraph menu, and in toolbar menulist -->
-<!ENTITY ParagraphSelect.tooltip "tooltip for Paragraph menu on formatting toolbar">
+<!ENTITY ParagraphSelect.tooltip "Choose a paragraph format from the drop-down list">
 <!ENTITY normalCmd.label "Normal">
 <!ENTITY normal.accesskey "n">
 <!ENTITY advancedPropertiesCmd.label "Advanced Properties...">
@@ -549,43 +549,43 @@ Menu item text for "[Page|Table|Cell] Background color" is filled from
 <!ENTITY setFocusCmd.label "Set Focus">
 
 <!-- toolbar-only items -->
-<!ENTITY newToolbarCmd.tooltip "New Blank Page">
+<!ENTITY newToolbarCmd.tooltip "Create a new blank page">
 <!ENTITY openToolbarCmd.label "Open">
-<!ENTITY openToolbarCmd.tooltip "Open Local Page">
-<!ENTITY saveToolbarCmd.tooltip "Save Page Locally">
+<!ENTITY openToolbarCmd.tooltip "Open a local file">
+<!ENTITY saveToolbarCmd.tooltip "Save file locally">
 <!ENTITY previewToolbarCmd.label "Preview">
-<!ENTITY previewToolbarCmd.tooltip "Preview Page in Navigator">
+<!ENTITY previewToolbarCmd.tooltip "Preview this page in Navigator">
 <!ENTITY printToolbarCmd.label "Print">
-<!ENTITY printToolbarCmd.tooltip "Print Page">
+<!ENTITY printToolbarCmd.tooltip "Print this page">
 <!ENTITY findToolbarCmd.label "Find">
-<!ENTITY findToolbarCmd.tooltip "Find string in Page">
+<!ENTITY findToolbarCmd.tooltip "Find text in page">
 <!ENTITY spellToolbarCmd.label "Spell">
 <!ENTITY spellToolbarCmd.tooltip "Check Spelling of Selection or Entire Page">
 <!ENTITY imageToolbarCmd.label "Image">
-<!ENTITY imageToolbarCmd.tooltip "Edit Selected Image Properties or Insert New Image">
+<!ENTITY imageToolbarCmd.tooltip "Insert new image or edit selected image properties">
 <!ENTITY hruleToolbarCmd.label "H.Line">
-<!ENTITY hruleToolbarCmd.tooltip "Edit Selected Horizontal Line or Insert New Horizontal Line">
+<!ENTITY hruleToolbarCmd.tooltip "Insert horizontal line or edit selected line properties">
 <!ENTITY tableToolbarCmd.label "Table">
-<!ENTITY tableToolbarCmd.tooltip "Edit Selected Table or Insert New Table">
+<!ENTITY tableToolbarCmd.tooltip "Insert new table or edit selected table properties">
 <!ENTITY linkToolbarCmd.label "Link">
-<!ENTITY linkToolbarCmd.tooltip "Edit Selected Link or Insert New Link">
+<!ENTITY linkToolbarCmd.tooltip "Insert new link or edit selected link properties">
 <!ENTITY anchorToolbarCmd.label "Anchor">
-<!ENTITY anchorToolbarCmd.tooltip "Edit Selected Anchor or Insert New Anchor (Target)">
+<!ENTITY anchorToolbarCmd.tooltip "Insert new anchor (target) or edit anchor properties">
 <!ENTITY textColorCaption.label "Text Color">
-<!ENTITY TextColorPopupButton.tooltip "Text Color tooltip">
-<!ENTITY BackColorPopupButton.tooltip "Page Background Color tooltip">
+<!ENTITY TextColorPopupButton.tooltip "Choose color for text">
+<!ENTITY BackColorPopupButton.tooltip "Choose color for page background">
 
 <!-- editor toolbar -->
 <!ENTITY decreaseFontSizeToolbarCmd.tooltip "Decrease Font Size">
 <!ENTITY increaseFontSizeToolbarCmd.tooltip "Increase Font Size">
-<!ENTITY boldToolbarCmd.tooltip "Make Selected or New Text Bold">
-<!ENTITY italicToolbarCmd.tooltip "Make Selected or New Text Italic">
-<!ENTITY underlineToolbarCmd.tooltip "Make Selected or New Text Underline">
-<!ENTITY bulletListToolbarCmd.tooltip "Make Bulleted List">
-<!ENTITY numberListToolbarCmd.tooltip "Make Numbered List">
-<!ENTITY outdentToolbarCmd.tooltip "Outdent Text (Move to the left)">
-<!ENTITY indentToolbarCmd.tooltip "Indent Text (Move to the right)">
-<!ENTITY AlignPopupButton.tooltip "Set Alignment of Text">
+<!ENTITY boldToolbarCmd.tooltip "Bold">
+<!ENTITY italicToolbarCmd.tooltip "Italic">
+<!ENTITY underlineToolbarCmd.tooltip "Underline">
+<!ENTITY bulletListToolbarCmd.tooltip "Apply bulleted list format">
+<!ENTITY numberListToolbarCmd.tooltip "Apply numbered list format">
+<!ENTITY outdentToolbarCmd.tooltip "Outdent text (move left)">
+<!ENTITY indentToolbarCmd.tooltip "Indent text (move right)">
+<!ENTITY AlignPopupButton.tooltip "Choose text alignment">
 
 <!-- formatting toolbar not used, but may be in future -->
 <!ENTITY formatToolbar.boldChar "B">
@@ -601,11 +601,11 @@ Menu item text for "[Page|Table|Cell] Background color" is filled from
 
 <!-- Display Mode Toolbar -->
 <!ENTITY normalMode.label "Normal">
-<!ENTITY normalMode.tooltip "Normal Edit Mode (Default)">
+<!ENTITY normalMode.tooltip "Show table borders and named anchors">
 <!ENTITY previewMode.label "Edit Preview">
-<!ENTITY previewMode.tooltip "Edit Preview Mode (???)">
+<!ENTITY previewMode.tooltip "Display as WYSIWYG (browser)">
 <!ENTITY showAllTags.label "Show All Tags">
-<!ENTITY showAllTags.tooltip "Show All Tags Mode (Edit with each html tag iconified)">
+<!ENTITY showAllTags.tooltip "Display icons for all HTML tags">
 <!ENTITY sourceMode.label "HTML Source">
-<!ENTITY sourceMode.tooltip "HTML Source (Edit the Raw HTML Source)">
-<!ENTITY ToggleEditModeType.tooltip "Change between icon and text labeled tabs">
+<!ENTITY sourceMode.tooltip "Edit HTML source">
+<!ENTITY ToggleEditModeType.tooltip "Toggle between tab icons and text labels ">
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdDialogOverlay.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EdDialogOverlay.dtd
index 3b72c4264da..2794dddb4e4 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EdDialogOverlay.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EdDialogOverlay.dtd
@@ -14,12 +14,12 @@
    - 
    - The Initial Developer of the Original Code is Netscape
    - Communications Corporation. Portions created by Netscape are
-   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Copyright (C) 1998-2000 Netscape Communications Corporation. All
    - Rights Reserved.
    - 
    - Contributor(s): 
   -->
 
 <!ENTITY AdvancedEditButton.label "Advanced Edit...">
-<!ENTITY AdvancedEditButton.tooltip "Edit additional properties for this object">
+<!ENTITY AdvancedEditButton.tooltip "Add or modify HTML and style attributes, and JavaScript events for this object">
 <!ENTITY chooseButton.label "Choose File...">
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdNamedAnchorProperties.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EdNamedAnchorProperties.dtd
index 083ce391300..8e3ace1992f 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EdNamedAnchorProperties.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EdNamedAnchorProperties.dtd
@@ -14,7 +14,7 @@
    - 
    - The Initial Developer of the Original Code is Netscape
    - Communications Corporation. Portions created by Netscape are
-   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Copyright (C) 1998-2000 Netscape Communications Corporation. All
    - Rights Reserved.
    - 
    - Contributor(s): 
@@ -22,7 +22,7 @@
 
 <!ENTITY windowTitle.label "Named Anchor Properties">
 <!ENTITY anchorNameEditField.label "Anchor Name:">
-<!ENTITY noSpacesMsg.label "(Spaces are not allowed.)">
-<!ENTITY nameInput.tooltip "tooltip for anchor name edit field">
+<!ENTITY noSpacesMsg.label "(Do not include spaces)">
+<!ENTITY nameInput.tooltip "Enter a name for this anchor (target). Click Advanced Edit to add or modify additional properties for this anchor.">