diff --git a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
index 2b6eaae26b0..0cc266275c9 100644
--- a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
@@ -3,162 +3,7 @@
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?> 
 
-<!DOCTYPE window
-[
-
-<!-- These entity declarations will go into a separate, locale file at some point -->
-<!-- Window title -->
-<!ENTITY textEditorWindow.title "Text Editor">
-
-<!-- Menu items:  the . means that the menu item isn't implemented yet -->
-
-<!-- File menu items -->
-<!ENTITY fileMenu.label "File">
-<!ENTITY newCmd.label "New">
-<!ENTITY openCmd.label "Open...">
-<!ENTITY closeCmd.label "Close">
-<!ENTITY saveCmd.label "Save">
-<!ENTITY saveAsCmd.label "Save As...">
-<!ENTITY printSetupCmd.label ".Print Setup...">
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY printCmd.label "Print...">
-<!ENTITY quitCmd.label "Quit">
-
-<!-- Edit menu items -->
-<!ENTITY editMenu.label "Edit">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteAsQuotationCmd.label "Paste As Quotation">
-<!ENTITY clearCmd.label ".Clear">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY findCmd.label "Find...">
-<!ENTITY findAgainCmd.label "Find Again">
-
-<!-- View menu items -->
-<!ENTITY viewMenu.label "View">
-<!ENTITY hideCompositionToolbarCmd.label ".Hide Composition Toolbar">
-<!ENTITY showCompositionToolbarCmd.label ".Show Composition Toolbar">
-<!ENTITY hideFormattingToolbarCmd.label ".Hide Format Toolbar">
-<!ENTITY showFormattingToolbarCmd.label ".Show Format Toolbar">
-
-<!-- Insert menu items -->
-<!ENTITY insertMenu.label "Insert">
-<!ENTITY insertLinkCmd.label "Link...">
-<!ENTITY insertTargetCmd.label ".Target...">
-<!ENTITY insertImageCmd.label "Image...">
-<!ENTITY insertHLineCmd.label "Horizontal Line">
-<!ENTITY insertTableCmd.label "Table...">
-<!ENTITY insertHTMLSourceCmd.label ".HTML Source...">
-<!ENTITY insertLineBreakCmd.label ".Line Break">
-<!ENTITY insertBreakBelowImagesCmd.label ".Break Below Image(s)">
-
-<!-- Format menu items -->
-<!ENTITY formatMenu.label "Format">
-
-<!ENTITY fontfaceMenu.label "Font Face">
-<!ENTITY defaultVariableWidthCmd.label "Default Variable Width">
-<!ENTITY defaultFixedWidthCmd.label "Default Fixed Width">
-<!ENTITY arialHelveticaFont.label "Arial, Helvetica">
-<!ENTITY timesFont.label "Times">
-<!ENTITY courierFont.label "Courier">
-
-<!ENTITY fontsizeMenu.label "Size">
-<!ENTITY sizeMinusTwoCmd.label " -2">
-<!ENTITY sizeMinusOneCmd.label " -1 (smaller)">
-<!ENTITY sizeNormalCmd.label " Normal">
-<!ENTITY sizePlusOneCmd.label " +1 (bigger)">
-<!ENTITY sizePlusTwoCmd.label " +2">
-<!ENTITY sizePlusThreeCmd.label " +3">
-<!ENTITY sizePlusFourCmd.label " +4">
-
-<!ENTITY fontStyleMenu.label "Style">
-<!ENTITY styleBoldCmd.label "Bold">
-<!ENTITY styleItalicCmd.label "Italic">
-<!ENTITY styleUnderlineCmd.label "Underline">
-<!ENTITY styleStrikeThruCmd.label "Strikethrough">
-<!ENTITY styleSuperscriptCmd.label "Superscript">
-<!ENTITY styleSubscriptCmd.label "Subscript">
-<!ENTITY styleBlinkCmd.label "Blink">
-<!ENTITY styleNonbreakingCmd.label "Nonbreaking">
-
-<!ENTITY fontColorMenu.label "Text Color">
-<!ENTITY colorBlackCmd.label "Black">
-<!ENTITY colorGrayCmd.label "Gray">
-<!ENTITY colorSilverCmd.label "Silver">
-<!ENTITY colorWhiteCmd.label "White">
-<!ENTITY colorRedCmd.label "Red">
-<!ENTITY colorBlueCmd.label "Blue">
-<!ENTITY colorGreenCmd.label "Green">
-<!ENTITY colorCyanCmd.label "Cyan">
-<!ENTITY colorYellowCmd.label "Yellow">
-<!ENTITY colorMagentaCmd.label "Magenta">
-
-<!ENTITY backgroundColorMenu.label "Background Color">
-
-<!ENTITY paragraphHeadingMenu.label "Paragraph / Heading">
-<!ENTITY paragraphNormalCmd.label "Normal">
-<!ENTITY headingOneCmd.label "Heading 1">
-<!ENTITY headingTwoCmd.label "Heading 2">
-<!ENTITY headingThreeCmd.label "Heading 3">
-<!ENTITY headingFourCmd.label "Heading 4">
-<!ENTITY headingFiveCmd.label "Heading 5">
-<!ENTITY headingSixCmd.label "Heading 6">
-<!ENTITY paragraphBlockquoteCmd.label "Blockquote">
-<!ENTITY paragraphAddressCmd.label "Address">
-<!ENTITY paragraphPreformatCmd.label "Preformat">
-<!ENTITY paragraphListCmd.label "List item">
-<!ENTITY paragraphDfnTermCmd.label "Definition term">
-<!ENTITY paragraphDfnDescCmd.label "Definition description">
-
-<!ENTITY removeAllStylesCmd.label "Remove All Style(s)">
-
-<!ENTITY toolsMenu.label "Tools">
-<!ENTITY newBrowserCmd.label "New Browser Window">
-<!ENTITY newPlaintextEditorCmd.label "New Plaintext Editor">
-<!ENTITY checkSpellingCmd.label "Check Spelling...">
-<!ENTITY setFocusCmd.label "Set Focus">
-
-<!ENTITY debugMenu.label "Debug">
-<!ENTITY outputTextCmd.label "Output Text">
-<!ENTITY outputHTMLCmd.label "Output HTML">
-<!ENTITY insertTextCmd.label "Insert Text">
-<!ENTITY testSelectionCmd.label "Test Selection">
-<!ENTITY testDocumentCmd.label "Test Document">
-<!ENTITY runUnitTestsCmd.label "Run Unit Tests">
-
-<!ENTITY helpMenu.label "Help">
-<!ENTITY aboutCmd.label ".About">
-
-<!-- formatting toolbar -->
-<!ENTITY paragraphToolbarMenu.label "Paragraph">
-<!ENTITY fontToolbarMenu.label "Font">
-<!ENTITY sizeToolbarMenu.label "Size">
-<!ENTITY formatToolbar.boldChar "B">
-<!ENTITY formatToolbar.italicChar "I">
-<!ENTITY formatToolbar.underlineChar "U">
-<!ENTITY bulletListIcon.url "chrome://editor/skin/images/ED_Bullets.gif">
-<!ENTITY numberListIcon.url "chrome://editor/skin/images/ED_Numbers.gif">
-<!ENTITY outdentIcon.url "chrome://editor/skin/images/ED_Outdent.gif">
-<!ENTITY indentIcon.url "chrome://editor/skin/images/ED_Indent.gif">
-<!ENTITY alignpopupIcon.url "chrome://editor/skin/images/ED_Align.gif">
-<!ENTITY alignLeft.label "Left">
-<!ENTITY alignCenter.label "Center">
-<!ENTITY alignRight.label "Right">
-<!ENTITY alignJustify.label "Justify">
-<!ENTITY linkIcon.url "chrome://editor/skin/images/ED_Link.gif">
-<!ENTITY imageIcon.url "chrome://editor/skin/images/ED_Image.gif">
-<!ENTITY spellingIcon.url "chrome://editor/skin/images/ED_Spell.gif">
-<!ENTITY linkToolbarCmd.label "Link">
-<!ENTITY imageToolbarCmd.label "Image">
-<!ENTITY spellToolbarCmd.label "Spell">
-
-<!ENTITY tempNotification.label "[Notification Component]">
-<!ENTITY tempDoneLoading.label "Document: Done">
-
-]> 
+<!DOCTYPE window SYSTEM "chrome://editor/locale/EditorAppShell.dtd"> 
 
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
 			  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mozilla/suite/debugQA/content/debugQATextEditorShell.xul b/mozilla/suite/debugQA/content/debugQATextEditorShell.xul
index 2b6eaae26b0..0cc266275c9 100644
--- a/mozilla/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/mozilla/suite/debugQA/content/debugQATextEditorShell.xul
@@ -3,162 +3,7 @@
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?> 
 
-<!DOCTYPE window
-[
-
-<!-- These entity declarations will go into a separate, locale file at some point -->
-<!-- Window title -->
-<!ENTITY textEditorWindow.title "Text Editor">
-
-<!-- Menu items:  the . means that the menu item isn't implemented yet -->
-
-<!-- File menu items -->
-<!ENTITY fileMenu.label "File">
-<!ENTITY newCmd.label "New">
-<!ENTITY openCmd.label "Open...">
-<!ENTITY closeCmd.label "Close">
-<!ENTITY saveCmd.label "Save">
-<!ENTITY saveAsCmd.label "Save As...">
-<!ENTITY printSetupCmd.label ".Print Setup...">
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY printCmd.label "Print...">
-<!ENTITY quitCmd.label "Quit">
-
-<!-- Edit menu items -->
-<!ENTITY editMenu.label "Edit">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteAsQuotationCmd.label "Paste As Quotation">
-<!ENTITY clearCmd.label ".Clear">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY findCmd.label "Find...">
-<!ENTITY findAgainCmd.label "Find Again">
-
-<!-- View menu items -->
-<!ENTITY viewMenu.label "View">
-<!ENTITY hideCompositionToolbarCmd.label ".Hide Composition Toolbar">
-<!ENTITY showCompositionToolbarCmd.label ".Show Composition Toolbar">
-<!ENTITY hideFormattingToolbarCmd.label ".Hide Format Toolbar">
-<!ENTITY showFormattingToolbarCmd.label ".Show Format Toolbar">
-
-<!-- Insert menu items -->
-<!ENTITY insertMenu.label "Insert">
-<!ENTITY insertLinkCmd.label "Link...">
-<!ENTITY insertTargetCmd.label ".Target...">
-<!ENTITY insertImageCmd.label "Image...">
-<!ENTITY insertHLineCmd.label "Horizontal Line">
-<!ENTITY insertTableCmd.label "Table...">
-<!ENTITY insertHTMLSourceCmd.label ".HTML Source...">
-<!ENTITY insertLineBreakCmd.label ".Line Break">
-<!ENTITY insertBreakBelowImagesCmd.label ".Break Below Image(s)">
-
-<!-- Format menu items -->
-<!ENTITY formatMenu.label "Format">
-
-<!ENTITY fontfaceMenu.label "Font Face">
-<!ENTITY defaultVariableWidthCmd.label "Default Variable Width">
-<!ENTITY defaultFixedWidthCmd.label "Default Fixed Width">
-<!ENTITY arialHelveticaFont.label "Arial, Helvetica">
-<!ENTITY timesFont.label "Times">
-<!ENTITY courierFont.label "Courier">
-
-<!ENTITY fontsizeMenu.label "Size">
-<!ENTITY sizeMinusTwoCmd.label " -2">
-<!ENTITY sizeMinusOneCmd.label " -1 (smaller)">
-<!ENTITY sizeNormalCmd.label " Normal">
-<!ENTITY sizePlusOneCmd.label " +1 (bigger)">
-<!ENTITY sizePlusTwoCmd.label " +2">
-<!ENTITY sizePlusThreeCmd.label " +3">
-<!ENTITY sizePlusFourCmd.label " +4">
-
-<!ENTITY fontStyleMenu.label "Style">
-<!ENTITY styleBoldCmd.label "Bold">
-<!ENTITY styleItalicCmd.label "Italic">
-<!ENTITY styleUnderlineCmd.label "Underline">
-<!ENTITY styleStrikeThruCmd.label "Strikethrough">
-<!ENTITY styleSuperscriptCmd.label "Superscript">
-<!ENTITY styleSubscriptCmd.label "Subscript">
-<!ENTITY styleBlinkCmd.label "Blink">
-<!ENTITY styleNonbreakingCmd.label "Nonbreaking">
-
-<!ENTITY fontColorMenu.label "Text Color">
-<!ENTITY colorBlackCmd.label "Black">
-<!ENTITY colorGrayCmd.label "Gray">
-<!ENTITY colorSilverCmd.label "Silver">
-<!ENTITY colorWhiteCmd.label "White">
-<!ENTITY colorRedCmd.label "Red">
-<!ENTITY colorBlueCmd.label "Blue">
-<!ENTITY colorGreenCmd.label "Green">
-<!ENTITY colorCyanCmd.label "Cyan">
-<!ENTITY colorYellowCmd.label "Yellow">
-<!ENTITY colorMagentaCmd.label "Magenta">
-
-<!ENTITY backgroundColorMenu.label "Background Color">
-
-<!ENTITY paragraphHeadingMenu.label "Paragraph / Heading">
-<!ENTITY paragraphNormalCmd.label "Normal">
-<!ENTITY headingOneCmd.label "Heading 1">
-<!ENTITY headingTwoCmd.label "Heading 2">
-<!ENTITY headingThreeCmd.label "Heading 3">
-<!ENTITY headingFourCmd.label "Heading 4">
-<!ENTITY headingFiveCmd.label "Heading 5">
-<!ENTITY headingSixCmd.label "Heading 6">
-<!ENTITY paragraphBlockquoteCmd.label "Blockquote">
-<!ENTITY paragraphAddressCmd.label "Address">
-<!ENTITY paragraphPreformatCmd.label "Preformat">
-<!ENTITY paragraphListCmd.label "List item">
-<!ENTITY paragraphDfnTermCmd.label "Definition term">
-<!ENTITY paragraphDfnDescCmd.label "Definition description">
-
-<!ENTITY removeAllStylesCmd.label "Remove All Style(s)">
-
-<!ENTITY toolsMenu.label "Tools">
-<!ENTITY newBrowserCmd.label "New Browser Window">
-<!ENTITY newPlaintextEditorCmd.label "New Plaintext Editor">
-<!ENTITY checkSpellingCmd.label "Check Spelling...">
-<!ENTITY setFocusCmd.label "Set Focus">
-
-<!ENTITY debugMenu.label "Debug">
-<!ENTITY outputTextCmd.label "Output Text">
-<!ENTITY outputHTMLCmd.label "Output HTML">
-<!ENTITY insertTextCmd.label "Insert Text">
-<!ENTITY testSelectionCmd.label "Test Selection">
-<!ENTITY testDocumentCmd.label "Test Document">
-<!ENTITY runUnitTestsCmd.label "Run Unit Tests">
-
-<!ENTITY helpMenu.label "Help">
-<!ENTITY aboutCmd.label ".About">
-
-<!-- formatting toolbar -->
-<!ENTITY paragraphToolbarMenu.label "Paragraph">
-<!ENTITY fontToolbarMenu.label "Font">
-<!ENTITY sizeToolbarMenu.label "Size">
-<!ENTITY formatToolbar.boldChar "B">
-<!ENTITY formatToolbar.italicChar "I">
-<!ENTITY formatToolbar.underlineChar "U">
-<!ENTITY bulletListIcon.url "chrome://editor/skin/images/ED_Bullets.gif">
-<!ENTITY numberListIcon.url "chrome://editor/skin/images/ED_Numbers.gif">
-<!ENTITY outdentIcon.url "chrome://editor/skin/images/ED_Outdent.gif">
-<!ENTITY indentIcon.url "chrome://editor/skin/images/ED_Indent.gif">
-<!ENTITY alignpopupIcon.url "chrome://editor/skin/images/ED_Align.gif">
-<!ENTITY alignLeft.label "Left">
-<!ENTITY alignCenter.label "Center">
-<!ENTITY alignRight.label "Right">
-<!ENTITY alignJustify.label "Justify">
-<!ENTITY linkIcon.url "chrome://editor/skin/images/ED_Link.gif">
-<!ENTITY imageIcon.url "chrome://editor/skin/images/ED_Image.gif">
-<!ENTITY spellingIcon.url "chrome://editor/skin/images/ED_Spell.gif">
-<!ENTITY linkToolbarCmd.label "Link">
-<!ENTITY imageToolbarCmd.label "Image">
-<!ENTITY spellToolbarCmd.label "Spell">
-
-<!ENTITY tempNotification.label "[Notification Component]">
-<!ENTITY tempDoneLoading.label "Document: Done">
-
-]> 
+<!DOCTYPE window SYSTEM "chrome://editor/locale/EditorAppShell.dtd"> 
 
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
 			  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"