Issue #7 and #8 - Update the rest of the Moonchild stuff to say either Basilisk-Dev or Basilisk Development Team

14 files changed, 21 insertions, 21 deletions

diff --git a/basilisk/LICENSE b/basilisk/LICENSE
index 3312653..1d7dd0a 100644
--- a/basilisk/LICENSE
+++ b/basilisk/LICENSE
@@ -3,7 +3,7 @@ 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, Basilisk-Dev, or any other party, including without
+Productions, the Basilisk Dev Team, or any other party, including without
 limitation the Basilisk name or logo.
 
 The Serpent logo in branding/unofficial is derived from "Sea Serpent"
diff --git a/basilisk/app/application.ini b/basilisk/app/application.ini
index 05317ee..e481743 100644
--- a/basilisk/app/application.ini
+++ b/basilisk/app/application.ini
@@ -20,7 +20,7 @@
 
 [App]
 # Vendor=@MOZ_APP_VENDOR@
-Vendor=Moonchild Productions
+Vendor=Basilisk-Dev
 # Name=@MOZ_APP_BASENAME@
 Name=Basilisk
 RemotingName=@MOZ_APP_REMOTINGNAME@
diff --git a/basilisk/app/module.ver b/basilisk/app/module.ver
index 0373ff9..0a1d2b4 100644
--- a/basilisk/app/module.ver
+++ b/basilisk/app/module.ver
@@ -1,8 +1,8 @@
-WIN32_MODULE_COMPANYNAME=Moonchild Productions
-WIN32_MODULE_COPYRIGHT=©Basilisk and Mozilla Developers; available under the MPL 2 license.
+WIN32_MODULE_COMPANYNAME=Basilisk Development Team
+WIN32_MODULE_COPYRIGHT=�Basilisk and Mozilla Developers; available under the MPL 2 license.
 WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
 WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
-WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of Moonchild Productions.
+WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of the Basilisk Development Team.
 WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
diff --git a/basilisk/base/content/overrides/app-license.html b/basilisk/base/content/overrides/app-license.html
index 286b2d4..ec61ecf 100644
--- a/basilisk/base/content/overrides/app-license.html
+++ b/basilisk/base/content/overrides/app-license.html
@@ -3,7 +3,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
     <p><b>Binaries</b> of this product have been made available to you by the
     <a href="https://basilisk-browser.org">Basilisk Development Team</a> under the Mozilla
-    Public Licence 2.0 (MPL). <a href="about:rights">Know your rights</a>/</p>
+    Public Licence 2.0 (MPL). <a href="about:rights">Know your rights!</a></p>
     <br>
     Basilisk was formerly developed by the <a href="http://www.palemoon.org/">Pale Moon project team</a>
     and <a href="http://www.moonchildproductions.info/">Moonchild Productions</a>. Without them this project
diff --git a/basilisk/branding/official/LICENSE b/basilisk/branding/official/LICENSE
index f1c6ade..72a4bdc 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, Basilisk-Dev, or any other party,
+to the trademarks of Moonchild Productions, the Basilisk Development Team, or any other party,
 including without limitation the Basilisk name or logo.
 
-These branding materials are Copyrighted (c) Basilisk-Dev. All rights reserved.
+These branding materials are Copyrighted (c) the Basilisk Development Team. 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.
diff --git a/basilisk/branding/official/branding.nsi b/basilisk/branding/official/branding.nsi
index 250abd8..ffa6bc0 100644
--- a/basilisk/branding/official/branding.nsi
+++ b/basilisk/branding/official/branding.nsi
@@ -9,7 +9,7 @@
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Basilisk"
-!define CompanyName           "Moonchild Productions"
+!define CompanyName           "Basilisk Development Team"
 !define URLInfoAbout          "https://www.basilisk-browser.org"
 !define URLUpdateInfo         "https://www.basilisk-browser.org/releasenotes.shtml"
 !define HelpLink              "https://www.basilisk-browser.org/contact.shtml"
diff --git a/basilisk/branding/official/locales/en-US/brand.dtd b/basilisk/branding/official/locales/en-US/brand.dtd
index 68abf6d..5c15fbe 100644
--- a/basilisk/branding/official/locales/en-US/brand.dtd
+++ b/basilisk/branding/official/locales/en-US/brand.dtd
@@ -5,6 +5,6 @@
 <!ENTITY  brandShorterName      "Basilisk">
 <!ENTITY  brandShortName        "Basilisk">
 <!ENTITY  brandFullName         "Basilisk">
-<!ENTITY  vendorShortName       "Moonchild">
-<!ENTITY  vendorFullName        "Moonchild Productions">
-<!ENTITY  trademarkInfo.part1   "Basilisk, Basilisk Browser and the Basilisk logos are trademarks of Basilisk-Dev.">
+<!ENTITY  vendorShortName       "Basilisk-Dev">
+<!ENTITY  vendorFullName        "Basilisk-Dev-Team">
+<!ENTITY  trademarkInfo.part1   "Basilisk, Basilisk Browser and the Basilisk logos are trademarks of the Basilisk Development Team.">
diff --git a/basilisk/branding/official/locales/en-US/brand.properties b/basilisk/branding/official/locales/en-US/brand.properties
index 9bdb667..e7fb77b 100644
--- a/basilisk/branding/official/locales/en-US/brand.properties
+++ b/basilisk/branding/official/locales/en-US/brand.properties
@@ -5,7 +5,7 @@
 brandShorterName=Basilisk
 brandShortName=Basilisk
 brandFullName=Basilisk
-vendorShortName=Moonchild
+vendorShortName=Basilisk-Dev
 
 homePageSingleStartMain=Internal home page with search.
 homePageImport=Import your home page from %S
diff --git a/basilisk/branding/unofficial/branding.nsi b/basilisk/branding/unofficial/branding.nsi
index 586dd00..5afe193 100644
--- a/basilisk/branding/unofficial/branding.nsi
+++ b/basilisk/branding/unofficial/branding.nsi
@@ -9,7 +9,7 @@
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Serpent"
-!define CompanyName           "Moonchild Productions"
+!define CompanyName           "Basilisk Development Team"
 !define URLInfoAbout          "https://www.basilisk-browser.org"
 !define URLUpdateInfo         "https://www.basilisk-browser.org"
 !define HelpLink              "https://forum.palemoon.org"
diff --git a/basilisk/branding/unofficial/locales/en-US/brand.dtd b/basilisk/branding/unofficial/locales/en-US/brand.dtd
index 17c2436..d10cf29 100644
--- a/basilisk/branding/unofficial/locales/en-US/brand.dtd
+++ b/basilisk/branding/unofficial/locales/en-US/brand.dtd
@@ -5,6 +5,6 @@
 <!ENTITY  brandShorterName      "Serpent">
 <!ENTITY  brandShortName        "Serpent">
 <!ENTITY  brandFullName         "Serpent">
-<!ENTITY  vendorShortName       "Moonchild">
-<!ENTITY  vendorFullName        "Moonchild Productions">
+<!ENTITY  vendorShortName       "Basilisk-Dev">
+<!ENTITY  vendorFullName        "Basilisk-Dev">
 <!ENTITY  trademarkInfo.part1   " ">
diff --git a/basilisk/branding/unofficial/locales/en-US/brand.properties b/basilisk/branding/unofficial/locales/en-US/brand.properties
index 80349f0..f3fd5df 100644
--- a/basilisk/branding/unofficial/locales/en-US/brand.properties
+++ b/basilisk/branding/unofficial/locales/en-US/brand.properties
@@ -5,7 +5,7 @@
 brandShorterName=Serpent
 brandShortName=Serpent
 brandFullName=Serpent
-vendorShortName=Moonchild
-vendorFullName=Moonchild Productions
+vendorShortName=Basilisk-Dev
+vendorFullName=Basilisk-Dev
 
 syncBrandShortName=Sync
diff --git a/basilisk/confvars.sh b/basilisk/confvars.sh
index 64eb57e..d73cfd7 100644
--- a/basilisk/confvars.sh
+++ b/basilisk/confvars.sh
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZ_APP_BASENAME=Basilisk
-MOZ_APP_VENDOR=Moonchild
+MOZ_APP_VENDOR=Basilisk-Dev
 MOZ_PHOENIX=1
 MOZ_AUSTRALIS=1
 MC_BASILISK=1
diff --git a/basilisk/installer/windows/nsis/defines.nsi.in b/basilisk/installer/windows/nsis/defines.nsi.in
index 9f47f42..f8dab66 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 Basilisk-Dev."
+VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of the Basilisk Development Team."
 #endif
 VIAddVersionKey "LegalCopyright"  "${CompanyName}"
 VIAddVersionKey "FileVersion"     "${AppVersion}"
diff --git a/basilisk/installer/windows/nsis/shared.nsh b/basilisk/installer/windows/nsis/shared.nsh
index fbcac74..1996fb9 100644
--- a/basilisk/installer/windows/nsis/shared.nsh
+++ b/basilisk/installer/windows/nsis/shared.nsh
@@ -533,7 +533,7 @@
     ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0
     ${WriteRegStr2} $1 "$0" "HelpLink" "${HelpLink}" 0
     ${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0
-    ${WriteRegStr2} $1 "$0" "Publisher" "Moonchild Productions" 0
+    ${WriteRegStr2} $1 "$0" "Publisher" "Basilisk Development Team" 0
     ${WriteRegStr2} $1 "$0" "UninstallString" "$\"$8\uninstall\helper.exe$\"" 0
     DeleteRegValue SHCTX "$0" "URLInfoAbout"
 ; Don't add URLUpdateInfo which is the release notes url except for the release