Binaries of this product have been made available to you by the - Pale Moon project team and - Moonchild Productions under the Mozilla +
Binaries of this product have been made available to you by + Eclipse Community under the Mozilla Public License 2.0 (MPL). Know your rights.
diff --git a/application/palemoon/app/module.ver b/application/palemoon/app/module.ver index d8a1275100..e241b8cb55 100644 --- a/application/palemoon/app/module.ver +++ b/application/palemoon/app/module.ver @@ -1,8 +1,8 @@ WIN32_MODULE_COMPANYNAME=@MOZ_APP_VENDOR@ -WIN32_MODULE_COPYRIGHT=İPale Moon, Firefox and Mozilla Developers, available under the MPL 2.0. +WIN32_MODULE_COPYRIGHT=İEclipse Community, Pale Moon, Firefox and Mozilla Developers, available under the MPL 2.0. WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@ WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@ -WIN32_MODULE_TRADEMARKS=The Pale Moon logo and project names are trademarks of Moonchild Productions. +WIN32_MODULE_TRADEMARKS=The Lun3r logo and project names are trademarks of Moonchild Productions. WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ web browser WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@ diff --git a/application/palemoon/base/content/overrides/app-license.html b/application/palemoon/base/content/overrides/app-license.html index 2d2e3d55ef..3150425a4e 100644 --- a/application/palemoon/base/content/overrides/app-license.html +++ b/application/palemoon/base/content/overrides/app-license.html @@ -1,6 +1,6 @@ -Binaries of this product have been made available to you by the - Pale Moon Project under the Pale Moon - Binary redistribution license.
\ No newline at end of file +Binaries of this product have been made available to you by + Eclipse Community under the Mozilla + Public License 2.0 (MPL). Know your rights.
diff --git a/build/directive4.py b/build/directive4.py index 650349d689..ab74045773 100644 --- a/build/directive4.py +++ b/build/directive4.py @@ -28,24 +28,6 @@ for _value in listConfigure: elif _splitString[0] == "MOZ_BRANDING_DIRECTORY": strBrandingDirectory = _splitString[1] -# Only applies if using Official Branding or specific branding directories -if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("branding/official")) or (strBrandingDirectory.endswith("branding/unstable")): - # Applies to Pale Moon and Basilisk - if ('MC_BASILISK' in listConfig) or ('MC_PALEMOON' in listConfig): - listViolations += [ - 'MOZ_SYSTEM_JPEG', - 'MOZ_SYSTEM_ZLIB', - 'MOZ_SYSTEM_BZ2', - 'MOZ_SYSTEM_JEMALLOC' - ] - - # Applies to Pale Moon Only - if 'MC_PALEMOON' in listConfig: - listViolations += [ - 'MOZ_EME', - 'MOZ_WEBRTC' - ] - # Iterate through enabled violations and output 1 to DIRECTIVE4 if any are found for _value in listViolations: if _value in listConfig: diff --git a/old-configure.in b/old-configure.in index c460596b3b..28f91bcb2b 100644 --- a/old-configure.in +++ b/old-configure.in @@ -5439,9 +5439,9 @@ DIRECTIVE4=`$PYTHON $_topsrcdir/build/directive4.py $DIRECTIVE4_LIST` if test -n "$DIRECTIVE4"; then if test -n "$MC_PRIVATE_BUILD"; then - AC_MSG_WARN([Private Build - The configuration you have chosen to use with official branding deviates from official build configuration. Your build is thus for personal and private use only and must not be (re)distributed - Please see: http://www.palemoon.org/redist.shtml]) + AC_MSG_WARN([Please do not redistribute this build with official branding if you are not part of Eclipse Community.]) else - AC_MSG_ERROR([Branding Violation - Please see: http://www.palemoon.org/redist.shtml]) + AC_MSG_ERROR([Please use unofficial branding for this build. If you really wish to use official branding, set MC_PRIVATE_BUILD=1 as an environment variable.]) fi fi diff --git a/toolkit/locales/en-US/chrome/global/aboutRights.dtd b/toolkit/locales/en-US/chrome/global/aboutRights.dtd index 8ccbbb1777..a904d67913 100644 --- a/toolkit/locales/en-US/chrome/global/aboutRights.dtd +++ b/toolkit/locales/en-US/chrome/global/aboutRights.dtd @@ -19,7 +19,7 @@ - +