# HG changeset patch
# User t_mrc-ct@users.osdn.jp
# Date 1468345170 -32400
#      Wed Jul 13 02:39:30 2016 +0900
# Branch THUNDERBIRD3880_2016050308_RELBRANCH
# Node ID 299fe272ba0d0f758b4ca313b9944dff4b3fd5f1
# Parent  09775e838bd5fbcd36dcfc885341bc9be8c9c523
branding change (v38.1.0 fix, mod38.9.0)

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
@@ -12,19 +12,21 @@
   if (aEvent.target != document)
     return;
 
   try {
     var distroId = Services.prefs.getCharPref("distribution.id");
     if (distroId) {
       var distroVersion = Services.prefs.getCharPref("distribution.version");
 
+/*
       var distroIdField = document.getElementById("distributionId");
       distroIdField.value = distroId + " - " + distroVersion;
       distroIdField.style.display = "block";
+*/
 
       try {
         // This is in its own try catch due to bug 895473 and bug 900925.
         var distroAbout = Services.prefs.getComplexValue("distribution.about",
           Components.interfaces.nsISupportsString);
         var distroField = document.getElementById("distribution");
         distroField.value = distroAbout;
         distroField.style.display = "block";
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">
@@ -103,33 +103,33 @@
               <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
           <vbox id="experimental" hidden="true">
             <description class="text-blurb" id="warningDesc">
               &warningDesc.version;
 #ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
               &warningDesc.telemetryDesc;
 #endif
             </description>
             <description class="text-blurb" id="communityExperimentalDesc">
-              &community.exp.start;<label class="text-link" href="http://www.mozilla.org/">&community.exp.mozillaLink;</label>&community.exp.middle;<label class="text-link" href="about:credits">&community.exp.creditsLink;</label>&community.exp.end;
+              &community.exp.start;<label class="text-link" href="http://www.mozilla.org/">&community.exp.mozillaLink;</label>&community.exp.middle;<label class="text-link" href="about:credits">&community.exp.creditsLink;</label>&community.exp.middle2;<label class="text-link" href="http://osdn.jp/projects/tenfourbird/">&community.exp.vendorLink;</label>&community.exp.end;
             </description>
           </vbox>
           <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.end3;
+            &community.start2;<label class="text-link" href="http://tenfourbird.osdn.jp/">&community.tenfourbirdLink;</label>&community.middle3;<label class="text-link" href="http://www.mozilla.org/projects/thunderbird">&community.thunderbirdLink;</label>&community.middle4;<label class="text-link" href="http://www.floodgap.com/software/tenfourfox/">&community.tenfourfoxLink;</label>&community.middle5;<label class="text-link" onclick="openURL('http://www.mozilla.org/');" oncommand="openUILink(this.getAttribute('href'), event);">&community.mozillaLink;</label>&community.middle6;<label class="text-link" onclick="openAboutTab('about:credits');">&community.creditsLink;</label>&community.middle7;<label class="text-link" href="http://osdn.jp/projects/tenfourbird/">&community.vendorLink;</label>&community.end3;
           </description>
           <description class="text-blurb" id="contributeDesc">
             &helpus.start;<label class="text-link" onclick="openUILink(this.getAttribute('href'), event)" href="https://donate.mozilla.org/thunderbird/about/">&helpus.donateLink;</label>&helpus.middle;<label class="text-link" onclick="openUILink(this.getAttribute('href'), event)" href="http://www.mozilla.org/contribute/" >&helpus.getInvolvedLink;</label>&helpus.end;
           </description>
        </vbox>
      </vbox>
     </hbox>
     <vbox id="bottomBox">
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
@@ -17,29 +17,39 @@
 <!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 <!ENTITY warningDesc.version        "&brandShortName; is experimental and may be unstable.">
 <!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
 <!ENTITY warningDesc.telemetryDesc  "It automatically sends information about performance, hardware, usage and customizations back to &vendorShortName; to help make &brandShortName; better.">
 
 <!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 <!ENTITY community.exp.start        "">
 <!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
-<!ENTITY community.exp.mozillaLink  "&vendorShortName;">
+<!ENTITY community.exp.mozillaLink  "Mozilla">
 <!ENTITY community.exp.middle       " is a ">
 <!-- LOCALIZATION NOTE (community.exp.creditslink): This is a link title that links to about:credits. -->
 <!ENTITY community.exp.creditsLink  "global community">
-<!ENTITY community.exp.end          " working together to keep the Web open, public and accessible to all.">
+<!ENTITY community.exp.middle2          " but ">
+<!ENTITY community.exp.vendorLink      "&vendorShortName;">
+<!ENTITY community.exp.end             " is a tiny community working together to keep the Web open, public and accessible to all of the PowerPC lovers.">
 
-<!ENTITY community.start2           "&brandShortName; is designed by ">
+<!ENTITY community.start2           "">
+<!ENTITY community.tenfourbirdLink  "&brandShortName;">
+<!ENTITY community.middle3         " is free software based on ">
+<!ENTITY community.thunderbirdLink   "Mozilla Thunderbird">
+<!ENTITY community.middle4          " and ">
+<!ENTITY community.tenfourfoxLink   "TenFourFox">
+<!ENTITY community.middle5          ". ">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
-<!ENTITY community.mozillaLink      "&vendorShortName;">
-<!ENTITY community.middle2          ", a ">
+<!ENTITY community.mozillaLink      "Mozilla">
+<!ENTITY community.middle6          " is a ">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
 <!ENTITY community.creditsLink      "global community">
-<!ENTITY community.end3             " working together to keep the Web open, public and accessible to all.">
+<!ENTITY community.middle7          " but ">
+<!ENTITY community.vendorLink      "&vendorShortName;">
+<!ENTITY community.end3             " is a tiny community working together to keep the Web open, public and accessible to all of the PowerPC lovers.">
 
 <!ENTITY helpus.start               "Want to help? ">
 <!-- LOCALIZATION NOTE (helpus.donateLink): This is a link title that links to the thunderbird donation page -->
 <!ENTITY helpus.donateLink          "Make a donation">
 <!ENTITY helpus.middle              " or ">
 <!-- LOCALIZATION NOTE (helpus.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
 <!ENTITY helpus.getInvolvedLink     "get involved!">
 <!ENTITY helpus.end                 "">
