From 6d8d54e3e8bb4699538fa1dc18d57ec0048c8e0b Mon Sep 17 00:00:00 2001
From: "davidm%netscape.com"
 <davidm%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 10 Sep 1999 01:00:37 +0000
Subject: [PATCH] Move command keys to dtd. Add code to get default homepage
 url from dtd

git-svn-id: svn://10.0.0.236/trunk@46680 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../locales/en-US/chrome/browser/navigator.dtd    | 15 +++++++++++++++
 .../browser/resources/locale/en-US/navigator.dtd  | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd b/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
index 81070c99bb5..67345947bc8 100644
--- a/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -5,24 +5,30 @@
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 <!ENTITY throbber.url "http://www.mozilla.org"> 
 <!ENTITY myNetscape.url "http://my.netscape.com">
+<!ENTITY defaultHomepage.url "www.mozilla.org" >
 <!ENTITY fileMenu.label "File">
 <!ENTITY fileMenu.accesskey "f">
 <!ENTITY browserCmd.label "New Browser Window">
 <!ENTITY browserCmd.accesskey "n">
+<!ENTITY browserCmd.commandkey "n">
 <!ENTITY newMenu.label "New">
 <!ENTITY newMenu.accesskey "e">
 <!ENTITY newMailCmd.label "Mail Message">
 <!ENTITY newMailCmd.accesskey "m">
+<!ENTITY newMailCmd.commandkey "m">
 <!ENTITY newBlankPageCmd.label "Blank Window">
 <!ENTITY newBlankPageCmd.accesskey "b" >
+<!ENTITY newBlankPageCmd.commandkey "n" >
 <!ENTITY newPageFromTemplateCmd.label "Page Using Template">
 <!ENTITY newPageFromTemplateCmd.accesskey "t">
 <!ENTITY newPageFromDraftCmd.label "Page using Draft">
 <!ENTITY newPageFromDraftCmd.accesskey "d">
 <!ENTITY openCmd.label "Open Web Location...">
 <!ENTITY openCmd.accesskey "o">
+<!ENTITY openCmd.commandkey "o">
 <!ENTITY openFileCmd.label "Open File...">
 <!ENTITY openFileCmd.accesskey "l">
+<!ENTITY openFileCmd.commandkey "l">
 <!ENTITY sendPageCmd.label "Send Page">
 <!ENTITY sendPageCmd.accesskey "s">
 <!ENTITY editPageCmd.label "Edit Page">
@@ -39,10 +45,13 @@
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printCmd.label "Print...">
 <!ENTITY printCmd.accesskey "p">
+<!ENTITY printCmd.commandkey "p">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.accesskey "c">
+<!ENTITY closeCmd.commandkey "w">
 <!ENTITY quitCmd.label "Quit">
 <!ENTITY quitCmd.accesskey "q">
+<!ENTITY quitCmd.commandkey "q">
 
 <!ENTITY editMenu.label "Edit">
 <!ENTITY undoCmd.label "Undo">
@@ -159,17 +168,23 @@
 <!ENTITY goMenu.accesskey "g">
 <!ENTITY goBackCmd.label "Back">
 <!ENTITY goBackCmd.accesskey "b">
+<!ENTITY goBackCmd.commandkey "[">
 <!ENTITY goForwardCmd.label "Forward">
 <!ENTITY goForwardCmd.accesskey "f">
+<!ENTITY goForwardCmd.commandkey "]">
 <!ENTITY goHomeCmd.label "Home">
 <!ENTITY goHomeCmd.accesskey "h">
+<!ENTITY goHomeCmd.commandkey "h">
+
 
 <!ENTITY bookmarksMenu.label "Bookmarks">
 <!ENTITY bookmarksMenu.accesskey "b">
 <!ENTITY addCurPageCmd.label "Add Current Page">
 <!ENTITY addCurPageCmd.accesskey "a">
+<!ENTITY addCurPageCmd.commandkey "d">
 <!ENTITY manBookmarksCmd.label "Manage Bookmarks...">
 <!ENTITY manBookmarksCmd.accesskey "m">
+<!ENTITY manBookmarksCmd.commandkey "m">
 
 <!ENTITY helpMenuCmd.label "Help">
 <!ENTITY helpContentsCmd.label "Help Contents">
diff --git a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
index 81070c99bb5..67345947bc8 100644
--- a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -5,24 +5,30 @@
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 <!ENTITY throbber.url "http://www.mozilla.org"> 
 <!ENTITY myNetscape.url "http://my.netscape.com">
+<!ENTITY defaultHomepage.url "www.mozilla.org" >
 <!ENTITY fileMenu.label "File">
 <!ENTITY fileMenu.accesskey "f">
 <!ENTITY browserCmd.label "New Browser Window">
 <!ENTITY browserCmd.accesskey "n">
+<!ENTITY browserCmd.commandkey "n">
 <!ENTITY newMenu.label "New">
 <!ENTITY newMenu.accesskey "e">
 <!ENTITY newMailCmd.label "Mail Message">
 <!ENTITY newMailCmd.accesskey "m">
+<!ENTITY newMailCmd.commandkey "m">
 <!ENTITY newBlankPageCmd.label "Blank Window">
 <!ENTITY newBlankPageCmd.accesskey "b" >
+<!ENTITY newBlankPageCmd.commandkey "n" >
 <!ENTITY newPageFromTemplateCmd.label "Page Using Template">
 <!ENTITY newPageFromTemplateCmd.accesskey "t">
 <!ENTITY newPageFromDraftCmd.label "Page using Draft">
 <!ENTITY newPageFromDraftCmd.accesskey "d">
 <!ENTITY openCmd.label "Open Web Location...">
 <!ENTITY openCmd.accesskey "o">
+<!ENTITY openCmd.commandkey "o">
 <!ENTITY openFileCmd.label "Open File...">
 <!ENTITY openFileCmd.accesskey "l">
+<!ENTITY openFileCmd.commandkey "l">
 <!ENTITY sendPageCmd.label "Send Page">
 <!ENTITY sendPageCmd.accesskey "s">
 <!ENTITY editPageCmd.label "Edit Page">
@@ -39,10 +45,13 @@
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printCmd.label "Print...">
 <!ENTITY printCmd.accesskey "p">
+<!ENTITY printCmd.commandkey "p">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.accesskey "c">
+<!ENTITY closeCmd.commandkey "w">
 <!ENTITY quitCmd.label "Quit">
 <!ENTITY quitCmd.accesskey "q">
+<!ENTITY quitCmd.commandkey "q">
 
 <!ENTITY editMenu.label "Edit">
 <!ENTITY undoCmd.label "Undo">
@@ -159,17 +168,23 @@
 <!ENTITY goMenu.accesskey "g">
 <!ENTITY goBackCmd.label "Back">
 <!ENTITY goBackCmd.accesskey "b">
+<!ENTITY goBackCmd.commandkey "[">
 <!ENTITY goForwardCmd.label "Forward">
 <!ENTITY goForwardCmd.accesskey "f">
+<!ENTITY goForwardCmd.commandkey "]">
 <!ENTITY goHomeCmd.label "Home">
 <!ENTITY goHomeCmd.accesskey "h">
+<!ENTITY goHomeCmd.commandkey "h">
+
 
 <!ENTITY bookmarksMenu.label "Bookmarks">
 <!ENTITY bookmarksMenu.accesskey "b">
 <!ENTITY addCurPageCmd.label "Add Current Page">
 <!ENTITY addCurPageCmd.accesskey "a">
+<!ENTITY addCurPageCmd.commandkey "d">
 <!ENTITY manBookmarksCmd.label "Manage Bookmarks...">
 <!ENTITY manBookmarksCmd.accesskey "m">
+<!ENTITY manBookmarksCmd.commandkey "m">
 
 <!ENTITY helpMenuCmd.label "Help">
 <!ENTITY helpContentsCmd.label "Help Contents">