diff --git a/mozilla/configure.in b/mozilla/configure.in
index 303d452ef92..57258caa358 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -3836,14 +3836,14 @@ MOZ_ARG_ENABLE_STRING(application,
case "$MOZ_BUILD_APP" in
suite)
- MOZ_APP_NAME=mozilla
- MOZ_APP_DISPLAYNAME=Mozilla
+ MOZ_APP_NAME=seamonkey
+ MOZ_APP_DISPLAYNAME=SeaMonkey
MOZ_MAIL_NEWS=1
MOZ_LDAP_XPCOM=1
MOZ_COMPOSER=1
MOZ_SUITE=1
MOZ_PROFILESHARING=
- MOZ_APP_VERSION=$MOZILLA_VERSION
+ MOZ_APP_VERSION=`cat $topsrcdir/xpfe/bootstrap/version.txt`
MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming permissions reporter"
AC_DEFINE(MOZ_SUITE)
;;
diff --git a/mozilla/editor/ui/locales/en-US/chrome/region/region.properties b/mozilla/editor/ui/locales/en-US/chrome/region/region.properties
index 733f9e2b66c..eec06148fb0 100644
--- a/mozilla/editor/ui/locales/en-US/chrome/region/region.properties
+++ b/mozilla/editor/ui/locales/en-US/chrome/region/region.properties
@@ -1,4 +1,4 @@
#
# editor.js
# editor.properties
-editor.throbber.url=http://www.mozilla.org/products/mozilla1.x/
+editor.throbber.url=http://www.mozilla.org/projects/seamonkey/
diff --git a/mozilla/mailnews/base/resources/locale/en-US/region.properties b/mozilla/mailnews/base/resources/locale/en-US/region.properties
index ffee7e7cf62..67d94cadea4 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/region.properties
+++ b/mozilla/mailnews/base/resources/locale/en-US/region.properties
@@ -2,9 +2,9 @@
# messenger.properties
# mailnews.js
mailnews.start_page.url=chrome://messenger/content/start.xhtml
-messenger.throbber.url=http://www.mozilla.org/products/mozilla1.x/
-compose.throbber.url=http://www.mozilla.org/products/mozilla1.x/
-addressbook.throbber.url=http://www.mozilla.org/products/mozilla1.x/
+messenger.throbber.url=http://www.mozilla.org/projects/seamonkey/
+compose.throbber.url=http://www.mozilla.org/projects/seamonkey/
+addressbook.throbber.url=http://www.mozilla.org/projects/seamonkey/
# To make mapit buttons to disappear in the addressbook, specify empty string. For example:
# mail.addr_book.mapit_url.format=
# The format for "mail.addr_book.mapit_url.format" is:
diff --git a/mozilla/profile/defaults/bookmarks.html b/mozilla/profile/defaults/bookmarks.html
index d683f6ed06e..388b2d451de 100644
--- a/mozilla/profile/defaults/bookmarks.html
+++ b/mozilla/profile/defaults/bookmarks.html
@@ -18,15 +18,14 @@ Do Not Edit! -->
mozilla.org
- The Mozilla Organization
-
- Mozilla Application Suite
-
- Mozilla Firefox
-
- Mozilla Thunderbird
+
- SeaMonkey Project
+
- Mozilla Products
- Feedback
Community & Support
- mozillaZine
-
- Mozilla 1.x Support (mozillaZine)
+
- SeaMonkey Support (mozillaZine)
- mozdev.org
- Mozilla Plug-in Information (mozdev)
- Mozilla Extensions (mozdev)
diff --git a/mozilla/themes/classic/communicator/brand/throbber-anim.gif b/mozilla/themes/classic/communicator/brand/throbber-anim.gif
index cd19451828d..720492f2925 100644
Binary files a/mozilla/themes/classic/communicator/brand/throbber-anim.gif and b/mozilla/themes/classic/communicator/brand/throbber-anim.gif differ
diff --git a/mozilla/themes/classic/communicator/brand/throbber-single.gif b/mozilla/themes/classic/communicator/brand/throbber-single.gif
index 7d60bae2d16..3d3d6654b38 100644
Binary files a/mozilla/themes/classic/communicator/brand/throbber-single.gif and b/mozilla/themes/classic/communicator/brand/throbber-single.gif differ
diff --git a/mozilla/themes/classic/communicator/brand/throbber16-anim.gif b/mozilla/themes/classic/communicator/brand/throbber16-anim.gif
index fbfabe6116e..00fa4150917 100644
Binary files a/mozilla/themes/classic/communicator/brand/throbber16-anim.gif and b/mozilla/themes/classic/communicator/brand/throbber16-anim.gif differ
diff --git a/mozilla/themes/classic/communicator/brand/throbber16-single.gif b/mozilla/themes/classic/communicator/brand/throbber16-single.gif
index 7635f5999fe..360d34cb15d 100644
Binary files a/mozilla/themes/classic/communicator/brand/throbber16-single.gif and b/mozilla/themes/classic/communicator/brand/throbber16-single.gif differ
diff --git a/mozilla/themes/modern/communicator/brand/throbber-anim.gif b/mozilla/themes/modern/communicator/brand/throbber-anim.gif
index cd19451828d..720492f2925 100644
Binary files a/mozilla/themes/modern/communicator/brand/throbber-anim.gif and b/mozilla/themes/modern/communicator/brand/throbber-anim.gif differ
diff --git a/mozilla/themes/modern/communicator/brand/throbber-single.gif b/mozilla/themes/modern/communicator/brand/throbber-single.gif
index 7d60bae2d16..3d3d6654b38 100644
Binary files a/mozilla/themes/modern/communicator/brand/throbber-single.gif and b/mozilla/themes/modern/communicator/brand/throbber-single.gif differ
diff --git a/mozilla/themes/modern/communicator/brand/throbber16-anim.gif b/mozilla/themes/modern/communicator/brand/throbber16-anim.gif
index fbfabe6116e..00fa4150917 100644
Binary files a/mozilla/themes/modern/communicator/brand/throbber16-anim.gif and b/mozilla/themes/modern/communicator/brand/throbber16-anim.gif differ
diff --git a/mozilla/themes/modern/communicator/brand/throbber16-single.gif b/mozilla/themes/modern/communicator/brand/throbber16-single.gif
index 7635f5999fe..360d34cb15d 100644
Binary files a/mozilla/themes/modern/communicator/brand/throbber16-single.gif and b/mozilla/themes/modern/communicator/brand/throbber16-single.gif differ
diff --git a/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef b/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef
index 4f3046fef0e..4fb99203a47 100644
--- a/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef
+++ b/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef
@@ -8,7 +8,7 @@ like this:
-->
-
+
diff --git a/mozilla/xpfe/bootstrap/browser-prefs.js b/mozilla/xpfe/bootstrap/browser-prefs.js
index 4cafeca8f60..d2f2cc1d3ad 100644
--- a/mozilla/xpfe/bootstrap/browser-prefs.js
+++ b/mozilla/xpfe/bootstrap/browser-prefs.js
@@ -56,6 +56,8 @@ pref("general.open_location.last_window_choice", 0);
pref("general.smoothScroll", false);
+#expand pref("general.useragent.extra.__MOZ_APP_NAME__", "__MOZ_APP_DISPLAYNAME__/__MOZ_APP_VERSION__");
+
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last
pref("browser.startup.page", 1);
pref("browser.startup.homepage", "chrome://navigator-region/locale/region.properties");
diff --git a/mozilla/xpfe/bootstrap/init.d/README b/mozilla/xpfe/bootstrap/init.d/README
index eb0d9707793..4238c436eb6 100644
--- a/mozilla/xpfe/bootstrap/init.d/README
+++ b/mozilla/xpfe/bootstrap/init.d/README
@@ -2,15 +2,15 @@ mozilla/xpfe/bootstrap/init.d/README
This file describes the mechanism for installing and executing
initialization and termination scripts used to implement pluggable
-shell scripts to modify the behaviour of Mozilla/FireFox/ThunderBird/SunBird.
+shell scripts to modify the behaviour of SeaMonkey/FireFox/ThunderBird/SunBird.
File names in the mozilla/init.d/ and %user_profile%/init.d/
-(for example ${HOME}/.mozilla/init.d/ for Mozilla) are of the form
+(for example ${HOME}/.mozilla/init.d/ for SeaMonkey) are of the form
[SK]nn where 'S' means "run this script at application startup",
'K' means "run this script at application termination", and 'nn' is the
sequence number for killing or starting the job.
-When the application (e.g. Mozilla) starts scripts prefixed with 'S' are
-executed (first those in Mozilla's installation directory, then those in
+When the application (e.g. SeaMonkey) starts scripts prefixed with 'S' are
+executed (first those in the app's installation directory, then those in
user's profile directory), on termination those scripts prefixed with 'K'
are being executed (first those in user's profile dir, finally those in
mozilla's installation directory).
@@ -20,9 +20,9 @@ mozilla's installation directory).
'stop' for scripts prefixed with 'K' and the argument 'start' for scripts
prefixed with 'S'.
An exception of this rule are scripts with the suffix *.sh - they are called
- "inline" in the current shell process which starts/terminates Mozilla. These
+ "inline" in the current shell process which starts/terminates the app. These
scripts have FULL ACCESS to all variables of the calling script (which means
- these scripts can set/modify/unset environment variables used by Mozilla).
+ these scripts can set/modify/unset environment variables used by the app).
Since these scripts run in the same shell the author of such scripts should
ensure that no namespace collisions occur (e.g. accidential modify variable
names used by the parent script).
@@ -41,9 +41,9 @@ mozilla's installation directory).
Relative (!!) or absolute path to the location where the mozilla binary
is located.
- "MOZ_PIS_SESSION_PID":
- Process id of the initial mozilla launch script. In this case used as
- session identifier. The value identifies the current mozilla
- session. Note that one user may run multiple mozilla sessions (with
+ Process id of the initial application launch script. In this case used as
+ session identifier. The value identifies the current application
+ session. Note that one user may run multiple application sessions (with
differnt profiles) in parallel. "stop"-scripts must ensure that they
only affect resources created by the "start"-script of the same session
(identified via "MOZ_PIS_SESSION_PID") and same machine (use 'uname -n'
diff --git a/mozilla/xpfe/bootstrap/module.ver b/mozilla/xpfe/bootstrap/module.ver
index 475dc4064fc..23b7abfc330 100644
--- a/mozilla/xpfe/bootstrap/module.ver
+++ b/mozilla/xpfe/bootstrap/module.ver
@@ -1,6 +1,8 @@
WIN32_MODULE_COMPANYNAME=mozilla.org
WIN32_MODULE_COPYRIGHT=©Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
-WIN32_MODULE_TRADEMARKS=Mozilla is a trademark of The Mozilla Foundation.
+WIN32_MODULE_FILEVERSION=1,0,0,0
+WIN32_MODULE_FILEVERSION_STRING=1.0a
+WIN32_MODULE_TRADEMARKS=SeaMonkey and Mozilla are trademarks of The Mozilla Foundation.
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
diff --git a/mozilla/xpfe/bootstrap/mozilla.icns b/mozilla/xpfe/bootstrap/mozilla.icns
index d055829085d..2a3bf003944 100644
Binary files a/mozilla/xpfe/bootstrap/mozilla.icns and b/mozilla/xpfe/bootstrap/mozilla.icns differ
diff --git a/mozilla/xpfe/bootstrap/mozilla.ico b/mozilla/xpfe/bootstrap/mozilla.ico
index 678075081cb..ea33ed3f68d 100644
Binary files a/mozilla/xpfe/bootstrap/mozilla.ico and b/mozilla/xpfe/bootstrap/mozilla.ico differ
diff --git a/mozilla/xpfe/bootstrap/mozos2.ico b/mozilla/xpfe/bootstrap/mozos2.ico
index fbc3007a771..404bd8e281b 100644
Binary files a/mozilla/xpfe/bootstrap/mozos2.ico and b/mozilla/xpfe/bootstrap/mozos2.ico differ
diff --git a/mozilla/xpfe/bootstrap/splash.bmp b/mozilla/xpfe/bootstrap/splash.bmp
index f275728bc48..7297703f729 100644
Binary files a/mozilla/xpfe/bootstrap/splash.bmp and b/mozilla/xpfe/bootstrap/splash.bmp differ
diff --git a/mozilla/xpfe/bootstrap/splash.xpm b/mozilla/xpfe/bootstrap/splash.xpm
index 3b0006c33da..1ce96e95b2f 100644
--- a/mozilla/xpfe/bootstrap/splash.xpm
+++ b/mozilla/xpfe/bootstrap/splash.xpm
@@ -1,307 +1,270 @@
/* XPM */
static char * splash_xpm[] = {
-"392 263 41 1",
+"390 260 7 1",
" c None",
-". c #100C05",
-"+ c #100B03",
-"@ c #181106",
-"# c #E89B2E",
-"$ c #D8912B",
-"% c #D5902B",
-"& c #C58528",
-"* c #BD7F26",
-"= c #AA7222",
-"- c #A97222",
-"; c #A46F21",
-"> c #9B681F",
-", c #94641E",
-"' c #734D17",
-") c #6D4916",
-"! c #F6A632",
-"~ c #E69B2F",
-"{ c #B47A25",
-"] c #83591B",
-"^ c #624214",
-"/ c #31210A",
-"( c #5D3F14",
-"_ c #F7A531",
-": c #C98628",
-"< c #BA7C25",
-"[ c #422C0D",
-"} c #8B5D1C",
-"| c #7C5319",
-"1 c #BB7D26",
-"2 c #5B3D13",
-"3 c #523711",
-"4 c #211607",
-"5 c #4E3411",
-"6 c #3F2A0E",
-"7 c #2F200B",
-"8 c #201608",
-"9 c #0A0703",
-"0 c #090603",
-"a c #020202",
-"b c #000000",
-"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________66666>________>66666:____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb___________________________________________________________________________________________________________________________________________________________________________________________________________________________________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb__________________________________________________________________________________________________________________:<<<<<<<<<1**_______________________________#<<<<<<<<<<<<<<<<<<___________#<<<<<<<<<<<<$__________$<<<<<_________aaaaa|________|aaaaa<____________________________________________________________________________________________________________________________________________bb",
-"bb__________________________________________________________________________________________________________________6aaaaaaaaaaa2a______________________________#___________.aaaaa___________#<<<<___________|aaaaa_________aaaaa|________|aaaaa<____________<||||||8aaaaa<__________________________________________________________________________________________________________________bb",
-"bb__________________________________________________________________________________________________________________6aaaa6____aaaaaa______________|aaaaa_________aaaaa|________|aaaaa<_______aaaaaaaaaaaaaaaaaa<__________________________________________________________________________________________________________________bb",
-"bb__________________________________________________________________________________________________________________6aaaa6__________________|aaaaa_________aaaaa|________|aaaaa<_______aaaaa.:_____)aaaaa<__________________________________________________________________________________________________________________bb",
-"bb__________________________________________________________________________________________________________________6aaaa6____aaaaaa_________________|aaaaa_________aaaaa|________|aaaaa<_______aaaaa6_______aaaaa<__________________________________________________________________________________________________________________bb",
-"bb__________________________________________________________________________________________________________________6aaaa6_____________________|aaaaa_________aaaaa|________|aaaaa<_______aaaaa6_______aaaaa<__________________________________________________________________________________________________________________bb",
-"bb__________________________________________________________________________________________________________________6aaaa6____7aaaaa<__________________________________________________________________________________________________________________bb",
-"bb__________________________________________________________________________________________________________________6aaaa6____
-
-
+
+
diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/brand.properties b/mozilla/xpfe/communicator/resources/locale/en-US/brand.properties
index 8f9c607425d..2d38def9fbc 100644
--- a/mozilla/xpfe/communicator/resources/locale/en-US/brand.properties
+++ b/mozilla/xpfe/communicator/resources/locale/en-US/brand.properties
@@ -1,3 +1,3 @@
-brandShortName=Mozilla
-vendorShortName=Mozilla
+brandShortName=SeaMonkey
+vendorShortName=SeaMonkey
sidebarName=Sidebar
diff --git a/mozilla/xpfe/components/search/resources/locale/en-US/default.htm b/mozilla/xpfe/components/search/resources/locale/en-US/default.htm
index 17c576030b2..9100fe99086 100644
--- a/mozilla/xpfe/components/search/resources/locale/en-US/default.htm
+++ b/mozilla/xpfe/components/search/resources/locale/en-US/default.htm
@@ -6,7 +6,7 @@
- Mozilla Search
+ SeaMonkey Search