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

@@ -8,6 +8,7 @@
 # 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/"

mail/branding/nightly/configure.sh

@@ -2,4 +2,4 @@
 # 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

mail/branding/nightly/locales/en-US/brand.dtd

@@ -4,6 +4,6 @@
 
 <!ENTITY  brandShortName        "Daily">
 <!ENTITY  brandShorterName      "Daily">
-<!ENTITY  brandFullName         "Daily">
+<!ENTITY  brandFullName         "Thunderbird Daily">
 <!ENTITY  vendorShortName       "mozilla.org">
 <!ENTITY  trademarkInfo.part1   " ">

mail/branding/nightly/locales/en-US/brand.properties

@@ -4,6 +4,6 @@
 
 brandShortName=Daily
 brandShorterName=Daily
-brandFullName=Daily
+brandFullName=Thunderbird Daily
 vendorShortName=mozilla.org
 

mail/installer/windows/nsis/defines.nsi.in

@@ -21,7 +21,9 @@
 
 !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"

mail/installer/windows/nsis/maintenanceservice_installer.nsi

@@ -51,7 +51,9 @@ Var BrandFullName
 ; 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

other-licenses/branding/thunderbird/branding.nsi

@@ -40,6 +40,7 @@
 # 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/"