Skip to content

Commit 165a838

Browse files
K4sum1K4sum1
committed
Branding part 0
1 parent 522f98a commit 165a838

File tree

7 files changed

+12
-31
lines changed

7 files changed

+12
-31
lines changed

‎application/basilisk/app/module.ver

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
WIN32_MODULE_COMPANYNAME=@MOZ_APP_VENDOR@
2-
WIN32_MODULE_COPYRIGHT=�Basilisk and Mozilla Developers; available under the MPL 2 license.
2+
WIN32_MODULE_COPYRIGHT=�Eclipse Community, Basilisk and Mozilla Developers; available under the MPL 2 license.
33
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
44
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
5-
WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of Moonchild Productions.
5+
WIN32_MODULE_TRADEMARKS=The Hydra logo and project names are trademarks of Eclipse Community.
66
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ web browser
77
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
88
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@

‎application/basilisk/base/content/overrides/app-license.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<!-- This Source Code Form is subject to the terms of the Mozilla Public
22
- License, v. 2.0. If a copy of the MPL was not distributed with this
33
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
4-
<p><b>Binaries</b> of this product have been made available to you by the
5-
<a href="http://www.palemoon.org/">Pale Moon project team</a> and
6-
<a href="http://www.moonchildproductions.info/">Moonchild Productions</a> under the Mozilla
4+
<p><b>Binaries</b> of this product have been made available to you by
5+
<a href="http://eclipse.cx/">Eclipse Community</a> under the Mozilla
76
Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p>

‎application/palemoon/app/module.ver

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
WIN32_MODULE_COMPANYNAME=@MOZ_APP_VENDOR@
2-
WIN32_MODULE_COPYRIGHT=�Pale Moon, Firefox and Mozilla Developers, available under the MPL 2.0.
2+
WIN32_MODULE_COPYRIGHT=�Eclipse Community, Pale Moon, Firefox and Mozilla Developers, available under the MPL 2.0.
33
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
44
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
5-
WIN32_MODULE_TRADEMARKS=The Pale Moon logo and project names are trademarks of Moonchild Productions.
5+
WIN32_MODULE_TRADEMARKS=The Lun3r logo and project names are trademarks of Moonchild Productions.
66
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ web browser
77
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
88
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@

‎application/palemoon/base/content/overrides/app-license.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- This Source Code Form is subject to the terms of the Mozilla Public
22
- License, v. 2.0. If a copy of the MPL was not distributed with this
33
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
4-
<p><b>Binaries</b> of this product have been made available to you by the
5-
<a href="http://www.palemoon.org/">Pale Moon Project</a> under the Pale Moon
6-
Binary <a href="http://www.palemoon.org/redist.shtml">redistribution license</a>.</p>
4+
<p><b>Binaries</b> of this product have been made available to you by
5+
<a href="http://eclipse.cx/">Eclipse Community</a> under the Mozilla
6+
Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p>

‎build/directive4.py

-18
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,6 @@
2828
elif _splitString[0] == "MOZ_BRANDING_DIRECTORY":
2929
strBrandingDirectory = _splitString[1]
3030

31-
# Only applies if using Official Branding or specific branding directories
32-
if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("branding/official")) or (strBrandingDirectory.endswith("branding/unstable")):
33-
# Applies to Pale Moon and Basilisk
34-
if ('MC_BASILISK' in listConfig) or ('MC_PALEMOON' in listConfig):
35-
listViolations += [
36-
'MOZ_SYSTEM_JPEG',
37-
'MOZ_SYSTEM_ZLIB',
38-
'MOZ_SYSTEM_BZ2',
39-
'MOZ_SYSTEM_JEMALLOC'
40-
]
41-
42-
# Applies to Pale Moon Only
43-
if 'MC_PALEMOON' in listConfig:
44-
listViolations += [
45-
'MOZ_EME',
46-
'MOZ_WEBRTC'
47-
]
48-
4931
# Iterate through enabled violations and output 1 to DIRECTIVE4 if any are found
5032
for _value in listViolations:
5133
if _value in listConfig:

‎old-configure.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -5439,9 +5439,9 @@ DIRECTIVE4=`$PYTHON $_topsrcdir/build/directive4.py $DIRECTIVE4_LIST`
54395439

54405440
if test -n "$DIRECTIVE4"; then
54415441
if test -n "$MC_PRIVATE_BUILD"; then
5442-
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])
5442+
AC_MSG_WARN([Please do not redistribute this build with official branding if you are not part of Eclipse Community.])
54435443
else
5444-
AC_MSG_ERROR([Branding Violation - Please see: http://www.palemoon.org/redist.shtml])
5444+
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.])
54455445
fi
54465446
fi
54475447

‎toolkit/locales/en-US/chrome/global/aboutRights.dtd

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<!ENTITY rights.intro-point1b "Mozilla Public License">
2020
<!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others. You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
2121

22-
<!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of Moonchild Productions or any other party, including without limitation the Basilisk and Pale Moon names or logos. Additional information on trademarks may be found ">
22+
<!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of Eclipse Community or any other party, including without limitation the Hydra and Lun3r names or logos. Additional information on trademarks may be found ">
2323
<!ENTITY rights.intro-point2-b "here">
2424
<!ENTITY rights.intro-point2-c ".">
2525

0 commit comments

Comments
 (0)