Bug 1548612 Part 0 Follow-up - Fix some issues with stub installer strings. r=flod
authorMatt Howell <mhowell@mozilla.com>
Sat, 11 May 2019 17:34:07 +0000
changeset 532337 d7e3b6eb151c314af3aa3b102cf8bcd912c7c6f8
parent 532336 a9241feee65fa53207166a45e2682fd238f6dfa0
child 532338 784c0c4b688bde6491539ad89a5f44b939c4fd7e
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod
bugs1548612
milestone68.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 1548612 Part 0 Follow-up - Fix some issues with stub installer strings. r=flod Differential Revision: https://phabricator.services.mozilla.com/D30793
browser/locales/en-US/installer/nsisstrings.properties
--- a/browser/locales/en-US/installer/nsisstrings.properties
+++ b/browser/locales/en-US/installer/nsisstrings.properties
@@ -18,37 +18,40 @@
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
 
 INSTALLER_WIN_CAPTION=$BrandShortName Installer
 
 # 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_HEADER2=$BrandShortName is already installed. Let's update it.
-STUB_CLEANUP_REINSTALL_HEADER2=$BrandShortName has been installed before. Let's get you a new copy.
+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_HEADER2=$BrandShortName is already installed. Let’s update it.
+STUB_CLEANUP_REINSTALL_HEADER2=$BrandShortName has been installed before. Let’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_LABEL2=Now installing…
-STUB_INSTALLING_HEADLINE=Put your privacy first.\nJoin ${BrandProductName}.
+# The \n in the next string is intended to force a nice-looking layout in en-US
+# and can be moved or deleted as needed. There's no practical limit on the
+# number of lines available.
+STUB_INSTALLING_HEADLINE=Put your privacy first.\nJoin $BrandProductName.
 STUB_INSTALLING_BODY=Get the rest of our privacy-first products, and learn how to stay smarter and safer online.
 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.
-WARN_WRITE_ACCESS_QUIT=You don't have access to write to the installation directory
-WARN_DISK_SPACE_QUIT=You don't have sufficient disk space to install.
+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.
+WARN_WRITE_ACCESS_QUIT=You don’t have access to write to the installation directory
+WARN_DISK_SPACE_QUIT=You don’t have sufficient disk space to install.
 WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
 
 ERROR_DOWNLOAD_CONT=Hmm. For some reason, we could not install $BrandShortName.\nChoose OK to start over.
 
 STUB_CANCEL_PROMPT_HEADING=Do you want to install $BrandShortName?
 STUB_CANCEL_PROMPT_MESSAGE=If you cancel, $BrandShortName will not be installed.
 STUB_CANCEL_PROMPT_BUTTON_CONTINUE=Install $BrandShortName
 STUB_CANCEL_PROMPT_BUTTON_EXIT=Cancel