From 949ef6c8eace3aeab394ed30c465aa50a02b2622 Mon Sep 17 00:00:00 2001
From: "ben%netscape.com" <ben%netscape.com>
Date: Thu, 14 Sep 2006 05:49:06 +0000
Subject: [PATCH] fixes for localisability of navigator package (removed
 hardcoded english strings ) (r=jst@citec.fi), small formatting fix for
 navigator to prevent whitespace at top of mac navigator window

---
 suite/browser/viewSource.xul                  | 158 +-----------------
 .../en-US/chrome/browser/navigator.properties |   4 +-
 .../en-US/chrome/browser/viewSource.dtd       |  90 ----------
 3 files changed, 7 insertions(+), 245 deletions(-)

diff --git a/suite/browser/viewSource.xul b/suite/browser/viewSource.xul
index acdc86c49a6f..2a841204428d 100644
--- a/suite/browser/viewSource.xul
+++ b/suite/browser/viewSource.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
+<?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://navigator/locale/viewSource.dtd" >
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -27,159 +28,8 @@
   <broadcaster id="dialog.start" ready="false"/>
   <observes element="dialog.start" attribute="ready" onbroadcast="StartupViewSource()"/>
     
-  <menubar>
-    <menu value="&fileMenu.label;">
-	    <menupopup>
-			  <menuitem value="&browserCmd.label;" oncommand="BrowserNewWindow();"/>
-      			<menu value="&newMenu.label;">
-				  <menupopup>
-      				<menuitem value="&newMailCmd.label;" oncommand="MsgNewMessage();"/>
-					  <menuitem value="&newChatCmd.label;" oncommand=""/>
-					  <menuseparator />
-					  <menuitem value="&newBlankPageCmd.label;" oncommand="BrowserNewWindow();"/>
-					  <menuitem value="&newPageFromTemplateCmd.label;" oncommand="BrowserNewWindow();"/>
-					  <menuitem value="&newPageFromDraftCmd.label;" oncommand="BrowserNewWindow();"/>
-				  </menupopup>
-    			</menu>
-			  <menuitem value="&openCmd.label;" oncommand="BrowserOpenWindow();"/>
-			  <menuseparator />
-			  <menuitem value="&sendPageCmd.label;" oncommand="NotImplementedYet();"/>
-			   <menuseparator />
-			  <menu value="&offlineMenu.label;">
-				  <menupopup>
-				  <menuitem value="&offlineGoOfflineCmd.label;" oncommand="NotImplementedYet();"/>
-				  <menuseparator />
-				  <menuitem value="&offlineSynchronizeCmd.label;" oncommand="NotImplementedYet();"/>
-				  </menupopup>
-			  </menu>
-			  <menuseparator />
-			  <menuitem value="&printSetupCmd.label;" oncommand=";"/>
-			  <menuitem value="&printPreviewCmd.label;" oncommand=""/>
-			  <menuitem value="&printCmd.label;" oncommand="BrowserPrint()"/>
-			  <menuseparator />
-			  <menuitem value="&closeCmd.label;" oncommand="BrowserClose();"/>
-			  <menuitem value="&quitCmd.label;" oncommand="BrowserExit();"/>
-		</menupopup>
-    </menu>
-	<menu value="&editMenu.label;">
-	  <menupopup> 
-      <menuitem value="&undoCmd.label;" oncommand="NotImplementedYet();" disabled=""/> 
-      <menuitem value="&redoCmd.label;" oncommand="NotImplementedYet();" disabled=""/> 
-      <menuseparator /> 
-      <menuitem value="&cutCmd.label;" oncommand="NotImplementedYet();" disabled=""/> 
-      <menuitem value="&copyCmd.label;" oncommand="BrowserCopy();"/> 
-      <menuitem value="&pasteCmd.label;" oncommand="NotImplementedYet();" disabled=""/> 
-      <menuitem value="&deleteCmd.label;" oncommand="NotImplementedYet();" disabled=""/> 
-      <menuseparator /> 
-      <menuitem value="&selectAllCmd.label;" oncommand="NotImplementedYet();"/> 
-      <menuseparator /> 
-      <menuitem value="&preferences.label;" oncommand="DoPreferences();"/> 
-	  </menupopup>
-    </menu> 
-
-    <menu value="&viewMenu.label;">
-	  <menupopup>
-      <menuitem value="&toolbarsCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menupopup id="menu_View_Popup">
-      <menuseparator />
-      <menuitem value="&enlargeTextSizeCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="Reduce Text Size" oncommand="NotImplementedYet();" disabled=""/>
-      <menuseparator />
-      <menu value="&useStyleSheetMenu.label;" oncommand="NotImplementedYet();">
-	      <menupopup>
-		  <menuitem value="&useStyleSheetDefaultCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-	      <menuseparator />
-	      <menuitem value="&useStyleSheetEasyReadingCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-	      <menuitem value="&useStyleSheetMaximumInformationCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-	      <menuitem value="&useStlyleSheetBizarreCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-          </menupopup>
-	  </menu>
-      <menuseparator />
-      <menuitem value="&reloadCmd.label;" oncommand="BrowserReload();" disabled=""/>
-      <menuitem value="&showImagesCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&stopCmd.label;" oncommand="NotImplementedYet();"/>
-      <menuseparator />
-      <menuitem value="&pageSourceCmd.label;" oncommand="BrowserViewSource();" disabled=""/>
-      <menuitem value="&pageInfoCmd.label;" oncommand="NotImplementedYet();"/>
-      <menuseparator />
-      <menu value="&charSetMenu.label;">
-	      <menupopup>
-		  <menuitem value="&charWesternCmd.label;" oncommand="BrowserSetDocumentCharacterSet('ISO-8859-1');"/>
-	      <menuitem value="&charJapaneseCmd.label;" oncommand="BrowserSetDocumentCharacterSet('ISO-2022-JP');"/>
-	      <menuitem value="&charShiftJisCmd.label;" oncommand="BrowserSetDocumentCharacterSet('Shift_JIS');"/>
-	      <menuitem value="&charEupCmd.label;" oncommand="BrowserSetDocumentCharacterSet('EUC-JP');"/>
-	      </menupopup>
-	   </menu>
-	   </menupopup>
-    </menu>
-    <menu value="&searchMenu.label;">
-	  <menupopup>
-      <menuitem value="&findOnCmd.label;" oncommand="BrowserFind();;" disabled=""/>
-      <menuitem value="&findAgainCmd.label;" oncommand="BrowserFindAgain();" disabled=""/>
-      <menuseparator />
-      <menuitem value="&searchParentCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&searchParenet2Cmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&appSpecificCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&appSpecificCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuseparator />
-      <menuitem value="&searchInternetCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&searchAllMailCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&searchBookmarksCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&searchPeopleCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuseparator />
-      <menuitem value="&searchComputerCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-	  </menupopup>
-    </menu>
-    <menu value="&goMenu.label;">
-	  <menupopup>
-      <menuitem value="&goBackCmd.label;" oncommand="BrowserBack();" disabled=""/>
-      <menuitem value="&goForwardCmd.label;" oncommand="BrowserForward();" disabled=""/>
-      <menuitem value="&goHomeCmd.label;" oncommand="BrowserHome();" disabled=""/>
-	  </menupopup>
-    </menu>
-	 <menu value="&tasksMenu.label;">
-	  <menupopup>
-      <menuitem value="&navigatorCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&messengerCmd.label;" oncommand="OpenMessenger();" />
-      <menuitem value="&editorCmd.label;"    oncommand="OpenEditor();" />
-      <menuitem value="&manageHistoryCmd.label;"    oncommand="OpenHistoryView();" />
-      <menuitem value="&chatCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&shoppingCartCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menu value="&toolsMenu.label;">
-	      <menupopup>
-		  <menuitem value="&toolsPluginsInfoCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-	      <menuitem value="&toolsServerToolsCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-	      <menuitem value="&toolsJavaConsoleCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-	      <menuitem value="&toolsJavascriptDebuggerCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-		  </menupopup>
-      </menu>
-      <menuseparator />
-      <menuitem value="&securityInfo.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuseparator/>
-      <menuitem value="&window1Cmd.label;" oncommand="NotImplementedYet();" key="1" disabled=""/>
-      <menuitem value="&window2Cmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&window3Cmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-	  </menupopup>
-    </menu>
-    
-     <menu value="&helpMenuCmd.label;">
-	  <menupopup>
-      <menuitem value="&helpContentsCmd.label;" oncommand="window.frames[0].location.href = 'http://www.mozilla.org/projects/user-docs/local/browserhelp/browsertop.html'" disabled=""/>
-      <menuseparator />
-      <menuitem value="&howTutorialCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&helpChannelCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuseparator />
-      <menuitem value="&softwareUpdatesCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&technicalSupportCmd.label;" oncommand="NotImplementedYet();" disabled=""/>
-      <menuitem value="&releaseNotesCmd.label;" 
-	            oncommand="window.frames[0].location.href='http://www.mozilla.org/projects/seamonkey/release-notes/index.html'" disabled=""/>
-      
-      <menuseparator />
-      <menuitem value="&aboutCommunicatorCmd.label;" 
-	            oncommand="window.frames[0].location.href='http://www.mozilla.org/projects/seamonkey/release-notes/index.html'" disabled=""/>
-	  </menupopup>
-    </menu>
-  </menubar>
+  <!-- Menu -->
+  <menubar id="main-menubar"/>
   
   <html:iframe id="content-frame" type="content" html:name="content" html:src="about:blank" flex="100%"/>
 
@@ -201,7 +51,7 @@
 
 		<spring flex="100%"/>		
 
-		<titledbutton align="right" value="Build ID: 1999082316" style="font-family:sans-serif;font-size:2.5mm;"/>
+		<titledbutton align="right" value="Build ID: 2000020608" style="font-family:sans-serif;font-size:2.5mm;"/>
      </box>
   </box>
  
diff --git a/suite/locales/en-US/chrome/browser/navigator.properties b/suite/locales/en-US/chrome/browser/navigator.properties
index a502dc8e81ea..ca2a45ec5891 100644
--- a/suite/locales/en-US/chrome/browser/navigator.properties
+++ b/suite/locales/en-US/chrome/browser/navigator.properties
@@ -1 +1,3 @@
-nv_done=Document Done
\ No newline at end of file
+nv_done=Document: Done
+homePageDefault=http://www.mozilla.org/
+openFile=Open File
diff --git a/suite/locales/en-US/chrome/browser/viewSource.dtd b/suite/locales/en-US/chrome/browser/viewSource.dtd
index 66d127284d38..21affdb37c74 100644
--- a/suite/locales/en-US/chrome/browser/viewSource.dtd
+++ b/suite/locales/en-US/chrome/browser/viewSource.dtd
@@ -7,93 +7,3 @@
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifierseperator) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifierseperator " - ">
 <!ENTITY mainWindow.preface "Source for: "> 
-<!ENTITY fileMenu.label "File">
-<!ENTITY browserCmd.label "New Browser Window">
-<!ENTITY newMenu.label "New">
-<!ENTITY newMailCmd.label "Mail Message">
-<!ENTITY newChatCmd.label "Chat Window">
-<!ENTITY newBlankPageCmd.label "Blank Page">
-<!ENTITY newPageFromTemplateCmd.label "Page Using Template">
-<!ENTITY newPageFromDraftCmd.label "Page Using Draft">
-<!ENTITY openCmd.label "Open">
-<!ENTITY sendPageCmd.label "Send 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 selectAllCmd.label "Select All">
-<!ENTITY preferences.label "Preferences">
-<!ENTITY viewMenu.label "View">
-<!ENTITY toolbarsCmd.label "Toolbars">
-<!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 useStyleSheetMaximumInformationCmd.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 charSetMenu.label "Character Set"> 
-<!ENTITY charWesternCmd.label "Latin1">  
-<!ENTITY charJapaneseCmd.label "Japanese (ISO-2022-JP)">  
-<!ENTITY charShiftJisCmd.label "Shift_JIS">
-<!ENTITY charEupCmd.label "EUC-JP">
-<!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 "Menu">
-<!ENTITY goBackCmd.label "Go Back">
-<!ENTITY goForwardCmd.label "Go Forward">
-<!ENTITY goHomeCmd.label "Home">
-<!ENTITY tasksMenu.label "Tasks">
-<!-- LOCALIZATION NOTE (navigatorCmd.label) : DONT_TRANSLATE -->
-<!ENTITY navigatorCmd.label "Navigator">
-<!-- LOCALIZATION NOTE (messengerCmd.label) : DONT_TRANSLATE -->
-<!ENTITY messengerCmd.label "Messenger">
-<!ENTITY editorCmd.label "Editor">
-<!ENTITY manageHistoryCmd.label "Manage History">
-<!ENTITY chatCmd.label "Chat">
-<!ENTITY shoppingCartCmd.label "Shopping Cart">
-<!ENTITY toolsMenu.label "Tools">
-<!ENTITY toolsPluginsInfoCmd.label "Plugins Info">
-<!ENTITY toolsJavaConsoleCmd.label "Java/JS Console">
-<!ENTITY toolsServerToolsCmd.label "Server Tools">
-<!ENTITY toolsJavascriptDebuggerCmd.label "JavaScipt Debugger">
-<!ENTITY securityInfo.label "Security Info">
-<!ENTITY window1Cmd.label "Window 1">
-<!ENTITY window2Cmd.label "Window 2">
-<!ENTITY window3Cmd.label "Window 3">
-<!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">
-<!-- LOCALIZATION NOTE (aboutCommunicatorCmd.label) : Do not translate "communicator" -->
-<!ENTITY aboutCommunicatorCmd.label "About Communicator Prototype">
-
-