Commit 2fcd7061 authored by Phil Ringnalda's avatar Phil Ringnalda
Browse files

Bug 536336 - Remove copyright strings in UI, r=gavin,handerson

--HG--
extra : rebase_source : 1192b1774627677a6a5dd9faa800c436361c987d
parent 14359075
......@@ -47,7 +47,6 @@ SourceRepository=@MOZ_SOURCE_REPO@
#ifdef MOZ_SOURCE_STAMP
SourceStamp=@MOZ_SOURCE_STAMP@
#endif
Copyright=Copyright (c) 1998 - 2010 mozilla.org
ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
[Gecko]
......
......@@ -74,7 +74,7 @@
<key>CFBundleExecutable</key>
<string>firefox-bin</string>
<key>CFBundleGetInfoString</key>
<string>%APP_NAME% %APP_VERSION%, © 1998-2010 Contributors</string>
<string>%APP_NAME% %APP_VERSION%</string>
<key>CFBundleIconFile</key>
<string>firefox</string>
<key>CFBundleIdentifier</key>
......
......@@ -85,10 +85,9 @@
<label id="distribution"/>
<label id="distributionId"/>
<description id="copyright">
&copyrightInfo1;<label
<label
class="text-link" href="&licenseLink;"
>&licenseLinkText;</label>&copyrightInfo2;
&logoCopyright;
>&licenseLinkText;</label>&licenseLinkSuffix;&logoTrademark;
</description>
<textbox id="userAgent" multiline="true" readonly="true" flex="1"/>
</vbox>
......
......@@ -44,8 +44,6 @@
%brandDTD;
<!ENTITY % creditsDTD SYSTEM "chrome://browser/locale/credits.dtd">
%creditsDTD;
<!ENTITY % licenseDTD SYSTEM "chrome://global/locale/license.dtd">
%licenseDTD;
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
%globalDTD;
]
......@@ -621,13 +619,6 @@
<p id="gecko" class="center" dir="&locale.dir;">&credit.poweredByGeckoReg;</p>
<p class="footnote" dir="&locale.dir;">
&brandFullName;&trade; &license.part0; &copy;1998-2010 &license.part1;
<a href="" link="about:credits" onclick="visitLink(event);">&license.contrib;</a>,
&license.part2;
<a href="" link="about:license" onclick="visitLink(event);">about:license</a>
&license.part3;</p>
<p class="footnote">
Mozilla Firefox&reg; and the Firefox logo are registered trademarks of the
Mozilla Foundation. You are not granted rights or licenses to the trademarks
......
<!ENTITY brandShortName "Minefield">
<!ENTITY brandFullName "Minefield">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY logoCopyright " ">
<!ENTITY logoTrademark " ">
<!ENTITY brandShortName "Namoroka">
<!ENTITY brandFullName "Namoroka">
<!ENTITY vendorShortName "mozilla.org">
<!ENTITY logoCopyright " ">
<!ENTITY logoTrademark " ">
<!-- LOCALIZATION NOTE (releaseBaseURL): The about: page appends __MOZ_APP_VERSION__.html, e.g. 2.0.html -->
<!ENTITY releaseBaseURL "http://www.mozilla.org/projects/namoroka/releases/">
......@@ -7,7 +7,6 @@
<!ENTITY aboutVersion "version">
<!ENTITY closeCmdGNOME.label "Close">
<!ENTITY closeCmdGNOME.accesskey "C">
<!ENTITY copyrightInfo1 "&#169;1998-2010 Contributors. All rights reserved. (">
<!ENTITY licenseLink "about:license">
<!ENTITY licenseLinkText "Licensing information">
<!ENTITY copyrightInfo2 ").">
<!ENTITY licenseLinkSuffix ".">
<!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.">
<!-- LOCALIZATION NOTE (logoTrademark): note that there is no space between licenseLinkText (and its trailing licenseLinkSuffix entity) and this entity, so if your locale needs a space between sentences, you need to put it at the start of this entity. -->
<!ENTITY logoTrademark " Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
......@@ -66,7 +66,7 @@
</div>
<ul id="aboutPageList">
<li>&about.copy.beforeLink; <a href="about:credits">&about.copy.linkTitle;</a> &about.copy.afterLink;</li>
<li>&about.credits.beforeLink;<a href="about:credits">&about.credits.linkTitle;</a>&about.credits.afterLink;</li>
<li>&about.license.beforeLink; <a href="about:license">&about.license.linkTitle;</a> &about.license.afterLink;</li>
<!-- Release notes link removed pending fix for bug 349985
<li>&about.relnotes.beforeLink; <a id="releaseNotesURL" href="">&about.relnotes.linkTitle;</a> &about.relnotes.afterLink;</li>
......
<!ENTITY about.version "version">
<!ENTITY about.copy.beforeLink "Copyright &copy; 1998-2010 by">
<!ENTITY about.copy.linkTitle "contributors">
<!ENTITY about.copy.afterLink "to the Mozilla Project.">
<!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
<!ENTITY about.credits.beforeLink "See a list of ">
<!ENTITY about.credits.linkTitle "contributors">
<!-- LOCALIZATION NOTE (about.credits.afterLink): note that there is no space between the linked about.credits.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
<!ENTITY about.credits.afterLink " to the Mozilla Project.">
<!ENTITY about.license.beforeLink "Read the">
<!ENTITY about.license.linkTitle "licensing information">
......
<!ENTITY license.part0 "is copyright">
<!ENTITY license.part1 "by its">
<!ENTITY license.contrib "contributors">
<!ENTITY license.part2 "according to terms set out in the">
<!ENTITY license.part3 "document. All Rights Reserved.">
......@@ -59,7 +59,5 @@ Contributors:
&quot;page&quot; will likely return more topics than you want.</li>
</ul>
<p>Copyright &copy; 2003-2010 Contributors to the Mozilla project.</p>
</body>
</html>
......@@ -37,7 +37,6 @@
+ locale/@AB_CD@/global/intl.properties (%chrome/global/intl.properties)
+ locale/@AB_CD@/global/keys.properties (%chrome/global/keys.properties)
+ locale/@AB_CD@/global/languageNames.properties (%chrome/global/languageNames.properties)
locale/@AB_CD@/global/license.dtd (%chrome/global/license.dtd)
locale/@AB_CD@/global/mozilla.dtd (%chrome/global/mozilla.dtd)
locale/@AB_CD@/global/notification.dtd (%chrome/global/notification.dtd)
locale/@AB_CD@/global/preferences.dtd (%chrome/global/preferences.dtd)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment