Bug 415128: fix Help->About copyright notice to mention licensing information, and remove references to logo copyright in non-branded builds, r=gavin, a=beltzner

This commit is contained in:
Gervase Markham 2009-01-02 00:36:07 -05:00
parent d46fa1ae1a
commit eb9081f1b2
6 changed files with 21 additions and 5 deletions

View File

@ -7,7 +7,7 @@
}
#modes {
min-height: 380px;
min-height: 400px;
}
#clientBox {
@ -91,3 +91,10 @@ button[dlgtype="extra2"] {
button[dlgtype="accept"] {
-moz-margin-end: 13px;
}
.text-link,
.text-link:focus {
margin: 0px;
padding: 0px;
border: 0px;
}

View File

@ -83,7 +83,12 @@
#expand <label id="version" value="&aboutVersion; __MOZ_APP_VERSION__"/>
<label id="distribution"/>
<label id="distributionId"/>
<description id="copyright">&copyrightInfo;</description>
<description id="copyright">
&copyrightInfo1;<label
class="text-link" href="&licenseLink;"
>&licenseLinkText;</label>&copyrightInfo2;
&logoCopyright;
</description>
<textbox id="userAgent" multiline="true" readonly="true" flex="1"/>
</vbox>
<vbox flex="1" id="creditsBox">

View File

@ -1,6 +1,7 @@
<!ENTITY brandShortName "Shiretoko">
<!ENTITY brandFullName "Shiretoko">
<!ENTITY vendorShortName "mozilla.org">
<!ENTITY logoCopyright " ">
<!-- LOCALIZATION NOTE (releaseBaseURL): The about: page appends __MOZ_APP_VERSION__.html, e.g. 2.0.html -->
<!ENTITY releaseBaseURL "http://www.mozilla.org/projects/shiretoko/releases/">

View File

@ -1,3 +1,4 @@
<!ENTITY brandShortName "Minefield">
<!ENTITY brandFullName "Minefield">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY logoCopyright " ">

View File

@ -7,6 +7,7 @@
<!ENTITY aboutVersion "version">
<!ENTITY closeCmdGNOME.label "Close">
<!ENTITY closeCmdGNOME.accesskey "C">
<!ENTITY copyrightInfo "&#169;1998-2009 Contributors. All Rights Reserved. Firefox and the
Firefox logos are trademarks of the Mozilla Foundation. All rights
reserved.">
<!ENTITY copyrightInfo1 "&#169;1998-2009 Contributors. All rights reserved. (">
<!ENTITY licenseLink "about:license">
<!ENTITY licenseLinkText "Licensing information">
<!ENTITY copyrightInfo2 ").">

View File

@ -1,3 +1,4 @@
<!ENTITY brandShortName "Firefox">
<!ENTITY brandFullName "Mozilla Firefox">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY logoCopyright "Firefox and the Firefox logos are trademarks of the Mozilla Foundation. All rights reserved.">