update to HEAD

git-svn-id: svn://10.0.0.236/branches/MIGRATION_20040101_BRANCH@152784 18797224-902f-48f8-a5cc-f745e15eee43
Migrate more seamonkey stuff after the fact
2004-02-15 00:39:40 +00:00 · 2004-01-20 06:09:53 +00:00 · 2004-01-19 09:43:18 +00:00 · 2004-01-19 09:39:10 +00:00 · 2004-01-19 09:37:11 +00:00 · 2004-01-19 05:43:56 +00:00
1344 changed files with 167698 additions and 79976 deletions
--- a/mozilla/browser/Makefile.in
+++ b/mozilla/browser/Makefile.in
@@ -0,0 +1,47 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla Browser code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2002
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Brian Ryner <bryner@brianryner.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = base components app extensions
+
+include $(topsrcdir)/config/rules.mk
--- a/mozilla/browser/README.html
+++ b/mozilla/browser/README.html
@@ -0,0 +1,143 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html lang="en-GB-hixie">
+ <head>
+  <title>Mozilla Firebird</title>
+ </head>
+ <body>
+  <h1>Mozilla Firebird</h1>
+
+  <p><span class="LXRLONGDESC">This project is a redesign of the
+  Mozilla browser component, similar to Galeon, K-Meleon and Chimera,
+  but written using the XUL user interface language and designed to be
+  cross-platform.</span></p>
+
+
+  <h2>Principles, Strategy, Tactics, and Concrete Design Decisions</h2>
+
+  <ol>
+   <li>CVS access is restricted to a very small team. We'll grow as
+   needed, based on reputation and meritorious hacks.</li>
+
+   <li>This will be a single process for the browser only. Mail
+   clients, web editors, etc, will be out-of-process. Hooks for other
+   apps will be provided eventually, although that is not an immediate
+   goal.</li>
+
+   <li>No profile manager UI on startup, although you can still select
+   multiple profiles from the command line.</li>
+
+   <li>The default theme will be based on Classic, utilizing nsITheme 
+   to respects the system look and feel. Mozilla Firebird will not use the old 
+   and stale Communicator icons. Additional themes will be supported 
+   but will not be part of Mozilla Firebird.</li>
+
+   <li>The toolbar(s) will be configurable. That includes moving the
+   location bar where the user wants it (not just splitting it so it
+   takes a whole toolbar width).</li>
+
+   <li>The personal toolbar is the personal toolbar, not the
+   whorebar.</li>
+
+   <li>All wallet-like functionality will be rewritten from
+   scratch.</li>
+
+   <li>We will have a sidebar, but it may work differently from
+   Mozilla's current one.</li>
+
+   <li>There won't be 239 access points for Search and for
+   Bookmarks!</li>
+
+   <li>We may drop the throbber.</li>
+
+   <li>The interface will not be "geeky" nor will it have a
+   "hacker-focus". Nor will it be "minimal". The idea is to design the
+   best web browser for most people. (This doesn't mean every feature
+   has to be enabled by default.)</li>
+  </ol>
+
+
+  <h2>Notes</h2>
+
+  <p>We won't be redesigning the editor widget(s) or other parts of
+  Gecko as part of this project.</p>
+  
+  <p>We plan to move this app to the 
+  <a href="http://www.mozilla.org/projects/embedding/MRE.html">MRE</a>
+  or the <a href="http://www.mozilla.org/projects/xul/xre.html">XRE</a> 
+  but those projects are not ready for us so we have not started that 
+  work yet.</p>
+
+
+  <h2>FAQ</h2>
+
+  <h3>Q1. Why?</h3>
+
+  <p>Some of us want to have fun and build an excellent, user-friendly
+  browser without the constraints (such as unnecessary features,
+  compatibility, marketing requirements, month long discussions, etc.)
+  that the current browser development requires.</p>
+
+  <p>Others of us are simply using this as a prototype to demonstrate
+  possible optimizations to the trunk, such as stripping overlays or
+  separating the application into separate processes instead of
+  running one monolithic suite.</p>
+
+  <h3>Q2. Why only a small team?</h3>
+
+  <p>The size of the team working on the trunk is one of the many
+  reasons that development on the trunk is so slow. We feel that
+  fewer dependencies (no marketing constraints), faster innovation (no
+  UI committees), and more freedom to experiment (no backwards
+  compatibility requirements) will lead to a better end product.</p>
+
+  <h3>Q3. Where do I file bugs on this?</h3>
+
+  <p>We're still chopping with strong bursts and broad strokes. There's 
+  plenty that's obviously broken and we don't need bugs on that. If you 
+  find a bug (a feature request is not a bug) and you're sure that it's 
+  specific to Mozilla Firebird (not present in Mozilla) and you've read all of the 
+  existing Mozilla Firebird bugs well enough to know that it's not already reported 
+  then feel free report it on the Phoenix product in Bugzilla. </p>
+
+  <h3>Q4: Why are you guys wasting time making a FAQ?</h3>
+
+  <p>Because we would waste tons of time answering these questions, if
+  there were no FAQ.</p>
+
+  <h3>Q5: How do I get involved?</h3>
+
+  <p>By invitation. This is a meritocracy -- those who gain the respect of
+  those in the group will be invited to join the group.</p>
+
+
+  <h2>Getting and Building the Source</h2>
+
+  <h3>UNIX, Windows (gmake), Mac (mach-o)</h3>
+
+  <ol>
+   <li>Create a .mozconfig file in your home directory, or in the mozilla directory, containing the following:<br>
+       <br>
+       <code>
+        export MOZ_PHOENIX=1<br>
+        mk_add_options MOZ_PHOENIX=1<br>
+        ac_add_options --enable-crypto<br>
+        ac_add_options --disable-tests<br>
+        ac_add_options --disable-debug<br>
+        ac_add_options --disable-composer<br>
+        ac_add_options --enable-optimize=-O2<br>
+        ac_add_options --disable-ldap<br>
+        ac_add_options --disable-mailnews<br>
+        ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices<br>
+        <br>
+        <b>Note: DO NOT USE --enable-optimize=-O2 on Windows. There are bugs.  Simply use --enable-optimize.</b>
+       </code>
+   <li>Pull from CVS and build as described in the <a href="http://www.mozilla.org/build/unix.html">Mozilla build instructions</a>.
+   <li>Run the MozillaFirebird executable that is left in dist/bin</li>
+  </ol>
+
+  <h2>Mac (CodeWarrior)</h2>
+
+  <p>This platform is currently not supported.</p>
+
+ </body>
+</html>
--- a/mozilla/browser/app/Makefile.in
+++ b/mozilla/browser/app/Makefile.in
@@ -0,0 +1,250 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Brian Ryner <bryner@brianryner.com>
+#  Jonathan Wilson <jonwil@tpgi.com.au>
+#  Dan Mosedale <dmose@mozilla.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= profile
+
+PREF_FILES = $(srcdir)/profile/all.js
+
+ifeq ($(USE_SHORT_LIBNAME), 1)
+PROGRAM = MozillaFirebird$(BIN_SUFFIX)
+else
+PROGRAM = MozillaFirebird-bin$(BIN_SUFFIX)
+endif
+
+REQUIRES = \
+	appshell \
+	string \
+	xpcom \
+	xulapp \
+	$(NULL)
+
+CPPSRCS = nsBrowserApp.cpp
+
+ifdef BUILD_STATIC_LIBS
+STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
+endif
+
+LIBS = \
+	$(STATIC_COMPONENTS_LINKER_PATH) \
+	$(EXTRA_DSO_LIBS) \
+	$(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \
+	$(MOZ_JS_LIBS) \
+	$(XPCOM_LIBS) \
+	$(NSPR_LIBS) \
+	$(TK_LIBS) \
+	$(NULL)
+
+ifdef MOZ_JPROF
+LIBS += -ljprof
+endif
+
+ifndef MOZ_WINCONSOLE
+ifdef MOZ_DEBUG
+MOZ_WINCONSOLE = 1
+else
+MOZ_WINCONSOLE = 0
+endif
+endif
+
+include $(topsrcdir)/config/config.mk
+ifndef BUILD_STATIC_LIBS
+
+ifdef NS_TRACE_MALLOC
+EXTRA_DSO_LIBS += tracemalloc
+endif
+
+else
+include $(topsrcdir)/config/static-config.mk
+
+EXTRA_DEPS	+= \
+	$(STATIC_EXTRA_DEPS) \
+	$(NULL)
+DEFINES		+= $(STATIC_DEFINES)
+CPPSRCS		+= $(STATIC_CPPSRCS)
+EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
+REQUIRES	+= $(STATIC_REQUIRES)
+EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)
+endif
+
+ifeq ($(OS_ARCH),WINNT)
+OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32)
+RCINCLUDE = splash.rc
+ifndef GNU_CC
+RCFLAGS += -DMOZ_PHOENIX -I$(srcdir)
+else
+RCFLAGS += -DMOZ_PHOENIX --include-dir $(srcdir)
+endif
+ifdef BUILD_STATIC_LIBS
+RCFLAGS += -DMOZ_STATIC_BUILD
+endif
+endif
+
+ifeq ($(OS_ARCH),OS2)
+RESFILE=splashos2.res
+ifdef BUILD_STATIC_LIBS
+EXE_DEF_FILE = browser.def
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+OS_LIBS += libuls.lib libconv.lib
+else
+OS_LIBS += -llibuni -luconv
+endif
+endif
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+ifdef BUILD_STATIC_LIBS
+include $(topsrcdir)/config/static-rules.mk
+endif
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifdef BUILD_STATIC_LIBS
+LIBS	+= -framework QuickTime -framework IOKit
+endif
+endif
+
+ifeq ($(OS_ARCH),WINNT)
+#
+# Control the default heap size.
+# This is the heap returned by GetProcessHeap().
+# As we use the CRT heap, the default size is too large and wastes VM.
+#
+# The default heap size is 1MB on Win32.
+# The heap will grow if need be.
+#
+# Set it to 256k.  See bug 127069.
+#
+ifndef GNU_CC
+LDFLAGS += /HEAP:0x40000
+endif
+# Get rid of console window
+ifdef GNU_CC
+LDFLAGS += -mwindows
+endif
+endif
+
+$(PROGRAM): $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
+
+ifeq ($(OS_ARCH),OS2)
+ifdef BUILD_STATIC_LIBS
+$(EXE_DEF_FILE):
+	rm -f $@
+	@echo NAME mozilla >$(EXE_DEF_FILE)
+	@echo IMPORTS >>$(EXE_DEF_FILE)
+	@echo 	WinQueryProperty		= PMMERGE.5450 >>$(EXE_DEF_FILE)
+	@echo 	WinRemoveProperty		= PMMERGE.5451 >>$(EXE_DEF_FILE)
+	@echo 	WinSetProperty			= PMMERGE.5452 >>$(EXE_DEF_FILE)
+
+LDFLAGS += /NOE
+endif
+endif
+
+ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+MozillaFirebird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
+		-e "s|%MREDIR%|$(mredir)|" \
+		-e "s|mozilla-bin|$(PROGRAM)|g" > $@
+	chmod +x $@
+
+libs:: MozillaFirebird
+	$(INSTALL) $< $(DIST)/bin
+
+install:: MozillaFirebird
+	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
+
+GARBAGE += MozillaFirebird
+GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js)
+
+endif
+
+ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ICON_FILES	= \
+		$(srcdir)/mozicon50.xpm \
+		$(srcdir)/mozicon16.xpm \
+		$(NULL)
+
+libs::
+	$(INSTALL) $(ICON_FILES) $(DIST)/bin/icons
+
+install::
+	$(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+libs::
+	$(INSTALL) $(srcdir)/default.xpm $(DIST)/bin/chrome/icons
+
+install::
+	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/default.xpm $(DESTDIR)$(mozappdir)/icons
+endif
+
+export:: $(PREF_FILES)
+	@for i in $(PREF_FILES); do rm -f $(DIST)/bin/defaults/pref/`basename $$i`; $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $$i > $(DIST)/bin/defaults/pref/`basename $$i`; done
+
+install:: $(PREF_FILES)
+	@for i in $(PREF_FILES); do rm -f $(DESTDIR)$(mozappdir)/defaults/pref/`basename $$i`; $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $$i > $(DESTDIR)$(mozappdir)/defaults/pref/`basename $$i`; done
+
+libs::
+	touch $(DIST)/bin/.autoreg
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+
+APP_NAME = Mozilla\ Firebird
+
+libs:: $(PROGRAM)
+	mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS
+	rsync -a $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app
+	rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
+	rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
+	rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
+	cp -RL $(srcdir)/macbuild/mach.icns $(DIST)/$(APP_NAME).app/Contents/Resources/mach.icns
+	echo -n APPLMOZB > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
+#       remove CVS dirs from packaged app
+	find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
+
+clean clobber::
+	rm -rf $(DIST)/$(APP_NAME).app
+endif
--- a/mozilla/browser/app/MozillaFirebird.exe.manifest
+++ b/mozilla/browser/app/MozillaFirebird.exe.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+        version="1.0.0.0"
+        processorArchitecture="X86"
+        name="Mozilla.Firebird"
+        type="win32"
+/>
+<description>Mozilla Firebird</description>
+<dependency>
+        <dependentAssembly>
+                <assemblyIdentity
+                        type="win32"
+                        name="Microsoft.Windows.Common-Controls"
+                        version="6.0.0.0"
+                        processorArchitecture="X86"
+                        publicKeyToken="6595b64144ccf1df"
+                        language="*"
+                />
+        </dependentAssembly>
+</dependency>
+</assembly>
--- a/mozilla/browser/app/brand.dtd
+++ b/mozilla/browser/app/brand.dtd
@@ -0,0 +1,7 @@
+<!ENTITY  lang.version          "1.5a">
+<!ENTITY  brandShortName        "Mozilla Firebird">
+<!ENTITY  brandFullName         "Mozilla Firebird">
+<!ENTITY  version               "0.7+">
+<!ENTITY  vendorShortName       "Mozilla">
+
+<!ENTITY  releaseURL            "http://www.mozilla.org/projects/firebird/release-notes.html">
--- a/mozilla/browser/app/brand.properties
+++ b/mozilla/browser/app/brand.properties
@@ -0,0 +1,3 @@
+brandShortName=Mozilla Firebird
+brandFullName=Mozilla Firebird
+vendorShortName=Mozilla
--- a/mozilla/browser/app/default.xpm
+++ b/mozilla/browser/app/default.xpm
@@ -0,0 +1,88 @@
+/* XPM */
+static char *mozilla.xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 34 1",
+"  c opaque",
+". c #100101",
+"X c #1f0202",
+"o c #1f0d02",
+"O c #2f0302",
+"+ c #2f1303",
+"@ c #3f0403",
+"# c #3e1a04",
+"$ c #4e0504",
+"% c #5e0605",
+"& c #4e2005",
+"* c #5d2606",
+"= c #6e0705",
+"- c #7e0806",
+"; c #6d2d07",
+": c #7d3309",
+"> c #8d0807",
+", c #9d0908",
+"< c #8c390a",
+"1 c #ad0a08",
+"2 c #bc0b09",
+"3 c #9c400b",
+"4 c #ab460c",
+"5 c #bb4d0d",
+"6 c #cc0c0a",
+"7 c #dc0d0b",
+"8 c #eb0e0b",
+"9 c #fb0f0c",
+"0 c #ca530e",
+"q c #da590f",
+"w c #e96010",
+"e c #f96611",
+"r c white",
+"t c None",
+/* pixels */
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"ttttttttttttttttttttt     tttttttttttttttttttttt",
+"tttttttttttttttttttttt   .  tttttttttttttttttttt",
+"ttttttttttttttttttttttt  *:  ttttttttttttttttttt",
+"tttttttttttttttttttttttt  50+  ttttttttttttttttt",
+"ttttttttttttttttttttttttt oew*  tttttttttttttttt",
+"ttttttttttttttttttt   tttt 0ee*  ttttttttttttttt",
+"ttttttttttttttttt    ttttt :eee& ttttttttttttttt",
+"ttttt  ttttttttt     ttttt *eeewo tttttt  tttttt",
+"ttttt  tttttttt  %$ tttttt #eeee5  ttttt   ttttt",
+"tttt  . ttttttt O8  tttttt :eeeee# ttttt .  tttt",
+"tttt %$ tttttt .82 tt   tt 3eeeee5  tttt -% tttt",
+"tttt 6, ttttt  19, tt   t  qeeeeee# tttt 67  ttt",
+"ttt X99. tttt @991 ttt    &eeeeeee3 ttt O99$ ttt",
+"ttt =99- tttt 2992 ttt =  5eeeeeeew  t  1991 ttt",
+"ttt 2998X tt X9999. tt 2@#eeeeeeeee& t @9999. tt",
+"tt  99992  t =9999- t  92oeeeeeeeee:  .79999@ tt",
+"tt O99999,   199998.  %99X4eeeeeeee5 .699999- tt",
+"tt @999999,  7999992 O899=:eeeeeeeeq 6999999> tt",
+"tt @99999991 9999999,.6991#eeeeeeeee 99999992 tt",
+"tt @99999992O99999999,.292#eeeeeeeee 9999999- tt",
+"tt O99999992@999999999,.,,&eeeeeeeee 9999999% tt",
+"  t 89999992@99999999996..<eeeeeeeeq.9999998.   ",
+"    -9999892@999999999998@+0eeeeeee5@999999-    ",
+" O%  ,999$-6X9999999999999=.4eeeeee:=99999,  %O ",
+"  27=-999@.7 999999999999991.<eeeee+199999-=72  ",
+"t @999999@+@O2669999999999996X*eeeq.899999999@ t",
+"t  299999@4+ --O99999999999998O*ee*%999999992  t",
+"tt X89999@4w#.X 799999999999998X<q.799999998X tt",
+"tt  %9999=:ee3oX$999999999999996 #%99999999%  tt",
+"t    >999>*eee#1.,99999999999999-.89999999>    t",
+"tt @O.9996oeee#26.%29999999999999799999999.O@ tt",
+"tt X999999X5ee#197=@799999999999999999999999X tt",
+"ttt >99999-#ee;-999999999999999999999999999> ttt",
+"ttt .699998.4e3@999999999999999999999999996. ttt",
+"tttt O899991.5w 79999999999999999999999998O tttt",
+"ttttt O89999, :*$999999999999999999999998O ttttt",
+"tttttt O699996O. >9999999999999999999996O tttttt",
+"ttttttt .>99999,O ,9999999999999999999>. ttttttt",
+"tttttttt  X,899999999999999999999998,X  tttttttt",
+"tttttttttt  .$>299999962269999992>$.  tttttttttt",
+"tttttttttttt                        tttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt"
+};
--- a/mozilla/browser/app/document-icon.ico
+++ b/mozilla/browser/app/document-icon.ico
--- a/mozilla/browser/app/jar.mn
+++ b/mozilla/browser/app/jar.mn
@@ -0,0 +1,3 @@
+en-US.jar:
+        locale/en-US/global/brand.dtd                      (brand.dtd)
+        locale/en-US/global/brand.properties               (brand.properties)
--- a/mozilla/browser/app/macbuild/Contents/Info.plist
+++ b/mozilla/browser/app/macbuild/Contents/Info.plist
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>html</string>
+				<string>htm</string>
+				<string>shtml</string>
+				<string>xml</string>
+				<string>xhtml</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>fileHtml.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>HTML Document</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>HTML</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>txt</string>
+				<string>text</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>fileBookmark.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Text Document</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>TEXT</string>
+				<string>utxt</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>jpeg</string>
+				<string>jpg</string>
+				<string>png</string>
+				<string>gif</string>
+				<string>mng</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>fileBookmark.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Image Document</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>GIFf</string>
+				<string>JPEG</string>
+				<string>PNGf</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>MozillaFirebird-bin</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Mozilla 1.4a, © 1998-2003 The Mozilla Organization</string>
+	<key>CFBundleIconFile</key>
+	<string>mach</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.mozilla.mozilla</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>MozillaFirebird</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.4a</string>
+	<key>CFBundleSignature</key>
+	<string>MOZZ</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLIconFile</key>
+			<string>fileHtml.icns</string>
+			<key>CFBundleURLName</key>
+			<string>http URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>http</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleURLIconFile</key>
+			<string>fileHtml.icns</string>
+			<key>CFBundleURLName</key>
+			<string>https URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>https</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>ftp URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>ftp</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>gopher URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>gopher</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>file URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>file</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>0.6.1</string>
+	<key>NSAppleScriptEnabled</key>
+	<true/>
+</dict>
+</plist>
--- a/mozilla/browser/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/mozilla/browser/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings
--- a/mozilla/browser/app/macbuild/mach.icns
+++ b/mozilla/browser/app/macbuild/mach.icns
--- a/mozilla/browser/app/module.ver
+++ b/mozilla/browser/app/module.ver
@@ -0,0 +1,8 @@
+WIN32_MODULE_COMPANYNAME=Mozilla
+WIN32_MODULE_COPYRIGHT=©Firebird and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
+WIN32_MODULE_FILEVERSION=0,7,0,0
+WIN32_MODULE_FILEVERSION_STRING=0.7+
+WIN32_MODULE_TRADEMARKS=Blah
+WIN32_MODULE_DESCRIPTION=Mozilla Firebird
+WIN32_MODULE_PRODUCTNAME=Firebird
+WIN32_MODULE_NAME=Firebird
--- a/mozilla/browser/app/mozicon16.xpm
+++ b/mozilla/browser/app/mozicon16.xpm
@@ -0,0 +1,66 @@
+/* XPM */
+static char *mozilla.xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 44 1",
+"  c opaque",
+". c #2a0302",
+"X c #2d1303",
+"o c #3d0303",
+"O c #321403",
+"+ c #3e1a04",
+"@ c #490403",
+"# c #4d1c05",
+"$ c #540504",
+"% c #5b0504",
+"& c #5e0b05",
+"* c #640605",
+"= c #6e1106",
+"- c #740706",
+"; c #7e0806",
+": c #7d1207",
+"> c #642907",
+", c #870806",
+"< c #8d0807",
+"1 c #8d1908",
+"2 c #920907",
+"3 c #9d0908",
+"4 c #9c1f09",
+"5 c #a40a08",
+"6 c #ad0a08",
+"7 c #bc0b09",
+"8 c #bc1109",
+"9 c #ac260a",
+"0 c #ac300a",
+"q c #ab3b0b",
+"w c #bc210a",
+"e c #a6440b",
+"r c #ab460c",
+"t c #b74b0c",
+"y c #bb4d0d",
+"u c #cc0c0a",
+"i c #eb0e0b",
+"p c #fb0f0c",
+"a c #ca530e",
+"s c #da590f",
+"d c #e96010",
+"f c #f96611",
+"g c white",
+"h c None",
+/* pixels */
+"hhhhhhhhhhhhhhhh",
+"hhhhhhh X hhhhhh",
+"hhhhhh h+tOhhhhh",
+"h  hh  h ae h  h",
+"h@@h 5   sf>h%@h",
+"h,<h$p o#ffe <5h",
+"h7i@5p%-9ffdopu ",
+"h7pi7pi<wfff7pi ",
+" <pi7ppi=dff7p< ",
+"*6p:6ippp1drip6*",
+" 5pq#3pppp14pp5 ",
+" ;p0y67pppiipp; ",
+"h%p8y6pppppppp%h",
+"h -i8*ppppppi- h",
+"hhh.<676676<.hhh",
+"hhhhhhhhhhhhhhhh"
+};
--- a/mozilla/browser/app/mozicon50.xpm
+++ b/mozilla/browser/app/mozicon50.xpm
@@ -0,0 +1,88 @@
+/* XPM */
+static char *mozilla.xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 34 1",
+"  c opaque",
+". c #100101",
+"X c #1f0202",
+"o c #1f0d02",
+"O c #2f0302",
+"+ c #2f1303",
+"@ c #3f0403",
+"# c #3e1a04",
+"$ c #4e0504",
+"% c #5e0605",
+"& c #4e2005",
+"* c #5d2606",
+"= c #6e0705",
+"- c #7e0806",
+"; c #6d2d07",
+": c #7d3309",
+"> c #8d0807",
+", c #9d0908",
+"< c #8c390a",
+"1 c #ad0a08",
+"2 c #bc0b09",
+"3 c #9c400b",
+"4 c #ab460c",
+"5 c #bb4d0d",
+"6 c #cc0c0a",
+"7 c #dc0d0b",
+"8 c #eb0e0b",
+"9 c #fb0f0c",
+"0 c #ca530e",
+"q c #da590f",
+"w c #e96010",
+"e c #f96611",
+"r c white",
+"t c None",
+/* pixels */
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"ttttttttttttttttttttt     tttttttttttttttttttttt",
+"tttttttttttttttttttttt   .  tttttttttttttttttttt",
+"ttttttttttttttttttttttt  *:  ttttttttttttttttttt",
+"tttttttttttttttttttttttt  50+  ttttttttttttttttt",
+"ttttttttttttttttttttttttt oew*  tttttttttttttttt",
+"ttttttttttttttttttt   tttt 0ee*  ttttttttttttttt",
+"ttttttttttttttttt    ttttt :eee& ttttttttttttttt",
+"ttttt  ttttttttt     ttttt *eeewo tttttt  tttttt",
+"ttttt  tttttttt  %$ tttttt #eeee5  ttttt   ttttt",
+"tttt  . ttttttt O8  tttttt :eeeee# ttttt .  tttt",
+"tttt %$ tttttt .82 tt   tt 3eeeee5  tttt -% tttt",
+"tttt 6, ttttt  19, tt   t  qeeeeee# tttt 67  ttt",
+"ttt X99. tttt @991 ttt    &eeeeeee3 ttt O99$ ttt",
+"ttt =99- tttt 2992 ttt =  5eeeeeeew  t  1991 ttt",
+"ttt 2998X tt X9999. tt 2@#eeeeeeeee& t @9999. tt",
+"tt  99992  t =9999- t  92oeeeeeeeee:  .79999@ tt",
+"tt O99999,   199998.  %99X4eeeeeeee5 .699999- tt",
+"tt @999999,  7999992 O899=:eeeeeeeeq 6999999> tt",
+"tt @99999991 9999999,.6991#eeeeeeeee 99999992 tt",
+"tt @99999992O99999999,.292#eeeeeeeee 9999999- tt",
+"tt O99999992@999999999,.,,&eeeeeeeee 9999999% tt",
+"  t 89999992@99999999996..<eeeeeeeeq.9999998.   ",
+"    -9999892@999999999998@+0eeeeeee5@999999-    ",
+" O%  ,999$-6X9999999999999=.4eeeeee:=99999,  %O ",
+"  27=-999@.7 999999999999991.<eeeee+199999-=72  ",
+"t @999999@+@O2669999999999996X*eeeq.899999999@ t",
+"t  299999@4+ --O99999999999998O*ee*%999999992  t",
+"tt X89999@4w#.X 799999999999998X<q.799999998X tt",
+"tt  %9999=:ee3oX$999999999999996 #%99999999%  tt",
+"t    >999>*eee#1.,99999999999999-.89999999>    t",
+"tt @O.9996oeee#26.%29999999999999799999999.O@ tt",
+"tt X999999X5ee#197=@799999999999999999999999X tt",
+"ttt >99999-#ee;-999999999999999999999999999> ttt",
+"ttt .699998.4e3@999999999999999999999999996. ttt",
+"tttt O899991.5w 79999999999999999999999998O tttt",
+"ttttt O89999, :*$999999999999999999999998O ttttt",
+"tttttt O699996O. >9999999999999999999996O tttttt",
+"ttttttt .>99999,O ,9999999999999999999>. ttttttt",
+"tttttttt  X,899999999999999999999998,X  tttttttt",
+"tttttttttt  .$>299999962269999992>$.  tttttttttt",
+"tttttttttttt                        tttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt",
+"tttttttttttttttttttttttttttttttttttttttttttttttt"
+};
--- a/mozilla/browser/app/mozilla.ico
+++ b/mozilla/browser/app/mozilla.ico
--- a/mozilla/browser/app/mozilla.in
+++ b/mozilla/browser/app/mozilla.in
@@ -0,0 +1,115 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+## $Id: mozilla.in,v 1.2 2003-07-26 07:51:05 bryner%brianryner.com Exp $
+## 
+## Usage:
+##
+## $ mozilla [args]
+##
+## This script is meant to run the mozilla-bin binary from either 
+## mozilla/xpfe/bootstrap or mozilla/dist/bin.
+##
+## The script will setup all the environment voodoo needed to make
+## the mozilla-bin binary to work.
+##
+
+#uncomment for debugging
+#set -x
+
+moz_libdir=%MOZAPPDIR%
+MRE_HOME=%MREDIR%
+
+# Use run-mozilla.sh in the current dir if it exists
+# If not, then start resolving symlinks until we find run-mozilla.sh
+found=0
+progname=$0
+curdir=`dirname "$progname"`
+run_moz="$curdir/run-mozilla.sh"
+if test -x "$run_moz"; then
+  dist_bin=$curdir
+  found=1
+else
+  here=`/bin/pwd`
+  while [ -h "$progname" ]; do
+    bn=`basename "$progname"`
+    cd `dirname "$progname"`
+    progname=`/bin/ls -l "$bn" |sed -e 's/^.* -> //' `
+    if [ ! -x "$progname" ]; then
+      break
+    fi
+    curdir=`dirname "$progname"`
+    run_moz="$curdir/run-mozilla.sh"
+    if [ -x "$run_moz" ]; then
+      cd "$curdir"
+      dist_bin=`pwd`
+      found=1
+      break
+    fi
+  done
+  cd "$here"
+fi
+if [ $found = 0 ]; then
+  # Check default compile-time libdir
+  if [ -x "$moz_libdir/run-mozilla.sh" ]; then
+    dist_bin=$moz_libdir
+  else 
+    echo "Cannot find mozilla runtime directory. Exiting."
+    exit 1
+  fi
+fi
+
+script_args=""
+moreargs=""
+debugging=0
+MOZILLA_BIN="mozilla-bin"
+
+if [ "$OSTYPE" = "beos" ]; then
+  mimeset -F $MOZILLA_BIN
+fi
+
+while [ $# -gt 0 ]
+do
+  case "$1" in
+    -p | -pure)
+      MOZILLA_BIN="mozilla-bin.pure"
+      shift
+      ;;
+    -g | --debug)
+      script_args="$script_args -g"
+      debugging=1
+      shift
+      ;;
+    -d | --debugger)
+      script_args="$script_args -d $2"
+      shift 2
+      ;;
+    *)
+      moreargs="$moreargs \"$1\""
+      shift 1
+      ;;
+  esac
+done
+
+export MRE_HOME
+eval "set -- $moreargs"
+if [ $debugging = 1 ]
+then
+  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
+fi
+exec "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
--- a/mozilla/browser/app/mozos2.ico
+++ b/mozilla/browser/app/mozos2.ico
--- a/mozilla/browser/app/nsBrowserApp.cpp
+++ b/mozilla/browser/app/nsBrowserApp.cpp
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Brian Ryner <bryner@brianryner.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsXULAppAPI.h"
+#ifdef XP_WIN
+#include <windows.h>
+#endif
+
+int main(int argc, char* argv[])
+{
+  nsXREAppData appData;
+  appData.SetSplashEnabled(PR_FALSE);
+  appData.SetProductName(NS_LITERAL_CSTRING("Phoenix"));
+  appData.SetUseStartupPrefs(PR_FALSE);
+
+  return xre_main(argc, argv, appData);
+}
+
+#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
+char* splash_xpm[] = {0};
+#endif
+
+#if defined( XP_WIN ) && defined( WIN32 ) && !defined(__GNUC__)
+// We need WinMain in order to not be a console app.  This function is
+// unused if we are a console application.
+int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR args, int )
+{
+    // Do the real work.
+    return main( __argc, __argv );
+}
+#endif
--- a/mozilla/browser/app/profile/Makefile.in
+++ b/mozilla/browser/app/profile/Makefile.in
@@ -0,0 +1,57 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= chrome
+
+include $(topsrcdir)/config/rules.mk
+
+FILES := \
+	bookmarks.html \
+	localstore.rdf \
+	search.rdf \
+	$(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+FILES += win/mimeTypes.rdf
+else
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+FILES += mac/mimeTypes.rdf
+else
+FILES += mimeTypes.rdf
+endif
+endif
+
+libs:: $(FILES)
+	$(INSTALL) $^ $(DIST)/bin/defaults/profile
+	$(INSTALL) $^ $(DIST)/bin/defaults/profile/US
+
+install:: $(FILES)
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/US
+
+
--- a/mozilla/browser/app/profile/all.js
+++ b/mozilla/browser/app/profile/all.js
@@ -0,0 +1,659 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
+//  The first character after a period must be alphabetic.
+
+// pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties");
+pref("browser.chromeURL","chrome://browser/content/");
+pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
+pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
+pref("xpinstall.dialog.progress", "chrome://mozapps/content/downloads/downloads.xul");
+pref("xpinstall.dialog.progress.type", "Download:Manager");
+
+pref("keyword.enabled", true);
+pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q=");
+
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("general.useragent.contentlocale", "chrome://browser-region/locale/region.properties");
+pref("general.useragent.vendor", "Firebird");
+pref("general.useragent.vendorSub", "0.7+");
+
+pref("general.smoothScroll", false);
+#ifndef XP_UNIX
+pref("general.autoScroll", true);
+#endif
+
+pref("backups.number_of_prefs_copies", 1);
+
+// 0 = blank, 1 = home (browser.startup.homepage), 2 = last
+// XXXBlake Remove this stupid pref
+pref("browser.startup.page",                1);
+pref("browser.startup.homepage",	          "chrome://browser-region/locale/region.properties");
+// "browser.startup.homepage_override" was for 4.x
+pref("browser.startup.homepage_override.1", false);
+
+pref("browser.cache.enable",                true); // see also network.http.use-cache
+pref("browser.cache.disk.enable",           true);
+pref("browser.cache.disk.capacity",         50000);
+pref("browser.cache.memory.enable",         true);
+//pref("browser.cache.memory.capacity",     -1);
+// -1 = determine dynamically, 0 = none, n = memory capacity in kilobytes
+pref("browser.cache.check_doc_frequency",   3);
+// 0 = once-per-session, 1 = each-time, 2 = never, 3 = when-appropriate/automatically
+
+pref("browser.display.use_document_fonts",  1);  // 0 = never, 1 = quick, 2 = always
+pref("browser.display.use_document_colors", true);
+pref("browser.display.use_system_colors",   false);
+pref("browser.display.foreground_color",    "#000000");
+pref("browser.display.background_color",    "#FFFFFF");
+pref("browser.display.force_inline_alttext", false); // true = force ALT text for missing images to be layed out inline
+// 0 = no external leading, 
+// 1 = use external leading only when font provides, 
+// 2 = add extra leading both internal leading and external leading are zero
+pref("browser.display.normal_lineheight_calc_control", 2);
+pref("browser.display.show_image_placeholders", true); // true = show image placeholders while image is loaded and when image is broken
+pref("browser.anchor_color",                "#0000EE");
+pref("browser.active_color",                "#EE0000");
+pref("browser.visited_color",               "#551A8B");
+pref("browser.underline_anchors",           true);
+pref("browser.blink_allowed",               true);
+pref("browser.enable_automatic_image_resizing", true);
+
+pref("browser.display.use_focus_colors",    false);
+pref("browser.display.focus_background_color", "#117722");
+pref("browser.display.focus_text_color",     "#ffffff");
+pref("browser.display.focus_ring_width",     1);
+pref("browser.display.focus_ring_on_anything", false);
+
+pref("browser.urlbar.matchOnlyTyped", false);
+
+pref("browser.chrome.site_icons", true);
+pref("browser.chrome.favicons", true);
+
+pref("browser.chrome.toolbar_tips",         true);
+
+pref("browser.turbo.enabled", false);
+
+pref("browser.formfill.enable", true);
+
+pref("browser.helperApps.alwaysAsk.force",  false);
+pref("browser.helperApps.neverAsk.saveToDisk", "");
+pref("browser.helperApps.neverAsk.openFile", "");
+
+pref("accessibility.browsewithcaret", false);
+pref("accessibility.warn_on_browsewithcaret", true);
+pref("accessibility.usetexttospeech", "");
+pref("accessibility.usebrailledisplay", "");
+pref("accessibility.accesskeycausesactivation", true);
+pref("accessibility.typeaheadfind", true);
+pref("accessibility.typeaheadfind.autostart", true);
+pref("accessibility.typeaheadfind.linksonly", true);
+pref("accessibility.typeaheadfind.startlinksonly", false);
+pref("accessibility.typeaheadfind.timeout", 4000);
+pref("accessibility.typeaheadfind.enabletimeout", true);
+pref("accessibility.typeaheadfind.soundURL", "default");
+pref("accessibility.typeaheadfind.enablesound", true);
+
+pref("browser.download.useDownloadDir", true);
+pref("browser.download.folderList", 0);
+pref("browser.download.manager.showAlertOnComplete", true);
+pref("browser.download.manager.showAlertInterval", 2000);
+pref("browser.download.manager.retention", 2);
+pref("browser.download.manager.showWhenStarting", true);
+pref("browser.download.manager.useWindow", true);
+pref("browser.download.manager.closeWhenDone", true);
+pref("browser.download.manager.openDelay", 500);
+
+// pointer to the default engine name
+pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
+// pointer to the Web Search url (content area context menu)
+pref("browser.search.defaulturl", "chrome://browser-region/locale/region.properties");
+
+// basic search popup constraint: minimum sherlock plugin version displayed
+// (note: must be a string representation of a float or it'll default to 0.0)
+pref("browser.search.basic.min_ver", "0.0");
+
+pref("browser.history_expire_days", 9);
+pref("browser.history.grouping", "day");
+pref("browser.sessionhistory.max_entries", 50);
+ 
+// loading and rendering of framesets and iframes
+pref("browser.frames.enabled", true);
+
+// form submission
+pref("browser.forms.submit.backwards_compatible", true);
+
+// Tab browser preferences.
+pref("browser.tabs.autoHide", true);
+pref("browser.tabs.forceHide", false);
+pref("browser.tabs.loadInBackground", true);
+pref("browser.tabs.loadFolderAndReplace", true);
+pref("browser.tabs.opentabfor.middleclick", true);
+pref("browser.tabs.opentabfor.urlbar", true);
+
+// view source
+pref("view_source.syntax_highlight", true);
+pref("view_source.wrap_long_lines", false);
+
+// gfx widgets
+pref("nglayout.widget.mode", 2);
+pref("nglayout.initialpaint.delay", 250);
+
+// dispatch left clicks only to content in browser (still allows clicks to chrome/xul)
+pref("nglayout.events.dispatchLeftClickOnly", true);
+
+// whether or not to use xbl form controls
+pref("nglayout.debug.enable_xbl_forms", false);
+
+// size of scrollbar snapping region
+pref("slider.snapMultiplier", 6);
+
+// option to choose plug-in finder
+pref("application.use_ns_plugin_finder", false);
+
+// Smart Browsing prefs
+pref("browser.related.enabled", true);
+pref("browser.related.autoload", 1);  // 0 = Always, 1 = After first use, 2 = Never
+pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?");
+pref("browser.related.disabledForDomains", "");
+pref("browser.goBrowsing.enabled", true);
+
+// URI fixup prefs
+pref("browser.fixup.alternate.enabled", true);
+pref("browser.fixup.alternate.prefix", "www.");
+pref("browser.fixup.alternate.suffix", ".com");
+
+// Default bookmark sorting
+pref("browser.bookmarks.sort.direction", "descending");
+pref("browser.bookmarks.sort.resource", "rdf:http://home.netscape.com/NC-rdf#Name");
+
+// Print header customization
+// Use the following codes:
+// &T - Title
+// &U - Document URL
+// &D - Date/Time
+// &P - Page Number
+// &PT - Page Number "of" Page total
+// Set each header to a string containing zero or one of these codes
+// and the code will be replaced in that string by the corresponding data
+pref("print.print_headerleft", "&T");
+pref("print.print_headercenter", "");
+pref("print.print_headerright", "&U");
+pref("print.print_footerleft", "&PT");
+pref("print.print_footercenter", "");
+pref("print.print_footerright", "&D");
+pref("print.show_print_progress", true);
+
+// This indicates whether it should use the native dialog or the XP Dialog50
+pref("print.use_native_print_dialog", false);
+
+pref("print.whileInPrintPreview", true);
+
+// Cache old Presentation when going into Print Preview
+pref("print.always_cache_old_pres", false);
+
+// Enables you to specify the gap from the edge of the paper to the margin
+// this is used by both Printing and Print Preview
+pref("print.print_edge_top", 0); // 1/100 of an inch
+pref("print.print_edge_left", 0); // 1/100 of an inch
+pref("print.print_edge_right", 0); // 1/100 of an inch
+pref("print.print_edge_bottom", 0); // 1/100 of an inch
+
+// Default Capability Preferences: Security-Critical! 
+// Editing these may create a security risk - be sure you know what you're doing
+//pref("capability.policy.default.barprop.visible.set", "UniversalBrowserWrite");
+
+pref("capability.policy.default_policynames", "mailnews");
+pref("capability.policy.policynames", "");
+
+pref("capability.policy.default.DOMException.code", "allAccess");
+pref("capability.policy.default.DOMException.message", "allAccess");
+pref("capability.policy.default.DOMException.name", "allAccess");
+pref("capability.policy.default.DOMException.result", "allAccess");
+pref("capability.policy.default.DOMException.toString", "allAccess");
+
+pref("capability.policy.default.History.back", "allAccess");
+pref("capability.policy.default.History.current", "UniversalBrowserRead");
+pref("capability.policy.default.History.forward", "allAccess");
+pref("capability.policy.default.History.go", "allAccess");
+pref("capability.policy.default.History.item", "UniversalBrowserRead");
+pref("capability.policy.default.History.next", "UniversalBrowserRead");
+pref("capability.policy.default.History.previous", "UniversalBrowserRead");
+pref("capability.policy.default.History.toString", "UniversalBrowserRead");
+
+pref("capability.policy.default.HTMLDocument.close", "allAccess");
+pref("capability.policy.default.HTMLDocument.open", "allAccess");
+
+pref("capability.policy.default.Location.hash.set", "allAccess");
+pref("capability.policy.default.Location.href.set", "allAccess");
+pref("capability.policy.default.Location.reload", "allAccess");
+pref("capability.policy.default.Location.replace", "allAccess");
+
+pref("capability.policy.default.Navigator.preference", "allAccess");
+pref("capability.policy.default.Navigator.preferenceinternal.get", "UniversalPreferencesRead");
+pref("capability.policy.default.Navigator.preferenceinternal.set", "UniversalPreferencesWrite");
+
+pref("capability.policy.default.Window.blur", "allAccess");
+pref("capability.policy.default.Window.close", "allAccess");
+pref("capability.policy.default.Window.closed", "allAccess");
+pref("capability.policy.default.Window.Components", "allAccess");
+pref("capability.policy.default.Window.document", "allAccess");
+pref("capability.policy.default.Window.focus", "allAccess");
+pref("capability.policy.default.Window.frames", "allAccess");
+pref("capability.policy.default.Window.history", "allAccess");
+pref("capability.policy.default.Window.length", "allAccess");
+pref("capability.policy.default.Window.location", "allAccess");
+pref("capability.policy.default.Window.opener", "allAccess");
+pref("capability.policy.default.Window.parent", "allAccess");
+pref("capability.policy.default.Window.self", "allAccess");
+pref("capability.policy.default.Window.top", "allAccess");
+pref("capability.policy.default.Window.window", "allAccess");
+
+// Scripts & Windows prefs
+pref("browser.block.target_new_window",     false);
+pref("dom.disable_image_src_set",           false);
+pref("dom.disable_open_during_load",        true);
+pref("dom.disable_window_flip",             false);
+pref("dom.disable_window_move_resize",      false);
+pref("dom.disable_window_status_change",    false);
+
+pref("dom.disable_window_open_feature.titlebar",    false);
+pref("dom.disable_window_open_feature.close",       false);
+pref("dom.disable_window_open_feature.toolbar",     false);
+pref("dom.disable_window_open_feature.location",    false);
+pref("dom.disable_window_open_feature.directories", false);
+pref("dom.disable_window_open_feature.personalbar", false);
+pref("dom.disable_window_open_feature.menubar",     false);
+pref("dom.disable_window_open_feature.scrollbars",  false);
+pref("dom.disable_window_open_feature.resizable",   false);
+pref("dom.disable_window_open_feature.minimizable", false);
+pref("dom.disable_window_open_feature.status",      false);
+
+pref("dom.allow_scripts_to_close_windows",          false);
+
+pref("javascript.enabled",                  true);
+pref("javascript.options.strict",           false);
+pref("javascript.options.showInConsole",    false);
+
+// popups.policy 1=allow,2=reject
+pref("privacy.popups.policy",               1);
+pref("privacy.popups.usecustom",            true);
+pref("privacy.popups.firstTime",            true);
+
+// advanced prefs
+pref("advanced.always_load_images",         true);
+pref("security.enable_java",                true);
+pref("advanced.mailftp",                    false);
+pref("image.animation_mode",                "normal");
+
+// If there is ever a security firedrill that requires
+// us to block certian ports global, this is the pref 
+// to use.  Is is a comma delimited list of port numbers
+// for example:
+//   pref("network.security.ports.banned", "1,2,3,4,5");
+// prevents necko connecting to ports 1-5 unless the protocol
+// overrides.
+
+pref("network.hosts.smtp_server",           "mail");
+pref("network.hosts.pop_server",            "mail");
+pref("network.protocols.useSystemDefaults",   false); // set to true if user links should use system default handlers
+
+// <http>
+pref("network.http.version", "1.1");	  // default
+// pref("network.http.version", "1.0");   // uncomment this out in case of problems
+// pref("network.http.version", "0.9");   // it'll work too if you're crazy
+// keep-alive option is effectively obsolete. Nevertheless it'll work with
+// some older 1.0 servers:
+
+pref("network.http.proxy.version", "1.1");    // default
+// pref("network.http.proxy.version", "1.0"); // uncomment this out in case of problems
+                                              // (required if using junkbuster proxy)
+
+// enable caching of http documents
+pref("network.http.use-cache", true);
+
+// this preference can be set to override the socket type used for normal
+// HTTP traffic.  an empty value indicates the normal TCP/IP socket type.
+pref("network.http.default-socket-type", "");
+
+pref("network.http.keep-alive", true); // set it to false in case of problems
+pref("network.http.proxy.keep-alive", true);
+pref("network.http.keep-alive.timeout", 300);
+
+// limit the absolute number of http connections.
+pref("network.http.max-connections", 24);
+
+// limit the absolute number of http connections that can be established per
+// host.  if a http proxy server is enabled, then the "server" is the proxy
+// server.  Otherwise, "server" is the http origin server.
+pref("network.http.max-connections-per-server", 8);
+
+// if network.http.keep-alive is true, and if NOT connecting via a proxy, then
+// a new connection will only be attempted if the number of active persistent
+// connections to the server is less then max-persistent-connections-per-server.
+pref("network.http.max-persistent-connections-per-server", 2);
+
+// if network.http.keep-alive is true, and if connecting via a proxy, then a
+// new connection will only be attempted if the number of active persistent
+// connections to the proxy is less then max-persistent-connections-per-proxy.
+pref("network.http.max-persistent-connections-per-proxy", 4);
+
+// amount of time (in seconds) to suspend pending requests, before spawning a
+// new connection, once the limit on the number of persistent connections per
+// host has been reached.  however, a new connection will not be created if
+// max-connections or max-connections-per-server has also been reached.
+pref("network.http.request.max-start-delay", 10);
+
+// http specific network timeouts (XXX currently unused)
+pref("network.http.connect.timeout",  30);	// in seconds
+pref("network.http.request.timeout", 120);	// in seconds
+
+// Headers
+pref("network.http.accept.default", "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,video/x-mng,image/png,image/jpeg,image/gif;q=0.2,*/*;q=0.1");
+pref("network.http.sendRefererHeader",      2); // 0=don't send any, 1=send only on clicks, 2=send on image requests as well
+
+// Maximum number of consecutive redirects before aborting.
+pref("network.http.redirection-limit", 20);
+
+// Enable http compression: comment this out in case of problems with 1.1
+pref("network.http.accept-encoding" ,"gzip,deflate");
+
+pref("network.http.pipelining"      , false);
+pref("network.http.proxy.pipelining", false);
+
+// Always pipeling the very first request:  this will only work when you are
+// absolutely sure the the site or proxy you are browsing to/through support
+// pipelining; the default behavior will be that the browser will first make
+// a normal, non-pipelined request, then  examine  and remember the responce
+// and only the subsequent requests to that site will be pipeline
+pref("network.http.pipelining.firstrequest", false);
+
+// Max number of requests in the pipeline
+pref("network.http.pipelining.maxrequests" , 4);
+
+pref("network.http.proxy.ssl.connect",true);
+// </http>
+
+// This preference controls whether or not URLs with UTF-8 characters are
+// escaped.  Set this preference to TRUE for strict RFC2396 conformance.
+pref("network.standard-url.escape-utf8", true);
+
+// Idle timeout for ftp control connections - 5 minute default
+pref("network.ftp.idleConnectionTimeout", 300);
+
+// directory listing format - constants are defined in nsIDirectoryListing.idl
+// Do not set this to 0...
+pref("network.dir.format", 2);
+
+// enables the prefetch service (i.e., prefetching of <link rel="next"> URLs).
+pref("network.prefetch-next", true);
+
+// sspitzer:  change this back to "news" when we get to beta.
+// for now, set this to news.mozilla.org because you can only
+// post to the server specified by this pref.
+pref("network.hosts.nntp_server",           "news.mozilla.org");
+
+// 0-Accept, 1-dontAcceptForeign, 2-dontUse
+user_pref("network.image.imageBehavior",    0);
+
+pref("network.image.warnAboutImages",       false);
+pref("network.proxy.autoconfig_url",        "");
+pref("network.proxy.type",                  0);
+pref("network.proxy.ftp",                   "");
+pref("network.proxy.ftp_port",              0);
+pref("network.proxy.gopher",                "");
+pref("network.proxy.gopher_port",           0);
+pref("network.proxy.news",                  "");
+pref("network.proxy.news_port",             0);
+pref("network.proxy.http",                  "");
+pref("network.proxy.http_port",             0);
+pref("network.proxy.wais",                  "");
+pref("network.proxy.wais_port",             0);
+pref("network.proxy.ssl",                   "");
+pref("network.proxy.ssl_port",              0);
+pref("network.proxy.socks",                 "");
+pref("network.proxy.socks_port",            0);
+pref("network.proxy.socks_version",         5);
+pref("network.proxy.no_proxies_on",         "localhost, 127.0.0.1");
+pref("network.online",                      true); //online/offline
+pref("network.cookie.cookieBehavior",       0); // cookies enabled
+pref("network.cookie.warnAboutCookies",     false);
+pref("network.cookie.enableForCurrentSessionOnly", false);
+pref("network.cookie.lifetime.days",        90);
+
+// The following default value is for p3p medium mode.
+// See extensions/cookie/resources/content/p3p.xul for the definitions of low/medium/hi
+pref("network.cookie.p3p",                  "ffffaaaa");
+pref("network.cookie.p3plevel",             1); // 0=low, 1=medium, 2=high, 3=custom
+
+pref("network.enablePad",                   false); // Allow client to do proxy autodiscovery
+pref("network.enableIDN",                   true); // Turn on/off IDN (Internationalized Domain Name) resolution
+pref("converter.html2txt.structs",          true); // Output structured phrases (strong, em, code, sub, sup, b, i, u)
+pref("converter.html2txt.header_strategy",  1); // 0 = no indention; 1 = indention, increased with header level; 2 = numbering and slight indention
+pref("imageblocker.enabled",                true);
+
+// l12n and i18n
+pref("intl.accept_languages", "chrome://global/locale/intl.properties");
+pref("intl.accept_charsets",  "iso-8859-1,*,utf-8");
+// collationOption is only set on linux for japanese. see bug 18338 and 62015
+// we need to check if this pref is still useful.
+pref("intl.collationOption",  "chrome://global-platform/locale/intl.properties");
+pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more1",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more2",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more3",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more4",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more5",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.cache.size", 5);
+pref("intl.charset.detector", "chrome://global/locale/intl.properties");
+pref("intl.charset.default",  "chrome://global-platform/locale/intl.properties");
+pref("intl.locale.matchOS",   false);
+// fallback charset list for Unicode conversion (converting from Unicode)
+// currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
+// for ISO-8859-1
+pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
+pref("font.language.group", "chrome://global/locale/intl.properties");
+pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
+
+// -- folders (Mac: these are binary aliases.)
+pref("security.directory",              "");
+
+pref("signed.applets.codebase_principal_support", false);
+pref("security.checkloaduri", true);
+pref("security.xpconnect.plugin.unrestricted", true);
+
+// Modifier key prefs: default to Windows settings,
+// menu access key = alt, accelerator key = control.
+// Use 17 for Ctrl, 18 for Alt, 224 for Meta, 0 for none. Mac settings in macprefs.js
+pref("ui.key.accelKey", 17);
+pref("ui.key.generalAccessKey", 18);
+pref("ui.key.menuAccessKey", 18);
+pref("ui.key.menuAccessKeyFocuses", false);
+
+// Middle-mouse handling
+pref("middlemouse.paste", false);
+pref("middlemouse.contentLoadURL", false);
+pref("middlemouse.scrollbarPosition", false);
+
+// Clipboard behavior
+pref("clipboard.autocopy", false);
+
+// 0=lines, 1=pages, 2=history , 3=text size
+pref("mousewheel.withnokey.action",0);
+pref("mousewheel.withnokey.numlines",1);	
+pref("mousewheel.withnokey.sysnumlines",true);
+pref("mousewheel.withcontrolkey.action",3);
+pref("mousewheel.withcontrolkey.numlines",1);
+pref("mousewheel.withcontrolkey.sysnumlines",true);
+pref("mousewheel.withshiftkey.action",2);
+pref("mousewheel.withshiftkey.numlines",1);
+pref("mousewheel.withshiftkey.sysnumlines",false);
+pref("mousewheel.withaltkey.action",0);
+pref("mousewheel.withaltkey.numlines",1);
+pref("mousewheel.withaltkey.sysnumlines",false);
+
+pref("profile.confirm_automigration",true);
+pref("profile.allow_automigration", true);   // setting to false bypasses automigration in the profile code
+
+// the amount of time (in seconds) that must elapse
+// before we think your mozilla profile is defunct
+// and you'd benefit from re-migrating from 4.x
+// see bug #137886 for more details
+//
+// if -1, we never think your profile is defunct
+// and users will never see the remigrate UI.
+pref("profile.seconds_until_defunct", -1);
+// We can show it anytime from menus
+pref("profile.manage_only_at_launch",false);
+
+// Customizable toolbar stuff
+pref("custtoolbar.personal_toolbar_folder", "");
+
+pref("prefs.converted-to-utf8",false);
+// --------------------------------------------------
+// IBMBIDI 
+// --------------------------------------------------
+//
+// ------------------
+//  Text Direction
+// ------------------
+// 1 = directionLTRBidi *
+// 2 = directionRTLBidi
+pref("bidi.direction", 1);
+// ------------------
+//  Text Type
+// ------------------
+// 1 = charsettexttypeBidi *
+// 2 = logicaltexttypeBidi
+// 3 = visualtexttypeBidi
+pref("bidi.texttype", 1);
+// ------------------
+//  Controls Text Mode
+// ------------------
+// 1 = logicalcontrolstextmodeBidiCmd
+// 2 = visualcontrolstextmodeBidi <-- NO LONGER SUPPORTED
+// 3 = containercontrolstextmodeBidi *
+pref("bidi.controlstextmode", 1);
+// ------------------
+//  Clipboard Text Mode
+// ------------------
+//  1 = logicalclipboardtextmodeBidi
+// 2 = visiualclipboardtextmodeBidi
+// 3 = sourceclipboardtextmodeBidi *
+pref("bidi.clipboardtextmode", 3);
+// ------------------
+//  Numeral Style
+// ------------------
+// 0 = nominalnumeralBidi *
+// 1 = regularcontextnumeralBidi
+// 2 = hindicontextnumeralBidi
+// 3 = arabicnumeralBidi
+// 4 = hindinumeralBidi
+pref("bidi.numeral", 0);
+// ------------------
+//  Support Mode
+// ------------------
+// 1 = mozillaBidisupport *
+// 2 = OsBidisupport
+// 3 = disableBidisupport
+pref("bidi.support", 1);
+// ------------------
+//  Charset Mode
+// ------------------
+// 1 = doccharactersetBidi *
+// 2 = defaultcharactersetBidi
+pref("bidi.characterset", 1);
+
+pref("browser.throbber.url","chrome://browser-region/locale/region.properties");
+
+// used for double-click word selection behavior. Win will override.
+pref("layout.word_select.eat_space_to_next_word", false);
+pref("layout.word_select.stop_at_punctuation", true);
+
+// pref to force frames to be resizable
+pref("layout.frames.force_resizability", false);
+
+// pref to permit users to make verified SOAP calls by default
+pref("capability.policy.default.SOAPCall.invokeVerifySourceHeader", "allAccess");
+
+// pref to control the alert notification 
+pref("alerts.slideIncrement", 1);
+pref("alerts.slideIncrementTime", 10);
+pref("alerts.totalOpenTime", 4000);
+pref("alerts.height", 50);
+
+// update notifications prefs
+pref("update_notifications.enabled", true);
+pref("update_notifications.provider.0.frequency", 7); // number of days
+pref("update_notifications.provider.0.datasource", "chrome://browser-region/locale/region.properties");
+
+// if true, allow plug-ins to override internal imglib decoder mime types in full-page mode
+pref("plugin.override_internal_types", false);
+pref("plugin.expose_full_path", false); // if true navigator.plugins reveals full path
+
+// Help Windows NT, 2000, and XP dialup a RAS connection
+// when a network address is unreachable.
+pref("network.autodial-helper.enabled", true);
+
+// Pref to control whether we set ddeexec subkeys for the http
+// Internet shortcut protocol if we are handling it.  These
+// subkeys will be set only while we are running (to avoid the
+// problem of Windows showing an alert when it tries to use DDE
+// and we're not already running).
+pref("advanced.system.supportDDEExec", true);
+pref("browser.xul.error_pages.enabled", false);
+
+pref("signon.rememberSignons",              true);
+pref("signon.expireMasterPassword",         false);
+pref("signon.SignonFileName", "signons.txt");
+
+pref("network.protocol-handler.external.mailto", true); // for mail
+pref("network.protocol-handler.external.news" , true); // for news 
+
+// By default, all protocol handlers are exposed.  This means that
+// the browser will respond to openURL commands for all URL types.
+// It will also try to open link clicks inside the browser before
+// failing over to the system handlers.
+pref("network.protocol-handler.expose-all", true);
+
+// Default security warning dialogs to off
+pref("security.warn_entering_secure", false);
+pref("security.warn_entering_weak", false);
+pref("security.warn_leaving_secure", false);
+pref("security.warn_viewing_mixed", false);
+pref("security.warn_submit_insecure", false);
--- a/mozilla/browser/app/profile/bookmarks.html
+++ b/mozilla/browser/app/profile/bookmarks.html
@@ -0,0 +1,49 @@
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<!-- This is an automatically generated file.
+It will be read and overwritten.
+Do Not Edit! -->
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<TITLE>Bookmarks</TITLE>
+<H1>Bookmarks</H1>
+
+<DL><p>
+<DT><H3 PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Toolbar Folder</H3>
+<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
+<DL><p>
+<DT><A HREF="http://texturizer.net/firebird/index.html">Mozilla Firebird Help</A>
+<DD>David Tenser's Mozilla Firebird help site
+<DT><A HREF="http://forums.mozillazine.org/viewforum.php?f=38">Mozilla Firebird Support</A>
+<DD>MozillaZine's Firebird Support forum
+<DT><A HREF="http://plugindoc.mozdev.org/faqs/">Plug-in FAQ</A>
+<DD>Mozilla Firebird Plug-in Frequently Asked Questions
+</DL><p>
+<HR>
+<DT><H3>Mozilla Firebird &amp; Mozilla Information</H3>
+<DD>Information about Mozilla Firebird and Mozilla
+<DL><p>
+<DT><A HREF="http://texturizer.net/firebird/extensions/">Mozilla Firebird Extensions</A>
+<DD>Mozilla Firebird add-ons and extensions
+<DT><A HREF="http://texturizer.net/firebird/themes/">Mozilla Firebird Themes</A>
+<DD>Mozilla Firebird themes
+<DT><A HREF="http://forums.mozillazine.org/index.php?c=4">Mozilla Firebird Discussions</A>
+<DD>MozillaZine's Mozilla Firebird discussion forums
+<DT><A HREF="http://www.mozillazine.org/">MozillaZine</A>
+<DD>Mozilla community news and advocacy
+</DL><p>
+<HR>
+<DT><H3>Quick Searches</H3>
+<DD>Handy searches that can be performed in the addressbar
+<DL><p>
+<DT><A HREF="http://devedge.netscape.com/viewsource/2002/bookmarks/">Using Mozilla Firebird Quick Searches</A>
+<DD>Learn how to create and use Mozilla Firebird custom keywords and quick searches
+<DT><A HREF="http://www.google.com/search?&q=%s" SHORTCUTURL="google">Google Quicksearch</A>
+<DD>Type &quot;google &lt;search term&gt;&quot; in the addressbar to perform a Google search
+<DT><A HREF="http://www.google.com/search?q=%s&btnI=I'm+Feeling+Lucky" SHORTCUTURL="goto">I'm Feeling Lucky Quicksearch</A>
+<DD>Type &quot;goto &lt;term&gt;&quot; in the addressbar to visit Google's top listing for that term
+<DT><A HREF="http://dictionary.reference.com/search?q=%s" SHORTCUTURL="dict">Dictionary.com Quicksearch</A>
+<DD>Type &quot;dict &lt;word&gt;&quot; in the addressbar to perform a dictionary look-up
+<DT><A HREF="http://www.google.com/search?&q=stocks:%s" SHORTCUTURL="quot">Stock Symbol Quicksearch</A>
+<DD>Type &quot;quot &lt;symbol&gt;&quot; in the addressbar to perform a stock symbol look-up
+</DL><p>
+<HR>
+</DL><p>
--- a/mozilla/browser/app/profile/chrome/Makefile.in
+++ b/mozilla/browser/app/profile/chrome/Makefile.in
@@ -0,0 +1,39 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+FILES := \
+	userContent-example.css \
+	userChrome-example.css \
+	$(NULL)
+
+FILES := $(addprefix $(srcdir)/, $(FILES))
+
+libs::
+	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/chrome
+	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/US/chrome
+
+install::
+	$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/chrome
+	$(NSINSTALL)  -t $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/US/chrome
+
--- a/mozilla/browser/app/profile/chrome/userChrome-example.css
+++ b/mozilla/browser/app/profile/chrome/userChrome-example.css
@@ -0,0 +1,54 @@
+/*
+ * Edit this file and copy it as userChrome.css into your
+ * profile-directory/chrome/
+ */
+
+/*
+ * This file can be used to customize the look of Mozilla's user interface
+ * You should consider using !important on rules which you want to
+ * override default settings.
+ */
+
+/*
+ * Do not remove the @namespace line -- it's required for correct functioning
+ */
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */
+
+
+/*
+ * Some possible accessibility enhancements:
+ */
+/*
+ * Make all the default font sizes 20 pt:
+ *
+ * * {
+ *   font-size: 20pt !important
+ * }
+ */
+/*
+ * Make menu items in particular 15 pt instead of the default size:
+ *
+ * menupopup > * {
+ *   font-size: 15pt !important
+ * }
+ */
+/*
+ * Give the Location (URL) Bar a fixed-width font
+ *
+ * #urlbar {
+ *    font-family: monospace !important;
+ * }
+ */
+
+/*
+ * Eliminate the throbber and its annoying movement:
+ *
+ * #throbber-box {
+ *   display: none !important;
+ * }
+ */
+
+/*
+ * For more examples see http://www.mozilla.org/unix/customizing.html
+ */
+ 
--- a/mozilla/browser/app/profile/chrome/userContent-example.css
+++ b/mozilla/browser/app/profile/chrome/userContent-example.css
@@ -0,0 +1,35 @@
+/*
+ * Edit this file and copy it as userContent.css into your
+ * profile-directory/chrome/
+ */
+
+/*
+ * This file can be used to apply a style to all web pages you view
+ * Rules without !important are overruled by author rules if the
+ * author sets any.  Rules with !important overrule author rules.
+ */
+
+/*
+ * example: turn off "blink" element blinking
+ *
+ * blink { text-decoration: none ! important; }
+ *
+ */
+
+/*
+ * example: give all tables a 2px border
+ *
+ * table { border: 2px solid; }
+ */
+
+/*
+ * example: turn off "marquee" element
+ *
+ * marquee { -moz-binding: none; }
+ *
+ */
+ 
+/* 
+ * For more examples see http://www.mozilla.org/unix/customizing.html
+ */
+
--- a/mozilla/browser/app/profile/firebird.js
+++ b/mozilla/browser/app/profile/firebird.js
@@ -0,0 +1,659 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
+//  The first character after a period must be alphabetic.
+
+// pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties");
+pref("browser.chromeURL","chrome://browser/content/");
+pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
+pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
+pref("xpinstall.dialog.progress", "chrome://mozapps/content/downloads/downloads.xul");
+pref("xpinstall.dialog.progress.type", "Download:Manager");
+
+pref("keyword.enabled", true);
+pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q=");
+
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("general.useragent.contentlocale", "chrome://browser-region/locale/region.properties");
+pref("general.useragent.vendor", "Firebird");
+pref("general.useragent.vendorSub", "0.7+");
+
+pref("general.smoothScroll", false);
+#ifndef XP_UNIX
+pref("general.autoScroll", true);
+#endif
+
+pref("backups.number_of_prefs_copies", 1);
+
+// 0 = blank, 1 = home (browser.startup.homepage), 2 = last
+// XXXBlake Remove this stupid pref
+pref("browser.startup.page",                1);
+pref("browser.startup.homepage",	          "chrome://browser-region/locale/region.properties");
+// "browser.startup.homepage_override" was for 4.x
+pref("browser.startup.homepage_override.1", false);
+
+pref("browser.cache.enable",                true); // see also network.http.use-cache
+pref("browser.cache.disk.enable",           true);
+pref("browser.cache.disk.capacity",         50000);
+pref("browser.cache.memory.enable",         true);
+//pref("browser.cache.memory.capacity",     -1);
+// -1 = determine dynamically, 0 = none, n = memory capacity in kilobytes
+pref("browser.cache.check_doc_frequency",   3);
+// 0 = once-per-session, 1 = each-time, 2 = never, 3 = when-appropriate/automatically
+
+pref("browser.display.use_document_fonts",  1);  // 0 = never, 1 = quick, 2 = always
+pref("browser.display.use_document_colors", true);
+pref("browser.display.use_system_colors",   false);
+pref("browser.display.foreground_color",    "#000000");
+pref("browser.display.background_color",    "#FFFFFF");
+pref("browser.display.force_inline_alttext", false); // true = force ALT text for missing images to be layed out inline
+// 0 = no external leading, 
+// 1 = use external leading only when font provides, 
+// 2 = add extra leading both internal leading and external leading are zero
+pref("browser.display.normal_lineheight_calc_control", 2);
+pref("browser.display.show_image_placeholders", true); // true = show image placeholders while image is loaded and when image is broken
+pref("browser.anchor_color",                "#0000EE");
+pref("browser.active_color",                "#EE0000");
+pref("browser.visited_color",               "#551A8B");
+pref("browser.underline_anchors",           true);
+pref("browser.blink_allowed",               true);
+pref("browser.enable_automatic_image_resizing", true);
+
+pref("browser.display.use_focus_colors",    false);
+pref("browser.display.focus_background_color", "#117722");
+pref("browser.display.focus_text_color",     "#ffffff");
+pref("browser.display.focus_ring_width",     1);
+pref("browser.display.focus_ring_on_anything", false);
+
+pref("browser.urlbar.matchOnlyTyped", false);
+
+pref("browser.chrome.site_icons", true);
+pref("browser.chrome.favicons", true);
+
+pref("browser.chrome.toolbar_tips",         true);
+
+pref("browser.turbo.enabled", false);
+
+pref("browser.formfill.enable", true);
+
+pref("browser.helperApps.alwaysAsk.force",  false);
+pref("browser.helperApps.neverAsk.saveToDisk", "");
+pref("browser.helperApps.neverAsk.openFile", "");
+
+pref("accessibility.browsewithcaret", false);
+pref("accessibility.warn_on_browsewithcaret", true);
+pref("accessibility.usetexttospeech", "");
+pref("accessibility.usebrailledisplay", "");
+pref("accessibility.accesskeycausesactivation", true);
+pref("accessibility.typeaheadfind", true);
+pref("accessibility.typeaheadfind.autostart", true);
+pref("accessibility.typeaheadfind.linksonly", true);
+pref("accessibility.typeaheadfind.startlinksonly", false);
+pref("accessibility.typeaheadfind.timeout", 4000);
+pref("accessibility.typeaheadfind.enabletimeout", true);
+pref("accessibility.typeaheadfind.soundURL", "default");
+pref("accessibility.typeaheadfind.enablesound", true);
+
+pref("browser.download.useDownloadDir", true);
+pref("browser.download.folderList", 0);
+pref("browser.download.manager.showAlertOnComplete", true);
+pref("browser.download.manager.showAlertInterval", 2000);
+pref("browser.download.manager.retention", 2);
+pref("browser.download.manager.showWhenStarting", true);
+pref("browser.download.manager.useWindow", true);
+pref("browser.download.manager.closeWhenDone", true);
+pref("browser.download.manager.openDelay", 500);
+
+// pointer to the default engine name
+pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
+// pointer to the Web Search url (content area context menu)
+pref("browser.search.defaulturl", "chrome://browser-region/locale/region.properties");
+
+// basic search popup constraint: minimum sherlock plugin version displayed
+// (note: must be a string representation of a float or it'll default to 0.0)
+pref("browser.search.basic.min_ver", "0.0");
+
+pref("browser.history_expire_days", 9);
+pref("browser.history.grouping", "day");
+pref("browser.sessionhistory.max_entries", 50);
+ 
+// loading and rendering of framesets and iframes
+pref("browser.frames.enabled", true);
+
+// form submission
+pref("browser.forms.submit.backwards_compatible", true);
+
+// Tab browser preferences.
+pref("browser.tabs.autoHide", true);
+pref("browser.tabs.forceHide", false);
+pref("browser.tabs.loadInBackground", true);
+pref("browser.tabs.loadFolderAndReplace", true);
+pref("browser.tabs.opentabfor.middleclick", true);
+pref("browser.tabs.opentabfor.urlbar", true);
+
+// view source
+pref("view_source.syntax_highlight", true);
+pref("view_source.wrap_long_lines", false);
+
+// gfx widgets
+pref("nglayout.widget.mode", 2);
+pref("nglayout.initialpaint.delay", 250);
+
+// dispatch left clicks only to content in browser (still allows clicks to chrome/xul)
+pref("nglayout.events.dispatchLeftClickOnly", true);
+
+// whether or not to use xbl form controls
+pref("nglayout.debug.enable_xbl_forms", false);
+
+// size of scrollbar snapping region
+pref("slider.snapMultiplier", 6);
+
+// option to choose plug-in finder
+pref("application.use_ns_plugin_finder", false);
+
+// Smart Browsing prefs
+pref("browser.related.enabled", true);
+pref("browser.related.autoload", 1);  // 0 = Always, 1 = After first use, 2 = Never
+pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?");
+pref("browser.related.disabledForDomains", "");
+pref("browser.goBrowsing.enabled", true);
+
+// URI fixup prefs
+pref("browser.fixup.alternate.enabled", true);
+pref("browser.fixup.alternate.prefix", "www.");
+pref("browser.fixup.alternate.suffix", ".com");
+
+// Default bookmark sorting
+pref("browser.bookmarks.sort.direction", "descending");
+pref("browser.bookmarks.sort.resource", "rdf:http://home.netscape.com/NC-rdf#Name");
+
+// Print header customization
+// Use the following codes:
+// &T - Title
+// &U - Document URL
+// &D - Date/Time
+// &P - Page Number
+// &PT - Page Number "of" Page total
+// Set each header to a string containing zero or one of these codes
+// and the code will be replaced in that string by the corresponding data
+pref("print.print_headerleft", "&T");
+pref("print.print_headercenter", "");
+pref("print.print_headerright", "&U");
+pref("print.print_footerleft", "&PT");
+pref("print.print_footercenter", "");
+pref("print.print_footerright", "&D");
+pref("print.show_print_progress", true);
+
+// This indicates whether it should use the native dialog or the XP Dialog50
+pref("print.use_native_print_dialog", false);
+
+pref("print.whileInPrintPreview", true);
+
+// Cache old Presentation when going into Print Preview
+pref("print.always_cache_old_pres", false);
+
+// Enables you to specify the gap from the edge of the paper to the margin
+// this is used by both Printing and Print Preview
+pref("print.print_edge_top", 0); // 1/100 of an inch
+pref("print.print_edge_left", 0); // 1/100 of an inch
+pref("print.print_edge_right", 0); // 1/100 of an inch
+pref("print.print_edge_bottom", 0); // 1/100 of an inch
+
+// Default Capability Preferences: Security-Critical! 
+// Editing these may create a security risk - be sure you know what you're doing
+//pref("capability.policy.default.barprop.visible.set", "UniversalBrowserWrite");
+
+pref("capability.policy.default_policynames", "mailnews");
+pref("capability.policy.policynames", "");
+
+pref("capability.policy.default.DOMException.code", "allAccess");
+pref("capability.policy.default.DOMException.message", "allAccess");
+pref("capability.policy.default.DOMException.name", "allAccess");
+pref("capability.policy.default.DOMException.result", "allAccess");
+pref("capability.policy.default.DOMException.toString", "allAccess");
+
+pref("capability.policy.default.History.back", "allAccess");
+pref("capability.policy.default.History.current", "UniversalBrowserRead");
+pref("capability.policy.default.History.forward", "allAccess");
+pref("capability.policy.default.History.go", "allAccess");
+pref("capability.policy.default.History.item", "UniversalBrowserRead");
+pref("capability.policy.default.History.next", "UniversalBrowserRead");
+pref("capability.policy.default.History.previous", "UniversalBrowserRead");
+pref("capability.policy.default.History.toString", "UniversalBrowserRead");
+
+pref("capability.policy.default.HTMLDocument.close", "allAccess");
+pref("capability.policy.default.HTMLDocument.open", "allAccess");
+
+pref("capability.policy.default.Location.hash.set", "allAccess");
+pref("capability.policy.default.Location.href.set", "allAccess");
+pref("capability.policy.default.Location.reload", "allAccess");
+pref("capability.policy.default.Location.replace", "allAccess");
+
+pref("capability.policy.default.Navigator.preference", "allAccess");
+pref("capability.policy.default.Navigator.preferenceinternal.get", "UniversalPreferencesRead");
+pref("capability.policy.default.Navigator.preferenceinternal.set", "UniversalPreferencesWrite");
+
+pref("capability.policy.default.Window.blur", "allAccess");
+pref("capability.policy.default.Window.close", "allAccess");
+pref("capability.policy.default.Window.closed", "allAccess");
+pref("capability.policy.default.Window.Components", "allAccess");
+pref("capability.policy.default.Window.document", "allAccess");
+pref("capability.policy.default.Window.focus", "allAccess");
+pref("capability.policy.default.Window.frames", "allAccess");
+pref("capability.policy.default.Window.history", "allAccess");
+pref("capability.policy.default.Window.length", "allAccess");
+pref("capability.policy.default.Window.location", "allAccess");
+pref("capability.policy.default.Window.opener", "allAccess");
+pref("capability.policy.default.Window.parent", "allAccess");
+pref("capability.policy.default.Window.self", "allAccess");
+pref("capability.policy.default.Window.top", "allAccess");
+pref("capability.policy.default.Window.window", "allAccess");
+
+// Scripts & Windows prefs
+pref("browser.block.target_new_window",     false);
+pref("dom.disable_image_src_set",           false);
+pref("dom.disable_open_during_load",        true);
+pref("dom.disable_window_flip",             false);
+pref("dom.disable_window_move_resize",      false);
+pref("dom.disable_window_status_change",    false);
+
+pref("dom.disable_window_open_feature.titlebar",    false);
+pref("dom.disable_window_open_feature.close",       false);
+pref("dom.disable_window_open_feature.toolbar",     false);
+pref("dom.disable_window_open_feature.location",    false);
+pref("dom.disable_window_open_feature.directories", false);
+pref("dom.disable_window_open_feature.personalbar", false);
+pref("dom.disable_window_open_feature.menubar",     false);
+pref("dom.disable_window_open_feature.scrollbars",  false);
+pref("dom.disable_window_open_feature.resizable",   false);
+pref("dom.disable_window_open_feature.minimizable", false);
+pref("dom.disable_window_open_feature.status",      false);
+
+pref("dom.allow_scripts_to_close_windows",          false);
+
+pref("javascript.enabled",                  true);
+pref("javascript.options.strict",           false);
+pref("javascript.options.showInConsole",    false);
+
+// popups.policy 1=allow,2=reject
+pref("privacy.popups.policy",               1);
+pref("privacy.popups.usecustom",            true);
+pref("privacy.popups.firstTime",            true);
+
+// advanced prefs
+pref("advanced.always_load_images",         true);
+pref("security.enable_java",                true);
+pref("advanced.mailftp",                    false);
+pref("image.animation_mode",                "normal");
+
+// If there is ever a security firedrill that requires
+// us to block certian ports global, this is the pref 
+// to use.  Is is a comma delimited list of port numbers
+// for example:
+//   pref("network.security.ports.banned", "1,2,3,4,5");
+// prevents necko connecting to ports 1-5 unless the protocol
+// overrides.
+
+pref("network.hosts.smtp_server",           "mail");
+pref("network.hosts.pop_server",            "mail");
+pref("network.protocols.useSystemDefaults",   false); // set to true if user links should use system default handlers
+
+// <http>
+pref("network.http.version", "1.1");	  // default
+// pref("network.http.version", "1.0");   // uncomment this out in case of problems
+// pref("network.http.version", "0.9");   // it'll work too if you're crazy
+// keep-alive option is effectively obsolete. Nevertheless it'll work with
+// some older 1.0 servers:
+
+pref("network.http.proxy.version", "1.1");    // default
+// pref("network.http.proxy.version", "1.0"); // uncomment this out in case of problems
+                                              // (required if using junkbuster proxy)
+
+// enable caching of http documents
+pref("network.http.use-cache", true);
+
+// this preference can be set to override the socket type used for normal
+// HTTP traffic.  an empty value indicates the normal TCP/IP socket type.
+pref("network.http.default-socket-type", "");
+
+pref("network.http.keep-alive", true); // set it to false in case of problems
+pref("network.http.proxy.keep-alive", true);
+pref("network.http.keep-alive.timeout", 300);
+
+// limit the absolute number of http connections.
+pref("network.http.max-connections", 24);
+
+// limit the absolute number of http connections that can be established per
+// host.  if a http proxy server is enabled, then the "server" is the proxy
+// server.  Otherwise, "server" is the http origin server.
+pref("network.http.max-connections-per-server", 8);
+
+// if network.http.keep-alive is true, and if NOT connecting via a proxy, then
+// a new connection will only be attempted if the number of active persistent
+// connections to the server is less then max-persistent-connections-per-server.
+pref("network.http.max-persistent-connections-per-server", 2);
+
+// if network.http.keep-alive is true, and if connecting via a proxy, then a
+// new connection will only be attempted if the number of active persistent
+// connections to the proxy is less then max-persistent-connections-per-proxy.
+pref("network.http.max-persistent-connections-per-proxy", 4);
+
+// amount of time (in seconds) to suspend pending requests, before spawning a
+// new connection, once the limit on the number of persistent connections per
+// host has been reached.  however, a new connection will not be created if
+// max-connections or max-connections-per-server has also been reached.
+pref("network.http.request.max-start-delay", 10);
+
+// http specific network timeouts (XXX currently unused)
+pref("network.http.connect.timeout",  30);	// in seconds
+pref("network.http.request.timeout", 120);	// in seconds
+
+// Headers
+pref("network.http.accept.default", "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,video/x-mng,image/png,image/jpeg,image/gif;q=0.2,*/*;q=0.1");
+pref("network.http.sendRefererHeader",      2); // 0=don't send any, 1=send only on clicks, 2=send on image requests as well
+
+// Maximum number of consecutive redirects before aborting.
+pref("network.http.redirection-limit", 20);
+
+// Enable http compression: comment this out in case of problems with 1.1
+pref("network.http.accept-encoding" ,"gzip,deflate");
+
+pref("network.http.pipelining"      , false);
+pref("network.http.proxy.pipelining", false);
+
+// Always pipeling the very first request:  this will only work when you are
+// absolutely sure the the site or proxy you are browsing to/through support
+// pipelining; the default behavior will be that the browser will first make
+// a normal, non-pipelined request, then  examine  and remember the responce
+// and only the subsequent requests to that site will be pipeline
+pref("network.http.pipelining.firstrequest", false);
+
+// Max number of requests in the pipeline
+pref("network.http.pipelining.maxrequests" , 4);
+
+pref("network.http.proxy.ssl.connect",true);
+// </http>
+
+// This preference controls whether or not URLs with UTF-8 characters are
+// escaped.  Set this preference to TRUE for strict RFC2396 conformance.
+pref("network.standard-url.escape-utf8", true);
+
+// Idle timeout for ftp control connections - 5 minute default
+pref("network.ftp.idleConnectionTimeout", 300);
+
+// directory listing format - constants are defined in nsIDirectoryListing.idl
+// Do not set this to 0...
+pref("network.dir.format", 2);
+
+// enables the prefetch service (i.e., prefetching of <link rel="next"> URLs).
+pref("network.prefetch-next", true);
+
+// sspitzer:  change this back to "news" when we get to beta.
+// for now, set this to news.mozilla.org because you can only
+// post to the server specified by this pref.
+pref("network.hosts.nntp_server",           "news.mozilla.org");
+
+// 0-Accept, 1-dontAcceptForeign, 2-dontUse
+user_pref("network.image.imageBehavior",    0);
+
+pref("network.image.warnAboutImages",       false);
+pref("network.proxy.autoconfig_url",        "");
+pref("network.proxy.type",                  0);
+pref("network.proxy.ftp",                   "");
+pref("network.proxy.ftp_port",              0);
+pref("network.proxy.gopher",                "");
+pref("network.proxy.gopher_port",           0);
+pref("network.proxy.news",                  "");
+pref("network.proxy.news_port",             0);
+pref("network.proxy.http",                  "");
+pref("network.proxy.http_port",             0);
+pref("network.proxy.wais",                  "");
+pref("network.proxy.wais_port",             0);
+pref("network.proxy.ssl",                   "");
+pref("network.proxy.ssl_port",              0);
+pref("network.proxy.socks",                 "");
+pref("network.proxy.socks_port",            0);
+pref("network.proxy.socks_version",         5);
+pref("network.proxy.no_proxies_on",         "localhost, 127.0.0.1");
+pref("network.online",                      true); //online/offline
+pref("network.cookie.cookieBehavior",       0); // cookies enabled
+pref("network.cookie.warnAboutCookies",     false);
+pref("network.cookie.enableForCurrentSessionOnly", false);
+pref("network.cookie.lifetime.days",        90);
+
+// The following default value is for p3p medium mode.
+// See extensions/cookie/resources/content/p3p.xul for the definitions of low/medium/hi
+pref("network.cookie.p3p",                  "ffffaaaa");
+pref("network.cookie.p3plevel",             1); // 0=low, 1=medium, 2=high, 3=custom
+
+pref("network.enablePad",                   false); // Allow client to do proxy autodiscovery
+pref("network.enableIDN",                   true); // Turn on/off IDN (Internationalized Domain Name) resolution
+pref("converter.html2txt.structs",          true); // Output structured phrases (strong, em, code, sub, sup, b, i, u)
+pref("converter.html2txt.header_strategy",  1); // 0 = no indention; 1 = indention, increased with header level; 2 = numbering and slight indention
+pref("imageblocker.enabled",                true);
+
+// l12n and i18n
+pref("intl.accept_languages", "chrome://global/locale/intl.properties");
+pref("intl.accept_charsets",  "iso-8859-1,*,utf-8");
+// collationOption is only set on linux for japanese. see bug 18338 and 62015
+// we need to check if this pref is still useful.
+pref("intl.collationOption",  "chrome://global-platform/locale/intl.properties");
+pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more1",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more2",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more3",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more4",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more5",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.cache.size", 5);
+pref("intl.charset.detector", "chrome://global/locale/intl.properties");
+pref("intl.charset.default",  "chrome://global-platform/locale/intl.properties");
+pref("intl.locale.matchOS",   false);
+// fallback charset list for Unicode conversion (converting from Unicode)
+// currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
+// for ISO-8859-1
+pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
+pref("font.language.group", "chrome://global/locale/intl.properties");
+pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
+
+// -- folders (Mac: these are binary aliases.)
+pref("security.directory",              "");
+
+pref("signed.applets.codebase_principal_support", false);
+pref("security.checkloaduri", true);
+pref("security.xpconnect.plugin.unrestricted", true);
+
+// Modifier key prefs: default to Windows settings,
+// menu access key = alt, accelerator key = control.
+// Use 17 for Ctrl, 18 for Alt, 224 for Meta, 0 for none. Mac settings in macprefs.js
+pref("ui.key.accelKey", 17);
+pref("ui.key.generalAccessKey", 18);
+pref("ui.key.menuAccessKey", 18);
+pref("ui.key.menuAccessKeyFocuses", false);
+
+// Middle-mouse handling
+pref("middlemouse.paste", false);
+pref("middlemouse.contentLoadURL", false);
+pref("middlemouse.scrollbarPosition", false);
+
+// Clipboard behavior
+pref("clipboard.autocopy", false);
+
+// 0=lines, 1=pages, 2=history , 3=text size
+pref("mousewheel.withnokey.action",0);
+pref("mousewheel.withnokey.numlines",1);	
+pref("mousewheel.withnokey.sysnumlines",true);
+pref("mousewheel.withcontrolkey.action",3);
+pref("mousewheel.withcontrolkey.numlines",1);
+pref("mousewheel.withcontrolkey.sysnumlines",true);
+pref("mousewheel.withshiftkey.action",2);
+pref("mousewheel.withshiftkey.numlines",1);
+pref("mousewheel.withshiftkey.sysnumlines",false);
+pref("mousewheel.withaltkey.action",0);
+pref("mousewheel.withaltkey.numlines",1);
+pref("mousewheel.withaltkey.sysnumlines",false);
+
+pref("profile.confirm_automigration",true);
+pref("profile.allow_automigration", true);   // setting to false bypasses automigration in the profile code
+
+// the amount of time (in seconds) that must elapse
+// before we think your mozilla profile is defunct
+// and you'd benefit from re-migrating from 4.x
+// see bug #137886 for more details
+//
+// if -1, we never think your profile is defunct
+// and users will never see the remigrate UI.
+pref("profile.seconds_until_defunct", -1);
+// We can show it anytime from menus
+pref("profile.manage_only_at_launch",false);
+
+// Customizable toolbar stuff
+pref("custtoolbar.personal_toolbar_folder", "");
+
+pref("prefs.converted-to-utf8",false);
+// --------------------------------------------------
+// IBMBIDI 
+// --------------------------------------------------
+//
+// ------------------
+//  Text Direction
+// ------------------
+// 1 = directionLTRBidi *
+// 2 = directionRTLBidi
+pref("bidi.direction", 1);
+// ------------------
+//  Text Type
+// ------------------
+// 1 = charsettexttypeBidi *
+// 2 = logicaltexttypeBidi
+// 3 = visualtexttypeBidi
+pref("bidi.texttype", 1);
+// ------------------
+//  Controls Text Mode
+// ------------------
+// 1 = logicalcontrolstextmodeBidiCmd
+// 2 = visualcontrolstextmodeBidi <-- NO LONGER SUPPORTED
+// 3 = containercontrolstextmodeBidi *
+pref("bidi.controlstextmode", 1);
+// ------------------
+//  Clipboard Text Mode
+// ------------------
+//  1 = logicalclipboardtextmodeBidi
+// 2 = visiualclipboardtextmodeBidi
+// 3 = sourceclipboardtextmodeBidi *
+pref("bidi.clipboardtextmode", 3);
+// ------------------
+//  Numeral Style
+// ------------------
+// 0 = nominalnumeralBidi *
+// 1 = regularcontextnumeralBidi
+// 2 = hindicontextnumeralBidi
+// 3 = arabicnumeralBidi
+// 4 = hindinumeralBidi
+pref("bidi.numeral", 0);
+// ------------------
+//  Support Mode
+// ------------------
+// 1 = mozillaBidisupport *
+// 2 = OsBidisupport
+// 3 = disableBidisupport
+pref("bidi.support", 1);
+// ------------------
+//  Charset Mode
+// ------------------
+// 1 = doccharactersetBidi *
+// 2 = defaultcharactersetBidi
+pref("bidi.characterset", 1);
+
+pref("browser.throbber.url","chrome://browser-region/locale/region.properties");
+
+// used for double-click word selection behavior. Win will override.
+pref("layout.word_select.eat_space_to_next_word", false);
+pref("layout.word_select.stop_at_punctuation", true);
+
+// pref to force frames to be resizable
+pref("layout.frames.force_resizability", false);
+
+// pref to permit users to make verified SOAP calls by default
+pref("capability.policy.default.SOAPCall.invokeVerifySourceHeader", "allAccess");
+
+// pref to control the alert notification 
+pref("alerts.slideIncrement", 1);
+pref("alerts.slideIncrementTime", 10);
+pref("alerts.totalOpenTime", 4000);
+pref("alerts.height", 50);
+
+// update notifications prefs
+pref("update_notifications.enabled", true);
+pref("update_notifications.provider.0.frequency", 7); // number of days
+pref("update_notifications.provider.0.datasource", "chrome://browser-region/locale/region.properties");
+
+// if true, allow plug-ins to override internal imglib decoder mime types in full-page mode
+pref("plugin.override_internal_types", false);
+pref("plugin.expose_full_path", false); // if true navigator.plugins reveals full path
+
+// Help Windows NT, 2000, and XP dialup a RAS connection
+// when a network address is unreachable.
+pref("network.autodial-helper.enabled", true);
+
+// Pref to control whether we set ddeexec subkeys for the http
+// Internet shortcut protocol if we are handling it.  These
+// subkeys will be set only while we are running (to avoid the
+// problem of Windows showing an alert when it tries to use DDE
+// and we're not already running).
+pref("advanced.system.supportDDEExec", true);
+pref("browser.xul.error_pages.enabled", false);
+
+pref("signon.rememberSignons",              true);
+pref("signon.expireMasterPassword",         false);
+pref("signon.SignonFileName", "signons.txt");
+
+pref("network.protocol-handler.external.mailto", true); // for mail
+pref("network.protocol-handler.external.news" , true); // for news 
+
+// By default, all protocol handlers are exposed.  This means that
+// the browser will respond to openURL commands for all URL types.
+// It will also try to open link clicks inside the browser before
+// failing over to the system handlers.
+pref("network.protocol-handler.expose-all", true);
+
+// Default security warning dialogs to off
+pref("security.warn_entering_secure", false);
+pref("security.warn_entering_weak", false);
+pref("security.warn_leaving_secure", false);
+pref("security.warn_viewing_mixed", false);
+pref("security.warn_submit_insecure", false);
--- a/mozilla/browser/app/profile/localstore.rdf
+++ b/mozilla/browser/app/profile/localstore.rdf
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<RDF:RDF
+     xmlns:NC="http://home.netscape.com/NC-rdf#"
+     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+</RDF:RDF>
--- a/mozilla/browser/app/profile/mac/mimeTypes.rdf
+++ b/mozilla/browser/app/profile/mac/mimeTypes.rdf
@@ -0,0 +1,319 @@
+<?xml version="1.0"?>  
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+     xmlns:NC="http://home.netscape.com/NC-rdf#"
+     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+  <Description about="urn:mimetypes"> 
+    <NC:MIME-types> 
+      <Seq about="urn:mimetypes:root"> 
+        <RDF:li resource="urn:mimetype:application/vnd.ms-excel"/>
+        <RDF:li resource="urn:mimetype:application/msword"/>
+        <RDF:li resource="urn:mimetype:application/vnd.ms-powerpoint"/>
+        <RDF:li resource="urn:mimetype:application/pdf"/>
+        <RDF:li resource="urn:mimetype:video/avi"/>
+        <RDF:li resource="urn:mimetype:video/quicktime"/>
+        <RDF:li resource="urn:mimetype:video/x-ms-wmv"/>
+        <RDF:li resource="urn:mimetype:video/x-ms-asf"/>
+        <RDF:li resource="urn:mimetype:video/mpeg"/>
+        <RDF:li resource="urn:mimetype:audio/x-pn-realaudio"/>
+        <RDF:li resource="urn:mimetype:audio/x-m4a"/>
+        <RDF:li resource="urn:mimetype:audio/x-mp3"/>
+        <RDF:li resource="urn:mimetype:audio/mpeg"/>
+        <RDF:li resource="urn:mimetype:audio/x-ms-wma"/>
+        <RDF:li resource="urn:mimetype:audio/wav"/>
+        <RDF:li resource="urn:mimetype:audio/mid"/>
+        <RDF:li resource="urn:mimetype:application/x-stuffit"/>
+        <RDF:li resource="urn:mimetype:application/x-zip-compressed"/>
+        <RDF:li resource="urn:mimetype:application/x-gzip"/>
+      </Seq> 
+    </NC:MIME-types> 
+  </Description> 
+    
+  <!-- Microsoft Excel -->     
+  <RDF:Description about="urn:mimetype:application/vnd.ms-excel"
+                   NC:value="application/vnd.ms-excel"
+                   NC:editable="true"
+                   NC:fileExtensions="xls"
+                   NC:description="Microsoft Excel Worksheet">
+    <NC:handlerProp resource="urn:mimetype:handler:application/vnd.ms-excel"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/vnd.ms-excel"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/vnd.ms-excel"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/vnd.ms-excel"
+                   NC:prettyName=""
+                   NC:path="" />
+
+  <!-- Microsoft Word -->
+  <RDF:Description about="urn:mimetype:application/msword"
+                   NC:value="application/msword"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:application/msword"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/msword"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/msword"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/msword"
+                   NC:prettyName=""
+                   NC:path="" />
+  
+  <!-- Microsoft Word -->
+  <RDF:Description about="urn:mimetype:application/vnd.ms-powerpoint"
+                   NC:value="application/vnd.ms-powerpoint"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:application/vnd.ms-powerpoint"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/vnd.ms-powerpoint"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/vnd.ms-powerpoint"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/vnd.ms-powerpoint"
+                   NC:prettyName=""
+                   NC:path="" />
+                   
+  <!-- Adobe Acrobat -->
+  <RDF:Description about="urn:mimetype:application/pdf"
+                   NC:value="application/pdf"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:application/pdf"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/pdf"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/pdf"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/pdf"
+                   NC:prettyName=""
+                   NC:path="" />                     
+
+  <!-- Stuffit Expander -->
+  <RDF:Description about="urn:mimetype:application/x-stuffit"
+                   NC:value="application/x-stuffit"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:application/x-stuffit"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/x-stuffit"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/x-stuffit"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/x-stuffit"
+                   NC:prettyName=""
+                   NC:path="" />                     
+
+  <!-- Zip Compressed --> 
+  <RDF:Description about="urn:mimetype:application/x-zip-compressed"
+                   NC:value="application/x-zip-compressed"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:application/x-zip-compressed"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/x-zip-compressed"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/x-zip-compressed"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/x-zip-compressed"
+                   NC:prettyName=""
+                   NC:path="" />        
+                   
+  <!-- GZIP Compressed -->
+  <RDF:Description about="urn:mimetype:application/x-gzip"
+                   NC:value="application/x-gzip"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:application/x-gzip"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/x-gzip"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/x-gzip"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/x-gzip"
+                   NC:prettyName=""
+                   NC:path="" />        
+
+  <!-- Video for Windows -->
+  <RDF:Description about="urn:mimetype:video/avi"
+                   NC:value="video/avi"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:video/avi"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:video/avi"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:video/avi"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:video/avi"
+                   NC:prettyName=""
+                   NC:path="" />                     
+  
+  <!-- Quicktime -->
+  <RDF:Description about="urn:mimetype:video/quicktime"
+                   NC:value="video/quicktime"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:video/quicktime"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:video/quicktime"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:video/quicktime"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:video/quicktime"
+                   NC:prettyName=""
+                   NC:path="" />                     
+  
+  <!-- Windows Media -->
+  <RDF:Description about="urn:mimetype:video/x-ms-wmv"
+                   NC:value="video/x-ms-wmv"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:video/x-ms-wmv"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:video/x-ms-wmv"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:video/x-ms-wmv"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:video/x-ms-wmv"
+                   NC:prettyName=""
+                   NC:path="" />                     
+    
+  <RDF:Description about="urn:mimetype:video/x-ms-asf"
+                   NC:value="video/x-ms-asf"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:video/x-ms-asf"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:video/x-ms-asf"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:video/x-ms-asf"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:video/x-ms-asf"
+                   NC:prettyName=""
+                   NC:path="" />                     
+      
+  <!-- MPEG Video -->
+  <RDF:Description about="urn:mimetype:video/mpeg"
+                   NC:value="video/mpeg"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:video/mpeg"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:video/mpeg"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:video/mpeg"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:video/mpeg"
+                   NC:prettyName=""
+                   NC:path="" />                     
+      
+  <!-- RealMedia -->
+  <RDF:Description about="urn:mimetype:audio/x-pn-realaudio"
+                   NC:value="audio/x-pn-realaudio"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/x-pn-realaudio"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/x-pn-realaudio"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/x-pn-realaudio"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/x-pn-realaudio"
+                   NC:prettyName=""
+                   NC:path="" />                     
+
+  <!-- MPEG4 -->
+  <RDF:Description about="urn:mimetype:audio/x-m4a"
+                   NC:value="audio/x-m4a"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/x-m4a"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/x-m4a"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/x-m4a"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/x-m4a"
+                   NC:prettyName=""
+                   NC:path="" />     
+
+  <!-- MP3 -->    
+  <RDF:Description about="urn:mimetype:audio/x-mp3"
+                   NC:value="audio/x-mp3"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/x-mp3"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/x-mp3"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/x-mp3"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/x-mp3"
+                   NC:prettyName=""
+                   NC:path="" />     
+
+  <!-- MPEG Audio --> 
+  <RDF:Description about="urn:mimetype:audio/mpeg"
+                   NC:value="audio/mpeg"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/mpeg"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/mpeg"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/mpeg"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/mpeg"
+                   NC:prettyName=""
+                   NC:path="" />     
+
+  <!-- Windows Media Audio --> 
+  <RDF:Description about="urn:mimetype:audio/x-ms-wma"
+                   NC:value="audio/x-ms-wma"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/x-ms-wma"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/x-ms-wma"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/x-ms-wma"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/x-ms-wma"
+                   NC:prettyName=""
+                   NC:path="" />     
+                   
+  <!-- WAV --> 
+  <RDF:Description about="urn:mimetype:audio/wav"
+                   NC:value="audio/wav"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/wav"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/wav"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/wav"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/wav"
+                   NC:prettyName=""
+                   NC:path="" />     
+
+  <!-- MIDI --> 
+  <RDF:Description about="urn:mimetype:audio/mid"
+                   NC:value="audio/mid"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/mid"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/mid"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/mid"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/mid"
+                   NC:prettyName=""
+                   NC:path="" />     
+
+</RDF>
--- a/mozilla/browser/app/profile/mimeTypes.rdf
+++ b/mozilla/browser/app/profile/mimeTypes.rdf
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>  
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:NC="http://home.netscape.com/NC-rdf#">
+
+  <Description about="urn:mimetypes"> 
+    <NC:MIME-types> 
+	    <Seq about="urn:mimetypes:root"> 
+	    </Seq> 
+    </NC:MIME-types> 
+  </Description> 
+</RDF>
--- a/mozilla/browser/app/profile/pagethemes.rdf
+++ b/mozilla/browser/app/profile/pagethemes.rdf
@@ -0,0 +1,23 @@
+<?xml version="1.0"?> <!-- -*- Mode: SGML -*- -->
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is Mozilla Communicator.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp. Portions created by Netscape Communications
+   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+   - Rights Reserved.
+   - 
+  --> 
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"/>
+
--- a/mozilla/browser/app/profile/search.rdf
+++ b/mozilla/browser/app/profile/search.rdf
@@ -0,0 +1,67 @@
+<?xml version="1.0"?> <!-- -*- Mode: SGML -*- -->
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is Mozilla Communicator.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp. Portions created by Netscape Communications
+   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): Robert John Churchill (rjc@netscape.com)
+  --> 
+
+
+<!DOCTYPE RDF 
+[
+<!ENTITY search.category.mozilla	"Mozilla">
+<!ENTITY search.category.web		"Web">
+]
+>
+
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:NC="http://home.netscape.com/NC-rdf#">
+
+
+<!-- search categories (under the "NC:SearchCategoryRoot" node) -->
+<!-- Note: these names SHOULD be localized via a DTD -->
+
+  <RDF:Seq about="NC:SearchCategoryRoot">
+  	<RDF:li>
+  		<RDF:Description about="urn:search:category:2">
+			<NC:title>&search.category.mozilla;</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:1">
+			<NC:title>&search.category.web;</NC:title>
+  		</RDF:Description>
+  	</RDF:li>
+  </RDF:Seq>
+
+
+<!-- engines per category (Note that specific prefixes are required) -->
+
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:1">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:NetscapeSearch.src" />
+    <RDF:li resource="NC:SearchCategory?engine=urn:search:engine:google.src" />
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:dmoz.src" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:2">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:mozilla.src" />
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:bugzilla.src" />
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:lxrmozilla.src" />
+  </RDF:Seq>
+
+</RDF:RDF>
--- a/mozilla/browser/app/profile/win/mimeTypes.rdf
+++ b/mozilla/browser/app/profile/win/mimeTypes.rdf
@@ -0,0 +1,272 @@
+<?xml version="1.0"?>  
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+     xmlns:NC="http://home.netscape.com/NC-rdf#"
+     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+  <Description about="urn:mimetypes"> 
+    <NC:MIME-types> 
+      <Seq about="urn:mimetypes:root"> 
+        <RDF:li resource="urn:mimetype:application/vnd.ms-excel"/>
+        <RDF:li resource="urn:mimetype:application/msword"/>
+        <RDF:li resource="urn:mimetype:application/vnd.ms-powerpoint"/>
+        <RDF:li resource="urn:mimetype:application/pdf"/>
+        <RDF:li resource="urn:mimetype:video/avi"/>
+        <RDF:li resource="urn:mimetype:video/quicktime"/>
+        <RDF:li resource="urn:mimetype:video/x-ms-wmv"/>
+        <RDF:li resource="urn:mimetype:video/x-ms-asf"/>
+        <RDF:li resource="urn:mimetype:video/mpeg"/>
+        <RDF:li resource="urn:mimetype:audio/x-pn-realaudio"/>
+        <RDF:li resource="urn:mimetype:audio/x-m4a"/>
+        <RDF:li resource="urn:mimetype:audio/x-mp3"/>
+        <RDF:li resource="urn:mimetype:audio/mpeg"/>
+        <RDF:li resource="urn:mimetype:audio/x-ms-wma"/>
+        <RDF:li resource="urn:mimetype:audio/wav"/>
+        <RDF:li resource="urn:mimetype:audio/mid"/>
+
+      </Seq> 
+    </NC:MIME-types> 
+  </Description> 
+    
+  <!-- Microsoft Excel -->     
+  <RDF:Description about="urn:mimetype:application/vnd.ms-excel"
+                   NC:value="application/vnd.ms-excel"
+                   NC:editable="true"
+                   NC:fileExtensions="xls"
+                   NC:description="Microsoft Excel Worksheet">
+    <NC:handlerProp resource="urn:mimetype:handler:application/vnd.ms-excel"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/vnd.ms-excel"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/vnd.ms-excel"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/vnd.ms-excel"
+                   NC:prettyName=""
+                   NC:path="" />
+
+  <!-- Microsoft Word -->
+  <RDF:Description about="urn:mimetype:application/msword"
+                   NC:value="application/msword"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:application/msword"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/msword"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/msword"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/msword"
+                   NC:prettyName=""
+                   NC:path="" />
+  
+  <!-- Microsoft Word -->
+  <RDF:Description about="urn:mimetype:application/vnd.ms-powerpoint"
+                   NC:value="application/vnd.ms-powerpoint"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:application/vnd.ms-powerpoint"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/vnd.ms-powerpoint"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/vnd.ms-powerpoint"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/vnd.ms-powerpoint"
+                   NC:prettyName=""
+                   NC:path="" />
+                   
+  <!-- Adobe Acrobat -->
+  <RDF:Description about="urn:mimetype:application/pdf"
+                   NC:value="application/pdf"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:application/pdf"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:application/pdf"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:application/pdf"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:application/pdf"
+                   NC:prettyName=""
+                   NC:path="" />                     
+
+  <!-- Video for Windows -->
+  <RDF:Description about="urn:mimetype:video/avi"
+                   NC:value="video/avi"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:video/avi"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:video/avi"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:video/avi"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:video/avi"
+                   NC:prettyName=""
+                   NC:path="" />                     
+  
+  <!-- Quicktime -->
+  <RDF:Description about="urn:mimetype:video/quicktime"
+                   NC:value="video/quicktime"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:video/quicktime"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:video/quicktime"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:video/quicktime"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:video/quicktime"
+                   NC:prettyName=""
+                   NC:path="" />                     
+  
+  <!-- Windows Media -->
+  <RDF:Description about="urn:mimetype:video/x-ms-wmv"
+                   NC:value="video/x-ms-wmv"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:video/x-ms-wmv"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:video/x-ms-wmv"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:video/x-ms-wmv"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:video/x-ms-wmv"
+                   NC:prettyName=""
+                   NC:path="" />                     
+    
+  <RDF:Description about="urn:mimetype:video/x-ms-asf"
+                   NC:value="video/x-ms-asf"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:video/x-ms-asf"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:video/x-ms-asf"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:video/x-ms-asf"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:video/x-ms-asf"
+                   NC:prettyName=""
+                   NC:path="" />                     
+      
+  <!-- MPEG Video -->
+  <RDF:Description about="urn:mimetype:video/mpeg"
+                   NC:value="video/mpeg"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:video/mpeg"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:video/mpeg"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:video/mpeg"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:video/mpeg"
+                   NC:prettyName=""
+                   NC:path="" />                     
+      
+  <!-- RealMedia -->
+  <RDF:Description about="urn:mimetype:audio/x-pn-realaudio"
+                   NC:value="audio/x-pn-realaudio"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/x-pn-realaudio"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/x-pn-realaudio"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/x-pn-realaudio"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/x-pn-realaudio"
+                   NC:prettyName=""
+                   NC:path="" />                     
+
+  <!-- MPEG4 -->
+  <RDF:Description about="urn:mimetype:audio/x-m4a"
+                   NC:value="audio/x-m4a"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/x-m4a"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/x-m4a"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/x-m4a"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/x-m4a"
+                   NC:prettyName=""
+                   NC:path="" />     
+
+  <!-- MP3 -->    
+  <RDF:Description about="urn:mimetype:audio/x-mp3"
+                   NC:value="audio/x-mp3"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/x-mp3"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/x-mp3"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/x-mp3"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/x-mp3"
+                   NC:prettyName=""
+                   NC:path="" />     
+
+  <!-- MPEG Audio --> 
+  <RDF:Description about="urn:mimetype:audio/mpeg"
+                   NC:value="audio/mpeg"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/mpeg"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/mpeg"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/mpeg"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/mpeg"
+                   NC:prettyName=""
+                   NC:path="" />     
+
+  <!-- Windows Media Audio --> 
+  <RDF:Description about="urn:mimetype:audio/x-ms-wma"
+                   NC:value="audio/x-ms-wma"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/x-ms-wma"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/x-ms-wma"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/x-ms-wma"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/x-ms-wma"
+                   NC:prettyName=""
+                   NC:path="" />     
+                   
+  <!-- WAV --> 
+  <RDF:Description about="urn:mimetype:audio/wav"
+                   NC:value="audio/wav"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/wav"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/wav"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/wav"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/wav"
+                   NC:prettyName=""
+                   NC:path="" />     
+
+  <!-- MIDI --> 
+  <RDF:Description about="urn:mimetype:audio/mid"
+                   NC:value="audio/mid"
+                   NC:editable="true">
+    <NC:handlerProp resource="urn:mimetype:handler:audio/mid"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:handler:audio/mid"
+                   NC:alwaysAsk="false"
+                   NC:useSystemDefault="true">
+    <NC:externalApplication resource="urn:mimetype:externalApplication:audio/mid"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mimetype:externalApplication:audio/mid"
+                   NC:prettyName=""
+                   NC:path="" />     
+
+</RDF>
--- a/mozilla/browser/app/splash.rc
+++ b/mozilla/browser/app/splash.rc
@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Bill Law       law@netscape.com
+ *   Jonathan Wilson <jonwil@tpgi.com.au>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include <windows.h>
+#include "nsINativeAppSupportWin.h"
+
+1 24 "MozillaFirebird.exe.manifest"
+
+// Program icon.
+IDI_APPLICATION ICON
+	"mozilla.ico"
+
+// Splash screen dialog.
+IDD_SPLASH DIALOGEX
+	DISCARDABLE
+	0,0,0,0
+	STYLE DS_SETFOREGROUND | DS_CENTER | WS_POPUP
+    EXSTYLE WS_EX_TOOLWINDOW
+	FONT 8, "MS Sans Serif"
+	BEGIN
+		CONTROL
+            		IDB_SPLASH,
+			IDB_SPLASH,
+			"Static",
+			SS_BITMAP,
+			0,0,0,0
+	END
+
+// Splash screen bitmap.
+// IDB_SPLASH BITMAP
+// 	"splash.bmp"
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_DDE_APPLICATION_NAME,            "Mozilla Firebird Debug"
+    IDS_STARTMENU_APPNAME,              "Mozilla Firebird Debug"
+END
+
+#ifdef MOZ_STATIC_BUILD
+
+// XXX This code is copied from resource.h and widget.rc.  It's a work-around
+// for the limitation that only one resource file can be used in an .exe.  We
+// should develop a method, for static builds only, to combine multiple .rc
+// files into a single .rc file, and then use that to build the single .res
+// file for the .exe.
+
+// We need this cursor for versions of Windows that don't support IDC_HAND,
+// namely Win95 and NT4.
+#define IDC_SELECTANCHOR 4100
+IDC_SELECTANCHOR CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\select.cur"
+
+#define IDC_ZOOMIN       4114
+IDC_ZOOMIN       CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\zoom_in.cur"
+#define IDC_ZOOMOUT      4115
+IDC_ZOOMOUT      CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\zoom_out.cur"
+
+#endif
--- a/mozilla/browser/app/splashos2.rc
+++ b/mozilla/browser/app/splashos2.rc
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *   Bill Law       law@netscape.com
+ *   IBM Corp.
+ */
+#include <os2.h>
+
+// Splash screen dialog ID.
+#define IDD_SPLASH  100
+
+// Splash screen bitmap ID.
+#define IDB_SPLASH  101
+
+// DDE application name
+#define ID_DDE_APPLICATION_NAME 102
+
+
+ICON 1 "mozos2.ico"
+
+DLGTEMPLATE IDD_SPLASH DISCARDABLE 
+BEGIN
+    DIALOG "", IDD_SPLASH, 0, 0, 390, 261, , FCF_BORDER
+    BEGIN
+    END
+END
+
+//BITMAP IDB_SPLASH "splash.bmp"
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_DDE_APPLICATION_NAME,            "Mozilla Firebird"
+END
--- a/mozilla/browser/base/Makefile.in
+++ b/mozilla/browser/base/Makefile.in
@@ -0,0 +1,39 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH   = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+# Use Pinstripe on MacOS X
+DIRS	+= skin/mac
+else
+# Use Qute on Windows and Linux
+DIRS    += skin 
+endif
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
--- a/mozilla/browser/base/content/about.png
+++ b/mozilla/browser/base/content/about.png
--- a/mozilla/browser/base/content/aboutDialog.xul
+++ b/mozilla/browser/base/content/aboutDialog.xul
@@ -0,0 +1,86 @@
+<?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
+
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Firebird about dialog.
+#
+# The Initial Developer of the Original Code is
+# Blake Ross (blaker@netscape.com).
+# Portions created by the Initial Developer are Copyright (C) 2002
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the LGPL or the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://browser/skin/aboutDialog.css" type="text/css"?> 
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % aboutDialogDTD SYSTEM "chrome://browser/locale/aboutDialog.dtd" >
+%aboutDialogDTD;
+]>
+
+<dialog xmlns:html="http://www.w3.org/1999/xhtml"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="aboutDialog"
+        buttons="accept"
+        onload="onLoad();"
+        title="&aboutDialog.title;"
+        style="width: 299px"> 
+    
+    <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+    <script type="application/x-javascript">
+      <![CDATA[
+        function onLoad() {
+          var userAgentField = document.getElementById("userAgent");
+          userAgentField.value = navigator.userAgent;
+        }
+      ]]>
+    </script>
+
+    <vbox flex="1" id="clientBox">
+      <image src="chrome://browser/content/about.png"/>
+      <vbox id="detailsBox" align="center" flex="1">
+        <separator class="thin"/>
+        <hbox align="center">
+          <label value="&brandFullName;" id="brandName"/>
+          <label value="&version;"/>
+        </hbox>
+        <spacer flex="1"/>
+        <textbox id="userAgent" multiline="true" readonly="true" cols="60" style="height: 5.1em"/>
+        <spacer flex="1"/>
+        <html:a onclick="visitLink(event);"
+                href="" id="copyright" link="&copyrightLink;"
+                style="display: block;">&copyright;</html:a>
+        <spacer flex="1"/>
+      </vbox>
+    </vbox>
+    
+    <separator class="groove" id="groove"/>
+</dialog>
--- a/mozilla/browser/base/content/browser-context.inc
+++ b/mozilla/browser/base/content/browser-context.inc
@@ -0,0 +1,214 @@
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is Mozilla.org Code.
+# 
+# The Initial Developer of the Original Code is.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
+    <popup id="contentAreaContextMenu"
+           onpopupshowing="if (event.target != this) return true; gContextMenu = new nsContextMenu( this ); return gContextMenu.shouldDisplay;"
+           onpopuphiding="if (event.target == this) gContextMenu = null;">
+      <menuitem id="context-openlink"
+                label="&openLinkCmd.label;"
+                accesskey="&openLinkCmd.accesskey;"
+                oncommand="gContextMenu.openLink();"/>
+      <menuitem id="context-openlinkintab"
+                label="&openLinkCmdInTab.label;"
+                accesskey="&openLinkCmdInTab.accesskey;"
+                oncommand="gContextMenu.openLinkInTab();"/>
+      <menuseparator id="context-sep-open"/>
+      <menuitem id="context-bookmarklink"
+                label="&bookmarkLinkCmd.label;"
+                accesskey="&bookmarkLinkCmd.accesskey;"
+                oncommand="BookmarksUtils.addBookmark(gContextMenu.linkURL(),
+                                                      gContextMenu.linkText());"/>
+      <menuitem id="context-savelink"
+                label="&saveLinkCmd.label;"
+                accesskey="&saveLinkCmd.accesskey;"
+                oncommand="gContextMenu.saveLink();"/>
+      <menuitem id="context-sendlink"
+                label="&sendLinkCmd.label;"
+                accesskey="&sendLinkCmd.accesskey;"
+                oncommand="gContextMenu.sendLink();"/>
+      <menuitem id="context-copyemail"
+                label="&copyEmailCmd.label;"
+                accesskey="&copyEmailCmd.accesskey;"
+                oncommand="gContextMenu.copyEmail();"/>
+      <menuitem id="context-copylink"
+                label="&copyLinkCmd.label;"
+                accesskey="&copyLinkCmd.accesskey;"
+                command="cmd_copyLink"/>
+      <menuseparator id="context-sep-copylink"/>
+      <menuitem id="context-viewimage"
+                label="&viewImageCmd.label;"
+                accesskey="&viewImageCmd.accesskey;"
+                oncommand="gContextMenu.viewImage();"/>
+      <menuitem id="context-copyimage"
+                label="&copyImageCmd.label;"
+                accesskey="&copyImageCmd.accesskey;"
+                command="cmd_copyImageLocation"/>
+      <menuseparator id="context-sep-copyimage"/>
+      <menuitem id="context-saveimage"
+                label="&saveImageCmd.label;"
+                accesskey="&saveImageCmd.accesskey;"
+                oncommand="gContextMenu.saveImage();"/>
+      <menuitem id="context-sendimage"  
+                label="&sendImageCmd.label;" 
+                accesskey="&sendImageCmd.accesskey;" 
+                oncommand="gContextMenu.sendImage();"/>
+      <menuitem id="context-setWallpaper"
+                label="&setWallpaperCmd.label;"
+                accesskey="&setWallpaperCmd.accesskey;"
+                oncommand="gContextMenu.setWallpaper();"/>
+
+<!--XXXBlake XUL sucks! We need autocheck for menuitems. -->
+      <menuitem id="context-blockimage" class="menuitem-iconic"
+                oncommand="gContextMenu.toggleImageBlocking(this.getAttribute('checked') != 'true');"/>
+      <menuitem id="context-back"
+                label="&backCmd.label;"
+                accesskey="&backCmd.accesskey;"
+                command="Browser:Back"/>
+      <menuitem id="context-forward"
+                label="&forwardCmd.label;"
+                accesskey="&forwardCmd.accesskey;"
+                command="Browser:Forward"/>
+      <menuitem id="context-reload"
+                label="&reloadCmd.label;"
+                accesskey="&reloadCmd.accesskey;"
+                oncommand="BrowserReload();"/>
+      <menuitem id="context-stop"
+                label="&stopCmd.label;"
+                accesskey="&stopCmd.accesskey;"
+                command="Browser:Stop"/>
+      <menuseparator id="context-sep-stop"/>
+      <menuitem id="context-bookmarkpage"
+                label="&bookmarkPageCmd.label;"
+                accesskey="&bookmarkPageCmd.accesskey;"
+                oncommand="addBookmarkAs(document.getElementById('content'));"/>
+      <menuitem id="context-savepage"
+                label="&savePageCmd.label;"
+                accesskey="&savePageCmd.accesskey;"
+                oncommand="saveDocument(window._content.document);"/>
+      <menuitem id="context-sendpage"  
+                label="&sendPageCmd.label;" 
+                accesskey="&sendPageCmd.accesskey;" 
+                command="Browser:SendLink"/>
+      <menuseparator id="context-sep-viewbgimage"/>  
+      <menuitem id="context-viewbgimage"
+                label="&viewBGImageCmd.label;"
+                accesskey="&viewBGImageCmd.accesskey;"
+                oncommand="gContextMenu.viewBGImage();"/>
+      <menuitem id="context-undo"
+                label="&undoCmd.label;"
+                accesskey="&undoCmd.accesskey;"
+                command="cmd_undo"/>
+      <menuseparator id="context-sep-undo"/>
+      <menuitem id="context-cut"
+                label="&cutCmd.label;"
+                accesskey="&cutCmd.accesskey;"
+                command="cmd_cut"/>
+      <menuitem id="context-copy"
+                label="&copyCmd.label;"
+                accesskey="&copyCmd.accesskey;"
+                command="cmd_copy"/>
+      <menuitem id="context-paste"
+                label="&pasteCmd.label;"
+                accesskey="&pasteCmd.accesskey;"
+                command="cmd_paste"/>
+      <menuitem id="context-delete"
+                label="&deleteCmd.label;"
+                accesskey="&deleteCmd.accesskey;"
+                command="cmd_delete"/>
+      <menuseparator id="context-sep-paste"/>
+      <menuitem id="context-selectall"
+                label="&selectAllCmd.label;"
+                accesskey="&selectAllCmd.accesskey;"
+                command="cmd_selectAll"/>      
+      <menuseparator id="context-sep-selectall"/>
+      <menuitem id="context-searchselect"
+                accesskey="&search.accesskey;"
+                oncommand="OpenSearch('internet', gContextMenu.searchSelected(), true);"/>
+      <menuseparator id="frame-sep"/>
+      <menu id="frame" label="&thisFrameMenu.label;" accesskey="&thisFrameMenu.accesskey;">
+        <menupopup>
+          <menuitem label="&showOnlyThisFrameCmd.label;"
+                    accesskey="&showOnlyThisFrameCmd.accesskey;"
+                    oncommand="gContextMenu.showOnlyThisFrame();"/>
+          <menuitem label="&openFrameCmd.label;"
+                    accesskey="&openFrameCmd.accesskey;"
+                    oncommand="gContextMenu.openFrame();"/>
+          <menuitem label="&openFrameCmdInTab.label;"
+                    accesskey="&openFrameCmdInTab.accesskey;"
+                    oncommand="gContextMenu.openFrameInTab();"/>
+          <menuseparator/>
+          <menuitem label="&reloadFrameCmd.label;"
+                    accesskey="&reloadFrameCmd.accesskey;"
+                    oncommand="gContextMenu.reloadFrame();"/>
+          <menuseparator/>
+          <menuitem label="&bookmarkFrameCmd.label;"
+                    accesskey="&bookmarkFrameCmd.accesskey;"
+                    oncommand="gContextMenu.addBookmarkForFrame();"/>
+          <menuitem label="&saveFrameCmd.label;"
+                    accesskey="&saveFrameCmd.accesskey;"
+                    oncommand="saveDocument(gContextMenu.target.ownerDocument);"/>
+          <menuseparator/>
+          <menuitem label="&viewFrameSourceCmd.label;"
+                    accesskey="&viewFrameSourceCmd.accesskey;"
+                    oncommand="gContextMenu.viewFrameSource();"/>
+          <menuitem label="&viewFrameInfoCmd.label;"
+                    accesskey="&viewFrameInfoCmd.accesskey;"
+                    oncommand="gContextMenu.viewFrameInfo();"/>        
+        </menupopup>
+      </menu>
+      <menuseparator id="context-sep-properties"/>
+      <menuitem id="context-viewpartialsource-selection"
+                label="&viewPartialSourceForSelectionCmd.label;"
+                accesskey="&viewPartialSourceCmd.accesskey;"
+                oncommand="gContextMenu.viewPartialSource('selection');"/>
+      <menuitem id="context-viewpartialsource-mathml"
+                label="&viewPartialSourceForMathMLCmd.label;"
+                accesskey="&viewPartialSourceCmd.accesskey;"
+                oncommand="gContextMenu.viewPartialSource('mathml');"/>
+      <menuitem id="context-viewsource"
+                label="&viewPageSourceCmd.label;"
+                accesskey="&viewPageSourceCmd.accesskey;"
+                oncommand="BrowserViewSourceOfDocument(_content.document);"/>
+      <menuitem id="context-viewinfo"
+                label="&viewPageInfoCmd.label;"
+                accesskey="&viewPageInfoCmd.accesskey;"
+                oncommand="gContextMenu.viewInfo();"/>
+      <menuitem id="context-metadata"
+                label="&metadataCmd.label;"
+                accesskey="&metadataCmd.accesskey;"
+                oncommand="gContextMenu.showMetadata();"/>
+    </popup>
+    
+    
--- a/mozilla/browser/base/content/browser-doctype.inc
+++ b/mozilla/browser/base/content/browser-doctype.inc
@@ -0,0 +1,11 @@
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
+%browserDTD;
+<!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd">
+%globalRegionDTD;
+<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" >
+%charsetDTD;
+]>
+
--- a/mozilla/browser/base/content/browser-gotreehack.inc
+++ b/mozilla/browser/base/content/browser-gotreehack.inc
@@ -0,0 +1,23 @@
+  <!-- Total hack. Used by the Go menu to build up items. -->
+  <tree id="hiddenHistoryTree" hidden="true" collapsed="true" datasources="rdf:null"
+        flags="dont-build-content"
+        hidecolumnpicker="true">
+    <template>
+      <rule>
+        <treechildren>
+          <treeitem uri="rdf:*" rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
+            <treerow>
+              <treecell label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+              <treecell label="rdf:http://home.netscape.com/NC-rdf#Date" hidden="true"/>
+            </treerow>
+          </treeitem>
+        </treechildren>
+      </rule>
+    </template>
+    <treecols id="hiddenHistoryTreeCols">
+      <treecol flex="1" id="Name"
+               hideheader="true" primary="true"/>
+      <treecol id="Date" hidden="true" hideheader="true"
+               sort="rdf:http://home.netscape.com/NC-rdf#Date" sortActive="true" sortDirection="descending"/>
+    </treecols>
+  </tree>
--- a/mozilla/browser/base/content/browser-menubar.inc
+++ b/mozilla/browser/base/content/browser-menubar.inc
@@ -0,0 +1,417 @@
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is Mozilla.org Code.
+# 
+# The Initial Developer of the Original Code is.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
+       <menubar id="main-menubar" statusbar="statusbar-display"
+                style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
+            <menu label="&fileMenu.label;"
+                  accesskey="&fileMenu.accesskey;">
+              <menupopup id="menu_FilePopup" onpopupshowing="getContentAreaFrameCount();">
+                <menuitem label="&newNavigatorCmd.label;"
+                          accesskey="&newNavigatorCmd.accesskey;"
+                          key="key_newNavigator"
+                          command="cmd_newNavigator"/>
+                <menuitem command="cmd_newNavigatorTab" key="key_newNavigatorTab"
+                          label="&tabCmd.label;" accesskey="&tabCmd.accesskey;"/>
+                <menuitem label="&openFileCmd.label;" accesskey="&openFileCmd.accesskey;" key="openFileKb" command="Browser:OpenFile"/>
+                <menuitem id="menu_close" label="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" command="cmd_close"/>
+                <menuitem id="menu_closeWindow" hidden="true" command="cmd_closeWindow" key="key_closeWindow" label="&closeWindow.label;"/>
+                <menuseparator/>
+                <menuitem label="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;" key="key_savePage" command="Browser:SavePage"/>
+                <menuitem id="menu_saveFrame" label="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" oncommand="saveFrameDocument();" hidden="true"/>
+                <menuitem id="menu_sendLink"  label="&sendPageCmd.label;"  accesskey="&sendPageCmd.accesskey;"  command="Browser:SendLink"/>
+                <menuseparator/>
+                <menuitem label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" oncommand="PrintUtils.showPageSetup();"/>
+                <menuitem label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" oncommand="PrintUtils.printPreview(onEnterPrintPreview, onExitPrintPreview);"/>
+                <menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" key="printKb" command="cmd_print"/>
+                <menuseparator/>
+                <menuitem label="&import.label;" accesskey="&import.accesskey;" oncommand="BrowserImport();"/>
+#ifndef XP_MACOSX
+                <menuseparator/>
+#endif
+                <menuitem id="goOfflineMenuitem"
+                          label="&goOfflineCmd.label;" accesskey="&goOfflineCmd.accesskey;" 
+                          type="checkbox" oncommand="BrowserOffline.toggleOfflineStatus();"/>
+                <menuitem id="menu_FileQuitItem" 
+#ifdef XP_WIN
+			  label="&quitApplicationCmdWin.label;"
+			  accesskey="&quitApplicationCmdWin.accesskey;"
+#else
+			  label="&quitApplicationCmd.label;" 
+			  accesskey="&quitApplicationCmd.accesskey;" 
+#endif
+			  oncommand="goQuitApplication();"/>
+              </menupopup>
+            </menu>
+  
+            <menu label="&editMenu.label;"
+                  accesskey="&editMenu.accesskey;">
+              <menupopup id="menu_EditPopup">
+                <menuitem label="&undoCmd.label;"
+                          key="key_undo"
+                          accesskey="&undoCmd.accesskey;"
+                          command="cmd_undo"/>
+                <menuitem label="&redoCmd.label;"
+                          key="key_redo"
+                          accesskey="&redoCmd.accesskey;"
+                          command="cmd_redo"/>
+                <menuseparator/>
+                <menuitem label="&cutCmd.label;"
+                          key="key_cut"
+                          accesskey="&cutCmd.accesskey;"
+                          command="cmd_cut"/>
+                <menuitem label="&copyCmd.label;"
+                          key="key_copy"
+                          accesskey="&copyCmd.accesskey;"
+                          command="cmd_copy"/>
+                <menuitem label="&pasteCmd.label;"
+                          key="key_paste"
+                          accesskey="&pasteCmd.accesskey;"
+                          command="cmd_paste"/>
+                <menuitem label="&deleteCmd.label;"
+                          key="key_delete"
+                          accesskey="&deleteCmd.accesskey;"
+                          command="cmd_delete"/>
+                <menuseparator/>
+                <menuitem label="&selectAllCmd.label;"
+                          key="key_selectAll"
+                          accesskey="&selectAllCmd.accesskey;"
+                          command="cmd_selectAll"/>
+                <menuseparator/>
+                <menuitem label="&findOnCmd.label;" accesskey="&findOnCmd.accesskey;" key="key_find" command="cmd_find"/>
+                <menuitem label="&findAgainCmd.label;" accesskey="&findAgainCmd.accesskey;" key="key_findAgain" command="cmd_findAgain"/>
+              </menupopup>
+            </menu>
+  
+            <menu label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
+              <menupopup id="menu_viewPopup">
+                <menu label="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;"
+                      onpopupshowing="onViewToolbarsPopupShowing(event);">
+                  <menupopup onpopupshowing="updateToolbarStates(this);"> 
+                    <menuseparator/>
+                      <menuitem label="&viewCustomizeToolbar.label;" accesskey="&viewCustomizeToolbar.accesskey;"
+                                command="cmd_CustomizeToolbars"/>             
+                  </menupopup>
+                </menu>
+                <menuitem id="toggle_taskbar" label="&taskbarCmd.label;" accesskey="&taskbarCmd.accesskey;" type="checkbox" oncommand="goToggleToolbar('status-bar','toggle_taskbar');" checked="true" />
+                <menu label="&viewSidebarMenu.label;"
+                      accesskey="&viewSidebarMenu.accesskey;">
+                  <menupopup id="viewSidebarMenu">
+                    <menuitem key="viewBookmarksSidebarKb" observes="viewBookmarksSidebar"/>
+                    <menuitem key="key_gotoHistory" observes="viewHistorySidebar"/>
+                  </menupopup>
+                </menu>            
+                <menuseparator/>
+                <menuitem label="&stopCmd.label;" accesskey="&stopCmd.accesskey;" command="Browser:Stop" key="key_stop"/>
+                <menuitem accesskey="&reloadCmd.accesskey;" key="key_reload" label="&reloadCmd.label;" oncommand="BrowserReload();"/>
+                <menuseparator/>
+                <menuitem key="key_textZoomEnlarge" label="&textZoomEnlargeCmd.label;" accesskey="&textZoomEnlargeCmd.accesskey;"
+                          command="cmd_textZoomEnlarge"/>
+                <menuitem key="key_textZoomReduce"  label="&textZoomReduceCmd.label;"  accesskey="&textZoomReduceCmd.accesskey;"
+                          command="cmd_textZoomReduce"/>
+                <menu label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;"
+                      datasources="rdf:charset-menu" ref="NC:BrowserCharsetMenuRoot"
+                      oncommand="MultiplexHandler(event)" onpopupshowing="CreateMenu('browser');UpdateMenus(event)" onpopupshown="CreateMenu('more-menu');">
+                    <template>
+                        <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
+                            <menupopup>
+                            <menuseparator uri="..." />
+                            </menupopup>
+                        </rule>
+                        <rule>
+                            <menupopup>
+                            <menuitem type="radio" name="charsetGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                            </menupopup>
+                        </rule>
+                    </template>
+      
+                    <menupopup>
+                    <menu label="&charsetMenuAutodet.label;" accesskey="&charsetMenuAutodet.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserAutodetMenuRoot">
+                        <template>
+                            <rule rdf:type="http://home.netscape.com/NC-rdf#CharsetDetector">
+                                <menupopup>
+                                <menuitem type="radio" name="detectorGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                </menupopup>
+                            </rule>
+                        </template>
+                        <menupopup>
+                        </menupopup>
+                    </menu>
+                    <menu label="&charsetMenuMore.label;" accesskey="&charsetMenuMore.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMoreCharsetMenuRoot">
+                        <template>
+                            <rule>
+                                <menupopup>
+                                <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                </menupopup>
+                            </rule>
+                        </template>
+                        <menupopup>
+                            <menu label="&charsetMenuMore1.label;" accesskey="&charsetMenuMore1.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore1CharsetMenuRoot">
+                                <template>
+                                    <rule>
+                                        <menupopup>
+                                        <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                        </menupopup>
+                                    </rule>
+                                </template>
+                                <menupopup>
+                                </menupopup>
+                            </menu>
+                            <menu label="&charsetMenuMore2.label;" accesskey="&charsetMenuMore2.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore2CharsetMenuRoot">
+                                <template>
+                                    <rule>
+                                        <menupopup>
+                                        <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                        </menupopup>
+                                    </rule>
+                                </template>
+                                <menupopup>
+                                </menupopup>
+                            </menu>
+                            <menu label="&charsetMenuMore3.label;" accesskey="&charsetMenuMore3.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore3CharsetMenuRoot">
+                                <template>
+                                    <rule>
+                                        <menupopup>
+                                        <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                        </menupopup>
+                                    </rule>
+                                </template>
+                                <menupopup>
+                                </menupopup>
+                            </menu>
+                            <menu label="&charsetMenuMore4.label;" accesskey="&charsetMenuMore4.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore4CharsetMenuRoot">
+                                <template>
+                                    <rule>
+                                        <menupopup>
+                                        <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                        </menupopup>
+                                    </rule>
+                                </template>
+                                <menupopup>
+                                </menupopup>
+                            </menu>
+                            <menu label="&charsetMenuMore5.label;" accesskey="&charsetMenuMore5.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore5CharsetMenuRoot">
+                                <template>
+                                    <rule>
+                                        <menupopup>
+                                        <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                        </menupopup>
+                                    </rule>
+                                </template>
+                                <menupopup>
+                                </menupopup>
+                            </menu>
+                            <menuseparator />
+                        </menupopup>
+                    </menu>
+                    <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
+                    </menupopup>
+                </menu>
+                <menuseparator/>
+                <menuitem accesskey="&pageSourceCmd.accesskey;" label="&pageSourceCmd.label;" key="key_viewSource" command="View:PageSource"/>
+                  <menuitem accesskey="&fullScreenCmd.accesskey;"
+                            label="&fullScreenCmd.label;" key="key_fullScreen"
+                            command="View:FullScreen"/>
+              </menupopup>
+            </menu>
+  
+            <menu label="&goMenu.label;" accesskey="&goMenu.accesskey;" oncommand="var url = event.target.getAttribute('statustext'); if (url) openTopWin(url);">
+              <menupopup id="goPopup" onpopupshowing="updateGoMenu(this);" onpopuphiding="onGoMenuHidden();">
+                <menuitem label="&backCmd.label;"    accesskey="&backCmd.accesskey;"    key="goBackKb"    command="Browser:Back"/>
+                <menuitem label="&forwardCmd.label;" accesskey="&forwardCmd.accesskey;" key="goForwardKb" command="Browser:Forward"/>
+                <menuitem label="&goHomeCmd.label;"    accesskey="&goHomeCmd.accesskey;"    command="Browser:Home" key="goHome"/>
+                <menuseparator id="startHistorySeparator"/>
+                <menuseparator hidden="true" id="endHistorySeparator"/>
+                <menuitem accesskey="&historyCmd.accesskey;" command="viewHistorySidebar" key="key_gotoHistory"/>
+              </menupopup>
+            </menu>
+
+            <menu id="bookmarks-menu" label="&bookmarksMenu.label;" accesskey="&bookmarksMenu.accesskey;"
+                  datasources="rdf:bookmarks rdf:files rdf:localsearch" 
+                  ref="NC:BookmarksRoot" flags="dont-test-empty"
+                  template='bookmarks-template'
+                  onpopupshowing="BookmarksMenu.showOpenInTabsMenuItem(event.target)"
+                  onpopuphidden="BookmarksMenu.hideOpenInTabsMenuItem(event.target)"
+                  oncommand="BookmarksMenu.loadBookmark(event, event.target, this.database)"
+                  onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
+                  ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
+                  ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
+                  ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
+                  ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
+                  ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
+              <menupopup contextmenu='bookmarks-context-menu'>
+                <menuitem key="addBookmarkAsKb"
+                          label="&addCurPageAsCmd.label;"
+                          accesskey="&addCurPageAsCmd.accesskey;"
+                          command="Browser:AddBookmarkAs"/>
+                <menuitem key="manBookmarkKb" 
+                          label="&manBookmarksCmd.label;"
+                          accesskey="&manBookmarksCmd.accesskey;"    
+                          oncommand="toOpenWindowByType('bookmarks:manager', 'chrome://browser/content/bookmarks/bookmarksManager.xul');"/>
+                <menuseparator/>
+              </menupopup>
+            </menu>
+        
+          <menu label="&toolsMenu.label;" accesskey="&toolsMenu.accesskey;">
+            <menupopup id="menu_ToolsPopup">
+              <menuitem label="&downloads.label;" accesskey="&downloads.accesskey;" 
+                        key="key_openDownloads" command="Tools:Downloads"/>
+              <menuseparator id="devToolsSeparator"/>
+              <menuitem id="javascriptConsole" 
+                        label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" 
+                        oncommand="toJavaScriptConsole();"/>
+              <menuitem accesskey="&pageInfoCmd.accesskey;" label="&pageInfoCmd.label;"   
+                        key="key_viewInfo" command="View:PageInfo"/>
+#ifndef XP_MACOSX
+              <menuseparator id="prefSep"/>
+#endif
+              <menuitem id="menu_preferences"
+                        label="&preferencesCmd.label;"
+                        accesskey="&preferencesCmd.accesskey;"
+                        oncommand="openPreferences();"/>
+            </menupopup>
+          </menu>
+    
+#ifdef XP_MACOSX
+        <menu id="windowMenu" label="&windowMenu.label;"
+            datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
+            onpopupshown="checkFocusedWindow();">
+            <template>
+            <rule>
+                <menupopup>
+                <menuitem uri="rdf:*" label="rdf:http://home.netscape.com/NC-rdf#Name" type="radio"
+                            oncommand="ShowWindowFromResource(event.target)"/>
+                </menupopup>
+            </rule>
+            </template>
+            <menupopup id="windowPopup">
+              <menuitem label="&zoomWindow.label;" disabled="true"/>
+              <menuitem command="minimizeWindow" key="key_minimizeWindow"/>
+              <menuseparator/>
+              <menuitem label="&bringAllToFront.label;" disabled="true"/>
+              <menuseparator id="sep-window-list"/>
+            </menupopup>
+        </menu>
+#endif
+
+#ifdef XP_WIN
+          <menu label="&helpMenuWin.label;"
+                accesskey="&helpMenuWin.accesskey;">
+#else
+          <menu label="&helpMenu.label;"
+                accesskey="&helpMenu.accesskey;">
+#endif
+            <menupopup id="menu_HelpPopup">
+              <menuitem accesskey="&releaseCmd.accesskey;"
+                        label="&releaseCmd.label;"
+                        oncommand="openTopWin('&releaseURL;');"/>
+              <menuseparator/>
+              <menuitem id="aboutName"
+                        accesskey="&aboutCmd.accesskey;"
+                        label="&aboutCmd.label;"
+                        oncommand="openAboutDialog();"/>
+            </menupopup>
+          </menu>
+        </menubar>
+
+
+<template id='bookmarks-template' xmlns:nc="http://home.netscape.com/NC-rdf#">
+    <rule parent="hbox" rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
+      <toolbarseparator uri="rdf:*"
+                        rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
+    </rule>
+    <!-- yes, the type attribute is necessary otherwise all leaves are 
+         treated as containers for some reason -->
+    <rule parent="hbox" iscontainer="true" isempty="true"
+          rdf:type="http://home.netscape.com/NC-rdf#Folder">
+      <toolbarbutton type="menu" editable="true" class="bookmark-item"
+                     rdf:type="http://home.netscape.com/NC-rdf#Folder"
+                     uri="rdf:*" label="rdf:http://home.netscape.com/NC-rdf#Name">
+        <menupopup>
+          <menuitem label="&emptyItem.label;" disabled="true"/>
+        </menupopup>
+      </toolbarbutton>
+    </rule>
+    <rule parent="hbox" iscontainer="true">
+      <toolbarbutton type="menu" class="bookmark-item" uri="rdf:*" editable="true"
+                     rdf:type="http://home.netscape.com/NC-rdf#Folder"
+                     label="rdf:http://home.netscape.com/NC-rdf#Name">
+        <menupopup contextmenu="bookmarks-context-menu"/>
+      </toolbarbutton>
+    </rule>
+    <rule parent="hbox">
+      <toolbarbutton class="bookmark-item" uri="rdf:*" editable="true" 
+                     status="rdf:http://home.netscape.com/WEB-rdf#status"
+                     rdf:type="http://home.netscape.com/NC-rdf#Bookmark"
+                     image="rdf:http://home.netscape.com/NC-rdf#Icon"
+                     statustext="rdf:http://home.netscape.com/NC-rdf#URL"
+                     tooltip="btTooltip"
+                     label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+    </rule>
+    <rule iscontainer="true" isempty="true"
+          rdf:type="http://home.netscape.com/NC-rdf#Folder">
+      <menupopup>
+        <menu class="menu-iconic bookmark-item" uri="rdf:*" 
+              type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+              label="rdf:http://home.netscape.com/NC-rdf#Name">
+          <menupopup>
+            <menuitem label="&emptyItem.label;" disabled="true"/>
+          </menupopup>
+        </menu>
+      </menupopup>
+    </rule>
+    <rule iscontainer="true">
+      <menupopup>
+        <menu class="menu-iconic bookmark-item" uri="rdf:*"
+              label="rdf:http://home.netscape.com/NC-rdf#Name"
+              type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
+          <menupopup contextmenu="bookmarks-context-menu"/>
+        </menu>
+      </menupopup>
+    </rule>
+    <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
+      <menupopup> 
+        <menuseparator uri="rdf:*" />
+      </menupopup>
+    </rule>
+    <rule>
+      <menupopup>
+        <menuitem class="menuitem-iconic bookmark-item" uri="rdf:*"
+                  label="rdf:http://home.netscape.com/NC-rdf#Name" 
+                  image="rdf:http://home.netscape.com/NC-rdf#Icon"
+                  status="rdf:http://home.netscape.com/WEB-rdf#status"
+                  statustext="rdf:http://home.netscape.com/NC-rdf#URL"/>
+      </menupopup>
+    </rule>
+  </template>
--- a/mozilla/browser/base/content/browser-scripts.inc
+++ b/mozilla/browser/base/content/browser-scripts.inc
@@ -0,0 +1,48 @@
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is Mozilla.org Code.
+# 
+# The Initial Developer of the Original Code is.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Ben Goodger <ben@bengoodger.com> (v2.0) 
+#   Blake Ross <blakeross@telocity.com>
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
+<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+<script type="application/x-javascript" src="chrome://global/content/findUtils.js"/>
+<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksMenu.js"/>
+<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/contentAreaUtils.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
+
--- a/mozilla/browser/base/content/browser-sets.inc
+++ b/mozilla/browser/base/content/browser-sets.inc
@@ -0,0 +1,267 @@
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is Mozilla.org Code.
+# 
+# The Initial Developer of the Original Code is.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Ben Goodger <ben@bengoodger.com> (v2.0) 
+#   Blake Ross <blakeross@telocity.com>
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
+  <stringbundleset id="stringbundleset"> 
+    <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
+    <stringbundle id="bundle_browser_region" src="chrome://browser-region/locale/region.properties"/>
+    <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
+  </stringbundleset>
+
+  <commandset commandupdater="true"
+              events="focus"
+              oncommandupdate="goUpdateGlobalEditMenuItems()"/>
+  <commandset commandupdater="true"
+              events="select"
+              oncommandupdate="goUpdateSelectEditMenuItems()"/>
+  <commandset commandupdater="true"
+              events="undo"
+              oncommandupdate="goUpdateUndoEditMenuItems()"/>
+  <commandset commandupdater="true"
+              events="clipboard"
+              oncommandupdate="goUpdatePasteMenuItems()"/>
+  
+  <commandset id="mainCommandSet">
+    <command id="cmd_newNavigator"                 oncommand="OpenBrowserWindow()"/>
+    <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
+    <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
+    <command id="cmd_bm_openinnewtab"              oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
+    <command id="cmd_bm_expandfolder"              oncommand="goDoCommand('cmd_bm_expandfolder');"/>
+    <command id="cmd_bm_openfolder"                oncommand="goDoCommand('cmd_bm_openfolder');"/>
+    <command id="cmd_bm_managefolder"              oncommand="goDoCommand('cmd_bm_managefolder');"/>
+    <command id="cmd_bm_newfolder"                 oncommand="goDoCommand('cmd_bm_newfolder');"/>
+    <command id="cmd_bm_newbookmark"               oncommand="goDoCommand('cmd_bm_newbookmark');"/>
+    <command id="cmd_bm_newseparator"              oncommand="goDoCommand('cmd_bm_newseparator');"/>
+    <command id="cmd_bm_properties"                oncommand="goDoCommand('cmd_bm_properties');"/>
+    <command id="cmd_bm_rename"                    oncommand="goDoCommand('cmd_bm_rename');"/>
+    <command id="cmd_bm_moveBookmark"              oncommand="goDoCommand('cmd_bm_moveBookmark');"/>
+
+#ifdef XP_WIN
+    <command id="cmd_handleBackspace"  oncommand="BrowserHandleBackspace();" />
+#endif
+
+    <command id="cmd_newNavigatorTab" oncommand="BrowserOpenTab();"/>
+    <command id="Browser:OpenFile"  oncommand="BrowserOpenFileWindow();"/>
+    <command id="Browser:SavePage" oncommand="saveDocument(window._content.document);"/>
+    <command id="Browser:SendLink" oncommand="sendLink(Components.lookupMethod(window._content, 'location').call(window._content).href,
+                                              Components.lookupMethod(window._content.document, 'title').call(window._content.document));"/>
+    <command id="cmd_print" oncommand="PrintUtils.print();"/>
+    <command id="cmd_close" oncommand="BrowserCloseTabOrWindow()"/>
+    <command id="cmd_closeWindow" oncommand="BrowserCloseWindow()"/>
+    <command id="cmd_CustomizeToolbars" oncommand="BrowserCustomizeToolbar()"/>
+  
+    <command id="cmd_copyLink"
+             oncommand="goDoCommand('cmd_copyLink')"
+             disabled="false"/>
+    <command id="cmd_copyImageLocation"
+             oncommand="goDoCommand('cmd_copyImageLocation')"
+             disabled="false"/>
+    <command id="cmd_copyImageContents"
+             oncommand="goDoCommand('cmd_copyImageContents')"
+             disabled="false"/>
+    <command id="cmd_undo" 
+             oncommand="goDoCommand('cmd_undo')"
+             disabled="true"/>
+    <command id="cmd_redo" 
+             oncommand="goDoCommand('cmd_redo')"
+             disabled="true"/>
+    <command id="cmd_cut" 
+             oncommand="goDoCommand('cmd_cut')"
+             disabled="true"/>
+    <command id="cmd_copy" 
+             oncommand="goDoCommand('cmd_copy')"
+             disabled="true"/>
+    <command id="cmd_paste" 
+             oncommand="goDoCommand('cmd_paste')"
+             disabled="true"/>
+    <command id="cmd_delete"
+             oncommand="goDoCommand('cmd_delete')"
+             valueDefault="&deleteCmd.label;"
+             disabled="true"/>
+    <command id="cmd_selectAll"
+             oncommand="goDoCommand('cmd_selectAll')"
+             disabled="true"/>
+
+    <command id="View:PageSource" oncommand="BrowserViewSourceOfDocument(_content.document);"/>
+    <command id="View:PageInfo" oncommand="BrowserPageInfo();"/>
+    <command id="View:FullScreen" oncommand="BrowserFullScreen();"/>
+    <command id="cmd_find" oncommand="getBrowser().find();"/>
+    <command id="cmd_findAgain" oncommand="getBrowser().findAgain();"/>
+    <command id="cmd_findPrevious" oncommand="getBrowser().findPrevious();"/>
+    <command id="Browser:AddBookmarkAs" oncommand="addBookmarkAs(document.getElementById('content'));"/>
+    <command id="Browser:Home"    oncommand="BrowserHome();"/>
+    <command id="Browser:Back"    oncommand="BrowserBack();" disabled="true"/>
+    <command id="Browser:Forward" oncommand="BrowserForward();" disabled="true"/>
+    <command id="Browser:Stop"    oncommand="BrowserStop();" disabled="true"/>
+    <command id="cmd_textZoomReduce"  oncommand="ZoomManager.prototype.getInstance().reduce();"/>
+    <command id="cmd_textZoomEnlarge" oncommand="ZoomManager.prototype.getInstance().enlarge();"/>
+    <command id="Browser:OpenLocation" oncommand="openLocation();"/>
+    
+    <command id="Tools:Downloads" oncommand="toOpenWindowByType('Download:Manager', 
+                                                                'chrome://mozapps/content/downloads/downloads.xul',
+                                                                'chrome,dialog=no,resizable');"/>
+    
+#ifdef XP_MACOSX
+    <command id="minimizeWindow" label="&minimizeWindow.label;" disabled="true"/>
+#endif
+  </commandset>
+
+  <broadcasterset id="mainBroadcasterSet">
+    <broadcaster id="viewBookmarksSidebar" autoCheck="false" label="&bookmarksButton.label;"
+                 type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/bookmarks/bookmarksPanel.xul"
+                 oncommand="toggleSidebar('viewBookmarksSidebar');"/>
+
+    <broadcaster id="viewHistorySidebar" autoCheck="false" label="&historyButton.label;"
+                 type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/history/history-panel.xul"
+                 oncommand="toggleSidebar('viewHistorySidebar');"/>
+                 
+    <broadcaster id="viewWebPanelsSidebar" autoCheck="false" 
+                 type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/web-panels.xul"
+                 oncommand="toggleSidebar('viewWebPanelsSidebar');"/>
+
+  </broadcasterset>
+
+  <keyset id="mainKeyset">
+    <key id="key_newNavigator"
+         key="&newNavigatorCmd.key;"
+         command="cmd_newNavigator"
+         modifiers="accel"/>
+    <key id="key_newNavigatorTab" key="&tabCmd.commandkey;" modifiers="accel" command="cmd_newNavigatorTab"/>
+    <key id="focusURLBar" key="&openCmd.commandkey;" command="Browser:OpenLocation"
+         modifiers="accel"/>
+#ifdef XP_UNIX
+#ifndef XP_MACOSX
+    <key id="focusSearchBar" key="&searchFocusUnix.commandkey;" oncommand="focusSearchBar();" modifiers="accel"/>
+#else
+    <key id="focusSearchBar" key="&searchFocus.commandkey;" oncommand="focusSearchBar();" modifiers="accel"/>
+#endif
+#else
+    <key id="focusSearchBar" key="&searchFocus.commandkey;" oncommand="focusSearchBar();" modifiers="accel"/>
+#endif
+    <key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile"  modifiers="accel"/>
+    <key id="key_savePage" key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
+    <key id="printKb" key="&printCmd.commandkey;" command="cmd_print"  modifiers="accel"/>
+    <key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
+    <key id="key_closeWindow" key="&closeCmd.key;" command="cmd_closeWindow" modifiers="accel,shift"/>
+    <key id="key_undo"
+         key="&undoCmd.key;"
+         modifiers="accel"/>
+    <key id="key_redo"
+         key="&redoCmd.key;"
+         modifiers="accel"/>
+    <key id="key_cut"
+         key="&cutCmd.key;"
+         modifiers="accel"/>
+    <key id="key_copy"
+         key="&copyCmd.key;"
+         modifiers="accel"/>
+    <key id="key_paste"
+         key="&pasteCmd.key;"
+         modifiers="accel"/>
+    <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
+
+#ifdef XP_WIN
+    <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
+    <key id="goBackKb"  keycode="VK_LEFT" command="Browser:Back" modifiers="alt"/>
+    <key id="goForwardKb"  keycode="VK_RIGHT" command="Browser:Forward" modifiers="alt"/>
+    <key keycode="VK_BACK" command="cmd_handleBackspace"/>
+    <key keycode="VK_BACK" command="Browser:Forward" modifiers="shift"/>
+
+    <key id="goHome" keycode="VK_HOME" command="Browser:Home" modifiers="alt"/>
+
+    <key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
+#else
+    <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="alt"/>
+    
+#ifdef XP_MACOSX
+    <key id="goBackKb"  keycode="VK_LEFT" command="Browser:Back" modifiers="accel"/>
+    <key id="goForwardKb"  keycode="VK_RIGHT" command="Browser:Forward" modifiers="accel"/>
+#else
+    <key id="goBackKb"  keycode="VK_LEFT" command="Browser:Back" modifiers="alt"/>
+    <key id="goForwardKb"  keycode="VK_RIGHT" command="Browser:Forward" modifiers="alt"/>
+#endif
+
+    <key key="&goBackCmd.commandKey;" command="Browser:Back" modifiers="accel"/>
+    <key key="&goForwardCmd.commandKey;" command="Browser:Forward" modifiers="accel"/>
+
+    <key id="goHome" keycode="VK_HOME" command="Browser:Home" modifiers="alt"/>
+    <key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
+#endif
+    <key keycode="VK_F5" oncommand="BrowserReload();"/>
+    <key keycode="VK_F5" modifiers="control" oncommand="BrowserReloadSkipCache();"/>
+    <key id="key_reload"  key="&reloadCmd.commandkey;" oncommand="BrowserReload();" modifiers="accel"/>
+    <key key="&reloadCmd.commandkey;" oncommand="BrowserReloadSkipCache();" modifiers="accel,shift"/>
+    <key id="key_viewSource" key="&pageSourceCmd.commandkey;" command="View:PageSource" modifiers="accel"/>
+#ifdef XP_WIN
+    <key id="key_viewInfo"   key="&pageInfoWinCmd.commandkey;"   command="View:PageInfo"   modifiers="accel"/>
+#else
+    <key id="key_viewInfo"   key="&pageInfoCmd.commandkey;"   command="View:PageInfo"   modifiers="accel"/>
+#endif
+    <key id="key_find" key="&findOnCmd.commandkey;" command="cmd_find" modifiers="accel"/>
+    <key id="key_findAgain" key="&findAgainCmd.commandkey;" command="cmd_findAgain" modifiers="accel"/>
+    <key id="key_findPrevious" key="&findAgainCmd.commandkey;" command="cmd_findPrevious" modifiers="accel,shift"/>
+    <key keycode="&findAgainCmd.commandkey2;" command="cmd_findAgain"/>
+    <key keycode="&findAgainCmd.commandkey2;"  command="cmd_findPrevious" modifiers="shift"/>
+
+    <key id="addBookmarkAsKb" key="&addCurPageAsCmd.commandkey;" command="Browser:AddBookmarkAs" modifiers="accel"/>
+    <key id="viewBookmarksSidebarKb" key="&manBookmarksCmd.commandkey;" command="viewBookmarksSidebar" modifiers="accel"/>
+
+#ifdef XP_WIN
+# Ctrl+I is conventially mapped to Info on MacOS X, thus it should not be 
+# overridden for other purposes there. 
+    <key id="viewBookmarksSidebarKb" key="&manBookmarksWinCmd.commandkey;" command="viewBookmarksSidebar" modifiers="accel"/>
+#endif
+
+    <key id="key_stop" keycode="VK_ESCAPE" command="Browser:Stop"/>
+#ifdef XP_MACOSX
+    <key id="key_gotoHistory"  key="&history.commandKey;"  command="viewHistorySidebar" modifiers="accel,shift"/>
+#else
+    <key id="key_gotoHistory"  key="&history.commandKey;"  command="viewHistorySidebar" modifiers="accel"/>
+#endif
+
+    <key id="key_openDownloads"   key="&downloads.commandkey;"           command="Tools:Downloads" modifiers="accel"/>
+
+    <key id="key_textZoomReduce"  key="&textZoomReduceCmd.commandkey;"   command="cmd_textZoomReduce"  modifiers="accel"/>
+    <key id="key_textZoomEnlarge" key="&textZoomEnlargeCmd.commandkey;"  command="cmd_textZoomEnlarge" modifiers="accel"/>
+    <key                          key="&textZoomEnlargeCmd.commandkey2;" command="cmd_textZoomEnlarge" modifiers="accel"/>
+    <key                          key="&textZoomResetCmd.commandkey;"    oncommand="ZoomManager.prototype.getInstance().reset();"   modifiers="accel"/>
+    
+#ifdef XP_MACOSX
+    <key id="key_minimizeWindow" command="minimizeWindow" key="&minimizeWindow.key;" modifiers="accel"/>
+#endif
+
+  </keyset>
+
--- a/mozilla/browser/base/content/browser.css
+++ b/mozilla/browser/base/content/browser.css
@@ -0,0 +1,13 @@
+#search-bar {
+  -moz-binding: url("chrome://browser/content/search.xml#searchbar");
+}
+
+/* ::::: print preview toolbar ::::: */
+
+toolbar[printpreview="true"] {
+  -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar");
+}
+
+#search-proxy-button {
+  -moz-binding: url("chrome://browser/content/search.xml#searchBarDropMarker");
+}
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -0,0 +1,395 @@
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998-2000 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#   Blake Ross <blaker@netscape.com>
+#   David Hyatt <hyatt@mozilla.org>
+#   Joe Hewitt <hewitt@netscape.com>
+#   Pierre Chanial <chanial@noos.fr>
+#   Dean Tessman <dean_tessman@hotmail.com>
+
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
+
+#ifdef XP_MACOSX
+<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
+#endif
+
+# All DTD information is stored in a separate file so that it can be shared by
+# hiddenWindow.xul.
+#include browser-doctype.inc
+ 
+<window id="main-window"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="Startup()" onunload="Shutdown()" onclose="return closeWindow(false);"
+        contenttitlesetting="true"
+        title="&mainWindow.title;"
+        titlemodifier="&mainWindow.title;"
+        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
+        windowtype="navigator:browser"
+        width="610" height="450"
+        screenX="4" screenY="4"
+        persist="screenX screenY width height sizemode"> 
+
+#ifndef XP_MACOSX
+# All JS files that browser.xul wishes to include *must* go into the browser-scripts.inc file
+# so that they can be shared by hiddenWindow.xul.
+#include browser-scripts.inc
+
+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the 
+# browser-sets.inc file for sharing with hiddenWindow.xul.
+#include browser-sets.inc
+#endif
+
+  <popupset id="mainPopupSet">
+    <popup id="backMenu" position="after_start" onpopupshowing="return BrowserBackMenu(event);" oncommand="gotoHistoryIndex(event);"/>
+    <popup id="forwardMenu" position="after_start" onpopupshowing="return BrowserForwardMenu(event);" oncommand="gotoHistoryIndex(event);"/>
+    <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
+
+    <popup id="SearchBarPopup" position="after_start"
+           datasources="rdf:internetsearch" ref="NC:SearchEngineRoot" 
+           oncommand="return SearchBarPopupCommand(event);"
+           onpopupshowing="SearchBarPopupShowing(event);">
+      <menuitem id="__PhoenixFindInPage" class="menuitem-iconic"
+                label="&findOnSearchBarCmd.label;"/>
+      <menuseparator/>
+      <template>
+        <menuitem type="checkbox"
+                  uri="..." value="..."
+                  src="rdf:http://home.netscape.com/NC-rdf#Icon"
+                  label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+      </template>
+    </popup>
+
+    <popup type="autocomplete" id="PopupAutoComplete"/>
+
+    <popup id="toolbar-context-menu"
+           onpopupshowing="updateToolbarStates(this); onViewToolbarsPopupShowing(event);">
+      <menuseparator/>
+      <menuitem command="cmd_CustomizeToolbars"
+                label="&viewCustomizeToolbar.label;"
+                accesskey="&viewCustomizeToolbar.accesskey;"/>
+    </popup>
+
+#include browser-context.inc
+
+  </popupset>
+
+#ifndef XP_MACOSX
+# The hacky hidden tree used by the Go menu to build items.
+#include browser-gotreehack.inc
+#endif
+
+  <!-- bookmarks context menu -->
+  <popupset>
+    <menupopup id="bookmarks-context-menu" 
+               onpopupshowing="return BookmarksMenu.createContextMenu(event);"
+               onpopuphidden ="BookmarksMenu.destroyContextMenu(event);"/>
+  </popupset>
+
+  <!-- bookmarks toolbar tooltip -->
+  <tooltip id="btTooltip" noautohide="true" 
+           onpopupshowing="return BookmarksToolbar.fillInBTTooltip(document.tooltipNode)">
+    <vbox id="btTooltipTextBox" flex="1">  
+      <label id="btTitleText" />
+      <label id="btUrlText" />
+    </vbox>
+  </tooltip>
+
+  <toolbox id="navigator-toolbox" class="toolbox-top" mode="icons" iconsize="small">
+    <!-- Menu -->
+      <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
+#ifdef XP_MACOSX
+               defaultset="menubar-items"
+#else
+               defaultset="menubar-items,spring,throbber-box"
+#endif
+               mode="icons" iconsize="small" context="toolbar-context-menu">
+        <toolbaritem id="menubar-items" align="center">
+
+#ifndef XP_MACOSX
+# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by 
+# hiddenWindow.xul.
+#include browser-menubar.inc
+#endif
+
+        </toolbaritem>
+    </toolbar>
+
+    <toolbarpalette id="BrowserToolbarPalette">
+      <toolbarbutton id="back-button" type="menu-button" class="toolbarbutton-1"
+                      label="&backCmd.label;"
+					command="Browser:Back"
+                      context="backMenu"
+                      tooltiptext="&backButton.tooltip;">
+        <menupopup context="" onpopupshowing="BrowserBackMenu(event);"
+                    oncommand="gotoHistoryIndex(event); event.preventBubble();"/>
+      </toolbarbutton>
+    
+      <toolbarbutton id="forward-button" type="menu-button" class="toolbarbutton-1"
+                      label="&forwardCmd.label;"
+                      command="Browser:Forward"
+                      context="forwardMenu"
+                      tooltiptext="&forwardButton.tooltip;">
+        <menupopup context="" oncommand="gotoHistoryIndex(event); event.preventBubble()"
+                    onpopupshowing="BrowserForwardMenu(event);"/>
+      </toolbarbutton>
+    
+      <toolbarbutton id="reload-button" class="toolbarbutton-1"
+                      label="&reloadCmd.label;"
+                      oncommand="if (event.shiftKey) BrowserReloadSkipCache(); else BrowserReload();"  
+                      tooltiptext="&reloadButton.tooltip;"/>
+                    
+      <toolbarbutton id="stop-button" class="toolbarbutton-1"
+                      label="&stopCmd.label;"
+                      command="Browser:Stop"
+                      tooltiptext="&stopButton.tooltip;"/>
+
+      <toolbarbutton id="home-button" class="toolbarbutton-1"
+                      label="&homeButton.label;"
+                      ondragover="nsDragAndDrop.dragOver(event, homeButtonObserver);"
+                      ondragdrop="nsDragAndDrop.drop(event, homeButtonObserver);"
+                      ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver);"
+                      oncommand="BrowserHome();"/>
+    
+      <toolbaritem id="urlbar-container" align="center" flex="1000"
+                   title="&locationItem.title;" class="chromeclass-location">
+        <textbox id="urlbar" flex="1"
+                 type="autocomplete" accesskey="&urlbar.accesskey;"
+                 autocompletesearch="history" 
+                 autocompletepopup="PopupAutoComplete"
+                 tabscrolling="true"
+                 showcommentcolumn="true"
+                 enablehistory="true"
+                 oninput="gBrowser.userTypedValue = this.value"
+                 ontextentered="return handleURLBarCommand(param);"
+                 ontextreverted="return handleURLBarRevert();"
+                 onfocus="URLBarFocusHandler(event, this);"
+                 onmousedown="URLBarMouseDownHandler(event, this);"
+                 onclick="URLBarClickHandler(event, this);">
+          <deck id="page-proxy-deck">
+            <image id="page-proxy-button"
+                    ondraggesture="PageProxyDragGesture(event);"
+                    tooltiptext="&proxyIcon.tooltip;"/>
+            <image id="page-proxy-favicon"
+                    ondraggesture="PageProxyDragGesture(event);"
+                    onload="this.parentNode.selectedIndex = 1;
+                            event.stopPropagation();
+                            event.preventBubble();
+                            HandleBookmarkIcon(this.src, true);"
+                    onerror="gBrowser.addToMissedIconCache(this.src); HandleBookmarkIcon(this.src, false);
+                             this.parentNode.selectedIndex = 0;"
+                    tooltiptext="&proxyIcon.tooltip;"/>
+          </deck>
+        </textbox>
+      </toolbaritem>
+
+      <toolbaritem id="search-container" align="center"
+                   title="&searchItem.title;" class="chromeclass-location">
+        <textbox id="search-bar" type="autocomplete" flex="1"
+                 autocompletepopup="PopupAutoComplete"
+                 autocompletesearch="form-history"
+                 tabscrolling="true"
+                 onfocus="URLBarFocusHandler(event, this);"
+                 onmousedown="URLBarMouseDownHandler(event, this);"
+                 onclick="URLBarClickHandler(event, this);"
+                 persist="searchengine,autocompletesearchparam">
+          <button id="search-proxy-button" type="menu"
+                  popup="SearchBarPopup" persist="src"/>
+        </textbox>
+      </toolbaritem>
+      
+      <toolbaritem id="go-container" align="center" class="chromeclass-location">
+        <button id="go-button" class="button-toolbar"
+                label="&goButton.label;"
+                oncommand="handleURLBarCommand(event);"
+                ondragover="nsDragAndDrop.dragOver(event, goButtonObserver);"
+                ondragdrop="nsDragAndDrop.drop(event, goButtonObserver);"
+                ondragexit="nsDragAndDrop.dragExit(event, goButtonObserver);"
+                tooltiptext="&goButton.tooltip;"/> 
+      </toolbaritem>
+
+      <toolbarbutton id="print-button" class="toolbarbutton-1"
+                     label="&printButton.label;" command="cmd_print"
+                     tooltiptext="&printButton.tooltip;"/>
+
+      <toolbaritem id="throbber-box" title="&throbberItem.title;" align="center" pack="center">
+        <button id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')"
+                tooltiptext="&throbber.tooltip;"/>
+      </toolbaritem>
+      
+      <toolbaritem id="personal-bookmarks" title="&bookmarksItem.title;" flex="1">
+        <stack id="bookmarks-stack" flex="1" style="min-width:0px; width:0px;">
+          <hbox id="bookmarks-ptf" class="bookmarks-toolbar-items" contextmenu="bookmarks-context-menu"
+                flex="1" style="min-width:0px; width:0px;margin-left: 3px;" 
+                datasources="rdf:bookmarks rdf:files rdf:localsearch"
+                template="bookmarks-template" flags="dont-test-empty"
+                rdf:type="http://home.netscape.com/NC-rdf#Folder"
+                onpopupshowing="BookmarksMenu.showOpenInTabsMenuItem(event.target)"
+                onpopuphidden="BookmarksMenu.hideOpenInTabsMenuItem(event.target)"
+                oncommand="BookmarksMenu.loadBookmark(event, event.target, this.database)"
+                onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
+                ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
+                ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
+                ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
+                ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
+                ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
+          </hbox>
+          <hbox class="bookmarks-toolbar-overflow-items" mousethrough="always">
+            <hbox mousethrough="always" id="overflow-padder"/>
+              <toolbarbutton id="bookmarks-chevron" type="menu" class="chevron"
+                             mousethrough="never" collapsed="true" 
+                             datasources="rdf:bookmarks rdf:files rdf:localsearch"
+                             template="bookmarks-template" flags="dont-test-empty"
+                             onpopupshowing="BookmarksMenu.showOpenInTabsMenuItem(event.target)"
+                             onpopuphidden="BookmarksMenu.hideOpenInTabsMenuItem(event.target)"
+                             oncommand="BookmarksMenu.loadBookmark(event, event.target, this.database)"
+                             onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
+                             ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
+                             ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
+                             ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
+                             ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
+                             ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
+                <menupopup contextmenu="bookmarks-context-menu"
+                           onpopupshowing="if (event.target == this) BookmarksToolbar.updateOverflowMenu(this);"/>
+              </toolbarbutton>
+            </hbox>
+            <toolbarbutton class="bookmark-item bookmarks-toolbar-customize" mousethrough="never"
+                           label="&bookmarksToolbarItem.label;"/>
+          </stack>
+        </toolbaritem>
+
+        <toolbarbutton id="downloads-button" class="toolbarbutton-1"
+                       observes="Tools:Downloads"
+                       ondragdrop="nsDragAndDrop.drop(event, DownloadsButtonDNDObserver); event.preventBubble()"
+                       ondragover="nsDragAndDrop.dragOver(event, DownloadsButtonDNDObserver); event.preventBubble()"
+                       ondragenter="nsDragAndDrop.dragEnter(event, DownloadsButtonDNDObserver); event.preventBubble()"
+                       ondragexit="nsDragAndDrop.dragExit(event, DownloadsButtonDNDObserver); event.preventBubble()"
+                       label="&downloads.label;"
+                       tooltiptext="&downloads.tooltip;"/>
+
+        <toolbarbutton id="history-button" class="toolbarbutton-1"
+                       observes="viewHistorySidebar"
+                       tooltiptext="&historyButton.tooltip;"/>
+                       
+        <toolbarbutton id="bookmarks-button" class="toolbarbutton-1"
+                       observes="viewBookmarksSidebar"
+                       tooltiptext="&bookmarksButton.tooltip;"/>
+    
+        <toolbarbutton id="new-tab-button" class="toolbarbutton-1"
+                       label="&tabCmd.label;"
+                       command="cmd_newNavigatorTab"
+                       tooltiptext="&newTabButton.tooltip;"/>
+
+        <toolbarbutton id="new-window-button" class="toolbarbutton-1"
+                       label="&newNavigatorCmd.label;"
+                       command="key_newNavigator"
+                       tooltiptext="&newWindowButton.tooltip;"/>
+
+        <toolbarbutton id="cut-button" class="toolbarbutton-1"
+                       label="&cutCmd.label;"
+                       command="cmd_cut"
+                       tooltiptext="&cutButton.tooltip;"/>
+
+        <toolbarbutton id="copy-button" class="toolbarbutton-1"
+                       label="&copyCmd.label;"
+                       command="cmd_copy"
+                       tooltiptext="&copyButton.tooltip;"/>
+
+        <toolbarbutton id="paste-button" class="toolbarbutton-1"
+                       label="&pasteCmd.label;"
+                       command="cmd_paste"
+                       tooltiptext="&pasteButton.tooltip;"/>
+
+    </toolbarpalette>
+
+    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
+             toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
+             fullscreentoolbar="true" mode="icons" iconsize="small"
+             customizable="true"
+             defaultset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,window-controls"
+             context="toolbar-context-menu">
+      <hbox id="window-controls" hidden="true" fullscreencontrol="true">
+        <toolbarbutton id="minimize-button" class="toolbarbutton-1"
+                       oncommand="window.minimize();"/>
+
+        <toolbarbutton id="restore-button" class="toolbarbutton-1"
+                       oncommand="BrowserFullScreen();"/>
+
+        <toolbarbutton id="close-button" class="toolbarbutton-1"
+                       oncommand="window.close();"/>
+      </hbox>
+    </toolbar>
+ 
+    <toolbarset id="customToolbars" context="toolbar-context-menu"/>
+
+    <toolbar id="PersonalToolbar" class="chromeclass-directories" iconsize="small"
+             customizable="true" defaultset="personal-bookmarks" mode="icons"
+             toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
+             context="toolbar-context-menu"/>
+    
+  </toolbox>
+  
+  <hbox flex="1" id="browser">
+    <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
+      <sidebarheader align="center">
+        <label id="sidebar-title" persist="value" flex="1" crop="end"/>
+        <image id="sidebar-throbber"/>
+        <toolbarbutton class="tabs-closebutton" oncommand="toggleSidebar();"/>      
+      </sidebarheader>        
+      <browser id="sidebar" flex="1" autoscroll="false"
+               style="min-width: 150px; width: 200px; max-width: 400px;"/>
+    </vbox>    
+    
+    <splitter id="sidebar-splitter" hidden="true"/>
+    <vbox id="appcontent" flex="1">
+      <tabbrowser id="content" disablehistory="true"
+                  flex="1" contenttooltip="aHTMLTooltip"
+                  contentcontextmenu="contentAreaContextMenu"
+                  onnewtab="BrowserOpenTab();"
+                  autocompletepopup="PopupAutoComplete"
+                  ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);"
+                  onclick="return contentAreaClick(event, false);"/>
+    </vbox>
+  </hbox>
+  <statusbar class="chromeclass-status" id="status-bar"
+             ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
+    <statusbarpanel id="security-button" class="statusbarpanel-iconic"
+                  onclick="displayPageInfo()"/>
+    <statusbarpanel id="page-report-button" class="statusbarpanel-iconic" tooltiptext="&pageReportIcon.tooltip;"
+                  onclick="displayPageReport();"/>
+    <statusbarpanel id="page-theme-button" type="menu" class="statusbarpanel-menu-iconic" tooltiptext="&pageThemeIcon.tooltip;">
+          <menupopup onpopupshowing="stylesheetFillPopup(this);"
+                     oncommand="stylesheetSwitchAll(window._content, event.target.getAttribute('data'));">
+            <menuitem label="&pageThemeNoTheme.label;" accesskey="&pageThemeNoTheme.accesskey;" type="radio" data="_nostyle"/>
+            <menuitem label="&pageThemePersistentOnly.label;" accesskey="&pageThemePersistentOnly.accesskey;" type="radio" checked="true"/>
+            <menuseparator/>
+          </menupopup>
+    </statusbarpanel>
+
+    <statusbarpanel id="statusbar-display" flex="1"/>
+    <statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel">
+      <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
+    </statusbarpanel>
+  </statusbar>
+</window>
+  
--- a/mozilla/browser/base/content/contentAreaUtils.js
+++ b/mozilla/browser/base/content/contentAreaUtils.js
@@ -0,0 +1,925 @@
+/**
+ * Determine whether or not a given focused DOMWindow is in the content
+ * area.
+ **/
+ 
+function openNewTabWith(href, linkNode, event, securityCheck)
+{
+  if (securityCheck)
+    urlSecurityCheck(href, document); 
+
+  var prefSvc = Components.classes["@mozilla.org/preferences-service;1"]
+                          .getService(Components.interfaces.nsIPrefService);
+  prefSvc = prefSvc.getBranch(null);
+
+  // should we open it in a new tab?
+  var loadInBackground = true;
+  try {
+    loadInBackground = prefSvc.getBoolPref("browser.tabs.loadInBackground");
+  }
+  catch(ex) {
+  }
+
+  if (event && event.shiftKey)
+    loadInBackground = !loadInBackground;
+
+  // As in openNewWindowWith(), we want to pass the charset of the
+  // current document over to a new tab. 
+  var wintype = document.firstChild.getAttribute('windowtype');
+  var originCharset;
+  if (wintype == "navigator:browser") {
+    originCharset = window._content.document.characterSet;
+  }
+
+  // open link in new tab
+  var browser = top.document.getElementById("content");  
+  var theTab = browser.addTab(href, getReferrer(document), originCharset);
+  if (!loadInBackground)
+    browser.selectedTab = theTab;
+  
+  if (linkNode)
+    markLinkVisited(href, linkNode);
+}
+
+function openNewWindowWith(href, linkNode, securityCheck) 
+{
+  if (securityCheck)
+    urlSecurityCheck(href, document);
+
+  // if and only if the current window is a browser window and it has a document with a character
+  // set, then extract the current charset menu setting from the current document and use it to
+  // initialize the new browser window...
+  var charsetArg = null;
+  var wintype = document.firstChild.getAttribute('windowtype');
+  if (wintype == "navigator:browser")
+    charsetArg = "charset=" + window._content.document.characterSet;
+
+  var referrer = getReferrer(document);
+  window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", href, charsetArg, referrer);
+  
+  if (linkNode)
+    markLinkVisited(href, linkNode);
+}
+
+function markLinkVisited(href, linkNode)
+{
+   var globalHistory = Components.classes["@mozilla.org/browser/global-history;1"]
+                               .getService(Components.interfaces.nsIGlobalHistory);
+   if (!globalHistory.isVisited(href)) {
+     globalHistory.addPage(href);
+     var oldHref = linkNode.getAttribute("href");
+     if (typeof oldHref == "string") {
+       // Use setAttribute instead of direct assignment.
+       // (bug 217195, bug 187195)
+       linkNode.setAttribute("href", "");
+       linkNode.setAttribute("href", oldHref);
+     }
+     else {
+       // Converting to string implicitly would be a 
+       // minor security hole (similar to bug 202994).
+     }
+   }
+}
+
+function urlSecurityCheck(url, doc) 
+{
+  // URL Loading Security Check
+  var focusedWindow = doc.commandDispatcher.focusedWindow;
+  var sourceURL = getContentFrameURI(focusedWindow);
+  const nsIScriptSecurityManager = Components.interfaces.nsIScriptSecurityManager;
+  var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
+                         .getService(nsIScriptSecurityManager);
+  try {
+    secMan.checkLoadURIStr(sourceURL, url, nsIScriptSecurityManager.STANDARD);
+  } catch (e) {
+    throw "Load of " + url + " denied.";
+  }
+}
+
+function isContentFrame(aFocusedWindow)
+{
+  if (!aFocusedWindow)
+    return false;
+
+  var focusedTop = Components.lookupMethod(aFocusedWindow, 'top')
+                             .call(aFocusedWindow);
+
+  return (focusedTop == window.content);
+}
+
+function getContentFrameURI(aFocusedWindow)
+{
+  var contentFrame = isContentFrame(aFocusedWindow) ? aFocusedWindow : window.content;
+  return Components.lookupMethod(contentFrame, 'location').call(contentFrame).href;
+}
+
+function getReferrer(doc)
+{
+  var focusedWindow = doc.commandDispatcher.focusedWindow;
+  var sourceURL = getContentFrameURI(focusedWindow);
+
+  try {
+    var uri = Components.classes["@mozilla.org/network/standard-url;1"].createInstance(Components.interfaces.nsIURI);
+    uri.spec = sourceURL;
+    return uri;
+  } catch (e) {
+    return null;
+  }
+}
+
+const kSaveAsType_Complete = 0;   // Save document with attached objects
+const kSaveAsType_URL = 1;        // Save document or URL by itself
+const kSaveAsType_Text = 2;       // Save document, converting to plain text. 
+
+// Clientelle: (Make sure you don't break any of these)
+//  - File    ->  Save Page/Frame As...
+//  - Context ->  Save Page/Frame As...
+//  - Context ->  Save Link As...
+//  - Context ->  Save Image As...
+//  - Alt-Click Save Link As
+//
+// Try saving each of these types:
+// - A complete webpage using File->Save Page As, and Context->Save Page As
+// - A webpage as HTML only using the above methods
+// - A webpage as Text only using the above methods
+// - An image with an extension (e.g. .jpg) in its file name, using
+//   Context->Save Image As...
+// - An image without an extension (e.g. a banner ad on cnn.com) using
+//   the above method. 
+// - A linked document using Save Link As...
+// - A linked document using Alt-click Save Link As...
+//
+function saveURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache, aSkipPrompt)
+{
+  saveInternal(aURL, null, aFileName, aFilePickerTitleKey, aShouldBypassCache, aSkipPrompt);
+}
+
+function saveDocument(aDocument, aSkipPrompt)
+{
+  // In both cases here, we want to use cached data because the 
+  // document is currently visible. 
+  if (aDocument) 
+    saveInternal(aDocument.location.href, aDocument, false, aSkipPrompt);
+  else
+    saveInternal(_content.location.href, null, false, aSkipPrompt);
+}
+
+function saveInternal(aURL, aDocument, 
+                      aFileName, aFilePickerTitleKey,
+                      aShouldBypassCache, aSkipPrompt)
+{
+  if (aSkipPrompt == undefined)
+    aSkipPrompt = false;
+
+  var data = {
+    url: aURL,
+    fileName: aFileName,
+    filePickerTitle: aFilePickerTitleKey,
+    document: aDocument,
+    bypassCache: aShouldBypassCache,
+    window: window
+  };
+  var sniffer = new nsHeaderSniffer(aURL, foundHeaderInfo, data, aSkipPrompt);
+}
+
+function foundHeaderInfo(aSniffer, aData, aSkipPrompt)
+{
+  var contentType = aSniffer.contentType;
+  var contentEncodingType = aSniffer.contentEncodingType;
+
+  var shouldDecode = false;
+  // Are we allowed to decode?
+  try {
+    const helperAppService =
+      Components.classes["@mozilla.org/uriloader/external-helper-app-service;1"].
+        getService(Components.interfaces.nsIExternalHelperAppService);
+    var url = aSniffer.uri.QueryInterface(Components.interfaces.nsIURL);
+    var urlExt = url.fileExtension;
+    if (helperAppService.applyDecodingForExtension(urlExt,
+                                                   contentEncodingType)) {
+      shouldDecode = true;
+    }
+  }
+  catch (e) {
+  }
+
+  var isDocument = aData.document != null && isDocumentType(contentType);
+  if (!isDocument && !shouldDecode && contentEncodingType) {
+    // The data is encoded, we are not going to decode it, and this is not a
+    // document save so we won't be doing a "save as, complete" (which would
+    // break if we reset the type here).  So just set our content type to
+    // correspond to the outermost encoding so we get extensions and the like
+    // right.
+    contentType = contentEncodingType;
+  }
+  
+  var file = null;
+  var saveAsType = kSaveAsType_URL;
+  try {
+    file = aData.fileName.QueryInterface(Components.interfaces.nsILocalFile);
+  }
+  catch (e) {
+    var saveAsTypeResult = { rv: 0 };
+    file = getTargetFile(aData, aSniffer, contentType, isDocument, aSkipPrompt, saveAsTypeResult);
+    saveAsType = saveAsTypeResult.rv;
+  }
+
+  // If we're saving a document, and are saving either in complete mode or 
+  // as converted text, pass the document to the web browser persist component.
+  // If we're just saving the HTML (second option in the list), send only the URI.
+  var source = (isDocument && saveAsType != kSaveAsType_URL) ? aData.document : aSniffer.uri;
+  var persistArgs = {
+    source      : source,
+    contentType : (isDocument && saveAsType == kSaveAsType_Text) ? "text/plain" : contentType,
+    target      : file,
+    postData    : aData.document ? getPostData() : null,
+    bypassCache : aData.bypassCache
+  };
+  
+  var persist = makeWebBrowserPersist();
+
+  // Calculate persist flags.
+  const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
+  const flags = nsIWBP.PERSIST_FLAGS_NO_CONVERSION | nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
+  if (aData.bypassCache)
+    persist.persistFlags = flags | nsIWBP.PERSIST_FLAGS_BYPASS_CACHE;
+  else 
+    persist.persistFlags = flags | nsIWBP.PERSIST_FLAGS_FROM_CACHE;
+
+  if (shouldDecode)
+    persist.persistFlags &= ~nsIWBP.PERSIST_FLAGS_NO_CONVERSION;
+    
+  // Create download and initiate it (below)
+  var dl = Components.classes["@mozilla.org/download;1"].createInstance(Components.interfaces.nsIDownload);
+
+  if (isDocument && saveAsType != kSaveAsType_URL) {
+    // Saving a Document, not a URI:
+    var filesFolder = null;
+    if (persistArgs.contentType != "text/plain") {
+      // Create the local directory into which to save associated files. 
+      const nsILocalFile = Components.interfaces.nsILocalFile;
+      const lfContractID = "@mozilla.org/file/local;1";
+      filesFolder = Components.classes[lfContractID].createInstance(nsILocalFile);
+      filesFolder.initWithPath(persistArgs.target.path);
+      
+      var nameWithoutExtension = filesFolder.leafName;
+      nameWithoutExtension = nameWithoutExtension.substring(0, nameWithoutExtension.lastIndexOf("."));
+      var filesFolderLeafName = getStringBundle().formatStringFromName("filesFolder",
+                                                                       [nameWithoutExtension],
+                                                                       1);
+
+      filesFolder.leafName = filesFolderLeafName;
+    }
+      
+    var encodingFlags = 0;
+    if (persistArgs.contentType == "text/plain") {
+      encodingFlags |= nsIWBP.ENCODE_FLAGS_FORMATTED;
+      encodingFlags |= nsIWBP.ENCODE_FLAGS_ABSOLUTE_LINKS;
+      encodingFlags |= nsIWBP.ENCODE_FLAGS_NOFRAMES_CONTENT;        
+    }
+    
+    const kWrapColumn = 80;
+    dl.init(aSniffer.uri, persistArgs.target, null, null, null, persist);
+    persist.saveDocument(persistArgs.source, persistArgs.target, filesFolder, 
+                         persistArgs.contentType, encodingFlags, kWrapColumn);
+  } else {
+    dl.init(source, persistArgs.target, null, null, null, persist);
+    persist.saveURI(source, null, null, persistArgs.postData, null, persistArgs.target);
+  }
+}
+
+function getTargetFile(aData, aSniffer, aContentType, aIsDocument, aSkipPrompt, aSaveAsTypeResult)
+{
+  aSaveAsTypeResult.rv = kSaveAsType_Complete;                                           
+  
+  // Determine what the 'default' string to display in the File Picker dialog 
+  // should be. 
+  var defaultFileName = getDefaultFileName(aData.fileName, 
+                                           aSniffer.suggestedFileName, 
+                                           aSniffer.uri,
+                                           aData.document);
+
+  var defaultExtension = getDefaultExtension(defaultFileName, aSniffer.uri, aContentType);
+  var defaultString = getNormalizedLeafName(defaultFileName, defaultExtension);
+
+  const prefSvcContractID = "@mozilla.org/preferences-service;1";
+  const prefSvcIID = Components.interfaces.nsIPrefService;                              
+  var prefs = Components.classes[prefSvcContractID].getService(prefSvcIID).getBranch("browser.download.");
+
+  const nsILocalFile = Components.interfaces.nsILocalFile;
+
+  // ben 07/31/2003:
+  // |browser.download.defaultFolder| holds the default download folder for 
+  // all files when the user has elected to have all files automatically
+  // download to a folder. The values of |defaultFolder| can be either their
+  // desktop, their downloads folder (My Documents\My Downloads) or some other
+  // location of their choosing (which is mapped to |browser.download.dir|
+  // This pref is _unset_ when the user has elected to be asked about where
+  // to place every download - this will force the prompt to ask the user
+  // where to put saved files. 
+  var dir = null;
+  try {
+    dir = prefs.getComplexValue("defaultFolder", nsILocalFile);
+  }
+  catch (e) { }
+  
+  var file;
+  if (!aSkipPrompt || !dir) {
+    // If we're asking the user where to save the file, root the Save As...
+    // dialog on they place they last picked. 
+    try {
+      dir = prefs.getComplexValue("lastDir", nsILocalFile);
+    }
+    catch (e) {
+      // No default download location. Default to desktop. 
+      var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"].getService(Components.interfaces.nsIProperties);
+
+      function getDesktopKey()
+      {      
+#ifdef XP_WIN
+        return "DeskV";
+#endif
+#ifdef XP_MACOSX
+        return "UsrDsk";
+#endif
+        return "Home";
+      }
+      
+      dir = fileLocator.get(getDesktopKey(), Components.interfaces.nsILocalFile);
+    }
+
+
+    var fp = makeFilePicker();
+    var titleKey = aData.filePickerTitle || "SaveLinkTitle";
+    var bundle = getStringBundle();
+    fp.init(window, bundle.GetStringFromName(titleKey), 
+            Components.interfaces.nsIFilePicker.modeSave);
+    
+    appendFiltersForContentType(fp, aContentType,
+                                aIsDocument ? MODE_COMPLETE : MODE_FILEONLY);  
+  
+    if (dir)
+      fp.displayDirectory = dir;
+    
+    if (aIsDocument) {
+      try {
+        fp.filterIndex = prefs.getIntPref("save_converter_index");
+      }
+      catch (e) {
+      }
+    }
+  
+    fp.defaultExtension = defaultExtension;
+    fp.defaultString = defaultString;
+  
+    if (fp.show() == Components.interfaces.nsIFilePicker.returnCancel || !fp.file)
+      return;
+  
+    var useDownloadDir = false;
+    try {
+      useDownloadDir = prefs.getBoolPref("useDownloadDir");
+    }
+    catch(ex) {
+    }
+    
+    var directory = fp.file.parent.QueryInterface(nsILocalFile);
+    prefs.setComplexValue("lastDir", nsILocalFile, directory);
+
+    fp.file.leafName = validateFileName(fp.file.leafName);
+    aSaveAsTypeResult.rv = fp.filterIndex;
+    file = fp.file;
+
+    if (aIsDocument) 
+      prefs.setIntPref("save_converter_index", aSaveAsTypeResult.rv);
+  }
+  else {
+    // ben 07/31/2003: 
+    // We don't nullcheck dir here because dir should never be null if we get here
+    // unless something is badly wrong, and if it is, I want to know about it in
+    // bugs. 
+    dir.append(defaultString);
+    file = dir;
+    
+    // Since we're automatically downloading, we don't get the file picker's 
+    // logic to check for existing files, so we need to do that here.
+    //
+    // Note - this code is identical to that in 
+    //   browser/components/downloads/content/nsHelperAppDlg.js. 
+    // If you are updating this code, update that code too! We can't share code
+    // here since that code is called in a js component. 
+    while (file.exists()) {
+      var parts = /.+-(\d+)(\..*)?$/.exec(file.leafName);
+      if (parts) {
+        file.leafName = file.leafName.replace(/((\d+)\.)/, 
+                                              function (str, p1, part, s) { 
+                                                return (parseInt(part) + 1) + "."; 
+                                              });
+      }
+      else {
+        file.leafName = file.leafName.replace(/\./, "-1$&");
+      }
+    }
+    
+  }
+
+  return file;    
+}
+
+function nsHeaderSniffer(aURL, aCallback, aData, aSkipPrompt)
+{
+  this.mCallback = aCallback;
+  this.mData = aData;
+  this.mSkipPrompt = aSkipPrompt;
+  
+  this.uri = makeURL(aURL);
+  
+  this.linkChecker = Components.classes["@mozilla.org/network/urichecker;1"]
+    .createInstance(Components.interfaces.nsIURIChecker);
+  this.linkChecker.init(this.uri);
+
+  var flags;
+  if (aData.bypassCache) {
+    flags = Components.interfaces.nsIRequest.LOAD_BYPASS_CACHE;
+  } else {
+    flags = Components.interfaces.nsIRequest.LOAD_FROM_CACHE;
+  }
+  this.linkChecker.loadFlags = flags;
+
+  this.linkChecker.asyncCheck(this, null);
+}
+
+nsHeaderSniffer.prototype = {
+
+  // ---------- nsISupports methods ----------
+  QueryInterface: function (iid) {
+    if (!iid.equals(Components.interfaces.nsIRequestObserver) &&
+        !iid.equals(Components.interfaces.nsISupports) &&
+        !iid.equals(Components.interfaces.nsIInterfaceRequestor) &&
+        !iid.equals(Components.interfaces.nsIAuthPrompt)) {
+      throw Components.results.NS_ERROR_NO_INTERFACE;
+    }
+    return this;
+  },
+
+  // ---------- nsIInterfaceRequestor methods ----------
+  getInterface : function(iid) {
+    return this.QueryInterface(iid);
+  },
+
+  // ---------- nsIAuthPrompt methods ----------
+  prompt : function(dlgTitle, text, pwrealm, savePW, defaultText, result)
+  {
+    dump("authprompt prompt! pwrealm="+pwrealm+"\n");
+    var promptServ = this.promptService;
+    if (!promptServ)
+      return false;
+    var saveCheck = {value:savePW};
+    return promptServ.prompt(window, dlgTitle, text, defaultText, pwrealm, saveCheck);
+  },
+  promptUsernameAndPassword : function(dlgTitle, text, pwrealm, savePW, user, pw)
+  {
+    dump("authprompt promptUsernameAndPassword!  "+dlgTitle+" "+text+", pwrealm="+pwrealm+"\n");
+    var promptServ = this.promptService;
+    if (!promptServ)
+      return false;
+    var saveCheck = {value:savePW};
+    return promptServ.promptUsernameAndPassword(window, dlgTitle, text, user, pw, pwrealm, saveCheck);
+  },
+  promptPassword : function(dlgTitle, text, pwrealm, savePW, pw)
+  {
+    dump("auth promptPassword!  "+dlgTitle+" "+text+", pwrealm="+pwrealm+"\n");
+    var promptServ = this.promptService;
+    if (!promptServ)
+      return false;
+
+    var saveCheck = {value:savePW};
+    return promptServ.promptPassword(window, dlgTitle, text, pw, pwrealm, saveCheck);
+  },
+
+  // ---------- nsIRequestObserver methods ----------
+  onStartRequest: function (aRequest, aContext) { },
+  
+  onStopRequest: function (aRequest, aContext, aStatus) {
+    try {
+      if (aStatus == 0) { // NS_BINDING_SUCCEEDED, so there's something there
+        var linkChecker = aRequest.QueryInterface(Components.interfaces.nsIURIChecker);
+        var channel = linkChecker.baseChannel;
+        this.contentType = channel.contentType;
+        try {
+          var httpChannel = channel.QueryInterface(Components.interfaces.nsIHttpChannel);
+          var encodedChannel = channel.QueryInterface(Components.interfaces.nsIEncodedChannel);
+          this.contentEncodingType = null;
+          // There may be content-encodings on the channel.  Multiple content
+          // encodings are allowed, eg "Content-Encoding: gzip, uuencode".  This
+          // header would mean that the content was first gzipped and then
+          // uuencoded.  The encoding enumerator returns MIME types
+          // corresponding to each encoding starting from the end, so the first
+          // thing it returns corresponds to the outermost encoding.
+          var encodingEnumerator = encodedChannel.contentEncodings;
+          if (encodingEnumerator && encodingEnumerator.hasMoreElements()) {
+            try {
+              this.contentEncodingType =
+                encodingEnumerator.getNext().
+                  QueryInterface(Components.interfaces.nsISupportsCString).data;
+            } catch (e) {
+            }
+          }
+          this.mContentDisposition = httpChannel.getResponseHeader("content-disposition");
+        }
+        catch (e) {
+        }
+        if (!this.contentType || this.contentType == "application/x-unknown-content-type") {
+          // We didn't get a type from the server.  Fall back on other type detection mechanisms
+          throw "Unknown Type";
+        }
+      }
+      else {
+        dump("Error saving link aStatus = 0x" + aStatus.toString(16) + "\n");
+        var bundle = getStringBundle();
+        var errorTitle = bundle.GetStringFromName("saveLinkErrorTitle");
+        var errorMsg = bundle.GetStringFromName("saveLinkErrorMsg");
+        const promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
+        promptService.alert(this.mData.window, errorTitle, errorMsg);
+        return;
+      }
+    }
+    catch (e) {
+      if (this.mData.document) {
+        this.contentType = this.mData.document.contentType;
+      } else {
+        try {
+          var url = this.uri.QueryInterface(Components.interfaces.nsIURL);
+          var ext = url.fileExtension;
+          if (ext) {
+            var mimeInfo = getMIMEInfoForExtension(ext);
+            if (mimeInfo)
+              this.contentType = mimeInfo.MIMEType;
+          }
+        }
+        catch (e) {
+          // Not much we can do here.  Give up.
+        }
+      }
+    }
+    this.mCallback(this, this.mData, this.mSkipPrompt);
+  },
+
+  // ------------------------------------------------
+
+  get promptService()
+  {
+    var promptSvc;
+    try {
+      promptSvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
+      promptSvc = promptSvc.QueryInterface(Components.interfaces.nsIPromptService);
+    }
+    catch (e) {}
+    return promptSvc;
+  },
+
+  get suggestedFileName()
+  {
+    var fileName = "";
+
+    if (this.mContentDisposition) {
+      const mhpContractID = "@mozilla.org/network/mime-hdrparam;1"
+      const mhpIID = Components.interfaces.nsIMIMEHeaderParam;
+      const mhp = Components.classes[mhpContractID].getService(mhpIID);
+      var dummy = { value: null }; // To make JS engine happy.
+      var charset = getCharsetforSave(null);
+
+      try {
+        fileName = mhp.getParameter(this.mContentDisposition, "filename", charset, true, dummy);
+      } 
+      catch (e) {
+        try {
+          fileName = mhp.getParameter(this.mContentDisposition, "name", charset, true, dummy);
+        }
+        catch (e) {
+        }
+      }
+    }
+    fileName = fileName.replace(/^"|"$/g, "");
+    return fileName;
+  }
+};
+
+const MODE_COMPLETE = 0;
+const MODE_FILEONLY = 1;
+
+function appendFiltersForContentType(aFilePicker, aContentType, aSaveMode)
+{
+  var bundle = getStringBundle();
+    
+  switch (aContentType) {
+  case "text/html":
+    if (aSaveMode == MODE_COMPLETE)
+      aFilePicker.appendFilter(bundle.GetStringFromName("WebPageCompleteFilter"), "*.htm; *.html");
+    aFilePicker.appendFilter(bundle.GetStringFromName("WebPageHTMLOnlyFilter"), "*.htm; *.html");
+    if (aSaveMode == MODE_COMPLETE)
+      aFilePicker.appendFilters(Components.interfaces.nsIFilePicker.filterText);
+    break;
+  default:
+    var mimeInfo = getMIMEInfoForType(aContentType);
+    if (mimeInfo) {
+
+      var extEnumerator = mimeInfo.getFileExtensions();
+
+      var extString = "";
+      while (extEnumerator.hasMore()) {
+        var extension = extEnumerator.getNext();
+        if (extString)
+          extString += "; ";    // If adding more than one extension,
+                                // separate by semi-colon
+        extString += "*." + extension;
+      }
+
+      if (extString) {
+        aFilePicker.appendFilter(mimeInfo.Description, extString);
+      } else {
+        aFilePicker.appendFilters(Components.interfaces.nsIFilePicker.filterAll);
+      }        
+    }
+    else
+      aFilePicker.appendFilters(Components.interfaces.nsIFilePicker.filterAll);
+    break;
+  }
+} 
+
+function getPostData()
+{
+  try {
+    var sessionHistory = getWebNavigation().sessionHistory;
+    entry = sessionHistory.getEntryAtIndex(sessionHistory.index, false);
+    entry = entry.QueryInterface(Components.interfaces.nsISHEntry);
+    return entry.postData;
+  }
+  catch (e) {
+  }
+  return null;
+}
+
+//XXXPch: that that be removed.
+function getStringBundle()
+{
+  const bundleURL = "chrome://browser/locale/contentAreaCommands.properties";
+  
+  const sbsContractID = "@mozilla.org/intl/stringbundle;1";
+  const sbsIID = Components.interfaces.nsIStringBundleService;
+  const sbs = Components.classes[sbsContractID].getService(sbsIID);
+  
+  const lsContractID = "@mozilla.org/intl/nslocaleservice;1";
+  const lsIID = Components.interfaces.nsILocaleService;
+  const ls = Components.classes[lsContractID].getService(lsIID);
+  var appLocale = ls.getApplicationLocale();
+  return sbs.createBundle(bundleURL, appLocale);    
+}
+
+function makeWebBrowserPersist()
+{
+  const persistContractID = "@mozilla.org/embedding/browser/nsWebBrowserPersist;1";
+  const persistIID = Components.interfaces.nsIWebBrowserPersist;
+  return Components.classes[persistContractID].createInstance(persistIID);
+}
+
+function makeURL(aURL)
+{
+  var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                .getService(Components.interfaces.nsIIOService);
+  return ioService.newURI(aURL, null, null);
+  
+}
+
+function makeFilePicker()
+{
+  const fpContractID = "@mozilla.org/filepicker;1";
+  const fpIID = Components.interfaces.nsIFilePicker;
+  return Components.classes[fpContractID].createInstance(fpIID);
+}
+
+function getMIMEService()
+{
+  const mimeSvcContractID = "@mozilla.org/mime;1";
+  const mimeSvcIID = Components.interfaces.nsIMIMEService;
+  const mimeSvc = Components.classes[mimeSvcContractID].getService(mimeSvcIID);
+  return mimeSvc;
+}
+
+function getMIMEInfoForExtension(aExtension)
+{
+  try {  
+    return getMIMEService().GetFromExtension(aExtension);
+  }
+  catch (e) {
+  }
+  return null;
+}
+
+function getMIMEInfoForType(aMIMEType)
+{
+  try {  
+    return getMIMEService().GetFromMIMEType(aMIMEType);
+  }
+  catch (e) {
+  }
+  return null;
+}
+
+function getDefaultFileName(aDefaultFileName, aNameFromHeaders, aDocumentURI, aDocument)
+{
+  if (aNameFromHeaders)
+    // 1) Use the name suggested by the HTTP headers
+    return validateFileName(aNameFromHeaders);
+
+  try {
+    var url = aDocumentURI.QueryInterface(Components.interfaces.nsIURL);
+    if (url.fileName != "") {
+      // 2) Use the actual file name, if present
+      return validateFileName(decodeURIComponent(url.fileName));
+    }
+  } catch (e) {
+    try {
+      // the file name might be non ASCII
+      // try unescape again with a characterSet
+      var textToSubURI = Components.classes["@mozilla.org/intl/texttosuburi;1"]
+                                   .getService(Components.interfaces.nsITextToSubURI);
+      var charset = getCharsetforSave(aDocument);
+      return validateFileName(textToSubURI.unEscapeURIForUI(charset, url.fileName));
+    } catch (e) {
+      // This is something like a wyciwyg:, data:, and so forth
+      // URI... no usable filename here.
+    }
+  }
+  
+  if (aDocument) {
+    var docTitle = validateFileName(aDocument.title).replace(/^\s+|\s+$/g, "");
+
+    if (docTitle != "") {
+      // 3) Use the document title
+      return docTitle;
+    }
+  }
+  
+  if (aDefaultFileName)
+    // 4) Use the caller-provided name, if any
+    return validateFileName(aDefaultFileName);
+
+  try {
+    if (aDocumentURI.host)
+      // 5) Use the host.
+      return aDocumentURI.host;
+  } catch (e) {
+    // Some files have no information at all, like Javascript generated pages
+  }
+  try {
+    // 6) Use the default file name
+    return getStringBundle().GetStringFromName("DefaultSaveFileName");
+  } catch (e) {
+    //in case localized string cannot be found
+  }
+  // 7) If all else fails, use "index"
+  return "index";
+}
+
+function validateFileName(aFileName)
+{
+  var re = /[\/]+/g;
+  if (navigator.appVersion.indexOf("Windows") != -1) {
+    re = /[\\\/\|]+/g;
+    aFileName = aFileName.replace(/[\"]+/g, "'");
+    aFileName = aFileName.replace(/[\*\:\?]+/g, " ");
+    aFileName = aFileName.replace(/[\<]+/g, "(");
+    aFileName = aFileName.replace(/[\>]+/g, ")");
+  }
+  else if (navigator.appVersion.indexOf("Macintosh") != -1)
+    re = /[\:\/]+/g;
+  
+  return aFileName.replace(re, "_");
+}
+
+function getNormalizedLeafName(aFile, aDefaultExtension)
+{
+  if (!aDefaultExtension)
+    return aFile;
+  
+  // Fix up the file name we're saving to to include the default extension
+  const stdURLContractID = "@mozilla.org/network/standard-url;1";
+  const stdURLIID = Components.interfaces.nsIURL;
+  var url = Components.classes[stdURLContractID].createInstance(stdURLIID);
+  url.filePath = aFile;
+  
+  if (url.fileExtension != aDefaultExtension) {
+    return aFile + "." + aDefaultExtension;
+  }
+
+  return aFile;
+}
+
+function getDefaultExtension(aFilename, aURI, aContentType)
+{
+  if (aContentType == "text/plain" || aContentType == "application/octet-stream" || aURI.scheme == "ftp")
+    return "";   // temporary fix for bug 120327
+
+  // This mirrors some code in nsExternalHelperAppService::DoContent
+  // Use the filename first and then the URI if that fails
+  
+  var mimeInfo = getMIMEInfoForType(aContentType);
+
+  // First try the extension from the filename
+  const stdURLContractID = "@mozilla.org/network/standard-url;1";
+  const stdURLIID = Components.interfaces.nsIURL;
+  var url = Components.classes[stdURLContractID].createInstance(stdURLIID);
+  url.filePath = aFilename;
+
+  var ext = url.fileExtension;
+
+  if (ext && mimeInfo && mimeInfo.ExtensionExists(ext)) {
+    return ext;
+  }
+  
+  // Well, that failed.  Now try the extension from the URI
+  var urlext;
+  try {
+    url = aURI.QueryInterface(Components.interfaces.nsIURL);
+    urlext = url.fileExtension;
+  } catch (e) {
+  }
+
+  if (urlext && mimeInfo && mimeInfo.ExtensionExists(urlext)) {
+    return urlext;
+  }
+  else {
+    try {
+      return mimeInfo.primaryExtension;
+    }
+    catch (e) {
+      // Fall back on the extensions in the filename and URI for lack
+      // of anything better.
+      return ext || urlext;
+    }
+  }
+}
+
+function isDocumentType(aContentType)
+{
+  switch (aContentType) {
+  case "text/html":
+    return true;
+  case "text/xml":
+  case "application/xhtml+xml":
+  case "application/xml":
+    return false; // XXX Disables Save As Complete until it works for XML
+  }
+  return false;
+}
+
+function getCharsetforSave(aDocument)
+{
+  if (aDocument)
+    return aDocument.characterSet;
+
+  if (document.commandDispatcher.focusedWindow)
+    return document.commandDispatcher.focusedWindow.document.characterSet;
+
+  return  window._content.document.characterSet;
+  return false;
+}
+
+# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- 
+# ***** BEGIN LICENSE BLOCK *****
+# Version: NPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Netscape Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is 
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Ben Goodger <ben@netscape.com> (Save File)
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or 
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the NPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the NPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
--- a/mozilla/browser/base/content/contents.rdf
+++ b/mozilla/browser/base/content/contents.rdf
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:browser"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:browser"
+        chrome:displayName="Browser"
+        chrome:author="mozilla.org"
+        chrome:name="browser"
+        chrome:localeVersion="0.9.9"
+        chrome:skinVersion="1.5">
+  </RDF:Description>
+
+</RDF:RDF>
+
--- a/mozilla/browser/base/content/hiddenWindow.xul
+++ b/mozilla/browser/base/content/hiddenWindow.xul
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998-2000 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s):
+#   David Hyatt <hyatt@mozilla.org> (Original Author)
+#
+#ifdef XP_MACOSX
+
+<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
+
+<window id="main-window"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+</window>
+
+#endif
--- a/mozilla/browser/base/content/macBrowserOverlay.xul
+++ b/mozilla/browser/base/content/macBrowserOverlay.xul
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998-2000 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#   David Hyatt <hyatt@mozilla.org> (Original Author)
+#
+#ifdef XP_MACOSX
+
+# All DTD information is stored in a separate file so that it can be shared by
+# hiddenWindow.xul.
+#include browser-doctype.inc
+
+<overlay id="hidden-overlay"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+# All JS files that browser.xul wishes to include *must* go into the browser-scripts.inc file
+# so that they can be shared by hiddenWindow.xul.
+#include browser-scripts.inc
+
+<window id="main-window">
+
+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the 
+# browser-sets.inc file for sharing with hiddenWindow.xul.
+#include browser-sets.inc
+
+# The hacky hidden tree used by the Go menu to build items.
+#include browser-gotreehack.inc
+
+# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by 
+# hiddenWindow.xul.
+#include browser-menubar.inc
+
+</window>
+
+</overlay>
+
+#endif
--- a/mozilla/browser/base/content/metaData.js
+++ b/mozilla/browser/base/content/metaData.js
@@ -0,0 +1,622 @@
+# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is this file as it was released on
+# January 3, 2001.
+#
+# The Initial Developer of the Original Code is Jonas Sicking.
+# Portions created by Jonas Sicking are Copyright (C) 2000
+# Jonas Sicking.  All Rights Reserved.
+#
+# Contributor(s):
+#   Jonas Sicking <sicking@bigfoot.com> (Original Author)
+#   Gervase Markham <gerv@gerv.net>
+#   Heikki Toivonen <heikki@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable
+# instead of those above.  If you wish to allow use of your
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+const XLinkNS = "http://www.w3.org/1999/xlink";
+const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+const XMLNS = "http://www.w3.org/XML/1998/namespace";
+const XHTMLNS = "http://www.w3.org/1999/xhtml";
+var gMetadataBundle;
+var gLangBundle;
+var gRegionBundle;
+var nodeView;
+var htmlMode = false;
+
+var onLink   = false;
+var onImage  = false;
+var onInsDel = false;
+var onQuote  = false;
+var onMisc   = false;
+var onTable  = false;
+var onTitle  = false;
+var onLang   = false;
+
+const nsICacheService = Components.interfaces.nsICacheService;
+const cacheService = Components.classes["@mozilla.org/network/cache-service;1"]
+                     .getService(nsICacheService);
+var httpCacheSession = cacheService.createSession("HTTP", 0, true);
+httpCacheSession.doomEntriesIfExpired = false;
+var ftpCacheSession = cacheService.createSession("FTP", 0, true);
+ftpCacheSession.doomEntriesIfExpired = false;
+
+
+function onLoad()
+{
+  gMetadataBundle = document.getElementById("bundle_metadata");
+  gLangBundle = document.getElementById("bundle_languages");
+  gRegionBundle = document.getElementById("bundle_regions");
+  
+  showMetadataFor(window.arguments[0]);
+  nodeView = window.arguments[0].ownerDocument.defaultView;
+}
+
+function showMetadataFor(elem)
+{
+  // skip past non-element nodes
+  while (elem && elem.nodeType != Node.ELEMENT_NODE)
+    elem = elem.parentNode;
+
+  if (!elem) {
+    alert(gMetadataBundle.getString("unableToShowProps"));
+    window.close();
+  }
+
+  if (elem.ownerDocument.getElementsByName && !elem.ownerDocument.namespaceURI)
+    htmlMode = true;
+  
+  // htmllocalname is "" if it's not an html tag, or the name of the tag if it is.
+  var htmllocalname = "";
+  if (isHTMLElement(elem,"")) { 
+    htmllocalname = elem.localName.toLowerCase();
+  }
+  
+  // We only look for images once
+  checkForImage(elem, htmllocalname);
+  
+  // Walk up the tree, looking for elements of interest.
+  // Each of them could be at a different level in the tree, so they each
+  // need their own boolean to tell us to stop looking.
+  while (elem && elem.nodeType == Node.ELEMENT_NODE) {
+    if (!onLink)   checkForLink(elem, htmllocalname);
+    if (!onInsDel) checkForInsDel(elem, htmllocalname);
+    if (!onQuote)  checkForQuote(elem, htmllocalname);
+    if (!onTable)  checkForTable(elem, htmllocalname);
+    if (!onTitle)  checkForTitle(elem, htmllocalname);
+    if (!onLang)   checkForLang(elem, htmllocalname);
+      
+    elem = elem.parentNode;
+
+    htmllocalname = "";
+    if (isHTMLElement(elem,"")) { 
+      htmllocalname = elem.localName.toLowerCase();
+    }
+  }
+  
+  // Decide which sections to show
+  var onMisc = onTable || onTitle || onLang;
+  if (!onMisc)   hideNode("misc-sec");
+  if (!onLink)   hideNode("link-sec");
+  if (!onImage)  hideNode("image-sec");
+  if (!onInsDel) hideNode("insdel-sec");
+  if (!onQuote)  hideNode("quote-sec");
+
+  // Fix the Misc section visibilities
+  if (onMisc) {
+    if (!onTable) hideNode("misc-tblsummary");
+    if (!onLang)  hideNode("misc-lang");
+    if (!onTitle) hideNode("misc-title");
+  }
+
+  // Get rid of the "No properties" message. This is a backstop -
+  // it should really never show, as long as nsContextMenu.js's
+  // checking doesn't get broken.
+  if (onLink || onImage || onInsDel || onQuote || onMisc)
+    hideNode("no-properties")
+}
+
+
+function checkForImage(elem, htmllocalname)
+{
+  var img;
+  var imgType; // "img" = <img>
+               // "object" = <object>
+               // "input" = <input type=image>
+               // "background" = css background (to be added later)
+  var ismap = false;
+
+  if (htmllocalname === "img") {
+    img = elem;
+    imgType = "img";
+
+  } else if (htmllocalname === "object" &&
+             elem.type.substring(0,6) == "image/" &&
+             elem.data) {
+    img = elem;
+    imgType = "object";
+
+  } else if (htmllocalname === "input" &&
+             elem.type.toUpperCase() == "IMAGE") {
+    img = elem;
+    imgType = "input";
+
+  } else if (htmllocalname === "area" || htmllocalname === "a") {
+
+    // Clicked in image map?
+    var map = elem;
+    ismap = true;
+    setAlt(map);
+
+    while (map && map.nodeType == Node.ELEMENT_NODE && !isHTMLElement(map,"map") )
+      map = map.parentNode;
+
+    if (map && map.nodeType == Node.ELEMENT_NODE) {
+      img = getImageForMap(map);
+      var imgLocalName = img && img.localName.toLowerCase();
+      if (imgLocalName == "img" || imgLocalName == "object")
+          imgType = imgLocalName;
+    }
+  }
+
+  if (img) {
+
+    var imgURL = imgType == "object" ? img.data : img.src;
+    setInfo("image-url", imgURL);
+    var size = getSize(imgURL);
+
+    if (size != -1) {
+      var kbSize = size / 1024;
+      kbSize = Math.round(kbSize*100)/100;
+      setInfo("image-filesize", gMetadataBundle.getFormattedString("imageSize", [kbSize, size]));
+    } else {
+      setInfo("image-filesize", gMetadataBundle.getString("imageSizeUnknown"));
+    }
+    if ("width" in img && img.width != "") {
+      setInfo("image-width", gMetadataBundle.getFormattedString("imageWidth", [ img.width ]));
+      setInfo("image-height", gMetadataBundle.getFormattedString("imageHeight", [ img.height ]));
+    }
+    else {
+      setInfo("image-width", "");
+      setInfo("image-height", "");
+    }        
+     
+    if (imgType == "img") {
+      setInfo("image-desc", getAbsoluteURL(img.longDesc, img));
+    } else {
+      setInfo("image-desc", "");
+    }
+    
+    onImage = true;
+  }
+
+  if (!ismap) {
+   if (imgType == "img" || imgType == "input") {
+     setAlt(img);
+   } else {
+     hideNode("image-alt");
+   }
+  }
+}
+
+function checkForLink(elem, htmllocalname)
+{
+  if ((htmllocalname === "a" && elem.href != "") ||
+    htmllocalname === "area") {
+
+    setInfo("link-lang", convertLanguageCode(elem.getAttribute("hreflang")));
+    setInfo("link-url",  elem.href);
+    setInfo("link-type", elem.getAttribute("type"));
+    setInfo("link-rel",  elem.getAttribute("rel"));
+    setInfo("link-rev",  elem.getAttribute("rev"));
+
+    var target = elem.target;
+
+    switch (target) {
+    case "_top":
+      setInfo("link-target", gMetadataBundle.getString("sameWindowText"));
+      break;
+    case "_parent":
+      setInfo("link-target", gMetadataBundle.getString("parentFrameText"));
+      break;
+    case "_blank":
+      setInfo("link-target", gMetadataBundle.getString("newWindowText"));
+      break;
+    case "":
+    case "_self":
+      if (elem.ownerDocument != elem.ownerDocument.defaultView._content.document)
+        setInfo("link-target", gMetadataBundle.getString("sameFrameText"));
+      else
+        setInfo("link-target", gMetadataBundle.getString("sameWindowText"));
+      break;
+    default:
+      setInfo("link-target", "\"" + target + "\"");
+    }
+    
+    onLink = true;
+  }
+
+  else if (elem.getAttributeNS(XLinkNS,"href") != "") {
+    setInfo("link-url", getAbsoluteURL(elem.getAttributeNS(XLinkNS,"href"),elem));
+    setInfo("link-lang", "");
+    setInfo("link-type", "");
+    setInfo("link-rel", "");
+    setInfo("link-rev", "");
+
+    switch (elem.getAttributeNS(XLinkNS,"show")) {
+    case "embed":
+        setInfo("link-target", gMetadataBundle.getString("embeddedText"));
+        break;
+    case "new":
+        setInfo("link-target", gMetadataBundle.getString("newWindowText"));
+        break;
+    case "":
+    case "replace":
+        if (elem.ownerDocument != elem.ownerDocument.defaultView._content.document)
+            setInfo("link-target", gMetadataBundle.getString("sameFrameText"));
+        else
+            setInfo("link-target", gMetadataBundle.getString("sameWindowText"));
+        break;
+    default:
+        setInfo("link-target", "");
+        break;
+    }
+    
+    onLink = true;
+  }
+}
+
+function checkForInsDel(elem, htmllocalname)
+{
+  if ((htmllocalname === "ins" || htmllocalname === "del") &&
+    (elem.cite || elem.dateTime)) {
+    setInfo("insdel-cite", getAbsoluteURL(elem.cite, elem));
+    setInfo("insdel-date", elem.dateTime);
+    onInsDel = true;
+  } 
+}
+
+
+function checkForQuote(elem, htmllocalname)
+{
+  if ((htmllocalname === "q" || htmllocalname === "blockquote") && elem.cite) {
+    setInfo("quote-cite", getAbsoluteURL(elem.cite, elem));
+    onQuote = true;
+  } 
+}
+
+function checkForTable(elem, htmllocalname)
+{
+  if (htmllocalname === "table" && elem.summary) {
+    setInfo("misc-tblsummary", elem.summary);
+    onTable = true;
+  }
+}
+
+function checkForLang(elem, htmllocalname)
+{
+  if ((htmllocalname && elem.lang) || elem.getAttributeNS(XMLNS, "lang")) {
+    var abbr;
+    if (htmllocalname && elem.lang)
+      abbr = elem.lang;
+    else
+      abbr = elem.getAttributeNS(XMLNS, "lang");
+        
+    setInfo("misc-lang", convertLanguageCode(abbr));
+    onLang = true;
+  }
+}
+    
+function checkForTitle(elem, htmllocalname)
+{
+  if (htmllocalname && elem.title) {
+    setInfo("misc-title", elem.title);
+    onTitle = true;
+  }    
+}
+
+/*
+ * Set text of node id to value
+ * if value="" the node with specified id is hidden.
+ * Node should be have one of these forms
+ * <xul:label id="id-text" value=""/>
+ * <xul:description id="id-text"/>
+ */
+function setInfo(id, value)
+{
+  if (!value) {
+    hideNode(id);
+    return;
+  }
+
+  var node = document.getElementById(id+"-text");
+
+  if (node.namespaceURI == XULNS && node.localName == "label" ||
+     (node.namespaceURI == XULNS && node.localName == "textbox")) {
+    node.setAttribute("value",value);
+
+  } else if (node.namespaceURI == XULNS && node.localName == "description") {
+    while (node.hasChildNodes())
+      node.removeChild(node.firstChild);
+    node.appendChild(node.ownerDocument.createTextNode(value));
+  }
+}
+
+// Hide node with specified id
+function hideNode(id)
+{
+    var style = document.getElementById(id).getAttribute("style");
+    document.getElementById(id).setAttribute("style", "display:none;" + style);
+}
+
+const nsIScriptSecurityManager = Components.interfaces.nsIScriptSecurityManager;
+
+// opens the link contained in the node's "value" attribute.
+function openLink(node)
+{
+  var url = node.getAttribute("value");
+  // Security-Critical: Only links to 'safe' protocols should be functional.
+  // Specifically, javascript: and data: URLs must be made non-functional
+  // here, because they will run with full privilege.
+  var safeurls = /^https?:|^file:|^chrome:|^resource:|^mailbox:|^imap:|^s?news:|^nntp:|^about:|^mailto:|^ftp:|^gopher:/i;
+  if (safeurls.test(url)) {
+    var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"].getService()
+                           .QueryInterface(nsIScriptSecurityManager);
+    try {
+      secMan.checkLoadURIStr(nodeView._content.document.location,
+                             url, nsIScriptSecurityManager.STANDARD);
+    } catch (e) {
+      return;
+    }
+    nodeView._content.document.location = url;
+    window.close();
+  }
+}
+
+/*
+ * Find <img> or <object> which uses an imagemap.
+ * If more then one object is found we can't determine which one
+ * was clicked.
+ *
+ * This code has to be changed once bug 1882 is fixed.
+ * Once bug 72527 is fixed this code should use the .images collection.
+ */
+function getImageForMap(map)
+{
+  var mapuri = "#" + map.getAttribute("name");
+  var multipleFound = false;
+  var img;
+
+  var list = getHTMLElements(map.ownerDocument, "img");
+  for (var i=0; i < list.length; i++) {
+    if (list.item(i).getAttribute("usemap") == mapuri) {
+      if (img) {
+        multipleFound = true;
+        break;
+      } else {
+        img = list.item(i);
+        imgType = "img";
+      }
+    }
+  }
+
+  list = getHTMLElements(map.ownerDocument, "object");
+  for (i = 0; i < list.length; i++) {
+    if (list.item(i).getAttribute("usemap") == mapuri) {
+      if (img) {
+        multipleFound = true;
+        break;
+      } else {
+        img = list.item(i);
+        imgType = "object";
+      }
+    }
+  }
+
+  if (multipleFound)
+    img = null;
+
+  return img;
+}
+
+/*
+ * Takes care of XMLBase and <base>
+ * url is the possibly relative url.
+ * node is the node where the url was given (needed for XMLBase)
+ *
+ * This function is called in many places as a workaround for bug 72524
+ * Once bug 72522 is fixed this code should use the Node.baseURI attribute
+ *
+ * for node==null or url=="", empty string is returned
+ */
+function getAbsoluteURL(url, node)
+{
+  if (!url || !node)
+    return "";
+
+  var urlArr = new Array(url);
+  var doc = node.ownerDocument;
+
+  if (node.nodeType == Node.ATTRIBUTE_NODE)
+    node = node.ownerElement;
+
+  while (node && node.nodeType == Node.ELEMENT_NODE) {
+    if (node.getAttributeNS(XMLNS, "base") != "")
+      urlArr.unshift(node.getAttributeNS(XMLNS, "base"));
+
+    node = node.parentNode;
+  }
+
+  // Look for a <base>.
+  var baseTags = getHTMLElements(doc,"base");
+  if (baseTags && baseTags.length) {
+    urlArr.unshift(baseTags[baseTags.length - 1].getAttribute("href"));
+  }
+
+  // resolve everything from bottom up, starting with document location
+  var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                            .getService(Components.interfaces.nsIIOService);
+  var URL = ioService.newURI(doc.location.href, null, null);
+  for (var i=0; i<urlArr.length; i++) {
+    URL.spec = URL.resolve(urlArr[i]);
+  }
+
+  return URL.spec;
+}
+
+function getHTMLElements(node, name)
+{
+  if (htmlMode)
+    return node.getElementsByTagName(name);
+  return node.getElementsByTagNameNS(XHTMLNS, name);
+}
+
+// name should be in lower case
+function isHTMLElement(node, name)
+{
+  if (node.nodeType != Node.ELEMENT_NODE)
+    return false;
+
+  if (htmlMode)
+    return !name || node.localName.toLowerCase() == name;
+
+  return (!name || node.localName == name) && node.namespaceURI == XHTMLNS;
+}
+
+// This function coded according to the spec at:
+// http://www.bath.ac.uk/~py8ieh/internet/discussion/metadata.txt
+function convertLanguageCode(abbr)
+{
+  if (!abbr) return "";
+  var result;
+  var language = "";
+  var region;
+  var is_region_set = false;
+  var tokens = abbr.split("-");
+
+  if (tokens[0] === "x" || tokens[0] === "i")
+  {
+    // x and i prefixes mean unofficial ones. So we upper-case the first
+    // word and leave the rest.
+    tokens.shift();
+
+    if (tokens[0])
+    {
+      // Upper-case first letter
+      language = tokens[0].substr(0, 1).toUpperCase() + tokens[0].substr(1);
+      tokens.shift();
+
+      if (tokens[0])
+      {
+        // Add on the rest as space-separated strings inside the brackets
+        region = tokens.join(" ");
+        is_region_set = true;
+      }
+    }
+  }
+  else
+  {
+    // Otherwise we treat the first as a lang, the second as a region
+    // and the rest as strings.
+    try
+    {
+      language = gLangBundle.getString(tokens[0]);
+    }
+    catch (e) 
+    {
+      // Language not present in lang bundle
+      language = tokens[0]; 
+    }
+
+    tokens.shift();
+
+    if (tokens[0])
+    {
+      try
+      {
+        // We don't add it on to the result immediately
+        // because we want to get the spacing right.
+        region = gRegionBundle.getString(tokens[0].toLowerCase());
+
+        tokens.shift();
+
+        if (tokens[0])
+        {
+          // Add on the rest as space-separated strings inside the brackets
+          region += " " + tokens.join(" ");
+        }
+      }
+      catch (e) 
+      {
+        // Region not present in region bundle
+        region = tokens.join(" ");
+      }
+
+      is_region_set = true;
+    }
+  }
+
+  if (is_region_set) {
+    result = gMetadataBundle.getFormattedString("languageRegionFormat",
+                                                [language, region]);
+  } else
+    result = language;
+
+  return result;
+}
+
+// Returns the size of the URL in bytes; must be cached and therefore an HTTP or FTP URL
+function getSize(url) {
+  try
+  {
+    var cacheEntryDescriptor = httpCacheSession.openCacheEntry(url, Components.interfaces.nsICache.ACCESS_READ, false);
+    if(cacheEntryDescriptor)
+      return cacheEntryDescriptor.dataSize;
+  }
+  catch(ex) {}
+  try
+  {
+    cacheEntryDescriptor = ftpCacheSession.openCacheEntry(url, Components.interfaces.nsICache.ACCESS_READ, false);
+    if (cacheEntryDescriptor)
+      return cacheEntryDescriptor.dataSize;
+  }
+  catch(ex) {}
+  return -1;
+}
+
+function setAlt(elem) {
+  var altText = document.getElementById("image-alt-text");
+  if (elem.hasAttribute("alt")) {
+    if (elem.alt != "") {
+      altText.value = elem.alt;
+      altText.setAttribute("style","font-style:inherit");
+    } else {
+      altText.value = gMetadataBundle.getString("altTextBlank");
+      altText.setAttribute("style","font-style:italic");
+    }
+  } else {
+    altText.value = gMetadataBundle.getString("altTextMissing");
+    altText.setAttribute("style","font-style:italic");
+  }
+}
--- a/mozilla/browser/base/content/metaData.xul
+++ b/mozilla/browser/base/content/metaData.xul
@@ -0,0 +1,221 @@
+<?xml version="1.0"?> 
+
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is this file as it was released on
+# January 3, 2001.
+# 
+# The Initial Developer of the Original Code is Jonas Sicking.
+# Portions created by Jonas Sicking are Copyright (C) 2000
+# Jonas Sicking.  All Rights Reserved.
+# 
+# Contributor(s):
+#   Jonas Sicking <sicking@bigfoot.com> (Original Author)
+#   Gervase Markham <gerv@gerv.net>
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://browser/locale/metaData.dtd" >
+ 
+<window id="metadata"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&caption.label;"
+        onload="onLoad()"
+        class="dialog"
+        minwidth="350"
+        persist="screenX screenY"
+        screenX="24" screenY="24">
+
+  <script type="application/x-javascript" src="chrome://browser/content/metaData.js"/>
+
+  <keyset id="dialogKeys"/>
+
+  <stringbundle src="chrome://browser/locale/metaData.properties" id="bundle_metadata"/>
+  <stringbundle src="chrome://global/locale/languageNames.properties" id="bundle_languages"/>
+  <stringbundle src="chrome://global/locale/regionNames.properties" id="bundle_regions"/>
+
+  <label id="no-properties" value="&no-properties.label;"/>
+  
+  <vbox id="link-sec">
+    <label value="&link-sec.label;"/>
+    <separator class="groove"/>
+    <grid>
+      <columns>
+        <column/>
+        <column/>
+        <column flex="1"/>
+      </columns>
+      <rows>
+        <row id="link-url">
+          <separator orient="vertical"/>
+          <label value="&link-url.label; "/>
+          <textbox readonly="true" id="link-url-text"/>
+        </row>
+        <row id="link-target">
+          <separator orient="vertical"/>
+          <label value="&link-target.label; "/>
+          <textbox readonly="true" id="link-target-text"/>
+        </row>
+        <row id="link-type">
+          <separator orient="vertical"/>
+          <label value="&link-type.label; "/>
+          <textbox readonly="true" id="link-type-text"/>
+        </row>
+        <row id="link-lang">
+          <separator orient="vertical"/>
+          <label value="&link-lang.label; "/>
+          <textbox readonly="true" id="link-lang-text"/>
+        </row>
+        <row id="link-rel">
+          <separator orient="vertical"/>
+          <label value="&link-rel.label; "/>
+          <textbox readonly="true" id="link-rel-text"/>
+        </row>
+        <row id="link-rev">
+          <separator orient="vertical"/>
+          <label value="&link-rev.label; "/>
+          <textbox readonly="true" id="link-rev-text"/>
+        </row>
+      </rows>
+    </grid>
+    <separator/>
+  </vbox>
+  <vbox id="image-sec">
+    <label value="&image-sec.label;"/>
+    <separator class="groove"/>
+    <grid>
+      <columns>
+        <column/>
+        <column/>
+        <column flex="1"/>
+      </columns>
+      <rows>
+        <row id="image-url">
+          <separator orient="vertical"/>
+          <label value="&image-url.label; "/>
+          <textbox readonly="true" id="image-url-text"/>
+        </row>
+        <row id="image-width">
+          <separator orient="vertical"/>
+          <label value="&image-width.label; "/>
+          <textbox readonly="true" id="image-width-text"/>
+        </row>
+        <row id="image-height">
+          <separator orient="vertical"/>
+          <label value="&image-height.label; "/>
+          <textbox readonly="true" id="image-height-text"/>
+        </row>
+	<row id="image-filesize">
+          <separator orient="vertical"/>
+          <label value="&image-filesize.label; "/>
+          <textbox readonly="true" id="image-filesize-text"/>
+	</row>
+        <row id="image-alt">
+          <separator orient="vertical"/>
+          <label value="&image-alt.label; "/>
+          <textbox readonly="true" id="image-alt-text"/>
+        </row>
+        <row id="image-desc">
+          <separator orient="vertical"/>
+          <label value="&image-desc.label; "/>
+          <textbox readonly="true" id="image-desc-text"/>
+        </row>
+      </rows>
+    </grid>
+    <separator/>
+  </vbox>
+  <vbox id="insdel-sec">
+    <label value="&insdel-sec.label;"/>
+    <separator class="groove"/>
+    <grid>
+      <columns>
+        <column/>
+        <column/>
+        <column flex="1"/>
+      </columns>
+      <rows>
+        <row id="insdel-cite">
+          <separator orient="vertical"/>
+          <label value="&insdel-cite.label; "/>
+          <textbox readonly="true" id="insdel-cite-text"/>
+        </row>
+        <row id="insdel-date">
+          <separator orient="vertical"/>
+          <label value="&insdel-date.label; "/>
+          <textbox readonly="true" id="insdel-date-text"/>
+        </row>
+      </rows>
+    </grid>
+    <separator/>
+  </vbox>
+  <vbox id="quote-sec">
+    <label value="&quote-sec.label;"/>
+    <separator class="groove"/>
+    <grid>
+      <columns>
+        <column/>
+        <column/>
+        <column flex="1"/>
+      </columns>
+      <rows>
+        <row id="quote-cite">
+          <separator orient="vertical"/>
+          <label value="&quote-cite.label; "/>
+          <textbox readonly="true" id="quote-cite-text"/>
+        </row>
+      </rows>
+    </grid>
+    <separator/>
+  </vbox>
+  <vbox id="misc-sec">
+    <label value="&misc-sec.label;"/>
+    <separator class="groove"/>
+    <grid>
+      <columns>
+        <column/>
+        <column/>
+        <column flex="1"/>
+      </columns>
+      <rows>
+        <row id="misc-lang">
+          <separator orient="vertical"/>
+          <label value="&misc-lang.label; "/>
+          <textbox readonly="true" id="misc-lang-text"/>
+        </row>
+        <row id="misc-title">
+          <separator orient="vertical"/>
+          <label value="&misc-title.label; "/>
+          <textbox readonly="true" id="misc-title-text"/>
+        </row>
+        <row id="misc-tblsummary">
+          <separator orient="vertical"/>
+          <label value="&misc-tblsummary.label; "/>
+          <textbox readonly="true" id="misc-tblsummary-text"/>
+        </row>
+      </rows>
+    </grid>
+    <separator/>
+  </vbox>
+</window>
--- a/mozilla/browser/base/content/openLocation.js
+++ b/mozilla/browser/base/content/openLocation.js
@@ -0,0 +1,147 @@
+# -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is Mozilla Communicator client code, released March
+# 31, 1998.
+#
+# The Initial Developer of the Original Code is Netscape Communications
+# Corporation. Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): Michael Lowe <michael.lowe@bigfoot.com>
+#                 Blake Ross   <blaker@netscape.com>
+#
+
+var browser;
+var dialog = {};
+var pref = null;
+try {
+  pref = Components.classes["@mozilla.org/preferences-service;1"]
+                   .getService(Components.interfaces.nsIPrefBranch);
+} catch (ex) {
+  // not critical, remain silent
+}
+
+function onLoad()
+{
+  dialog.input         = document.getElementById("dialog.input");
+  dialog.open          = document.documentElement.getButton("accept");
+  dialog.openWhereList = document.getElementById("openWhereList");
+  dialog.openTopWindow = document.getElementById("currentWindow");
+  dialog.bundle        = document.getElementById("openLocationBundle");
+
+  if ("arguments" in window && window.arguments.length >= 1)
+    browser = window.arguments[0];
+   
+  dialog.openWhereList.selectedItem = dialog.openTopWindow;
+
+  // change OK button text to 'open'
+  dialog.open.label = dialog.bundle.getString("openButtonLabel");
+
+  if (pref) {
+    try {
+      var value = pref.getIntPref("general.open_location.last_window_choice");
+      var element = dialog.openWhereList.getElementsByAttribute("value", value)[0];
+      if (element)
+        dialog.openWhereList.selectedItem = element;
+      dialog.input.value = pref.getComplexValue("general.open_location.last_url",
+                                                Components.interfaces.nsISupportsString).data;
+    }
+    catch(ex) {
+    }
+    if (dialog.input.value)
+      dialog.input.select(); // XXX should probably be done automatically
+  }
+
+  doEnabling();
+}
+
+function doEnabling()
+{
+    dialog.open.disabled = !dialog.input.value;
+}
+
+function open()
+{
+  var url;
+  if (browser)
+    url = browser.getShortcutOrURI(dialog.input.value);
+  else
+    url = dialog.input.value;
+
+  try {
+    switch (dialog.openWhereList.value) {
+      case "0":
+        browser.loadURI(url);
+        break;
+      case "1":
+        window.opener.delayedOpenWindow(getBrowserURL(), "all,dialog=no", url);
+        break;
+      case "3":
+        if (browser.getBrowser && browser.getBrowser().localName == "tabbrowser")
+          browser.delayedOpenTab(url);
+        else
+          browser.loadURI(url); // Just do a normal load.
+        break;
+    }
+  }
+  catch(exception) {
+  }
+
+  if (pref) {
+    var str = Components.classes["@mozilla.org/supports-string;1"]
+                        .createInstance(Components.interfaces.nsISupportsString);
+    str.data = dialog.input.value;
+    pref.setComplexValue("general.open_location.last_url",
+                         Components.interfaces.nsISupportsString, str);
+    pref.setIntPref("general.open_location.last_window_choice", dialog.openWhereList.value);
+  }
+
+  // Delay closing slightly to avoid timing bug on Linux.
+  window.close();
+  return false;
+}
+
+function createInstance(contractid, iidName)
+{
+  var iid = Components.interfaces[iidName];
+  return Components.classes[contractid].createInstance(iid);
+}
+
+const nsIFilePicker = Components.interfaces.nsIFilePicker;
+function onChooseFile()
+{
+  try {
+    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+    fp.init(window, dialog.bundle.getString("chooseFileDialogTitle"), nsIFilePicker.modeOpen);
+    else {
+      fp.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterText |
+                       nsIFilePicker.filterAll | nsIFilePicker.filterImages | nsIFilePicker.filterXML);
+    }
+
+    if (fp.show() == nsIFilePicker.returnOK && fp.fileURL.spec && fp.fileURL.spec.length > 0)
+      dialog.input.value = fp.fileURL.spec;
+  }
+  catch(ex) {
+  }
+  doEnabling();
+}
+
+function useUBHistoryItem(aMenuItem)
+{
+  var urlbar = document.getElementById("dialog.input");
+  urlbar.value = aMenuItem.getAttribute("label");
+  urlbar.focus();
+  doEnabling();
+}
+
--- a/mozilla/browser/base/content/openLocation.xul
+++ b/mozilla/browser/base/content/openLocation.xul
@@ -0,0 +1,72 @@
+<?xml version="1.0"?> 
+#
+#  The contents of this file are subject to the Netscape Public
+#  License Version 1.1 (the "License"); you may not use this file
+#  except in compliance with the License. You may obtain a copy of
+#  the License at http://www.mozilla.org/NPL/
+#  
+#  Software distributed under the License is distributed on an "AS
+#  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+#  implied. See the License for the specific language governing
+#  rights and limitations under the License.
+#  
+#  The Original Code is Mozilla Communicator client code, released
+#  March 31, 1998.
+#  
+#  The Initial Developer of the Original Code is Netscape
+#  Communications Corporation. Portions created by Netscape are
+#  Copyright (C) 1998-1999 Netscape Communications Corporation. All
+#  Rights Reserved.
+#  
+#  Contributor(s): 
+#    Ben Goodger <ben@netscape.com>
+#    Michael Lowe <michael.lowe@bigfoot.com> 
+#
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE dialog SYSTEM "chrome://browser/locale/openLocation.dtd">
+ 
+<dialog id="openLocation"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&caption.label;"
+        onload="onLoad()"
+        ondialogaccept="open()"
+        style="width: 40em;"
+        persist="screenX screenY"
+        screenX="24" screenY="24">
+              
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/> 
+  <script type="application/x-javascript" src="chrome://browser/content/openLocation.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
+  
+  <stringbundle id="openLocationBundle" src="chrome://browser/locale/openLocation.properties"/>
+
+  <hbox>
+    <separator orient="vertical" class="thin"/>
+    <vbox flex="1">
+      <description>&enter.label;</description>
+      <separator class="thin"/>
+
+      <hbox align="center">
+        <textbox id="dialog.input" flex="1" type="autocomplete"
+                  autocompletesearch="history"
+                  enablehistory="true"
+                  oninput="doEnabling();"/>
+        <button label="&chooseFile.label;" oncommand="onChooseFile();"/>
+      </hbox>
+      <hbox align="center">
+        <label value="&openWhere.label;"/>
+        <menulist id="openWhereList">
+          <menupopup>
+            <menuitem value="0" id="currentWindow" label="&topWindow.label;"/>
+            <menuitem value="1" label="&newWindow.label;"/>
+            <menuitem value="3" label="&newTab.label;"/>
+          </menupopup>
+        </menulist>
+        <spacer flex="1"/>
+      </hbox>
+    </vbox>
+  </hbox> 
+           
+</dialog>
--- a/mozilla/browser/base/content/pageInfo.js
+++ b/mozilla/browser/base/content/pageInfo.js
--- a/mozilla/browser/base/content/pageInfo.xul
+++ b/mozilla/browser/base/content/pageInfo.xul
@@ -0,0 +1,313 @@
+<?xml version="1.0"?> 
+#  The contents of this file are subject to the Netscape Public
+#  License Version 1.1 (the "License"); you may not use this file
+#  except in compliance with the License. You may obtain a copy of
+#  the License at http://www.mozilla.org/NPL/
+#  
+#  Software distributed under the License is distributed on an "AS
+#  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+#  implied. See the License for the specific language governing
+#  rights and limitations under the License.
+#  
+#  The Original Code is Mozilla Communicator client code, released
+#  March 31, 1998.
+#  
+#  The Initial Developer of the Original Code is Netscape
+#  Communications Corporation. Portions created by Netscape are
+#  Copyright (C) 1998-1999 Netscape Communications Corporation. All
+#  Rights Reserved.
+#  
+#  Contributor(s): 
+#    Simeon Morrison <smorrison@gte.com>
+#    Chris McAfee <mcafee@netscape.com>
+#    Daniel Brooks <db48x@yahoo.com>
+#    Gervase Markham <gerv@gerv.net>
+ 
+<?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
+
+<!DOCTYPE window [
+  <!ENTITY % pageInfoDTD SYSTEM "chrome://browser/locale/pageInfo.dtd">
+  %pageInfoDTD;
+]>
+
+<window id="main-window"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  windowtype="Browser:page-info"
+  onload="onLoadPageInfo()" onclose="return closeWindow(false);"
+  align="stretch" class="dialog"
+  screenX="10" screenY="10"
+  width="&pageInfoWindow.width;" height="&pageInfoWindow.height;"
+  persist="screenX screenY width height sizemode">
+
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/contentAreaUtils.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/pageInfo.js"/>
+
+  <keyset>
+    <key id="closeWindow" key="&closeWindow;" modifiers="accel" oncommand="closeWindow(true);"/>
+    <key keycode="VK_ESCAPE" oncommand="closeWindow(true);"/>
+    <key id="copy" key="c" modifiers="accel" oncommand="doCopy(event);"/>
+  </keyset>
+  <!-- keys are appended from the overlay -->
+  <keyset id="dialogKeys"/>
+
+  <stringbundle id="pageinfobundle" src="chrome://browser/locale/pageInfo.properties"/>
+
+  <tabbox id="tabbox" flex="1">
+    <tabs id="tabs">
+      <tab id="generalTab" label="&generalTab;"/>
+      <tab id="formsTab"   label="&formsTab;"   
+           oncommand="ensureSelection(formView)"/>
+      <tab id="linksTab"   label="&linksTab;"   
+           oncommand="ensureSelection(linkView)"/>
+      <tab id="mediaTab"   label="&mediaTab;"  
+           oncommand="ensureSelection(imageView)"/>
+      <!-- Others added by overlay -->
+    </tabs>
+    <tabpanels id="tabpanels" flex="1">
+
+      <!-- General page information -->
+      <vbox>
+        <textbox class="header" readonly="true" crop="right" id="titletext"/>
+        <grid>
+          <columns>
+            <column/>
+            <column style="width: .5em;"/>
+            <column flex="1"/>
+          </columns>
+          <rows>
+            <row>
+              <label value="&generalURL;"/>
+              <separator/>
+              <textbox readonly="true" crop="right" id="urltext" class="text-link"/>
+            </row>
+            <row>
+              <separator class="thin"/>
+            </row>
+            <row>
+              <label value="&generalType;"/>
+              <separator/>
+              <textbox readonly="true" crop="right" id="typetext"/>
+            </row>
+            <row>
+              <label value="&generalMode;"/>
+              <separator/>
+              <textbox readonly="true" crop="right" id="modetext"/>
+            </row>
+            <row>
+              <label value="&generalSource;"/>
+              <separator/>
+              <textbox readonly="true" crop="right" id="sourcetext"/>
+            </row>
+            <row>
+              <label value="&generalEncoding;"/>
+              <separator/>
+              <textbox readonly="true" crop="right" id="encodingtext"/>
+            </row>
+            <row>
+              <label value="&generalSize;"/>
+              <separator/>
+              <textbox readonly="true" crop="right" id="sizetext"/>
+            </row>
+            <row>
+              <label value="&generalReferrer;"/>
+              <separator/>
+              <textbox readonly="true" crop="right" id="refertext"/>
+            </row>
+            <row>
+              <separator class="thin"/>
+            </row>
+            <row>
+              <label value="&generalModified;"/>
+              <separator/>
+              <textbox readonly="true" crop="right" id="modifiedtext"/>
+            </row>
+            <row>
+              <label value="&generalExpires;"/>
+              <separator/>
+              <textbox readonly="true" crop="right" id="expirestext"/>
+            </row>
+          </rows>
+        </grid>
+        <separator class="thin"/>
+        <text id="metahead" class="header" value="&generalMeta;"/>
+        <tree id="metatree" flex="1">
+          <treecols>
+            <treecol persist="hidden width" flex="1" id="meta-name"    label="&generalMetaName;"/>
+            <splitter class="tree-splitter"/>
+            <treecol persist="hidden width" flex="4" id="meta-content" label="&generalMetaContent;"/>
+          </treecols>
+          <treechildren flex="1"/>
+        </tree>
+      </vbox>
+
+      <!-- Form information -->
+      <vbox>
+        <tree id="formtree" class="fixedsize" persist="height" onselect="onFormSelect();">
+          <treecols>
+            <splitter class="tree-splitter"/>
+            <treecol sortSeparators="true" persist="hidden width" flex="1" 
+                         width="1" id="form-name"   label="&formName;"/>
+            <splitter class="tree-splitter"/>
+            <treecol sortSeparators="true" persist="hidden width" flex="3" 
+                         width="3" id="form-method" label="&formMethod;"/>
+            <splitter class="tree-splitter"/>
+            <treecol sortSeparators="true" persist="hidden width" flex="2" 
+                         width="2" id="form-action" label="&formAction;"/>
+          </treecols>
+          <treechildren flex="1"/>
+        </tree>
+        <splitter orient="vertical" collapse="after"/>
+        <vbox flex="1">
+          <textbox class="header" id="formname"/>
+          <grid>
+            <columns>
+              <column/>
+              <column style="width: .5em;"/>
+              <column flex="1"/>
+            </columns>
+            <rows>
+              <row>
+                <label value="&formEncoding;"/>
+                <separator/>
+                <textbox readonly="true" crop="right" id="formenctype"/>
+              </row>
+              <row>
+                <label value="&formTarget;"/>
+                <separator/>
+                <textbox readonly="true" crop="right" class="label" id="formtarget"/>
+              </row>
+            </rows>
+          </grid>
+          <text class="header" value="&formFields;"/>
+          <tree id="formpreview" flex="1">
+            <treecols>
+              <treecol sortSeparators="true" persist="hidden width" flex="3" 
+                           width="3" id="field-label"  label="&formLabel;"/>
+              <splitter class="tree-splitter"/>
+              <treecol sortSeparators="true" persist="hidden width" flex="3" 
+                           width="3" id="field-field"  label="&formFName;"/>
+              <splitter class="tree-splitter"/>
+              <treecol sortSeparators="true" persist="hidden width" flex="1" 
+                           width="1" id="field-type"   label="&formType;"/>
+              <splitter class="tree-splitter"/>
+              <treecol sortSeparators="true" persist="hidden width" flex="3" 
+                           width="3" id="field-value"  label="&formCValue;"/>
+            </treecols>
+            <treechildren flex="1"/>
+          </tree>
+        </vbox>
+      </vbox>
+
+      <!-- Link info -->
+      <vbox>
+        <tree id="linktree" flex="1" ondraggesture="onBeginLinkDrag(event,'link-address','link-name')">
+          <treecols>
+            <treecol sortSeparators="true" persist="hidden width" flex="5" 
+                         width="5" id="link-name"     label="&linkName;"/>
+            <splitter class="tree-splitter"/>
+            <treecol sortSeparators="true" persist="hidden width" flex="7" 
+                         width="7" id="link-address"  label="&linkAddress;"/>
+            <splitter class="tree-splitter"/>
+            <treecol sortSeparators="true" persist="hidden width" flex="2" 
+                         width="2" id="link-type"     label="&linkType;"/>
+            <splitter class="tree-splitter"/>
+            <treecol sortSeparators="true" persist="hidden width" flex="2"
+                         width="2" id="link-target"   label="&linkTarget;" hidden="true"/>
+            <splitter class="tree-splitter"/>
+            <treecol sortSeparators="true" persist="hidden width" flex="1"
+                         width="1" id="link-acceskey" label="&linkAccessKey;" hidden="true"/>
+          </treecols>
+          <treechildren flex="1"/>
+        </tree>
+      </vbox>
+
+      <!-- Media information -->
+      <vbox>
+        <tree id="imagetree" class="fixedsize" persist="height" onselect="onImageSelect();" ondraggesture="onBeginLinkDrag(event,'image-address','image-alt')">
+          <treecols>
+            <treecol sortSeparators="true" persist="hidden width" flex="10" 
+                         width="10" id="image-address" label="&mediaAddress;"/>
+            <splitter class="tree-splitter"/>
+            <treecol sortSeparators="true" persist="hidden width" flex="2" 
+                         width="2"  id="image-type"    label="&mediaType;"/>
+            <splitter class="tree-splitter"/>
+            <treecol sortSeparators="true" hidden="true" persist="hidden width" flex="4" 
+                         width="4"  id="image-alt"    label="&mediaAltHeader;"/>
+          </treecols>
+          <treechildren flex="1"/>
+        </tree>
+        <splitter collapse="after" orient="vertical"/>
+        <vbox flex="1">
+          <grid>
+            <columns>
+              <column/>
+              <column style="width: .5em;"/>
+              <column flex="1"/>
+            </columns>
+            <rows>
+              <row>
+                <label value="&mediaURL;"/>
+                <separator/>
+                <textbox readonly="true" crop="right" id="imageurltext"/>
+              </row>
+              <row>
+                <label value="&mediaTitle;"/>
+                <separator/>
+                <textbox readonly="true" crop="right" id="imagetitletext"/>
+              </row>
+              <row>
+                <label value="&mediaAlt;"/>
+                <separator/>
+                <textbox readonly="true" crop="right" id="imagealttext"/>
+              </row>
+              <row>
+                <label value="&mediaLongdesc;"/>
+                <separator/>
+                <textbox readonly="true" crop="right" id="imagelongdesctext"/>
+              </row>
+              <row>
+                <label value="&generalType;"/>
+                <separator/>
+                <textbox readonly="true" crop="right" id="imagetypetext"/>
+              </row>
+              <row>
+                <label value="&generalSource;"/>
+                <separator/>
+                <textbox readonly="true" crop="right" id="imagesourcetext"/>
+              </row>
+              <row>
+                <label value="&generalSize;"/>
+                <separator/>
+                <textbox readonly="true" crop="right" id="imagesizetext"/>
+              </row>
+              <row>
+                <label value="&generalExpires;"/>
+                <separator/>
+                <textbox readonly="true" crop="right" id="imageexpirestext"/>
+              </row>
+              <row>
+                <label value="&mediaDimensions;"/>
+                <separator/>
+                <vbox>
+                  <textbox readonly="true" crop="right" id="imageSize"/>
+                  <textbox readonly="true" crop="right" id="physSize"/>
+                </vbox>
+              </row>
+            </rows>
+          </grid>
+          <hbox>
+            <button label="&mediaSaveAs;" accesskey="&mediaSaveAsAccesskey;" id="imagesaveasbutton" disabled="true" oncommand="saveMedia();"/>
+          </hbox>
+          <vbox class="inset iframe" flex="1" pack="center">
+            <hbox id="theimagecontainer" pack="center">
+              <image id="thepreviewimage"/>
+            </hbox>
+          </vbox>
+        </vbox>
+      </vbox>
+
+      <!-- Others added by overlay -->
+    </tabpanels>
+  </tabbox>
+</window>
--- a/mozilla/browser/base/content/pageReport.js
+++ b/mozilla/browser/base/content/pageReport.js
@@ -0,0 +1,94 @@
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s): 
+#   David Hyatt  (hyatt@apple.com)
+#   Dean Tessman (dean_tessman@hotmail.com)
+
+var gSiteBox;
+var gUnblockButton;
+var gPageReport;
+
+var permissionmanager =
+        Components.classes["@mozilla.org/permissionmanager;1"]
+          .getService(Components.interfaces.nsIPermissionManager);
+var nsIPermissionManager = Components.interfaces.nsIPermissionManager;
+
+function onLoad()
+{
+  gSiteBox = document.getElementById("siteBox");
+  gUnblockButton = document.getElementById("unblockButton");
+  gPageReport = opener.gBrowser.pageReport;
+
+  buildSiteBox();
+  // select the first item using a delay, otherwise the listitems
+  // don't paint as selected.
+  setTimeout(selectFirstItem, 0);
+}
+
+function selectFirstItem()
+{
+  gSiteBox.selectedIndex = 0;
+}
+
+function buildSiteBox()
+{
+  for (var i = 0; i < gPageReport.length; i++) {
+    var found = false;
+    for (var j = 0; j < gSiteBox.childNodes.length; j++) {
+      if (gSiteBox.childNodes[j].label == gPageReport[i]) {
+        found = true;
+        break;
+      }
+    }
+
+    if (!found)
+      gSiteBox.appendItem(gPageReport[i]);
+  }
+}
+
+function siteSelected()
+{
+  gUnblockButton.disabled = (gSiteBox.selectedItems.length == 0);
+}
+
+function whitelistSite()
+{
+  var selectedItem = gSiteBox.selectedItems[0];
+  if (!selectedItem)
+    return;
+
+  var selectedIndex = gSiteBox.getIndexOfItem(selectedItem);
+
+  var uri = Components.classes['@mozilla.org/network/standard-url;1'].createInstance(Components.interfaces.nsIURI);
+  uri.spec = selectedItem.label;
+  permissionmanager.add(uri, "popup", nsIPermissionManager.ALLOW_ACTION);
+  gSiteBox.removeChild(selectedItem);
+
+  if (gSiteBox.getRowCount() == 0) {
+    // close if there are no other sites to whitelist
+    window.close();
+    return;
+  }
+
+  // make sure a site is selected
+  if (selectedIndex > gSiteBox.getRowCount() - 1)
+    selectedIndex -= 1;
+  gSiteBox.selectedIndex = selectedIndex;
+  document.documentElement.getButton("accept").focus()
+}
--- a/mozilla/browser/base/content/pageReport.xul
+++ b/mozilla/browser/base/content/pageReport.xul
@@ -0,0 +1,57 @@
+<?xml version="1.0"?> 
+#
+#  The contents of this file are subject to the Netscape Public
+#  License Version 1.1 (the "License"); you may not use this file
+#  except in compliance with the License. You may obtain a copy of
+#  the License at http://www.mozilla.org/NPL/
+#  
+#  Software distributed under the License is distributed on an "AS
+#  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+#  implied. See the License for the specific language governing
+#  rights and limitations under the License.
+#  
+#  The Original Code is Mozilla Communicator client code, released
+#  March 31, 1998.
+#  
+#  The Initial Developer of the Original Code is Netscape
+#  Communications Corporation. Portions created by Netscape are
+#  Copyright (C) 1998-1999 Netscape Communications Corporation. All
+#  Rights Reserved.
+#  
+#  Contributor(s): 
+#    David Hyatt  (hyatt@apple.com)
+#    Dean Tessman (dean_tessman@hotmail.com)
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE dialog [
+  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+  %brandDTD;
+  <!ENTITY % openDialogDTD SYSTEM "chrome://browser/locale/pageReport.dtd" >
+  %openDialogDTD;
+]>            
+ 
+<dialog id="pageReport"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&caption.label;"
+        onload="onLoad()"
+        style="width: 40em;"
+        buttons="accept"
+        persist="screenX screenY"
+        screenX="24" screenY="24">
+              
+  <script type="application/x-javascript" src="chrome://browser/content/pageReport.js"/>
+ 
+  <description>
+    &intro.label;
+  </description>
+  <listbox style="height:10em" id="siteBox" onselect="siteSelected();" flex="1"/>
+  <separator class="thin"/>
+  <hbox>
+    <button label="&unblock.label;" id="unblockButton" oncommand="whitelistSite();"
+      disabled="true" accesskey="&unblock.accesskey;"/>
+    <spacer flex="1"/>
+    <button dlgtype="accept" label="&done.label;" default="true"
+      oncommand="window.close();" accesskey="&done.accesskey;"/>
+  </hbox>
+</dialog>
--- a/mozilla/browser/base/content/pageReportFirstTime.xul
+++ b/mozilla/browser/base/content/pageReportFirstTime.xul
@@ -0,0 +1,60 @@
+<?xml version="1.0"?> 
+#  The contents of this file are subject to the Netscape Public
+#  License Version 1.1 (the "License"); you may not use this file
+#  except in compliance with the License. You may obtain a copy of
+#  the License at http://www.mozilla.org/NPL/
+#  
+#  Software distributed under the License is distributed on an "AS
+#  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+#  implied. See the License for the specific language governing
+#  rights and limitations under the License.
+#  
+#  The Original Code is Mozilla Communicator client code, released
+#  March 31, 1998.
+#  
+#  The Initial Developer of the Original Code is Netscape
+#  Communications Corporation. Portions created by Netscape are
+#  Copyright (C) 1998-1999 Netscape Communications Corporation. All
+#  Rights Reserved.
+#  
+#  Contributor(s): 
+#    David Hyatt (hyatt@apple.com)
+
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
+
+<!DOCTYPE dialog [
+  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+  %brandDTD;
+  <!ENTITY % pageReportFirstTimeDTD SYSTEM "chrome://browser/locale/pageReportFirstTime.dtd" >
+  %pageReportFirstTimeDTD;
+]>            
+ 
+<dialog id="pageReportFirstTime"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&caption.label;"
+        onload="setTimeout('window.sizeToContent();', 100);"
+        style="width: 40em;"
+        buttons="accept"
+        persist="screenX screenY"
+        screenX="24" screenY="24">
+              
+  <description>
+    &startDescription.label;
+  </description>
+
+  <separator class="thin"/>
+
+  <hbox pack="center">
+    <statusbar style="width:20em">
+      <statusbarpanel class="statusbarpanel-iconic" style="min-height:18px" id="page-report-button" blocked="true"/>
+      <statusbarpanel flex="1" pack="left"><description>&done.label;</description></statusbarpanel>
+    </statusbar>
+  </hbox>
+
+  <separator class="thin"/>
+
+  <description>
+    &endDescription.label;
+  </description>
+
+ </dialog>
--- a/mozilla/browser/base/content/search.xml
+++ b/mozilla/browser/base/content/search.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0"?>
+
+# -*- Mode: HTML -*-
+# ***** BEGIN LICENSE BLOCK *****
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org browser.
+# 
+# The Initial Developer of the Original Code is Joe Hewitt.
+# Portions created by the Initial Developer are
+# Copyright (C) 2003 the Initial Developer.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#     Pierre Chanial V 2.0 (p_ch@verizon.net)
+#
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+# ***** END LICENSE BLOCK *****
+
+<bindings id="SearchBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+  <binding id="searchbar" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete">
+    <implementation>
+      <constructor><![CDATA[
+        setTimeout(function(a) { a.initialize(); }, 0, this);
+      ]]></constructor>
+
+      <method name="initialize">
+        <body><![CDATA[
+          this.RDF = Components.classes["@mozilla.org/rdf/rdf-service;1"]
+                               .getService(Components.interfaces.nsIRDFService);
+          this.ISEARCHDS = this.RDF.GetDataSource("rdf:internetsearch");
+
+          var engine = this.currentEngine;
+          if (!engine)
+            this.currentEngine = this.getDefaultEngine();
+          else {
+            var rEngine = this.RDF.GetResource(engine);
+            var rChild  = this.RDF.GetResource("http://home.netscape.com/NC-rdf#child");
+            if (!this.ISEARCHDS.hasArcIn(rEngine, rChild)) {
+              // XXXben this is a short term hack to prevent the search engine selector
+              // from forgetting the defaut.
+              var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+              file.initWithPath(unescape(engine.substr("engine://".length)));
+              if (!file.exists())
+                this.currentEngine = "__PhoenixFindInPage";
+            }
+          }
+        ]]></body>
+      </method>
+
+      <field name="RDF"/>
+      <field name="ISEARCHDS"/>
+
+      <property name="currentEngine"
+                onget="return this.getAttribute('searchengine')">
+        <setter><![CDATA[
+          if (!val)
+            return;
+
+          this.setAttribute("searchengine", val);
+
+          if (val == "__PhoenixFindInPage") {
+            this.setAttribute("autocompletesearchparam", "__PhoenixFindInPage");
+            this.firstChild.removeAttribute("src");
+            return;
+          }
+
+          this.setAttribute("autocompletesearchparam", "q");
+          const kNC_Icon = this.RDF.GetResource("http://home.netscape.com/NC-rdf#Icon");
+          var rEngine = this.RDF.GetResource(val);
+          this.firstChild.setAttribute("src", this.readRDFString(rEngine, kNC_Icon));
+          
+        ]]></setter>
+      </property>
+
+      <method name="getDefaultEngine">
+        <body><![CDATA[
+          var PREF = Components.classes["@mozilla.org/preferences-service;1"]
+                               .getService(Components.interfaces.nsIPrefService)
+                               .getBranch(null);
+          var defaultName = PREF.getComplexValue("browser.search.defaultenginename",
+                                                 Components.interfaces.nsIPrefLocalizedString).data;
+
+          const kNC_Root  = this.RDF.GetResource("NC:SearchEngineRoot");
+          const kNC_child = this.RDF.GetResource("http://home.netscape.com/NC-rdf#child");
+          const kNC_Name  = this.RDF.GetResource("http://home.netscape.com/NC-rdf#Name");
+          
+          var arcs = this.ISEARCHDS.GetTargets(kNC_Root, kNC_child, true);
+          while (arcs.hasMoreElements()) {
+            var rEngine = arcs.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
+            var name = this.readRDFString(rEngine, kNC_Name);
+            if (name == defaultName)
+              return rEngine.Value;
+          }
+          return null;
+        ]]></body>
+      </method>
+
+      <method name="readRDFString">
+        <parameter name="aRes"/>
+        <parameter name="aProp"/>
+        <body><![CDATA[
+          var n = this.ISEARCHDS.GetTarget(aRes, aProp, true);
+          return n ? n.QueryInterface(Components.interfaces.nsIRDFLiteral).Value : null;
+        ]]></body>
+      </method>
+
+      // overload |onTextEntered| in autocomplete.xml
+      <method name="onTextEntered">
+        <body><![CDATA[
+          // Save the current value in the form history
+          if (gFormFillEnabled) {
+            if (!gFormHistory)
+              gFormHistory = Components.classes["@mozilla.org/satchel/form-history;1"]
+                                       .getService(Components.interfaces.nsIFormHistory);
+            gFormHistory.addEntry(this.getAttribute("autocompletesearchparam"), this.value);
+          }
+          if (this.currentEngine != "__PhoenixFindInPage") {
+            var ISEARCHSVC = Components.classes["@mozilla.org/rdf/datasource;1?name=internetsearch"]
+                                       .getService(Components.interfaces.nsIInternetSearchService);
+            var searchURL = ISEARCHSVC.GetInternetSearchURL(this.currentEngine, encodeURIComponent(this.value), 
+                                                            0, 0, {value:0});
+            gURLBar.value = searchURL;
+            BrowserLoadURL(this.mEnterEvent); // from autocomplete.xml
+          } else {
+            quickFindInPage(this.value);
+          }
+        ]]></body>
+      </method>
+
+    </implementation>
+
+    <handlers>
+
+      <handler event="keypress" keycode="vk_up" modifiers="control" phase="capturing">
+        <![CDATA[
+          var currentEngine = this.currentEngine;
+          if (currentEngine && currentEngine != "__PhoenixFindInPage") {
+            var searchEngineMenuitem = document.getElementById(currentEngine);
+            var newEngine = searchEngineMenuitem.previousSibling;
+            if (!newEngine.id)
+              newEngine = {id: "__PhoenixFindInPage"}
+            this.currentEngine = newEngine.id;
+          }
+          event.preventDefault();
+          event.stopPropagation();
+        ]]>
+      </handler>
+
+      <handler event="keypress" keycode="vk_down" modifiers="control" phase="capturing">
+        <![CDATA[
+          var currentEngine = this.currentEngine;
+          if (!currentEngine)
+            return;
+          var searchEngineMenuitem = document.getElementById(currentEngine);
+          var newEngine;
+          if (currentEngine == "__PhoenixFindInPage") {
+            newEngine = searchEngineMenuitem.nextSibling.nextSibling.nextSibling;
+          } else {
+            newEngine = searchEngineMenuitem.nextSibling;
+          }
+          if (newEngine)
+            this.currentEngine = newEngine.id;
+          event.preventDefault();
+          event.stopPropagation();
+        ]]>
+      </handler>
+
+    </handlers>
+
+  </binding>
+  
+  <binding id="searchBarDropMarker">
+    <content>
+      <xul:stack flex="1">
+        <xul:hbox align="center">
+          <xul:image class="search-proxy-button-image" xbl:inherits="src"/>
+        </xul:hbox>
+        <xul:image class="search-proxy-button-dropmarker"/>
+      </xul:stack>
+    </content>  
+  </binding>
+
+</bindings>
--- a/mozilla/browser/base/content/utilityOverlay.js
+++ b/mozilla/browser/base/content/utilityOverlay.js
@@ -0,0 +1,214 @@
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# ***** BEGIN LICENSE BLOCK *****
+# Version: NPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Netscape Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is 
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Alec Flett <alecf@netscape.com>
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or 
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the NPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the NPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
+/**
+ * Communicator Shared Utility Library
+ * for shared application glue for the Communicator suite of applications
+ **/
+
+var goPrefWindow = 0;
+
+function getBrowserURL()
+{
+  return "chrome://browser/content/browser.xul";
+}
+
+function goToggleToolbar( id, elementID )
+{
+  var toolbar = document.getElementById(id);
+  var element = document.getElementById(elementID);
+  if (toolbar)
+  {
+    var isHidden = toolbar.hidden;
+    toolbar.hidden = !isHidden;
+    document.persist(id, 'hidden');
+    if (element) {
+      element.setAttribute("checked", isHidden ? "true" : "false");
+      document.persist(elementID, 'checked');
+    }
+  }
+}
+
+function goClickThrobber( urlPref )
+{
+  var url;
+  try {
+    var pref = Components.classes["@mozilla.org/preferences-service;1"]
+                         .getService(Components.interfaces.nsIPrefBranch);
+    url = pref.getComplexValue(urlPref, Components.interfaces.nsIPrefLocalizedString).data;
+  }
+
+  catch(e) {
+    url = null;
+  }
+
+  if ( url )
+    openTopWin(url);
+}
+
+
+//No longer needed.  Rip this out since we are using openTopWin
+function goHelpMenu( url )
+{
+  /* note that this chrome url should probably change to not have all of the navigator controls */
+  /* also, do we want to limit the number of help windows that can be spawned? */
+  window.openDialog( getBrowserURL(), "_blank", "chrome,all,dialog=no", url );
+}
+
+function getTopWin()
+{
+    var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
+    var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
+    var topWindowOfType = windowManagerInterface.getMostRecentWindow( "navigator:browser" );
+
+    if (topWindowOfType) {
+        return topWindowOfType;
+    }
+    return null;
+}
+
+function openTopWin( url )
+{
+    /* note that this chrome url should probably change to not have
+       all of the navigator controls, but if we do this we need to have
+       the option for chrome controls because goClickThrobber() needs to
+       use this function with chrome controls */
+    /* also, do we want to
+       limit the number of help windows that can be spawned? */
+    if ((url == null) || (url == "")) return null;
+
+    // xlate the URL if necessary
+    if (url.indexOf("urn:") == 0)
+    {
+        url = xlateURL(url);        // does RDF urn expansion
+    }
+
+    // avoid loading "", since this loads a directory listing
+    if (url == "") {
+        url = "about:blank";
+    }
+
+    var topWindowOfType = getTopWin();
+    if ( topWindowOfType )
+    {
+        topWindowOfType.focus();
+        topWindowOfType.loadURI(url);
+        return topWindowOfType;
+    }
+    return window.openDialog( getBrowserURL(), "_blank", "chrome,all,dialog=no", url );
+}
+
+// update menu items that rely on focus
+function goUpdateGlobalEditMenuItems()
+{
+  goUpdateCommand('cmd_undo');
+  goUpdateCommand('cmd_redo');
+  goUpdateCommand('cmd_cut');
+  goUpdateCommand('cmd_copy');
+  goUpdateCommand('cmd_paste');
+  goUpdateCommand('cmd_selectAll');
+  goUpdateCommand('cmd_delete');
+}
+
+// update menu items that rely on the current selection
+function goUpdateSelectEditMenuItems()
+{
+  goUpdateCommand('cmd_cut');
+  goUpdateCommand('cmd_copy');
+  goUpdateCommand('cmd_delete');
+  goUpdateCommand('cmd_selectAll');
+}
+
+// update menu items that relate to undo/redo
+function goUpdateUndoEditMenuItems()
+{
+  goUpdateCommand('cmd_undo');
+  goUpdateCommand('cmd_redo');
+}
+
+// update menu items that depend on clipboard contents
+function goUpdatePasteMenuItems()
+{
+  goUpdateCommand('cmd_paste');
+}
+
+// Gather all descendent text under given document node.
+function gatherTextUnder ( root ) 
+{
+  var text = "";
+  var node = root.firstChild;
+  var depth = 1;
+  while ( node && depth > 0 ) {
+    // See if this node is text.
+    if ( node.nodeName == "#text" ) {
+      // Add this text to our collection.
+      text += " " + node.data;
+    } else if ( node.nodeType == Node.ELEMENT_NODE 
+                && node.localName.toUpperCase() == "IMG" ) {
+      // If it has an alt= attribute, use that.
+      var altText = node.getAttribute( "alt" );
+      if ( altText && altText != "" ) {
+        text = altText;
+        break;
+      }
+    }
+    // Find next node to test.
+    // First, see if this node has children.
+    if ( node.hasChildNodes() ) {
+      // Go to first child.
+      node = node.firstChild;
+      depth++;
+    } else {
+      // No children, try next sibling.
+      if ( node.nextSibling ) {
+        node = node.nextSibling;
+      } else {
+        // Last resort is our next oldest uncle/aunt.
+        node = node.parentNode.nextSibling;
+        depth--;
+      }
+    }
+  }
+  // Strip leading whitespace.
+  text = text.replace( /^\s+/, "" );
+  // Strip trailing whitespace.
+  text = text.replace( /\s+$/, "" );
+  // Compress remaining whitespace.
+  text = text.replace( /\s+/g, " " );
+  return text;
+}
--- a/mozilla/browser/base/content/web-panels.js
+++ b/mozilla/browser/base/content/web-panels.js
@@ -0,0 +1,107 @@
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is Mozilla.org Code.
+# 
+# The Initial Developer of the Original Code is David Hyatt.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   David Hyatt <hyatt@mozilla.org>
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
+var panelProgressListener = {
+    onProgressChange : function (aWebProgress, aRequest,
+                                    aCurSelfProgress, aMaxSelfProgress,
+                                    aCurTotalProgress, aMaxTotalProgress) {
+    },
+    
+    onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
+    {
+        if (!aRequest)
+          return;
+
+        //ignore local/resource:/chrome: files
+        if (aStatus == NS_NET_STATUS_READ_FROM || aStatus == NS_NET_STATUS_WROTE_TO)
+           return;
+
+        const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
+        const nsIChannel = Components.interfaces.nsIChannel;
+        if (aStateFlags & nsIWebProgressListener.STATE_START && 
+            aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
+            window.parent.document.getElementById('sidebar-throbber').setAttribute("loading", "true");
+        }
+        else if (aStateFlags & nsIWebProgressListener.STATE_STOP &&
+                aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
+            window.parent.document.getElementById('sidebar-throbber').removeAttribute("loading");
+        }
+    }
+    ,
+
+    onLocationChange : function(aWebProgress, aRequest, aLocation) {
+    },
+
+    onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage) {
+    },
+
+    onSecurityChange : function(aWebProgress, aRequest, aState) { 
+    },
+
+    QueryInterface : function(aIID)
+    {
+        if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
+            aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
+            aIID.equals(Components.interfaces.nsISupports))
+        return this;
+        throw Components.results.NS_NOINTERFACE;
+    }
+};
+
+var gLoadFired = false;
+function loadWebPanel(aURI) {
+    var panelBrowser = document.getElementById('web-panels-browser');
+    if (gLoadFired)
+        panelBrowser.webNavigation.loadURI(aURI, nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
+    panelBrowser.setAttribute("cachedurl", aURI);
+}
+
+function load()
+{
+  var panelBrowser = document.getElementById('web-panels-browser');
+  panelBrowser.webProgress.addProgressListener(panelProgressListener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
+  if (panelBrowser.getAttribute("cachedurl"))
+    panelBrowser.webNavigation.loadURI(panelBrowser.getAttribute("cachedurl"), nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
+  gNavigatorBundle = document.getElementById("bundle_browser");
+    
+  gLoadFired = true;
+}
+
+function unload()
+{
+  var panelBrowser = document.getElementById('web-panels-browser');
+  panelBrowser.webProgress.removeProgressListener(panelProgressListener);
+}
--- a/mozilla/browser/base/content/web-panels.xul
+++ b/mozilla/browser/base/content/web-panels.xul
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is Mozilla.org Code.
+# 
+# The Initial Developer of the Original Code is David Hyatt.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   David Hyatt <hyatt@mozilla.org>
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
+
+<!DOCTYPE window SYSTEM "chrome://browser/locale/browser.dtd">
+
+<page id="webpanels-window"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="load()" onunload="unload()"> 
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/contentAreaUtils.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/web-panels.js"/>
+
+  <stringbundleset id="stringbundleset"> 
+    <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
+  </stringbundleset>
+    
+  <popupset id="mainPopupSet">
+#include browser-context.inc
+  </popupset>
+  
+  
+  <browser id="web-panels-browser" persist="cachedurl" type="content" flex="1"
+           context="contentAreaContextMenu"
+           onclick="return window.parent.contentAreaClick(event, true);"/>
+</page>
--- a/mozilla/browser/base/jar.mn
+++ b/mozilla/browser/base/jar.mn
@@ -0,0 +1,43 @@
+browser.jar:
+        content/browser/contents.rdf                  (content/contents.rdf)
+        content/browser/about.png                     (content/about.png)
+*       content/browser/aboutDialog.xul               (content/aboutDialog.xul)
+        content/browser/browser.css                   (content/browser.css)
+*       content/browser/browser.js                    (content/browser.js)
+*       content/browser/browser.xul                   (content/browser.xul)
+*       content/browser/contentAreaUtils.js           (content/contentAreaUtils.js)
+*       content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
+*       content/browser/macBrowserOverlay.xul         (content/macBrowserOverlay.xul)
+*       content/browser/metaData.js                   (content/metaData.js)
+*       content/browser/metaData.xul                  (content/metaData.xul)
+*       content/browser/openLocation.js               (content/openLocation.js)
+*       content/browser/openLocation.xul              (content/openLocation.xul)
+*       content/browser/pageInfo.js                   (content/pageInfo.js)
+*       content/browser/pageInfo.xul                  (content/pageInfo.xul)
+*       content/browser/pageReport.js                 (content/pageReport.js)
+*       content/browser/pageReport.xul                (content/pageReport.xul)
+*       content/browser/pageReportFirstTime.xul       (content/pageReportFirstTime.xul)   
+*       content/browser/search.xml                    (content/search.xml)
+*       content/browser/utilityOverlay.js             (content/utilityOverlay.js)
+*       content/browser/web-panels.js                 (content/web-panels.js)
+*       content/browser/web-panels.xul                (content/web-panels.xul)
+
+en-US.jar:
+        locale/en-US/browser/contents.rdf             (locale/contents.rdf)
+        locale/en-US/browser/aboutDialog.dtd          (locale/aboutDialog.dtd)
+*       locale/en-US/browser/browser.dtd              (locale/browser.dtd)
+        locale/en-US/browser/browser.properties       (locale/browser.properties)
+        locale/en-US/browser/contentAreaCommands.properties  (locale/contentAreaCommands.properties)
+        locale/en-US/browser/metaData.dtd             (locale/metaData.dtd)
+        locale/en-US/browser/metaData.properties      (locale/metaData.properties)
+        locale/en-US/browser/openLocation.dtd         (locale/openLocation.dtd)
+        locale/en-US/browser/openLocation.properties  (locale/openLocation.properties)
+	locale/en-US/browser/page-drawer.dtd          (locale/page-drawer.dtd)
+*       locale/en-US/browser/pageInfo.dtd             (locale/pageInfo.dtd)
+        locale/en-US/browser/pageInfo.properties      (locale/pageInfo.properties)
+        locale/en-US/browser/pageReport.dtd           (locale/pageReport.dtd)
+        locale/en-US/browser/pageReportFirstTime.dtd  (locale/pageReportFirstTime.dtd)
+
+US.jar:
+        locale/US/browser-region/region.properties    (locale/region.properties)
+        locale/US/browser-region/contents.rdf         (locale/contents-region.rdf)
--- a/mozilla/browser/base/locale/aboutDialog.dtd
+++ b/mozilla/browser/base/locale/aboutDialog.dtd
@@ -0,0 +1,3 @@
+<!ENTITY aboutDialog.title      "About &brandFullName;">
+<!ENTITY copyright              "Copyright and contributor information">
+<!ENTITY copyrightLink          "about:">
--- a/mozilla/browser/base/locale/browser.dtd
+++ b/mozilla/browser/base/locale/browser.dtd
@@ -0,0 +1,301 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the browser main menu items -->
+<!-- LOCALIZATION NOTE : FILE Do not translate accesskey and commandkey --> 
+
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
+<!ENTITY viewsourcetitle.preface "Source for: ">
+
+<!ENTITY nothingAvailable.label "(Nothing Available)">
+
+<!ENTITY tabCmd.label "New Tab">
+<!ENTITY tabCmd.accesskey "T">
+<!ENTITY tabCmd.commandkey "t">
+<!ENTITY openFileCmd.label "Open File...">
+<!ENTITY openFileCmd.accesskey "O">
+<!ENTITY openFileCmd.commandkey "o">
+<!ENTITY printSetupCmd.label "Page Setup...">
+<!ENTITY printSetupCmd.accesskey "u">
+<!ENTITY printPreviewCmd.label "Print Preview">
+<!ENTITY printPreviewCmd.accesskey "v">
+<!ENTITY printCmd.label "Print...">
+<!ENTITY printCmd.accesskey "P">
+<!ENTITY printCmd.commandkey "p">
+<!ENTITY import.label "Import...">
+<!ENTITY import.accesskey "I">
+
+<!ENTITY goOfflineCmd.label "Work Offline">
+<!ENTITY goOfflineCmd.accesskey "w">
+
+<!ENTITY navbarCmd.label "Navigation Toolbar">
+<!ENTITY navbarCmd.accesskey "N">
+<!ENTITY personalbarCmd.label "Bookmarks Toolbar">
+<!ENTITY personalbarCmd.accesskey "B">
+<!ENTITY bookmarksToolbarItem.label "Bookmarks Toolbar Items">
+<!ENTITY taskbarCmd.label "Status Bar">
+<!ENTITY taskbarCmd.accesskey "B">
+
+<!ENTITY pageSourceCmd.label "Page Source">
+<!ENTITY pageSourceCmd.accesskey "o">
+<!ENTITY pageSourceCmd.commandkey "u">
+<!ENTITY pageInfoCmd.label "Page Info">
+<!ENTITY pageInfoCmd.accesskey "I">
+<!ENTITY pageInfoCmd.commandkey "i">
+<!ENTITY pageInfoWinCmd.commandkey "j">
+<!ENTITY fullScreenCmd.label "Full Screen">
+<!ENTITY fullScreenCmd.accesskey "F">
+
+<!ENTITY closeWindow.label "Close Window">
+
+
+<!ENTITY findOnCmd.label "Find in This Page...">
+<!ENTITY findOnCmd.accesskey "F">
+<!ENTITY findOnCmd.commandkey "f">
+<!ENTITY findAgainCmd.label "Find Again">
+<!ENTITY findAgainCmd.accesskey "g">
+<!ENTITY findAgainCmd.commandkey "g">
+<!ENTITY findAgainCmd.commandkey2 "VK_F3">
+
+<!ENTITY bookmarksMenu.label "Bookmarks">
+<!ENTITY bookmarksMenu.accesskey "B">
+<!ENTITY addCurPageAsCmd.label "Add to Bookmarks...">
+<!ENTITY addCurPageAsCmd.accesskey "A">
+<!ENTITY addCurPageAsCmd.commandkey "d">
+<!ENTITY manBookmarksCmd.label "Manage Bookmarks...">
+<!ENTITY manBookmarksCmd.accesskey "M">
+<!ENTITY manBookmarksCmd.commandkey "b">
+<!ENTITY manBookmarksWinCmd.commandkey "i">
+<!ENTITY emptyItem.label "(Empty)">
+
+<!ENTITY backCmd.label                "Back">
+<!ENTITY backCmd.accesskey            "B">
+<!ENTITY backButton.tooltip           "Go back one page">
+<!ENTITY forwardCmd.label             "Forward">
+<!ENTITY forwardCmd.accesskey         "F">
+<!ENTITY forwardButton.tooltip        "Go forward one page">
+<!ENTITY reloadCmd.label              "Reload">
+<!ENTITY reloadCmd.accesskey          "R">
+<!ENTITY reloadButton.tooltip         "Reload current page">
+<!ENTITY stopCmd.label                "Stop">
+<!ENTITY stopCmd.accesskey            "S">
+<!ENTITY stopButton.tooltip           "Stop loading this page">
+<!ENTITY goButton.label               "Go">
+<!ENTITY goButton.tooltip             "Type a location in the address field, then click Go">
+<!ENTITY printButton.label            "Print">
+<!ENTITY printButton.tooltip          "Print this page">
+
+<!ENTITY locationItem.title           "Location">
+<!ENTITY searchItem.title             "Search">
+<!ENTITY throbberItem.title           "Activity Indicator">
+<!ENTITY bookmarksItem.title          "Bookmarks">
+
+<!ENTITY throbber.tooltip             "Go to the &brandShortName; home page">
+
+<!ENTITY proxyIcon.tooltip            "Drag and drop this icon to create a link to this page">
+
+<!-- Toolbar items --> 
+<!ENTITY  homeButton.label            "Home">
+
+<!ENTITY historyCmd.label             "History">  
+<!ENTITY historyCmd.accesskey         "i">
+<!ENTITY history.commandKey           "h">
+
+<!ENTITY toolsMenu.label              "Tools">
+<!ENTITY toolsMenu.accesskey          "T"> 
+
+<!ENTITY downloads.label              "Downloads">
+<!ENTITY downloads.tooltip            "Displays the progress of ongoing downloads">
+<!ENTITY downloads.accesskey          "D">
+<!ENTITY downloads.commandkey         "e">
+
+<!ENTITY javaConsoleCmd.label         "Java Console">
+<!ENTITY javaConsoleCmd.accesskey     "J">
+
+<!ENTITY javaScriptConsoleCmd.label   "JavaScript Console">
+<!ENTITY javaScriptConsoleCmd.accesskey "S">
+
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+<!ENTITY newMenu.label            "New">
+<!ENTITY newMenu.accesskey          "N">
+<!ENTITY newNavigatorCmd.label        "New Window">
+<!ENTITY newNavigatorCmd.key        "N">
+<!ENTITY newNavigatorCmd.accesskey      "N">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY undoCmd.label            "Undo">  
+<!ENTITY undoCmd.key            "Z">  
+<!ENTITY undoCmd.accesskey          "U"> 
+<!ENTITY redoCmd.label            "Redo">  
+<!ENTITY redoCmd.key            "Y">  
+<!ENTITY redoCmd.accesskey          "R"> 
+<!ENTITY cutCmd.label           "Cut">  
+<!ENTITY cutCmd.key             "X">  
+<!ENTITY cutCmd.accesskey         "t"> 
+<!ENTITY copyCmd.label            "Copy">  
+<!ENTITY copyCmd.key            "C">  
+<!ENTITY copyCmd.accesskey          "C"> 
+<!ENTITY pasteCmd.label           "Paste">  
+<!ENTITY pasteCmd.key           "V">  
+<!ENTITY pasteCmd.accesskey         "P"> 
+<!ENTITY deleteCmd.label          "Delete">  
+<!ENTITY deleteCmd.key            "D">  
+<!ENTITY deleteCmd.accesskey        "D"> 
+<!ENTITY selectAllCmd.label         "Select All">  
+<!ENTITY selectAllCmd.key         "A">  
+<!ENTITY selectAllCmd.accesskey       "A"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!ENTITY viewMenu.label         "View"> 
+<!ENTITY viewMenu.accesskey       "V"> 
+<!ENTITY viewToolbarsMenu.label       "Toolbars"> 
+<!ENTITY viewToolbarsMenu.accesskey     "T"> 
+<!ENTITY viewSidebarMenu.label "Sidebar">
+<!ENTITY viewSidebarMenu.accesskey "e">
+<!ENTITY viewCustomizeToolbar.label       "Customize..."> 
+<!ENTITY viewCustomizeToolbar.accesskey     "C"> 
+
+<!ENTITY goMenu.label "Go">
+<!ENTITY goMenu.accesskey "g">
+<!ENTITY goHomeCmd.label "Home">
+<!ENTITY goHomeCmd.accesskey "h">
+<!ENTITY earlierHistory.label "Earlier History">
+
+<!ENTITY helpMenu.label         "Help"> 
+<!ENTITY helpMenu.accesskey     "H"> 
+<!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
+                       for the help button in the menubar but Gnome does not.   -->
+<!ENTITY helpMenuWin.label      "Help"> 
+<!ENTITY helpMenuWin.accesskey  "H"> 
+
+<!ENTITY releaseCmd.label       "Release Notes">
+<!ENTITY releaseCmd.accesskey       "R">
+<!ENTITY aboutCmd.label         "About &brandFullName;">
+<!ENTITY aboutCmd.accesskey       "A">
+
+<!ENTITY openCmd.commandkey           "l">
+<!ENTITY urlbar.accesskey             "d">
+<!ENTITY searchFocus.commandkey       "k">
+<!ENTITY searchFocusUnix.commandkey   "j">
+
+<!ENTITY openLinkCmd.label            "Open Link in New Window">
+<!ENTITY openLinkCmd.accesskey        "W">
+<!ENTITY openLinkCmdInTab.label       "Open Link in New Tab">
+<!ENTITY openLinkCmdInTab.accesskey   "T">
+<!ENTITY openLinkInWindowCmd.label    "Open">
+<!ENTITY openLinkInWindowCmd.accesskey "p">
+<!ENTITY openFrameCmd.label           "Open Frame in New Window">
+<!ENTITY openFrameCmd.accesskey       "W">
+<!ENTITY openFrameCmdInTab.label      "Open Frame in New Tab">
+<!ENTITY openFrameCmdInTab.accesskey  "T">
+<!ENTITY showOnlyThisFrameCmd.label     "Show Only This Frame">
+<!ENTITY showOnlyThisFrameCmd.accesskey "w">
+<!ENTITY reloadCmd.commandkey         "r">
+<!ENTITY reloadFrameCmd.label         "Reload Frame">
+<!ENTITY reloadFrameCmd.accesskey     "R">
+<!ENTITY viewPartialSourceForSelectionCmd.label "View Selection Source">
+<!ENTITY viewPartialSourceForMathMLCmd.label    "View MathML Source">
+<!ENTITY viewPartialSourceCmd.accesskey "e">
+<!ENTITY viewPageSourceCmd.label      "View Page Source">
+<!ENTITY viewPageSourceCmd.accesskey  "V">
+<!ENTITY viewFrameSourceCmd.label     "View Frame Source">
+<!ENTITY viewFrameSourceCmd.accesskey "V">
+<!ENTITY viewPageInfoCmd.label        "View Page Info">
+<!ENTITY viewPageInfoCmd.accesskey    "I">
+<!ENTITY viewFrameInfoCmd.label       "View Frame Info">
+<!ENTITY viewFrameInfoCmd.accesskey   "i">
+<!ENTITY viewImageCmd.label           "View Image">
+<!ENTITY viewImageCmd.accesskey       "I">
+<!ENTITY viewBGImageCmd.label         "View Background Image">
+<!ENTITY viewBGImageCmd.accesskey     "w">
+<!ENTITY setWallpaperCmd.label        "Set As Wallpaper">
+<!ENTITY setWallpaperCmd.accesskey    "S">
+<!ENTITY bookmarkPageCmd.label        "Bookmark This Page...">
+<!ENTITY bookmarkPageCmd.accesskey    "m">
+<!ENTITY bookmarkLinkCmd.label        "Bookmark This Link...">
+<!ENTITY bookmarkLinkCmd.accesskey    "L">
+<!ENTITY bookmarkFrameCmd.label       "Bookmark This Frame...">
+<!ENTITY bookmarkFrameCmd.accesskey   "F">
+<!ENTITY sendPageCmd.label            "Send Page...">
+<!ENTITY sendPageCmd.accesskey        "S">
+<!ENTITY savePageCmd.label            "Save Page As...">
+<!ENTITY savePageCmd.accesskey        "A">
+<!ENTITY savePageCmd.commandkey       "s">
+<!ENTITY saveFrameCmd.label           "Save Frame As...">
+<!ENTITY saveFrameCmd.accesskey       "F">
+<!ENTITY saveLinkCmd.label            "Save Link to Disk...">
+<!ENTITY saveLinkCmd.accesskey        "k">
+<!ENTITY sendLinkCmd.label            "Send Link..."> 
+<!ENTITY sendLinkCmd.accesskey        "d">
+<!ENTITY saveImageCmd.label           "Save Image As...">
+<!ENTITY saveImageCmd.accesskey       "v">
+<!ENTITY sendImageCmd.label           "Send Image...">
+<!ENTITY sendImageCmd.accesskey       "n">
+<!ENTITY copyLinkCmd.label            "Copy Link Location">
+<!ENTITY copyLinkCmd.accesskey        "C">
+<!ENTITY copyImageCmd.label           "Copy Image Location">
+<!ENTITY copyImageCmd.accesskey       "o">
+<!ENTITY metadataCmd.label            "Properties">
+<!ENTITY metadataCmd.accesskey        "P">
+<!ENTITY copyEmailCmd.label           "Copy Email Address">
+<!ENTITY copyEmailCmd.accesskey       "E">
+<!ENTITY thisFrameMenu.label              "This Frame">
+<!ENTITY thisFrameMenu.accesskey          "h">
+<!ENTITY search.accesskey             "W">
+
+<!ENTITY textZoomEnlargeCmd.label       "Increase Text Size">
+<!ENTITY textZoomEnlargeCmd.accesskey   "I">
+<!ENTITY textZoomEnlargeCmd.commandkey  "+">
+<!ENTITY textZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
+
+<!ENTITY textZoomReduceCmd.label        "Decrease Text Size">
+<!ENTITY textZoomReduceCmd.accesskey    "D">
+<!ENTITY textZoomReduceCmd.commandkey   "-">
+<!ENTITY textZoomResetCmd.commandkey    "0">
+
+<!ENTITY bookmarksButton.label          "Bookmarks">
+<!ENTITY bookmarksButton.tooltip        "Displays your bookmarks">
+
+<!ENTITY historyButton.label            "History">
+<!ENTITY historyButton.tooltip          "Displays pages you've viewed recently">
+
+<!ENTITY newTabButton.tooltip           "Opens a new tab">
+<!ENTITY newWindowButton.tooltip        "Opens a new window">
+
+<!ENTITY cutButton.tooltip              "Cut">
+<!ENTITY copyButton.tooltip             "Copy">
+<!ENTITY pasteButton.tooltip            "Paste">
+
+<!ENTITY findOnSearchBarCmd.label       "Find in this Page">
+
+<!ENTITY quitApplicationCmdWin.label       "Exit"> 
+<!ENTITY quitApplicationCmdWin.accesskey   "x">
+<!ENTITY goBackCmd.commandKey "[">
+<!ENTITY goForwardCmd.commandKey "]">
+<!ENTITY quitApplicationCmd.label       "Quit"> 
+<!ENTITY quitApplicationCmd.accesskey   "Q">
+
+<!ENTITY closeCmd.label                 "Close">  
+<!ENTITY closeCmd.key                   "W">  
+<!ENTITY closeCmd.accesskey             "C">
+
+<!ENTITY minimizeWindow.key "m">
+<!ENTITY minimizeWindow.label "Minimize Window">
+<!ENTITY bringAllToFront.label "Bring All to Front">
+<!ENTITY zoomWindow.label "Zoom Window">
+<!ENTITY windowMenu.label "Window">
+
+<!ENTITY pageThemeButton.label "Page Themes">
+<!ENTITY pageThemeNoTheme.label "No Theme">
+<!ENTITY pageThemeNoTheme.accesskey "n">
+<!ENTITY pageThemePersistentOnly.label "Basic Theme">
+<!ENTITY pageThemePersistentOnly.accesskey "b">
+
+<!ENTITY pageThemeIcon.tooltip            "Switch to an alternate stylesheet">
+<!ENTITY pageReportIcon.tooltip            "Change popup blocking settings for this website">
--- a/mozilla/browser/base/locale/browser.properties
+++ b/mozilla/browser/base/locale/browser.properties
@@ -0,0 +1,49 @@
+nv_done=Done
+nv_timeout=Timed Out
+nv_stopped=Stopped
+openFile=Open File
+defaultStatus=
+
+droponhomebutton=Drop a link or file to make it your home page
+droponhometitle=Set Home Page
+droponhomemsg=Do you want this document to be your new home page?
+
+jserror=An error has occurred on this page. Double click here for details.
+
+linkTargetLabel=Link will open in:
+linkHREFLabel=Location:
+
+#SessionHistory.js
+nothingAvailable=(Nothing Available)
+
+# Localization Note: Use 'true' or 'false' to control the pref:theme to 
+# show the English description or not
+# for example, in Japanese build, instead of showing English description
+# set the following value to false so it won't show up.
+showskinsdescription=true
+
+# context menu strings
+
+searchText=Web Search for "%S"
+
+blockImages=Block Images from %S
+
+SavePageTitle=Save Web Page
+SaveImageTitle=Save Picture
+SaveLinkTitle=Save As
+DefaultSaveFileName=index
+WebPageCompleteFilter=Web Page, complete
+WebPageHTMLOnlyFilter=Web Page, HTML only
+
+# LOCALIZATION NOTE (filesFolder):
+#    This is the name of the folder that is created parallel to a HTML file 
+#    when it is saved "With Images". The %S section is replaced with the
+#    leaf name of the file being saved (minus extension).
+filesFolder=%S_files
+
+saveLinkErrorMsg=The link could not be saved.  The web page might have been removed or had its name changed.
+saveLinkErrorTitle=Save Link
+addEngines=Add engines...
+
+# Default name for the Web Panels sidebar
+webPanels=Web Panels
--- a/mozilla/browser/base/locale/contentAreaCommands.properties
+++ b/mozilla/browser/base/locale/contentAreaCommands.properties
@@ -0,0 +1,21 @@
+# context menu strings
+
+searchText=Web Search for "%S"
+
+SavePageTitle=Save Web Page
+SaveImageTitle=Save Image
+SaveLinkTitle=Save As
+DefaultSaveFileName=index
+WebPageCompleteFilter=Web Page, complete
+WebPageHTMLOnlyFilter=Web Page, HTML only
+WebPageXHTMLOnlyFilter=Web Page, XHTML only
+WebPageXMLOnlyFilter=Web Page, XML only
+
+# LOCALIZATION NOTE (filesFolder):
+#    This is the name of the folder that is created parallel to a HTML file 
+#    when it is saved "With Images". The %S section is replaced with the
+#    leaf name of the file being saved (minus extension).
+filesFolder=%S_files
+
+saveLinkErrorMsg=The link could not be saved.  The web page might have been removed or had its name changed.
+saveLinkErrorTitle=Save Link
--- a/mozilla/browser/base/locale/contents-region.rdf
+++ b/mozilla/browser/base/locale/contents-region.rdf
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the locale being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:US"
+        chrome:author="mozilla.org"
+        chrome:name="US"
+        chrome:previewURL="http://www.mozilla.org/locales/US.gif">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:US:packages">
+        <RDF:li resource="urn:mozilla:locale:US:browser-region"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+
+  <!-- Version Information.  State that we work only with major version of this
+       package. -->
+  <RDF:Description about="urn:mozilla:locale:US:browser-region"
+	chrome:localeVersion="1.1b"/>
+</RDF:RDF>
--- a/mozilla/browser/base/locale/contents.rdf
+++ b/mozilla/browser/base/locale/contents.rdf
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the skins being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:en-US">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+        <RDF:li resource="urn:mozilla:locale:en-US:browser"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+
+  <!-- Version Information.  State that we work only with major version of this
+       package. -->
+  <RDF:Description about="urn:mozilla:locale:en-US:browser"
+	chrome:localeVersion="0.9.9"/>
+</RDF:RDF>
--- a/mozilla/browser/base/locale/metaData.dtd
+++ b/mozilla/browser/base/locale/metaData.dtd
@@ -0,0 +1,26 @@
+<!ENTITY no-properties.label   "No properties set.">
+
+<!ENTITY caption.label         "Element Properties">
+<!ENTITY image-sec.label       "Image Properties">
+<!ENTITY image-url.label       "Location:">
+<!ENTITY image-desc.label      "Description:">
+<!ENTITY image-alt.label       "Alternate text:">
+<!ENTITY image-width.label     "Width:">
+<!ENTITY image-height.label    "Height:">
+<!ENTITY image-filesize.label  "Size of File:">
+<!ENTITY insdel-sec.label      "Insert/Delete Properties">
+<!ENTITY insdel-cite.label     "Info:">
+<!ENTITY insdel-date.label     "Date:">
+<!ENTITY link-sec.label        "Link Properties">
+<!ENTITY link-url.label        "Address:">
+<!ENTITY link-target.label     "Will open in:">
+<!ENTITY link-type.label       "Target type:">
+<!ENTITY link-lang.label       "Target language:">
+<!ENTITY link-rel.label        "Relation:">
+<!ENTITY link-rev.label        "Reversed relation:">
+<!ENTITY misc-sec.label        "Miscellaneous Properties">
+<!ENTITY misc-lang.label       "Text language:">
+<!ENTITY misc-title.label      "Title:">
+<!ENTITY misc-tblsummary.label "Table summary:">
+<!ENTITY quote-sec.label       "Quote Properties">
+<!ENTITY quote-cite.label      "Info:">
--- a/mozilla/browser/base/locale/metaData.properties
+++ b/mozilla/browser/base/locale/metaData.properties
@@ -0,0 +1,15 @@
+sameWindowText=Same window
+newWindowText=New window
+parentFrameText=Parent frame
+sameFrameText=Same frame
+embeddedText=Embedded
+unableToShowProps=No properties available.
+altTextMissing=Missing
+altTextBlank=Blank
+imageSize=%S KB (%S bytes)
+imageSizeUnknown=Unknown (not cached)
+imageWidth=%Spx
+imageHeight=%Spx
+# LOCALIZATION NOTE: Next two strings are for language name representations
+#                    %1$S = language name, %2$S = region name
+languageRegionFormat=%1$S (%2$S)
--- a/mozilla/browser/base/locale/openLocation.dtd
+++ b/mozilla/browser/base/locale/openLocation.dtd
@@ -0,0 +1,12 @@
+<!-- extracted from content/openLocation.xul -->
+
+<!ENTITY enter.label "Enter the web location (URL), or specify the local file you would like to open:">  
+<!ENTITY chooseFile.label "Choose File...">
+<!ENTITY newWindow.label "New Navigator window">
+<!ENTITY newTab.label "New Navigator tab">
+<!ENTITY topWindow.label "Current Navigator window">
+<!ENTITY editNewWindow.label "New Composer window">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY caption.label "Open Web Location">
+<!ENTITY openWhere.label "Open in:">
+<!ENTITY example.label "Example: &vendorURL;">
--- a/mozilla/browser/base/locale/openLocation.properties
+++ b/mozilla/browser/base/locale/openLocation.properties
@@ -0,0 +1,2 @@
+openButtonLabel=Open
+chooseFileDialogTitle=Choose File
--- a/mozilla/browser/base/locale/page-drawer.dtd
+++ b/mozilla/browser/base/locale/page-drawer.dtd
@@ -0,0 +1,2 @@
+<!ENTITY viewPage.label "Grab Page">
+<!ENTITY addPanel.label "Add Bookmark">
--- a/mozilla/browser/base/locale/pageInfo.dtd
+++ b/mozilla/browser/base/locale/pageInfo.dtd
@@ -0,0 +1,106 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is Daniel Brooks.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the LGPL or the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** -->
+
+<!ENTITY  preface               "Info for: "> 
+
+<!ENTITY  title                 "Page Info"> 
+<!ENTITY  description           "Information about the current page"> 
+<!ENTITY  helpButton            "Help">
+<!ENTITY  pageInfoWindow.width  "425">
+<!ENTITY  pageInfoWindow.height "470">
+
+<!ENTITY  unknown               "Unknown">
+<!ENTITY  closeWindow           "w">
+
+<!ENTITY  generalTab            "General">
+<!ENTITY  generalTitle          "Title:">
+<!ENTITY  generalURL            "URL:">
+<!ENTITY  generalMode           "Render Mode:">
+<!ENTITY  generalType           "Type:">
+<!ENTITY  generalSize           "Size:">
+<!ENTITY  generalReferrer       "Referring URL:">
+<!ENTITY  generalSource         "Source:">
+<!ENTITY  generalSent           "Sent:">
+<!ENTITY  generalModified       "Modified:">
+<!ENTITY  generalExpires        "Expires:">
+<!ENTITY  generalEncoding       "Encoding:">
+<!ENTITY  generalMeta           "Meta:">
+<!ENTITY  generalMetaName       "Name">
+<!ENTITY  generalMetaContent    "Content">
+
+<!ENTITY  formsTab              "Forms">
+<!ENTITY  formAction            "Form Action">
+<!ENTITY  formMethod            "Method">
+<!ENTITY  formName              "Name">
+<!ENTITY  formNo                "No.">
+<!ENTITY  formEncoding          "Encoding:">
+<!ENTITY  formTarget            "Target:">
+<!ENTITY  formFields            "Fields:">
+<!ENTITY  formLabel             "Label">
+<!ENTITY  formFName             "Field Name">
+<!ENTITY  formType              "Type">
+<!ENTITY  formCValue            "Current Value">
+
+<!ENTITY  linksTab              "Links">
+<!ENTITY  linkNo                "No.">
+<!ENTITY  linkName              "Name">
+<!ENTITY  linkAddress           "Address">
+<!ENTITY  linkType              "Type">
+<!ENTITY  linkTarget            "Target">
+<!ENTITY  linkAccessKey         "Access Key">
+
+<!ENTITY  mediaTab              "Media">
+<!ENTITY  mediaHeader           "Images on this page">
+<!ENTITY  mediaURL              "URL:">
+<!ENTITY  mediaBase             "Base URL:">
+<!ENTITY  mediaAlt              "Alternate Text:">
+<!ENTITY  mediaAltHeader        "Alternate Text">
+<!ENTITY  mediaNo               "No.">
+<!ENTITY  mediaName             "Name">
+<!ENTITY  mediaAddress          "Address">
+<!ENTITY  mediaType             "Type">
+<!ENTITY  mediaPlugin           "Plugin:">
+<!ENTITY  mediaCharset          "Encoding:">
+<!ENTITY  mediaDimensions       "Dimensions:">
+<!ENTITY  mediaEncryption       "Encryption:">
+<!ENTITY  mediaTitle            "Title Attribute:">
+<!ENTITY  mediaLongdesc         "Long Description:">
+<!ENTITY  mediaSaveAs           "Save As...">
+<!ENTITY  mediaSaveAsAccesskey  "S">
+
+<!ENTITY  framesTab             "Frames">
+<!ENTITY  frameName             "Name">
+<!ENTITY  frameAddress          "Address">
+<!ENTITY  frameType             "Type">
--- a/mozilla/browser/base/locale/pageInfo.properties
+++ b/mozilla/browser/base/locale/pageInfo.properties
@@ -0,0 +1,47 @@
+pageInfo.title=Page Info
+frameInfo.title=Frame Info
+ 
+noPageTitle=Untitled Page
+pageTitle=%S:
+unknown=Unknown
+default=Default
+notset=Not Specified
+emptystring=Empty String
+
+generalNotCached=(not cached)
+generalNoExpiration=(no expiration set)
+generalQuirksMode=Quirks mode
+generalStrictMode=Standards compliance mode
+generalNoReferrer=(no referrer)
+
+formTitle=Form %S:
+formUntitled=Unnamed Form:
+formDefaultTarget=None (opens in same window)
+formChecked=Checked
+formUnchecked=Unchecked
+formPassword=********
+
+linkAnchor=Anchor
+linkArea=Area
+linkSubmission=Form Submission
+linkSubmit=Submit Query
+linkRel=Related Link
+linkStylesheet=Stylesheet
+linkRev=Reverse Link
+linkX=Simple XLink
+
+mediaImg=Image
+mediaBGImg=Background
+mediaApplet=Applet
+mediaObject=Object
+mediaEmbed=Embed
+mediaLink=Icon
+mediaInput=Input
+mediaSize=Width: %Spx, Height: %Spx
+mediaPhysSize=Physical Width: %Spx, Physical Height: %Spx
+
+generalDiskCache=Disk Cache
+generalMemoryCache=Memory Cache
+generalHTTPCache=HTTP Cache
+generalFTPCache=FTP Cache
+generalSize=%S KB (%S bytes)
--- a/mozilla/browser/base/locale/pageReport.dtd
+++ b/mozilla/browser/base/locale/pageReport.dtd
@@ -0,0 +1,10 @@
+<!ENTITY caption.label "Blocked Popups">
+
+<!ENTITY intro.label "The following pages were prevented from displaying 
+unrequested popup windows:">
+
+<!ENTITY done.label "Done">
+<!ENTITY done.accesskey "D">
+
+<!ENTITY unblock.label "Unblock Site">
+<!ENTITY unblock.accesskey "U">
--- a/mozilla/browser/base/locale/pageReportFirstTime.dtd
+++ b/mozilla/browser/base/locale/pageReportFirstTime.dtd
@@ -0,0 +1,7 @@
+<!ENTITY startDescription.label            "A Web site has attempted to open a popup window without your permission. &brandShortName; has automatically closed the popup window.  Whenever &brandShortName; blocks these popups, you will see an icon on the status bar.">
+
+<!ENTITY endDescription.label              "You can click on this icon to see which sites &brandShortName; blocked and to allow those sites to open popups if they are required for the site to function correctly.">
+
+<!ENTITY caption.label                     "About Popup Blocking">
+
+<!ENTITY done.label "Done">
--- a/mozilla/browser/base/locale/region.properties
+++ b/mozilla/browser/base/locale/region.properties
@@ -0,0 +1,32 @@
+general.useragent.contentlocale=US
+
+homePageDefault=http://www.mozilla.org/products/firebird/
+shopKeyword=keyword:shop [Product]
+quoteKeyword=keyword:quote [Enter symbol here]
+localKeyword=keyword:zip [Your zip code]
+keywordList=http://home.netscape.com/escapes/keywords
+webmailKeyword=http://webmail.netscape.com
+careerKeyword=keyword:[Your city] careers
+fallbackDefaultSearchURL=http://search.netscape.com/cgi-bin/search?charset=UTF-8&search=
+otherSearchURL=http://home.netscape.com/bookmark/6_0/tsearch.html
+
+# all.js
+browser.startup.homepage=http://www.mozilla.org/products/firebird/
+browser.throbber.url=http://www.mozilla.org/products/firebird/
+browser.search.defaulturl=http://www.google.com/search?lr=&ie=UTF-8&oe=UTF-8&q=
+
+wallet.Server=http://www.mozilla.org/wallet/tables/
+wallet.Samples=http://www.mozilla.org/wallet/samples/
+
+#config.js
+startup.homepage_override_url=http://www.mozilla.org/products/firebird/
+
+# search-panel.properties
+defaultSearchURL=http://www.google.com/search?hl=en&lr=&ie=UTF-8&oe=UTF-8&q=
+browser.search.defaultenginename=Google
+
+# update notifications: new update page
+update_notifications.provider.0.datasource=
+
+searchEnginesURL=http://mycroft.mozdev.org/download.html
+
--- a/mozilla/browser/base/locale/unix/Makefile.in
+++ b/mozilla/browser/base/locale/unix/Makefile.in
@@ -0,0 +1,32 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+NO_JAR_AUTO_REG=1
+
+include $(topsrcdir)/config/rules.mk
+
--- a/mozilla/browser/base/locale/unix/contents-platform.rdf
+++ b/mozilla/browser/base/locale/unix/contents-platform.rdf
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the locale being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:en-US"
+        chrome:author="mozilla.org"
+        chrome:name="en-US"
+        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+        <RDF:li resource="urn:mozilla:locale:en-US:navigator-platform"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+
+  <!-- Version Information.  State that we work only with major version of this
+       package. -->
+  <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform"
+	chrome:localeVersion="0.9.9"/>
+</RDF:RDF>
--- a/mozilla/browser/base/locale/unix/jar.mn
+++ b/mozilla/browser/base/locale/unix/jar.mn
@@ -0,0 +1,3 @@
+en-unix.jar:
+        locale/en-US/navigator-platform/contents.rdf 			(contents-platform.rdf)
+        locale/en-US/navigator-platform/navigator.properties
--- a/mozilla/browser/base/locale/unix/navigator.properties
+++ b/mozilla/browser/base/locale/unix/navigator.properties
@@ -0,0 +1,5 @@
+# moved from navigator/locale/navigator.properties
+# valid collation options are: <empty string> or useCodePointOrder
+intl.collationOption=
+intl.charset.default=ISO-8859-1
+
--- a/mozilla/browser/base/locale/win/Makefile.in
+++ b/mozilla/browser/base/locale/win/Makefile.in
@@ -0,0 +1,32 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+NO_JAR_AUTO_REG=1
+
+include $(topsrcdir)/config/rules.mk
+
--- a/mozilla/browser/base/locale/win/contents-platform.rdf
+++ b/mozilla/browser/base/locale/win/contents-platform.rdf
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the locale being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:en-US"
+        chrome:author="mozilla.org"
+        chrome:name="en-US"
+        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+        <RDF:li resource="urn:mozilla:locale:en-US:navigator-platform"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+
+  <!-- Version Information.  State that we work only with major version of this
+       package. -->
+  <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform"
+	chrome:localeVersion="0.9.9"/>
+</RDF:RDF>
--- a/mozilla/browser/base/locale/win/jar.mn
+++ b/mozilla/browser/base/locale/win/jar.mn
@@ -0,0 +1,3 @@
+en-win.jar:
+        locale/en-US/navigator-platform/contents.rdf 			(contents-platform.rdf)
+        locale/en-US/navigator-platform/navigator.properties
--- a/mozilla/browser/base/locale/win/navigator.properties
+++ b/mozilla/browser/base/locale/win/navigator.properties
@@ -0,0 +1,5 @@
+# moved from navigator/locale/navigator.properties
+# valid collation options are: <empty string> or useCodePointOrder
+intl.collationOption=
+intl.charset.default=ISO-8859-1
+
--- a/mozilla/browser/base/skin/Bookmarks-folder.png
+++ b/mozilla/browser/base/skin/Bookmarks-folder.png
--- a/mozilla/browser/base/skin/Close-tab.png
+++ b/mozilla/browser/base/skin/Close-tab.png
--- a/mozilla/browser/base/skin/Go.png
+++ b/mozilla/browser/base/skin/Go.png
--- a/mozilla/browser/base/skin/Info.png
+++ b/mozilla/browser/base/skin/Info.png
--- a/mozilla/browser/base/skin/Makefile.in
+++ b/mozilla/browser/base/skin/Makefile.in
@@ -0,0 +1,29 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH   = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
--- a/mozilla/browser/base/skin/Search-bar.png
+++ b/mozilla/browser/base/skin/Search-bar.png
--- a/mozilla/browser/base/skin/Secure.png
+++ b/mozilla/browser/base/skin/Secure.png
--- a/mozilla/browser/base/skin/Security-broken.png
+++ b/mozilla/browser/base/skin/Security-broken.png
--- a/mozilla/browser/base/skin/Throbber-small.gif
+++ b/mozilla/browser/base/skin/Throbber-small.gif
--- a/mozilla/browser/base/skin/Throbber-small.png
+++ b/mozilla/browser/base/skin/Throbber-small.png
--- a/mozilla/browser/base/skin/Throbber.gif
+++ b/mozilla/browser/base/skin/Throbber.gif
--- a/mozilla/browser/base/skin/Throbber.png
+++ b/mozilla/browser/base/skin/Throbber.png
--- a/Show More
+++ b/Show More