Bug 1094505 - Avoid using concatenated name in installer. r=rstrong

browser/branding/aurora/branding.nsi

@@ -9,6 +9,7 @@
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Firefox Developer Edition"
+!define BrandShortName        "Firefox Developer Edition"
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "https://www.mozilla.org"
 !define HelpLink              "https://support.mozilla.org"

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

@@ -31,7 +31,9 @@
 !define DDEApplication        "Firefox"
 !define AppRegName            "Firefox"
 
+!ifndef DEV_EDITION
 !define BrandShortName        "@MOZ_APP_DISPLAYNAME@"
+!endif
 !define BrandFullName         "${BrandFullNameInternal}"
 
 !define NO_UNINSTALL_SURVEY