From a74d67d0a6356f8d1c7cbd3aafba45efae2ae967 Mon Sep 17 00:00:00 2001
From: "danm%netscape.com" <danm%netscape.com>
Date: Sat, 21 Aug 1999 00:15:58 +0000
Subject: [PATCH] move localizable string entities into separate DTD

---
 suite/browser/hiddenWindow.xul                | 254 +-----------------
 .../global/resources/content/hiddenWindow.xul | 254 +-----------------
 2 files changed, 16 insertions(+), 492 deletions(-)

diff --git a/suite/browser/hiddenWindow.xul b/suite/browser/hiddenWindow.xul
index a293dec3040..01d9eca1a07 100644
--- a/suite/browser/hiddenWindow.xul
+++ b/suite/browser/hiddenWindow.xul
@@ -32,251 +32,19 @@ Contributor(s): ______________________________________. -->
      the full one was included for now in anticipation of the whole thing
      becoming an included file someday. -->
 
-<!-- First, a bunch of string definitions lifted from navigator.xul,
-     just for the menus.  What are the odds they'll stay in synch?
-     Hoping for the day when included files work. The one new string
-     in here is the first, the hidden window's title. -->
-<!DOCTYPE window
-[
-<!ENTITY hiddenWindow.title "hidden"> 
-<!ENTITY mainWindow.titlemodifier "Mozilla"> 
-<!ENTITY mainWindow.titlemodifierseparator " - ">
-<!ENTITY throbber.url "http://www.mozilla.org"> 
-<!ENTITY fileMenu.label "File">
-<!ENTITY browserCmd.label "New Browser Window">
-<!ENTITY newMenu.label "New">
-<!ENTITY newMailCmd.label "Mail Message">
-<!ENTITY newBlankPageCmd.label "Blank Window">
-<!ENTITY newPageFromTemplateCmd.label "Page Using Template">
-<!ENTITY newPageFromDraftCmd.label "Page using Draft">
-<!ENTITY openCmd.label "Open File or Location...">
-<!ENTITY sendPageCmd.label "Send Page">
-<!ENTITY editPageCmd.label "Edit Page">
-<!ENTITY offlineMenu.label "Offline">
-<!ENTITY offlineGoOfflineCmd.label "Go Offline">
-<!ENTITY offlineSynchronizeCmd.label "Synchronize">
-<!ENTITY printSetupCmd.label "Print Setup...">
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY printCmd.label "Print...">
-<!ENTITY closeCmd.label "Close">
-<!ENTITY quitCmd.label "Quit">
-<!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 deleteCmd.label "Delete">
-<!ENTITY walletMenu.label "Wallet">
-<!ENTITY walletSafeFillCmd.label "Safe Form Fill">
-<!ENTITY walletQuickFillCmd.label "Quick Form Fill">
-<!ENTITY walletContentsCmd.label "Wallet Contents">
-<!ENTITY walletDisplaySignonsCmd.label "Display Signons">
-<!ENTITY walletDisplayCookiesCmd.label "Display Cookies">
-<!ENTITY walletSamplesCmd.label "Samples">
-<!ENTITY walletChangePasswordCmd.label "Change Password">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY preferences.label "Preferences...">
-<!ENTITY viewMenu.label "View">
-<!ENTITY toolbarsCmd.label "Toolbars">
-<!ENTITY sidebarCmd.label "Sidebar">
-<!ENTITY enlargeTextSizeCmd.label "Enlarge Text Size">
-<!ENTITY reduceTextSizeCmd.label "Reduce Text Size">
-<!ENTITY useStyleSheetMenu.label "Use Stylesheet">
-<!ENTITY useStyleSheetDefaultCmd.label "Default">
-<!ENTITY useStyleSheetEasyReadingCmd.label "Easy Reading">
-<!ENTITY useStyleSheetMaxInfoCmd.label "Maximum Information">
-<!ENTITY useStlyleSheetBizarreCmd.label "Bizarre">
-<!ENTITY reloadCmd.label "Reload">
-<!ENTITY showImagesCmd.label "Show Images">
-<!ENTITY stopCmd.label "Stop">
-<!ENTITY pageSourceCmd.label "Page Source">
-<!ENTITY pageInfoCmd.label "Page Info">
-<!ENTITY translateMenu.label "Translate">
-<!ENTITY translateButton.label "Translate">
-<!ENTITY translateEngtoFrenCmd.label "English to French">
-<!ENTITY translateEngtoGermCmd.label "English to German">
-<!ENTITY translateEngtoItalianCmd.label "English to Italian">
-<!ENTITY translateEngtoJapaneseCmd.label "English to Japanese">
-<!ENTITY translateEngtoPortCmd.label "English to Portugese">
-<!ENTITY translateEngtoSpanCmd.label "English to Spanish">
-<!ENTITY translateFrentoEngCmd.label "French to English">
-<!ENTITY translateFrentoGermCmd.label "French to German">
-<!ENTITY translateFrentoSpanCmd.label "French to Spanish">
-<!ENTITY translateGermtoEngCmd.label "German to English">
-<!ENTITY translateGermtoFrenCmd.label "German to French">
-<!ENTITY translateGermtoSpanCmd.label "German to Spanish">
-<!ENTITY translateItaliantoEngCmd.label "Italian to English">
-<!ENTITY tanslateJapanesetoEngCmd.label "Japanese to English">
-<!ENTITY translatePorttoEngCmd.label "Portugese to English">
-<!ENTITY tanslateSpantoEngCmd.label "Spanish to English">
-<!ENTITY translateSpantoFrenCmd.label "Spanish to French">
-<!ENTITY translateSpantoGermCmd.label "Spanish to German">
-<!ENTITY dcharMenu.label "Character Set">
-<!ENTITY dcharIso1Cmd.label "ISO Latin 1 (ISO-8859-1)">
-<!ENTITY dcharIso2Cmd.label "ISO Latin 2 (ISO-8859-2)">
-<!ENTITY dcharIso3Cmd.label "ISO Latin 3 (ISO-8859-3)">
-<!ENTITY dcharIso4Cmd.label "ISO Latin 4 (ISO-8859-4)">
-<!ENTITY dcharIso9Cmd.label "ISO Latin 5 (ISO-8859-9)">
-<!ENTITY dcharIso10Cmd.label "ISO Latin 6 (ISO-8859-10)">
-<!ENTITY dcharIso13Cmd.label "ISO Latin 7 (ISO-8859-13)">
-<!ENTITY dcharIso14Cmd.label "ISO Latin 8 (ISO-8859-14)">
-<!ENTITY dcharIso15Cmd.label "ISO Latin 9 (ISO-8859-15)">
-<!ENTITY dcharWinLat2Cmd.label "Windows Latin 2 (windows-1250)"> 
-<!ENTITY dcharWinLat1Cmd.label "Windows Latin 1 (windows-1252)">
-<!ENTITY dcharWinLat5Cmd.label "Windows Latin 5 (windows-1254)">
-<!ENTITY dcharWinBalRimCmd.label "Windows Baltic (windows-1257)">
-<!ENTITY dcharMacRomCmd.label "Macintosh Roman">
-<!ENTITY dcharMacCenEuroCmd.label "Macintosh Central European">
-<!ENTITY dcharMacTurCmd.label "Macintosh Turkish">
-<!ENTITY dcharMacCroaCmd.label "Macintosh Croatian">
-<!ENTITY dcharMacRomanianCmd.label "Macintosh Romanian">
-<!ENTITY dcharMacIceCmd.label "Macintosh Icelandic">
-<!ENTITY dcharJapanCmd.label "Japanese JIS (ISO-2022-JP)">
-<!ENTITY dcharJapanShiftjsCmd.label "Japanese (Shift_JIS)">
-<!ENTITY dcharJapanEucCmd.label "Japanese (EUC-JP)">
-<!ENTITY dcharTradChiBigCmd.label "Traditional Chinese (Big5)">
-<!ENTITY dcharTriChiEucCmd.label "Traditional Chinese (EUC-TW)">
-<!ENTITY dcharSimpChiGbCmd.label "Simplified Chinese (GB2312)">
-<!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
-<!ENTITY dcharUtf7Cmd.label "Multilingual (UTF-7)">
-<!ENTITY dcharUtf8Cmd.label "Multilingual (UTF-8)">
-<!ENTITY dcharIsoCyrCmd.label "ISO Cyrillic (ISO-8859-5)">
-<!ENTITY dcharEcmaCyrCmd.label "ECMA Cyrillic (ISO-IR-111)">
-<!ENTITY dcharDosCyrCmd.label "DOS Cyrillic (IBM866)">
-<!ENTITY dcharWinCyrCmd.label "Windows Cyrillic (windows-1251)">
-<!ENTITY dcharMacCyrCmd.label "Macintosh Cyrillic">
-<!ENTITY dcharMacUkrCmd.label "Macintosh Ukrainian">
-<!ENTITY dcharRusCmd.label "Russian (KOI8-R)">
-<!ENTITY dcharUkrCmd.label "Ukrainian (KOI8-U)">
-<!ENTITY dcharIsoGreekCmd.label "ISO Greek (ISO-8859-7)">
-<!ENTITY dcharWinGreekCmd.label "Windows Greek (windows-1253)">
-<!ENTITY dcharMacGreekCmd.label "Macintosh Greek">
-<!ENTITY dcharWinVietCmd.label "Windows Vietvaluese (windows-1258)">
-<!ENTITY dcharVietTcnCmd.label "Vietvaluese (TCVN5712)">
-<!ENTITY dcharVietViCmd.label "Vietvaluese (VISCII)">
-<!ENTITY dcharVieVpCmd.label "Vietvaluese (VPS)">
-<!ENTITY dcharThaiCmd.label "Thai (TIS-620)">
-<!ENTITY dcharArmCmd.label "Armenian (ARMSCII-8)">
-<!ENTITY dcharIso6Cmd.label ".ISO Arabic (ISO-8859-6)">
-<!ENTITY dcharIso8Cmd.label ".ISO Hebrew (ISO-8859-8)">
-<!ENTITY dcharCp1255Cmd.label "Windows Hebrew (windows-1255)">
-<!ENTITY dcharCp1256Cmd.label "Windows Arabic (windows-1256)">
-<!ENTITY searchMenu.label "Search">
-<!ENTITY findOnCmd.label "Find On this page...">
-<!ENTITY findAgainCmd.label "Find Again">
-<!ENTITY searchParentCmd.label "Search Parent Item...">
-<!ENTITY searchParenet2Cmd.label "Search Parent2 Item">
-<!ENTITY appSpecificCmd.label "App Specific">
-<!ENTITY searchInternetCmd.label "Search the Internet...">
-<!ENTITY searchAllMailCmd.label "Search All Mail....">
-<!ENTITY searchBookmarksCmd.label "Search Bookmarks...">
-<!ENTITY searchPeopleCmd.label "Search People...">
-<!ENTITY searchComputerCmd.label "Search on this Computer...">
-<!ENTITY goMenu.label "Go">
-<!ENTITY goBackCmd.label "Back">
-<!ENTITY goForwardCmd.label "Forward">
-<!ENTITY goHomeCmd.label "Home">
-<!ENTITY goPrev1Cmd.label "Previous Site 1">
-<!ENTITY goPrev2Cmd.label "Previous Site 2">
-<!ENTITY goPrevnCmd.label "Previous Site n">
-<!ENTITY bookmarksMenu.label "Bookmarks">
-<!ENTITY addCurPageCmd.label "Add Current Page">
-<!ENTITY manBookmarksCmd.label "Manage Bookmarks...">
-<!ENTITY tasksMenu.label "Tasks">
-<!ENTITY navigatorCmd.label "Navigator">
-<!ENTITY messengerCmd.label "Messenger">
-<!ENTITY editorCmd.label "Editor">
-<!ENTITY textEditorCmd.label "Plaintext Editor">
-<!ENTITY manageHistoryCmd.label "Manage History">
-<!ENTITY toolsMenu.label "Tools">
-<!ENTITY toolsPluginsInfoCmd.label "Plugins Info">
-<!ENTITY toolsJavaConsoleCmd.label "Java/JS Console">
-<!ENTITY toolsServerToolsCmd.label "Server Tools">
-<!ENTITY toolsJsDebuggerCmd.label "JavaScipt Debugger">
-<!ENTITY securityInfo.label "Security Info">
-<!ENTITY helpMenuCmd.label "Help">
-<!ENTITY helpContentsCmd.label "Help Contents">
-<!ENTITY howTutorialCmd.label "How to Tutorial">
-<!ENTITY helpChannelCmd.label "Help Channel">
-<!ENTITY softwareUpdatesCmd.label "Software Updates">
-<!ENTITY technicalSupportCmd.label "Technical Support">
-<!ENTITY releaseNotesCmd.label "Release Notes">
-<!ENTITY aboutCommunicatorCmd.label "About Communicator Prototype">
-
-<!ENTITY debugMenu.label "Debug">
-<!ENTITY debugQA.label "QA Help">
-<!ENTITY debugQABug.label "QA Help">
-<!ENTITY debugQASmoke.label "Smoke Tests">
-<!ENTITY debugQAKnowBug.label "Known Bugs">
-<!ENTITY debugVerCmd.label "Verification">
-<!ENTITY ver1Cmd.label "Mozilla">
-<!ENTITY ver2Cmd.label "Yahoo">
-<!ENTITY ver3Cmd.label "Netscape">
-<!ENTITY ver4Cmd.label "Excite">
-<!ENTITY ver5Cmd.label "Microsoft">
-<!ENTITY ver6Cmd.label "city.net">
-<!ENTITY ver7Cmd.label "Mirabilis">
-<!ENTITY ver8Cmd.label "Pathfinder">
-<!ENTITY ver9Cmd.label "Warner Bros.">
-<!ENTITY ver10Cmd.label "CNN">
-<!ENTITY ver11Cmd.label "USA Today">
-<!ENTITY ver12Cmd.label "Disney">
-<!ENTITY ver13Cmd.label "Hotwired">
-<!ENTITY ver14Cmd.label "Hotbot">
-<!ENTITY ver15Cmd.label "Frames">
-<!ENTITY ver16Cmd.label "Tables">
-<!ENTITY ver17Cmd.label "Applets">
-<!ENTITY ver18Cmd.label "JavaScript">
-<!ENTITY ver19Cmd.label "GIF Images">
-<!ENTITY ver20Cmd.label "JPEG Images">
-<!ENTITY ver21Cmd.label "PNG Images">
-<!ENTITY ver22Cmd.label "Transparency">
-<!ENTITY ver23Cmd.label "Animation">
-<!ENTITY ver24Cmd.label "Larger page">
-<!ENTITY ver25Cmd.label "Smaller page">
-
-<!ENTITY viewDemoMenu.label "Viewer Demos">
-<!ENTITY demo0Cmd.label "#0 Basic Styles">
-<!ENTITY demo1Cmd.label "#1 CSS Styles">
-<!ENTITY demo2Cmd.label "#2 Images">
-<!ENTITY demo3Cmd.label "#3 Basic Tables">
-<!ENTITY demo4Cmd.label "#4 Simple Tables">
-<!ENTITY demo5Cmd.label "#5 More Styles">
-<!ENTITY demo6Cmd.label "#6 Deeply Nested Tables">
-<!ENTITY demo7Cmd.label "#7 Scaled Anim Image">
-<!ENTITY demo8Cmd.label "#8 Form">
-<!ENTITY demo9Cmd.label "#9 Frames">
-<!ENTITY demo10Cmd.label "#10 Anim Images">
-<!ENTITY demo11Cmd.label "#11 Fixed Positioning">
-<!ENTITY demo12Cmd.label "#12 More Fixed Pos">
-<!ENTITY demo13Cmd.label "#13 DHTML">
-<!ENTITY demo14Cmd.label "#14 XML Sorting">
-<!ENTITY demo15Cmd.label "#15 XML IRS">
-<!ENTITY demo16Cmd.label "#16 Gfx Widgets">
-
-<!ENTITY xptkMenu.label "XPToolkit">
-<!ENTITY xptk1Cmd.label "Tri-state checkbox">
-<!ENTITY xptk2Cmd.label "Toolbar">
-<!ENTITY xptk3Cmd.label "Tree">
-<!ENTITY xptk4Cmd.label "Dialog">
-<!ENTITY xptk5Cmd.label "Dialog w/ animation">
-<!ENTITY xptk6Cmd.label "Tab">
-<!ENTITY xptk7Cmd.label "Beep">
-
-<!ENTITY QA.label "QA">
-<!ENTITY QABugCmd.label "Bug Writing">
-<!ENTITY QATempCmd.label "Bug Template">
-<!ENTITY QASmokeCmd.label "Smoke Tests">
-<!ENTITY QAKnownBugCmd.label "Known Bugs">
-]> 
+<!-- Localizable string definitions from navigator.xul.  Note the window's
+     title is not defined as a localizable entity.  This is not incorrect:
+     the string will never be displayed, and serves as a programmatic
+     reference to the window.  It is also convenient: we want to share
+     the main window's DTD. -->
+<!DOCTYPE window SYSTEM "chrome://navigator/locale/navigator.dtd"> 
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  title="&hiddenWindow.title;"
+  title="hidden"
   titlemodifier="&mainWindow.titlemodifier;" 
-  titleseparator="&mainWindow.titlemodifierseparator;">
+  titlemenuseparator="&mainWindow.titlemodifiermenuseparator;">
 
   <!-- JS from navigator.xul, to handle the menu commands -->
   <html:script language="javascript" src="chrome://navigator/content/navigator.js"/>
@@ -288,12 +56,6 @@ Contributor(s): ______________________________________. -->
        it's every bit a copy. 
   -->
 
-  <!-- Comment to whoever made this (Dan?).  Move this into an overlay and 
-	   put it in global/platform/mac!  Then nobody else has to deal with this! 
-	   Also, can't this be a minimal menu bar?  It doesn't have to have everything 
-	   navigator.xul has!
-	   (Dave H.) -->
-
   <menubar chromeclass="menubar">
     <menu value="&fileMenu.label;">
 	  <menupopup> 
diff --git a/xpfe/global/resources/content/hiddenWindow.xul b/xpfe/global/resources/content/hiddenWindow.xul
index a293dec3040..01d9eca1a07 100644
--- a/xpfe/global/resources/content/hiddenWindow.xul
+++ b/xpfe/global/resources/content/hiddenWindow.xul
@@ -32,251 +32,19 @@ Contributor(s): ______________________________________. -->
      the full one was included for now in anticipation of the whole thing
      becoming an included file someday. -->
 
-<!-- First, a bunch of string definitions lifted from navigator.xul,
-     just for the menus.  What are the odds they'll stay in synch?
-     Hoping for the day when included files work. The one new string
-     in here is the first, the hidden window's title. -->
-<!DOCTYPE window
-[
-<!ENTITY hiddenWindow.title "hidden"> 
-<!ENTITY mainWindow.titlemodifier "Mozilla"> 
-<!ENTITY mainWindow.titlemodifierseparator " - ">
-<!ENTITY throbber.url "http://www.mozilla.org"> 
-<!ENTITY fileMenu.label "File">
-<!ENTITY browserCmd.label "New Browser Window">
-<!ENTITY newMenu.label "New">
-<!ENTITY newMailCmd.label "Mail Message">
-<!ENTITY newBlankPageCmd.label "Blank Window">
-<!ENTITY newPageFromTemplateCmd.label "Page Using Template">
-<!ENTITY newPageFromDraftCmd.label "Page using Draft">
-<!ENTITY openCmd.label "Open File or Location...">
-<!ENTITY sendPageCmd.label "Send Page">
-<!ENTITY editPageCmd.label "Edit Page">
-<!ENTITY offlineMenu.label "Offline">
-<!ENTITY offlineGoOfflineCmd.label "Go Offline">
-<!ENTITY offlineSynchronizeCmd.label "Synchronize">
-<!ENTITY printSetupCmd.label "Print Setup...">
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY printCmd.label "Print...">
-<!ENTITY closeCmd.label "Close">
-<!ENTITY quitCmd.label "Quit">
-<!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 deleteCmd.label "Delete">
-<!ENTITY walletMenu.label "Wallet">
-<!ENTITY walletSafeFillCmd.label "Safe Form Fill">
-<!ENTITY walletQuickFillCmd.label "Quick Form Fill">
-<!ENTITY walletContentsCmd.label "Wallet Contents">
-<!ENTITY walletDisplaySignonsCmd.label "Display Signons">
-<!ENTITY walletDisplayCookiesCmd.label "Display Cookies">
-<!ENTITY walletSamplesCmd.label "Samples">
-<!ENTITY walletChangePasswordCmd.label "Change Password">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY preferences.label "Preferences...">
-<!ENTITY viewMenu.label "View">
-<!ENTITY toolbarsCmd.label "Toolbars">
-<!ENTITY sidebarCmd.label "Sidebar">
-<!ENTITY enlargeTextSizeCmd.label "Enlarge Text Size">
-<!ENTITY reduceTextSizeCmd.label "Reduce Text Size">
-<!ENTITY useStyleSheetMenu.label "Use Stylesheet">
-<!ENTITY useStyleSheetDefaultCmd.label "Default">
-<!ENTITY useStyleSheetEasyReadingCmd.label "Easy Reading">
-<!ENTITY useStyleSheetMaxInfoCmd.label "Maximum Information">
-<!ENTITY useStlyleSheetBizarreCmd.label "Bizarre">
-<!ENTITY reloadCmd.label "Reload">
-<!ENTITY showImagesCmd.label "Show Images">
-<!ENTITY stopCmd.label "Stop">
-<!ENTITY pageSourceCmd.label "Page Source">
-<!ENTITY pageInfoCmd.label "Page Info">
-<!ENTITY translateMenu.label "Translate">
-<!ENTITY translateButton.label "Translate">
-<!ENTITY translateEngtoFrenCmd.label "English to French">
-<!ENTITY translateEngtoGermCmd.label "English to German">
-<!ENTITY translateEngtoItalianCmd.label "English to Italian">
-<!ENTITY translateEngtoJapaneseCmd.label "English to Japanese">
-<!ENTITY translateEngtoPortCmd.label "English to Portugese">
-<!ENTITY translateEngtoSpanCmd.label "English to Spanish">
-<!ENTITY translateFrentoEngCmd.label "French to English">
-<!ENTITY translateFrentoGermCmd.label "French to German">
-<!ENTITY translateFrentoSpanCmd.label "French to Spanish">
-<!ENTITY translateGermtoEngCmd.label "German to English">
-<!ENTITY translateGermtoFrenCmd.label "German to French">
-<!ENTITY translateGermtoSpanCmd.label "German to Spanish">
-<!ENTITY translateItaliantoEngCmd.label "Italian to English">
-<!ENTITY tanslateJapanesetoEngCmd.label "Japanese to English">
-<!ENTITY translatePorttoEngCmd.label "Portugese to English">
-<!ENTITY tanslateSpantoEngCmd.label "Spanish to English">
-<!ENTITY translateSpantoFrenCmd.label "Spanish to French">
-<!ENTITY translateSpantoGermCmd.label "Spanish to German">
-<!ENTITY dcharMenu.label "Character Set">
-<!ENTITY dcharIso1Cmd.label "ISO Latin 1 (ISO-8859-1)">
-<!ENTITY dcharIso2Cmd.label "ISO Latin 2 (ISO-8859-2)">
-<!ENTITY dcharIso3Cmd.label "ISO Latin 3 (ISO-8859-3)">
-<!ENTITY dcharIso4Cmd.label "ISO Latin 4 (ISO-8859-4)">
-<!ENTITY dcharIso9Cmd.label "ISO Latin 5 (ISO-8859-9)">
-<!ENTITY dcharIso10Cmd.label "ISO Latin 6 (ISO-8859-10)">
-<!ENTITY dcharIso13Cmd.label "ISO Latin 7 (ISO-8859-13)">
-<!ENTITY dcharIso14Cmd.label "ISO Latin 8 (ISO-8859-14)">
-<!ENTITY dcharIso15Cmd.label "ISO Latin 9 (ISO-8859-15)">
-<!ENTITY dcharWinLat2Cmd.label "Windows Latin 2 (windows-1250)"> 
-<!ENTITY dcharWinLat1Cmd.label "Windows Latin 1 (windows-1252)">
-<!ENTITY dcharWinLat5Cmd.label "Windows Latin 5 (windows-1254)">
-<!ENTITY dcharWinBalRimCmd.label "Windows Baltic (windows-1257)">
-<!ENTITY dcharMacRomCmd.label "Macintosh Roman">
-<!ENTITY dcharMacCenEuroCmd.label "Macintosh Central European">
-<!ENTITY dcharMacTurCmd.label "Macintosh Turkish">
-<!ENTITY dcharMacCroaCmd.label "Macintosh Croatian">
-<!ENTITY dcharMacRomanianCmd.label "Macintosh Romanian">
-<!ENTITY dcharMacIceCmd.label "Macintosh Icelandic">
-<!ENTITY dcharJapanCmd.label "Japanese JIS (ISO-2022-JP)">
-<!ENTITY dcharJapanShiftjsCmd.label "Japanese (Shift_JIS)">
-<!ENTITY dcharJapanEucCmd.label "Japanese (EUC-JP)">
-<!ENTITY dcharTradChiBigCmd.label "Traditional Chinese (Big5)">
-<!ENTITY dcharTriChiEucCmd.label "Traditional Chinese (EUC-TW)">
-<!ENTITY dcharSimpChiGbCmd.label "Simplified Chinese (GB2312)">
-<!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
-<!ENTITY dcharUtf7Cmd.label "Multilingual (UTF-7)">
-<!ENTITY dcharUtf8Cmd.label "Multilingual (UTF-8)">
-<!ENTITY dcharIsoCyrCmd.label "ISO Cyrillic (ISO-8859-5)">
-<!ENTITY dcharEcmaCyrCmd.label "ECMA Cyrillic (ISO-IR-111)">
-<!ENTITY dcharDosCyrCmd.label "DOS Cyrillic (IBM866)">
-<!ENTITY dcharWinCyrCmd.label "Windows Cyrillic (windows-1251)">
-<!ENTITY dcharMacCyrCmd.label "Macintosh Cyrillic">
-<!ENTITY dcharMacUkrCmd.label "Macintosh Ukrainian">
-<!ENTITY dcharRusCmd.label "Russian (KOI8-R)">
-<!ENTITY dcharUkrCmd.label "Ukrainian (KOI8-U)">
-<!ENTITY dcharIsoGreekCmd.label "ISO Greek (ISO-8859-7)">
-<!ENTITY dcharWinGreekCmd.label "Windows Greek (windows-1253)">
-<!ENTITY dcharMacGreekCmd.label "Macintosh Greek">
-<!ENTITY dcharWinVietCmd.label "Windows Vietvaluese (windows-1258)">
-<!ENTITY dcharVietTcnCmd.label "Vietvaluese (TCVN5712)">
-<!ENTITY dcharVietViCmd.label "Vietvaluese (VISCII)">
-<!ENTITY dcharVieVpCmd.label "Vietvaluese (VPS)">
-<!ENTITY dcharThaiCmd.label "Thai (TIS-620)">
-<!ENTITY dcharArmCmd.label "Armenian (ARMSCII-8)">
-<!ENTITY dcharIso6Cmd.label ".ISO Arabic (ISO-8859-6)">
-<!ENTITY dcharIso8Cmd.label ".ISO Hebrew (ISO-8859-8)">
-<!ENTITY dcharCp1255Cmd.label "Windows Hebrew (windows-1255)">
-<!ENTITY dcharCp1256Cmd.label "Windows Arabic (windows-1256)">
-<!ENTITY searchMenu.label "Search">
-<!ENTITY findOnCmd.label "Find On this page...">
-<!ENTITY findAgainCmd.label "Find Again">
-<!ENTITY searchParentCmd.label "Search Parent Item...">
-<!ENTITY searchParenet2Cmd.label "Search Parent2 Item">
-<!ENTITY appSpecificCmd.label "App Specific">
-<!ENTITY searchInternetCmd.label "Search the Internet...">
-<!ENTITY searchAllMailCmd.label "Search All Mail....">
-<!ENTITY searchBookmarksCmd.label "Search Bookmarks...">
-<!ENTITY searchPeopleCmd.label "Search People...">
-<!ENTITY searchComputerCmd.label "Search on this Computer...">
-<!ENTITY goMenu.label "Go">
-<!ENTITY goBackCmd.label "Back">
-<!ENTITY goForwardCmd.label "Forward">
-<!ENTITY goHomeCmd.label "Home">
-<!ENTITY goPrev1Cmd.label "Previous Site 1">
-<!ENTITY goPrev2Cmd.label "Previous Site 2">
-<!ENTITY goPrevnCmd.label "Previous Site n">
-<!ENTITY bookmarksMenu.label "Bookmarks">
-<!ENTITY addCurPageCmd.label "Add Current Page">
-<!ENTITY manBookmarksCmd.label "Manage Bookmarks...">
-<!ENTITY tasksMenu.label "Tasks">
-<!ENTITY navigatorCmd.label "Navigator">
-<!ENTITY messengerCmd.label "Messenger">
-<!ENTITY editorCmd.label "Editor">
-<!ENTITY textEditorCmd.label "Plaintext Editor">
-<!ENTITY manageHistoryCmd.label "Manage History">
-<!ENTITY toolsMenu.label "Tools">
-<!ENTITY toolsPluginsInfoCmd.label "Plugins Info">
-<!ENTITY toolsJavaConsoleCmd.label "Java/JS Console">
-<!ENTITY toolsServerToolsCmd.label "Server Tools">
-<!ENTITY toolsJsDebuggerCmd.label "JavaScipt Debugger">
-<!ENTITY securityInfo.label "Security Info">
-<!ENTITY helpMenuCmd.label "Help">
-<!ENTITY helpContentsCmd.label "Help Contents">
-<!ENTITY howTutorialCmd.label "How to Tutorial">
-<!ENTITY helpChannelCmd.label "Help Channel">
-<!ENTITY softwareUpdatesCmd.label "Software Updates">
-<!ENTITY technicalSupportCmd.label "Technical Support">
-<!ENTITY releaseNotesCmd.label "Release Notes">
-<!ENTITY aboutCommunicatorCmd.label "About Communicator Prototype">
-
-<!ENTITY debugMenu.label "Debug">
-<!ENTITY debugQA.label "QA Help">
-<!ENTITY debugQABug.label "QA Help">
-<!ENTITY debugQASmoke.label "Smoke Tests">
-<!ENTITY debugQAKnowBug.label "Known Bugs">
-<!ENTITY debugVerCmd.label "Verification">
-<!ENTITY ver1Cmd.label "Mozilla">
-<!ENTITY ver2Cmd.label "Yahoo">
-<!ENTITY ver3Cmd.label "Netscape">
-<!ENTITY ver4Cmd.label "Excite">
-<!ENTITY ver5Cmd.label "Microsoft">
-<!ENTITY ver6Cmd.label "city.net">
-<!ENTITY ver7Cmd.label "Mirabilis">
-<!ENTITY ver8Cmd.label "Pathfinder">
-<!ENTITY ver9Cmd.label "Warner Bros.">
-<!ENTITY ver10Cmd.label "CNN">
-<!ENTITY ver11Cmd.label "USA Today">
-<!ENTITY ver12Cmd.label "Disney">
-<!ENTITY ver13Cmd.label "Hotwired">
-<!ENTITY ver14Cmd.label "Hotbot">
-<!ENTITY ver15Cmd.label "Frames">
-<!ENTITY ver16Cmd.label "Tables">
-<!ENTITY ver17Cmd.label "Applets">
-<!ENTITY ver18Cmd.label "JavaScript">
-<!ENTITY ver19Cmd.label "GIF Images">
-<!ENTITY ver20Cmd.label "JPEG Images">
-<!ENTITY ver21Cmd.label "PNG Images">
-<!ENTITY ver22Cmd.label "Transparency">
-<!ENTITY ver23Cmd.label "Animation">
-<!ENTITY ver24Cmd.label "Larger page">
-<!ENTITY ver25Cmd.label "Smaller page">
-
-<!ENTITY viewDemoMenu.label "Viewer Demos">
-<!ENTITY demo0Cmd.label "#0 Basic Styles">
-<!ENTITY demo1Cmd.label "#1 CSS Styles">
-<!ENTITY demo2Cmd.label "#2 Images">
-<!ENTITY demo3Cmd.label "#3 Basic Tables">
-<!ENTITY demo4Cmd.label "#4 Simple Tables">
-<!ENTITY demo5Cmd.label "#5 More Styles">
-<!ENTITY demo6Cmd.label "#6 Deeply Nested Tables">
-<!ENTITY demo7Cmd.label "#7 Scaled Anim Image">
-<!ENTITY demo8Cmd.label "#8 Form">
-<!ENTITY demo9Cmd.label "#9 Frames">
-<!ENTITY demo10Cmd.label "#10 Anim Images">
-<!ENTITY demo11Cmd.label "#11 Fixed Positioning">
-<!ENTITY demo12Cmd.label "#12 More Fixed Pos">
-<!ENTITY demo13Cmd.label "#13 DHTML">
-<!ENTITY demo14Cmd.label "#14 XML Sorting">
-<!ENTITY demo15Cmd.label "#15 XML IRS">
-<!ENTITY demo16Cmd.label "#16 Gfx Widgets">
-
-<!ENTITY xptkMenu.label "XPToolkit">
-<!ENTITY xptk1Cmd.label "Tri-state checkbox">
-<!ENTITY xptk2Cmd.label "Toolbar">
-<!ENTITY xptk3Cmd.label "Tree">
-<!ENTITY xptk4Cmd.label "Dialog">
-<!ENTITY xptk5Cmd.label "Dialog w/ animation">
-<!ENTITY xptk6Cmd.label "Tab">
-<!ENTITY xptk7Cmd.label "Beep">
-
-<!ENTITY QA.label "QA">
-<!ENTITY QABugCmd.label "Bug Writing">
-<!ENTITY QATempCmd.label "Bug Template">
-<!ENTITY QASmokeCmd.label "Smoke Tests">
-<!ENTITY QAKnownBugCmd.label "Known Bugs">
-]> 
+<!-- Localizable string definitions from navigator.xul.  Note the window's
+     title is not defined as a localizable entity.  This is not incorrect:
+     the string will never be displayed, and serves as a programmatic
+     reference to the window.  It is also convenient: we want to share
+     the main window's DTD. -->
+<!DOCTYPE window SYSTEM "chrome://navigator/locale/navigator.dtd"> 
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  title="&hiddenWindow.title;"
+  title="hidden"
   titlemodifier="&mainWindow.titlemodifier;" 
-  titleseparator="&mainWindow.titlemodifierseparator;">
+  titlemenuseparator="&mainWindow.titlemodifiermenuseparator;">
 
   <!-- JS from navigator.xul, to handle the menu commands -->
   <html:script language="javascript" src="chrome://navigator/content/navigator.js"/>
@@ -288,12 +56,6 @@ Contributor(s): ______________________________________. -->
        it's every bit a copy. 
   -->
 
-  <!-- Comment to whoever made this (Dan?).  Move this into an overlay and 
-	   put it in global/platform/mac!  Then nobody else has to deal with this! 
-	   Also, can't this be a minimal menu bar?  It doesn't have to have everything 
-	   navigator.xul has!
-	   (Dave H.) -->
-
   <menubar chromeclass="menubar">
     <menu value="&fileMenu.label;">
 	  <menupopup>