From 7cf28f7ba3ee5dab4e80f406f8bd2867c5c4abd2 Mon Sep 17 00:00:00 2001 From: Basilisk-Dev Date: Sat, 30 Jul 2022 20:50:56 -0400 Subject: Issue #7 - Update LICENSE files and some copyright info --- basilisk/LICENSE | 4 ++-- basilisk/base/content/aboutDialog.xul | 6 +++--- basilisk/base/content/overrides/app-license.html | 9 ++++++--- basilisk/branding/official/LICENSE | 6 +++--- basilisk/branding/official/locales/en-US/brand.dtd | 2 +- basilisk/installer/windows/nsis/defines.nsi.in | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/basilisk/LICENSE b/basilisk/LICENSE index f2d7bda..3312653 100644 --- a/basilisk/LICENSE +++ b/basilisk/LICENSE @@ -3,8 +3,8 @@ copyright licensing conditions attached to the platform codebase, including copies of the licenses concerned. You are not granted rights or licenses to the trademarks of Moonchild -Productions or any other party, including without limitation the -Basilisk name or logo. +Productions, Basilisk-Dev, or any other party, including without +limitation the Basilisk name or logo. The Serpent logo in branding/unofficial is derived from "Sea Serpent" by Lorc, licensed under the Creative Commons license CC-BY 3.0 diff --git a/basilisk/base/content/aboutDialog.xul b/basilisk/base/content/aboutDialog.xul index b1fcd6a..70a2c74 100644 --- a/basilisk/base/content/aboutDialog.xul +++ b/basilisk/base/content/aboutDialog.xul @@ -124,14 +124,14 @@ #ifdef MC_PRIVATE_BUILD - This is a private build of Basilisk. If you did not manually build this copy from source yourself, then please download an official version from the . + This is a private build of Basilisk. If you did not manually build this copy from source yourself, then please download an official version from the . #else - Basilisk is community software released by and Mozilla developers. Learn to this software. + Basilisk is community software released by and Mozilla developers. Learn to this software. Basilisk was formerly developed by the Pale Moon team. Without them this project would not exist. Thank you to Moonchild and others for your work on Basilisk over the years. - Want to help? Please consider or get involved with our of the Unified XUL Platform. + Want to help? Please consider or get involved with the of the Unified XUL Platform. #endif diff --git a/basilisk/base/content/overrides/app-license.html b/basilisk/base/content/overrides/app-license.html index 0a1f0d8..286b2d4 100644 --- a/basilisk/base/content/overrides/app-license.html +++ b/basilisk/base/content/overrides/app-license.html @@ -2,6 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

Binaries of this product have been made available to you by the - Pale Moon project team and - Moonchild Productions under the Mozilla - Public License 2.0 (MPL). Know your rights.

+ Basilisk Development Team under the Mozilla + Public Licence 2.0 (MPL). Know your rights/

+
+ Basilisk was formerly developed by the Pale Moon project team + and Moonchild Productions. Without them this project + would not exist. diff --git a/basilisk/branding/official/LICENSE b/basilisk/branding/official/LICENSE index 8833fe2..f1c6ade 100644 --- a/basilisk/branding/official/LICENSE +++ b/basilisk/branding/official/LICENSE @@ -1,10 +1,10 @@ This location contains official branding for the Basilisk browser. Please note that you are not granted any trademark rights or licenses -to the trademarks of Moonchild Productions or any other party, +to the trademarks of Moonchild Productions, Basilisk-Dev, or any other party, including without limitation the Basilisk name or logo. -These branding materials are Copyrighted (c) M. Straver. All rights reserved. +These branding materials are Copyrighted (c) Basilisk-Dev. All rights reserved. Official branding using these files is only allowed by the copyright holder -or by third parties with express permission from the copyright holder. \ No newline at end of file +or by third parties with express permission from the copyright holder. diff --git a/basilisk/branding/official/locales/en-US/brand.dtd b/basilisk/branding/official/locales/en-US/brand.dtd index 1d2ac79..68abf6d 100644 --- a/basilisk/branding/official/locales/en-US/brand.dtd +++ b/basilisk/branding/official/locales/en-US/brand.dtd @@ -7,4 +7,4 @@ - + diff --git a/basilisk/installer/windows/nsis/defines.nsi.in b/basilisk/installer/windows/nsis/defines.nsi.in index d031911..9f47f42 100644 --- a/basilisk/installer/windows/nsis/defines.nsi.in +++ b/basilisk/installer/windows/nsis/defines.nsi.in @@ -51,7 +51,7 @@ VIProductVersion "1.0.0.0" VIAddVersionKey "ProductName" "${BrandShortName}" VIAddVersionKey "CompanyName" "${CompanyName}" #ifdef MOZ_OFFICIAL_BRANDING -VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Moonchild Productions." +VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Basilisk-Dev." #endif VIAddVersionKey "LegalCopyright" "${CompanyName}" VIAddVersionKey "FileVersion" "${AppVersion}" -- cgit v1.2.3