Browse Source

Pale Moon Installer: Remove unused stub defines and strings.

pull/1/head
Ascrod 4 years ago committed by Roy Tam
parent
commit
d74a223e8a
  1. 35
      application/palemoon/branding/official/branding.nsi
  2. 26
      application/palemoon/branding/unofficial/branding.nsi
  3. 32
      application/palemoon/branding/unstable/branding.nsi
  4. 4
      application/palemoon/installer/windows/Makefile.in
  5. 27
      application/palemoon/installer/windows/nsis/defines.nsi.in
  6. 67
      application/palemoon/locales/en-US/installer/nsisstrings.properties

35
application/palemoon/branding/official/branding.nsi

@ -14,38 +14,3 @@
!define URLUpdateInfo "http://www.palemoon.org/releasenotes.shtml"
!define HelpLink "http://www.palemoon.org/troubleshooting.shtml"
!define URLSystemRequirements "http://www.palemoon.org/download.shtml"
; The OFFICIAL define is a workaround to support different urls for Release and
; Beta since they share the same branding when building with other branches that
; set the update channel to beta.
!define OFFICIAL
!define URLStubDownload ""
!define URLManualDownload "http://www.palemoon.org/download-ng.shtml"
!define Channel "release"
# The installer's certificate name and issuer expected by the stub installer
# !define CertNameDownload "Mozilla Corporation"
# !define CertIssuerDownload "Thawte Code Signing CA - G2"
# Dialog units are used so the UI displays correctly with the system's DPI
# settings.
# The dialog units for the bitmap's dimensions should match exactly with the
# bitmap's width and height in pixels.
!define APPNAME_BMP_WIDTH_DU "134u"
!define APPNAME_BMP_HEIGHT_DU "36u"
!define INTRO_BLURB_WIDTH_DU "258u"
!define INTRO_BLURB_EDGE_DU "170u"
!define INTRO_BLURB_LTR_TOP_DU "20u"
!define INTRO_BLURB_RTL_TOP_DU "12u"
# UI Colors that can be customized for each channel
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000033
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666699
!define FOOTER_BKGRD_COLOR 0xFFFFFF
!define INTRO_BLURB_TEXT_COLOR 0x666699
!define OPTIONS_TEXT_COLOR_NORMAL 0x000000
!define OPTIONS_TEXT_COLOR_FADED 0x666699
!define OPTIONS_BKGRD_COLOR 0xF0F0F0
!define INSTALL_BLURB_TEXT_COLOR 0x666699
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666699
!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0x9999C0

26
application/palemoon/branding/unofficial/branding.nsi

@ -14,29 +14,3 @@
!define URLUpdateInfo "http://www.palemoon.org"
!define HelpLink "http://www.palemoon.org"
!define URLSystemRequirements "http://www.palemoon.org/download.shtml"
!define URLManualDownload "http://www.palemoon.org/download-ng.shtml"
!define Channel "unofficial"
# Dialog units are used so the UI displays correctly with the system's DPI
# settings.
# The dialog units for the bitmap's dimensions should match exactly with the
# bitmap's width and height in pixels.
!define APPNAME_BMP_WIDTH_DU 159u
!define APPNAME_BMP_HEIGHT_DU 26u
!define INTRO_BLURB_WIDTH_DU "230u"
!define INTRO_BLURB_EDGE_DU "198u"
!define INTRO_BLURB_LTR_TOP_DU "16u"
!define INTRO_BLURB_RTL_TOP_DU "11u"
# UI Colors that can be customized for each channel
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
!define FOOTER_BKGRD_COLOR 0xFFFFFF
!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
!define OPTIONS_TEXT_COLOR_NORMAL 0xFFFFFF
!define OPTIONS_TEXT_COLOR_FADED 0xA1AAB3
!define OPTIONS_BKGRD_COLOR 0x0F1B26
!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0xA1AAB3

32
application/palemoon/branding/unstable/branding.nsi

@ -14,35 +14,3 @@
!define URLUpdateInfo "http://www.palemoon.org/unstable/"
!define HelpLink "http://www.palemoon.org/unstable/"
!define URLSystemRequirements "http://www.palemoon.org/download.shtml"
; The OFFICIAL define is a workaround to support different urls for Release and
; Beta since they share the same branding when building with other branches that
; set the update channel to beta.
!define OFFICIAL
!define URLStubDownload ""
!define URLManualDownload "http://www.palemoon.org/unstable.shtml"
!define Channel "unstable"
# Dialog units are used so the UI displays correctly with the system's DPI
# settings.
# The dialog units for the bitmap's dimensions should match exactly with the
# bitmap's width and height in pixels.
!define APPNAME_BMP_WIDTH_DU "134u"
!define APPNAME_BMP_HEIGHT_DU "36u"
!define INTRO_BLURB_WIDTH_DU "258u"
!define INTRO_BLURB_EDGE_DU "170u"
!define INTRO_BLURB_LTR_TOP_DU "20u"
!define INTRO_BLURB_RTL_TOP_DU "12u"
# UI Colors that can be customized for each channel
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000033
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666699
!define FOOTER_BKGRD_COLOR 0xFFFFFF
!define INTRO_BLURB_TEXT_COLOR 0x666699
!define OPTIONS_TEXT_COLOR_NORMAL 0x000000
!define OPTIONS_TEXT_COLOR_FADED 0x666699
!define OPTIONS_BKGRD_COLOR 0xF0F0F0
!define INSTALL_BLURB_TEXT_COLOR 0x666699
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666699
!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0x9999C0

4
application/palemoon/installer/windows/Makefile.in

@ -79,10 +79,6 @@ $(CONFIG_DIR)/setup.exe::
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--preprocess-locale $(topsrcdir) \
$(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--preprocess-single-file $(topsrcdir) \
$(PPL_LOCALE_ARGS) $(CONFIG_DIR) \
nsisstrings.properties nsisstrings.nlf
GARBARGE_DIRS += instgen

27
application/palemoon/installer/windows/nsis/defines.nsi.in

@ -3,23 +3,6 @@
# 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/.
# Defining FunnelcakeVersion will append the value of StubURLVersionAppend to
# StubURLVersion, append the value of URLManualDownloadAppend to
# URLManualDownload, and append the value of URLStubDownloadAppend to
# URLStubDownload. The value of FunnelcakeVersion should not be defined when it
# is not used and when it is defined its value should never be empty.
# !define FunnelcakeVersion "999"
!ifdef FunnelcakeVersion
!define URLManualDownloadAppend "&f=${FunnelcakeVersion}"
!define URLStubDownloadAppend "-f${FunnelcakeVersion}"
!define StubURLVersionAppend "-${FunnelcakeVersion}"
!else
!define URLManualDownloadAppend ""
!define URLStubDownloadAppend ""
!define StubURLVersionAppend ""
!endif
# These defines should match application.ini settings
!define AppName "Pale Moon"
!define AppVersion "@APP_VERSION@"
@ -84,13 +67,3 @@ VIAddVersionKey "FileVersion" "${AppVersion}"
VIAddVersionKey "ProductVersion" "${AppVersion}"
# Comments is not used but left below commented out for future reference
# VIAddVersionKey "Comments" "Comments"
# Control positions in Dialog Units so they are placed correctly with
# non-default DPI settings
!define OPTIONS_ITEM_EDGE_DU 90u
!define OPTIONS_ITEM_WIDTH_DU 356u
!define OPTIONS_SUBITEM_EDGE_DU 119u
!define OPTIONS_SUBITEM_WIDTH_DU 327u
!define INSTALL_BLURB_TOP_DU 78u
!define APPNAME_BMP_EDGE_DU 19u
!define APPNAME_BMP_TOP_DU 12u

67
application/palemoon/locales/en-US/installer/nsisstrings.properties

@ -1,67 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
# LOCALIZATION NOTE:
# This file must be saved as UTF8
# Accesskeys are defined by prefixing the letter that is to be used for the
# accesskey with an ampersand (e.g. &).
# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
# custom string and always use the same one as used by the en-US files.
# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
# for double ampersand) and prevents the letter following the ampersand from
# being used as an accesskey.
# You can use \n to create a newline in the string but only when the string
# from en-US contains a \n.
WIN_CAPTION=$BrandShortName Setup
INTRO_BLURB1=Thanks for choosing $BrandFullName, the browser that chooses you above everything else.
INSTALL_BLURB1=You're about to enjoy the very latest in speed, flexibility and security so you're always in control.
INSTALL_BLURB2=That's because $BrandShortName is made by a non-profit to make browsing and the Web better for you.
INSTALL_BLURB3=You're also joining a global community of users, contributors and developers working to make the best browser in the world.
WARN_MIN_SUPPORTED_OSVER_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer.
WARN_MIN_SUPPORTED_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires a processor with ${MinSupportedCPU} support.
WARN_MIN_SUPPORTED_OSVER_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer and a processor with ${MinSupportedCPU} support.
WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
WARN_DISK_SPACE=You don't have sufficient disk space to install to this location.\n\nClick OK to select a different location.
WARN_ROOT_INSTALL=Unable to install to the root of your disk.\n\nClick OK to select a different location.
WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
ERROR_DOWNLOAD=Your download was interrupted.\n\nPlease click the OK button to continue.
INSTALL_BUTTON=&Install
UPGRADE_BUTTON=&Upgrade
CANCEL_BUTTON=Cancel
OPTIONS_BUTTON=&Options
MAKE_DEFAULT=&Make $BrandShortName my default browser
CREATE_SHORTCUTS=Create Shortcuts for $BrandShortName:
ADD_SC_TASKBAR=On my &Task bar
ADD_SC_QUICKLAUNCHBAR=On my &Quick Launch bar
ADD_CheckboxShortcutInStartMenu=In my &Start Menu Programs Folder
ADD_CheckboxShortcutOnDesktop=On my &Desktop
SPACE_REQUIRED=Space Required:
SPACE_AVAILABLE=Space Available:
ONE_MOMENT_INSTALL=One moment, $BrandShortName will launch as soon as the install is complete…
ONE_MOMENT_UPGRADE=One moment, $BrandShortName will launch as soon as the upgrade is complete…
INSTALL_MAINT_SERVICE=&Install the $BrandShortName background update service
SEND_PING=S&end information about this installation to Mozilla
BROWSE_BUTTON=B&rowse…
DEST_FOLDER=Destination Folder
DOWNLOADING_LABEL=Downloading $BrandShortName…
INSTALLING_LABEL=Installing $BrandShortName…
UPGRADING_LABEL=Upgrading $BrandShortName…
SELECT_FOLDER_TEXT=Select the folder to install $BrandShortName in.
BYTE=B
KILO=K
MEGA=M
GIGA=G
Loading…
Cancel
Save