Bug 282057 - brand.dtd/properties live in the wrong chrome package... xulrunner apps cannot provide these files, which means they can't use various toolkit features r=darin moa=Neil (seamonkey)

Makefile.in

@@ -334,9 +334,6 @@ ifdef MOZ_USE_OFFICIAL_BRANDING
 tier_99_dirs  += other-licenses/branding/firefox
 endif
 tier_99_dirs	+= browser xpfe/bootstrap/init.d
-ifdef MOZ_USE_OFFICIAL_BRANDING
-tier_99_dirs  += other-licenses/branding/firefox/content
-endif
 endif
 
 ifdef MOZ_XULRUNNER
@@ -352,9 +349,6 @@ ifdef MOZ_USE_OFFICIAL_BRANDING
 tier_99_dirs  += other-licenses/branding/thunderbird
 endif
 tier_99_dirs	+= mail xpfe/bootstrap/init.d
-ifdef MOZ_USE_OFFICIAL_BRANDING
-tier_99_dirs  += other-licenses/branding/thunderbird/content
-endif
 endif
 
 ifdef MOZ_STANDALONE_COMPOSER

allmakefiles.sh

@@ -864,11 +864,13 @@ extensions/typeaheadfind/Makefile
 MAKEFILES_firefox_branding="
 other-licenses/branding/firefox/Makefile
 other-licenses/branding/firefox/content/Makefile
+other-licenses/branding/firefox/locales/Makefile
 "
 
 MAKEFILES_thunderbird_branding="
 other-licenses/branding/thunderbird/Makefile
 other-licenses/branding/thunderbird/content/Makefile
+other-licenses/branding/thunderbird/locales/Makefile
 "
 
 MAKEFILES_phoenix="

browser/app/profile/firefox.js

@@ -180,11 +180,11 @@ pref("browser.search.defaulturl",             "chrome://browser-region/locale/re
 pref("browser.search.order.1",                "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.2",                "chrome://browser-region/locale/region.properties");
  
-pref("browser.search.param.Google.1.default", "chrome://browser/content/searchconfig.properties");
+pref("browser.search.param.Google.1.default", "chrome://branding/content/searchconfig.properties");
-pref("browser.search.param.Google.1.custom",  "chrome://browser/content/searchconfig.properties");
+pref("browser.search.param.Google.1.custom",  "chrome://branding/content/searchconfig.properties");
-pref("browser.search.order.Yahoo.1",          "chrome://browser/content/searchconfig.properties");
+pref("browser.search.order.Yahoo.1",          "chrome://branding/content/searchconfig.properties");
-pref("browser.search.order.Yahoo.2",          "chrome://browser/content/searchconfig.properties");
+pref("browser.search.order.Yahoo.2",          "chrome://branding/content/searchconfig.properties");
-pref("browser.search.order.Yahoo",            "chrome://browser/content/searchconfig.properties");
+pref("browser.search.order.Yahoo",            "chrome://branding/content/searchconfig.properties");
 
 // basic search popup constraint: minimum sherlock plugin version displayed
 // (note: must be a string representation of a float or it'll default to 0.0)

browser/base/Makefile.in

@@ -44,22 +44,20 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-AB_CD = $(MOZ_UI_LOCALE)
-
-DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
-
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID_UNQUOTED)
+DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
+
+ifdef MOZ_USE_OFFICIAL_BRANDING
+DEFINES += -DMOZ_USE_OFFICIAL_BRANDING
+endif
 
 ifneq (,$(filter windows gtk2, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DHAVE_SHELL_SERVICE=1
 endif
 
 libs locale::
-	@$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+	$(INSTALL) $(srcdir)/content/browserconfig.properties $(DIST)/bin
-	  $(srcdir)/content/browserconfig.properties > $(DIST)/bin/browserconfig.properties
 
 install::
-	@$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+	$(INSTALL) $(srcdir)/content/browserconfig.properties $(DESTDIR)$(mozappdir)
-	  $(srcdir)/content/browserconfig.properties > $(DESTDIR)$(mozappdir)/browserconfig.properties

browser/base/branding/contents.rdf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:branding"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:branding"
+        chrome:name="branding" />
+</RDF:RDF>

browser/base/content/aboutDialog.css

@@ -3,7 +3,7 @@
  }
 
  #clientBox {
-   background-image: url("chrome://browser/content/about.png");
+   background-image: url("chrome://branding/content/about.png");
    background-repeat: no-repeat;
    background-color: #FFFFFF;
    padding-top: 203px;

browser/base/content/browser-sets.inc

@@ -44,7 +44,7 @@
 #endif
 
   <stringbundleset id="stringbundleset"> 
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_shell" src="chrome://browser/locale/shellservice.properties"/>
     <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
     <stringbundle id="bundle_findBar" src="chrome://browser/locale/browser.properties"/>

browser/base/content/credits.xhtml

@@ -193,7 +193,7 @@
   </head>
   <body onload="init();" onunload="uninit();">
     <div id="titleBox">
-      <img src="chrome://browser/content/aboutCredits.png" />
+      <img src="chrome://branding/content/aboutCredits.png" />
     </div>
 
     <div id="creditsBox">
@@ -343,7 +343,7 @@
     </div>
 
     <div id="footerBox">
-      <img src="chrome://browser/content/aboutFooter.png" />
+      <img src="chrome://branding/content/aboutFooter.png" />
     </div>
   </body>
 </html>

browser/base/jar.mn

@@ -1,9 +1,6 @@
 browser.jar:
         content/browser/contents.rdf                  (content/contents.rdf)
         content/browser-region/contents.rdf           (content/contents-region.rdf)
-        content/browser/about.png                     (content/about.png)
-        content/browser/aboutCredits.png              (content/aboutCredits.png)
-        content/browser/aboutFooter.png               (content/aboutFooter.png)
 *       content/browser/aboutDialog.xul               (content/aboutDialog.xul)
 *       content/browser/aboutDialog.js                (content/aboutDialog.js)
 *       content/browser/aboutDialog.css               (content/aboutDialog.css)
@@ -28,8 +25,15 @@ browser.jar:
 *       content/browser/sanitize.xul                  (content/sanitize.xul)
 *       content/browser/search.xml                    (content/search.xml)
 *       content/browser/searchbarBindings.css         (content/searchbarBindings.css)
-*       content/browser/searchconfig.properties       (content/searchconfig.properties)
 *       content/browser/setWallpaper.xul              (content/setWallpaper.xul)
 *       content/browser/utilityOverlay.js             (content/utilityOverlay.js)
 *       content/browser/web-panels.js                 (content/web-panels.js)
 *       content/browser/web-panels.xul                (content/web-panels.xul)
+#ifndef MOZ_USE_OFFICIAL_BRANDING
+  content/branding/contents.rdf                  (branding/contents.rdf)
+  content/branding/about.png                     (branding/about.png)
+  content/branding/aboutCredits.png              (branding/aboutCredits.png)
+  content/branding/aboutFooter.png               (branding/aboutFooter.png)
+  content/branding/searchconfig.properties       (branding/searchconfig.properties)
+  content/branding/icon64.png                    (branding/icon64.png)
+#endif

browser/components/bookmarks/content/bookmarks.js

@@ -1223,7 +1223,7 @@ var BookmarksUtils = {
                                 .getService(Components.interfaces.nsIStringBundleService);
       var bookmarksBundle  = "chrome://browser/locale/bookmarks/bookmarks.properties";
       this._bundle         = BUNDLESVC.createBundle(bookmarksBundle, LOCALESVC.getApplicationLocale());
-      var brandBundle      = "chrome://global/locale/brand.properties";
+      var brandBundle      = "chrome://branding/locale/brand.properties";
       this._brandShortName = BUNDLESVC.createBundle(brandBundle,     LOCALESVC.getApplicationLocale())
                                       .GetStringFromName("brandShortName");
     }

browser/components/history/content/history.js

@@ -164,7 +164,7 @@ function checkURLSecurity(aURL)
     var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
                                   .getService(Components.interfaces.nsIPromptService);
     var historyBundle = strBundleService.createBundle("chrome://global/locale/history/history.properties");
-    var brandBundle = strBundleService.createBundle("chrome://global/locale/brand.properties");      
+    var brandBundle = strBundleService.createBundle("chrome://branding/locale/brand.properties");      
     var brandStr = brandBundle.GetStringFromName("brandShortName");
     var errorStr = historyBundle.GetStringFromName("load-js-data-url-error");
     promptService.alert(window, brandStr, errorStr);

browser/components/preferences/general.xul

@@ -34,7 +34,7 @@
                   type="bool"/>
     </preferences>
     
-    <stringbundle id="bundleBrand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundleShell" src="chrome://browser/locale/shellservice.properties"/>
 
     <groupbox>

browser/components/shell/src/nsShellService.h

@@ -37,5 +37,5 @@
 #define PREF_CHECKDEFAULTBROWSER "browser.shell.checkDefaultBrowser"
 
 #define SHELLSERVICE_PROPERTIES "chrome://browser/locale/shellservice.properties"
-#define BRAND_PROPERTIES "chrome://global/locale/brand.properties"
+#define BRAND_PROPERTIES "chrome://branding/locale/brand.properties"
 

browser/components/shell/src/nsWindowsShellService.cpp

@@ -744,7 +744,7 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
   nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(bundleCID));
   if (bundleService) {
     nsCOMPtr<nsIStringBundle> brandBundle;
-    rv = bundleService->CreateBundle("chrome://global/locale/brand.properties",
+    rv = bundleService->CreateBundle("chrome://branding/locale/brand.properties",
                                      getter_AddRefs(brandBundle));
     if (NS_SUCCEEDED(rv) && brandBundle) {
       if (NS_FAILED(rv = brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(),

browser/installer/unix/ab-CD.jst

@@ -79,6 +79,7 @@ if (verifyDiskSpace(fProgram, srDest))
 
         registerChrome(chromeType, cf, "locale/browser/");
         registerChrome(chromeType, cf, "locale/browser-region/");
+        registerChrome(chromeType, cf, "locale/branding/");
         registerChrome(chromeType, cf, "locale/@AB_CD@/passwordmgr/");
         registerChrome(chromeType, cf, "locale/@AB_CD@/mozapps/");
 

browser/installer/unix/browser.jst

@@ -92,6 +92,7 @@ if (verifyDiskSpace(communicatorFolder, srDest))
 
     // register chrome
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/browser/");
+    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/branding/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome", "classic.jar"), "skin/classic/browser/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/browser-region/");
 

browser/installer/windows/ab-CD.jst

@@ -80,6 +80,7 @@ if(verifyDiskSpace(fProgram, srDest))
 
     registerChrome(chromeType, cf, "locale/browser/");
     registerChrome(chromeType, cf, "locale/browser-region/");
+    registerChrome(chromeType, cf, "locale/branding/");
     registerChrome(chromeType, cf, "locale/@AB_CD@/passwordmgr/");
     registerChrome(chromeType, cf, "locale/@AB_CD@/mozapps/");
 

browser/installer/windows/browser.jst

@@ -525,6 +525,7 @@ if(verifyDiskSpace(fProgram, srDest))
 
     // register chrome
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/browser/");
+    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/branding/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome", "classic.jar"), "skin/classic/browser/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/browser-region/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/browser-platform/");

browser/locales/Makefile.in

@@ -53,6 +53,10 @@ APP_VERSION := $(shell cat $(srcdir)/../config/version.txt)
 
 DEFINES += -DAB_CD=$(AB_CD) -DAPP_VERSION=$(MOZ_APP_VERSION)
 
+ifdef MOZ_USE_OFFICIAL_BRANDING
+DEFINES += -DMOZ_USE_OFFICIAL_BRANDING
+endif
+
 ifeq (,$(filter-out pref,$(MOZ_EXTENSIONS)))
 DEFINES += -DEXTENSION_PREF
 endif

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

@@ -0,0 +1,5 @@
+<!ENTITY  brandShortName        "Browser">
+<!ENTITY  brandFullName         "Gecko Browser">            
+<!ENTITY  vendorShortName       "Generic">
+
+<!ENTITY  releaseURL            "http://www.mozilla.org/">

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

@@ -0,0 +1,3 @@
+brandShortName=Browser
+brandFullName=Gecko Browser
+vendorShortName=Generic

browser/locales/generic/chrome/branding/contents.rdf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+#filter substitution
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the locales being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:@AB_CD@"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:@AB_CD@">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:@AB_CD@:packages">
+        <RDF:li resource="urn:mozilla:locale:@AB_CD@:branding"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+</RDF:RDF>

browser/locales/jar.mn

@@ -1,8 +1,6 @@
 #filter substitution
 
 @AB_CD@.jar:
-*   locale/@AB_CD@/global/brand.dtd        (%chrome/global/brand.dtd)
-+   locale/@AB_CD@/global/brand.properties (%chrome/global/brand.properties)
 *   locale/browser/contents.rdf                    (generic/chrome/browser/contents.rdf)
     locale/browser/aboutDialog.dtd                 (%chrome/browser/aboutDialog.dtd)
     locale/browser/credits.dtd                     (%chrome/browser/credits.dtd)
@@ -56,4 +54,9 @@
 *   locale/@AB_CD@/cookie/contents.rdf                     (generic/chrome/cookie/contents.rdf)
     locale/@AB_CD@/cookie/cookieAcceptDialog.dtd           (%chrome/cookie/cookieAcceptDialog.dtd)
     locale/@AB_CD@/cookie/cookieAcceptDialog.properties    (%chrome/cookie/cookieAcceptDialog.properties)
+#ifndef MOZ_USE_OFFICIAL_BRANDING
+*   locale/branding/contents.rdf      (generic/chrome/branding/contents.rdf)
+    locale/branding/brand.dtd         (%chrome/branding/brand.dtd)
+    locale/branding/brand.properties  (%chrome/branding/brand.properties)
+#endif
 #includesubst @AB_CD@/extra-jar.mn

extensions/p3p/resources/content/nsPolicyViewer.js

@@ -620,7 +620,7 @@ function getBundle ()
 function getBrandName ()
 {
   if (!gBrandName) {
-    var brandBundle = getStrBundleService().createBundle("chrome://global/locale/brand.properties");
+    var brandBundle = getStrBundleService().createBundle("chrome://branding/locale/brand.properties");
     gBrandName = brandBundle.GetStringFromName("brandShortName")
   }
   return gBrandName;

layout/printing/nsPrintData.cpp

@@ -89,7 +89,7 @@ nsPrintData::nsPrintData(ePrintDataType aType) :
   nsCOMPtr<nsIStringBundle> brandBundle;
   nsCOMPtr<nsIStringBundleService> svc( do_GetService( NS_STRINGBUNDLE_CONTRACTID ) );
   if (svc) {
-    svc->CreateBundle( "chrome://global/locale/brand.properties", getter_AddRefs( brandBundle ) );
+    svc->CreateBundle( "chrome://branding/locale/brand.properties", getter_AddRefs( brandBundle ) );
     if (brandBundle) {
       brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(), &mBrandName );
     }

mail/base/Makefile.in

@@ -42,6 +42,10 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_USE_OFFICIAL_BRANDING
+DEFINES += -DMOZ_USE_OFFICIAL_BRANDING
+endif
+
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 	DIRS  += skin/mac
 else
@@ -49,4 +53,3 @@ else
 endif
 
 include $(topsrcdir)/config/rules.mk
-

mail/base/content/ABSearchDialog.xul

@@ -65,7 +65,7 @@
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
     <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
   <!-- XXX: only mailWidgets.xml requires strres.js (<script> isn't valid in XBL yet - see hyatt)-->

mail/base/content/SearchDialog.xul

@@ -58,7 +58,7 @@
 
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <!-- XXX: only mailWidgets.xml requires strres.js (<script> isn't valid in XBL yet - see hyatt)-->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>

mail/base/content/aboutDialog.css

@@ -4,7 +4,7 @@
 
 #clientBox {
   background-color: #FFFFFF;
-  background-image: url("chrome://messenger/content/about-thunderbird.png");
+  background-image: url("chrome://branding/content/about-thunderbird.png");
   background-repeat: no-repeat;
   padding-top: 216px;
   color: #000000;

mail/base/content/contents-branding.rdf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:branding"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:branding"
+        chrome:name="branding" />
+</RDF:RDF>

mail/base/content/hiddenWindow.xul

@@ -72,7 +72,7 @@
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
 </stringbundleset>
 

mail/base/content/messageWindow.xul

@@ -66,7 +66,7 @@
         windowtype="mail:messageWindow">
 
   <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
   </stringbundleset>

mail/base/content/messenger.xul

@@ -67,7 +67,7 @@
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
 </stringbundleset>
 

mail/base/content/msgPrintEngine.xul

@@ -54,7 +54,7 @@
         windowtype="mail:printEngine">
 
   <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
 

mail/base/content/msgSelectOffline.xul

@@ -53,7 +53,7 @@
         ondialogcancel="return selectCancelButton();">
 
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 		
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>

mail/base/jar.mn

@@ -35,12 +35,16 @@ messenger.jar:
 *+  content/messenger/searchBar.js                  (content/searchBar.js)
 *   content/messenger/phishingDetector.js           (content/phishingDetector.js)
 *+  content/messenger-views/contents.rdf            (content/messenger-views.rdf)
-    content/messenger/about-thunderbird.png         (content/about-thunderbird.png)
-    content/messenger/about-credits.png             (content/about-credits.png)
     content/messenger/about-footer.png              (content/about-footer.png)
     content/messenger/aboutDialog.css               (content/aboutDialog.css)
 +   content/messenger/messenger.css                 (content/messenger.css)
 *   content/messenger/search.xml                    (content/search.xml)
+#ifndef MOZ_USE_OFFICIAL_BRANDING
+    content/branding/contents.rdf                   (content/contents-branding.rdf)
+    content/branding/about-credits.png              (content/about-credits.png)
+    content/branding/about-thunderbird.png          (content/about-thunderbird.png)
+    content/branding/thunderbird-watermark.png      (content/thunderbird-watermark.png)
+#endif
 
 comm.jar:
 *   content/help/contents.rdf                       (content/help.rdf)

mail/components/addrbook/content/addressbook.xul

@@ -64,7 +64,7 @@
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
 <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>

mail/components/gnome/nsMailGNOMEIntegration.cpp

@@ -249,7 +249,7 @@ nsMailGNOMEIntegration::ShowMailIntegrationDialog(nsIDOMWindow* aParentWindow)
   NS_ENSURE_TRUE(bundleService, NS_ERROR_FAILURE);
 
   nsCOMPtr<nsIStringBundle> brandBundle;
-  bundleService->CreateBundle("chrome://global/locale/brand.properties",
+  bundleService->CreateBundle("chrome://branding/locale/brand.properties",
                               getter_AddRefs(brandBundle));
   NS_ENSURE_TRUE(brandBundle, NS_ERROR_FAILURE);
 

mail/components/migration/content/migration.css

@@ -37,5 +37,5 @@
 # ***** END LICENSE BLOCK *****
 
 .wizard-header {
-  background: url("chrome://messenger/content/thunderbird-wizard-badge.png") no-repeat right center Window;
+  background: url("chrome://branding/content/thunderbird-wizard-badge.png") no-repeat right center Window;
 }

mail/config/en-US-jar.mn

@@ -23,6 +23,7 @@ locale/en-US/messenger-mdn,                                     en-US/locale/en-
 locale/en-US/messenger-offline,                                 en-US/locale/en-US/messenger-offline
 locale/en-US/messenger-newsblog,                                en-US/locale/en-US/messenger-newsblog
 locale/en-US/messenger-region,                                  en-US/locale/en-US/messenger-region
+locale/en-US/branding,                                          en-US/locale/en-US/branding
 
 #################################################################################################
 # xpfe extensions (ldap, etc)

mail/config/installed-chrome.txt

@@ -25,6 +25,7 @@ content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-views/
 content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-smime/
 content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-mapi/
 content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-region/
+content,install,url,jar:resource:/chrome/mail.jar!/content/branding/
 skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/global/
 skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/communicator/
 skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/editor/
@@ -36,6 +37,7 @@ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/pipnss/
 locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/pippki/
 locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/autoconfig/
 locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger/
+locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/branding/
 locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-mdn/
 locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-views/
 locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-smime/

mail/config/mail-jar.mn

@@ -19,6 +19,7 @@ content/messenger/preferences,                       msg/content/messenger/prefe
 content/editor/images,				           msg/content/editor/images
 content/messenger/addressbook,                       msg/content/messenger/addressbook
 content/messenger/migration,                         msg/content/messenger/migration
+content/branding,                                    msg/content/branding
 
 #################################################################################################
 # Files we need from comm.jar

mail/extensions/smime/content/am-smime.xul

@@ -49,7 +49,7 @@
         orient="vertical">
  
   <stringbundle id="bundle_smime" src="chrome://messenger/locale/am-smime.properties"/> 
-  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/am-smime.js"/>
     

mail/extensions/smime/content/msgCompSMIMEOverlay.xul

@@ -54,7 +54,7 @@
     <observes element="securityStatus" attribute="crypto" />
     <observes element="securityStatus" attribute="signing" />
     <stringbundle id="bundle_comp_smime" src="chrome://messenger-smime/locale/msgCompSMIMEOverlay.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </window>
 
   <menupopup id="optionsMenuPopup">

mail/installer/windows/langenus.jst

@@ -76,6 +76,7 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(chromeType, cf, localeName + "communicator-platform/");
     registerChrome(chromeType, cf, localeName + "navigator/"); 
     registerChrome(chromeType, cf, localeName + "navigator-platform/");   
+    registerChrome(chromeType, cf, localeName + "branding/");
 
     err = performInstall(); 
     logComment("performInstall() returned: " + err);

mail/installer/windows/mail.jst

@@ -827,6 +827,7 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","mail.jar"), "content/messenger-mdn/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","mail.jar"), "content/messenger-views/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","mail.jar"), "content/messenger-mapi/");
+    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","mail.jar"), "content/branding/");
 
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","mail.jar"), "content/communicator/downloadmanager/");  
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","mail.jar"), "content/pippki/"); 

mail/locales/Makefile.in

@@ -50,4 +50,8 @@ APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
 
 DEFINES += -DAB_CD=en-US -DAPP_VERSION=$(APP_VERSION)
 
+ifdef MOZ_USE_OFFICIAL_BRANDING
+DEFINES += -DMOZ_USE_OFFICIAL_BRANDING
+endif
+
 include $(topsrcdir)/config/rules.mk

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

@@ -0,0 +1,5 @@
+#expand <!ENTITY  lang.version          "__MOZILLA_LOCALE_VERSION__">
+<!ENTITY  brandShortName        "Mail/News">
+<!ENTITY  brandFullName         "Mail/News Client">
+<!ENTITY  vendorShortName       "Mail/News Client">
+<!ENTITY  sidebarName           "Sidebar">

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

@@ -0,0 +1,10 @@
+brandShortName=Mail/News Client
+
+#We don't have a real property for the REAL short name (Thunderbird), uses thisone temporarily
+#We can't change brandShortName because that's used by non forked thunderbird/seamonkey code
+#where it really needs to be the full name for thunderbird
+brandRealShortName=Mail/News
+
+brandFullName=Mail/News Client
+vendorShortName=Mail/News Client
+sidebarName=Sidebar

mail/locales/en-US/chrome/messenger/credits.html

@@ -157,7 +157,7 @@
   </head>
   <body onload="init();" onunload="uninit();">
     <div id="titleBox">
-      <img src="chrome://messenger/content/about-credits.png">
+      <img src="chrome://branding/content/about-credits.png">
     </div>
     
     <div id="creditsBox">

mail/locales/en-US/chrome/messenger/start.html

@@ -48,7 +48,7 @@ h2 {
 #indent {
 	margin-left: 25px;
 	margin-right: 25px;
-	background: url(thunderbird-watermark.png) no-repeat top right;
+	background: url(chrome://branding/content/thunderbird-watermark.png) no-repeat top right;
 	min-height:  280px;
 }
 

mail/locales/generic/chrome/branding/contents.rdf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+#filter substitution
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the locales being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:@AB_CD@"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:@AB_CD@">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:@AB_CD@:packages">
+        <RDF:li resource="urn:mozilla:locale:@AB_CD@:branding"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+</RDF:RDF>

mail/locales/jar.mn

@@ -4,7 +4,6 @@
 * locale/@AB_CD@/messenger/contents.rdf                                 (generic/chrome/messenger/contents.rdf)
   locale/@AB_CD@/messenger/start.html                                   (@AB_CD@/chrome/messenger/start.html)
 * locale/@AB_CD@/messenger/credits.html                                 (@AB_CD@/chrome/messenger/credits.html)
-  locale/@AB_CD@/messenger/thunderbird-watermark.png                    (@AB_CD@/chrome/messenger/thunderbird-watermark.png)
   locale/@AB_CD@/messenger/startpage-h1.png                             (@AB_CD@/chrome/messenger/startpage-h1.png)
   locale/@AB_CD@/messenger/startpage-h2.png                             (@AB_CD@/chrome/messenger/startpage-h2.png)
   locale/@AB_CD@/messenger/startpage-back.png                           (@AB_CD@/chrome/messenger/startpage-back.png)
@@ -217,6 +216,9 @@
   locale/@AB_CD@/navigator-platform/unix/platformNavigationBindings.dtd (@AB_CD@/chrome/navigator-platform/unix/platformNavigationBindings.dtd)
   locale/@AB_CD@/navigator-platform/unix/navigator.properties           (@AB_CD@/chrome/navigator-platform/unix/navigator.properties)
 + locale/@AB_CD@/global/charset.dtd                 (@AB_CD@/chrome/global/charset.dtd)
-+ locale/@AB_CD@/global/brand.properties            (@AB_CD@/chrome/global/brand.properties)
-* locale/@AB_CD@/global/brand.dtd                   (@AB_CD@/chrome/global/brand.dtd)
   locale/@AB_CD@/global-platform/win/nsWindowsHooks.properties (@AB_CD@/chrome/global-platform/win/nsWindowsHooks.properties)
+#ifndef MOZ_USE_OFFICIAL_BRANDING
+* locale/@AB_CD@/branding/contents.rdf                (generic/chrome/branding/contents.rdf)
+  locale/@AB_CD@/branding/brand.properties            (@AB_CD@/chrome/branding/brand.properties)
+* locale/@AB_CD@/branding/brand.dtd                   (@AB_CD@/chrome/branding/brand.dtd)
+#endif

mailnews/addrbook/resources/content/addressbook.xul

@@ -72,7 +72,7 @@
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
 <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>

mailnews/base/prefs/resources/content/AccountManager.xul

@@ -17,7 +17,7 @@
         onload="onLoad(event);"
         ondialogaccept="return onAccept();"
         ondialoghelp="return doHelpButton();">
-<stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
 <script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>

mailnews/base/prefs/resources/content/SmtpServerEdit.xul

@@ -51,7 +51,7 @@
         onload="onLoad();"
         ondialogaccept="return onAccept();">
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-<stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 <script type="application/x-javascript" src="amUtils.js"/>
 <script type="application/x-javascript" src="SmtpServerEdit.js"/>
 <vbox id="smtpServerEditor"/>

mailnews/base/resources/content/mail3PaneWindowVertLayout.xul

@@ -69,7 +69,7 @@
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
 </stringbundleset>
 

mailnews/base/resources/content/messageWindow.xul

@@ -65,7 +65,7 @@
         windowtype="mail:messageWindow">
 
   <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
   </stringbundleset>

mailnews/base/resources/content/messenger.xul

@@ -69,7 +69,7 @@
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
 </stringbundleset>
 

mailnews/base/resources/content/msgAccountCentral.xul

@@ -51,7 +51,7 @@
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="OnInit();">
 
-  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
   <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>

mailnews/base/resources/content/msgPrintEngine.xul

@@ -53,7 +53,7 @@
         windowtype="mail:printEngine">
 
   <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
 

mailnews/base/resources/content/msgSelectOffline.xul

@@ -61,7 +61,7 @@
 <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-<stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>

mailnews/base/search/resources/content/ABSearchDialog.xul

@@ -65,7 +65,7 @@
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
     <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
   <!-- XXX: only mailWidgets.xml requires strres.js (<script> isn't valid in XBL yet - see hyatt)-->

mailnews/base/search/resources/content/SearchDialog.xul

@@ -60,7 +60,7 @@
 
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <!-- XXX: only mailWidgets.xml requires strres.js (<script> isn't valid in XBL yet - see hyatt)-->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script src="chrome://messenger/content/mailWindow.js"/>

mailnews/compose/src/nsMsgCompUtils.cpp

@@ -483,7 +483,7 @@ RRT_HEADER:
     if (NS_SUCCEEDED(rv)) 
 	{
       nsCOMPtr<nsIStringBundle> brandSringBundle;
-      rv = stringService->CreateBundle("chrome://global/locale/brand.properties", getter_AddRefs(brandSringBundle));
+      rv = stringService->CreateBundle("chrome://branding/locale/brand.properties", getter_AddRefs(brandSringBundle));
       if (NS_SUCCEEDED(rv)) 
 	  {
         nsXPIDLString brandName;

mailnews/extensions/smime/resources/content/am-smime.xul

@@ -50,7 +50,7 @@
         orient="vertical">
  
   <stringbundle id="bundle_smime" src="chrome://messenger/locale/am-smime.properties"/> 
-  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/am-smime.js"/>
     

mailnews/extensions/smime/resources/content/msgCompSMIMEOverlay.xul

@@ -55,7 +55,7 @@
     <observes element="securityStatus" attribute="crypto" />
     <observes element="securityStatus" attribute="signing" />
     <stringbundle id="bundle_comp_smime" src="chrome://messenger-smime/locale/msgCompSMIMEOverlay.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </window>
 
   <menupopup id="optionsMenuPopup">

mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.xul

@@ -59,7 +59,7 @@
       id="encrypted-status" collapsed="true" oncommand="showMessageReadSecurityInfo();"/>
 
     <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </statusbar>
 
 </overlay>

mailnews/mapi/mapihook/src/msgMapiHook.cpp

@@ -205,7 +205,7 @@ PRBool nsMapiHook::DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername,
 
         nsCOMPtr<nsIStringBundle> brandBundle;
         rv = bundleService->CreateBundle(
-                        "chrome://global/locale/brand.properties",
+                        "chrome://branding/locale/brand.properties",
                         getter_AddRefs(brandBundle));
         if (NS_FAILED(rv)) return PR_FALSE;
 

mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp

@@ -91,7 +91,7 @@ void nsMapiRegistryUtils::getVarValue(const PRUnichar * varName, nsAutoString &
     if (NS_SUCCEEDED(rv) && bundleService) {
         nsCOMPtr<nsIStringBundle> brandBundle;
         rv = bundleService->CreateBundle(
-                    "chrome://global/locale/brand.properties",
+                    "chrome://branding/locale/brand.properties",
                     getter_AddRefs(brandBundle));
         if (NS_SUCCEEDED(rv)) {
             nsXPIDLString value;

modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp

@@ -197,7 +197,7 @@ nsIconChannel::InitWithGnome()
     NS_ASSERTION(bundleService, "String bundle service must be present!");
 
     nsCOMPtr<nsIStringBundle> bundle;
-    bundleService->CreateBundle("chrome://global/locale/brand.properties",
+    bundleService->CreateBundle("chrome://branding/locale/brand.properties",
                                 getter_AddRefs(bundle));
     nsXPIDLString appName;
 

modules/plugin/base/src/nsPluginHostImpl.cpp

@@ -247,7 +247,7 @@ PRLogModuleInfo* nsPluginLogging::gNPPLog = nsnull;
 PRLogModuleInfo* nsPluginLogging::gPluginLog = nsnull;
 #endif
 
-#define BRAND_PROPERTIES_URL "chrome://global/locale/brand.properties"
+#define BRAND_PROPERTIES_URL "chrome://branding/locale/brand.properties"
 #define PLUGIN_PROPERTIES_URL "chrome://global/locale/downloadProgress.properties"
 #define PLUGIN_REGIONAL_URL "chrome://global-region/locale/region.properties"
 

other-licenses/branding/firefox/Makefile.in

@@ -10,6 +10,11 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+DIRS = \
+	content \
+	locales \
+	$(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
 BROWSER_APP_FILES = \

other-licenses/branding/firefox/content/contents.rdf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:branding"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:branding"
+        chrome:name="branding" />
+</RDF:RDF>

other-licenses/branding/firefox/content/jar.mn

@@ -1,10 +1,7 @@
 browser.jar:
-+ content/browser/about.png                     (about.png)
+  content/branding/contents.rdf                  (contents.rdf)
-+ content/browser/aboutCredits.png              (aboutCredits.png)
+  content/branding/about.png                     (about.png)
-+ content/browser/aboutFooter.png               (aboutFooter.png)
+  content/branding/aboutCredits.png              (aboutCredits.png)
-+ content/browser/searchconfig.properties       (searchconfig.properties)
+  content/branding/aboutFooter.png               (aboutFooter.png)
-  
+  content/branding/searchconfig.properties       (searchconfig.properties)
-classic.jar:  
+  content/branding/icon64.png                    (icon64.png)
-+ skin/classic/global/icons/alert-exclam.png    (alert-exclam.png)
-+ skin/classic/mozapps/update/icon32.png        (icon32.png)
-  

other-licenses/branding/firefox/locales/Makefile.in

@@ -0,0 +1,47 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla Browser code.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <benjamin@smedbergs.us>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH          = ../../../..
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = other-licenses/branding/firefox/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD)
+
+include $(topsrcdir)/config/rules.mk

other-licenses/branding/firefox/locales/contents.rdf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+#filter substitution
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the locales being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:@AB_CD@"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:@AB_CD@">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:@AB_CD@:packages">
+        <RDF:li resource="urn:mozilla:locale:@AB_CD@:branding"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+</RDF:RDF>

other-licenses/branding/firefox/locales/jar.mn

@@ -0,0 +1,6 @@
+#filter substitution
+
+@AB_CD@.jar:
+* locale/branding/contents.rdf     (contents.rdf)
+  locale/branding/brand.dtd        (%brand.dtd)
+  locale/branding/brand.properties (%brand.properties)

other-licenses/branding/thunderbird/Makefile.in

@@ -10,6 +10,11 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+DIRS = \
+	content \
+	locales \
+	$(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
 MAIL_APP_FILES = \

other-licenses/branding/thunderbird/content/contents.rdf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:branding"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:branding"
+        chrome:name="branding" />
+</RDF:RDF>

other-licenses/branding/thunderbird/content/jar.mn

@@ -1,7 +1,6 @@
 messenger.jar:
-+ content/messenger/about-credits.png             (about-credits.png)
+  content/branding/contents.rdf                  (contents.rdf)
-+ content/messenger/about-thunderbird.png         (about-thunderbird.png)
+  content/branding/about-credits.png             (about-credits.png)
-+ content/messenger/thunderbird-wizard-badge.png  (thunderbird-wizard-badge.png)
+  content/branding/about-thunderbird.png         (about-thunderbird.png)
-  
+  content/branding/thunderbird-wizard-badge.png  (thunderbird-wizard-badge.png)
-en-US.jar:
+  content/branding/thunderbird-watermark.png     (thunderbird-watermark.png)
-+ locale/en-US/messenger/thunderbird-watermark.png (thunderbird-watermark.png)

other-licenses/branding/thunderbird/locales/Makefile.in

@@ -0,0 +1,49 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla Browser code.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <benjamin@smedbergs.us>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH          = ../../../..
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = other-licenses/branding/thunderbird/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+APP_VERSION = $(shell cat $(topsrcdir)/mail/config/version.txt)
+
+DEFINES += -DAB_CD=$(AB_CD) -DAPP_VERSION=$(APP_VERSION)
+
+include $(topsrcdir)/config/rules.mk

other-licenses/branding/thunderbird/locales/contents.rdf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+#filter substitution
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the locales being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:@AB_CD@"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:@AB_CD@">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:@AB_CD@:packages">
+        <RDF:li resource="urn:mozilla:locale:@AB_CD@:branding"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+</RDF:RDF>

other-licenses/branding/thunderbird/locales/jar.mn

@@ -0,0 +1,6 @@
+#filter substitution
+
+@AB_CD@.jar:
+* locale/branding/contents.rdf     (contents.rdf)
+* locale/branding/brand.dtd        (%brand.dtd)
+  locale/branding/brand.properties (%brand.properties)

profile/resources/content/profileSelection.xul

@@ -72,7 +72,7 @@
   <stringbundle id="bundle_profileManager"
                 src="chrome://communicator/locale/profile/profileManager.properties"/>
   <stringbundle id="bundle_brand"
-                src="chrome://global/locale/brand.properties"/>
+                src="chrome://branding/locale/brand.properties"/>
   
   <script type="application/x-javascript" src="chrome://communicator/content/profile/profileSelection.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/profile/profileManager.js"/>

profile/src/nsProfile.cpp

@@ -135,7 +135,7 @@
 
 const char* kDefaultOpenWindowParams = "centerscreen,chrome,modal,titlebar";
 
-const char* kBrandBundleURL = "chrome://global/locale/brand.properties";
+const char* kBrandBundleURL = "chrome://branding/locale/brand.properties";
 const char* kMigrationBundleURL = "chrome://communicator/locale/profile/migration.properties";
 
 // we want everyone to have the debugging info to the console for now

security/manager/pki/resources/content/serverCrlNextupdate.js

@@ -53,7 +53,7 @@ function onLoad()
   var isupport = pkiParams.getISupportAtIndex(1);
   var cert = isupport.QueryInterface(nsIX509Cert);
   var connectURL = dialogParams.GetString(1); 
-  var gBundleBrand = srGetStrBundle("chrome://global/locale/brand.properties");
+  var gBundleBrand = srGetStrBundle("chrome://branding/locale/brand.properties");
   var brandName = gBundleBrand.GetStringFromName("brandShortName");
 
   bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");

security/manager/ssl/src/nsNSSIOLayer.cpp

@@ -492,7 +492,7 @@ nsHandleSSLError(nsNSSSocketInfo *socketInfo, PRInt32 err)
   nsCOMPtr<nsIStringBundleService> service = 
                               do_GetService(StringBundleServiceCID, &rv);
   nsCOMPtr<nsIStringBundle> brandBundle;
-  service->CreateBundle("chrome://global/locale/brand.properties",
+  service->CreateBundle("chrome://branding/locale/brand.properties",
                         getter_AddRefs(brandBundle));
   nsXPIDLString brandShortName;
   brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(),