Bug 551585 Remove copyright strings in UI. r=Standard8
authorAlexander L. Slovesnik <unghost@mozilla-russia.org>
Mon, 29 Mar 2010 16:00:39 +0100
changeset 5312 3edb03b2a5568720867c5c3a5ee758453df03538
parent 5311 4e9d373dfab1848bdeda1c2ee41fd827d48513ec
child 5313 09f9b08324d0bbb0d6c9d7be2b26b9f7977b7274
push id4096
push userbugzilla@standard8.plus.com
push dateMon, 29 Mar 2010 15:07:40 +0000
treeherdercomm-central@1491c4169057 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs551585
Bug 551585 Remove copyright strings in UI. r=Standard8
mail/app/application.ini
mail/app/macbuild/Contents/Info.plist.in
mail/base/content/aboutDialog.css
mail/base/content/aboutDialog.xul
mail/branding/nightly/locales/en-US/brand.dtd
mail/branding/unofficial/locales/en-US/brand.dtd
mail/locales/en-US/chrome/messenger/aboutDialog.dtd
other-licenses/branding/thunderbird/locales/en-US/brand.dtd
--- a/mail/app/application.ini
+++ b/mail/app/application.ini
@@ -41,17 +41,16 @@ Name=Thunderbird
 Version=@APP_VERSION@
 BuildID=@GRE_BUILDID@
 #ifdef MOZ_SOURCE_REPO
 SourceRepository=@MOZ_SOURCE_REPO@
 #endif
 #ifdef MOZ_SOURCE_STAMP
 SourceStamp=@MOZ_SOURCE_STAMP@
 #endif
-Copyright=Copyright (c) 1998-2010 mozilla.org
 ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 
 [Gecko]
 MinVersion=@GRE_MILESTONE@
 MaxVersion=@GRE_MILESTONE@
 
 [XRE]
 EnableProfileMigrator=1
--- a/mail/app/macbuild/Contents/Info.plist.in
+++ b/mail/app/macbuild/Contents/Info.plist.in
@@ -2,17 +2,17 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>thunderbird-bin</string>
 	<key>CFBundleGetInfoString</key>
-	<string>%APP_NAME% %APP_VERSION%, © 1998-2010 Contributors</string>
+	<string>%APP_NAME% %APP_VERSION%</string>
 	<key>CFBundleIconFile</key>
 	<string>thunderbird</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.mozilla.thunderbird</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>%APP_NAME%</string>
--- a/mail/base/content/aboutDialog.css
+++ b/mail/base/content/aboutDialog.css
@@ -6,16 +6,21 @@
   width: 298px;
 }
 
 #modes {
   min-height: 380px;
 }
 
 #clientBox {
+  /* XXX Add a min-width almost equal to chrome://branding/content/about.png's
+   * width, to maintain the dialog layout, and not have white lines down the
+   * side.
+   */
+  min-width: 298px;
   background-color: #FFFFFF;
   background-image: url("about:logo");
   background-repeat: no-repeat;
   padding-top: 216px;
   color: #000000;
 }
 
 #userAgent {
--- a/mail/base/content/aboutDialog.xul
+++ b/mail/base/content/aboutDialog.xul
@@ -58,17 +58,17 @@
         title="&aboutDialog.title;">
 
     <script type="application/javascript"
             src="chrome://messenger/content/aboutDialog.js"/>
 
     <deck id="modes" flex="1">
       <vbox flex="1" id="clientBox">
 #expand <label id="versionField" value="&aboutVersion; __MOZ_APP_VERSION__"/>
-        <description id="copyright">&copyrightText;</description>
+        <description id="copyright">&logoTrademark;</description>
         <textbox id="userAgent" multiline="true" readonly="true" flex="1"/>
       </vbox>
 
       <vbox flex="1" id="creditsBox">
         <iframe id="creditsIframe" flex="1"/>
       </vbox>
     </deck>
     <separator class="groove" id="groove"/>
--- a/mail/branding/nightly/locales/en-US/brand.dtd
+++ b/mail/branding/nightly/locales/en-US/brand.dtd
@@ -1,3 +1,4 @@
 <!ENTITY  brandShortName        "Shredder">
 <!ENTITY  brandFullName         "Shredder">
 <!ENTITY  vendorShortName       "mozilla.org">
+<!ENTITY  logoTrademark         " ">
--- a/mail/branding/unofficial/locales/en-US/brand.dtd
+++ b/mail/branding/unofficial/locales/en-US/brand.dtd
@@ -1,3 +1,4 @@
 <!ENTITY  brandShortName        "Lanikai">
 <!ENTITY  brandFullName         "Lanikai">
 <!ENTITY  vendorShortName       "mozilla.org">
+<!ENTITY  logoTrademark         " ">
--- a/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
+++ b/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
@@ -1,15 +1,12 @@
 <!ENTITY aboutDialog.title      "About &brandFullName;">
 <!ENTITY aboutButton.label      "&lt; Back">
 <!ENTITY aboutButton.accesskey  "B">
 <!ENTITY aboutVersion           "version">
-<!ENTITY copyrightText          "&#169;1998-2010 Contributors. All Rights Reserved. Mozilla Thunderbird and the 
-                                 Thunderbird logos are trademarks of the Mozilla Foundation.  All rights 
-                                 reserved.">
 <!ENTITY aboutMenu.label        "About">
 <!ENTITY aboutMenu.accesskey    "A">
 <!ENTITY aboutCredits.label     "Credits">
 <!ENTITY aboutCredits.accesskey "C">
 <!ENTITY aboutRights.label      "Your Rights">
 <!ENTITY aboutRights.accesskey  "R">
 <!ENTITY aboutContributors.label "Contributors">
 <!ENTITY aboutContributors.accesskey "o">
--- a/other-licenses/branding/thunderbird/locales/en-US/brand.dtd
+++ b/other-licenses/branding/thunderbird/locales/en-US/brand.dtd
@@ -1,3 +1,5 @@
 <!ENTITY  brandShortName        "Thunderbird">
 <!ENTITY  brandFullName         "Mozilla Thunderbird">
 <!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  logoTrademark         "Mozilla Thunderbird and the Thunderbird logos
+                                 are trademarks of the Mozilla Foundation.">