Use the full name as the short name (bug 1090324). r=gavin

--HG--
extra : rebase_source : a5e6721a8ef53f611e36747c5ef3a7cec01f9f35

browser/branding/aurora/configure.sh

@@ -2,5 +2,5 @@
 # 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=FirefoxDevEdition
+MOZ_APP_DISPLAYNAME=FirefoxDeveloperEdition
 MOZ_APP_REMOTINGNAME=firefox-dev

browser/branding/aurora/locales/en-US/brand.dtd

@@ -2,7 +2,7 @@
    - 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        "FirefoxDevEdition">
+<!ENTITY  brandShortName        "Firefox Developer Edition">
 <!ENTITY  brandFullName         "Firefox Developer Edition">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   " ">

browser/branding/aurora/locales/en-US/brand.properties

@@ -2,7 +2,7 @@
 # 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=FirefoxDevEdition
+brandShortName=Firefox Developer Edition
 brandFullName=Firefox Developer Edition
 vendorShortName=Mozilla
 

browser/config/mozconfigs/macosx-universal/l10n-mozconfig

@@ -4,7 +4,7 @@ ac_add_options --with-l10n-base=../../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 

browser/config/mozconfigs/macosx-universal/nightly

@@ -9,7 +9,7 @@ ac_add_options --enable-dtrace
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 

browser/config/mozconfigs/macosx64/debug

@@ -9,7 +9,7 @@ ac_add_options --with-google-oauth-api-keyfile=/builds/google-oauth-api.key
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 

browser/config/mozconfigs/macosx64/debug-asan

@@ -11,7 +11,7 @@ ac_add_options --disable-unified-compilation
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 

browser/config/mozconfigs/whitelist

@@ -48,7 +48,7 @@ whitelist['nightly']['linux64'] += [
 ]
 
 whitelist['nightly']['macosx-universal'] += [
-    'if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then',
+    'if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then',
     'ac_add_options --with-macbundlename-prefix=Firefox',
     'fi',
     'mk_add_options MOZ_MAKE_FLAGS="-j12"',