diff --git a/mozilla/editor/ui/Makefile.in b/mozilla/editor/ui/Makefile.in
index baa0d603516..4c3a3c130c4 100644
--- a/mozilla/editor/ui/Makefile.in
+++ b/mozilla/editor/ui/Makefile.in
@@ -42,6 +42,10 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+DIRS           = \
+               locales \
+               $(NULL)
+
 ifndef MOZ_STANDALONE_COMPOSER
 PREF_JS_EXPORTS = $(srcdir)/composer.js
 EXTRA_COMPONENTS = nsComposerCmdLineHandler.js
diff --git a/mozilla/editor/ui/composer/locale/en-US/contents.rdf b/mozilla/editor/ui/composer/locale/en-US/contents.rdf
deleted file mode 100644
index 93e76c9f742..00000000000
--- a/mozilla/editor/ui/composer/locale/en-US/contents.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:editor"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:editor"
-#expand 	chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"/>
-</RDF:RDF>
diff --git a/mozilla/editor/ui/jar.mn b/mozilla/editor/ui/jar.mn
index 9a3002b3e8d..15394a1e9ac 100644
--- a/mozilla/editor/ui/jar.mn
+++ b/mozilla/editor/ui/jar.mn
@@ -224,57 +224,3 @@ comm.jar:
       content/editor/EditorPublishOverlay.xul                  (dialogs/content/EditorPublishOverlay.xul) 
       content/editor/EditorPublishProgress.xul                 (dialogs/content/EditorPublishProgress.xul) 
       content/editor/EditorPublishProgress.js                  (dialogs/content/EditorPublishProgress.js) 
-
-#ifndef MOZ_XUL_APP
-en-US.jar:
-      locale/en-US/editor/editor.dtd                           (composer/locale/en-US/editor.dtd)
-*     locale/en-US/editor/contents.rdf                         (composer/locale/en-US/contents.rdf)
-      locale/en-US/editor/editorSmileyOverlay.dtd              (composer/locale/en-US/editorSmileyOverlay.dtd) 
-      locale/en-US/editor/editorPrefsOverlay.dtd               (composer/locale/en-US/editorPrefsOverlay.dtd) 
-      locale/en-US/editor/editorNavigatorOverlay.dtd           (composer/locale/en-US/editorNavigatorOverlay.dtd) 
-      locale/en-US/editor/pref-toolbars.dtd                    (composer/locale/en-US/pref-toolbars.dtd) 
-      locale/en-US/editor/pref-editing.dtd                     (composer/locale/en-US/pref-editing.dtd) 
-      locale/en-US/editor/pref-composer.dtd                    (composer/locale/en-US/pref-composer.dtd) 
-      locale/en-US/editor/pref-publish.dtd                     (composer/locale/en-US/pref-publish.dtd) 
-      locale/en-US/editor/editorOverlay.dtd                    (composer/locale/en-US/editorOverlay.dtd) 
-      locale/en-US/editor/editor.properties                    (composer/locale/en-US/editor.properties) 
-      locale/en-US/editor/EditorHLineProperties.dtd            (dialogs/locale/en-US/EditorHLineProperties.dtd) 
-      locale/en-US/editor/EditorImageProperties.dtd            (dialogs/locale/en-US/EditorImageProperties.dtd) 
-      locale/en-US/editor/EditorInsertSource.dtd               (dialogs/locale/en-US/EditorInsertSource.dtd) 
-      locale/en-US/editor/EditorInsertChars.dtd                (dialogs/locale/en-US/EditorInsertChars.dtd) 
-      locale/en-US/editor/EditorInsertTable.dtd                (dialogs/locale/en-US/EditorInsertTable.dtd) 
-      locale/en-US/editor/EditorInsertTOC.dtd                  (dialogs/locale/en-US/EditorInsertTOC.dtd) 
-      locale/en-US/editor/EditorLinkProperties.dtd             (dialogs/locale/en-US/EditorLinkProperties.dtd) 
-      locale/en-US/editor/EdLinkChecker.dtd                    (dialogs/locale/en-US/EdLinkChecker.dtd) 
-      locale/en-US/editor/EditorListProperties.dtd             (dialogs/locale/en-US/EditorListProperties.dtd) 
-      locale/en-US/editor/EditorPageProperties.dtd             (dialogs/locale/en-US/EditorPageProperties.dtd) 
-      locale/en-US/editor/EditorColorProperties.dtd            (dialogs/locale/en-US/EditorColorProperties.dtd) 
-      locale/en-US/editor/EdColorPicker.dtd                    (dialogs/locale/en-US/EdColorPicker.dtd) 
-      locale/en-US/editor/EditorPersonalDictionary.dtd         (dialogs/locale/en-US/EditorPersonalDictionary.dtd) 
-      locale/en-US/editor/EditorReplace.dtd                    (dialogs/locale/en-US/EditorReplace.dtd) 
-      locale/en-US/editor/EditorSnapToGrid.dtd                 (dialogs/locale/en-US/EditorSnapToGrid.dtd) 
-      locale/en-US/editor/EditorSpellCheck.dtd                 (dialogs/locale/en-US/EditorSpellCheck.dtd) 
-      locale/en-US/editor/EditorTableProperties.dtd            (dialogs/locale/en-US/EditorTableProperties.dtd) 
-      locale/en-US/editor/EditorFormProperties.dtd             (dialogs/locale/en-US/EditorFormProperties.dtd) 
-      locale/en-US/editor/EditorInputProperties.dtd            (dialogs/locale/en-US/EditorInputProperties.dtd) 
-      locale/en-US/editor/EditorTextAreaProperties.dtd         (dialogs/locale/en-US/EditorTextAreaProperties.dtd) 
-      locale/en-US/editor/EditorSelectProperties.dtd           (dialogs/locale/en-US/EditorSelectProperties.dtd) 
-      locale/en-US/editor/EditorButtonProperties.dtd           (dialogs/locale/en-US/EditorButtonProperties.dtd) 
-      locale/en-US/editor/EditorLabelProperties.dtd            (dialogs/locale/en-US/EditorLabelProperties.dtd) 
-      locale/en-US/editor/EditorFieldSetProperties.dtd         (dialogs/locale/en-US/EditorFieldSetProperties.dtd) 
-      locale/en-US/editor/EdNamedAnchorProperties.dtd          (dialogs/locale/en-US/EdNamedAnchorProperties.dtd) 
-      locale/en-US/editor/EdDialogOverlay.dtd                  (dialogs/locale/en-US/EdDialogOverlay.dtd) 
-      locale/en-US/editor/EdAdvancedEdit.dtd                   (dialogs/locale/en-US/EdAdvancedEdit.dtd) 
-      locale/en-US/editor/EditorImageMap.dtd                   (dialogs/locale/en-US/EditorImageMap.dtd) 
-      locale/en-US/editor/EditorImageMapHotSpot.dtd            (dialogs/locale/en-US/EditorImageMapHotSpot.dtd) 
-      locale/en-US/editor/EditConflict.dtd                     (dialogs/locale/en-US/EditConflict.dtd) 
-      locale/en-US/editor/EditorSaveAsCharset.dtd              (dialogs/locale/en-US/EditorSaveAsCharset.dtd) 
-      locale/en-US/editor/EdConvertToTable.dtd                 (dialogs/locale/en-US/EdConvertToTable.dtd) 
-      locale/en-US/editor/EditorPublish.dtd                    (dialogs/locale/en-US/EditorPublish.dtd) 
-      locale/en-US/editor/EditorPublishProgress.dtd            (dialogs/locale/en-US/EditorPublishProgress.dtd) 
-
-US.jar:
-*     locale/US/editor-region/contents.rdf                     (composer/locale/en-US/contents-region.rdf)
-      locale/US/editor-region/region.properties                (composer/locale/en-US/region.properties)
-#endif
-
diff --git a/mozilla/editor/ui/locales/Makefile.in b/mozilla/editor/ui/locales/Makefile.in
new file mode 100644
index 00000000000..c1cdcdaa6c4
--- /dev/null
+++ b/mozilla/editor/ui/locales/Makefile.in
@@ -0,0 +1,47 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla Browser code.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <bsmedberg@covad.net>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH          = ../../..
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = editor/ui/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/editor/ui/composer/locale/en-US/editor.dtd b/mozilla/editor/ui/locales/en-US/chrome/composer/editor.dtd
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/editor.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/composer/editor.dtd
diff --git a/mozilla/editor/ui/composer/locale/en-US/editor.properties b/mozilla/editor/ui/locales/en-US/chrome/composer/editor.properties
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/editor.properties
rename to mozilla/editor/ui/locales/en-US/chrome/composer/editor.properties
diff --git a/mozilla/editor/ui/composer/locale/en-US/editorNavigatorOverlay.dtd b/mozilla/editor/ui/locales/en-US/chrome/composer/editorNavigatorOverlay.dtd
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/editorNavigatorOverlay.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/composer/editorNavigatorOverlay.dtd
diff --git a/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd b/mozilla/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
diff --git a/mozilla/editor/ui/composer/locale/en-US/editorPrefsOverlay.dtd b/mozilla/editor/ui/locales/en-US/chrome/composer/editorPrefsOverlay.dtd
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/editorPrefsOverlay.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/composer/editorPrefsOverlay.dtd
diff --git a/mozilla/editor/ui/composer/locale/en-US/editorSmileyOverlay.dtd b/mozilla/editor/ui/locales/en-US/chrome/composer/editorSmileyOverlay.dtd
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/editorSmileyOverlay.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/composer/editorSmileyOverlay.dtd
diff --git a/mozilla/editor/ui/composer/locale/en-US/pref-composer.dtd b/mozilla/editor/ui/locales/en-US/chrome/composer/pref-composer.dtd
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/pref-composer.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/composer/pref-composer.dtd
diff --git a/mozilla/editor/ui/composer/locale/en-US/pref-editing.dtd b/mozilla/editor/ui/locales/en-US/chrome/composer/pref-editing.dtd
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/pref-editing.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/composer/pref-editing.dtd
diff --git a/mozilla/editor/ui/composer/locale/en-US/pref-publish.dtd b/mozilla/editor/ui/locales/en-US/chrome/composer/pref-publish.dtd
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/pref-publish.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/composer/pref-publish.dtd
diff --git a/mozilla/editor/ui/composer/locale/en-US/pref-toolbars.dtd b/mozilla/editor/ui/locales/en-US/chrome/composer/pref-toolbars.dtd
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/pref-toolbars.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/composer/pref-toolbars.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdAdvancedEdit.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EdAdvancedEdit.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EdAdvancedEdit.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EdAdvancedEdit.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdColorPicker.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EdColorPicker.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EdColorPicker.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EdColorPicker.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdConvertToTable.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EdConvertToTable.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EdConvertToTable.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EdConvertToTable.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdDialogOverlay.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EdDialogOverlay.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EdDialogOverlay.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EdDialogOverlay.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdLinkChecker.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EdLinkChecker.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EdLinkChecker.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EdLinkChecker.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdNamedAnchorProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EdNamedAnchorProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EdNamedAnchorProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EdNamedAnchorProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditConflict.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditConflict.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditConflict.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditConflict.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorButtonProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorButtonProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorButtonProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorButtonProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorColorProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorColorProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorColorProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorColorProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorFieldSetProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorFieldSetProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorFieldSetProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorFieldSetProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorFormProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorFormProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorFormProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorFormProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorHLineProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorHLineProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorHLineProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorHLineProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorImageMap.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorImageMap.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorImageMap.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorImageMap.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorImageMapHotSpot.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorImageMapHotSpot.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorImageMapHotSpot.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorImageMapHotSpot.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorImageProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorImageProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorImageProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorImageProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorInputProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorInputProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorInputProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorInputProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertChars.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorInsertChars.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorInsertChars.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorInsertChars.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertSource.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorInsertSource.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorInsertSource.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorInsertSource.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTOC.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorInsertTOC.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTOC.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorInsertTOC.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorInsertTable.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorInsertTable.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorLabelProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorLabelProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorLabelProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorLabelProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorLinkProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorLinkProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorLinkProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorLinkProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorListProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorListProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorListProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorListProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorPageProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorPageProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorPageProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorPageProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorPersonalDictionary.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorPersonalDictionary.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorPersonalDictionary.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorPersonalDictionary.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorPublish.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorPublish.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorPublish.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorPublish.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorPublishProgress.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorPublishProgress.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorPublishProgress.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorPublishProgress.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorReplace.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorReplace.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorReplace.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorReplace.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorSaveAsCharset.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorSaveAsCharset.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorSelectProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorSelectProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorSelectProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorSelectProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorSnapToGrid.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorSnapToGrid.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorSnapToGrid.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorSnapToGrid.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorSpellCheck.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorSpellCheck.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorSpellCheck.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorSpellCheck.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorTableProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorTableProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorTableProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorTableProperties.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorTextAreaProperties.dtd b/mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorTextAreaProperties.dtd
similarity index 100%
rename from mozilla/editor/ui/dialogs/locale/en-US/EditorTextAreaProperties.dtd
rename to mozilla/editor/ui/locales/en-US/chrome/dialogs/EditorTextAreaProperties.dtd
diff --git a/mozilla/editor/ui/composer/locale/en-US/region.properties b/mozilla/editor/ui/locales/en-US/chrome/region/region.properties
similarity index 100%
rename from mozilla/editor/ui/composer/locale/en-US/region.properties
rename to mozilla/editor/ui/locales/en-US/chrome/region/region.properties
diff --git a/mozilla/mail/locales/generic/chrome/editor/contents.rdf b/mozilla/editor/ui/locales/generic/chrome/composer/contents.rdf
similarity index 73%
rename from mozilla/mail/locales/generic/chrome/editor/contents.rdf
rename to mozilla/editor/ui/locales/generic/chrome/composer/contents.rdf
index c95bb670001..f4ce8178a91 100644
--- a/mozilla/mail/locales/generic/chrome/editor/contents.rdf
+++ b/mozilla/editor/ui/locales/generic/chrome/composer/contents.rdf
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 
-<!--
 #filter substitution
--->
 
 <RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
@@ -20,4 +18,9 @@
       </RDF:Seq>
     </chrome:packages>
   </RDF:Description>
-</RDF:RDF>
+
+  <!-- Version Information.  State that we work only with major version of this
+       package. -->
+  <RDF:Description about="urn:mozilla:locale:@AB_CD@:editor"
+       chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
+</RDF:RDF>
\ No newline at end of file
diff --git a/mozilla/editor/ui/composer/locale/en-US/contents-region.rdf b/mozilla/editor/ui/locales/generic/chrome/region/contents.rdf
similarity index 50%
rename from mozilla/editor/ui/composer/locale/en-US/contents-region.rdf
rename to mozilla/editor/ui/locales/generic/chrome/region/contents.rdf
index 346204515cc..510de6a8f79 100644
--- a/mozilla/editor/ui/composer/locale/en-US/contents-region.rdf
+++ b/mozilla/editor/ui/locales/generic/chrome/region/contents.rdf
@@ -1,26 +1,27 @@
 <?xml version="1.0"?>
+
+#filter substitution
+
 <RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
 
   <!-- list all the locale being supplied by this package -->
   <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:US"/>
+    <RDF:li resource="urn:mozilla:locale:@AB_CD@"/>
   </RDF:Seq>
 
   <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:US"
-        chrome:author="mozilla.org"
-        chrome:name="US"
-        chrome:previewURL="http://www.mozilla.org/locales/US.gif">
+  <RDF:Description about="urn:mozilla:locale:@AB_CD@"
+        chrome:author="mozilla.org">
     <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:US:packages">
-        <RDF:li resource="urn:mozilla:locale:US:editor-region"/>
+      <RDF:Seq about="urn:mozilla:locale:@AB_CD@:packages">
+        <RDF:li resource="urn:mozilla:locale:@AB_CD@:editor-region"/>
       </RDF:Seq>
     </chrome:packages>
   </RDF:Description>
 
   <!-- Version Information.  State that we work only with major version of this
        package. -->
-  <RDF:Description about="urn:mozilla:locale:US:editor-region"
-#expand 	chrome:localeVersion="__MOZILLA_REGION_VERSION__"/>
-</RDF:RDF>
+  <RDF:Description about="urn:mozilla:locale:@AB_CD@:editor-region"
+                chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
+</RDF:RDF>
\ No newline at end of file
diff --git a/mozilla/editor/ui/locales/jar.mn b/mozilla/editor/ui/locales/jar.mn
new file mode 100644
index 00000000000..c2ccc42418c
--- /dev/null
+++ b/mozilla/editor/ui/locales/jar.mn
@@ -0,0 +1,55 @@
+#filter substitution
+
+@AB_CD@.jar:
+* locale/@AB_CD@/editor/contents.rdf                         (generic/chrome/composer/contents.rdf)
+  locale/@AB_CD@/editor/editorSmileyOverlay.dtd              (%chrome/composer/editorSmileyOverlay.dtd)
+  locale/@AB_CD@/editor/editorOverlay.dtd                    (%chrome/composer/editorOverlay.dtd)
+  locale/@AB_CD@/editor/editor.properties                    (%chrome/composer/editor.properties)
+  locale/@AB_CD@/editor/EditorHLineProperties.dtd            (%chrome/dialogs/EditorHLineProperties.dtd)
+  locale/@AB_CD@/editor/EditorImageProperties.dtd            (%chrome/dialogs/EditorImageProperties.dtd)
+  locale/@AB_CD@/editor/EditorInsertSource.dtd               (%chrome/dialogs/EditorInsertSource.dtd)
+  locale/@AB_CD@/editor/EditorInsertChars.dtd                (%chrome/dialogs/EditorInsertChars.dtd)
+  locale/@AB_CD@/editor/EditorInsertTable.dtd                (%chrome/dialogs/EditorInsertTable.dtd)
+  locale/@AB_CD@/editor/EditorInsertTOC.dtd                  (%chrome/dialogs/EditorInsertTOC.dtd)
+  locale/@AB_CD@/editor/EditorLinkProperties.dtd             (%chrome/dialogs/EditorLinkProperties.dtd)
+  locale/@AB_CD@/editor/EditorListProperties.dtd             (%chrome/dialogs/EditorListProperties.dtd)
+  locale/@AB_CD@/editor/EditorColorProperties.dtd            (%chrome/dialogs/EditorColorProperties.dtd)
+  locale/@AB_CD@/editor/EdColorPicker.dtd                    (%chrome/dialogs/EdColorPicker.dtd)
+  locale/@AB_CD@/editor/EditorReplace.dtd                    (%chrome/dialogs/EditorReplace.dtd)
+  locale/@AB_CD@/editor/EditorSpellCheck.dtd                 (%chrome/dialogs/EditorSpellCheck.dtd)
+  locale/@AB_CD@/editor/EditorPersonalDictionary.dtd         (%chrome/dialogs/EditorPersonalDictionary.dtd)
+  locale/@AB_CD@/editor/EditorTableProperties.dtd            (%chrome/dialogs/EditorTableProperties.dtd)
+  locale/@AB_CD@/editor/EdNamedAnchorProperties.dtd          (%chrome/dialogs/EdNamedAnchorProperties.dtd)
+  locale/@AB_CD@/editor/EdDialogOverlay.dtd                  (%chrome/dialogs/EdDialogOverlay.dtd)
+  locale/@AB_CD@/editor/EdAdvancedEdit.dtd                   (%chrome/dialogs/EdAdvancedEdit.dtd)
+  locale/@AB_CD@/editor/EdConvertToTable.dtd                 (%chrome/dialogs/EdConvertToTable.dtd)
+
+
+#ifndef MOZ_XUL_APP
+@AB_CD@.jar:
+  locale/@AB_CD@/editor/editor.dtd                           (%chrome/composer/editor.dtd)
+  locale/@AB_CD@/editor/editorPrefsOverlay.dtd               (%chrome/composer/editorPrefsOverlay.dtd)
+  locale/@AB_CD@/editor/editorNavigatorOverlay.dtd           (%chrome/composer/editorNavigatorOverlay.dtd)
+  locale/@AB_CD@/editor/pref-toolbars.dtd                    (%chrome/composer/pref-toolbars.dtd)
+  locale/@AB_CD@/editor/pref-editing.dtd                     (%chrome/composer/pref-editing.dtd)
+  locale/@AB_CD@/editor/pref-composer.dtd                    (%chrome/composer/pref-composer.dtd)
+  locale/@AB_CD@/editor/pref-publish.dtd                     (%chrome/composer/pref-publish.dtd)
+  locale/@AB_CD@/editor/EdLinkChecker.dtd                    (%chrome/dialogs/EdLinkChecker.dtd)
+  locale/@AB_CD@/editor/EditorPageProperties.dtd             (%chrome/dialogs/EditorPageProperties.dtd)
+  locale/@AB_CD@/editor/EditorSnapToGrid.dtd                 (%chrome/dialogs/EditorSnapToGrid.dtd)
+  locale/@AB_CD@/editor/EditorFormProperties.dtd             (%chrome/dialogs/EditorFormProperties.dtd)
+  locale/@AB_CD@/editor/EditorInputProperties.dtd            (%chrome/dialogs/EditorInputProperties.dtd)
+  locale/@AB_CD@/editor/EditorTextAreaProperties.dtd         (%chrome/dialogs/EditorTextAreaProperties.dtd)
+  locale/@AB_CD@/editor/EditorSelectProperties.dtd           (%chrome/dialogs/EditorSelectProperties.dtd)
+  locale/@AB_CD@/editor/EditorButtonProperties.dtd           (%chrome/dialogs/EditorButtonProperties.dtd)
+  locale/@AB_CD@/editor/EditorLabelProperties.dtd            (%chrome/dialogs/EditorLabelProperties.dtd)
+  locale/@AB_CD@/editor/EditorFieldSetProperties.dtd         (%chrome/dialogs/EditorFieldSetProperties.dtd)
+  locale/@AB_CD@/editor/EditorImageMap.dtd                   (%chrome/dialogs/EditorImageMap.dtd)
+  locale/@AB_CD@/editor/EditorImageMapHotSpot.dtd            (%chrome/dialogs/EditorImageMapHotSpot.dtd)
+  locale/@AB_CD@/editor/EditConflict.dtd                     (%chrome/dialogs/EditConflict.dtd)
+  locale/@AB_CD@/editor/EditorSaveAsCharset.dtd              (%chrome/dialogs/EditorSaveAsCharset.dtd)
+  locale/@AB_CD@/editor/EditorPublish.dtd                    (%chrome/dialogs/EditorPublish.dtd)
+  locale/@AB_CD@/editor/EditorPublishProgress.dtd            (%chrome/dialogs/EditorPublishProgress.dtd)
+* locale/@AB_CD@/editor-region/contents.rdf                  (generic/chrome/region/contents.rdf)
+  locale/@AB_CD@/editor-region/region.properties             (%chrome/region/region.properties)
+#endif
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EdAdvancedEdit.dtd b/mozilla/mail/locales/en-US/chrome/editor/EdAdvancedEdit.dtd
deleted file mode 100644
index f72c7eec30c..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EdAdvancedEdit.dtd
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ben Goodger
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY WindowTitle.label              "Advanced Property Editor">
-<!ENTITY AttName.label                  "Attribute: ">
-<!ENTITY AttValue.label                 "Value: ">
-<!ENTITY PropertyName.label             "Property: ">
-<!ENTITY currentattributesfor.label     "Current attributes for: ">
-<!ENTITY tree.attributeHeader.label     "Attribute">
-<!ENTITY tree.propertyHeader.label      "Property">
-<!ENTITY tree.valueHeader.label         "Value">
-<!ENTITY tabHTML.label                  "HTML Attributes">
-<!ENTITY tabCSS.label                   "Inline Style">
-<!ENTITY tabJSE.label                   "JavaScript Events">
-
-<!ENTITY editAttribute.label    "Click on an item above to edit its value">
-<!ENTITY removeAttribute.label  "Remove">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EdColorPicker.dtd b/mozilla/mail/locales/en-US/chrome/editor/EdColorPicker.dtd
deleted file mode 100644
index 380e7811583..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EdColorPicker.dtd
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY windowTitle.label "Color">
-<!ENTITY lastPickedColor.label "Last-picked color">
-<!ENTITY lastPickedColor.accessKey "L">
-<!ENTITY setColor1.label "Click on a color or">
-<!ENTITY setColor2.label "enter an HTML color string">
-<!ENTITY setColor2.accessKey "H">
-<!ENTITY setColorExample.label "(e.g.: &quot;#0000ff&quot; or &quot;blue&quot;):">
-<!ENTITY default.label "Default">
-<!ENTITY default.accessKey "D">
-<!ENTITY palette.label "Palette:">
-<!ENTITY standardPalette.label "Standard">
-<!ENTITY webPalette.label "All web colors">
-<!ENTITY background.label "Background for:">
-<!ENTITY background.accessKey "B">
-<!ENTITY table.label "Table">
-<!ENTITY table.accessKey "T">
-<!ENTITY cell.label "Cell(s)">
-<!ENTITY cell.accessKey "C">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EdConvertToTable.dtd b/mozilla/mail/locales/en-US/chrome/editor/EdConvertToTable.dtd
deleted file mode 100644
index 6f47dfc644c..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EdConvertToTable.dtd
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "Convert To Table">
-<!ENTITY instructions1.label   "Composer creates a new table row for each paragraph in the selection.">
-<!ENTITY instructions2.label   "Choose the character used to separate the selection into columns:">
-<!ENTITY commaRadio.label      "Comma">
-<!ENTITY spaceRadio.label      "Space">
-<!ENTITY otherRadio.label      "Other Character:">
-<!ENTITY deleteCharCheck.label "Delete separator character">
-<!ENTITY collapseSpaces.label  "Ignore extra spaces">
-<!ENTITY collapseSpaces.tooltip "Convert adjacent spaces to one separator">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EdDialogOverlay.dtd b/mozilla/mail/locales/en-US/chrome/editor/EdDialogOverlay.dtd
deleted file mode 100644
index c537b438d85..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EdDialogOverlay.dtd
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY AdvancedEditButton.label "Advanced Edit...">
-<!ENTITY AdvancedEditButton.accessKey "E">
-<!ENTITY AdvancedEditButton.tooltip "Add or modify HTML attributes, style attributes, and JavaScript">
-<!ENTITY chooseButton.label "Choose File...">
-<!ENTITY chooseFile.accessKey "F">
-<!ENTITY chooseFileLink.accessKey "o">
-<!ENTITY makeUrlRelative.label "URL is relative to page location">
-<!ENTITY makeUrlRelative.accessKey "r">
-<!ENTITY makeUrlRelative.tooltip "Change between relative and absolute URL. You must first save the page to change this.">
-
-<!-- Shared by Link and Image dialogs -->
-<!ENTITY LinkURLEditField.label "Enter a web page location, a local file, or select a Named Anchor or Heading from the popup list:">
-<!ENTITY LinkURLEditField.accessKey "L">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EdNamedAnchorProperties.dtd b/mozilla/mail/locales/en-US/chrome/editor/EdNamedAnchorProperties.dtd
deleted file mode 100644
index d1dd897e4e5..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EdNamedAnchorProperties.dtd
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY windowTitle.label "Named Anchor Properties">
-<!ENTITY anchorNameEditField.label "Anchor Name:">
-<!ENTITY anchorNameEditField.accessKey "N">
-<!ENTITY nameInput.tooltip "Enter a unique name for this named anchor (target)">
-
-
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorColorProperties.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorColorProperties.dtd
deleted file mode 100644
index 88bf9d32b34..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorColorProperties.dtd
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "Page Colors and Background">
-<!ENTITY pageColors.label "Page Colors">
-<!ENTITY defaultColorsRadio.label "Reader's default colors (Don't set colors in page)">
-<!ENTITY defaultColorsRadio.accessKey "D">
-<!ENTITY defaultColorsRadio.tooltip "Use the color settings from the viewer (reader's) browser only">
-<!ENTITY customColorsRadio.label "Use custom colors:">
-<!ENTITY customColorsRadio.accessKey "C">
-<!ENTITY customColorsRadio.tooltip "These color settings override the viewer's browser settings">
-
-<!ENTITY normalText.label "Normal text">
-<!ENTITY normalText.accessKey "N">
-<!ENTITY linkText.label "Link text">
-<!ENTITY linkText.accessKey "L">
-<!ENTITY activeLinkText.label "Active link text">
-<!ENTITY activeLinkText.accessKey "A">
-<!ENTITY visitedLinkText.label "Visited link text">
-<!ENTITY visitedLinkText.accessKey "V">
-<!ENTITY background.label "Background:">
-<!ENTITY background.accessKey "B">
-<!ENTITY colon.character ":">
-<!ENTITY backgroundImage.label "Background Image:">
-<!ENTITY backgroundImage.accessKey "m">
-<!ENTITY backgroundImage.tooltip "Use an image file as the background for your page">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorHLineProperties.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorHLineProperties.dtd
deleted file mode 100644
index 07eb36fce45..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorHLineProperties.dtd
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "Horizontal Line Properties">
-
-<!ENTITY dimensionsBox.label "Dimensions">
-<!ENTITY heightEditField.label "Height:">
-<!ENTITY heightEditField.accessKey "G">
-<!ENTITY widthEditField.label "Width:">
-<!ENTITY widthEditField.accessKey "W">
-<!ENTITY pixelsPopup.value "pixels">
-<!ENTITY alignmentBox.label "Alignment">
-<!ENTITY leftRadio.value "Left">
-<!ENTITY leftRadio.accessKey "L">
-<!ENTITY centerRadio.value "Center">
-<!ENTITY centerRadio.accessKey "C">
-<!ENTITY rightRadio.value "Right">
-<!ENTITY rightRadio.accessKey "R">
-
-<!ENTITY threeDShading.label "3-D Shading">
-<!ENTITY threeDShading.accessKey "S">
-<!ENTITY saveSettings.label "Use as Default">
-<!ENTITY saveSettings.accessKey "D">
-<!ENTITY saveSettings.tooltip "Save these settings to use when inserting new horizontal lines">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorImageProperties.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorImageProperties.dtd
deleted file mode 100644
index d1b213a4467..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorImageProperties.dtd
+++ /dev/null
@@ -1,119 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- These strings are for use specifically in the editor's image and form image dialogs. -->
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "Image Properties">
-
-<!ENTITY pixelsPopup.value "pixels">
-<!ENTITY percentPopup.value "percent">
-
-<!-- These are in the Location tab panel -->
-<!ENTITY locationEditField.label "Image Location:">
-<!ENTITY locationEditField.accessKey "L">
-<!ENTITY locationEditField.tooltip "Type the image's filename or location">
-<!ENTITY title.label "Tooltip:">
-<!ENTITY title.accessKey "T">
-<!ENTITY title.tooltip "The html 'title' attribute that displays as a tooltip">
-<!ENTITY altText.label "Alternate text:">
-<!ENTITY altText.accessKey "A">
-<!ENTITY altTextEditField.tooltip "Type text to display in place of the image">
-<!ENTITY noAltText.label "Don't use alternate text">
-<!ENTITY noAltText.accessKey "D">
-
-<!ENTITY previewBox.label "Image Preview">
-<!ENTITY MoreFewerButton.tooltip "Display more or fewer properties to edit">
-
-<!-- These controls are in the Dimensions tab panel -->
-<!-- actualSize.label should be same as actualSizeRadio.label + ":" -->
-<!ENTITY actualSize.label "Actual Size:">
-<!ENTITY actualSizeRadio.label "Actual Size">
-<!ENTITY actualSizeRadio.accessKey "A">
-<!ENTITY actualSizeRadio.tooltip "Revert to the image's actual size">
-<!ENTITY customSizeRadio.label "Custom Size">
-<!ENTITY customSizeRadio.accessKey "S">
-<!ENTITY customSizeRadio.tooltip "Change the image's size as displayed in the page">
-<!ENTITY heightEditField.label "Height:">
-<!ENTITY heightEditField.accessKey "G">
-<!ENTITY widthEditField.label "Width:">
-<!ENTITY widthEditField.accessKey "W">
-<!ENTITY constrainCheckbox.label "Constrain">
-<!ENTITY constrainCheckbox.accessKey "C">
-<!ENTITY constrainCheckbox.tooltip "Maintain the image's aspect ratio">
-
-<!-- These controls are in the Image Map box of the expanded area -->
-<!ENTITY imagemapBox.label "Image Map">
-<!ENTITY removeImageMapButton.label "Remove">
-<!ENTITY removeImageMapButton.accessKey "R">
-<!ENTITY editImageMapButton.label "Edit...">
-<!ENTITY editImageMapButton.tooltip "Create clickable hotspots for this image">
-
-<!-- These are the options for image alignment -->
-<!ENTITY alignment.label "Align Text to Image">
-<!ENTITY bottomPopup.value "At the bottom">
-<!ENTITY topPopup.value "At the top">
-<!ENTITY centerPopup.value "In the center">
-<!ENTITY wrapRightPopup.value "Wrap to the right">
-<!ENTITY wrapLeftPopup.value "Wrap to the left">
-
-<!-- These controls are in the Spacing Box -->
-<!ENTITY spacingBox.label "Spacing">
-<!ENTITY spacingBox.tooltip "Type a number for the amount of space around image">
-<!ENTITY leftRightEditField.label "Left and Right:">
-<!ENTITY leftRightEditField.accessKey "L">
-<!ENTITY topBottomEditField.label "Top and Bottom:">
-<!ENTITY topBottomEditField.accessKey "T">
-<!ENTITY borderEditField.label "Solid Border:">
-<!ENTITY borderEditField.accessKey "B">
-
-<!-- These controls are in the Link Box -->
-<!ENTITY showImageLinkBorder.label "Show border around linked image">
-<!ENTITY showImageLinkBorder.accessKey "B">
-
-<!-- These controls may be added some day; currently not used -->
-<!ENTITY makePageBackgroundCheckbox.label "Make Page Background">
-<!ENTITY makePageBackgroundCheckbox.tooltip "Use image as background for your page">
-<!ENTITY editImageButton.label "Edit Image">
-<!ENTITY editImageButton.tooltip "Edit image file in another program">
-
-<!-- These tabs are currently used in the image input dialog -->
-<!ENTITY imageInputTab.label "Form">
-<!ENTITY imageLocationTab.label "Location">
-<!ENTITY imageDimensionsTab.label "Dimensions">
-<!ENTITY imageAppearanceTab.label "Appearance">
-<!ENTITY imageLinkTab.label "Link">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorInsertChars.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorInsertChars.dtd
deleted file mode 100644
index 5aa243e27ba..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorInsertChars.dtd
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "Insert Character">
-<!ENTITY category.label "Category">
-<!ENTITY letter.label "Letter:">
-<!ENTITY letter.accessKey "L">
-<!ENTITY character.label "Character:">
-<!ENTITY character.accessKey "C">
-<!ENTITY accentUpper.label "Accent Uppercase">
-<!ENTITY accentLower.label "Accent Lowercase">
-<!ENTITY otherUpper.label "Other Uppercase">
-<!ENTITY otherLower.label "Other Lowercase">
-<!ENTITY commonSymbols.label "Common Symbols">
-<!ENTITY insertButton.label "Insert">
-<!ENTITY closeButton.label "Close">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorInsertSource.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorInsertSource.dtd
deleted file mode 100644
index 05772a43072..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorInsertSource.dtd
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "Insert HTML">
-<!ENTITY sourceEditField.label "Enter HTML tags and text:">
-<!ENTITY example.label "Example: ">
-<!-- LOCALIZATION NOTE (exampleOpenTag.label): DONT_TRANSLATE: they are text for HTML tagnames: "<i>" and "</i>" -->
-<!ENTITY exampleOpenTag.label "&lt;i&gt;">
-<!-- LOCALIZATION NOTE (exampleCloseTag.label): DONT_TRANSLATE: they are text for HTML tagnames: "<i>" and "</i>" -->
-<!ENTITY exampleCloseTag.label "&lt;/i&gt;">
-<!ENTITY exampleText.label "Hello World!">
-<!ENTITY insertButton.label "Insert">
-<!ENTITY insertButton.accesskey "I">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorInsertTOC.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorInsertTOC.dtd
deleted file mode 100644
index 04d313a4ca8..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorInsertTOC.dtd
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is TOCMaker.
-   -
-   - The Initial Developer of the Original Code is
-   - Daniel Glazman.
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Original author: Daniel Glazman (daniel@glazman.org)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY Window.title        "Table of Contents">
-<!ENTITY buildToc.label      "Build table of contents from:">
-<!ENTITY style.label         "Style:">
-<!ENTITY tag.label           "Tag:">
-<!ENTITY class.label         "Class:">
-<!ENTITY header1.label       "Level 1">
-<!ENTITY header2.label       "Level 2">
-<!ENTITY header3.label       "Level 3">
-<!ENTITY header4.label       "Level 4">
-<!ENTITY header5.label       "Level 5">
-<!ENTITY header6.label       "Level 6">
-<!ENTITY makeReadOnly.label  "Make the table of contents read-only">
-<!ENTITY orderedList.label   "Number all entries in the table of contents">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorInsertTable.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorInsertTable.dtd
deleted file mode 100644
index 9a0b6ac30bd..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorInsertTable.dtd
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "Insert Table">
-
-<!ENTITY size.label "Size">
-<!ENTITY numRowsEditField.label "Rows:">
-<!ENTITY numRowsEditField.accessKey "R">
-<!ENTITY numColumnsEditField.label "Columns:">
-<!ENTITY numColumnsEditField.accessKey "C">
-<!ENTITY widthEditField.label "Width:">
-<!ENTITY widthEditField.accessKey "W">
-<!ENTITY borderEditField.label "Border:">
-<!ENTITY borderEditField.accessKey "B">
-<!ENTITY borderEditField.tooltip "Type a number for the table's border, or type zero (0) for no border">
-<!ENTITY pixels.label "pixels">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorLinkProperties.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorLinkProperties.dtd
deleted file mode 100644
index 7b0c01615be..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorLinkProperties.dtd
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY windowTitle.label "Link Properties">
-<!ENTITY LinkURLBox.label "Link Location">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorListProperties.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorListProperties.dtd
deleted file mode 100644
index 2df1d9af5da..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorListProperties.dtd
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "List Properties">
-
-<!ENTITY ListType.label "List Type">
-<!ENTITY bulletStyle.label "Bullet Style:">
-<!ENTITY startingNumber.label "Start at:">
-<!ENTITY startingNumber.accessKey "S">
-<!ENTITY none.value "None">
-<!ENTITY bulletList.value "Bullet (Unnumbered) List">
-<!ENTITY numberList.value "Numbered List">
-<!ENTITY definitionList.value "Definition List">
-<!ENTITY changeListMsg.label "When changing list type:">
-<!ENTITY changeEntireListRadio.label "Change entire list">
-<!ENTITY changeEntireListRadio.accessKey "C">
-<!ENTITY changeSelectedRadio.label "Change just selected items">
-<!ENTITY changeSelectedRadio.accessKey "I">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorPersonalDictionary.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorPersonalDictionary.dtd
deleted file mode 100644
index 28ba3bba957..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorPersonalDictionary.dtd
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "Personal Dictionary">
-
-<!ENTITY wordEditField.label "New word:">
-<!ENTITY wordEditField.accessKey "N">
-<!ENTITY AddButton.label "Add">
-<!ENTITY AddButton.accessKey "A">
-<!ENTITY DictionaryList.label "Words in dictionary:">
-<!ENTITY DictionaryList.accessKey "W">
-<!ENTITY ReplaceButton.label "Replace">
-<!ENTITY ReplaceButton.accessKey "R">
-<!ENTITY RemoveButton.label "Remove">
-<!ENTITY RemoveButton.accessKey "e">
-
-<!ENTITY CloseButton.label "Close">
-<!ENTITY CloseButton.accessKey "C">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorReplace.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorReplace.dtd
deleted file mode 100644
index 2b4f1afff5b..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorReplace.dtd
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Akkana Peck
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- extracted from EdReplace.xul -->
-
-<!ENTITY replaceDialog.title "Find and Replace">
-<!ENTITY findField.label "Find text:">
-<!ENTITY findField.accesskey "n">
-<!ENTITY replaceField.label "Replace with:">
-<!ENTITY replaceField.accesskey "e">
-<!ENTITY caseSensitiveCheckbox.label "Match upper/lower case">
-<!ENTITY caseSensitiveCheckbox.accesskey "c">
-<!ENTITY wrapCheckbox.label "Wrap around">
-<!ENTITY wrapCheckbox.accesskey "W">
-<!ENTITY backwardsCheckbox.label "Search backwards">
-<!ENTITY backwardsCheckbox.accesskey "b">
-<!ENTITY findNextButton.label "Find Next">
-<!ENTITY findNextButton.accesskey "F">
-<!ENTITY replaceButton.label "Replace">
-<!ENTITY replaceButton.accesskey "R">
-<!ENTITY replaceAndFindButton.label "Replace and Find">
-<!ENTITY replaceAndFindButton.accesskey "d">
-<!ENTITY replaceAllButton.label "Replace All">
-<!ENTITY replaceAllButton.accesskey "A">
-<!ENTITY closeButton.label "Close">
-<!ENTITY notFoundWarning.label "The text you entered was not found.">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorSpellCheck.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorSpellCheck.dtd
deleted file mode 100644
index 7131a155c7d..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorSpellCheck.dtd
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "Check Spelling">
-
-<!ENTITY misspelledWord.label "Misspelled word:">
-<!ENTITY wordEditField.label "Replace with:">
-<!ENTITY wordEditField.accessKey "w">
-<!ENTITY checkwordButton.label "Check Word">
-<!ENTITY checkwordButton.accessKey "k">
-<!ENTITY suggestions.label "Suggestions:">
-<!ENTITY suggestions.accessKey "u">
-<!ENTITY ignoreButton.label "Ignore">
-<!ENTITY ignoreButton.accessKey "I">
-<!ENTITY ignoreAllButton.label "Ignore All">
-<!ENTITY ignoreAllButton.accessKey "n">
-<!ENTITY replaceButton.label "Replace">
-<!ENTITY replaceButton.accessKey "R">
-<!ENTITY replaceAllButton.label "Replace All">
-<!ENTITY replaceAllButton.accessKey "A">
-<!ENTITY stopButton.label "Stop">
-<!ENTITY stopButton.accessKey "t">
-<!ENTITY userDictionary.label "Personal Dictionary:">
-<!ENTITY moreDictionaries.label "Download More">
-<!ENTITY addToUserDictionaryButton.label "Add Word">
-<!ENTITY addToUserDictionaryButton.accessKey "d">
-<!ENTITY editUserDictionaryButton.label "Edit...">
-<!ENTITY editUserDictionaryButton.accessKey "E">
-<!ENTITY recheckButton.label "Recheck Page">
-<!ENTITY recheckButton.accessKey "P">
-<!ENTITY closeButton.label "Close">
-<!ENTITY closeButton.accessKey "C">
-<!ENTITY sendButton.label "Send">
-<!ENTITY sendButton.accessKey "S">
-<!ENTITY languagePopup.label "Language:">
-<!ENTITY languagePopup.accessKey "L">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/EditorTableProperties.dtd b/mozilla/mail/locales/en-US/chrome/editor/EditorTableProperties.dtd
deleted file mode 100644
index f89f8b37ee0..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/EditorTableProperties.dtd
+++ /dev/null
@@ -1,116 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY tableWindow.title                "Table Properties">
-<!ENTITY applyButton.label                "Apply">
-<!ENTITY applyButton.accesskey            "A">
-<!ENTITY closeButton.label                "Close">
-<!ENTITY tableTab.label                   "Table">
-<!ENTITY cellTab.label                    "Cells">
-<!ENTITY tableRows.label                  "Rows:">
-<!ENTITY tableRows.accessKey              "R">
-<!ENTITY tableColumns.label               "Columns:">
-<!ENTITY tableColumns.accessKey           "C">
-<!ENTITY tableHeight.label                "Height:">
-<!ENTITY tableHeight.accessKey            "G">
-<!ENTITY tableWidth.label                 "Width:">
-<!ENTITY tableWidth.accessKey             "W">
-<!ENTITY tableBorderSpacing.label         "Borders and Spacing">
-<!ENTITY tableBorderWidth.label           "Border:">
-<!ENTITY tableBorderWidth.accessKey       "B">
-<!ENTITY tableSpacing.label               "Spacing:">
-<!ENTITY tableSpacing.accessKey           "S">
-<!ENTITY tablePadding.label               "Padding:">
-<!ENTITY tablePadding.accessKey           "P">
-<!ENTITY tablePxBetwCells.label           "pixels between cells">
-<!ENTITY tablePxBetwBrdrCellContent.label "pixels between cell border and content">
-<!ENTITY tableAlignment.label             "Table Alignment:">
-<!ENTITY tableAlignment.accessKey         "T">
-<!ENTITY tableCaption.label               "Caption:">
-<!ENTITY tableCaption.accessKey           "N">
-<!ENTITY tableCaptionAbove.label          "Above Table">
-<!ENTITY tableCaptionBelow.label          "Below Table">
-<!ENTITY tableCaptionLeft.label           "Left of Table">
-<!ENTITY tableCaptionRight.label          "Right of table">
-<!ENTITY tableCaptionNone.label           "None">
-<!ENTITY tableInheritColor.label           "(Let page color show through)">
-
-<!ENTITY cellPercent.label                "percent of table">
-<!ENTITY cellSelection.label              "Selection">
-<!ENTITY cellSelectCell.label             "Cell">
-<!ENTITY cellSelectRow.label              "Row">
-<!ENTITY cellSelectColumn.label           "Column">
-<!ENTITY cellSelectNext.label             "Next">
-<!ENTITY cellSelectNext.accessKey         "N">
-<!ENTITY cellSelectPrevious.label         "Previous">
-<!ENTITY cellSelectPrevious.accessKey     "P">
-<!ENTITY cellApplyBeforeMove.label        "Apply changes before changing selection">
-<!ENTITY cellKeepCurrentData.label        "Keep current settings">
-<!-- LOCALIZATION NOTE Next 2 form 1 sentence (we don't want to use HTML tag to wrap) -->
-<!ENTITY applyBeforeChange1.label         "Current changes will be applied">
-<!ENTITY applyBeforeChange2.label         "before changing the selection.">
-<!ENTITY cellRowSpan.label                "Row Span:">
-<!ENTITY cellColSpan.label                "Column Span:">
-<!ENTITY cellContentAlignment.label       "Content Alignment">
-<!ENTITY cellHorizontal.label             "Horizontal:">
-<!ENTITY cellHorizontal.accessKey         "Z">
-<!ENTITY cellVertical.label               "Vertical:">
-<!ENTITY cellVertical.accessKey           "V">
-<!ENTITY cellStyle.label                  "Cell Style:">
-<!ENTITY cellStyle.accessKey              "C">
-<!ENTITY cellNormal.label                 "Normal">
-<!ENTITY cellHeader.label                 "Header">
-<!ENTITY cellTextWrap.label               "Text Wrap:">
-<!ENTITY cellTextWrap.accessKey           "T">
-<!ENTITY cellWrap.label                   "Wrap">
-<!ENTITY cellNoWrap.label                 "Don't wrap">
-<!ENTITY cellAlignTop.label               "Top">
-<!ENTITY cellAlignMiddle.label            "Middle">
-<!ENTITY cellAlignBottom.label            "Bottom">
-<!ENTITY cellAlignJustify.label           "Justify">
-<!ENTITY cellAlignAtChar.label            "At Character:">
-<!ENTITY cellInheritColor.label           "(Let table color show through)">
-<!ENTITY cellUseCheckboxHelp.label        "Use checkboxes to determine which properties are applied to all selected cells">
-
-<!-- Used in both Table and Cell panels  -->
-<!ENTITY size.label                       "Size">
-<!ENTITY pixels.label                     "pixels">
-<!ENTITY backgroundColor.label            "Background Color:">
-<!ENTITY backgroundColor.accessKey        "B">
-<!ENTITY AlignLeft.label                  "Left">
-<!ENTITY AlignCenter.label                "Center">
-<!ENTITY AlignRight.label                 "Right">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/editor.properties b/mozilla/mail/locales/en-US/chrome/editor/editor.properties
deleted file mode 100644
index 532e785d798..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/editor.properties
+++ /dev/null
@@ -1,233 +0,0 @@
-#
-# moved from content/
-#
-# LOCALIZATION NOTE FILE: embedded "\n" represent HTML breaks (<br>)
-# Don't translate embedded "\n".
-# Don't translate strings like this: %variable%
-#  as they will be replaced using JavaScript
-#
-Yes=Yes
-No=No
-Cancel=Cancel
-Insert=Insert
-InsertAccessKey=I
-Save=Save
-DontSave=Don't Save
-More=More
-Fewer=Fewer
-Less=Less
-MoreAttributes=More Attributes
-FewerAttributes=Fewer Attributes
-MoreProperties=More Properties
-FewerProperties=Fewer Properties
-PropertiesAccessKey=P
-None=None
-none=none
-OpenHTMLFile=Open HTML File
-SelectImageFile=Select Image File
-SaveDocument=Save Page
-SaveDocumentAs=Save Page As
-ExportToText=Export to Text
-EditMode=Edit Mode
-Preview=Preview
-Publish=Publish
-PublishPage=Publish Page
-DontPublish=Don't Publish
-SavePassword=Use Password Manager to save this password
-CorrectSpelling=(correct spelling)
-NoSuggestedWords=(no suggested words)
-NoMisspelledWord=No misspelled words
-CheckSpellingDone=Completed spell checking.
-CheckSpelling=Check Spelling
-LoadingDone=Done loading page
-InputError=Error
-Alert=Alert
-CantEditFramesetMsg=Composer cannot edit HTML framesets, or pages with inline frames. For framesets, try editing the page for each frame separately. For pages with iframes, save a copy of the page and remove the <iframe> tag.
-CantEditMimeTypeMsg=This type of page can't be edited.
-CantEditDocumentMsg=This page can't be edited for an unknown reason.
-HTMLFiles=HTML Files
-IMGFiles=Image Files
-TextFiles=Text Files
-AllFiles=All Files
-BeforeClosing=before closing
-BeforePreview=before viewing in Navigator
-BeforeValidate=before validating the document
-# LOCALIZATION NOTE (SaveFilePrompt, PublishPrompt): Don't translate %title% and %reason% (this is the reason for asking user to close, such as "before closing")
-SaveFilePrompt=Save changes to "%title%" %reason%? 
-PublishPrompt=Save changes to "%title%" %reason%? 
-SaveFileFailed=Saving file failed!
-
-# Publishing error strings:
-# LOCALIZATION NOTE Don't translate %dir% or %file% in the Publishing error strings:
-FileNotFound=%file% not found.
-SubdirDoesNotExist=The subdirectory "%dir%" doesn't exist on this site or the filename "%file%" is already in use by another subdirectory.
-FilenameIsSubdir=The filename "%file%" is already in use by another subdirectory.
-ServerNotAvailable=The server is not available. Check your connection and try again later.
-Offline=You are currently offline. Click the icon near the lower-right corner of any window to go online.
-DiskFull=There is not enough disk space available to save the file "%file%."
-NameTooLong=The filename or subdirectory name is too long.
-AccessDenied=You do not have permission to publish to this location.
-UnknownPublishError=Unknown publishing error occurred.
-PublishFailed=Publishing failed.
-PublishCompleted=Publishing completed.
-AllFilesPublished=All files published
-# LOCALIZATION NOTE Don't translate %x% or %total%
-FailedFileMsg=%x% of %total% files failed to publish.
-# End-Publishing error strings
-Prompt=Prompt
-# LOCALIZATION NOTE (PromptFTPUsernamePassword): Don't translate %host% 
-PromptFTPUsernamePassword=Enter username and password for FTP server at %host%
-RevertCaption=Revert To Last Saved
-Revert=Revert
-SendPageReason=before sending this page
-Send=Send
-## LOCALIZATION NOTE (PublishProgressCaption, PublishToSite, AbandonChanges): Don't translate %title%
-PublishProgressCaption=Publishing: %title%
-PublishToSite=Publishing to Site: %title%
-AbandonChanges=Abandon unsaved changes to "%title%" and reload page?
-DocumentTitle=Page Title
-NeedDocTitle=Please enter a title for the current page.
-DocTitleHelp=This identifies the page in the window title and bookmarks.
-CancelPublishTitle=Cancel publishing?
-## LOCALIZATION NOTE: "Continue" in this sentence must match the text for
-## the CancelPublishContinue key below
-CancelPublishMessage=Cancelling while publishing is in progress may result in your file(s) being incompletely transferred. Would you like to Continue or Cancel?
-CancelPublishContinue=Continue
-AttributesFor=Current attributes for: 
-MissingImageError=Please enter or choose an image of type gif, jpg, or png.
-EmptyHREFError=Please choose a location to create a new link.
-LinkText=Link Text
-LinkImage=Link Image
-MixedSelection=[Mixed selection]
-Mixed=(mixed)
-EnterLinkText=Enter text to display for the link:
-EnterLinkTextAccessKey=T
-EmptyLinkTextError=Please enter some text for this link.
-EditTextWarning=This will replace existing content.
-#LOCALIZATION NOTE (ValidateNumber):Don't translate: %n% %min% %max%
-ValidateRangeMsg=The number you entered (%n%) is outside of the allowed range.
-ValidateNumberMsg=Please enter a number between %min% and %max%.
-MissingAnchorNameError=Please enter a name for this anchor.
-#LOCALIZATION NOTE (DuplicateAnchorNameError): Don't translate %name%
-DuplicateAnchorNameError="%name%" already exists in this page. Please enter a different name.
-BulletStyle=Bullet Style
-SolidCircle=Solid circle
-OpenCircle=Open circle
-SolidSquare=Solid square
-NumberStyle=Number Style
-Automatic=Automatic
-Style_1=1, 2, 3...
-Style_I=I, II, III...
-Style_i=i, ii, iii...
-Style_A=A, B, C...
-Style_a=a, b, c...
-Pixels=pixels
-Percent=percent
-PercentOfCell=% of cell
-PercentOfWindow=% of window
-PercentOfTable=% of table
-untitled=untitled
-ShowToolbar=Show Toolbar
-HideToolbar=Hide Toolbar
-ImapError=Unable to load image 
-ImapCheck=\nPlease select a new location (URL) and try again.
-SaveToUseRelativeUrl=Relative URLs can only be used on pages which have been saved
-NoNamedAnchorsOrHeadings=(No named anchors or headings in this page)
-TextColor=Text Color
-HighlightColor=Highlight Color
-PageColor=Page Background Color
-BlockColor=Block Background Color
-TableColor=Table Background Color
-CellColor=Cell Background Color
-TableOrCellColor=Table or Cell Color
-LinkColor=Link Text Color
-ActiveLinkColor=Active Link Color
-VisitedLinkColor=Visited Link Color
-Color=Color
-NoColorError=Click on a color or enter a valid HTML color string
-Table=Table
-TableCell=Table Cell
-NestedTable=Nested Table
-HLine=Horizontal Line
-Link=Link
-Image=Image
-ImageAndLink=Image and Link
-NamedAnchor=Named Anchor
-List=List
-ListItem=List Item
-Form=Form
-InputTag=Form Field
-InputImage=Form Image
-TextArea=Text Area
-Select=Selection List
-Button=Button
-Label=Label
-FieldSet=Field Set
-Tag=Tag
-MissingSiteNameError=Please enter a name for this publishing site.
-MissingPublishUrlError=Please enter a location for publishing this page.
-MissingPublishFilename=Please enter a filename for the current page.
-MissingPublishSiteError=No publishing site information given. Switching to Settings panel so you can supply publishing information.
-#LOCALIZATION NOTE (DuplicateSiteNameError): Don't translate %name%
-DuplicateSiteNameError="%name%" already exists. Please enter a different site name.
-AdvancedProperties=Advanced Properties...
-AdvancedEditForCellMsg=Advanced Edit is unavailable when multiple cells are selected
-# LOCALIZATION NOTE (ObjectProperties):Don't translate "%obj%" it will be replaced with one of above object nouns
-ObjectProperties=%obj% Properties...
-# LOCALIZATION NOTE This character must be in the above string and not confict with other accesskeys in Format menu
-ObjectPropertiesAccessKey=o
-# LOCALIZATION NOTE (JoinSelectedCells): This variable should contain the "tablejoincells.accesskey" 
-# letter as defined in editorOverlay.dtd
-JoinSelectedCells=Join Selected Cells
-# LOCALIZATION NOTE (JoinCellToRight): This variable should contain the "tablejoincells.accesskey" 
-# letter as defined in editorOverlay.dtd
-JoinCellToRight=Join with Cell to the Right
-JoinCellAccesskey=j
-# LOCALIZATION NOTE (TableSelectKey): DONT_TRANSLATE
-TableSelectKey=Ctrl+
-# LOCALIZATION NOTE (XulKeyDefault): DONT_TRANSLATE
-XulKeyDefault=Ctrl+
-# LOCALIZATION NOTE (XulKeyMac): DONT_TRANSLATE
-XulKeyMac=Cmd+
-# LOCALIZATION NOTE (XulKeyUnix): DONT_TRANSLATE
-XulKeyUnix=Alt+
-# LOCALIZATION NOTE (Del): DONT_TRANSLATE
-Del=Del
-Delete=Delete
-DeleteCells=Delete Cells
-DeleteTableTitle=Delete Rows or Columns
-DeleteTableMsg=Reducing the number of rows or columns will delete table cells and their contents. Do you really want to do this?
-Clear=Clear
-#Mouse actions
-Click=Click
-Drag=Drag
-Unknown=Unknown
-Close=Close
-#
-# LOCALIZATION NOTE "RemoveTextStylesAccesskey" is used for both
-#  menu items: "RemoveTextStyles" and "StopTextStyles"
-RemoveTextStylesAccesskey=x
-RemoveTextStyles=Remove All Text Styles
-StopTextStyles=Discontinue Text Styles
-#
-# LOCALIZATION NOTE "RemoveLinksAccesskey" is used for both
-#  menu items: "RemoveLinks" and "StopLinks"
-RemoveLinksAccesskey=n
-RemoveLinks=Remove Links
-StopLinks=Discontinue Link
-#
-NoFormAction=It is recommended that you enter an action for this form. Self-posting forms are an advanced technique that may not work consistently in all browsers.
-NoAltText=If the image is relevant to the content of the document, you must supply alternate text that will appear in text-only browsers, and that will appear in other browsers when an image is loading or when image loading is disabled.
-SaveImageAs=Save Image (%NAME%)...
-NoSeparatorCharacter=Please enter a single character to use for separating into columns
-Apply=Apply
-ApplyAccessKey=A
-#
-# LOCALIZATION NOTE please do not translate %brand%, it will be used programmatically
-#  download spelling dictionaries confirmation dialog
-DictDownldConfirmTit=Download Dictionaries
-DictDownldConfirmMsg=%brand% will close the current window and redirect you to a spellchecker download site.
-#
-NoHeadTag=The HTML source could not be converted back into the document because the required <head> tag is missing. Please add it.
-NoBodyTag=The HTML source could not be converted back into the document because the required <body> tag is missing. Please add it.
-NoLinksToCheck=There are no elements with links to check
diff --git a/mozilla/mail/locales/en-US/chrome/editor/editorOverlay.dtd b/mozilla/mail/locales/en-US/chrome/editor/editorOverlay.dtd
deleted file mode 100644
index 14064c78aeb..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/editorOverlay.dtd
+++ /dev/null
@@ -1,617 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1999-2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Sammy Ford
-   -   Blake Ross
-   -   Ryan Cassin (rcassin@supernova.org)
-   -   Daniel Glazman (glazman@netscape.com)
-   -   Stephen Donner (technutz@netscape.net)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- Attn: Localization - some of the menus in this dialog directly affect mail also. -->
-
-<!-- File menu items -->
-<!ENTITY fileMenu.label "File">
-<!ENTITY filemenu.accesskey "f">
-<!ENTITY newBlankPageCmd.label "Composer Page">
-<!ENTITY newBlankPage.accesskey "P" >
-<!ENTITY newMenu.label "New">
-<!ENTITY openFileCmd.label "Open File...">
-<!ENTITY fileopen.accesskey "o">
-<!ENTITY fileopen.keybinding "o">
-<!ENTITY openremoteCmd.label "Open Web Location...">
-<!ENTITY fileopenremote.accesskey "l">
-<!ENTITY fileopenremote.keybinding "l">
-<!ENTITY fileRecentMenu.label "Recent Pages">
-<!ENTITY filerecentmenu.accesskey "r">
-<!ENTITY fileRevert.label "Revert">
-<!ENTITY filerevert.accesskey "v">
-<!ENTITY saveCmd.label "Save">
-<!ENTITY filesave.accesskey "s">
-<!ENTITY filesave.keybinding "s">
-<!ENTITY saveAsCmd.label "Save As...">
-<!ENTITY filesaveas.accesskey "A">
-
-<!ENTITY publishCmd.label "Publish">
-<!ENTITY publishcmd.accesskey "b">
-<!ENTITY publishAsCmd.label "Publish As...">
-<!ENTITY publishas.accesskey "h">
-<!ENTITY exportToTextCmd.label "Export to Text...">
-<!ENTITY fileexporttotext.accesskey "T">
-<!ENTITY saveAsChangeEncodingCmd.label "Save And Change Character Encoding">
-<!ENTITY filesaveandchangeencoding.accesskey "E">
-<!ENTITY previewCmd.label "Browse Page">
-<!ENTITY filepreview.accesskey "w">
-<!ENTITY sendPageCmd.label "Send Page...">
-<!ENTITY sendPage.accesskey "d">
-<!ENTITY printSetupCmd.label "Page Setup...">
-<!ENTITY fileprintsetup.accesskey "u">
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY fileprintpreview.accesskey "v">
-<!ENTITY printCmd.label "Print...">
-<!ENTITY printButtonCmd.label "Print...">
-<!ENTITY fileprint.accesskey "p">
-<!ENTITY fileprint.keybinding "p">
-<!ENTITY closeCmd.label "Close">
-<!ENTITY fileclose.accesskey "c">
-<!ENTITY fileclose.keybinding "w">
-<!ENTITY exitCmd.label "Quit">
-<!ENTITY fileexit.accesskey "q">
-<!ENTITY fileexit.keybinding "q">
-
-<!-- Edit menu items -->
-<!ENTITY editMenu.label "Edit">
-<!ENTITY editmenu.accesskey "e">
-<!ENTITY pasteNoFormatting.label "Paste Without Formatting">
-<!ENTITY pasteNoFormatting.accesskey "o">
-<!ENTITY pasteAs.label "Paste As">
-<!ENTITY pasteAs.accesskey "a">
-<!ENTITY publishSettings.label "Publishing Site Settings...">
-<!ENTITY publishSettings.accesskey "b">
-
-<!-- For a "Paste" submenu when more than 1 
-     clipboard formats are available -->
-<!ENTITY pasteHTMLCmd.label "HTML">
-<!ENTITY pasteHTML.accesskey "h">
-<!ENTITY pasteTextCmd.label "Text">
-<!ENTITY pasteText.accesskey "t">
-<!ENTITY pasteImageCmd.label "Image">
-<!ENTITY pasteImage.accesskey "i">
-<!ENTITY pasteRowsCmd.label "Rows">
-<!ENTITY pasteRows.accesskey "r">
-<!ENTITY pasteColumnsCmd.label "Columns">
-<!ENTITY pasteColumns.accesskey "c">
-<!-- LOCALIZATION NOTE: Text for menu item is in editor.properties
-     Set to: "Table" or "Nested Table" depending on context 
-     This accesskey must be in both strings -->
-<!ENTITY pasteTable.accesskey "a">
-<!ENTITY pasteLinkCmd.label "Link">
-<!ENTITY editpastelink.accesskey "l">
-<!ENTITY pasteAsQuotationCmd.label "Paste As Quotation">
-<!ENTITY editpastequotation.accesskey "q">
-<!ENTITY editpastequotation.keybinding "v">
-<!ENTITY editStripQuotesCmd.label "Strip Quotes">
-<!ENTITY editRewrapCmd.label "Rewrap">
-<!ENTITY findCmd.label "Find and Replace...">
-<!ENTITY editfind.accesskey "f">
-<!ENTITY editfind.keybinding "f">
-<!ENTITY editfind.keybinding2 "VK_F19">
-<!ENTITY findAgainCmd.label "Find Again">
-<!ENTITY editfindnext.accesskey "g">
-<!ENTITY editfindnext.keybinding "g">
-<!ENTITY editfindnext.keybinding2 "VK_F3">
-<!ENTITY findPrevCmd.label "Find Previous">
-<!ENTITY editfindprev.accesskey "v">
-<!ENTITY editfindprev.keybinding "g">
-<!ENTITY editfindprev.keybinding2 "VK_F3">
-<!ENTITY checkSpellingCmd.label "Check Spelling">
-<!ENTITY validateCmd.label "Validate HTML">
-<!ENTITY validate.accesskey "v">
-<!ENTITY checkLinksCmd.label "Check Links">
-<!ENTITY editcheckspelling.accesskey "s">
-<!ENTITY editcheckspelling.keybinding "k">
-
-<!-- View menu items -->
-<!ENTITY viewToolbarsMenu.label "Show/Hide"> 
-<!ENTITY viewToolbarsMenu.accesskey "w"> 
-<!ENTITY compositionToolbarCmd.label "Composition Toolbar">
-<!ENTITY compositiontb.accesskey "c">
-<!ENTITY formattingToolbarCmd.label "Format Toolbar">
-<!ENTITY formattingtb.accesskey "f">
-<!ENTITY editmodeToolbarCmd.label "Edit Mode Toolbar">
-<!ENTITY editmodetb.accesskey "E">
-<!ENTITY taskbarCmd.label "Status Bar">  
-<!ENTITY taskbarCmd.accesskey "S"> 
-<!ENTITY viewPageSource.label "Page Source">
-<!ENTITY viewpagesource.accesskey "s">
-<!ENTITY viewParagraphMarks.label "Paragraph Marks">
-<!ENTITY viewparagraphmarks.accesskey "p">
-
-<!-- Insert menu items -->
-<!ENTITY insertMenu.label "Insert">
-<!ENTITY insertmenu.accesskey "i">
-<!ENTITY insertLinkCmd.label "Link...">
-<!ENTITY insertlink.accesskey "l">
-<!ENTITY insertlink.keybinding "l">
-<!ENTITY insertAnchorCmd.label "Named Anchor...">
-<!ENTITY insertanchor.accesskey "A">
-<!ENTITY insertImageCmd.label "Image...">
-<!ENTITY insertimage.accesskey "i">
-<!ENTITY insertImageMapCmd.label "Image Map...">
-<!ENTITY insertHLineCmd.label "Horizontal Line">
-<!ENTITY inserthline.accesskey "o">
-<!ENTITY insertTableCmd.label "Table...">
-<!ENTITY inserttable.accesskey "t">
-<!ENTITY insertFormMenu.label "Form">
-<!ENTITY insertformmenu.accesskey "F">
-<!ENTITY insertHTMLCmd.label "HTML...">
-<!ENTITY insertHTMLCmd.accesskey "h">
-<!ENTITY insertCharsCmd.label "Characters and Symbols...">
-<!ENTITY insertchars.accesskey "C">
-<!ENTITY insertBreakCmd.label "Line Break">
-<!ENTITY insertbreak.accesskey "b">
-<!ENTITY insertBreakAllCmd.label "Break Below Image(s)">
-<!ENTITY insertbreakall.accesskey "k">
-
-<!-- Insert form menu items -->
-<!ENTITY insertFormCmd.label "Define Form...">
-<!ENTITY insertform.accesskey "D">
-<!ENTITY insertInputTagCmd.label "Form Field...">
-<!ENTITY insertinputtag.accesskey "e">
-<!ENTITY insertInputImageCmd.label "Form Image...">
-<!ENTITY insertinputimage.accesskey "I">
-<!ENTITY insertTextAreaCmd.label "Text Area...">
-<!ENTITY inserttextarea.accesskey "T">
-<!ENTITY insertSelectCmd.label "Selection List...">
-<!ENTITY insertselect.accesskey "S">
-<!ENTITY insertButtonCmd.label "Define Button...">
-<!ENTITY insertbutton.accesskey "B">
-<!ENTITY insertLabelCmd.label "Define Label">
-<!ENTITY insertlabel.accesskey "L">
-<!ENTITY insertFieldSetCmd.label "Define Field Set...">
-<!ENTITY insertfieldset.accesskey "F">
-<!ENTITY insertIsIndexCmd.label "Index Search">
-<!ENTITY insertisindex.accesskey "x">
-
-<!-- Used just in context popup. -->
-<!ENTITY createLinkCmd.label "Create Link...">
-<!ENTITY createlink.accesskey "k">
-<!ENTITY editLinkCmd.label "Edit Link in New Composer">
-<!ENTITY editlink.accesskey "i">
-<!-- (Toplevel Edit menu uses utilityOverlay) -->
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undo.accesskey "u">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redo.accesskey "r">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cut.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copy.accesskey "c">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY paste.accesskey "p">
-<!ENTITY deleteCmd.label "Delete">
-<!ENTITY delete.accesskey "d">
-<!ENTITY clearCmd.label "Clear">
-<!ENTITY clear.accesskey "l">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectall.accesskey "a">
-
-<!-- Font Face SubMenu -->
-<!ENTITY FontFaceSelect.tooltip "Choose a font">
-<!ENTITY fontfaceMenu.label "Font">
-<!ENTITY formatfontmenu.accesskey "f">
-<!ENTITY fontVarWidth.label "Variable Width">
-<!ENTITY fontvarwidth.accesskey "v">
-<!ENTITY fontFixedWidth.label "Fixed Width">
-<!ENTITY fontfixedwidth.accesskey "x">
-<!ENTITY formatfontfixed.keybinding "t">
-<!ENTITY fontHelveticaFont.label "Helvetica, Arial">
-<!ENTITY fonthelvetica.accesskey "l">
-<!ENTITY fontTimes.label "Times">
-<!ENTITY fonttimes.accesskey "t">
-<!ENTITY fontCourier.label "Courier">
-<!ENTITY fontcourier.accesskey "c">
-<!ENTITY localfontfaceMenu.label "Local Fonts">
-<!ENTITY localfontmenu.accesskey "f">
-
-<!-- Font Size SubMenu -->
-<!ENTITY FontSizeSelect.tooltip "Choose a font size">
-<!ENTITY decreaseFontSize.label "Smaller">
-<!ENTITY decreasefontsize.accesskey "r">
-<!ENTITY decreaseFontSize.keybinding "-">
-<!ENTITY increaseFontSize.label "Larger">
-<!ENTITY increasefontsize.accesskey "g">
-<!ENTITY increaseFontSize.keybinding "+">
-<!ENTITY increaseFontSize.keybinding2 "="> <!-- + is above this key on many keyboards -->
-
-<!ENTITY fontsizeMenu.label "Size">
-<!ENTITY formatsizemenu.accesskey "z">
-<!ENTITY size-xx-smallCmd.label "xx-small">
-<!ENTITY size-xx-small.accesskey "a">
-<!ENTITY size-x-smallCmd.label "x-small">
-<!ENTITY size-x-small.accesskey "m">
-<!ENTITY size-smallCmd.label "small">
-<!ENTITY size-small.accesskey "s">
-<!ENTITY size-mediumCmd.label "medium">
-<!ENTITY size-medium.accesskey "d">
-<!ENTITY size-largeCmd.label "large">
-<!ENTITY size-large.accesskey "l">
-<!ENTITY size-x-largeCmd.label "x-large">
-<!ENTITY size-x-large.accesskey "x">
-<!ENTITY size-xx-largeCmd.label "xx-large">
-<!ENTITY size-xx-large.accesskey "e">
-
-<!-- Font Style SubMenu -->
-<!ENTITY fontStyleMenu.label "Text Style">
-<!ENTITY formatstylemenu.accesskey "s">
-<!ENTITY styleBoldCmd.label "Bold">
-<!ENTITY stylebold.accesskey "b">
-<!ENTITY stylebold.keybinding "b">
-<!ENTITY styleItalicCmd.label "Italic">
-<!ENTITY styleitalic.accesskey "I">
-<!ENTITY styleitalic.keybinding "i">
-<!ENTITY styleUnderlineCmd.label "Underline">
-<!ENTITY styleunderline.accesskey "u">
-<!ENTITY styleunderline.keybinding "u">
-<!ENTITY styleStrikeThruCmd.label "Strikethrough">
-<!ENTITY stylestrikethru.accesskey "k">
-<!ENTITY styleSuperscriptCmd.label "Superscript">
-<!ENTITY stylesuperscript.accesskey "p">
-<!ENTITY styleSubscriptCmd.label "Subscript">
-<!ENTITY stylesubscript.accesskey "S">
-<!ENTITY styleNonbreakingCmd.label "Nonbreaking">
-<!ENTITY stylenonbreaking.accesskey "N">
-<!ENTITY styleEm.label "Emphasis">
-<!ENTITY styleEm.accesskey "e">
-<!ENTITY styleStrong.label "Stronger Emphasis">
-<!ENTITY styleStrong.accesskey "t">
-<!ENTITY styleCite.label "Citation">
-<!ENTITY styleCite.accesskey "c">
-<!ENTITY styleAbbr.label "Abbreviation">
-<!ENTITY styleAbbr.accesskey "A">
-<!ENTITY styleAcronym.label "Acronym">
-<!ENTITY styleAcronym.accesskey "r">
-<!ENTITY styleCode.label "Code">
-<!ENTITY styleCode.accesskey "o">
-<!ENTITY styleSamp.label "Sample Output">
-<!ENTITY styleSamp.accesskey "m">
-<!ENTITY styleVar.label "Variable">
-<!ENTITY styleVar.accesskey "v">
-
-<!ENTITY formatFontColor.label "Text Color...">
-<!ENTITY formatfontcolor.accesskey "c">
-<!ENTITY tableOrCellColor.label "Table or Cell Background Color...">
-<!ENTITY tableOrCellColor.accesskey "B">
-
-<!ENTITY formatremovestyles.keybinding "y">
-<!ENTITY formatremovelinks.keybinding "k">
-<!ENTITY formatRemoveNamedAnchors.label "Remove Named Anchors">
-<!ENTITY formatRemoveNamedAnchors.accesskey "R">
-<!ENTITY formatremovenamedanchors.keybinding "a">
-
-<!ENTITY formatindent.keybinding "]">
-<!ENTITY formatoutdent.keybinding "[">
-<!ENTITY paragraphMenu.label "Paragraph">
-<!ENTITY formatparagraphmenu.accesskey "P">
-<!ENTITY paragraphParagraphCmd.label "Paragraph">  
-<!ENTITY paragraphparagraph.accesskey "P">
-<!ENTITY heading1Cmd.label "Heading 1">
-<!ENTITY heading1.accesskey "1">
-<!ENTITY heading2Cmd.label "Heading 2">
-<!ENTITY heading2.accesskey "2">
-<!ENTITY heading3Cmd.label "Heading 3">
-<!ENTITY heading3.accesskey "3">
-<!ENTITY heading4Cmd.label "Heading 4">
-<!ENTITY heading4.accesskey "4">
-<!ENTITY heading5Cmd.label "Heading 5">
-<!ENTITY heading5.accesskey "5">
-<!ENTITY heading6Cmd.label "Heading 6">
-<!ENTITY heading6.accesskey "6">
-<!ENTITY paragraphAddressCmd.label "Address">
-<!ENTITY paragraphaddress.accesskey "a">
-<!ENTITY paragraphPreformatCmd.label "Preformat">
-<!ENTITY paragraphpreformat.accesskey "f">
-<!ENTITY paragraphBlockquoteCmd.label "Blockquote">
-<!ENTITY paragraphblockquote.accesskey "b">
-
-<!-- List menu items -->
-<!ENTITY formatlistMenu.label "List">
-<!ENTITY formatlistmenu.accesskey "l">
-<!ENTITY noneCmd.label "None">
-<!ENTITY none.accesskey "N">
-<!ENTITY listBulletCmd.label "Bulleted">
-<!ENTITY listbullet.accesskey "b">
-<!ENTITY listNumberedCmd.label "Numbered">
-<!ENTITY listnumbered.accesskey "m">
-<!ENTITY listTermCmd.label "Term">
-<!ENTITY listterm.accesskey "t">
-<!ENTITY listDefinitionCmd.label "Definition">
-<!ENTITY listdefinition.accesskey "d">
-<!ENTITY listProps.label "List Properties...">
-<!ENTITY listprops.accesskey "l">
-
-<!ENTITY ParagraphSelect.tooltip "Choose a paragraph format">
-<!-- Shared in Paragraph, and Toolbar menulist -->
-<!ENTITY bodyTextCmd.label "Body Text">
-<!ENTITY bodytext.accesskey "T">
-<!-- isn't used in menu now, but may be added in future -->
-<!ENTITY advancedPropertiesCmd.label "Advanced Properties">
-<!ENTITY advancedproperties.accesskey "v">
-
-<!ENTITY NormalAbbr.label "Text">
-<!ENTITY ParagraphAbbr.label "P">  
-<!ENTITY Heading1Abbr.label "H1">
-<!ENTITY Heading2Abbr.label "H2">
-<!ENTITY Heading3Abbr.label "H3">
-<!ENTITY Heading4Abbr.label "H4">
-<!ENTITY Heading5Abbr.label "H5">
-<!ENTITY Heading6Abbr.label "H6">
-<!ENTITY BlockquoteAbbr.label "BQ">
-<!ENTITY AddressAbbr.label "Addr.">
-<!ENTITY PreformatAbbr.label "Pre.">
-
-<!-- Style Sheet submenu NOT IMPLEMENTED -->
-<!ENTITY stylesheetMenu.label "Apply Style Sheet">
-<!ENTITY formatstylesheetmenu.accesskey "y">
-
-<!-- Align menu items -->
-<!ENTITY alignMenu.label "Align">
-<!ENTITY formatalignmenu.accesskey "a">
-<!ENTITY alignLeft.label "Left">
-<!ENTITY alignleft.accesskey "l">
-<!ENTITY alignLeft.tooltip "Align Left">
-<!ENTITY alignCenter.label "Center">
-<!ENTITY aligncenter.accesskey "c">
-<!ENTITY alignCenter.tooltip "Align Center">
-<!ENTITY alignRight.label "Right">
-<!ENTITY alignright.accesskey "r">
-<!ENTITY alignRight.tooltip "Align Right">
-<!ENTITY alignJustify.label "Justify">
-<!ENTITY alignjustify.accesskey "j">
-<!ENTITY alignJustify.tooltip "Align Justified">
-
-<!-- Layer toolbar items -->
-<!ENTITY layer.tooltip "Layer">
-<!ENTITY layerSendToBack.tooltip "Send to Back">
-<!ENTITY layerBringToFront.tooltip "Bring to Front">
-
-<!ENTITY increaseIndent.label "Increase Indent">
-<!ENTITY increaseindent.accesskey "i">
-<!ENTITY increaseindentkb "=">
-<!ENTITY decreaseIndent.label "Decrease Indent">
-<!ENTITY decreaseindent.accesskey "D">
-<!ENTITY decreaseindentkb "-">
-
-<!ENTITY grid.label "Positioning grid">
-<!ENTITY grid.accesskey "t">
-
-<!ENTITY pageProperties.label "Page Title and Properties...">
-<!ENTITY pageproperties.accesskey "g">
-<!ENTITY colorsAndBackground.label "Page Colors and Background...">
-<!ENTITY colorsandbackground.accesskey "u">
-
-<!-- Table Menu -->
-<!ENTITY tableMenu.label "Table">
-<!ENTITY tablemenu.accesskey "b">
-<!-- Select Submenu -->
-<!ENTITY tableSelectMenu.label "Select">
-<!ENTITY tableselectmenu.accesskey "s">
-
-<!ENTITY tableSelectMenu2.label "Table Select">
-<!ENTITY tableInsertMenu2.label "Table Insert">
-<!ENTITY tableDeleteMenu2.label "Table Delete">
-
-<!-- Insert SubMenu -->
-<!ENTITY tableInsertMenu.label "Insert">
-<!ENTITY tableinsertmenu.accesskey "i">
-<!ENTITY tableTable.label "Table">
-<!ENTITY tabletable.accesskey "t">
-<!ENTITY tableRow.label "Row">
-<!ENTITY tableRows.label "Row(s)">
-<!ENTITY tablerow.accesskey "r">
-<!ENTITY tableRowAbove.label "Row Above">
-<!-- uses tablerow.accesskey -->
-<!ENTITY tableRowBelow.label "Row Below">
-<!ENTITY tablerowbelow.accesskey "b">
-<!ENTITY tableColumn.label "Column">
-<!ENTITY tableColumns.label "Column(s)">
-<!ENTITY tablecolumn.accesskey "o">
-<!ENTITY tableColumnBefore.label "Column Before">
-<!-- uses tablecolumn.accesskey -->
-<!ENTITY tableColumnAfter.label "Column After">
-<!ENTITY tablecolumnafter.accesskey "a">
-<!ENTITY tableCell.label "Cell">
-<!ENTITY tableCells.label "Cell(s)">
-<!ENTITY tablecell.accesskey "c">
-<!ENTITY tableCellContents.label "Cell Contents">
-<!ENTITY tablecellcontents.accesskey "n">
-<!ENTITY tableAllCells.label "All Cells">
-<!ENTITY tableCellBefore.label "Cell Before">
-<!ENTITY tableallcells.accesskey "a">
-<!-- uses tablecell.accesskey -->
-<!ENTITY tableCellAfter.label "Cell After">
-<!ENTITY tablecellafter.accesskey "f">
-<!-- Delete SubMenu -->
-<!ENTITY tableDeleteMenu.label "Delete">
-<!ENTITY tabledeletemenu.accesskey "D">
-
-<!ENTITY tableFix.label "Fix Table Layout">
-<!ENTITY tablefix.accesskey "f">
-<!-- text for "Join Cells" is in editor.properties 
-     ("JoinSelectedCells" and "JoinCellToRight")
-     the access key must exist in both of those strings
-     But value must be set here for accesskey to draw properly
--->
-<!ENTITY tableJoinCells.label "j">
-<!ENTITY tablejoincells.accesskey "j">
-<!ENTITY tableSplitCell.label "Split Cell">
-<!ENTITY tablesplitcell.accesskey "c">
-<!ENTITY convertToTable.label "Create Table from Selection">
-<!ENTITY converttotable.accesskey "r">
-<!ENTITY tableProperties.label "Table Properties...">
-<!ENTITY tableProperties.accesskey "o">
-
-<!-- Tools menu -->
-<!ENTITY toolsmenu.accesskey "l">
-<!ENTITY toolbrowser.accesskey "b">
-<!ENTITY toolplaineditor.accesskey "p">
-<!ENTITY toolsetfocus.accesskey "f">
-
-<!-- Debug menu items -->
-<!ENTITY debugMenu.label "Debug">
-<!ENTITY newEditorTestPage.label "Composer with Test Page">
-<!ENTITY textEditorCmd.label "Plaintext Editor">
-<!ENTITY outputTextCmd.label "Output Text">
-<!ENTITY outputHTMLCmd.label "Output HTML">
-<!ENTITY insertTextCmd.label "Insert Text">
-<!ENTITY testSelectionCmd.label "Test Selection">
-<!ENTITY testTableLayoutCmd.label "Test Table Layout">
-<!ENTITY testDocumentCmd.label "Test Document">
-<!ENTITY showEmbeddedCmd.label "Show Embedded Objects">
-<!ENTITY dumpContentCmd.label "Dump Content Tree">
-<!ENTITY runUnitTestsCmd.label "Run Unit Tests">
-<!ENTITY dumpUndoStack.label "Dump Undo Stack">
-<!ENTITY dumpRedoStack.label "Dump Redo Stack">
-<!ENTITY executeJSTransactionViaTxmgr.label "Execute JS Transaction Via Transaction Manager">
-<!ENTITY executeJSTransactionViaEditor.label "Execute JS Transaction Via Editor">
-<!ENTITY startLogCmd.label "Start Log">
-<!ENTITY stopLogCmd.label "Stop Log">
-<!ENTITY runLogCmd.label "Run Log">
-<!ENTITY setFocusCmd.label "Set Focus">
-
-<!-- Toolbar-only items -->
-<!ENTITY menuBar.tooltip "Menu Bar">
-<!ENTITY compositionToolbar.tooltip "Composition Toolbar">
-<!ENTITY formatToolbar.tooltip "Formatting Toolbar">
-<!ENTITY newToolbarCmd.tooltip "Create a new Composer page">
-<!ENTITY openToolbarCmd.label "Open">
-<!ENTITY openToolbarCmd.tooltip "Open a local file">
-<!ENTITY saveToolbarCmd.tooltip "Save file to a local location">
-<!ENTITY publishToolbarCmd.tooltip "Upload file to a remote location">
-<!ENTITY previewToolbarCmd.label "Browse">
-<!ENTITY previewToolbarCmd.tooltip "Load this page into Navigator">
-<!ENTITY printToolbarCmd.label "Print">
-<!ENTITY printToolbarCmd.tooltip "Print this page">
-<!ENTITY findToolbarCmd.label "Find">
-<!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 "Insert new image or edit selected image's properties">
-<!ENTITY hruleToolbarCmd.label "H.Line">
-<!ENTITY hruleToolbarCmd.tooltip "Insert horizontal line or edit selected line's properties">
-<!ENTITY tableToolbarCmd.label "Table">
-<!ENTITY tableToolbarCmd.tooltip "Insert new table or edit selected table's properties">
-<!ENTITY linkToolbarCmd.label "Link">
-<!ENTITY linkToolbarCmd.tooltip "Insert new link or edit selected link's properties">
-<!ENTITY anchorToolbarCmd.label "Anchor">
-<!ENTITY anchorToolbarCmd.tooltip "Insert new named anchor or edit selected anchor's properties">
-<!ENTITY textColorCaption.label "Text Color">
-<!ENTITY TextColorButton.tooltip "Choose color for text">
-<!ENTITY BackgroundColorButton.tooltip "Choose color for background">
-<!ENTITY throbber.tooltip "Go to the &vendorShortName; home page">
-<!ENTITY HighlightColorButton.tooltip "Choose highlight color for text">
-
-<!-- Editor toolbar -->
-<!ENTITY decreaseFontSizeToolbarCmd.tooltip "Smaller font size">
-<!ENTITY increaseFontSizeToolbarCmd.tooltip "Larger font size">
-<!ENTITY boldToolbarCmd.tooltip "Bold">
-<!ENTITY italicToolbarCmd.tooltip "Italic">
-<!ENTITY underlineToolbarCmd.tooltip "Underline">
-<!ENTITY bulletListToolbarCmd.tooltip "Apply or remove bulleted list">
-<!ENTITY numberListToolbarCmd.tooltip "Apply or remove numbered list">
-<!ENTITY outdentToolbarCmd.tooltip "Outdent text (move left)">
-<!ENTITY indentToolbarCmd.tooltip "Indent text (move right)">
-<!ENTITY AlignPopupButton.tooltip "Choose text alignment">
-<!ENTITY InsertPopupButton.tooltip "Insert a Link, Anchor, Image, Horizontal Line, or Table">
-<!ENTITY alignLeftButton.tooltip "Align text along left margin">
-<!ENTITY alignCenterButton.tooltip "Align text centered">
-<!ENTITY alignRightButton.tooltip "Align text along right margin">
-<!ENTITY alignjustifyButton.tooltip "Align text along left and right margins">
-
-<!-- Formatting toolbar not used, but may be in future -->
-<!ENTITY formatToolbar.boldChar "B">
-<!ENTITY formatToolbar.italicChar "I">
-<!ENTITY formatToolbar.underlineChar "U">
-
-<!-- Used with color pickers in Format toolbar and Format Menu -->
-<!ENTITY colorPicker.default.label "Reader's default color">
-<!ENTITY colorPicker.default.accesskey "r">
-<!ENTITY colorLabel.label "Color:">
-<!ENTITY ok.label "OK">
-
-<!-- Display Mode toolbar and View menu items -->
-<!ENTITY NormalModeTab.label "Normal">
-<!ENTITY NormalMode.label "Normal Edit Mode">
-<!ENTITY NormalMode.accesskey "n">
-<!ENTITY NormalMode.tooltip "Show table borders and named anchors">
-<!ENTITY AllTagsMode.label "HTML Tags">
-<!ENTITY AllTagsMode.accesskey "A">
-<!ENTITY AllTagsMode.tooltip "Display icons for all HTML tags">
-
-<!ENTITY HTMLSourceMode.label "HTML Source">
-<!-- Toolbar has an image with "HTML" text, so don't include it in the string -->
-<!ENTITY SourceMode.label "Source">
-<!ENTITY HTMLSourceMode.accesskey "h">
-<!ENTITY HTMLSourceMode.tooltip "Edit HTML source">
-<!ENTITY PreviewMode.label "Preview">
-<!ENTITY PreviewMode.accesskey "p">
-<!ENTITY PreviewMode.tooltip "Display as WYSIWYG (as in Navigator)">
-
-<!-- LOCALIZATION NOTE: Do NOT translate text for 'SourceTabDirection'
-     Use latin "ltr" if you want the <html> image to left of the 
-     'SourceMode.label' text defined above,
-     or use latin "rtl" if you want this image to the right of text
-     This is the value of the HTML 'dir' attribute
--->
-<!ENTITY SourceTabDirection "ltr">
-
-<!-- Structure Toolbar Context Menu items -->
-<!ENTITY structSelect.label         "Select">
-<!ENTITY structSelect.accesskey     "s">
-<!ENTITY structRemoveTag.label      "Remove tag">
-<!ENTITY structRemoveTag.accesskey  "r">
-<!ENTITY structChangeTag.label      "Change tag">
-<!ENTITY structChangeTag.accesskey  "c">
-
-<!-- TOC manipulation -->
-<!ENTITY insertTOC.label          "Insert">
-<!ENTITY insertTOC.accesskey      "i">
-<!ENTITY updateTOC.label          "Update">
-<!ENTITY updateTOC.accesskey      "u">
-<!ENTITY removeTOC.label          "Remove">
-<!ENTITY removeTOC.accesskey      "r">
-<!ENTITY tocMenu.label            "Table of Contents...">
-<!ENTITY tocMenu.accesskey        "b">
diff --git a/mozilla/mail/locales/en-US/chrome/editor/editorSmileyOverlay.dtd b/mozilla/mail/locales/en-US/chrome/editor/editorSmileyOverlay.dtd
deleted file mode 100644
index 9dbe82b7bdd..00000000000
--- a/mozilla/mail/locales/en-US/chrome/editor/editorSmileyOverlay.dtd
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Editor Smiley Overlay.
-   -
-   - The Initial Developer of the Original Code is
-   - Neil Rashbrook.
-   - Portions created by the Initial Developer are Copyright (C) 2003
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -    Neil Rashbrook <neil@parkwaycc.co.uk>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- Smiley Menu items -->
-<!ENTITY insertSmiley.label "Smiley">
-<!ENTITY insertSmiley.accesskey "S">
-
-<!ENTITY smiley1Cmd.label "Smile">
-<!ENTITY smiley1Cmd.accesskey "S">
-<!ENTITY smiley2Cmd.label "Frown">
-<!ENTITY smiley2Cmd.accesskey "F">
-<!ENTITY smiley3Cmd.label "Wink">
-<!ENTITY smiley3Cmd.accesskey "W">
-<!ENTITY smiley4Cmd.label "Tongue-out">
-<!ENTITY smiley4Cmd.accesskey "T">
-<!ENTITY smiley5Cmd.label "Laughing">
-<!ENTITY smiley5Cmd.accesskey "L">
-<!ENTITY smiley6Cmd.label "Embarrassed">
-<!ENTITY smiley6Cmd.accesskey "E">
-<!ENTITY smiley7Cmd.label "Undecided">
-<!ENTITY smiley7Cmd.accesskey "U">
-<!ENTITY smiley8Cmd.label "Surprise">
-<!ENTITY smiley8Cmd.accesskey "p">
-<!ENTITY smiley9Cmd.label "Kiss">
-<!ENTITY smiley9Cmd.accesskey "K">
-<!ENTITY smiley10Cmd.label "Yell">
-<!ENTITY smiley10Cmd.accesskey "Y">
-<!ENTITY smiley11Cmd.label "Cool">
-<!ENTITY smiley11Cmd.accesskey "C">
-<!ENTITY smiley12Cmd.label "Money-Mouth">
-<!ENTITY smiley12Cmd.accesskey "M">
-<!ENTITY smiley13Cmd.label "Foot-in-Mouth">
-<!ENTITY smiley13Cmd.accesskey "o">
-<!ENTITY smiley14Cmd.label "Innocent">
-<!ENTITY smiley14Cmd.accesskey "I">
-<!ENTITY smiley15Cmd.label "Cry">
-<!ENTITY smiley15Cmd.accesskey "r">
-<!ENTITY smiley16Cmd.label "Lips-are-Sealed">
-<!ENTITY smiley16Cmd.accesskey "a">
-<!ENTITY SmileButton.tooltip "Insert a smiley face">
-