Bug 439452: remove another 'Firefox', r=mfinkle mobile
authorGavin Sharp <gavin@mozilla.com>
Fri, 20 Jun 2008 13:33:34 -0400
branchmobile
changeset 31 2231628c6a5d5f37192df436cedaf9c55b4f0f31
parent 30 550f014628bae50dc26c542c0613e0de135eed03
child 32 3032efb61657208c58fdd345e070521af96ce208
push id20
push usergsharp@mozilla.com
push dateFri, 20 Jun 2008 17:34:01 +0000
reviewersmfinkle
bugs439452
Bug 439452: remove another 'Firefox', r=mfinkle
chrome/content/browser.xul
chrome/locale/en-US/browser.dtd
--- a/chrome/content/browser.xul
+++ b/chrome/content/browser.xul
@@ -40,19 +40,24 @@
 
 <?xml-stylesheet href="chrome://browser/skin/browser.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/deckbrowser.css" type="text/css"?>
 
 <?xul-overlay href="chrome://browser/content/toolbar.xul"?>
 <?xul-overlay href="chrome://browser/content/bookmarks.xul"?>
 <?xul-overlay href="chrome://browser/content/downloads.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://browser/locale/browser.dtd">
+<!DOCTYPE window [
+<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
+%browserDTD;
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+%brandDTD;
+]>
 
-<window id="main-window" title="&browser.title;"
+<window id="main-window" title="&brandShortName;"
         width="800" height="480"
         onload="Browser.startup();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/x-javascript" src="chrome://global/content/inlineSpellCheckUI.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/commandUtil.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
 
--- a/chrome/locale/en-US/browser.dtd
+++ b/chrome/locale/en-US/browser.dtd
@@ -1,10 +1,8 @@
-<!ENTITY browser.title         "Firefox">
-
 <!ENTITY cut.label             "Cut">
 <!ENTITY copy.label            "Copy">
 <!ENTITY copylink.label        "Copy Link Location">
 <!ENTITY paste.label           "Paste">
 <!ENTITY delete.label          "Delete">
 <!ENTITY selectAll.label       "Select All">
 <!ENTITY noSuggestions.label   "(No suggestions)">
 <!ENTITY addToDictionary.label "Add to Dictionary">