Backed out changeset 3133f6a664c7 (bug 1378834) for busted installers, at least on OS X. r=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 13 Sep 2017 14:54:44 +0200
changeset 430048 a7367247baa45a50f0082682f087c71b2d2e771f
parent 430047 4d573e9b4b0912b5673e514244e4ec4d18fe37df
child 430049 e8744e2681065da8a77f08d570509669baa8bb82
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)
reviewersbackout
bugs1378834
milestone57.0a1
backs out3133f6a664c709af4e39c2eab60ed35c1bcf6499
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
Backed out changeset 3133f6a664c7 (bug 1378834) for busted installers, at least on OS X. r=backout on a CLOSED TREE
browser/branding/nightly/branding.nsi
browser/branding/nightly/configure.sh
browser/branding/nightly/locales/en-US/brand.dtd
browser/branding/nightly/locales/en-US/brand.properties
--- a/browser/branding/nightly/branding.nsi
+++ b/browser/branding/nightly/branding.nsi
@@ -4,17 +4,16 @@
 
 # NSIS branding defines for nightly builds.
 # The official release build branding.nsi is located in other-license/branding/firefox/
 # The unofficial build branding.nsi is located in browser/branding/unofficial/
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Nightly"
-!define BrandFullName         "Firefox Nightly"
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "https://www.mozilla.org"
 !define HelpLink              "https://support.mozilla.org"
 
 !define URLStubDownload32 "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-nightly-latest"
 !define URLStubDownload64 "http://download.mozilla.org/?os=win64&lang=${AB_CD}&product=firefox-nightly-latest"
 !define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=nightly&installer_lang=${AB_CD}"
 !define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/"
--- a/browser/branding/nightly/configure.sh
+++ b/browser/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="Firefox Nightly"
+MOZ_APP_DISPLAYNAME=Nightly
--- a/browser/branding/nightly/locales/en-US/brand.dtd
+++ b/browser/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  brandShorterName      "Nightly">
-<!ENTITY  brandShortName        "Firefox Nightly">
-<!ENTITY  brandFullName         "Firefox Nightly">
+<!ENTITY  brandShortName        "Nightly">
+<!ENTITY  brandFullName         "Nightly">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   " ">
--- a/browser/branding/nightly/locales/en-US/brand.properties
+++ b/browser/branding/nightly/locales/en-US/brand.properties
@@ -1,10 +1,10 @@
 # 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/.
 
 brandShorterName=Nightly
-brandShortName=Firefox Nightly
-brandFullName=Firefox Nightly
+brandShortName=Nightly
+brandFullName=Nightly
 vendorShortName=Mozilla
 
 syncBrandShortName=Sync