--- a/suite/app/application.ini
+++ b/suite/app/application.ini
@@ -42,17 +42,16 @@ Name=SeaMonkey
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={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
[Gecko]
MinVersion=@GRE_MILESTONE@
MaxVersion=@GRE_MILESTONE@
[XRE]
EnableProfileMigrator=1
--- a/suite/app/macbuild/Contents/Info.plist.in
+++ b/suite/app/macbuild/Contents/Info.plist.in
@@ -18,19 +18,17 @@
<string>APPL</string>
<key>CFBundleSignature</key>
<string>MOZZ</string>
<key>CFBundleIconFile</key>
<string>seamonkey.icns</string>
<key>CFBundleShortVersionString</key>
<string>@MOZ_APP_VERSION@</string>
<key>CFBundleGetInfoString</key>
- <string>@MOZ_APP_DISPLAYNAME@ @MOZ_APP_VERSION@, Copyright © 1998-2010 Contributors to the Mozilla project</string>
- <key>NSHumanReadableCopyright</key>
- <string>Copyright © 1998-2010 Contributors to the Mozilla project</string>
+ <string>@MOZ_APP_DISPLAYNAME@ @MOZ_APP_VERSION@</string>
<key>NSAppleScriptEnabled</key>
<true/>
<key>CGDisableCoalescedUpdates</key>
<true/>
<key>CFBundleDocumentTypes</key>
<array>
<!--Updated Metadata begins here-->
--- a/suite/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
+++ b/suite/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
@@ -1,4 +1,3 @@
/* Localized versions of Info.plist keys */
CFBundleName = "@MOZ_APP_DISPLAYNAME@";
-NSHumanReadableCopyright = "Copyright © 1998-2010 Contributors to the Mozilla project";
--- a/suite/locales/en-US/chrome/branding/brand.dtd
+++ b/suite/locales/en-US/chrome/branding/brand.dtd
@@ -1,5 +1,4 @@
<!ENTITY brandFullName "SeaMonkey">
<!ENTITY brandShortName "SeaMonkey">
<!ENTITY vendorShortName "SeaMonkey">
<!ENTITY sidebarName "Sidebar">
-<!ENTITY copyright.string "Copyright © 2003-2010 Contributors to the Mozilla project.">
--- a/suite/locales/en-US/chrome/common/help/cert_dialog_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cert_dialog_help.xhtml
@@ -482,12 +482,10 @@
name for a website certificate matches the website's actual host name.
If you choose to continue you need to <a href="#add_security_exception">add
a security exception</a>.</p>
<p>If you decide to accept the certificate anyway (either for this session or
permanently), you should be cautious about what you do on the website, and you
should treat any information you find there as potentially suspect.</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/certs_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/certs_help.xhtml
@@ -410,12 +410,10 @@
module, both the module and its security devices are no longer available
for use by the browser.</li>
<li><strong>Enable FIPS</strong>: Turns the FIPS mode on and off. For more
information, see
<a href="using_certs_help.xhtml#enable_fips_mode">Enable FIPS
Mode</a>.</li>
</ul>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/certs_prefs_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/certs_prefs_help.xhtml
@@ -75,13 +75,10 @@
<p>A security device is a hardware or software device that stores your
certificates and keys. For example, a smart card is a security device. Your
browser has its own built-in software security device, and you can use
additional security devices, such as smart cards, at the same time.</p>
<p>To examine or configure your security devices, click Manage Security
Devices.</p>
-
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/composer_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/composer_help.xhtml
@@ -2485,12 +2485,10 @@
<p>To change the author name for an individual page: Open the Format menu and
choose Page Title and Properties.</p>
<p>To change the page colors and background image for an individual page: Open
the Format menu and choose Page Colors and Background.</p>
<p>[<a href="#composer_preferences">Return to beginning of section</a>]</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -496,12 +496,10 @@
(in milliseconds) between the flashes.</li>
<li><strong>Invert Color</strong>: Check this option to paint the
selected element with the inverted border color. This will cause the
whole element—including its border—to flash.</li>
</ul>
</li>
</ul>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -231,12 +231,10 @@
image specified</strong>: Allow you to choose displayed colors,
ignoring the web page colors and background image.</li>
</ul>
</li>
</ul>
<p>[<a href="#appearance_preferences">Return to beginning of section</a>]</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -652,12 +652,10 @@
</ul>
<p>For more information about downloading files from web pages, see
<a href= "nav_help.xhtml#plugins_and_downloads">Plugins and
Downloads</a>.</p>
<p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/cs_priv_prefs_popup.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_priv_prefs_popup.xhtml
@@ -136,12 +136,10 @@
Similarly you can use the notification bar to allow popups from the current
website or open the list of allowed websites through Manage Popups. Just
click the Preferences button at the right end of the notification bar.</p>
<p><strong>Note</strong>: Blocking popups may not always work and may interfere
with some websites. For more information about blocking popups, see
<a href="#controlling_popups">Controlling Popups</a>.</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/customize_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/customize_help.xhtml
@@ -1412,12 +1412,10 @@
<li>Click the Appearance category.</li>
<li>Select the components you want opened automatically each time you start
&brandShortName;.</li>
</ol>
<p>[<a href="#specifying_how_mozilla_starts_up">Return to beginning of
section</a>]</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/developer_tools.xhtml
+++ b/suite/locales/en-US/chrome/common/help/developer_tools.xhtml
@@ -66,12 +66,10 @@
<li><a href="http://www.webreference.com/programming/javascript/venkman/">Debugging
JavaScript Using Venkman</a> (webreference.com, article series)</li>
<li><a href="http://www.hacksrus.com/~ginda/venkman/">Venkman Development
Homepage</a></li>
</ul>
</li>
</ul>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/forieusers.xhtml
+++ b/suite/locales/en-US/chrome/common/help/forieusers.xhtml
@@ -135,12 +135,10 @@
<h2 id="keyboard_shortcuts">Keyboard Shortcuts</h2>
<p>You will notice that Microsoft Internet Explorer and &brandShortName;
share many of the same shortcut keys. For a full list of shortcut keys, see
the List of <a href="shortcuts.xhtml">&brandShortName; Keyboard
Shortcuts</a>.</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/glossary.xhtml
+++ b/suite/locales/en-US/chrome/common/help/glossary.xhtml
@@ -776,12 +776,10 @@
language used to convert an XML document into another XML document or into
some other format.</dd>
<dt id="xul">XUL (XML User Interface Language)</dt><dd>A XML markup language
for creating user interfaces in applications.</dd>
</dl>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/help_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/help_help.xhtml
@@ -99,12 +99,10 @@
&brandShortName;; this is not a general Internet search.</li>
<li>Try to broaden your search—don't be too specific; terms
could be worded differently than your search.</li>
<li>At the same time, you should avoid being too broad with your
search terms: a word like <q>web</q> will probably return far too
many hits.</li>
</ul>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/mail_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mail_help.xhtml
@@ -5593,12 +5593,10 @@ to filter unwanted mail, and how phishin
</ul>
<p>See <a href="#working_offline">Working Offline</a> for information on
working offline.</p>
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
section</a>]</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/mail_sec_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mail_sec_help.xhtml
@@ -443,12 +443,10 @@
will not be able to decrypt the message.</li>
</ul>
</li>
</ul>
<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
section</a>]</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/nav_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/nav_help.xhtml
@@ -1575,12 +1575,10 @@
character [*] cannot be used.</p>
<p>For more information on using the Proxy preferences panel, see
<a href="cs_nav_prefs_advanced.xhtml#proxies">Advanced Preferences -
Proxies</a>.</p>
<p>[<a href="#proxies">Return to beginning of section</a>]</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/page_info_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/page_info_help.xhtml
@@ -257,12 +257,10 @@
credit card number.</p>
<p>You can quickly check the encryption status of a web page by noting the
state of the lock icon at the bottom-right corner of the browser window. For
more details, see
<a href="using_certs_help.xhtml#checking_security_for_a_web_page">Checking
Security for a Web Page</a>.</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/passwords_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/passwords_help.xhtml
@@ -435,12 +435,10 @@
<li>Never give the password out to anyone.</li>
<li>If someone has learnt your password, change it immediately.</li>
<li>Every few months, change your password.</li>
<li>Choose a password you can remember so you don't have to write it
down.</li>
<li>Avoid letting people observe you typing your password.</li>
</ul>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/privacy_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/privacy_help.xhtml
@@ -211,12 +211,10 @@
<li>Can I access some or all of the information a site gathers about me, in
order to inspect or update it?</li>
<li>How does the site protect the information?</li>
<li>How do I contact the web site if I have questions or problems?</li>
</ul>
<p>[<a href="#privacy_on_the_internet">Return to beginning of section</a>]</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/privsec_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/privsec_help.xhtml
@@ -36,12 +36,10 @@
<li><a href="passwords_help.xhtml">Passwords</a></li>
<li><a href="passwords_help.xhtml#master_passwords">Master Passwords</a></li>
<li><a href="ssl_help.xhtml">SSL</a></li>
<li><a href="certs_prefs_help.xhtml">Certificates</a></li>
<li><a href="validation_help.xhtml">Validation</a></li>
</ul>
</div>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/profiles_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/profiles_help.xhtml
@@ -100,12 +100,10 @@
</ul>
</li>
<li>To rename a profile, select its name, click Rename Profile, and follow the
instructions.</li>
</ol>
<p>[<a href="#managing_profiles">Return to beginning of section</a>]</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/shortcuts-composer.xhtml
+++ b/suite/locales/en-US/chrome/common/help/shortcuts-composer.xhtml
@@ -171,12 +171,10 @@
<td>Text Style Fixed Width</td>
<td>Ctrl+T</td>
<td>Cmd+T</td>
<td>Ctrl+T</td>
</tr>
</tbody>
</table>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/shortcuts-mailnews.xhtml
+++ b/suite/locales/en-US/chrome/common/help/shortcuts-mailnews.xhtml
@@ -340,12 +340,10 @@
<td>Send Message Later</td>
<td>Ctrl+Shift+Enter</td>
<td>Cmd+Shift+Return</td>
<td>Ctrl+Shift+Enter</td>
</tr>
</tbody>
</table>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/shortcuts-navigator.xhtml
+++ b/suite/locales/en-US/chrome/common/help/shortcuts-navigator.xhtml
@@ -528,12 +528,10 @@
<td>Open a Drop-Down Menu</td>
<td>Alt+Down Arrow</td>
<td>Opt+Down Arrow</td>
<td>Alt+Down Arrow</td>
</tr>
</tbody>
</table>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/shortcuts.xhtml
+++ b/suite/locales/en-US/chrome/common/help/shortcuts.xhtml
@@ -352,12 +352,10 @@
<td>Go Forward One Page</td>
<td>Alt+Right Arrow</td>
<td>Cmd+Right Arrow</td>
<td>Alt+Right Arrow</td>
</tr>
</tbody>
</table>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/ssl_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/ssl_help.xhtml
@@ -116,12 +116,10 @@
<li>
<a href="http://developer.mozilla.org/en/docs/Introduction_to_SSL">Introduction
to SSL</a></li>
<li>
<a href="http://www.mozilla.org/projects/security/pki/nss/nss-3.11/nss-3.11-algorithms.html">Encryption
Technologies Available in NSS 3.11</a>.</li>
</ul>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/using_certs_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/using_certs_help.xhtml
@@ -722,12 +722,10 @@
the list.)</li>
</ol>
<p>For information about the OCSP options available, see
<a href="validation_help.xhtml#ocsp">OCSP</a>.</p>
<p>[<a href="#controlling_validation">Return to beginning of section</a>]</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/using_priv_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/using_priv_help.xhtml
@@ -783,12 +783,10 @@
want image animation to repeat as many times as specified within each
image. (This option is selected by default.)</li>
<li><strong>Once</strong>: Select this if you want image animation to occur
once, overriding the number of times specified within each image.</li>
<li><strong>Never</strong>: Select this if you do not want image
animation.</li>
</ul>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/validation_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/validation_help.xhtml
@@ -252,12 +252,10 @@
consecutive failures and the error message for the most recent
failure.</li>
</ul>
</li>
</ul>
<p>Click OK to confirm your choices.</p>
-<p>©right.string;</p>
-
</body>
</html>
--- a/suite/locales/en-US/chrome/common/help/welcome_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/welcome_help.xhtml
@@ -83,12 +83,10 @@
<td>
<p><strong><a href="irc://moznet/seamonkey/">Realtime Chat</a></strong></p>
<p>Chat with &brandShortName; users via IRC.</p>
</td>
<td></td>
</tr>
</table>
-<p>©right.string;</p>
-
</body>
</html>