Bug 1426640 - Rename Daily to Thunderbird Daily. r=jorgk
☠☠ backed out by 597e7300392f ☠ ☠
authorRichard Marti <richard.marti@gmail.com>
Thu, 21 Dec 2017 13:37:52 +0100
changeset 30643 f3cd3f17c1cbbee724205a5b9b0c3836760e0587
parent 30642 f45975e98daa7287b7a2bcebdbaae34fa5e19e09
child 30644 19ba0c25cd49d6ef52d945be3e144f2920a2230f
push id382
push userclokep@gmail.com
push dateMon, 12 Mar 2018 19:05:34 +0000
reviewersjorgk
bugs1426640, 1378834, 1404796
Bug 1426640 - Rename Daily to Thunderbird Daily. r=jorgk Port of m-c bugs: Bug 1378834 - Rename Nightly to Firefox Nightly Bug 1404796 - On mac, the app name is "FirefoxNightly" when it should be "Firefox Nightly"
mail/branding/nightly/branding.nsi
mail/branding/nightly/configure.sh
mail/branding/nightly/content/about-wordmark.png
mail/branding/nightly/locales/en-US/brand.dtd
mail/branding/nightly/locales/en-US/brand.properties
mail/installer/windows/nsis/defines.nsi.in
mail/installer/windows/nsis/maintenanceservice_installer.nsi
other-licenses/branding/thunderbird/branding.nsi
--- a/mail/branding/nightly/branding.nsi
+++ b/mail/branding/nightly/branding.nsi
@@ -3,13 +3,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # NSIS defines for nightly builds.
 # The release build branding.nsi is located in other-license/branding/thunderbird/
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Daily"
+!define BrandFullName         "Thunderbird Daily"
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "http://www.mozilla.org/"
 !define URLUpdateInfo         "http://www.mozilla.org/products/thunderbird/"
 !define URLSystemRequirements "https://www.mozilla.org/thunderbird/system-requirements/"
 !define SurveyURL             "http://live.mozillamessaging.com/survey/uninstall/?locale=${AB_CD}&version=${AppVersion}"
--- a/mail/branding/nightly/configure.sh
+++ b/mail/branding/nightly/configure.sh
@@ -1,5 +1,5 @@
 # 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/.
 
-MOZ_APP_DISPLAYNAME=Daily
+MOZ_APP_DISPLAYNAME=Thunderbird Daily
index 15523d76cb6d25a712db2abef690c8e492ba83a1..3aafa9a872feaa95527273272d6da98f75210d02
GIT binary patch
literal 4125
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
b@G1E(1;wr2r*w7M00000NkvXXu0mjfF^<|j
--- a/mail/branding/nightly/locales/en-US/brand.dtd
+++ b/mail/branding/nightly/locales/en-US/brand.dtd
@@ -1,9 +1,9 @@
 <!-- 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/. -->
 
 <!ENTITY  brandShortName        "Daily">
 <!ENTITY  brandShorterName      "Daily">
-<!ENTITY  brandFullName         "Daily">
+<!ENTITY  brandFullName         "Thunderbird Daily">
 <!ENTITY  vendorShortName       "mozilla.org">
 <!ENTITY  trademarkInfo.part1   " ">
--- a/mail/branding/nightly/locales/en-US/brand.properties
+++ b/mail/branding/nightly/locales/en-US/brand.properties
@@ -1,9 +1,9 @@
 # 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/.
 
 brandShortName=Daily
 brandShorterName=Daily
-brandFullName=Daily
+brandFullName=Thunderbird Daily
 vendorShortName=mozilla.org
 
--- a/mail/installer/windows/nsis/defines.nsi.in
+++ b/mail/installer/windows/nsis/defines.nsi.in
@@ -16,17 +16,19 @@
 
 !define AppRegNameMail        "Thunderbird"
 !define AppRegNameNews        "Thunderbird (News)"
 
 !define ClientsRegName        "Mozilla Thunderbird"
 
 !define BrandShortName        "@MOZ_APP_DISPLAYNAME@"
 !define PreReleaseSuffix      "@PRE_RELEASE_SUFFIX@"
+!ifndef BrandFullName
 !define BrandFullName         "${BrandFullNameInternal}${PreReleaseSuffix}"
+!endif
 
 !define CERTIFICATE_NAME            "Mozilla Corporation"
 !define CERTIFICATE_ISSUER          "DigiCert SHA2 Assured ID Code Signing CA"
 ; Changing the name or issuer requires us to have both the old and the new
 ;  in the registry at the same time, temporarily.
 !define CERTIFICATE_NAME_PREVIOUS   "Mozilla Corporation"
 !define CERTIFICATE_ISSUER_PREVIOUS "DigiCert Assured ID Code Signing CA-1"
 
--- a/mail/installer/windows/nsis/maintenanceservice_installer.nsi
+++ b/mail/installer/windows/nsis/maintenanceservice_installer.nsi
@@ -46,17 +46,19 @@ Var BrandFullName
 !define CompanyName "Mozilla Corporation"
 !define BrandFullNameInternal ""
 
 ; The following includes are custom.
 !include defines.nsi
 ; We keep defines.nsi defined so that we get other things like
 ; the version number, but we redefine BrandFullName
 !define MaintFullName "Mozilla Maintenance Service"
+!ifdef BrandFullName
 !undef BrandFullName
+!endif
 !define BrandFullName "${MaintFullName}"
 
 !include common.nsh
 !include locales.nsi
 
 VIAddVersionKey "FileDescription" "${MaintFullName} Installer"
 VIAddVersionKey "OriginalFilename" "maintenanceservice_installer.exe"
 
--- a/other-licenses/branding/thunderbird/branding.nsi
+++ b/other-licenses/branding/thunderbird/branding.nsi
@@ -35,13 +35,14 @@
 # ***** END LICENSE BLOCK *****
 
 # NSIS defines for official release builds.
 # The nightly build branding.nsi is located in mail/installer/windows/nsis
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Thunderbird"
+!define BrandFullName         "Mozilla Thunderbird"
 !define CompanyName           "Mozilla Corporation"
 !define URLInfoAbout          "http://www.mozilla.org/${AB_CD}/"
 !define URLUpdateInfo         "http://www.mozilla.org/${AB_CD}/thunderbird/"
 !define URLSystemRequirements "https://www.mozilla.org/thunderbird/system-requirements/"
 !define SurveyURL             "http://live.mozillamessaging.com/survey/uninstall/?locale=${AB_CD}&version=${AppVersion}"