# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1403431891 -32400
# Branch GECKO310b2_2014070404_RELBRANCH
# Node ID 775adac77f386e45091dfc332667144756c6abcc
# Parent  0317148b4dbc2b611fd026c3776f364792138960
branding change

diff --git a/mail/base/content/aboutDialog.js b/mail/base/content/aboutDialog.js
--- a/mail/base/content/aboutDialog.js
+++ b/mail/base/content/aboutDialog.js
@@ -17,19 +17,21 @@
       var distroVersion = Services.prefs.getCharPref("distribution.version");
       var distroAbout = Services.prefs.getComplexValue("distribution.about",
         Components.interfaces.nsISupportsString);
 
       var distroField = document.getElementById("distribution");
       distroField.value = distroAbout;
       distroField.style.display = "block";
 
+/*
       var distroIdField = document.getElementById("distributionId");
       distroIdField.value = distroId + " - " + distroVersion;
       distroIdField.style.display = "block";
+*/
     }
   }
   catch (e) {
     // Pref is unset
   }
 
   // XXX FIXME
   // Include the build ID if this is an "a#" (nightly or aurora) build
diff --git a/mail/base/content/aboutDialog.xul b/mail/base/content/aboutDialog.xul
--- a/mail/base/content/aboutDialog.xul
+++ b/mail/base/content/aboutDialog.xul
@@ -36,17 +36,17 @@
   <script type="application/javascript" src="chrome://messenger/content/specialTabs.js"/>
   <!-- This one is for openURL -->
   <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
   <vbox id="aboutDialogContainer">
     <hbox id="clientBox">
       <vbox id="leftBox" flex="1"/>
       <vbox id="rightBox" flex="1">
-#expand <label id="version">__MOZ_APP_VERSION__</label>
+#expand <label id="version" value="__MOZ_APP_VERSION__"/>
         <label id="distribution" class="text-blurb"/>
         <label id="distributionId" class="text-blurb"/>
 
         <vbox id="detailsBox">
           <vbox id="updateBox">
 #ifdef MOZ_UPDATER
             <deck id="updateDeck" orient="vertical">
               <hbox id="checkForUpdates" align="center">
@@ -99,26 +99,26 @@
               </hbox>
               <hbox id="unsupportedSystem" align="center">
                 <label>&update.unsupported.start;</label><label id="unsupportedLink" class="text-link">&update.unsupported.linkText;</label><label>&update.unsupported.end;</label>
               </hbox>
             </deck>
 #endif
           </vbox>
 #ifdef MOZ_UPDATER
-          <description class="text-blurb" id="currentChannelText">
+          <description class="text-blurb" id="currentChannelText" hidden="true">
             &channel.description.start;<label id="currentChannel"/>&channel.description.end;
           </description>
 #endif
           <description class="text-blurb" id="communityDesc">
-            &community.start2;<label class="text-link" onclick="openURL('http://www.mozilla.org/');" oncommand="openUILink(this.getAttribute('href'), event);">&community.mozillaLink;</label>&community.middle2;<label class="text-link" onclick="openAboutTab('about:credits');">&community.creditsLink;</label>&community.end2;
+            &community.start2;<label class="text-link" onclick="openURL('http://tenfourbird.sourceforge.jp/');">&community.tenfourbirdLink;</label>&community.middle2a;<label class="text-link" onclick="openURL('http://www.mozilla.org/projects/thunderbird/');">&community.mozillaLink;</label>&community.middle2b;<label class="text-link" onclick="openURL('http://www.floodgap.com/software/tenfourfox/');">&community.tenfourfoxLink;</label>&community.end2;
           </description>
-          <description class="text-blurb" id="contributeDesc">
+          <!--<description class="text-blurb" id="contributeDesc">
             &contribute.start;<label class="text-link" onclick="openURL('http://www.mozilla.org/contribute/');">&contribute.getInvolvedLink;</label>&contribute.end;
-          </description>
+          </description>-->
        </vbox>
      </vbox>
     </hbox>
     <vbox id="bottomBox">
       <hbox pack="center">
         <label class="text-link bottom-link" onclick="openAboutTab('about:license');">&bottomLinks.license;</label>
         <label class="text-link bottom-link" onclick="openAboutTab('about:rights');">&bottomLinks.rights;</label>
         <label class="text-link bottom-link" onclick="openURL('https://www.mozilla.org/en-US/thunderbird/legal/privacy/');">&bottomLinks.privacy;</label>
diff --git a/mail/base/content/overrides/app-license.html b/mail/base/content/overrides/app-license.html
--- a/mail/base/content/overrides/app-license.html
+++ b/mail/base/content/overrides/app-license.html
@@ -1,3 +1,3 @@
-    <p><b>Binaries</b> of this product have been made available to you by the
-    <a href="http://www.mozilla.org/">Mozilla Project</a> under the Mozilla
+    <p><b>Binaries</b> of this product may have been made available to you by
+    <a href="http://tenfourbird.sourceforge.jp/">Tenfourbird Project</a> under the Mozilla
     Public License. <a href="about:rights">Know your rights</a>.</p>
diff --git a/mail/branding/aurora/configure.sh b/mail/branding/aurora/configure.sh
--- a/mail/branding/aurora/configure.sh
+++ b/mail/branding/aurora/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=Earlybird
+MOZ_APP_DISPLAYNAME=Tenfourbird
diff --git a/mail/branding/aurora/locales/en-US/brand.dtd b/mail/branding/aurora/locales/en-US/brand.dtd
--- a/mail/branding/aurora/locales/en-US/brand.dtd
+++ b/mail/branding/aurora/locales/en-US/brand.dtd
@@ -1,8 +1,8 @@
 <!-- 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  brandShortName        "Earlybird">
-<!ENTITY  brandFullName         "Earlybird">
-<!ENTITY  vendorShortName       "mozilla.org">
+<!ENTITY  brandShortName        "Tenfourbird">
+<!ENTITY  brandFullName         "Tenfourbird">
+<!ENTITY  vendorShortName       "Tenfourbird Project">
 <!ENTITY  trademarkInfo.part1   " ">
diff --git a/mail/branding/aurora/locales/en-US/brand.properties b/mail/branding/aurora/locales/en-US/brand.properties
--- a/mail/branding/aurora/locales/en-US/brand.properties
+++ b/mail/branding/aurora/locales/en-US/brand.properties
@@ -1,7 +1,7 @@
 # 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/.
 
-brandShortName=Earlybird
-brandFullName=Earlybird
-vendorShortName=mozilla.org
+brandShortName=Tenfourbird
+brandFullName=Tenfourbird
+vendorShortName=Tenfourbird Project
diff --git a/mail/branding/aurora/thunderbird-branding.js b/mail/branding/aurora/thunderbird-branding.js
--- a/mail/branding/aurora/thunderbird-branding.js
+++ b/mail/branding/aurora/thunderbird-branding.js
@@ -14,9 +14,9 @@
 
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 60);
 
 // Give the user x seconds to react before showing the big UI. default=24 hours
 pref("app.update.promptWaitTime", 86400);
 
-pref("app.vendorURL", "http://www.mozilla.org/projects/%APP%/");
+pref("app.vendorURL", "http://tenfourbird.sourceforge.jp/");
diff --git a/mail/locales/en-US/chrome/messenger/aboutDialog.dtd b/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
--- a/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
+++ b/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
@@ -8,23 +8,23 @@
 -->
 <!ENTITY update.checkForUpdatesButton.label       "Check for Updates">
 <!ENTITY update.checkForUpdatesButton.accesskey   "C">
 <!ENTITY update.updateButton.label                "Restart to Update">
 <!ENTITY update.updateButton.accesskey            "R">
 <!ENTITY update.applyButtonBillboard.label        "Apply Update…">
 <!ENTITY update.applyButtonBillboard.accesskey    "A">
 
-<!ENTITY community.start2           "&brandShortName; is designed by ">
-<!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
-<!ENTITY community.mozillaLink      "&vendorShortName;">
-<!ENTITY community.middle2          ", a ">
-<!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
-<!ENTITY community.creditsLink      "global community">
-<!ENTITY community.end2             " working together to make the Internet better. We believe that the Internet should be open, public, and accessible to everyone without any restrictions.">
+<!ENTITY community.start2           "">
+<!ENTITY community.tenfourbirdLink  "&brandShortName;">
+<!ENTITY community.middle2a         " is free software based on ">
+<!ENTITY community.mozillaLink      "Mozilla Thunderbird">
+<!ENTITY community.middle2b         " and ">
+<!ENTITY community.tenfourfoxLink   "TenFourFox">
+<!ENTITY community.end2             ". We believe that the Internet should be open, public, and accessible to everyone including outdated one without any restrictions.">
 
 <!ENTITY contribute.start           "Sound interesting? ">
 <!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
 <!ENTITY contribute.getInvolvedLink "Get involved!">
 <!ENTITY contribute.end             "">
 
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "Licensing Information">
