Hardcoded generic branding

This commit is contained in:
K4sum1 2025-04-26 22:51:02 -07:00
commit 76fa1af460
42 changed files with 646 additions and 252 deletions

View file

@ -3,10 +3,10 @@
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
name="Pale Moon"
name="New Moon"
type="win32"
/>
<description>Pale Moon</description>
<description>New Moon</description>
<dependency>
<dependentAssembly>
<assemblyIdentity

View file

@ -75,7 +75,7 @@ static void Output(const char *fmt, ... )
decltype(MessageBoxW)* messageBoxW =
(decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW");
if (messageBoxW) {
messageBoxW(nullptr, wide_msg, L"Pale Moon", MB_OK
messageBoxW(nullptr, wide_msg, L"XULRunner", MB_OK
| MB_ICONERROR
| MB_SETFOREGROUND);
}

View file

@ -73,9 +73,6 @@ pref("browser.dictionaries.download.url", "https://@AM_DOMAIN@/dictionaries/");
// Get More Tools link URL
pref("browser.getdevtools.url","https://@AM_DOMAIN@/?component=integration&type=external&request=devtools");
// Feedback URL
pref("browser.feedback.url", "https://msfn.org/board/topic/177125-my-build-of-new-moon-temp-name-aka-pale-moon-fork-targetting-xp/?do=getNewComment");
// Help button in slow startup dialog
pref("browser.slowstartup.help.url", "https://support.mozilla.org/en-US/kb/firefox-takes-long-time-start-up");
@ -229,10 +226,10 @@ pref("keyword.enabled", true);
pref("general.useragent.locale", "@AB_CD@");
pref("general.skins.selectedSkin", "classic/1.0");
// Native UA mode by default for unbranded
pref("general.useragent.compatMode", 0);
pref("general.useragent.compatMode.gecko", false);
pref("general.useragent.compatMode.firefox", false);
// Firefox UA mode by default
pref("general.useragent.compatMode", 2);
pref("general.useragent.compatMode.gecko", true);
pref("general.useragent.compatMode.firefox", true);
pref("general.smoothScroll", true);
#ifdef UNIX_BUT_NOT_MAC
@ -255,7 +252,7 @@ pref("browser.defaultbrowser.notificationbar", false);
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
pref("browser.startup.page", 1);
pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties");
pref("browser.startup.homepage", "");
pref("browser.slowStartup.notificationDisabled", false);
pref("browser.slowStartup.timeThreshold", 60000);

View file

@ -1,11 +1,5 @@
// ===| General |==============================================================
pref("startup.homepage_welcome_url","http://www.palemoon.org/firstrun.shtml");
pref("app.vendorURL", "http://www.palemoon.org/");
// User Interface
pref("browser.identity.ssl_domain_display", 1); //show domain verified SSL (blue)
// ============================================================================

View file

@ -9,8 +9,8 @@
# 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 "https://msfn.org/board/topic/177125-my-build-of-new-moon-temp-name-aka-pale-moon-fork-targetting-xp/?do=getNewComment"
!define URLSystemRequirements "http://www.palemoon.org/download.shtml"
!define CompanyName "Open Source Contributors"
!define URLInfoAbout "about:blank"
!define URLUpdateInfo "about:blank"
!define HelpLink "about:blank"
!define URLSystemRequirements "about:blank"

View file

@ -2,4 +2,24 @@
# 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_NAME=newmoon
MOZ_APP_BASENAME="New Moon"
MOZ_APP_DISPLAYNAME="New Moon"
MOZ_APP_UA_NAME="PaleMoon"
MOZ_APP_VENDOR="Open Source Contributors"
MOZ_APP_FULLNAME="New Moon"
MOZ_APP_PROFILE="OpenSource/New Moon"
MOZ_APP_REMOTINGNAME=com.opensource.newmoon
MOZ_DISTRIBUTION_ID=com.opensource
MOZ_MACBUNDLE_NAME="newmoon.app"
MOZ_SOURCE_REPO=https://github.com/Eclipse-Community/UXP

View file

@ -4,5 +4,5 @@
<!ENTITY brandShortName "New Moon">
<!ENTITY brandFullName "New Moon">
<!ENTITY vendorShortName "a community developer">
<!ENTITY vendorShortName "Open Source Contributors">
<!ENTITY trademarkInfo.part1 " ">

View file

@ -4,6 +4,6 @@
brandShortName=New Moon
brandFullName=New Moon
vendorShortName=Moonchild
vendorShortName=Open Source Contributors
syncBrandShortName=Sync

View file

@ -10,3 +10,7 @@ export('DIST_SUBDIR')
include('../shared/branding.mozbuild')
ApplicationBranding()
FINAL_TARGET_FILES['..'] += [
'newmoon.VisualElementsManifest.xml',
]

View file

@ -0,0 +1,8 @@
<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
<VisualElements
ShowNameOnSquare150x150Logo='on'
Square150x150Logo='browser\VisualElements\VisualElements_150.png'
Square70x70Logo='browser\VisualElements\VisualElements_70.png'
ForegroundText='light'
BackgroundColor='#171717'/>
</Application>

View file

@ -81,10 +81,10 @@ Comment[uk]=Перегляд сторінок Інтернету
Comment[vi]=Để duyệt các trang web
Comment[zh_CN]=浏览互联网
Comment[zh_TW]=瀏覽網際網路
Exec=palemoon %u
Exec=newmoon %u
Terminal=false
Type=Application
Icon=palemoon
Icon=newmoon
Categories=Network;WebBrowser;
MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
StartupNotify=false
@ -176,7 +176,7 @@ Name[vi]=Mở thẻ mới
Name[xh]=Vula ithebhu entsha
Name[zh_CN]=打开新标签页
Name[zh_TW]=開啟新分頁
Exec=palemoon -new-tab
Exec=newmoon -new-tab
[Desktop Action NewWindow]
Name=Open new window
@ -263,7 +263,7 @@ Name[vi]=Mở cửa sổ mới
Name[xh]=Vula iwindow entsha
Name[zh_CN]=打开新窗口
Name[zh_TW]=開啟新視窗
Exec=palemoon -new-window
Exec=newmoon -new-window
[Desktop Action NewPrivateWindow]
Name=New private window
@ -350,4 +350,4 @@ Name[vi]=Cửa sổ riêng tư mới
Name[xh]=Ifestile yangasese entsha
Name[zh_CN]=新建隐私浏览窗口
Name[zh_TW]=新增隱私視窗
Exec=palemoon -private-window
Exec=newmoon -private-window

View file

@ -4,7 +4,7 @@
#include ../../shared/pref/uaoverrides.inc
pref("startup.homepage_override_url","");
pref("app.releaseNotesURL", "https://rtfreesoft.blogspot.com/search/label/newmoon");
pref("app.releaseNotesURL", "");
// Updates disabled
pref("app.update.enabled", false);

View file

@ -101,18 +101,18 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
// .htm .html .shtml .xht .xhtml
// are mapped like so:
//
// HKCU\SOFTWARE\Classes\.<ext>\ (default) REG_SZ PaleMoonHTML
// HKCU\SOFTWARE\Classes\.<ext>\ (default) REG_SZ NewMoonHTML
//
// as aliases to the class:
//
// HKCU\SOFTWARE\Classes\PaleMoonHTML\
// HKCU\SOFTWARE\Classes\NewMoonHTML\
// DefaultIcon (default) REG_SZ <apppath>,1
// shell\open\command (default) REG_SZ <apppath> -osint -url "%1"
// shell\open\ddeexec (default) REG_SZ <empty string>
//
// - Windows Vista and above Protocol Handler
//
// HKCU\SOFTWARE\Classes\PaleMoonURL\ (default) REG_SZ <appname> URL
// HKCU\SOFTWARE\Classes\NewMoonURL\ (default) REG_SZ <appname> URL
// EditFlags REG_DWORD 2
// FriendlyTypeName REG_SZ <appname> URL
// DefaultIcon (default) REG_SZ <apppath>,1
@ -156,7 +156,8 @@ typedef struct {
const char* oldValueData;
} SETTING;
#define APP_REG_NAME L"Pale Moon"
// Find a way to unhardcode this
#define APP_REG_NAME L"New Moon"
#define VAL_FILE_ICON "%APPPATH%,1"
#define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\""
#define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
@ -182,10 +183,10 @@ static SETTING gSettings[] = {
// File Handler Class
// ***keep this as the first entry because when aForAllTypes is not set below
// it will skip over this check.***
{ MAKE_KEY_NAME1("PaleMoonHTML", SOC), VAL_OPEN, OLD_VAL_OPEN },
{ MAKE_KEY_NAME1("NewMoonHTML", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("PaleMoonURL", SOC), VAL_OPEN, OLD_VAL_OPEN },
{ MAKE_KEY_NAME1("NewMoonURL", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handlers
{ MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON },
@ -199,10 +200,10 @@ static SETTING gSettings[] = {
// are incorrect they are fixed without notifying the user.
static SETTING gDDESettings[] = {
// File Handler Class
{ MAKE_KEY_NAME1("Software\\Classes\\PaleMoonHTML", SOD) },
{ MAKE_KEY_NAME1("Software\\Classes\\NewMoonHTML", SOD) },
// Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("Software\\Classes\\PaleMoonURL", SOD) },
{ MAKE_KEY_NAME1("Software\\Classes\\NewMoonURL", SOD) },
// Protocol Handlers
{ MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) },
@ -339,7 +340,7 @@ IsAARDefault(const RefPtr<IApplicationAssociationRegistration>& pAAR,
return false;
}
LPCWSTR progID = isProtocol ? L"PaleMoonURL" : L"PaleMoonHTML";
LPCWSTR progID = isProtocol ? L"NewMoonURL" : L"NewMoonHTML";
bool isDefault = !wcsicmp(registeredApp, progID);
CoTaskMemFree(registeredApp);
@ -371,8 +372,8 @@ IsDefaultBrowserWin8(bool aCheckAllTypes, bool* aIsDefaultBrowser)
/*
* Query's the AAR for the default status.
* This only checks for PaleMoonURL and if aCheckAllTypes is set, then
* it also checks for PaleMoonHTML. Note that those ProgIDs are shared
* This only checks for NewMoonURL and if aCheckAllTypes is set, then
* it also checks for NewMoonHTML. Note that those ProgIDs are shared
* by all PaleMoon browsers.
*/
bool

View file

@ -6,10 +6,10 @@
# Application Basename and Vendor
# MOZ_APP_BASENAME and MOZ_APP_VENDOR must not have spaces.
# These values where appropriate are hardcoded in application.ini
# to "Pale Moon" and "Moonchild Productions" respectively for
# to "New Moon" and "Open Source Contributors" respectively for
# Pale Moon
MOZ_APP_BASENAME=Palemoon
MOZ_APP_VENDOR=Moonchild
MOZ_APP_BASENAME=Newmoon
MOZ_APP_VENDOR=OpenSourceContributors
MOZ_APP_UA_NAME=PaleMoon
# Application Version

View file

@ -1,4 +1,4 @@
;!@Install@!UTF-8!
Title="Pale Moon"
Title="New Moon"
RunProgram="setup.exe"
;!@InstallEnd@!

View file

@ -379,17 +379,17 @@ Section "-Application" APP_IDX
; it doesn't cause problems always add them.
${SetUninstallKeys}
; On install always add the PaleMoonHTML and PaleMoonURL keys.
; An empty string is used for the 5th param because PaleMoonHTML is not a
; On install always add the NewMoonHTML and NewMoonURL keys.
; An empty string is used for the 5th param because NewMoonHTML is not a
; protocol handler.
${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""
; In Win8, the delegate execute handler picks up the value in PaleMoonURL and
; PaleMoonHTML to launch the desktop browser when it needs to.
${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \
; In Win8, the delegate execute handler picks up the value in NewMoonURL and
; NewMoonHTML to launch the desktop browser when it needs to.
${AddDisabledDDEHandlerValues} "NewMoonHTML" "$2" "$8,1" \
"${AppRegName} Document" ""
${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" "${AppRegName} URL" \
${AddDisabledDDEHandlerValues} "NewMoonURL" "$2" "$8,1" "${AppRegName} URL" \
"true"
; For pre win8, the following keys should only be set if we can write to HKLM.

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 == "NewMoonURL"
${AndIf} $9 != 0 ; We're not running in session 0
ReadRegStr $0 HKCU "Software\Classes\PaleMoonURL\shell\open\command" ""
ReadRegStr $0 HKCU "Software\Classes\NewMoonURL\shell\open\command" ""
${GetPathFromString} "$0" $0
${GetParent} "$0" $0
${If} ${FileExists} "$0"
@ -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}" "" "NewMoonHTML"
${EndIf}
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "PaleMoonHTML" ""
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "NewMoonHTML" ""
!macroend
!define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist"
@ -296,30 +296,30 @@
StrCpy $0 "SOFTWARE\Classes"
StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""
; Associate the file handlers with PaleMoonHTML
; Associate the file handlers with NewMoonHTML
ReadRegStr $6 SHCTX "$0\.htm" ""
${If} "$6" != "PaleMoonHTML"
WriteRegStr SHCTX "$0\.htm" "" "PaleMoonHTML"
${If} "$6" != "NewMoonHTML"
WriteRegStr SHCTX "$0\.htm" "" "NewMoonHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.html" ""
${If} "$6" != "PaleMoonHTML"
WriteRegStr SHCTX "$0\.html" "" "PaleMoonHTML"
${If} "$6" != "NewMoonHTML"
WriteRegStr SHCTX "$0\.html" "" "NewMoonHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.shtml" ""
${If} "$6" != "PaleMoonHTML"
WriteRegStr SHCTX "$0\.shtml" "" "PaleMoonHTML"
${If} "$6" != "NewMoonHTML"
WriteRegStr SHCTX "$0\.shtml" "" "NewMoonHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.xht" ""
${If} "$6" != "PaleMoonHTML"
WriteRegStr SHCTX "$0\.xht" "" "PaleMoonHTML"
${If} "$6" != "NewMoonHTML"
WriteRegStr SHCTX "$0\.xht" "" "NewMoonHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.xhtml" ""
${If} "$6" != "PaleMoonHTML"
WriteRegStr SHCTX "$0\.xhtml" "" "PaleMoonHTML"
${If} "$6" != "NewMoonHTML"
WriteRegStr SHCTX "$0\.xhtml" "" "NewMoonHTML"
${EndIf}
${AddAssociationIfNoneExist} ".pdf"
@ -329,12 +329,12 @@
${AddAssociationIfNoneExist} ".pdf"
${AddAssociationIfNoneExist} ".webm"
; An empty string is used for the 5th param because PaleMoonHTML is not a
; An empty string is used for the 5th param because NewMoonHTML is not a
; protocol handler
${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \
${AddDisabledDDEHandlerValues} "NewMoonHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" ""
${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" "${AppRegName} URL" \
${AddDisabledDDEHandlerValues} "NewMoonURL" "$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,35 +404,35 @@
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" "NewMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "NewMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "NewMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "NewMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "NewMoonHTML"
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" "NewMoonURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "NewMoonURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "NewMoonURL"
; Vista Registered Application
WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities"
!macroend
!define SetStartMenuInternet "!insertmacro SetStartMenuInternet"
; The IconHandler reference for PaleMoonHTML can end up in an inconsistent state
; The IconHandler reference for NewMoonHTML can end up in an inconsistent state
; due to changes not being detected by the IconHandler for side by side
; installs (see bug 268512). The symptoms can be either an incorrect icon or no
; 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\NewMoonHTML\ShellEx\IconHandler" ""
${Unless} ${Errors}
ReadRegStr $1 ${RegKey} "Software\Classes\PaleMoonHTML\DefaultIcon" ""
ReadRegStr $1 ${RegKey} "Software\Classes\NewMoonHTML\DefaultIcon" ""
${GetLongPath} "$INSTDIR\${FileMainEXE}" $2
${If} "$1" != "$2,1"
WriteRegStr ${RegKey} "Software\Classes\PaleMoonHTML\DefaultIcon" "" "$2,1"
WriteRegStr ${RegKey} "Software\Classes\NewMoonHTML\DefaultIcon" "" "$2,1"
${EndIf}
${EndUnless}
!macroend
@ -567,7 +567,7 @@
; HKCU Software\Classes keys when associating handlers. The fix uses the merged
; view in HKCR to check for existance of an existing association. This macro
; cleans affected installations by removing the HKLM and HKCU value if it is set
; to PaleMoonHTML when there is a value for PersistentHandler or by removing the
; to NewMoonHTML when there is a value for PersistentHandler or by removing the
; HKCU value when the HKLM value has a value other than an empty string.
!macro FixBadFileAssociation FILE_TYPE
; Only delete the default value in case the key has values for OpenWithList,
@ -576,16 +576,16 @@
ReadRegStr $1 HKLM "Software\Classes\${FILE_TYPE}" ""
ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" ""
${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"
; Since there is a persistent handler remove NewMoonHTML as the default
; value from both HKCU and HKLM if it set to NewMoonHTML.
${If} "$0" == "NewMoonHTML"
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
${EndIf}
${If} "$1" == "PaleMoonHTML"
${If} "$1" == "NewMoonHTML"
DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" ""
${EndIf}
${ElseIf} "$0" == "PaleMoonHTML"
; Since KHCU is set to PaleMoonHTML remove PaleMoonHTML as the default value
${ElseIf} "$0" == "NewMoonHTML"
; Since KHCU is set to NewMoonHTML remove NewMoonHTML as the default value
; from HKCU if HKLM is set to a value other than an empty string.
${If} "$1" != ""
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
@ -641,17 +641,17 @@
; Only set the file and protocol handlers if the existing one under HKCR is
; for this install location.
${IsHandlerForInstallDir} "PaleMoonHTML" $R9
${IsHandlerForInstallDir} "NewMoonHTML" $R9
${If} "$R9" == "true"
; An empty string is used for the 5th param because PaleMoonHTML is not a
; An empty string is used for the 5th param because NewMoonHTML is not a
; protocol handler.
${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \
${AddDisabledDDEHandlerValues} "NewMoonHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" ""
${EndIf}
${IsHandlerForInstallDir} "PaleMoonURL" $R9
${IsHandlerForInstallDir} "NewMoonURL" $R9
${If} "$R9" == "true"
${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" \
${AddDisabledDDEHandlerValues} "NewMoonURL" "$2" "$8,1" \
"${AppRegName} URL" "true"
${EndIf}
@ -699,10 +699,10 @@
DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher"
${EndUnless}
; Delete gopher from the user's UrlAssociations if it points to PaleMoonURL.
; Delete gopher from the user's UrlAssociations if it points to NewMoonURL.
StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher"
ReadRegStr $2 HKCU "$0\UserChoice" "Progid"
${If} "$2" == "PaleMoonURL"
${If} "$2" == "NewMoonURL"
DeleteRegKey HKCU "$0"
${EndIf}
!macroend

View file

@ -227,27 +227,27 @@ Section "Uninstall"
${un.SetAppLSPCategories}
${EndIf}
${un.RegCleanAppHandler} "PaleMoonURL"
${un.RegCleanAppHandler} "PaleMoonHTML"
${un.RegCleanAppHandler} "NewMoonURL"
${un.RegCleanAppHandler} "NewMoonHTML"
${un.RegCleanProtocolHandler} "ftp"
${un.RegCleanProtocolHandler} "http"
${un.RegCleanProtocolHandler} "https"
ClearErrors
ReadRegStr $R9 HKCR "PaleMoonHTML" ""
; Don't clean up the file handlers if the PaleMoonHTML key still exists since
ReadRegStr $R9 HKCR "NewMoonHTML" ""
; Don't clean up the file handlers if the NewMoonHTML 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" "NewMoonHTML"
${un.RegCleanFileHandler} ".html" "NewMoonHTML"
${un.RegCleanFileHandler} ".shtml" "NewMoonHTML"
${un.RegCleanFileHandler} ".xht" "NewMoonHTML"
${un.RegCleanFileHandler} ".xhtml" "NewMoonHTML"
${un.RegCleanFileHandler} ".oga" "NewMoonHTML"
${un.RegCleanFileHandler} ".ogg" "NewMoonHTML"
${un.RegCleanFileHandler} ".ogv" "NewMoonHTML"
${un.RegCleanFileHandler} ".pdf" "NewMoonHTML"
${un.RegCleanFileHandler} ".webm" "NewMoonHTML"
${EndIf}
SetShellVarContext all ; Set SHCTX to HKLM

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 New Moon 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 "New Moon 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 "New Moon 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 "New Moon 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=New Moon can't find the file at %S.
dnsNotFound=New Moon can't find the server at %S.
unknownProtocolFound=New Moon doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
connectionFailure=New Moon 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=New Moon 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=New Moon 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=New Moon 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. New Moon has canceled the request for your protection.
proxyResolveFailure=New Moon is configured to use a proxy server that can't be found.
proxyConnectFailure=New Moon 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 New Moon.
## 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=New Moon cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.

View file

@ -11,9 +11,6 @@
<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
<DD>@bookmarks_toolbarfolder_description@
<DL><p>
<DT><A HREF="http://www.palemoon.org/" ICON_URI="http://www.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=">Pale Moon</A>
<DT><A HREF="https://forum.palemoon.org/index.php" ICON_URI="https://forum.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=" LAST_CHARSET="UTF-8">Pale Moon forum</A>
<DT><A HREF="https://forum.palemoon.org/viewforum.php?f=24" ICON_URI="http://www.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=">F.A.Q.</A>
<DT><A HREF="http://www.palemoon.org/releasenotes.shtml" ICON_URI="http://www.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=">Release notes</A>
<DT><A HREF="http://www.example.com/" ICON_URI="http://www.example.com/favicon.ico" ICON="your icon here">Your website here (application/palemoon/locales/generic/profile/bookmarks.html.in)</A>
</DL><p>
</DL><p>