Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #240741 --> make shortBrandName really be the short name (Thunderbird) and fullBrandName be the full name (Mozilla Thunderbird). Clean up various elements in the UI to use the appropriate name.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@154994 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org 2004-04-16 21:50:48 +00:00
parent d1aa2c4ffc
commit c751812f52
8 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/mail/base/content/aboutDialog.xul
View File

@ -59,8 +59,8 @@
function onLoad() {
var versionField = document.getElementById("versionField");
var hidversionField = document.getElementById("hidversionField");
var brandShortNameEl = document.getElementById("brandShortName");
hidversionField.value = brandShortNameEl.firstChild.nodeValue + ' ' + navigator.vendorSub + ' (' + navigator.productSub + ')';
var brandFullNameEl = document.getElementById("brandFullName");
hidversionField.value = brandFullNameEl.firstChild.nodeValue + ' ' + navigator.vendorSub + ' (' + navigator.productSub + ')';
versionField.value = hidversionField.value;
versionField.width = hidversionField.width;
@ -139,6 +139,6 @@
<!-- Localizable strings (from .dtd) -->
<strings style="display:none;">
<string id="brandShortName">&brandShortName;</string>
<string id="brandFullName">&brandFullName;</string>
</strings>
</dialog>

3
mozilla/mail/base/locale/brand.dtd
View File

@ -1,4 +1,5 @@
#expand <!ENTITY lang.version "__MOZILLA_LOCALE_VERSION__">
<!ENTITY brandShortName "Mozilla Thunderbird">
<!ENTITY brandShortName "Thunderbird">
<!ENTITY brandFullName "Mozilla Thunderbird">
<!ENTITY vendorShortName "Mozilla Thunderbird">
<!ENTITY sidebarName "Sidebar">

1
mozilla/mail/base/locale/brand.properties
View File

@ -1,3 +1,4 @@
brandShortName=Mozilla Thunderbird
brandFullName=Mozilla Thunderbird
vendorShortName=Mozilla Thunderbird
sidebarName=Sidebar

6
mozilla/mail/base/locale/messenger.dtd
View File

@ -1,5 +1,5 @@
<!ENTITY messengerWindow.title "Mail &amp; Newsgroups">
<!ENTITY titledefault.label "&brandShortName;">
<!ENTITY titledefault.label "&brandFullName;">
<!ENTITY titleSeparator.label " - ">
<!-- File Menu -->
@ -396,9 +396,9 @@
<!ENTITY helpMenu.accesskey "H">
<!ENTITY releaseCmd.label "Release Notes">
<!ENTITY releaseCmd.accesskey "R">
<!ENTITY hintsAndTips.label "&brandShortName; Help">
<!ENTITY hintsAndTips.label "&brandFullName; Help">
<!ENTITY hintsAndTips.accesskey "h">
<!ENTITY aboutCmd.label "About &brandShortName;">
<!ENTITY aboutCmd.label "About &brandFullName;">
<!ENTITY aboutCmd.accesskey "A">
<!-- Mail Toolbar -->

5
mozilla/mail/base/locale/start.html
View File

@ -93,8 +93,9 @@ a:active, a:hover {
<li>Address Book</li>
</ul>
<h2>More Information</h2>
<p>For frequently asked questions, tips and general help, visit <a href="http://texturizer.net/thunderbird/">Mozilla Thunderbird Help</a>.</p>
<p>For product information, visit the <a href="http://www.mozilla.org/products/thunderbird/">Mozilla Thunderbird Product Page</a>.
<p>For frequently asked questions, tips and general help, visit <a href="http://texturizer.net/thunderbird/">Thunderbird Help</a>.
</p>
<p>For product information, visit the <a href="http://www.mozilla.org/products/thunderbird/">Thunderbird Product Page</a>.
<div id="gecko"><a href="http://www.mozilla.org/">Powered by Gecko.</a></div>
</div>

1
mozilla/mail/components/prefwindow/content/pref-mailnews.xul
View File

@ -25,6 +25,7 @@
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!DOCTYPE overlay [
<!ENTITY % brandingDTD SYSTEM "chrome://global/locale/brand.dtd" > %brandingDTD;
<!ENTITY % dtd1 SYSTEM "chrome://messenger/locale/pref-mailnews.dtd" > %dtd1;
<!ENTITY % dtd2 SYSTEM "chrome://messenger/locale/pref-notifications.dtd" > %dtd2;
]>

2
mozilla/mail/components/prefwindow/locale/pref-mailnews.dtd
View File

@ -7,7 +7,7 @@
<!ENTITY autounzip.label "Automatically expand zip files when saving attachments">
<!ENTITY autounzip.accesskey "A">
<!ENTITY messengerStartPage.label "Mail Start Page">
<!ENTITY enableStartPage.label "When Mail launches, show the Start Page in the message area">
<!ENTITY enableStartPage.label "When &brandShortName; launches, show the Start Page in the message area">
<!ENTITY enableStartPage.accesskey "W">
<!ENTITY location.label "Location:">
<!ENTITY location.accesskey "L">

4
mozilla/mail/components/prefwindow/locale/pref-mailnewsOverlay.dtd
View File

@ -1,5 +1,5 @@
<!ENTITY enableMapiTitle.label "When sending mail from other applications">
<!ENTITY enableMapi.label "Use &vendorShortName; as the default mail application">
<!ENTITY enableMapi.label "Use &brandShortName; as the default mail application">
<!ENTITY enableMapi.accesskey "u">
<!ENTITY enableNews.label "Use &vendorShortName; as the default news application">
<!ENTITY enableNews.label "Use &brandShortName; as the default news application">
<!ENTITY enableNews.accesskey "n">