Mypal branding

master
Fedor 2019-03-12 20:29:02 +03:00
parent ae278366f9
commit 4d5c45e668
24 changed files with 145 additions and 163 deletions

View File

@ -20,9 +20,9 @@
[App]
# Vendor=@MOZ_APP_VENDOR@
Vendor=Moonchild Productions
Vendor=""
# Name=@MOZ_APP_BASENAME@
Name=Pale Moon
Name=Mypal
RemotingName=@MOZ_APP_REMOTINGNAME@
#ifdef MOZ_APP_DISPLAYNAME
CodeName=@MOZ_APP_DISPLAYNAME@

View File

@ -1,8 +1,8 @@
WIN32_MODULE_COMPANYNAME=Moonchild Productions
WIN32_MODULE_COPYRIGHT=©Pale Moon, Firefox and Mozilla Developers, available under the MPL 2.0.
WIN32_MODULE_COMPANYNAME=Feodor2
WIN32_MODULE_COPYRIGHT=©Mypal, 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 the property of Moonchild Productions.
WIN32_MODULE_DESCRIPTION=Pale Moon web browser
WIN32_MODULE_PRODUCTNAME=Pale Moon
WIN32_MODULE_NAME=Pale Moon
WIN32_MODULE_TRADEMARKS=Mypal logo and project names are the property of mine.
WIN32_MODULE_DESCRIPTION=Mypal web browser
WIN32_MODULE_PRODUCTNAME=Mypal
WIN32_MODULE_NAME=Mypal

View File

@ -52,25 +52,13 @@
</vbox>
<vbox id="aboutTextBox" flex="1">
<description class="text-credits text-center">
#if defined(MOZ_OFFICIAL_BRANDING) || defined(MC_OFFICIAL)
#ifdef MC_PRIVATE_BUILD
This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
#else
<label class="text-link" href="http://www.palemoon.org">Pale Moon</label> is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
Mypal browser is based on Pale Moon.
</description>
<description class="text-credits text-center">
Special thanks to all our supporters and donors for making this browser possible!
Adapted for Windows XP and 2003.
</description>
<description class="text-credits">
If you wish to contribute, please consider helping out by providing support to other users on the <label class="text-link" href="https://forum.palemoon.org/">Pale Moon forum</label>
or getting involved in our development by tackling some of the issues found in our GitHub issue tracker.
#endif
#else
&brandFullName; is released by &vendorShortName;.
</description>
<description class="text-credits">
This is an unofficial build of Pale Moon. For official builds, please go to <label class="text-link" href="http://www.palemoon.org/">the Pale Moon website</label>.
#endif
If you wish to contribute, please consider helping out by providing support to other users on the <label class="text-link" href="https://feodor2.github.io/Mypal/">GitHub</label>
</description>
</vbox>
<vbox id="aboutLinkBox">

View File

@ -43,7 +43,7 @@
#endif
<menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
<menuitem id="menu_openHelp"
oncommand="openHelpLink('firefox-help')"
oncommand="openHelpLink('')"
onclick="checkForMiddleClick(this, event);"
label="&productHelp.label;"
accesskey="&productHelp.accesskey;"

View File

@ -340,11 +340,11 @@
</splitmenu>
<splitmenu id="appmenu_help"
label="&helpMenu.label;"
oncommand="openHelpLink('firefox-help')">
oncommand="openHelpLink('')">
<menupopup id="appmenu_helpMenupopup" onpopupshowing="buildHelpMenu();">
<menuitem id="appmenu_openHelp"
label="&helpMenu.label;"
oncommand="openHelpLink('firefox-help')"
oncommand="openHelpLink('')"
onclick="checkForMiddleClick(this, event);"/>
<menuitem id="appmenu_troubleshootingInfo"
label="&helpTroubleshootingInfo.label;"

View File

@ -1625,7 +1625,7 @@ function HandleAppCommandEvent(evt) {
gFindBar.onFindCommand();
break;
case "Help":
openHelpLink('firefox-help');
openHelpLink('');
break;
case "Open":
BrowserOpenFileWindow();

View File

@ -3,5 +3,5 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Do NOT localize or otherwise change these values
browser.startup.homepage=http://start.palemoon.org/
browser.startup.homepage_reset=http://start.palemoon.org/
browser.startup.homepage=https://duckduckgo.com/?t=palemoon
browser.startup.homepage_reset=https://duckduckgo.com/?t=palemoon

View File

@ -1,9 +1,8 @@
// ===| General |==============================================================
pref("startup.homepage_welcome_url","http://www.palemoon.org/firstrun.shtml");
pref("app.vendorURL", "http://www.palemoon.org/");
pref("startup.homepage_welcome_url","https://feodor2.github.io/Mypal/");
pref("app.vendorURL", "https://github.com/Feodor2/Mypal/");
// User Interface
pref("browser.identity.ssl_domain_display", 1); //show domain verified SSL (blue)

View File

@ -8,9 +8,9 @@
# BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified.
!define BrandFullNameInternal "New Moon"
!define CompanyName "Moonchild Productions"
!define URLInfoAbout "http://www.palemoon.org"
!define URLUpdateInfo "http://www.palemoon.org"
!define HelpLink "http://www.palemoon.org"
!define URLSystemRequirements "http://www.palemoon.org/download.shtml"
!define BrandFullNameInternal "Mypal"
!define CompanyName "Feodor2"
!define URLInfoAbout "https://feodor2.github.io/Mypal/"
!define URLUpdateInfo "https://feodor2.github.io/Mypal/"
!define HelpLink "https://github.com/Feodor2/Mypal/wiki"
!define URLSystemRequirements "https://feodor2.github.io/Mypal/"

View File

@ -2,4 +2,4 @@
# 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/.
MOZ_APP_DISPLAYNAME=NewMoon
MOZ_APP_DISPLAYNAME=Mypal

View File

@ -2,7 +2,7 @@
- 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/. -->
<!ENTITY brandShortName "New Moon">
<!ENTITY brandFullName "New Moon">
<!ENTITY vendorShortName "a community developer">
<!ENTITY brandShortName "Mypal">
<!ENTITY brandFullName "Mypal">
<!ENTITY vendorShortName "Feodor2">
<!ENTITY trademarkInfo.part1 " ">

View File

@ -2,8 +2,8 @@
# 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/.
brandShortName=New Moon
brandFullName=New Moon
vendorShortName=Moonchild
brandShortName=Mypal
brandFullName=Mypal
vendorShortName=Feodor2
syncBrandShortName=Sync

View File

@ -8,8 +8,8 @@
# These values where appropriate are hardcoded in application.ini
# to "Pale Moon" and "Moonchild Productions" respectively for
# Pale Moon
MOZ_APP_BASENAME=Palemoon
MOZ_APP_VENDOR=Moonchild
MOZ_APP_BASENAME=Mypal
MOZ_APP_VENDOR=Feodor2
# Application Version
# MOZ_APP_VERSION is read from ./config/version.txt

View File

@ -56,7 +56,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 mine."
#endif
VIAddVersionKey "LegalCopyright" "${CompanyName}"
VIAddVersionKey "FileVersion" "${AppVersion}"

View File

@ -246,10 +246,10 @@ Section "-InstallStartCleanup"
${EndIf}
; setup the application model id registration value
${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
${InitHashAppModelId} "$INSTDIR" "Software\${AppName}\TaskBarIDs"
; Remove the updates directory for Vista and above
${CleanUpdateDirectories} "Mozilla\Pale Moon" "Mozilla\updates"
${CleanUpdateDirectories} "Mypal" "Mypal\updates"
${RemoveDeprecatedFiles}
${RemovePrecompleteEntries} "false"
@ -339,25 +339,25 @@ Section "-Application" APP_IDX
${LogHeader} "Adding Registry Entries"
SetShellVarContext current ; Set SHCTX to HKCU
${RegCleanMain} "Software\Mozilla"
${RegCleanMain} "Software\Mypal"
${RegCleanUninstall}
${UpdateProtocolHandlers}
ClearErrors
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
WriteRegStr HKLM "Software" "${BrandShortName}InstallerTest" "Write Test"
${If} ${Errors}
StrCpy $TmpVal "HKCU" ; used primarily for logging
${Else}
SetShellVarContext all ; Set SHCTX to HKLM
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
DeleteRegValue HKLM "Software" "${BrandShortName}InstallerTest"
StrCpy $TmpVal "HKLM" ; used primarily for logging
${RegCleanMain} "Software\Mozilla"
${RegCleanMain} "Software\Mypal"
${RegCleanUninstall}
${UpdateProtocolHandlers}
ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion"
ReadRegStr $0 HKLM "Software\Mypal" "CurrentVersion"
${If} "$0" != "${GREVersion}"
WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}"
WriteRegStr HKLM "Software\Mypal" "CurrentVersion" "${GREVersion}"
${EndIf}
${EndIf}
@ -584,7 +584,7 @@ Section "-InstallEndCleanup"
; If we have something other than empty string now, write the value.
${If} "$0" != ""
ClearErrors
WriteRegStr HKCU "Software\Mozilla\Pale Moon" "OldDefaultBrowserCommand" "$0"
WriteRegStr HKCU "Software\Mypal" "OldDefaultBrowserCommand" "$0"
${EndIf}
${LogHeader} "Setting as the default browser"
@ -600,7 +600,7 @@ Section "-InstallEndCleanup"
${ElseIfNot} ${Errors}
${LogHeader} "Writing default-browser opt-out"
ClearErrors
WriteRegStr HKCU "Software\Mozilla\Pale Moon" "DefaultBrowserOptOut" "True"
WriteRegStr HKCU "Software\Mypal" "DefaultBrowserOptOut" "True"
${If} ${Errors}
${LogMsg} "Error writing default-browser opt-out"
${EndIf}
@ -964,9 +964,9 @@ Function preSummary
; Check if it is possible to write to HKLM
${If} $InstallType != ${INSTALLTYPE_PORTABLE}
ClearErrors
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
WriteRegStr HKLM "Software" "${BrandShortName}InstallerTest" "Write Test"
${Unless} ${Errors}
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
DeleteRegValue HKLM "Software" "${BrandShortName}InstallerTest"
; Check if Pale Moon is the http handler for this user.
SetShellVarContext current ; Set SHCTX to the current user
${IsHandlerForInstallDir} "http" $R9

View File

@ -13,9 +13,9 @@
; start menu tile. In case there are 2 PaleMoon installations, we only do
; this if the application being updated is the default.
ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId"
${If} $0 == "PaleMoonURL"
${If} $0 == "MypalURL"
${AndIf} $9 != 0 ; We're not running in session 0
ReadRegStr $0 HKCU "Software\Classes\PaleMoonURL\shell\open\command" ""
ReadRegStr $0 HKCU "Software\Classes\MypalURL\shell\open\command" ""
${GetPathFromString} "$0" $0
${GetParent} "$0" $0
${If} ${FileExists} "$0"
@ -29,25 +29,25 @@
; install location in the Software\Mozilla key and uninstall registry entries
; that point to our install location for both HKCU and HKLM.
SetShellVarContext current ; Set SHCTX to the current user (e.g. HKCU)
${RegCleanMain} "Software\Mozilla"
${RegCleanMain} "Software\Mypal"
${RegCleanUninstall}
${UpdateProtocolHandlers}
; setup the application model id registration value
${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
${InitHashAppModelId} "$INSTDIR" "Software\${AppName}\TaskBarIDs"
; Win7 taskbar and start menu link maintenance
Call FixShortcutAppModelIDs
ClearErrors
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
WriteRegStr HKLM "Software" "${BrandShortName}InstallerTest" "Write Test"
${If} ${Errors}
StrCpy $TmpVal "HKCU" ; used primarily for logging
${Else}
SetShellVarContext all ; Set SHCTX to all users (e.g. HKLM)
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
DeleteRegValue HKLM "Software" "${BrandShortName}InstallerTest"
StrCpy $TmpVal "HKLM" ; used primarily for logging
${RegCleanMain} "Software\Mozilla"
${RegCleanMain} "Software\Mypal"
${RegCleanUninstall}
${UpdateProtocolHandlers}
${FixShellIconHandler} "HKLM"
@ -88,9 +88,9 @@
${EndIf}
${EndIf}
ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion"
ReadRegStr $0 HKLM "Software\Mypal" "CurrentVersion"
${If} "$0" != "${GREVersion}"
WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}"
WriteRegStr HKLM "Software\Mypal" "CurrentVersion" "${GREVersion}"
${EndIf}
${EndIf}
@ -282,9 +282,9 @@
ClearErrors
EnumRegKey $7 HKCR "${FILE_TYPE}" 0
${If} ${Errors}
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "PaleMoonHTML"
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "MypalHTML"
${EndIf}
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "PaleMoonHTML" ""
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "MypalHTML" ""
!macroend
!define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist"
@ -298,28 +298,28 @@
; Associate the file handlers with PaleMoonHTML
ReadRegStr $6 SHCTX "$0\.htm" ""
${If} "$6" != "PaleMoonHTML"
WriteRegStr SHCTX "$0\.htm" "" "PaleMoonHTML"
${If} "$6" != "MypalHTML"
WriteRegStr SHCTX "$0\.htm" "" "MypalHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.html" ""
${If} "$6" != "PaleMoonHTML"
WriteRegStr SHCTX "$0\.html" "" "PaleMoonHTML"
${If} "$6" != "MypalHTML"
WriteRegStr SHCTX "$0\.html" "" "MypalHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.shtml" ""
${If} "$6" != "PaleMoonHTML"
WriteRegStr SHCTX "$0\.shtml" "" "PaleMoonHTML"
${If} "$6" != "MypalHTML"
WriteRegStr SHCTX "$0\.shtml" "" "MypalHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.xht" ""
${If} "$6" != "PaleMoonHTML"
WriteRegStr SHCTX "$0\.xht" "" "PaleMoonHTML"
${If} "$6" != "MypalHTML"
WriteRegStr SHCTX "$0\.xht" "" "MypalHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.xhtml" ""
${If} "$6" != "PaleMoonHTML"
WriteRegStr SHCTX "$0\.xhtml" "" "PaleMoonHTML"
${If} "$6" != "MypalHTML"
WriteRegStr SHCTX "$0\.xhtml" "" "MypalHTML"
${EndIf}
${AddAssociationIfNoneExist} ".pdf"
@ -331,10 +331,10 @@
; An empty string is used for the 5th param because PaleMoonHTML is not a
; protocol handler
${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \
${AddDisabledDDEHandlerValues} "MypalHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" ""
${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" "${AppRegName} URL" \
${AddDisabledDDEHandlerValues} "MypalURL" "$2" "$8,1" "${AppRegName} URL" \
"true"
; An empty string is used for the 4th & 5th params because the following
; protocol handlers already have a display name and the additional keys
@ -404,17 +404,17 @@
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0"
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "PaleMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "PaleMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "PaleMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "PaleMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "PaleMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "MypalHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "MypalHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "MypalHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "MypalHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "MypalHTML"
WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "PaleMoonURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "PaleMoonURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "PaleMoonURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "MypalURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "MypalURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "MypalURL"
; Vista Registered Application
WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities"
@ -427,12 +427,12 @@
; icon being displayed for files associated with PaleMoon (does not use SHCTX).
!macro FixShellIconHandler RegKey
ClearErrors
ReadRegStr $1 ${RegKey} "Software\Classes\PaleMoonHTML\ShellEx\IconHandler" ""
ReadRegStr $1 ${RegKey} "Software\Classes\MypalHTML\ShellEx\IconHandler" ""
${Unless} ${Errors}
ReadRegStr $1 ${RegKey} "Software\Classes\PaleMoonHTML\DefaultIcon" ""
ReadRegStr $1 ${RegKey} "Software\Classes\MypalHTML\DefaultIcon" ""
${GetLongPath} "$INSTDIR\${FileMainEXE}" $2
${If} "$1" != "$2,1"
WriteRegStr ${RegKey} "Software\Classes\PaleMoonHTML\DefaultIcon" "" "$2,1"
WriteRegStr ${RegKey} "Software\Classes\MypalHTML\DefaultIcon" "" "$2,1"
${EndIf}
${EndUnless}
!macroend
@ -451,14 +451,14 @@
${EndIf}
${GetLongPath} "$INSTDIR" $8
StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Main"
StrCpy $0 "Software\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Main"
${WriteRegStr2} $TmpVal "$0" "Install Directory" "$8" 0
${WriteRegStr2} $TmpVal "$0" "PathToExe" "$8\${FileMainEXE}" 0
StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Uninstall"
StrCpy $0 "Software\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Uninstall"
${WriteRegStr2} $TmpVal "$0" "Description" "${BrandFullNameInternal} ${AppVersion}$3 (${ARCH} ${AB_CD})" 0
StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})"
StrCpy $0 "Software\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})"
${WriteRegStr2} $TmpVal "$0" "" "${AppVersion}$3 (${ARCH} ${AB_CD})" 0
${If} "$3" == ""
DeleteRegValue SHCTX "$0" "ESR"
@ -466,14 +466,14 @@
${WriteRegDWORD2} $TmpVal "$0" "ESR" 1 0
${EndIf}
StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3\bin"
StrCpy $0 "Software\${BrandFullNameInternal} ${AppVersion}$3\bin"
${WriteRegStr2} $TmpVal "$0" "PathToExe" "$8\${FileMainEXE}" 0
StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3\extensions"
StrCpy $0 "Software\${BrandFullNameInternal} ${AppVersion}$3\extensions"
${WriteRegStr2} $TmpVal "$0" "Components" "$8\components" 0
${WriteRegStr2} $TmpVal "$0" "Plugins" "$8\plugins" 0
StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3"
StrCpy $0 "Software\${BrandFullNameInternal} ${AppVersion}$3"
${WriteRegStr2} $TmpVal "$0" "GeckoVer" "${GREVersion}" 0
${If} "$3" == ""
DeleteRegValue SHCTX "$0" "ESR"
@ -481,7 +481,7 @@
${WriteRegDWORD2} $TmpVal "$0" "ESR" 1 0
${EndIf}
StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}$3"
StrCpy $0 "Software\${BrandFullNameInternal}$3"
${WriteRegStr2} $TmpVal "$0" "" "${GREVersion}" 0
${WriteRegStr2} $TmpVal "$0" "CurrentVersion" "${AppVersion}$3 (${ARCH} ${AB_CD})" 0
!macroend
@ -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" "Feodor2" 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
@ -578,13 +578,13 @@
${If} "$2" != ""
; Since there is a persistent handler remove PaleMoonHTML as the default
; value from both HKCU and HKLM if it set to PaleMoonHTML.
${If} "$0" == "PaleMoonHTML"
${If} "$0" == "MypalHTML"
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
${EndIf}
${If} "$1" == "PaleMoonHTML"
${If} "$1" == "MypalHTML"
DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" ""
${EndIf}
${ElseIf} "$0" == "PaleMoonHTML"
${ElseIf} "$0" == "MypalHTML"
; Since KHCU is set to PaleMoonHTML remove PaleMoonHTML as the default value
; from HKCU if HKLM is set to a value other than an empty string.
${If} "$1" != ""
@ -639,17 +639,17 @@
; Only set the file and protocol handlers if the existing one under HKCR is
; for this install location.
${IsHandlerForInstallDir} "PaleMoonHTML" $R9
${IsHandlerForInstallDir} "MypalHTML" $R9
${If} "$R9" == "true"
; An empty string is used for the 5th param because PaleMoonHTML is not a
; protocol handler.
${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \
${AddDisabledDDEHandlerValues} "MypalHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" ""
${EndIf}
${IsHandlerForInstallDir} "PaleMoonURL" $R9
${IsHandlerForInstallDir} "MypalURL" $R9
${If} "$R9" == "true"
${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" \
${AddDisabledDDEHandlerValues} "MypalURL" "$2" "$8,1" \
"${AppRegName} URL" "true"
${EndIf}
@ -685,8 +685,8 @@
${RegCleanAppHandler} "chrome"
; Remove protocol handler registry keys added by the MS shim
DeleteRegKey HKLM "Software\Classes\PaleMoon.URL"
DeleteRegKey HKCU "Software\Classes\PaleMoon.URL"
DeleteRegKey HKLM "Software\Classes\Mypal.URL"
DeleteRegKey HKCU "Software\Classes\Mypal.URL"
; Delete gopher from Capabilities\URLAssociations if it is present.
${StrFilter} "${FileMainEXE}" "+" "" "" $R9
@ -700,7 +700,7 @@
; Delete gopher from the user's UrlAssociations if it points to PaleMoonURL.
StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher"
ReadRegStr $2 HKCU "$0\UserChoice" "Progid"
${If} "$2" == "PaleMoonURL"
${If} "$2" == "MypalURL"
DeleteRegKey HKCU "$0"
${EndIf}
!macroend

View File

@ -244,10 +244,10 @@ Section "Uninstall"
${EndIf}
; setup the application model id registration value
${un.InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
${un.InitHashAppModelId} "$INSTDIR" "Software\${AppName}\TaskBarIDs"
SetShellVarContext current ; Set SHCTX to HKCU
${un.RegCleanMain} "Software\Mozilla"
${un.RegCleanMain} "Software\Mypal"
${un.RegCleanUninstall}
${un.DeleteShortcuts}
@ -258,54 +258,54 @@ Section "Uninstall"
${EndIf}
; Remove the updates directory for Vista and above
${un.CleanUpdateDirectories} "Mozilla\PaleMoon" "Mozilla\updates"
${un.CleanUpdateDirectories} "Mypal" "updates"
; Remove any app model id's stored in the registry for this install path
DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
DeleteRegValue HKLM "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
DeleteRegValue HKCU "Software\${AppName}\TaskBarIDs" "$INSTDIR"
DeleteRegValue HKLM "Software\${AppName}\TaskBarIDs" "$INSTDIR"
ClearErrors
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
WriteRegStr HKLM "Software" "${BrandShortName}InstallerTest" "Write Test"
${If} ${Errors}
StrCpy $TmpVal "HKCU" ; used primarily for logging
${Else}
SetShellVarContext all ; Set SHCTX to HKLM
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
DeleteRegValue HKLM "Software" "${BrandShortName}InstallerTest"
StrCpy $TmpVal "HKLM" ; used primarily for logging
${un.RegCleanMain} "Software\Mozilla"
${un.RegCleanMain} "Software\Mypal"
${un.RegCleanUninstall}
${un.DeleteShortcuts}
${un.SetAppLSPCategories}
${EndIf}
${un.RegCleanAppHandler} "PaleMoonURL"
${un.RegCleanAppHandler} "PaleMoonHTML"
${un.RegCleanAppHandler} "MypalURL"
${un.RegCleanAppHandler} "MypalHTML"
${un.RegCleanProtocolHandler} "ftp"
${un.RegCleanProtocolHandler} "http"
${un.RegCleanProtocolHandler} "https"
ClearErrors
ReadRegStr $R9 HKCR "PaleMoonHTML" ""
ReadRegStr $R9 HKCR "MypalHTML" ""
; Don't clean up the file handlers if the PaleMoonHTML key still exists since
; there should be a second installation that may be the default file handler
${If} ${Errors}
${un.RegCleanFileHandler} ".htm" "PaleMoonHTML"
${un.RegCleanFileHandler} ".html" "PaleMoonHTML"
${un.RegCleanFileHandler} ".shtml" "PaleMoonHTML"
${un.RegCleanFileHandler} ".xht" "PaleMoonHTML"
${un.RegCleanFileHandler} ".xhtml" "PaleMoonHTML"
${un.RegCleanFileHandler} ".oga" "PaleMoonHTML"
${un.RegCleanFileHandler} ".ogg" "PaleMoonHTML"
${un.RegCleanFileHandler} ".ogv" "PaleMoonHTML"
${un.RegCleanFileHandler} ".pdf" "PaleMoonHTML"
${un.RegCleanFileHandler} ".webm" "PaleMoonHTML"
${un.RegCleanFileHandler} ".htm" "MypalHTML"
${un.RegCleanFileHandler} ".html" "MypalHTML"
${un.RegCleanFileHandler} ".shtml" "MypalHTML"
${un.RegCleanFileHandler} ".xht" "MypalHTML"
${un.RegCleanFileHandler} ".xhtml" "MypalHTML"
${un.RegCleanFileHandler} ".oga" "MypalHTML"
${un.RegCleanFileHandler} ".ogg" "MypalHTML"
${un.RegCleanFileHandler} ".ogv" "MypalHTML"
${un.RegCleanFileHandler} ".pdf" "MypalHTML"
${un.RegCleanFileHandler} ".webm" "MypalHTML"
${EndIf}
SetShellVarContext all ; Set SHCTX to HKLM
${un.GetSecondInstallPath} "Software\Mozilla" $R9
${un.GetSecondInstallPath} "Software\Mypal" $R9
${If} $R9 == "false"
SetShellVarContext current ; Set SHCTX to HKCU
${un.GetSecondInstallPath} "Software\Mozilla" $R9
${un.GetSecondInstallPath} "Software\Mypal" $R9
${EndIf}
StrCpy $0 "Software\Clients\StartMenuInternet\${FileMainEXE}\shell\open\command"
@ -351,7 +351,7 @@ Section "Uninstall"
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
DeleteRegKey HKLM "$0"
DeleteRegKey HKCU "$0"
StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=PaleMoon"
StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=Mypal"
DeleteRegKey HKLM "$0"
DeleteRegKey HKCU "$0"
${Else}
@ -448,7 +448,7 @@ Section "Uninstall"
; subsequently deleted after checking. If the value is found during startup
; the browser will offer to Reset PaleMoon. We use the UpdateChannel to match
; uninstalls of PaleMoon-release with reinstalls of PaleMoon-release, for example.
WriteRegStr HKCU "Software\Mozilla\PaleMoon" "Uninstalled-${UpdateChannel}" "True"
WriteRegStr HKCU "Software\Mypal" "Uninstalled-${UpdateChannel}" "True"
${un.IsFirewallSvcRunning}
Pop $0

View File

@ -3,12 +3,11 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!ENTITY chronicles.title.55.2
'The Chronicles of the Pale Moon, 55:2'>
'The Chronicles of the Mypal, 1023:345'>
<!ENTITY chronicles.quote.55.2
'And so, our focus was drawn through time and space to the <em>emerging dragon</em> who would not abandon hope.<br/>
Its resilience, stubbornness and spirit unbroken, and searching for long hours to find those willing to <em>join</em> its cause.<br/>
The old nest abandoned, the death throes of the Beast ignored, and more determined than ever to find glory in the future.'>
'Mypal pal <em>bebuba</em> mypal.<br/>
'>
<!ENTITY chronicles.from.55.2
'from <strong>The Chronicles of the Pale Moon,</strong> 55:2'>
'from <strong>The Chronicles of Mypal,</strong> 1023:345'>

View File

@ -41,7 +41,7 @@
<!ENTITY SOCKSport.accesskey "t">
<!ENTITY noproxy.label "No Proxy for:">
<!ENTITY noproxy.accesskey "n">
<!ENTITY noproxyExplain.label "Example: .palemoon.org, .net.nz, 192.168.1.0/24">
<!ENTITY noproxyExplain.label "Example: .mypal.org, .net.nz, 192.168.1.0/24">
<!ENTITY shareproxy.label "Use this proxy server for all protocols">
<!ENTITY shareproxy.accesskey "s">
<!ENTITY autologinproxy.label "Do not prompt for authentication if password is saved">

View File

@ -31,6 +31,6 @@
<!ENTITY newtabPage.label "When opening a new tab, show:">
<!ENTITY newtabPage.custom.label "A custom URL">
<!ENTITY newtabPage.blank.label "A blank page">
<!ENTITY newtabPage.home.label "The Pale Moon start page">
<!ENTITY newtabPage.home.label "The Mypal start page">
<!ENTITY newtabPage.myhome.label "My home page">
<!ENTITY newtabPage.quickdial.label "The Quickdial page">

View File

@ -5,6 +5,6 @@
<!ENTITY status4evar.throbber.widget.title "Activity Indicator">
<!ENTITY status4evar.download.widget.title "Download Status">
<!ENTITY status4evar.options.widget.title "Status Bar Preferences">
<!ENTITY status4evar.options.widget.label "Pale Moon status bar">
<!ENTITY status4evar.options.widget.label "Mypal status bar">
<!ENTITY status4evar.menu.options.label "Status Bar Preferences">

View File

@ -1,4 +1,4 @@
<!ENTITY status4evar.window.title "Pale Moon status bar preferences">
<!ENTITY status4evar.window.title "Mypal status bar preferences">
<!ENTITY status4evar.pane.status "Status">
<!ENTITY status4evar.pane.progress "Progress">
@ -33,7 +33,7 @@
<!ENTITY status4evar.option.no-repeat "No Repeat">
<!ENTITY status4evar.option.space "Space">
<!ENTITY status4evar.option.round "Round">
<!ENTITY status4evar.option.firefoxdefault "Pale Moon default">
<!ENTITY status4evar.option.firefoxdefault "Mypal default">
<!ENTITY status4evar.option.download.library "Library">
<!ENTITY status4evar.option.download.tab "Tab">
<!ENTITY status4evar.option.download.thirdparty "3rd Party">

View File

@ -3,24 +3,24 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
malformedURI=The URL is not valid and cannot be loaded.
fileNotFound=Pale Moon can't find the file at %S.
dnsNotFound=Pale Moon can't find the server at %S.
unknownProtocolFound=Pale Moon doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
connectionFailure=Pale Moon can't establish a connection to the server at %S.
fileNotFound=Mypal can't find the file at %S.
dnsNotFound=Mypal can't find the server at %S.
unknownProtocolFound=Mypal doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
connectionFailure=Mypal can't establish a connection to the server at %S.
netInterrupt=The connection to %S was interrupted while the page was loading.
netTimeout=The server at %S is taking too long to respond.
redirectLoop=Pale Moon has detected that the server is redirecting the request for this address in a way that will never complete.
redirectLoop=Mypal has detected that the server is redirecting the request for this address in a way that will never complete.
## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
resendButton.label=Resend
unknownSocketType=Pale Moon doesn't know how to communicate with the server.
unknownSocketType=Mypal doesn't know how to communicate with the server.
netReset=The connection to the server was reset while the page was loading.
notCached=This document is no longer available.
netOffline=Pale Moon is currently in offline mode and can't browse the Web.
netOffline=Mypal is currently in offline mode and can't browse the Web.
isprinting=The document cannot change while Printing or in Print Preview.
deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Pale Moon has canceled the request for your protection.
proxyResolveFailure=Pale Moon is configured to use a proxy server that can't be found.
proxyConnectFailure=Pale Moon is configured to use a proxy server that is refusing connections.
deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Mypal has canceled the request for your protection.
proxyResolveFailure=Mypal is configured to use a proxy server that can't be found.
proxyConnectFailure=Mypal is configured to use a proxy server that is refusing connections.
contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
externalProtocolTitle=External Protocol Request
@ -32,6 +32,6 @@ externalProtocolLaunchBtn=Launch application
cspBlocked=This page has a content security policy that prevents it from being embedded in this way.
xssBlockMode=This page contains an XSS attack that has been blocked for your security.
corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
remoteXUL=This page uses an unsupported technology that is no longer available by default in Pale Moon.
remoteXUL=This page uses an unsupported technology that is no longer available by default in Mypal.
## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
sslv3Used=Pale Moon cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
sslv3Used=Mypal cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.

View File

@ -19,10 +19,6 @@
<!ENTITY rights.intro-point1b "Mozilla Public License">
<!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.">
<!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 ">
<!ENTITY rights.intro-point2-b "here">
<!ENTITY rights.intro-point2-c ".">
<!-- point 2.5 text for official branded builds -->
<!ENTITY rights.intro-point2.5 "Some features in &brandShortName; give you the option to provide feedback to the publishers of this software. By choosing to submit feedback, you give the publishers in question permission to use the feedback to improve their products, to publish the feedback on their websites, and to distribute the feedback.">