diff --git a/application/palemoon/app/application.ini b/application/palemoon/app/application.ini index c64ed9079..309ed294e 100644 --- a/application/palemoon/app/application.ini +++ b/application/palemoon/app/application.ini @@ -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@ diff --git a/application/palemoon/app/module.ver b/application/palemoon/app/module.ver index 7a00230cf..ce4a06ebc 100644 --- a/application/palemoon/app/module.ver +++ b/application/palemoon/app/module.ver @@ -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 diff --git a/application/palemoon/base/content/aboutDialog.xul b/application/palemoon/base/content/aboutDialog.xul index a34923a0a..8eb8112da 100644 --- a/application/palemoon/base/content/aboutDialog.xul +++ b/application/palemoon/base/content/aboutDialog.xul @@ -52,25 +52,13 @@ -#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 . -#else - is released by . + Mypal browser is based on Pale Moon. - Special thanks to all our supporters and donors for making this browser possible! + Adapted for Windows XP and 2003. - If you wish to contribute, please consider helping out by providing support to other users on the - 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;. - - - This is an unofficial build of Pale Moon. For official builds, please go to . -#endif +If you wish to contribute, please consider helping out by providing support to other users on the diff --git a/application/palemoon/base/content/baseMenuOverlay.xul b/application/palemoon/base/content/baseMenuOverlay.xul index a006ed5c6..e509a8a8f 100644 --- a/application/palemoon/base/content/baseMenuOverlay.xul +++ b/application/palemoon/base/content/baseMenuOverlay.xul @@ -43,7 +43,7 @@ #endif + oncommand="openHelpLink('')"> - - - + + + diff --git a/application/palemoon/branding/unofficial/locales/en-US/brand.properties b/application/palemoon/branding/unofficial/locales/en-US/brand.properties index 863a7c83b..8c4fd8af7 100644 --- a/application/palemoon/branding/unofficial/locales/en-US/brand.properties +++ b/application/palemoon/branding/unofficial/locales/en-US/brand.properties @@ -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 diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index 6216cba5b..487ffc35e 100644 --- a/application/palemoon/confvars.sh +++ b/application/palemoon/confvars.sh @@ -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 diff --git a/application/palemoon/installer/windows/nsis/defines.nsi.in b/application/palemoon/installer/windows/nsis/defines.nsi.in index c6b982035..5149e3e85 100644 --- a/application/palemoon/installer/windows/nsis/defines.nsi.in +++ b/application/palemoon/installer/windows/nsis/defines.nsi.in @@ -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}" diff --git a/application/palemoon/installer/windows/nsis/installer.nsi b/application/palemoon/installer/windows/nsis/installer.nsi index 4c2022ad4..ef9a23c19 100644 --- a/application/palemoon/installer/windows/nsis/installer.nsi +++ b/application/palemoon/installer/windows/nsis/installer.nsi @@ -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 diff --git a/application/palemoon/installer/windows/nsis/shared.nsh b/application/palemoon/installer/windows/nsis/shared.nsh index 815853ae7..a017132ae 100644 --- a/application/palemoon/installer/windows/nsis/shared.nsh +++ b/application/palemoon/installer/windows/nsis/shared.nsh @@ -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 diff --git a/application/palemoon/installer/windows/nsis/uninstaller.nsi b/application/palemoon/installer/windows/nsis/uninstaller.nsi index c85af3656..1f22172c4 100644 --- a/application/palemoon/installer/windows/nsis/uninstaller.nsi +++ b/application/palemoon/installer/windows/nsis/uninstaller.nsi @@ -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 diff --git a/application/palemoon/locales/en-US/chrome/browser/palemoon.dtd b/application/palemoon/locales/en-US/chrome/browser/palemoon.dtd index 038d8eb75..04ded4132 100644 --- a/application/palemoon/locales/en-US/chrome/browser/palemoon.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/palemoon.dtd @@ -3,12 +3,11 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +'The Chronicles of the Mypal, 1023:345'> emerging dragon who would not abandon hope.
-Its resilience, stubbornness and spirit unbroken, and searching for long hours to find those willing to join its cause.
-The old nest abandoned, the death throes of the Beast ignored, and more determined than ever to find glory in the future.'> +'Mypal pal bebuba mypal.
+'> The Chronicles of the Pale Moon, 55:2'> +'from The Chronicles of Mypal, 1023:345'> diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/connection.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/connection.dtd index f74fbf578..fde56fc4f 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/connection.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/preferences/connection.dtd @@ -41,7 +41,7 @@ - + diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd index 86e1e880d..3ad5f65af 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd @@ -31,6 +31,6 @@ - + diff --git a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd index bb0ab95f8..dd1241bf4 100644 --- a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd @@ -5,6 +5,6 @@ - + diff --git a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd index 82f9e379b..13c9100e0 100644 --- a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd @@ -1,4 +1,4 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/application/palemoon/locales/en-US/chrome/overrides/appstrings.properties b/application/palemoon/locales/en-US/chrome/overrides/appstrings.properties index 28ce0220e..e706a850f 100644 --- a/application/palemoon/locales/en-US/chrome/overrides/appstrings.properties +++ b/application/palemoon/locales/en-US/chrome/overrides/appstrings.properties @@ -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. diff --git a/toolkit/locales/en-US/chrome/global/aboutRights.dtd b/toolkit/locales/en-US/chrome/global/aboutRights.dtd index 8ccbbb177..f057921cd 100644 --- a/toolkit/locales/en-US/chrome/global/aboutRights.dtd +++ b/toolkit/locales/en-US/chrome/global/aboutRights.dtd @@ -19,10 +19,6 @@ - - - -