# HG changeset patch
# User t_mrc-ct@users.osdn.jp
# Date 1439285305 -32400
#      Tue Aug 11 18:28:25 2015 +0900
# Node ID 3119b8a4c9cecb234836a1818606d868fa5d4383
# Parent  d8254f639e769b9835a38605e32fadf15541c872
patch for Tenfourbird 24 (v38.0 fix)

diff --git a/mail/chrome/messenger/aboutDialog.dtd b/mail/chrome/messenger/aboutDialog.dtd
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -12,36 +12,46 @@
 <!ENTITY update.updateButton.accesskey            "R">
 <!ENTITY update.applyButtonBillboard.label        "Apply Update…">
 <!ENTITY update.applyButtonBillboard.accesskey    "A">
 
 
 <!-- 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 customisations back to &vendorShortName; to help make &brandShortName; better.">
+<!ENTITY warningDesc.telemetryDesc  "It automatically sends information about performance, hardware, usage and customisations back to Mozilla to help make Thunderbird 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          " working together to keep the Web open, public and accessible to all.">
+<!ENTITY community.exp.vendorLink      "&vendorShortName;">
+<!ENTITY community.exp.end             " is working to keep the PowerPC Macs.">
 
-<!ENTITY community.start2           "&brandShortName; is designed by ">
+<!ENTITY community.start2           "">
+<!ENTITY community.tenfourbirdLink  "&brandShortName;">
+<!ENTITY community.middle3          " is 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          " working together to keep the Web open, public and accessible to all.">
+<!ENTITY community.vendorLink      "&vendorShortName;">
+<!ENTITY community.end3             " is working to keep PowerPC Macs.">
 
-<!ENTITY helpus.start               "Want to help? ">
+<!ENTITY helpus.start               "Want to help Mozilla? ">
 <!-- 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                 "">
 
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
diff --git a/other-licenses/branding/thunderbird/brand.dtd b/other-licenses/branding/thunderbird/brand.dtd
--- a/other-licenses/branding/thunderbird/brand.dtd
+++ b/other-licenses/branding/thunderbird/brand.dtd
@@ -1,9 +1,9 @@
 <!-- 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        "Thunderbird">
-<!ENTITY  brandFullName         "Mozilla Thunderbird">
-<!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  brandShortName        "Tenfourbird">
+<!ENTITY  brandFullName         "Tenfourbird">
+<!ENTITY  vendorShortName       "Tenfourbird Project">
 <!ENTITY  trademarkInfo.part1   "Mozilla Thunderbird and the Thunderbird logos
                                  are trademarks of the Mozilla Foundation.">
diff --git a/other-licenses/branding/thunderbird/brand.properties b/other-licenses/branding/thunderbird/brand.properties
--- a/other-licenses/branding/thunderbird/brand.properties
+++ b/other-licenses/branding/thunderbird/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=Thunderbird
-brandFullName=Mozilla Thunderbird
-vendorShortName=Mozilla
+brandShortName=Tenfourbird
+brandFullName=Tenfourbird
+vendorShortName=Tenfourbird Project
