diff --git a/mozilla/mailnews/base/resources/content/start.xhtml b/mozilla/mailnews/base/resources/content/start.xhtml index 676402a321d..bca436ba52a 100644 --- a/mozilla/mailnews/base/resources/content/start.xhtml +++ b/mozilla/mailnews/base/resources/content/start.xhtml @@ -71,7 +71,6 @@

&info.title;

&info_bugs.label;

-

&info_standalone.label;

diff --git a/mozilla/mailnews/base/resources/locale/en-US/start.dtd b/mozilla/mailnews/base/resources/locale/en-US/start.dtd index 7bb74aa83ae..7b1df7b8c67 100644 --- a/mozilla/mailnews/base/resources/locale/en-US/start.dtd +++ b/mozilla/mailnews/base/resources/locale/en-US/start.dtd @@ -54,7 +54,4 @@ client, supporting advanced junk mail detection and other useful features."> We welcome bug reports and feature requests, but please read the release notes and query -Bugzilla first.'> -Thunderbird Mail.'> +Bugzilla first.'> diff --git a/mozilla/mailnews/base/search/resources/locale/en-US/filter.properties b/mozilla/mailnews/base/search/resources/locale/en-US/filter.properties index 7f86f84c03b..284e2e8a9a9 100644 --- a/mozilla/mailnews/base/search/resources/locale/en-US/filter.properties +++ b/mozilla/mailnews/base/search/resources/locale/en-US/filter.properties @@ -14,4 +14,4 @@ promptTitle=Running Filters promptMsg=You are currently in the process of filtering messages.\nWould you like to continue applying filters? stopButtonLabel=Stop continueButtonLabel=Continue -cannotEnableFilter=This filter was probably created by future version of mozilla/netscape. You cannot enable this filter because we don't know how to apply it. +cannotEnableFilter=This filter was probably created by a future version of this software. You cannot enable this filter because we don't know how to apply it. diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 17bfaac8dc1..ce7e4c382b2 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -68,6 +68,10 @@ ifdef GRE_BUILD DEFINES += -DXPCOM_GLUE -DMOZILLA_STRICT_API endif +DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" +DEFINES += -DMOZ_APP_DISPLAYNAME=\"$(MOZ_APP_DISPLAYNAME)\" +DEFINES += -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\" + MODULE = apprunner REQUIRES = xpcom \ string \ @@ -103,9 +107,9 @@ endif include $(topsrcdir)/config/config.mk ifeq ($(USE_SHORT_LIBNAME),1) -PROGRAM = mozilla$(BIN_SUFFIX) +PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) else -PROGRAM = mozilla-bin$(BIN_SUFFIX) +PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX) endif # Force applications to be built non-statically @@ -385,7 +389,9 @@ LOCAL_INCLUDES = -I$(srcdir) -I. ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) $(MOZ_APP_NAME).1: mozilla.man.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk @sed -e "s|\@bindir\@|${bindir}|" -e "s|\@libdir\@|${libdir}|" \ - -e "s|\@mozilla_version\@|${MOZ_APP_VERSION}|" < $< > $@ + -e "s|\@MOZ_APP_DISPLAYNAME\@|$(MOZ_APP_DISPLAYNAME)|" \ + -e "s|\@MOZ_APP_NAME\@|$(MOZ_APP_NAME)|" \ + -e "s|\@MOZ_APP_VERSION\@|${MOZ_APP_VERSION}|" < $< > $@ libs:: $(MOZ_APP_NAME).1 $(INSTALL) $< $(DIST)/man/man1 @@ -393,12 +399,13 @@ libs:: $(MOZ_APP_NAME).1 install:: $(MOZ_APP_NAME).1 $(SYSINSTALL) $(IFLAGS1) $< $(DESTDIR)$(mandir)/man1 -MOZILLA_SCRIPT=mozilla +MOZILLA_SCRIPT=$(MOZ_APP_NAME) $(MOZILLA_SCRIPT):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \ -e "s|%MOZ_USER_DIR%|.mozilla|" \ -e "s|%MREDIR%|$(mredir)|" \ + -e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" \ -e "s|%MOZILLA-BIN%|$(PROGRAM)|g" > $@ chmod +x $@ @@ -453,15 +460,15 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) INCLUDES += -I$(srcdir)/../appshell/src -I$(srcdir)/appleevents ifdef MOZ_DEBUG -APP_NAME = MozillaDebug +APP_NAME = $(MOZ_APP_DISPLAYNAME)Debug else -APP_NAME = Mozilla +APP_NAME = $(MOZ_APP_DISPLAYNAME) endif libs:: $(PROGRAM) mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app - sed -e "s/MOZILLA_VERSION/$(MOZILLA_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist + sed -e "s/MOZ_APP_NAME/$(MOZ_APP_NAME)/" -e "s/MOZ_APP_DISPLAYNAME/$(MOZ_APP_DISPLAYNAME)/" -e "s/MOZ_APP_VERSION/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist 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 diff --git a/mozilla/xpfe/bootstrap/init.d/Makefile.in b/mozilla/xpfe/bootstrap/init.d/Makefile.in index 9f46fd17ac2..8104c5ccfc7 100644 --- a/mozilla/xpfe/bootstrap/init.d/Makefile.in +++ b/mozilla/xpfe/bootstrap/init.d/Makefile.in @@ -46,8 +46,8 @@ MODULE = apprunner include $(topsrcdir)/config/rules.mk -# Only install the init.d/ files when we use the "mozilla" shell script -# to start mozilla +# Only install the init.d/ files when we use the application shell script +# to start the application ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) diff --git a/mozilla/xpfe/bootstrap/macbuild/Contents/Info.plist.in b/mozilla/xpfe/bootstrap/macbuild/Contents/Info.plist.in index dbc14b07c5d..53d05b1431b 100644 --- a/mozilla/xpfe/bootstrap/macbuild/Contents/Info.plist.in +++ b/mozilla/xpfe/bootstrap/macbuild/Contents/Info.plist.in @@ -5,15 +5,15 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleExecutable - mozilla-bin + MOZ_APP_NAME-bin CFBundleIdentifier - org.mozilla.mozilla + org.mozilla.MOZ_APP_NAME CFBundleVersion - MOZILLA_VERSION + MOZ_APP_VERSION CFBundleDevelopmentRegion English CFBundleName - Mozilla + MOZ_APP_DISPLAYNAME CFBundlePackageType APPL CFBundleSignature @@ -21,9 +21,9 @@ CFBundleIconFile mozilla.icns CFBundleShortVersionString - MOZILLA_VERSION + MOZ_APP_VERSION CFBundleGetInfoString - Mozilla MOZILLA_VERSION, © 1998-2005 The Mozilla Organization + MOZ_APP_DISPLAYNAME MOZ_APP_VERSION, © 1998-2005 The Mozilla Organization NSAppleScriptEnabled CFBundleDocumentTypes @@ -57,7 +57,7 @@ CFBundleTypeName - Mozilla Preferences File + MOZ_APP_DISPLAYNAME Preferences File CFBundleTypeRole None CFBundleTypeOSTypes @@ -70,7 +70,7 @@ CFBundleTypeName - Mozilla Plugin + MOZ_APP_DISPLAYNAME Plugin CFBundleTypeRole None CFBundleTypeOSTypes @@ -89,7 +89,7 @@ CFBundleTypeName - Mozilla Command Line File + MOZ_APP_DISPLAYNAME Command Line File CFBundleTypeRole Viewer CFBundleTypeOSTypes @@ -102,7 +102,7 @@ CFBundleTypeName - Mozilla Shared Library + MOZ_APP_DISPLAYNAME Shared Library CFBundleTypeRole None CFBundleTypeOSTypes @@ -120,7 +120,7 @@ CFBundleTypeName - Mozilla Binary File + MOZ_APP_DISPLAYNAME Binary File CFBundleTypeRole None CFBundleTypeOSTypes @@ -161,7 +161,7 @@ html.icns - + CFBundleTypeName diff --git a/mozilla/xpfe/bootstrap/mozilla.in b/mozilla/xpfe/bootstrap/mozilla.in index 22e79c41c94..1790ae63bea 100755 --- a/mozilla/xpfe/bootstrap/mozilla.in +++ b/mozilla/xpfe/bootstrap/mozilla.in @@ -36,17 +36,17 @@ # # ***** END LICENSE BLOCK ***** -## $Id: mozilla.in,v 1.7 2004-04-17 16:51:11 gerv%gerv.net Exp $ +## $Id: mozilla.in,v 1.8 2005-03-29 22:02:22 kairo%kairo.at Exp $ ## ## Usage: ## ## $ mozilla [args] ## -## This script is meant to run the mozilla-bin binary from either +## This script is meant to run the application 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. +## the application binary to work. ## moz_pis_startstop_scripts() @@ -133,7 +133,7 @@ else if [ -x "$moz_libdir/run-mozilla.sh" ]; then dist_bin=$moz_libdir else - echo "Cannot find mozilla runtime directory. Exiting." + echo "Cannot find %MOZ_APP_DISPLAYNAME% runtime directory. Exiting." exit 1 fi fi diff --git a/mozilla/xpfe/bootstrap/mozilla.man.in b/mozilla/xpfe/bootstrap/mozilla.man.in index ccc7556e070..60bde539a72 100644 --- a/mozilla/xpfe/bootstrap/mozilla.man.in +++ b/mozilla/xpfe/bootstrap/mozilla.man.in @@ -1,24 +1,24 @@ -.TH MOZILLA 1 "August 07, 2001" mozilla "Linux User's Manual" +.TH @MOZ_APP_NAME@ 1 "March 28, 2005" @MOZ_APP_NAME@ "Linux User's Manual" .SH NAME -mozilla \- a Web browser for X11 derived from Netscape Communicator +@MOZ_APP_NAME@ \- an internet application suite (browser, mail, etc.) .SH SYNOPSIS -.B mozilla +.B @MOZ_APP_NAME@ [\fIOPTIONS\fR] [\fIURL\fR] -.B mozilla-bin +.B @MOZ_APP_NAME@-bin [\fIOPTIONS\fR] [\fIURL\fR] .SH DESCRIPTION -\fBMozilla\fR is an open-source web browser, designed for standards compliance, +\fB@MOZ_APP_DISPLAYNAME@\fR is an open-source web browser, designed for standards compliance, performance and portability. .SH USAGE -\fBmozilla\fR is a simple shell script that will set up the environment for -the actual executable, \fBmozilla-bin\fR. +\fB@MOZ_APP_NAME@\fR is a simple shell script that will set up the environment for +the actual executable, \fB@MOZ_APP_NAME@-bin\fR. .SH OPTIONS -A summary of the options supported by \fBmozilla\fR is included below. +A summary of the options supported by \fB@MOZ_APP_NAME@\fR is included below. .SS "GTK options" \fB\-\-gdk-debug=\fR\fIFLAGS\fR @@ -54,7 +54,7 @@ Don't use X shared memory extension .B \-\-g-fatal-warnings Make all warnings fatal -.SS "Mozilla options" +.SS "@MOZ_APP_DISPLAYNAME@ options" .TP \fB\-height\fR \fIvalue\fR Set height of startup window to \fIvalue\fR. @@ -69,7 +69,7 @@ Start with 4.x migration window. Set width of startup window to \fIvalue\fR. .TP .B \-v, \-version -Print \fB/usr/bin/mozilla-bin\fR version. +Print \fB@libdir@/@MOZ_APP_NAME@/@MOZ_APP_NAME@-bin\fR version. .TP \fB\-CreateProfile\fR \fIprofile\fR Create \fIprofile\fR. @@ -90,7 +90,7 @@ Start with profile selection dialog. Start with \fIlang-region\fR resources. .TP \fB\-remote\fR \fIcommand\fR -Execute \fIcommand\fR in an already running Mozilla process. For more info, +Execute \fIcommand\fR in an already running @MOZ_APP_DISPLAYNAME@ process. For more info, see: \fIhttp://www.mozilla.org/unix/remote.html\fR .TP .B \-splash @@ -115,18 +115,18 @@ Load the specified chrome. Start with mail. .TP \fB\-compose\fR \fIurl\fR -Start with messenger compose. +Start with mail compose. .SH FILES -\fI@bindir@/mozilla\fR - shell script wrapping \fBmozilla\fR +\fI@bindir@/@MOZ_APP_NAME@\fR - shell script wrapping \fB@MOZ_APP_NAME@\fR .br -\fI@libdir@/mozilla/mozilla-bin\fR - \fBmozilla\fR executable +\fI@libdir@/@MOZ_APP_NAME@/@MOZ_APP_NAME@-bin\fR - \fB@MOZ_APP_NAME@\fR executable .SH VERSION -@mozilla_version@ +@MOZ_APP_VERSION@ .SH BUGS -To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR +To report a bug, please visit \fIhttps://bugzilla.mozilla.org/\fR .SH "SEE ALSO" .BR galeon(1) diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp index a0062093548..d1ed0de8e9c 100644 --- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp +++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp @@ -151,8 +151,6 @@ extern "C" void ShowOSAlert(const char* aMessage); #include "jprof.h" #endif -#define MOZ_APP_NAME "mozilla" - // on x86 linux, the current builds of some popular plugins (notably // flashplayer and real) expect a few builtin symbols from libgcc // which were available in some older versions of gcc. However, @@ -1383,7 +1381,7 @@ static void DumpHelp(char *appname) #ifdef XP_UNIX printf("%s--g-fatal-warnings%sMake all warnings fatal\n", HELP_SPACER_1, HELP_SPACER_2); - printf("\nMozilla options\n"); + printf("\n%s options\n", MOZ_APP_DISPLAYNAME); #endif printf("%s-height %sSet height of startup window to .\n",HELP_SPACER_1,HELP_SPACER_2); @@ -1399,13 +1397,13 @@ static void DumpHelp(char *appname) printf("%s-UILocale %sStart with resources as UI Locale.\n",HELP_SPACER_1,HELP_SPACER_2); printf("%s-contentLocale %sStart with resources as content Locale.\n",HELP_SPACER_1,HELP_SPACER_2); #if defined(XP_WIN32) || defined(XP_OS2) - printf("%s-console%sStart Mozilla with a debugging console.\n",HELP_SPACER_1,HELP_SPACER_2); + printf("%s-console%sStart %s with a debugging console.\n",HELP_SPACER_1,HELP_SPACER_2,MOZ_APP_DISPLAYNAME); #endif #ifdef MOZ_ENABLE_XREMOTE printf("%s-remote %sExecute in an already running\n" - "%sMozilla process. For more info, see:\n" + "%s%s process. For more info, see:\n" "\n%shttp://www.mozilla.org/unix/remote.html\n\n", - HELP_SPACER_1,HELP_SPACER_1,HELP_SPACER_4,HELP_SPACER_2); + HELP_SPACER_1,HELP_SPACER_1,HELP_SPACER_4,MOZ_APP_DISPLAYNAME,HELP_SPACER_2); printf("%s-splash%sEnable splash screen.\n",HELP_SPACER_1,HELP_SPACER_2); #else printf("%s-nosplash%sDisable splash screen.\n",HELP_SPACER_1,HELP_SPACER_2); @@ -1426,7 +1424,7 @@ static nsresult DumpVersion(char *appname) nsresult rv = NS_OK; long buildID = NS_BUILD_ID; // 10-digit number - printf("Mozilla %s, Copyright (c) 2003-2004 mozilla.org", MOZILLA_VERSION); + printf("%s %s, Copyright (c) 2003-2005 mozilla.org", MOZ_APP_DISPLAYNAME, MOZ_APP_VERSION); if(buildID) { printf(", build %u\n", (unsigned int)buildID); diff --git a/mozilla/xpfe/global/Makefile.in b/mozilla/xpfe/global/Makefile.in index 1f420ebc6a4..80b1d0c1db2 100644 --- a/mozilla/xpfe/global/Makefile.in +++ b/mozilla/xpfe/global/Makefile.in @@ -48,6 +48,8 @@ CHROME_DEPS = build.dtd buildconfig.html include $(topsrcdir)/config/rules.mk +DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) + ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) CHROME_PLATFORM = mac else diff --git a/mozilla/xpfe/global/resources/content/about.xhtml b/mozilla/xpfe/global/resources/content/about.xhtml index 89a8b137bee..a1399d25e89 100644 --- a/mozilla/xpfe/global/resources/content/about.xhtml +++ b/mozilla/xpfe/global/resources/content/about.xhtml @@ -2,7 +2,7 @@ - + %versionDTD; %brandDTD; diff --git a/mozilla/xpfe/global/resources/content/version.dtd b/mozilla/xpfe/global/resources/content/version.dtd index d588d14a07f..f4d208a6abc 100644 --- a/mozilla/xpfe/global/resources/content/version.dtd +++ b/mozilla/xpfe/global/resources/content/version.dtd @@ -34,4 +34,4 @@ - - ***** END LICENSE BLOCK ***** --> -#expand +#expand