Bug 1397902 - Switch on the new stub installer strings and remove the old ones. r=agashlin,flod
authorMatt Howell <mhowell@mozilla.com>
Tue, 12 Sep 2017 13:10:13 -0700
changeset 430197 9583ea83ff4ab3042bca04c485d936862f0370d4
parent 430196 727f0d09e299a7fe1d3509c8b08756ccc3fbb4c7
child 430198 bcbb4575e482748f1d264727a71cdd459a9df031
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersagashlin, flod
bugs1397902
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1397902 - Switch on the new stub installer strings and remove the old ones. r=agashlin,flod MozReview-Commit-ID: 87PmEx0BbHe
browser/installer/windows/nsis/stub.nsi
browser/locales/en-US/installer/nsisstrings.properties
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -743,22 +743,22 @@ Function createInstall
   FindWindow $7 "#32770" "" $HWNDPARENT
   ${GetDlgItemWidthHeight} $HWNDPARENT $8 $9
 
   ; Resize the Dialog to fill the entire window
   System::Call 'user32::MoveWindow(i$Dialog,i0,i0,i $8,i $9,i0)'
 
   ; The header string may need more than half the width of the window, but it's
   ; currently not close to needing multiple lines in any localization.
-  ${NSD_CreateLabelCenter} 0% ${NOW_INSTALLING_TOP_DU} 100% 47u "$(STUB_INSTALLING_LABEL)"
+  ${NSD_CreateLabelCenter} 0% ${NOW_INSTALLING_TOP_DU} 100% 47u "$(STUB_INSTALLING_LABEL2)"
   Pop $0
   SendMessage $0 ${WM_SETFONT} $FontInstalling 0
   SetCtlColors $0 ${INSTALL_BLURB_TEXT_COLOR} transparent
 
-  ${NSD_CreateLabelCenter} 0% ${INSTALL_BLURB_TOP_DU} 100% 60u "$(STUB_BLURB1)"
+  ${NSD_CreateLabelCenter} 0% ${INSTALL_BLURB_TOP_DU} 100% 60u "$(STUB_BLURB_FIRST1)"
   Pop $LabelBlurb
   SendMessage $LabelBlurb ${WM_SETFONT} $FontBlurb 0
   SetCtlColors $LabelBlurb ${INSTALL_BLURB_TEXT_COLOR} transparent
 
   StrCpy $CurrentBlurbIdx "0"
 
   ${GetTextWidthHeight} "$(STUB_BLURB_FOOTER2)" $FontFooter \
     ${INSTALL_FOOTER_WIDTH_DU} $R1 $R2
@@ -891,21 +891,21 @@ FunctionEnd
 
 Function NextBlurb
   ${NSD_KillTimer} NextBlurb
 
   IntOp $CurrentBlurbIdx $CurrentBlurbIdx + 1
   IntOp $CurrentBlurbIdx $CurrentBlurbIdx % 3
 
   ${If} $CurrentBlurbIdx == "0"
-    StrCpy $0 "$(STUB_BLURB1)"
+    StrCpy $0 "$(STUB_BLURB_FIRST1)"
   ${ElseIf} $CurrentBlurbIdx == "1"
-    StrCpy $0 "$(STUB_BLURB2)"
+    StrCpy $0 "$(STUB_BLURB_SECOND1)"
   ${ElseIf} $CurrentBlurbIdx == "2"
-    StrCpy $0 "$(STUB_BLURB3)"
+    StrCpy $0 "$(STUB_BLURB_THIRD1)"
   ${EndIf}
 
   SendMessage $LabelBlurb ${WM_SETTEXT} 0 "STR:$0"
 
   ${NSD_CreateTimer} ClearBlurb ${BlurbDisplayMS}
 FunctionEnd
 
 Function ClearBlurb
--- a/browser/locales/en-US/installer/nsisstrings.properties
+++ b/browser/locales/en-US/installer/nsisstrings.properties
@@ -23,21 +23,17 @@ INSTALLER_WIN_CAPTION=$BrandShortName In
 # The \n in the next two strings can be moved or deleted as needed to make
 # the string fit in the 3 lines of space available.
 STUB_CLEANUP_PAVEOVER_HEADER=$BrandShortName is already installed.\nLet's update it.
 STUB_CLEANUP_REINSTALL_HEADER=$BrandShortName has been installed before.\nLet's get you a new copy.
 STUB_CLEANUP_PAVEOVER_BUTTON=&Update
 STUB_CLEANUP_REINSTALL_BUTTON=Re-&install
 STUB_CLEANUP_CHECKBOX_LABEL=&Restore default settings and remove old add-ons for optimal performance
 
-STUB_INSTALLING_LABEL=Now installing
 STUB_INSTALLING_LABEL2=Now installing…
-STUB_BLURB1=Fast, responsive online experiences
-STUB_BLURB2=Compatibility with more of your favorite sites
-STUB_BLURB3=Built-in privacy tools for safer browsing
 STUB_BLURB_FIRST1=The fastest, most responsive $BrandShortName yet
 STUB_BLURB_SECOND1=Faster page loading and tab switching
 STUB_BLURB_THIRD1=Powerful private browsing
 STUB_BLURB_FOOTER2=Built for people, not for profit
 
 WARN_MIN_SUPPORTED_OSVER_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer. Please click the OK button for additional information.
 WARN_MIN_SUPPORTED_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.
 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. Please click the OK button for additional information.