Bug 658874 - Update SeaMonkey website for 2.1 release
authorjh@junetz.de
Fri, 10 Jun 2011 20:48:42 +0000
changeset 680 a09104b3fd2e
parent 679 9e90879c2e0d
child 681 825e3ac60525
push id1
push userhg
push dateTue, 07 Apr 2015 21:00:21 +0000
bugs658874
Bug 658874 - Update SeaMonkey website for 2.1 release
lib/config.tmpl
src/doc/features.en.html
src/doc/index.en.html
src/download.jst
src/index.en.html
src/news.en.xml
src/releases/2.1.en.html
src/releases/index.en.html
--- a/lib/config.tmpl
+++ b/lib/config.tmpl
@@ -7,25 +7,25 @@
 [% toplink = "${template.name}"|replace('[^\/]+/','../')|replace('[^\/]*$','') %]
 [% IF toplink == '' %]
   [% toplink = './' %]
 [% END %]
 [% IF template.name == '404.en.html' %]
   [% toplink = '/' %]
 [% END %]
 
-[% releaseversion = '2.0.14' %]
+[% releaseversion = '2.1' %]
 [% releasename = "SeaMonkey $releaseversion" %]
 [% relnotes = "${toplink}releases/seamonkey$releaseversion/" %]
 [% download_win = "http://download.mozilla.org/?product=seamonkey-$releaseversion&os=win&lang=en-US" %]
 [% download_linux = "http://download.mozilla.org/?product=seamonkey-$releaseversion&os=linux&lang=en-US" %]
 [% download_mac = "http://download.mozilla.org/?product=seamonkey-$releaseversion&os=osx&lang=en-US" %]
 [% download_more = "${toplink}releases/#$releaseversion" %]
 [% download_allfiles = "http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$releaseversion/" %]
-[% download_win_mb = 10 %]
-[% download_linux_mb = 13 %]
-[% download_mac_mb = 22 %]
+[% download_win_mb = 16 %]
+[% download_linux_mb = 19 %]
+[% download_mac_mb = 34 %]
 
 [% betaversion = '2.1rc2' %]
 [% betaname = "SeaMonkey 2.1 Release Candidate 2" %]
 
-[% develversion = '2.1pre' %]
-[% develdownloadbase = 'http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-comm-2.0' %]
+[% develversion = '2.2a1' %]
+[% develdownloadbase = 'http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-comm-central-trunk' %]
--- a/src/doc/features.en.html
+++ b/src/doc/features.en.html
@@ -13,82 +13,99 @@
 <title>Features</title>
 </head>
 <body>
 <h1>Features of the SeaMonkey<sup>&reg;</sup> Suite</h1>
 
 <div class="section">
   <h3 id="browser">Browser</h3>
 
+  <p><strong>Sync</strong> allows you to keep your browsing history, passwords,
+    bookmarks, preferences and tabs in sync across different devices (computers)
+    in a secure way.</p>
+
   <p><strong>Tabbed browsing</strong> gives you a better way to surf the net.
     You no longer have to open one page at a time. With tabbed browsing, open
     several pages at once with one click. Plus, your homepage can be multiple
     pages, in tabs. And if you mistakenly close a tab or window, functionality
     to <strong>Undo Closed Tab or Window</strong> helps you bring it back to
     continue working with it.</p>
 
+  <p><strong>Session restore</strong> brings back all your open windows and tabs
+    after the rare occasion that SeaMonkey crashes&mdash;and if you wish even when
+    you close and reopen the browser or restart your computer. But crashes
+    should me rare nowadays since a crashing plugin will not take the whole
+    application down anymore.</p>
+
   <p>SeaMonkey's powerful <strong>Add-ons Management</strong> provides almost
     infinite possibilies to extend your Internet experience both through
     installing additional functionality created by others and even freely
     developing your own extensions and providing them to the rest of the
     SeaMonkey community.</p>
 
+  <p>SeaMonkey's unique <strong>Data Manager</strong> serves as a central
+    management interface for all kinds of site-specific data, including
+    cookies, permissions (e.g. image blocking), preferences, passwords and
+    form data.</p>
+
+  <p><strong>Lightweight themes (Personas)</strong> let you give your SeaMonkey
+    a personal touch through simple theming. You can choose from thousands of <a
+    href="http://getpersonas.com/">Personas</a>!</p>
+
   <p><strong>Feed detection</strong> notifies you when web pages offer RSS or
     Atom feeds, and <strong>feed preview</strong> lets you view their contents
-    and choose a reader with which to subscribe to those - including an internal
+    and choose a reader with which to subscribe to those&mdash;including an internal
     reader in the Mail &amp; Newsgroups component of SeaMonkey.</p>
 
   <p><strong>Smart Location Bar</strong> enables you to search your visited web
     pages right when typing in the browser's location bar and finding what you
     want to re-visited as fast as possible by learning which pages you visit
     frequently.</p>
 
   <p><strong>Popup blocker</strong> lets you surf the web without interruption
     from annoying ads.</p>
 
-  <p><strong>Image Manager</strong> lets you block images to remove offensive
-    images or speed up the rendering of web sites.</p>
-
   <p><strong>Find as you type</strong> gives you another way to navigate a
     page. Just start typing to jump from link to link or to find a word or
     phrase within a page.</p>
 
-  <p><strong>Session restore</strong> brings back all your open windows and tabs
-    after the rare occasion that SeaMonkey crashes - and if you wish even when
-    you close and reopen the browser or restart your computer.</p>
+  <p><strong>Safe Mode</strong> can help you solve problems that might occur,
+    e.g. with incompatible add-ons. If you need to ask someone for support,
+    the <strong>Troubleshooting Information</strong> page provides quick
+    access to basic technical information.</p>
 
-  <p>Plus all the features a modern browser should have including: Advanced
-    security settings; Password, Download, and Cookie managers; Web form
-    autocompletion; Themes; toolbar customization; multi-language and
-    multi-platform support; and the latest in Web Standards.</p>
+  <p>Plus all the features a modern browser should have, including: Advanced
+    security settings, download management, web form autocompletion, themes,
+    toolbar customization, multi-language and multi-platform support, plus
+    the latest in web standards.</p>
 
 
   <h3 id="mail">Mail &amp; Newsgroups</h3>
 
   <p><strong>Tabbed Mail</strong> lets you manage your mail and folders in
     parallel, without losing control of where you're at when reading, replying
     to and working with messages in more complex patterns.</p>
 
   <p><strong>Junk mail controls</strong> help you take back control of your
     e-mail from spammers. SeaMonkey's adaptive junk mail control gets smarter
     with use and is personalized to the e-mail that you receive.</p>
 
   <p>Manage your mail with customizable <strong>Tags</strong> and <strong>Mail
     Views</strong>. Color code your e-mail to help you prioritize. Sort your
     mail with views to help you through your e-mail much faster.</p>
 
-  <p><strong>Multiple Accounts</strong> support helps you manage
+  <p><strong>Multiple accounts</strong> support helps you manage
     all your mail through one interface.</p>
 
-  <p><strong>Feeds and Blogs</strong> is a reader for RSS and Atom feeds right
-    in your messaging center that eases your reading of information from all
-    across the web.</p>
+  <p><strong>Blogs &amp; News Feeds</strong> is a reader for RSS and Atom feeds
+    right in your messaging center that eases your reading of information from
+    all across the web.</p>
 
-  <p>SeaMonkey Mail &amp; Newsgroups includes Enterprise ready features such as
-    S/MIME, return receipts, Address Books, LDAP support, and digital signing.</p>
+  <p>SeaMonkey Mail &amp; Newsgroups includes nterprise-ready features such as
+    S/MIME, return receipts, address books, LDAP support, and digital signing.</p>
 
 
   <h3 id="composer">Composer</h3>
   <p>SeaMonkey's powerful yet simple <strong>HTML editor</strong> keeps
     getting better with dynamic image and table resizing, quick insert and
     delete of table cells, improved CSS support, and support for positioned
     layers. For all your documents and website projects, Composer is all you
     need.</p>
--- a/src/doc/index.en.html
+++ b/src/doc/index.en.html
@@ -32,18 +32,18 @@ menu</strong>.
   <li><a href="#other">Other &amp; Older Resources</a></li>
 </ul>
 
 <h2 id="features">SeaMonkey Features</h2>
 
 <p>
 If you are new to SeaMonkey, we have a <a href="features">description of
 SeaMonkey features</a> as well as <a href="2.0/screenshots">screenshots of our
-release</a> and <a href="1.1/screenshots">legacy versions</a> available
-here on this website.
+release</a> and <a href="1.1/screenshots">legacy</a> <a href="2.0/screenshots">versions</a>
+available here on this website.
 </p>
 
 <h2 id="community">Community Help</h2>
 
 <p>
 The best source for Help with SeaMonkey is the
 <a href="../community">SeaMonkey Community</a>. As we are a volunteer-driven
 open source project, the volunteers in our community are our biggest asset and
--- a/src/download.jst
+++ b/src/download.jst
@@ -42,43 +42,43 @@ var gLanguages = {
            "gb": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "English (British)",        localName: "English (British)" } },
   "es":  { "ar": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Spanish (Latin American)", localName: "Espa\u00F1ol (de Am\u00E9rica)" },
            "es": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Spanish (Spain)",          localName: "Espa\u00F1ol (de Espa\u00F1a)" } },
   "eu":  { "-":  { version: null,      betaversion: null,     name: "Basque",                   localName: "Euskara" } },
   "fi":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Finnish",                  localName: "Suomi" } },
   "fr":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "French",                   localName: "Fran\u00e7ais" } },
   "fy":  { "nl": { version: null,      betaversion: null,     name: "Frisian",                  localName: "Frysk" } },
   "ga":  { "ie": { version: null,      betaversion: null,     name: "Irish",                    localName: "Gaeilge" } },
-  "gl":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Galician",                 localName: "Galego" } },
+  "gl":  { "-":  { version: null,      betaversion: null,     name: "Galician",                 localName: "Galego" } },
   "gu":  { "in": { version: null,      betaversion: null,     name: "Gujarati",                 localName: "\u0A97\u0AC1\u0A9C\u0AB0\u0ABE\u0AA4\u0AC0" } },
   "he":  { "-":  { version: null,      betaversion: null,     name: "Hebrew",                   localName: "\u05E2\u05D1\u05E8\u05D9\u05EA" } },
-  "hu":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Hungarian",                localName: "Magyar" } },
+  "hu":  { "-":  { version: null,      betaversion: null,     name: "Hungarian",                localName: "Magyar" } },
   "hy":  { "am": { version: null,      betaversion: null,     name: "Armenian",                 localName: "\u0540\u0561\u0575\u0565\u0580\u0565\u0576" } },
   "it":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Italian",                  localName: "Italiano" } },
   "ja":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Japanese",                 localName: "\u65e5\u672c\u8a9e" } },
-  "ka":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Georgian",                 localName: "\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8" } },
+  "ka":  { "-":  { version: null,      betaversion: null,     name: "Georgian",                 localName: "\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8" } },
   "ko":  { "-":  { version: null,      betaversion: null,     name: "Korean",                   localName: "\uD55C\uAD6D\uC5B4" } },
   "lt":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Lithuanian",               localName: "Lietuvi\u0173" } },
   "mk":  { "-":  { version: null,      betaversion: null,     name: "Macedonian",               localName: "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0441\u043A\u0438" } },
   "mn":  { "-":  { version: null,      betaversion: null,     name: "Mongolian",                localName: "\u041C\u043E\u043D\u0433\u043E\u043B" } },
-  "nb":  { "no": { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Norwegian (Bokm\u00E5l)",  localName: "Norsk bokm\u00E5l" } },
+  "nb":  { "no": { version: null,      betaversion: null,     name: "Norwegian (Bokm\u00E5l)",  localName: "Norsk bokm\u00E5l" } },
   "nn":  { "no": { version: null,      betaversion: null,     name: "Norwegian (Nynorsk)",      localName: "Norsk nynorsk" } },
   "nl":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Dutch",                    localName: "Nederlands" } },
   "pa":  { "in": { version: null,      betaversion: null,     name: "Punjabi",                  localName: "\u0A2A\u0A70\u0A1C\u0A3E\u0A2C\u0A40" } },
   "pl":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Polish",                   localName: "Polski" } },
   "pt":  { "br": { version: null,      betaversion: null,     name: "Portuguese (Brazilian)",   localName: "Portugu\u00EAs (do Brasil)" },
            "pt": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Portuguese (Portugal)",    localName: "Portugu\u00EAs (Europeu)" } },
   "ro":  { "-":  { version: null,      betaversion: null,     name: "Romanian",                 localName: "Rom\u00E2n\u0103" } },
   "ru":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Russian",                  localName: "\u0420\u0443\u0441\u0441\u043A\u0438\u0439" } },
   "sk":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Slovak",                   localName: "Slovensk\u00FD" } },
   "sl":  { "-":  { version: null,      betaversion: null,     name: "Slovenian",                localName: "Slovensko" } },
   "sq":  { "-":  { version: null,      betaversion: null,     name: "Albanian",                 localName: "Shqipe" } },
   "sv":  { "se": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Swedish",                  localName: "Svenska" } },
-  "tr":  { "-":  { version: null,      betaversion: "[% betaversion %]",  name: "Turkish",                  localName: "T\u00FCrk\u00E7e" } },
-  "zh":  { "cn": { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Chinese (Simplified)",     localName: "\u4E2D\u6587 (\u7B80\u4F53)" },
+  "tr":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Turkish",                  localName: "T\u00FCrk\u00E7e" } },
+  "zh":  { "cn": { version: null,      betaversion: null,     name: "Chinese (Simplified)",     localName: "\u4E2D\u6587 (\u7B80\u4F53)" },
            "tw": { version: null,      betaversion: null,     name: "Chinese (Traditional)",    localName: "\u6b63\u9ad4\u4e2d\u6587 (\u7E41\u9AD4)" } }
 };
 
 function LanguageID(aAB, aCD, aBuild)
 {
   if (aCD == "-")
     this.abCD = aAB;
   else
--- a/src/index.en.html
+++ b/src/index.en.html
@@ -16,17 +16,17 @@
 <div class="key-point">
   <div id="product-desc" class="product-seamonkey">
     <h2><img src="/images/seamonkey_logo.png" height="105" width="340" alt="[% releasename %]"></h2>
     <p>
       Web-browser, advanced e-mail, newsgroup and feed client, IRC chat, and
       HTML editing made simple -- all your Internet needs in one application.
     </p>
     <ul>
-      <li><a href="doc/features">Features</a> &middot; <a href="doc/2.0/screenshots">Screenshots</a></li>
+      <li><a href="doc/features">Features</a> &middot; <a href="doc/2.1/screenshots">Screenshots</a></li>
       <li><a href="[% relnotes %]">Release Notes</a></li>
     </ul>
   </div>
   <div id="product-side">
     <div class="download">
       <h3>Download Now</h3>
       <b>[% releasename %]</b>
       <ul>
@@ -144,9 +144,9 @@ cross-platform architecture provided by 
   application and web development tools like a DOM Inspector and a JavaScript
   debugger.</li>
 <li>If that's still not enough, SeaMonkey can be extended with numerous
   <a href="https://addons.mozilla.org/seamonkey/">Add-Ons</a> that provide
   additional functionality and customization for a complete Internet
   experience.</li>
 </ul>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/src/news.en.xml
+++ b/src/news.en.xml
@@ -2,17 +2,57 @@
 
 <!--
 non-ASCII characters must be DOUBLE-escaped;
 you can use Hixie's converter to get the entity codes
 http://www.damowmow.com/portal/ (use the "Indentify" field)
 -->
 
 <newsfeed title="SeaMonkey News" url="http://seamonkey-project.org/news">
-  <entry id="2011-06-06" showfront="true">
+  <entry id="2011-06-10" showfront="true">
+    <headline>SeaMonkey 2.1</headline>
+    <content type="html" xml:lang="en">
+<![CDATA[<p>
+The SeaMonkey project is proud to present SeaMonkey 2.1: The new major
+release of the all-in-one Internet suite is <a href="http://www.seamonkey-project.org/releases/">available
+for download now</a>!
+Building on the same Mozilla platform as Firefox 4, it delivers the latest
+developments in web technologies such as HTML5, hardware acceleration and
+improved JavaScript speed.
+</p>
+<p>
+SeaMonkey 2.1 is available in 21 languages, for Windows, Mac OS X and Linux.
+</p>
+<p>
+Most notably, this release features for the first time:
+</p>
+<ul>
+<li>Sync allows you to share your bookmarks, history, passwords and tabs
+across different devices (computers) in a secure way.</li>
+<li>Personas let you choose from thousands of easy to install themes, giving
+you a more personalized browsing experience.</li>
+<li>An optional search bar gives access to OpenSearch search engines and
+suggestions.</li>
+<li>The new Data Manager unifies management of permissions, cookies, passwords
+and form data.</li>
+<li>Improved handling of plugins, including the ability to delete Flash cookies
+and survive plugin crashes.</li>
+</ul>
+<p>
+For a more complete list of major changes in SeaMonkey 2.1, see the What's New
+in SeaMonkey 2.1 section of the <a href="http://www.seamonkey-project.org/releases/seamonkey2.1/">Release
+Notes</a>, which also contain a list of known issues and answers to frequently
+asked questions. For a more general overview of the SeaMonkey project (and <a
+href="http://www.seamonkey-project.org/doc/2.1/screenshots">screen shots</a>!),
+visit <a href="http://www.seamonkey-project.org/">www.seamonkey-project.org</a>.
+</p>]]>
+    </content>
+  </entry>
+
+  <entry id="2011-06-06" showfront="false">
     <headline>SeaMonkey 2.1 Release Candidate 2</headline>
     <content type="html" xml:lang="en">
 <![CDATA[<p>
 SeaMonkey 2.1 Release Candidate 2 is
 <a href="http://www.seamonkey-project.org/releases/2.1rc2">now available
 for free download</a> on the SeaMonkey website. We encourage testers to
 <a href="http://www.seamonkey-project.org/dev/get-involved">get involved</a> in
 discussing and reporting problems as well as further improving the product.
@@ -28,17 +68,17 @@ SeaMonkey 2.1 Release Candidate 1 is
 <a href="http://www.seamonkey-project.org/releases/2.1rc1">now available
 for free download</a> on the SeaMonkey website. We encourage testers to
 <a href="http://www.seamonkey-project.org/dev/get-involved">get involved</a> in
 discussing and reporting problems as well as further improving the product.
 </p>]]>
     </content>
   </entry>
 
-  <entry id="2011-04-28" showfront="true">
+  <entry id="2011-04-28" showfront="false">
     <headline>SeaMonkey 2.0.14 Security Update</headline>
     <content type="html" xml:lang="en">
 <![CDATA[<p>
 As part of Mozilla's ongoing stability and security update process, SeaMonkey
 2.0.14 is now available for Windows, Mac, and Linux as a free download from
 <a href="http://www.seamonkey-project.org/releases/">www.seamonkey-project.org</a>.
 </p>
 <p>
new file mode 100755
--- /dev/null
+++ b/src/releases/2.1.en.html
@@ -0,0 +1,390 @@
+[%- PROCESS release.tmpl -%]
+[%- smversion = '2.1' -%]
+[%- prettyversion = '2.1' -%]
+[%- mirrorred = true -%]
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Language" content="en">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<meta http-equiv="Content-Script-Type" content="text/javascript">
+
+<link rel="top" href="../" title="SeaMonkey Project">
+<link rel="up" href="./" title="SeaMonkey Releases">
+
+<script type="text/javascript" src="/download.js"></script>
+
+<title>SeaMonkey [% prettyversion %]</title>
+</head>
+<body>
+<h1><a name="[% smversion %]">SeaMonkey [% prettyversion %]</a></h1>
+<p class="release-date">Released June 10, 2011</p>
+
+<div class="important">
+  <strong class="shout">Be careful!</strong> The SeaMonkey version available for
+  download on this page is a testing-only preview of the next generation of our
+  Internet suite. Please test it carefully, it's not yet in a state where we can
+  encourage you to use it for daily browsing and mail operations.
+  <br>For daily use, we strongly advise you to download the
+  <a href="./">current stable release</a> instead.
+</div>
+
+<ul class="toc">
+  <li><a href="#official">Official Builds</a></li>
+  <li><a href="#source">Source Code</a></li>
+  <li><a href="#langpacks">Language Packs</a></li>
+  <li><a href="#contrib">Contributed builds (other platforms)</a></li>
+</ul>
+
+<div class="key-point">
+<div class="key-side download">
+  <h3>Download</h3>
+  <ul>
+    <li id="download-win" class=""><a
+          href="[% INCLUDE download_build platform='win' locale='en-US' %]"
+          id="download-win-link">Windows,
+        <span id="download-win-lang">English</span>
+        (16 MB)</a></li>
+    <li id="download-linux" class=""><a
+          href="[% INCLUDE download_build platform='linux' locale='en-US' %]"
+          id="download-linux-link">Linux GTK2,
+        <span id="download-linux-lang">English</span>
+        (19 MB)</a></li>
+    <li id="download-mac" class=""><a
+          href="[% INCLUDE download_build platform='osx' locale='en-US' %]"
+          id="download-mac-link">Mac OS X,
+        <span id="download-mac-lang">English</span>
+        (34 MB)</a></li>
+  </ul>
+</div>
+<dl>
+  <dt id="relnotes"><a href="seamonkey2.1/">Release Notes</a></dt>
+    <dd>
+    The release notes contain installation instructions, system requirements,
+    what's new, and a list of known issues that you should read before
+    reporting bugs.
+    </dd>
+  <dt id="feedback">Feedback</dt>
+    <dd>
+    This is a testing preview for our upcoming major release. We appreciate
+    your testing of this version as well as your feedback on how well it works
+    for you. Please contact our <a href="../community#groups">newsgroups</a>
+    for general feedback and <a href="https://bugzilla.mozilla.org/">report
+    bugs in Bugzilla</a>.
+    </dd>
+</dl>
+</div>
+<script type="text/javascript">
+  <!--
+  highlightDownload("download", true);
+  // -->
+</script>
+
+<h2 id="official">Official builds</h2>
+<div class="section">
+<p class="note"><a href="[% INCLUDE download_file path='MD5SUMS' %]">MD5
+  sums</a> and <a href="[% INCLUDE download_file path='SHA1SUMS' %]">SHA1
+  sums</a> are available for official packages and source tarballs.
+</p>
+
+<table class="downloads" cellpadding="0" cellspacing="0"
+       summary="SeaMonkey builds available for download.">
+  <thead>
+    <tr>
+      <th colspan="2" class="top-left">Language</th>
+      <th>Version</th>
+      <th><span class="download-win">Windows</span></th>
+      <th><span class="download-mac">Mac OS X</span></th>
+      <th class="top-right"><span class="download-linux">Linux</span></th>
+    </tr>
+  </thead>
+  <tfoot>
+    <tr>
+      <td class="bottom-left"></td>
+      <td colspan="4"></td>
+      <td class="bottom-right"></td>
+    </tr>
+  </tfoot>
+  <tbody>
+    <tr id="be" class="odd">
+      <td>Belarusian</td>
+      <td lang="be">Беларуская</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='be' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='be' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='be' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="ca" class="even">
+      <td>Catalan</td>
+      <td lang="ca">català</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='ca' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='ca' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='ca' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="cs" class="odd">
+      <td>Czech</td>
+      <td lang="cs">Čeština</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='cs' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='cs' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='cs' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="nl" class="even">
+      <td>Dutch</td>
+      <td lang="nl">Nederlands</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='nl' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='nl' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='nl' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="en-US" class="odd">
+      <td>English (US)</td>
+      <td lang="en-US">English (US)</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='en-US' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='en-US' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='en-US' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="en-GB" class="even">
+      <td>English (British)</td>
+      <td lang="en-GB">English (British)</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='en-GB' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='en-GB' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='en-GB' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="fi" class="odd">
+      <td>Finnish</td>
+      <td lang="fi">suomi</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='fi' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='fi' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='fi' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="fr" class="even">
+      <td>French</td>
+      <td lang="fr">Français</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='fr' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='fr' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='fr' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="de" class="odd">
+      <td>German</td>
+      <td lang="de">Deutsch</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='de' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='de' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='de' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="it" class="even">
+     <td>Italian</td>
+     <td lang="it">Italiano</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='it' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='it' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='it' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="ja" class="odd">
+     <td>Japanese</td>
+     <td lang="ja">日本語</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='ja' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='ja-JP-mac' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='ja' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="lt" class="even">
+      <td>Lithuanian</td>
+      <td lang="lt">lietuvių kalba</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='lt' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='lt' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='lt' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="pl" class="odd">
+      <td>Polish</td>
+      <td lang="pl">Polski</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='pl' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='pl' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='pl' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="pt-PT" class="even">
+      <td>Portuguese (Portugal)</td>
+      <td lang="pt-PT">Português (Europeu)</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='pt-PT' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='pt-PT' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='pt-PT' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="ru" class="odd">
+      <td>Russian</td>
+      <td lang="ru">Русский</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='ru' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='ru' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='ru' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="sk" class="even">
+      <td>Slovak</td>
+      <td lang="sk">slovenčina</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='sk' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='sk' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='sk' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="es-AR" class="odd">
+      <td>Spanish (Argentina)</td>
+      <td lang="es-AR">Español (de Argentina)</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='es-AR' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='es-AR' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='es-AR' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="es-ES" class="even">
+      <td>Spanish (Spain)</td>
+      <td lang="es-ES">Español (de España)</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='es-ES' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='es-ES' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='es-ES' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="sv-SE" class="odd">
+      <td>Swedish</td>
+      <td lang="sv-SE">Svenska</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='sv-SE' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='sv-SE' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='sv-SE' %]" class="download-linux">Download</a></td>
+    </tr>
+    <tr id="tr" class="even">
+      <td>Turkish</td>
+      <td lang="tr">Türkçe</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='tr' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='tr' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='tr' %]" class="download-linux">Download</a></td>
+    </tr>
+  </tbody>
+</table>
+</div>
+
+<h2 id="source">Source code</h2>
+<div class="section">
+  <p>The source code is available either as a tar package or from the
+    <a href="http://developer.mozilla.org/en/Comm-central_source_code_(Mercurial)">source
+    repository</a>.
+  </p>
+
+  <ul>
+    <li id="tarball"><a href="[% INCLUDE download_file path="source/seamonkey-${smversion}.source.tar.bz2" %]">Source
+      Code Tarball</a> (bzip, 59 MB) - note that it doesn't unpack a
+      subdirectory itself, so create a directory to unpack it in.
+    </li>
+
+    <li id="readme">The <a href="[% INCLUDE download_file path='README' %]">README</a>
+      file explains how to pull SeaMonkey [% prettyversion %] from the source repository.
+    </li>
+  </ul>
+</div>
+
+<h2 id="langpacks">Language Packs</h2>
+<div class="section">
+  <p>See the <a href="langpack-notes/2.0">activation notes</a> for how to install those packages.</p>
+  <p>
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.be.langpack.xpi" %]">Belarusian</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.ca.langpack.xpi" %]">Catalan</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.cs.langpack.xpi" %]">Czech</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.nl.langpack.xpi" %]">Dutch</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.en-GB.langpack.xpi" %]">English (British)</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.fi.langpack.xpi" %]">Finnish</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.fr.langpack.xpi" %]">French</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.de.langpack.xpi" %]">German</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.it.langpack.xpi" %]">Italian</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.ja.langpack.xpi" %]">Japanese</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.lt.langpack.xpi" %]">Lithuanian</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.pl.langpack.xpi" %]">Polish</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.pt-PT.langpack.xpi" %]">Portuguese (Portugal)</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.ru.langpack.xpi" %]">Russian</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.sk.langpack.xpi" %]">Slovak</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.es-AR.langpack.xpi" %]">Spanish (Argentina)</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.es-ES.langpack.xpi" %]">Spanish (Spain)</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.sv-SE.langpack.xpi" %]">Swedish</a>
+  </p>
+</div>
+
+<h2 id="experimental">Experimental builds/languages</h2>
+<div class="section">
+<p class="note">Those languages didn't meet the quality criteria for official
+  builds but should be fully usable. Probably they have not completely finished
+  localizing and some parts might still be in English. The localizers would
+  welcome your help to complete the work and make it into the official set for
+  the next release!
+</p>
+
+<table class="downloads" cellpadding="0" cellspacing="0"
+       summary="SeaMonkey builds not meeting all quality criteria but still available for download.">
+  <thead>
+    <tr>
+      <th colspan="2" class="top-left">Language</th>
+      <th>Version</th>
+      <th><span class="download-win">Windows</span></th>
+      <th><span class="download-mac">Mac OS X</span></th>
+      <th class="top-right"><span class="download-linux">Linux</span></th>
+    </tr>
+  </thead>
+  <tfoot>
+    <tr>
+      <td class="bottom-left"></td>
+      <td colspan="4"></td>
+      <td class="bottom-right"></td>
+    </tr>
+  </tfoot>
+  <tbody>
+    <tr id="nb-NO" class="even">
+      <td>Norwegian (Bokmål)</td>
+      <td lang="nb-NO">Norsk bokmål</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='nb-NO' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='nb-NO' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='nb-NO' %]" class="download-linux">Download</a></td>
+    </tr>
+  </tbody>
+</table>
+<p>Language packs:
+  <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.nb-NO.langpack.xpi" %]">Norwegian (Bokmål)</a>
+</p>
+</div>
+
+<!--
+  Build contributors, please put your builds under:
+    pub/mozilla.org/seamonkey/releases/<version>/contrib/
+
+  Your build filename must have the prefix "seamonkey-<ver>-", e.g. "seamonkey-[% smversion %]-"
+  see http://developer.mozilla.org/en/docs/Package_Filename_Convention
+  and include a README explaining any build peculiarities and identifying
+  yourself as the contributor. Thanks.
+-->
+
+<h2 id="contrib">Contributed builds (other platforms)</h2>
+<div class="section">
+<p class="note">These are unofficial builds and may be configured differently
+  than the official SeaMonkey builds. Please read their "readme" files for
+  further information.</p>
+
+<dl>
+  <dt id="linux-x86_64">Linux/x86_64</dt>
+  <dd>
+    <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}.en-US.linux-x86_64.tar.bz2" %]">Linux/x86_64 .tar.bz2</a>
+    <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}.en-US.linux-x86_64.README" %]">(readme)</a>
+    <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}.en-US.linux-x86_64.MD5SUM" %]">(MD5 sum)</a>
+    <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}.en-US.linux-x86_64.SHA1SUM" %]">(SHA1 sum)</a>
+  </dd>
+</dl>
+</div>
+
+</body>
+</html>
--- a/src/releases/index.en.html
+++ b/src/releases/index.en.html
@@ -61,17 +61,17 @@
   </ul>
 </li>
 <li><a href="#[% betaversion %]">[% betaname %]</a></li>
 <li><a href="#old">older versions</a></li>
 </ul>
 
 <!-- Begin releases block -->
 <h2><a name="[% smversion %]">SeaMonkey [% prettyversion %]</a></h2>
-<p class="release-date">Released April 28, 2011</p>
+<p class="release-date">Released June 10, 2011</p>
 
 <div class="key-point">
 <ul>
   <li><a href="seamonkey[% smversion %]/">Release Notes</a> - The release notes describe
   new changes, system requirements, installation instructions, and known issues
   in this release - please read them carefully before using this version of
   SeaMonkey!
   </li>
@@ -115,104 +115,72 @@
     <tr id="ca" class="even">
       <td>Catalan</td>
       <td lang="ca">català</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='ca' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='ca' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='ca' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="zh-CN" class="odd">
-      <td>Chinese (Simplified)</td>
-      <td lang="zh-CN">中文 (简体)</td>
-      <td class="curVersion">[% smversion %]</td>
-      <td><a href="[% INCLUDE download_build platform='win' locale='zh-CN' %]" class="download-win">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='osx' locale='zh-CN' %]" class="download-mac">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='linux' locale='zh-CN' %]" class="download-linux">Download</a></td>
-    </tr>
-    <tr id="cs" class="even">
+    <tr id="cs" class="odd">
       <td>Czech</td>
       <td lang="cs">Čeština</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='cs' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='cs' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='cs' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="nl" class="odd">
+    <tr id="nl" class="even">
       <td>Dutch</td>
       <td lang="nl">Nederlands</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='nl' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='nl' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='nl' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="en-GB" class="even">
-      <td>English (British)</td>
-      <td lang="en-GB">English (British)</td>
-      <td class="curVersion">[% smversion %]</td>
-      <td><a href="[% INCLUDE download_build platform='win' locale='en-GB' %]" class="download-win">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='osx' locale='en-GB' %]" class="download-mac">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='linux' locale='en-GB' %]" class="download-linux">Download</a></td>
-    </tr>
     <tr id="en-US" class="odd">
       <td>English (US)</td>
       <td lang="en-US">English (US)</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='en-US' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='en-US' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='en-US' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="fi" class="even">
+    <tr id="en-GB" class="even">
+      <td>English (British)</td>
+      <td lang="en-GB">English (British)</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='en-GB' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='en-GB' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='en-GB' %]" class="download-linux">Download</a></td>
+     </tr>
+     <tr id="fi" class="odd">
       <td>Finnish</td>
       <td lang="fi">suomi</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='fi' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='fi' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='fi' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="fr" class="odd">
+    <tr id="fr" class="even">
       <td>French</td>
       <td lang="fr">Français</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='fr' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='fr' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='fr' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="gl" class="even">
-      <td>Galician</td>
-      <td lang="gl">Galego</td>
-      <td class="curVersion">[% smversion %]</td>
-      <td><a href="[% INCLUDE download_build platform='win' locale='gl' %]" class="download-win">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='osx' locale='gl' %]" class="download-mac">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='linux' locale='gl' %]" class="download-linux">Download</a></td>
-    </tr>
-    <tr id="ka" class="odd">
-      <td>Georgian</td>
-      <td lang="ka">ქართული</td>
-      <td class="curVersion">[% smversion %]</td>
-      <td><a href="[% INCLUDE download_build platform='win' locale='ka' %]" class="download-win">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='osx' locale='ka' %]" class="download-mac">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='linux' locale='ka' %]" class="download-linux">Download</a></td>
-    </tr>
-    <tr id="de" class="even">
+    <tr id="de" class="odd">
       <td>German</td>
       <td lang="de">Deutsch</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='de' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='de' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='de' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="hu" class="odd">
-     <td>Hungarian</td>
-     <td lang="hu">Magyar</td>
-      <td class="curVersion">[% smversion %]</td>
-      <td><a href="[% INCLUDE download_build platform='win' locale='hu' %]" class="download-win">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='osx' locale='hu' %]" class="download-mac">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='linux' locale='hu' %]" class="download-linux">Download</a></td>
-    </tr>
     <tr id="it" class="even">
      <td>Italian</td>
      <td lang="it">Italiano</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='it' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='it' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='it' %]" class="download-linux">Download</a></td>
     </tr>
@@ -227,80 +195,80 @@
     <tr id="lt" class="even">
       <td>Lithuanian</td>
       <td lang="lt">lietuvių kalba</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='lt' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='lt' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='lt' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="nb-NO" class="odd">
-      <td>Norwegian (Bokmål)</td>
-      <td lang="nb-NO">Norsk bokmål</td>
-      <td class="curVersion">[% smversion %]</td>
-      <td><a href="[% INCLUDE download_build platform='win' locale='nb-NO' %]" class="download-win">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='osx' locale='nb-NO' %]" class="download-mac">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='linux' locale='nb-NO' %]" class="download-linux">Download</a></td>
-    </tr>
-    <tr id="pl" class="even">
+    <tr id="pl" class="odd">
       <td>Polish</td>
       <td lang="pl">Polski</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='pl' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='pl' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='pl' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="pt-PT" class="odd">
+    <tr id="pt-PT" class="even">
       <td>Portuguese (Portugal)</td>
       <td lang="pt-PT">Português (Europeu)</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='pt-PT' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='pt-PT' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='pt-PT' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="ru" class="even">
+    <tr id="ru" class="odd">
       <td>Russian</td>
       <td lang="ru">Русский</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='ru' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='ru' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='ru' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="sk" class="odd">
+    <tr id="sk" class="even">
       <td>Slovak</td>
       <td lang="sk">slovenčina</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='sk' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='sk' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='sk' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="es-AR" class="even">
+    <tr id="es-AR" class="odd">
       <td>Spanish (Argentina)</td>
       <td lang="es-AR">Español (de Argentina)</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='es-AR' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='es-AR' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='es-AR' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="es-ES" class="odd">
+    <tr id="es-ES" class="even">
       <td>Spanish (Spain)</td>
       <td lang="es-ES">Español (de España)</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='es-ES' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='es-ES' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='es-ES' %]" class="download-linux">Download</a></td>
     </tr>
-    <tr id="sv-SE" class="even">
+    <tr id="sv-SE" class="odd">
       <td>Swedish</td>
       <td lang="sv-SE">Svenska</td>
       <td class="curVersion">[% smversion %]</td>
       <td><a href="[% INCLUDE download_build platform='win' locale='sv-SE' %]" class="download-win">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='osx' locale='sv-SE' %]" class="download-mac">Download</a></td>
       <td><a href="[% INCLUDE download_build platform='linux' locale='sv-SE' %]" class="download-linux">Download</a></td>
     </tr>
+    <tr id="tr" class="even">
+      <td>Turkish</td>
+      <td lang="tr">Türkçe</td>
+      <td class="curVersion">[% smversion %]</td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='tr' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='tr' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='tr' %]" class="download-linux">Download</a></td>
+    </tr>
   </tbody>
 </table>
 </div>
 
 <h2 id="source">Source code</h2>
 <div class="section">
   <p>The source code is available either as a tar package or from the
     <a href="http://developer.mozilla.org/en/Comm-central_source_code_(Mercurial)">source
@@ -320,36 +288,33 @@
 </div>
 
 <h2 id="langpacks">Language Packs</h2>
 <div class="section">
   <p>See the <a href="langpack-notes/2.0">activation notes</a> for how to install those packages.</p>
   <p>
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.be.langpack.xpi" %]">Belarusian</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.ca.langpack.xpi" %]">Catalan</a>,
-    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.zh-CN.langpack.xpi" %]">Chinese (Simplified)</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.cs.langpack.xpi" %]">Czech</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.nl.langpack.xpi" %]">Dutch</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.en-GB.langpack.xpi" %]">English (British)</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.fi.langpack.xpi" %]">Finnish</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.fr.langpack.xpi" %]">French</a>,
-    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.gl.langpack.xpi" %]">Galician</a>,
-    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.ka.langpack.xpi" %]">Georgian</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.de.langpack.xpi" %]">German</a>,
-    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.hu.langpack.xpi" %]">Hungarian</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.it.langpack.xpi" %]">Italian</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.ja.langpack.xpi" %]">Japanese</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.lt.langpack.xpi" %]">Lithuanian</a>,
-    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.nb-NO.langpack.xpi" %]">Norwegian (Bokmål)</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.pl.langpack.xpi" %]">Polish</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.pt-PT.langpack.xpi" %]">Portuguese (Portugal)</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.ru.langpack.xpi" %]">Russian</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.sk.langpack.xpi" %]">Slovak</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.es-AR.langpack.xpi" %]">Spanish (Argentina)</a>,
     <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.es-ES.langpack.xpi" %]">Spanish (Spain)</a>,
-    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.sv-SE.langpack.xpi" %]">Swedish</a>
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.sv-SE.langpack.xpi" %]">Swedish</a>,
+    <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.tr.langpack.xpi" %]">Turkish</a>
   </p>
 </div>
 
 <h2 id="experimental">Experimental builds/languages</h2>
 <div class="section">
 <p class="note">Those languages didn't meet the quality criteria for official
   builds but should be fully usable. Probably they have not completely finished
   localizing and some parts might still be in English. The localizers would
@@ -371,28 +336,28 @@
   <tfoot>
     <tr>
       <td class="bottom-left"></td>
       <td colspan="4"></td>
       <td class="bottom-right"></td>
     </tr>
   </tfoot>
   <tbody>
-    <tr id="tr" class="even">
-      <td>Turkish</td>
-      <td lang="tr">Türkçe</td>
+    <tr id="nb-NO" class="even">
+      <td>Norwegian (Bokmål)</td>
+      <td lang="nb-NO">Norsk bokmål</td>
       <td class="curVersion">[% smversion %]</td>
-      <td><a href="[% INCLUDE download_build platform='win' locale='tr' %]" class="download-win">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='osx' locale='tr' %]" class="download-mac">Download</a></td>
-      <td><a href="[% INCLUDE download_build platform='linux' locale='tr' %]" class="download-linux">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='win' locale='nb-NO' %]" class="download-win">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='osx' locale='nb-NO' %]" class="download-mac">Download</a></td>
+      <td><a href="[% INCLUDE download_build platform='linux' locale='nb-NO' %]" class="download-linux">Download</a></td>
     </tr>
   </tbody>
 </table>
 <p>Language packs:
-  <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.tr.langpack.xpi" %]">Turkish</a>
+  <a href="[% INCLUDE download_file path="langpack/seamonkey-${smversion}.nb-NO.langpack.xpi" %]">Norwegian (Bokmål)</a>
 </p>
 </div>
 
 <!--
   Build contributors, please put your builds under:
     pub/mozilla.org/seamonkey/releases/<version>/contrib/
 
   Your build filename must have the prefix "seamonkey-<ver>-", e.g. "seamonkey-[% smversion %]-"
@@ -423,58 +388,59 @@
   </dd>
 
   <dt id="solaris">Solaris tarballs</dt>
   <dd>
     <a href="[% INCLUDE download_file path="contrib/solaris_tarball/seamonkey-${smversion}.en-US.solaris2.11-i386.tar.bz2" %]">Solaris 2.11 i386</a>,
     <a href="[% INCLUDE download_file path="contrib/solaris_tarball/seamonkey-${smversion}.en-US.solaris2.11-sparc.tar.bz2" %]">Solaris 2.11 sparc</a>
     <a href="[% INCLUDE download_file path='contrib/solaris_tarball/README.txt' %]">(readme)</a>
   </dd>
--->
   <dt id="aix51-ppc">AIX 5.1 (ppc) RPM/tarball</dt>
   <dd>
     <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}-1.aix5.1.ppc.rpm" %]">AIX 5L (ppc) RPM</a>
     <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}-1.aix5.1.ppc.MD5SUMS" %]">(MD5 sum)</a>,
     <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}.en-US.aix5.1.0.0-powerpc.tar.bz2" %]">AIX 5L (ppc) tarball</a>
     <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}.en-US.aix5.1.0.0-powerpc.MD5SUMS" %]">(MD5 sum)</a>
     <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}.aix5.1.ppc.README" %]">(readme)</a>
   </dd>
-<!--
   <dt id="os2">OS/2</dt>
     <dd>
       <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}.en-US.os2.zip" %]">OS/2 zip</a>
       <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}.en-US.os2.README" %]">(readme)</a>
       <a href="[% INCLUDE download_file path="contrib/seamonkey-${smversion}.en-US.os2.MD5SUM" %]">(MD5 sum)</a>
     </dd>
 -->
 </dl>
 </div>
 
+<!--
 <h2><a name="[% betaversion %]">[% betaname %]</a></h2>
 <p class="release-date">Released June 6, 2011</p>
 
 <div class="key-point">
 <ul>
   <li><a href="seamonkey2.1/">Release Notes</a> - The release notes describe
   new changes, system requirements, installation instructions, and known issues
   in this release - please read them carefully before using this version of
   SeaMonkey!
   </li>
 
   <li>This preview of SeaMonkey's future is available from the
     <strong><a href="[% betaversion %]">[% betaname %] download page</a></strong>.
   </li>
 </ul>
 </div>
+-->
 
 <hr>
 
 <div class="para" id="old">
   <p>Previously released versions of SeaMonkey:</p>
   <ul class="snav">
+    <li><a href="2.1rc2">2.1 RC 2</a></li>
     <li><a href="2.1rc1">2.1 RC 1</a></li>
     <li><a href="2.1b3">2.1 Beta 3</a></li>
     <li><a href="2.1b2">2.1 Beta 2</a></li>
     <li><a href="2.1b1">2.1 Beta 1</a></li>
     <li><a href="2.1a3">2.1 Alpha 3</a></li>
     <li><a href="2.1a2">2.1 Alpha 2</a></li>
     <li><a href="2.1a1">2.1 Alpha 1</a></li>
     <li><a href="2.0.13">2.0.13</a></li>