downloads update - do NOT commit to production yet

5 files changed, 257 insertions, 146 deletions

diff --git a/downloads.ini b/downloads.ini
index d07fcf0da..0071a5bac 100644
--- a/downloads.ini
+++ b/downloads.ini
@@ -1,87 +1,172 @@
 ; Mageia downloads definition file
 
 [_global]
-name = Mageia 1 RC
-prefix = mageia-1-rc
+name = Mageia 1
+prefix = mageia-1
 type = iso
-errata = "http://www.mageia.org/wiki/doku.php?id=mageia1:errata"
-notes = "http://www.mageia.org/wiki/doku.php?id=iso1:rc_release_notes"
-blog = "http://blog.mageia.org/en/2011/05/17/mageia-1-rc/"
+errata = "http://mageia.org/wiki/doku.php?id=mageia1:errata"
+notes = "http://mageia.org/1/
+blog = "http://blog.mageia.org/en/
 
 [_popularity]
 ;extracted/normalized from www download logs; need time to make this automatic + post -rda
 dvd-i586 = 5
 dvd-x86_64 = 3
 cd-dualarch = 1
-live-kde-europa-cd-i586 = 4
-live-gnome-europa-cd-i586 = 2
+live-kde-europe1-cd-i586 = 4
+live-gnome-europe1-cd-i586 = 3
+live-kde-europe2-cd-i586 = 3
+live-gnome-europe2-cd-i586 = 2
+live-kde-asia-cd-i586 = 1
+live-kde-africa-cd-i586 = 1
+live-gnome-asia-cd-i586 = 1
+live-gnome-africa-cd-i586 = 1
 netboot-i586 = 1
 netboot-x86_64 = 1
 
 [dvd-i586]
+flavour = DVD
 name = 32bit DVD
 size = 4GB
 lang = All supported
-md5 = 7319f83a06403fb8b48ebe2dfd8b0c20
-sha1 = 79e9912e5398d1f397300d0252452255ee9bf74c
-path = iso/cauldron/mageia-dvd-1-rc-i586.iso
-torrent = iso/cauldron/torrents/mageia-dvd-1-rc-i586.torrent
+md5 = 535c53fabfaea25ad6ad49edbbf6ce0a
+sha1 = 1146008d408d5929ed07580070e453f6b4e64277
+path = iso/1/mageia-dvd-1-i586.iso
+torrent = iso/1/torrents/mageia-dvd-1-i586.torrent
 
 [dvd-x86_64]
+flavour = DVD
 name = 64bit DVD
 size = 4GB
 lang = All supported
-md5 = d1946796d130d2f4e1c8ec4bef8132dc
-sha1 = 0f30819e2e2ea19a49fe5e6a5b2046ab6f8120cf
-path = iso/cauldron/mageia-dvd-1-rc-x86_64.iso
-torrent = iso/cauldron/torrents/mageia-dvd-1-rc-x86_64.torrent
+md5 = 7e65859068810b5c2da7593e4254293a
+sha1 = e9679d433afbea721e33f830691c4044055f13ae
+path = iso/1/mageia-dvd-1-x86_64.iso
+torrent = iso/1/torrents/mageia-dvd-1-x86_64.torrent
 
+; Dual arch
 [cd-dualarch]
-name = Dual arch CD
+flavour = CD
+name = Dual Arch CD
 size = 700MB
 lang = Limited
-md5 = ada8b8e063da0fabefca3512cd75b294
-sha1 = 42762e73cf3950c161f71259bf22806451679a4b
-path = iso/cauldron/mageia-dual-1-rc.iso
-torrent = iso/cauldron/torrents/mageia-dual-1-rc.torrent
-
-;[live-kde-europa-cd-i586]
-;name = 32bit Live KDE CD
-;size = 700MB
-;lang = European set
-;langs = de|en|es|fr|it|pl|pt|ru
-;md5 = 
-;sha1 = 
-;path = iso/cauldron/mageia-livecd-1-rc-KDE4-int-cdrom-i586.iso
-;torrent = iso/cauldron/torrents/mageia-livecd-1-rc-KDE4-int-cdrom-i586.torrent
-;
-;[live-gnome-europa-cd-i586]
-;name = 32bit Live GNOME CD
-;size = 700MB
-;lang = European set
-;langs = de|en|es|fr|it|pl|pt|ru
-;md5 = 
-;sha1 = 
-;path = iso/cauldron/mageia-livecd-1-rc-GNOME-int-cdrom-i586.iso
-;torrent = iso/cauldron/torrents/mageia-livecd-1-rc-GNOME-int-cdrom-i586.torrent
+md5 = 7574f31cb8429614026a61c50578d863
+sha1 = 427e25a4c8aad56c0a19fae0bbbe085f1fc641ba
+path = iso/1/mageia-dual-1.iso
+torrent = iso/1/torrents/mageia-dual-1.torrent
 
+; KDE LiveCDs (32bit)
+[live-kde-europe1-cd-i586]
+flavour = LiveCD 32bit
+name = KDE
+size = 700MB
+lang = Europa set 1
+langs = de|en|es|fr|it|pl|pt|ru
+md5 = 4977f5a974dec5b937a891e29cce5fdb
+sha1 = ca68b6c642e91ad21026f872d097439d32457d30
+path = iso/1/mageia-livecd-1-KDE4-europe1-americas-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-KDE4-europe1-americas-cdrom-i586.torrent
+
+[live-kde-europe2-cd-i586]
+flavour = LiveCD 32bit
+name = KDE
+size = 700MB
+lang = Europa set 2
+langs = 
+md5 = 90768c05344ab250ae84f985e1b849c1
+sha1 = 715fca8f8411fa6d36b16c192a6566dd29ef4915
+path = iso/1/mageia-livecd-1-KDE4-europe2-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-KDE4-europe2-cdrom-i586.torrent
+
+[live-kde-asia-cd-i586]
+flavour = LiveCD 32bit
+name = KDE
+size = 700MB
+lang = Asia set
+langs = 
+md5 = 1b904aa607a464c7c712209acd109710
+sha1 = a53fa906c143e591082442d076c2b3b202fe8a47
+path = iso/1/mageia-livecd-1-KDE4-asia-noindia-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-KDE4-asia-noindia-cdrom-i586.torrent
+
+[live-kde-africa-cd-i586]
+flavour = LiveCD 32bit
+name = KDE
+size = 700MB
+lang = Africa/India set
+langs = 
+md5 = f7fc7ea64b38b04874ad7d3d6d904461
+sha1 = 072eeef7eedc0ca7ad070ed2f45403e7b2a601e6
+path = iso/1/mageia-livecd-1-KDE4-africa-india-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-KDE4-africa-india-cdrom-i586.torrent
+
+; GNOME LiveCDs (32bit)
+[live-gnome-europe1-cd-i586]
+flavour = LiveCD 32bit
+name = GNOME
+size = 700MB
+lang = Europa set 1
+langs = de|en|es|fr|it|pl|pt|ru
+md5 = be86c06cc4ad27b0ae36f673ddbfc489
+sha1 = fd648c7a21d54c2a52f9ed66cf1093f82acd828c
+path = iso/1/mageia-livecd-1-GNOME-europe1-americas-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-GNOME-europe1-americas-cdrom-i586.torrent
+
+[live-gnome-europe2-cd-i586]
+flavour = LiveCD 32bit
+name = GNOME
+size = 700MB
+lang = Europa set 2
+langs = 
+md5 = a8550c9932d7a7430fa4f574895f881e
+sha1 = fc191d30cf822ef5dfffcfbb0d228e442db00530
+path = iso/1/mageia-livecd-1-GNOME-europe2-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-GNOME-europe2-cdrom-i586.torrent
+
+[live-gnome-asia-cd-i586]
+flavour = LiveCD 32bit
+name = GNOME
+size = 700MB
+lang = Asia set
+langs = 
+md5 = b415d0d8b7f0384c16ebc18dcaccbbb0
+sha1 = 1cd93b7c34149bf326b22b61afa47bf7144a9921
+path = iso/1/mageia-livecd-1-GNOME-asia-noindia-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-GNOME-asia-noindia-cdrom-i586.torrent
+
+[live-gnome-africa-cd-i586]
+flavour = LiveCD 32bit
+name = GNOME
+size = 700MB
+lang = Africa/India set
+langs = 
+md5 = 621f4e965c04e49b8602b4ec670e8466
+sha1 = 753afcd28978ff89dc0a8840f8f33b65bf8dad30
+path = iso/1/mageia-livecd-1-GNOME-africa-india-cdrom-i586.iso
+torrent = iso/1/torrents/mageia-livecd-1-GNOME-africa-india-cdrom-i586.torrent
+
+; boot.iso
 [netboot-i586]
+flavour = boot.iso CD
 name = boot.iso 32bit CD
 size = 40MB
 lang = All supported
-path = distrib/cauldron/i586/install/images/boot.iso
+path = distrib/1/i586/install/images/boot.iso
 
 [netboot-x86_64]
+flavour = boot.iso CD
 name = boot.iso 64bit CD
 size = 40MB
 lang = All supported
-path = distrib/cauldron/x86_64/install/images/boot.iso
+path = distrib/1/x86_64/install/images/boot.iso
 
+; mgaonline RPM
 [mgaonline]
+type = rpm
 hidden = true
 name = mgaonline
 size = 196KB
 page_title = mgaonline
-post_link = /en/1/migrate/
+post_link = /migrate/
 post_title = Go back to the migration page
 path = distrib/1/i586/media/core/release/mgaonline-2.77.29-1.mga1.noarch.rpm
diff --git a/downloads.php b/downloads.php
index f9d8c184d..9fc6d51c2 100644
--- a/downloads.php
+++ b/downloads.php
@@ -10,7 +10,7 @@ include 'downloads_locales.php';
 if (!array_key_exists($locale, $_t))
     $locale = 'en';
 
-$_t = $_t[$locale];
+$_t = array_merge($_t['en'], $_t[$locale]);
 
 $prods = parse_ini_file('downloads.ini', true);
 $countries = array(
@@ -43,50 +43,83 @@ $s = '';
 $glob = array_shift($prods);
 $popularity = array_shift($prods);
 $i = 0;
+
+$prods2 = array();
 foreach ($prods as $k => $p) {
     if (isset($p['hidden'])) {
         continue;
     }
-    $iso = sprintf('%s-%s', $glob['prefix'], $k);
+    $prods2[$p['flavour']][$k] = $p;
+}
+
+$s1 = null;
+$s2 = null;
+$s3 = null;
+foreach ($prods2 as $flavour => $prods) {
 
-    $dl_link = sprintf('/%s/downloads/dl.php?product=%s', $locale, $iso);
-    $bt_link = isset($p['torrent']) ?
-        sprintf('/%s/downloads/dl.php?product=%s&torrent=1', $locale, $iso) :
-        null;
+    $flavour = sprintf('<td rowspan="%d">%s</td>', count($prods), $flavour);
+    foreach ($prods as $k => $p) {
+        $iso = sprintf('%s-%s', $glob['prefix'], $k);
 
-    $pop = array_key_exists($k, $popularity) ? $popularity[$k] : 0;
+        $dl_link = sprintf('/%s/downloads/dl.php?product=%s', $locale, $iso);
+        $bt_link = isset($p['torrent']) ?
+            sprintf('/%s/downloads/dl.php?product=%s&torrent=1', $locale, $iso) :
+            null;
 
-    $s .= sprintf($tmpl,
-        '', //($i == 0) ? ' class="reco"' : '',
-        $p['name'], $_t[$p['lang']], $p['size'],
-        $pop, $pop,
-        $dl_link, $_t['download'],
-        $bt_link,
-        !is_null($bt_link) ? $_t['download'] : ''
-    );
+        $pop = array_key_exists($k, $popularity) ? $popularity[$k] : 0;
 
-    $i++;
+        $s = sprintf($tmpl,
+            '',
+            //$flavour,
+            $p['name'], $_t[$p['lang']], $p['size'],
+            $pop, $pop,
+            $dl_link, $_t['download'],
+            $bt_link,
+            !is_null($bt_link) ? $_t['download'] : ''
+        );
+        $flavour = null;
+        $i++;
+        
+        if ($p['flavour'] == 'LiveCD 32bit')
+            $s2 .= $s;
+        elseif ($p['flavour'] == 'DVD'
+            || $p['flavour'] == 'CD')
+            $s1 .= $s;
+        else
+            $s3 .= $s;
+    }
 }
 
-$dl_table = <<<T
+$table_tmpl = <<<T
+<h3>%s</h3>
 <table class="dlt2">
     <thead>
         <tr>
-            <th>{$_t['flavour']}</th>
+            <th style="width: 12em;">{$_t['flavour']}</th>
             <th>{$_t['language']}</th>
             <th class="size">{$_t['size']}</th>
-            <th>Popularity</th>
+            <th>{$_t['popularity']}</th>
             <th>{$_t['link']}</th>
             <th>BitTorrent</th>
         </tr>
     </thead>
-    <tbody>
-    {$s}
-    </tbody>
+    <tbody>%s</tbody>
 </table>
-<p class="dlinfo">{$_t['all_languages']}</p>
-<p class="dlinfo">{$_t['limited_languages']}</p>
-<p class="dlinfo">{$_t['euro_languages']}</p>
+T;
+
+$dl_table = sprintf($table_tmpl, $_t['for_full_install'], $s1)
+    . "<p class='dlinfo'>{$_t['all_languages']}</p>
+    <p class='dlinfo'>{$_t['limited_languages']}</p><br>"
+
+    . sprintf($table_tmpl, $_t['for_test_live'], $s2)
+    . "<p class='dlinfo'>{$_t['def-Europa set 1']}</p>
+    <p class='dlinfo'>{$_t['def-Europa set 2']}</p>
+    <p class='dlinfo'>{$_t['def-Asia set']}</p>
+    <p class='dlinfo'>{$_t['def-Africa/India set']}</p><br>"
+
+    . sprintf($table_tmpl, $_t['for_network'], $s3);
+
+$dl_table .= <<<T
 <p class="dlinfo">Not sure of what ISO to download? This may still be a bit verbose,
 but you may want to <a href="http://www.mageia.org/wiki/doku.php?id=mageia_installation_media">read
 this article detailing our different install media</a>.</p>
diff --git a/downloads_locales.php b/downloads_locales.php
index 7b1f7ecaa..29bb14972 100644
--- a/downloads_locales.php
+++ b/downloads_locales.php
@@ -12,7 +12,7 @@ $_t = array(
             This is FOR: developers, packagers, test users ONLY.',
         'warn_2' => 'Whatever you may do with the provided ISO disc image
                 will be done at your own risk, with your own responsibility.',
-        'title_ok' => 'You still want to download and test Mageia 1 RC?',
+        'title_ok' => 'You still want to download and test Mageia 1?',
         'dl_help' => 'Just pick the ISO image that is best for you; if you are not sure, you should pick from the first two.',
         'changes_since_a2' => 'Changes since Beta 2',
         'release_docs' => 'Release Documents',
@@ -29,7 +29,7 @@ $_t = array(
         'dl_mirror_loc' => 'This <a href="%s">%s</a> download mirror is located in %s (%s).',
         'dl_alt_mirrors' => 'If it does not work well for you, <a href="#om" id="other_mirrors_btn">check out these other mirrors</a>.',
         'whatdouthink?' => 'What do you think of it?',
-        'give_feedback' => 'You are very welcome to give your impressions on Mageia 1 RC, wherever you want:
+        'give_feedback' => 'You are very welcome to give your impressions on Mageia 1, wherever you want:
                 on <a href="http://forums.mageia.org/">our forums</a>,
                 <a href="http://blog.mageia.org/">our blog</a>, on <em>your</em> blog,
                 on Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
@@ -57,7 +57,24 @@ Note that translations are on their way.',
         'All supported' => 'All supported',
         'English' => 'English',
         'Limited' => 'Limited',
-        'European set' => 'Europa set'
+        'European set' => 'Europa set',
+        'Europa set 1' => 'Europa 1',
+        'Europa set 2' => 'Europa 2',
+        'Asia set' => 'Asia',
+        'Africa/India set' => 'Africa/India',
+        'popularity' => 'Popularity',
+        'for_full_install' => 'For a full installation:',
+        'for_test_live' => 'For live test and install: LiveCD 32bit',
+        'for_network' => 'For a network install:',
+        'def-Europa set 1' => 'Europa set 1 of languages: Deutsch, English (several variants), greek, español, français, greek, italiano, Dutch, português, português do Brasil, Turkish.',
+        'def-Europa set 2' => 'Europa set 2 of languages: Bulgarian, Czech, Danish, American English, Estonian,
+            Finnish, Croatian, Hungarian, Lithuanian, Latvian, Norwegian Bokmaal, Norwegian Nynorsk, Polish,
+            Romanian, Russian, Swedish, Ukrainian, Uzbek, Uzbek (cyrillic).',
+        'def-Asia set' => 'Asia set 1 of languages: American English, Indonesian, Japanese, Korean,
+            Thai, Vietnamese, Chinese Simplified, Chinese Traditional.',
+        'def-Africa/India set' => 'Africa/India set of languages: Afrikaans, Amharic, Arabic, Assamese, Berber, Bengali, American English,
+            Hausa, Hebrew, Hindi, Igbo, Kannada, Malayalam, Marathi,
+            Punjabi, Tamil, Tswana, Tsonga, Venda, Xhosa, Yoruba, Zulu.'
     ),
     'fr' => array(
         'download' => 'télécharger',
@@ -69,14 +86,14 @@ Note that translations are on their way.',
         Ce logiciel n&rsquo;est PAS prévu pour un usage quotidien, une évaluation publique ou un environnement de production.
         Ce logiciel est prévu pour des TESTS, par des développeurs ou empaqueteurs.',
         'warn_2' => 'Quel que soit l&rsquo;usage que vous ferez des images ISO mises à votre disposition, cela sera fait en votre pleine conscience des risques encourus, avec vos propres responsabilités.',
-        'title_ok' => 'Vous voulez toujours télécharger et tester Mageia 1 RC&nbsp;?',
+        'title_ok' => 'Vous voulez toujours télécharger et tester Mageia 1&nbsp;?',
         'dl_help' => 'Choisissez l&rsquo;image qui vous convient&nbsp;; si vous n&rsquo;êtes pas sûr, prenez-en une parmi les premières.',
         'changes_since_a2' => 'Modifications depuis la version Beta 2',
         'release_docs' => 'Documents',
         'whatismageia' => 'Qu&rsquo;est-ce que Mageia&nbsp;?',
         'size' => 'Taille',
         'flavour' => 'Variante',
-        'language' => 'Langue',
+        'language' => 'Langues',
         'link' => 'Lien',
         'dl_shld_start' => 'Le téléchargement de %s va démarrer dans quelques secondes',
         'dl_size' => '(taille d&rsquo;environ %s).',
@@ -86,7 +103,7 @@ Note that translations are on their way.',
         'dl_mirror_loc' => 'Le miroir de téléchargement <a href="%s">%s</a> est en %s (%s).',
         'dl_alt_mirrors' => 'S&rsquo;il ne fonctionne pas bien, vous pouvez aussi <a href="#om" id="other_mirrors_btn">essayer un autre miroir</a>.',
         'whatdouthink?' => 'Qu&rsquo;en pensez-vous&nbsp;?',
-        'give_feedback' => 'Donnez-nous vos impressions sur cette RC, par le moyen que vous préférez&nbsp;: sur les <a href="http://forums.mageia.org/" hreflang="en">forums</a>, sur <a href="http://blog.mageia.org/fr/">notre blog</a>, sur <em>votre</em> blog, sur Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
+        'give_feedback' => 'Donnez-nous vos impressions sur Mageia 1, par le moyen que vous préférez&nbsp;: sur les <a href="http://forums.mageia.org/" hreflang="en">forums</a>, sur <a href="http://blog.mageia.org/fr/">notre blog</a>, sur <em>votre</em> blog, sur Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
         Dans tous les cas, n&rsquo;oubliez pas de pointer vers <a href="http://mageia.org/">mageia.org</a>.',
         'report_bug' => 'Si vous remarquez un bug, merci de <a href="/en/support/report-a-bug/">nous en informer</a> afin que nous puissions le corriger.',
         'notify_web' => 'Si vous rencontrez un problème pour télécharger cette beta,
@@ -106,7 +123,7 @@ Note that translations are on their way.',
         et tant d&rsquo;autres&nbsp;! Consultez la <a href="http://mageia.org/wiki/doku.php?id=tmp:supported_locales">liste complète</a>.',
         'euro_languages' => 'Langues européennes&nbsp;: allemand, anglais, espagnol, français, italien, polonais, portugais brésilien, russe.
         Davantage de langues seront disponibles dans la version finale.',
-        'All supported' => 'Toutes inclues',
+        'All supported' => 'Toutes',
         'limited_languages' => 'Limité&nbsp;: biélo-russe, catalan, allemand, anglais, espagnol, français, hongrois, italien, polonais, portugais, ukrainien.',
         'English' => 'Anglais',
         'Limited' => 'Limité',
@@ -123,7 +140,7 @@ Note that translations are on their way.',
             Diese Version ist GEDACHT FÜR: Tests von Entwicklern und Paketbauern.',
         'warn_2' => 'Alles, was Sie mit den angebotenen ISO-Abbildern machen geschieht 
                 auf Ihr eigenes Risiko, in Ihrer eigenen Verantwortung.',
-        'title_ok' => 'Sie wollen jetzt Mageia 1 RC herunterladen und testen?',
+        'title_ok' => 'Sie wollen jetzt Mageia 1 herunterladen und testen?',
         'dl_help' => 'Suchen Sie sich das für Sie passende ISO-Abbild aus. Falls Sie nicht sicher sind, sollten Sie eines der ersten Abbilder auswählen.',
         'changes_since_a2' => 'Änderungen seit Beta 2',
         'release_docs' => 'Dokumente zum Release',
@@ -180,7 +197,7 @@ Beachten Sie, dass an der Übersetzung noch gearbeitet wird.',
             Dit is NIET BEDOELD VOOR: dagelijks gebruik, publieke recencies, evaluatie voor persoonlijk gebruik of in een produktieomgeving.
             Dit is WEL BEDOELD VOOR: Mageia ontwikkelaars en het testen door packagers.',
         'warn_2' => 'Het gebruik van de aangeboden ISO-image is geheel voor uw eigen risico en rekening, en voor eigen verantwoordelijkheid.',
-        'title_ok' => 'U wilt nog steeds Mageia 1 RC downloaden?',
+        'title_ok' => 'U wilt nog steeds Mageia 1 downloaden?',
         'dl_help' => 'Kies het ISO-bestand welke voor u het beste is; Mocht u twijfelen dan kunt u het beste een van de eersten kiezen.',
         'changes_since_a2' => 'Veranderingen sinds Beta 2',
         'release_docs' => 'Release Documenten',
@@ -197,7 +214,7 @@ Beachten Sie, dass an der Übersetzung noch gearbeitet wird.',
         'dl_mirror_loc' => 'Deze <a href="%s">%s</a> spiegelserver bevindt zich in %s (%s).',
         'dl_alt_mirrors' => 'Mocht deze server voor u niet goed bereikbaar zijn, <a href="#om" id="other_mirrors_btn">kijkt u dan eens naar deze andere spiegelservers</a>.',
         'whatdouthink?' => 'Wat vindt u ervan?',
-        'give_feedback' => 'Graag horen wij uw bevindingen met Mageia 1 RC, waar u dat het beste uitkomt:
+        'give_feedback' => 'Graag horen wij uw bevindingen met Mageia 1, waar u dat het beste uitkomt:
                 op <a href="http://forums.mageia.org/">onze fora</a>,
                 <a href="http://blog.mageia.org/">ons blog</a>, op <em>uw</em> blog,
                 op Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
@@ -238,7 +255,7 @@ Wij zijn druk bezig met vertalingen naar andere talen.',
         Αυτό ΔΕΝ ΕΙΝΑΙ ΓΙΑ: χρήση, δημόσια αξιολόγηση, παραγωγική εργασία.
         Αυτό ειναι ΓΙΑ: προγραμματιστές, δημιουργούς πακέτων, χρήστες δοκιμών ΜΟΝΟ.',
         'warn_2' => 'Οποιαδήποτε και αν είναι η χρήση που θα κάνετε των εικόνων ISO που βρίσκονται στην διάθεσή σας, αυτή θα γίνει με δική σας ευθύνη και με πλήρη επίγνωση των τυχών κινδύνων που μπορεί να υπάρξουν.',
-        'title_ok' => 'Θέλετε ακόμα να κάνετε λήψη και να δοκιμάσετε τη Mageia 1 RC?',
+        'title_ok' => 'Θέλετε ακόμα να κάνετε λήψη και να δοκιμάσετε τη Mageia 1?',
         'dl_help' => 'Απλά επιλέξτε μία εικόνα ISO που είναι καταλληλότερη για εσάς. Αν δεν είστε σίγουροι, καλύτερα να διαλέξετε μία εκ των δύο πρώτων.',
         'changes_since_a2' => 'Αλλαγές από Beta 2',
         'release_docs' => 'Τεκμηρίωση κυκλοφορίας',
@@ -255,7 +272,7 @@ Wij zijn druk bezig met vertalingen naar andere talen.',
         'dl_mirror_loc' => 'Αυτός <a href="%s">%s</a> ο καθρεφτισμός λήψης βρίσκεται στο(ν)/στη(ν) %s (%s).',
         'dl_alt_mirrors' => 'Αν δε δουλεύει καλά για σας, <a href="#om" id="other_mirrors_btn">ελέγξτε αυτούς τους καθρεφτισμούς</a>.',
         'whatdouthink?' => 'Ποιά είναι η γνώμη σας γι\'αυτό;',
-        'give_feedback' => 'Είστε ευπρόσδεκτος να αναφέρετε τις εντυπώσεις σας από τη Mageia 1 RC, όπου θέλετε:
+        'give_feedback' => 'Είστε ευπρόσδεκτος να αναφέρετε τις εντυπώσεις σας από τη Mageia 1, όπου θέλετε:
         στα <a href="http://forums.mageia.org/">forums μας</a>,
         <a href="http://blog.mageia.org/">στο ιστολόγιο μας</a>, στο  <em>δικό σας</em> ιστολόγιο,
         στο Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
@@ -296,7 +313,7 @@ Wij zijn druk bezig met vertalingen naar andere talen.',
             Esto es PARA: desarrolladores, empaquetadores, usuarios de prueba SOLAMENTE.',
         'warn_2' => 'Todo lo que realice con la imagen de disco ISO provista
                 será bajo su propio riesgo y bajo su responsabilidad.',
-        'title_ok' => '¿Aún desea descargar y probar Mageia 1 RC?',
+        'title_ok' => '¿Aún desea descargar y probar Mageia 1?',
         'dl_help' => 'Seleccione la imagen ISO que mejor se ajusta a usted;; si no está seguro, debería elegir entre las dos primeras.',
         'changes_since_a2' => 'Cambios desde Beta 2',
         'release_docs' => 'Documentos de la versión',
@@ -313,7 +330,7 @@ Wij zijn druk bezig met vertalingen naar andere talen.',
         'dl_mirror_loc' => 'Éste <a href="%s">%s</a> servidor espejo de descarga está ubicado en %s (%s).',
         'dl_alt_mirrors' => 'Si no funciona bien para usted, <a href="#om" id="other_mirrors_btn">pruebe estos otros servidores espejo</a>.',
         'whatdouthink?' => '¿Qué le parece?',
-        'give_feedback' => 'Nos interesa conocer su opinión sobre Mageia 1 RC, como usted prefiera:
+        'give_feedback' => 'Nos interesa conocer su opinión sobre Mageia 1, como usted prefiera:
                 en <a href="http://forums.mageia.org/">nuestros foros</a>,
                 <a href="http://blog.mageia.org/es">nuestro blog</a>, en <em>su</em> blog,
                 en Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
@@ -354,7 +371,7 @@ Note que las traducciones están en progreso.',
             See ON: AINULT arendajatele, pakendajatele ja testijatele.',
         'warn_2' => 'Mida te ka ei võtaks pakutava ISO-tõmmisega ette,
                 teete te seda täielikult omal riisikol ja ise vastutades.',
-        'title_ok' => 'Kas soovite ikka veel Mageia 1 RC alla laadida ja testida?',
+        'title_ok' => 'Kas soovite ikka veel Mageia 1 alla laadida ja testida?',
         'dl_help' => 'Valige lihtsalt kõige paremini sobiv ISO-tõmmis. Kui te pole kindel, valige üks kahest esimesest.',
         'changes_since_a2' => 'Muudatused pärast Beta 2',
         'release_docs' => 'Väljalaskedokumendid',
@@ -371,7 +388,7 @@ Note que las traducciones están en progreso.',
         'dl_mirror_loc' => 'Selle <a href="%s">%s</a> allalaadimise peegelsaidi asukohaks on %s (%s).',
         'dl_alt_mirrors' => 'Kui see teie puhul ei toimi, <a href="#om" id="other_mirrors_btn">proovige kasutada teisi peegelsaite</a>.',
         'whatdouthink?' => 'Kuidas see teile meeldib?',
-        'give_feedback' => 'Me ootame väga teie muljeid Mageia 1 RC kohta, mida te võite jagada näiteks järgmistes kohtades:
+        'give_feedback' => 'Me ootame väga teie muljeid Mageia 1 kohta, mida te võite jagada näiteks järgmistes kohtades:
                 <a href="http://forums.mageia.org/">meie foorumites</a>,
                 <a href="http://blog.mageia.org/">meie ajaveebis</a>, <em>oma</em> ajaveebis,
                 Twitteris (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
@@ -465,7 +482,7 @@ Vær klar over at vi fortsatt lokaliserer infrastrukturen vår.',
             Această versiune este PENTRU: dezvoltatori, împachetatori și testori.',
         'warn_2' => 'Indiferent ce doriți să faceți cu imaginea ISO furnizată
                o faceți pe propriul risc și pe propria voastră răspundere.',
-        'title_ok' => 'Sigur doriți să descărcați și să testați Mageia 1 RC?',
+        'title_ok' => 'Sigur doriți să descărcați și să testați Mageia 1?',
         'dl_help' => 'Alegeți imaginea ISO care vi-se potrivește; dacă nu sînteți sigur, alegeți dintre primele două.',
         'changes_since_a2' => 'Modificări față de Alfa 2',
         'release_docs' => 'Documentele ediției',
@@ -482,7 +499,7 @@ Vær klar over at vi fortsatt lokaliserer infrastrukturen vår.',
         'dl_mirror_loc' => 'Acest server alternativ <a href="%s">%s</a> este localizat în %s (%s).',
         'dl_alt_mirrors' => 'Dacă nu funcționează bine, <a href="#om" id="other_mirrors_btn">încercați și aceste servere alternative</a>.',
         'whatdouthink?' => 'Ce părere aveți?',
-        'give_feedback' => 'Sînteți bine venit să ne spuneți ce părere aveți despre Mageia 1 RC, oricînd doriți:
+        'give_feedback' => 'Sînteți bine venit să ne spuneți ce părere aveți despre Mageia 1, oricînd doriți:
                 pe <a href="http://forums.mageia.org/">forumurile noastre</a>,
                 <a href="http://blog.mageia.org/">blogul nostru</a>, pe blogul <em>vostru</em>,
                 pe Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
@@ -522,7 +539,7 @@ De remarcat că traducerile sînt în curs.',
             Это ДЛЯ: тестирования разработчиками и упаковщиками.',
         'warn_2' => 'Чтобы вы не делали с предоставленным образом диска
                 вы делаете это на свой страх и риск.',
-        'title_ok' => 'Вы всё ещё хотите скачать и протестировать Mageia 1 RC?',
+        'title_ok' => 'Вы всё ещё хотите скачать и протестировать Mageia 1?',
         'dl_help' => 'Просто выберите подходящий вам образ; если вы не уверенны, вам стоит выбрать один из первых.',
         'changes_since_a2' => 'Изменения по сравнению с Beta 2',
         'release_docs' => 'Документация по релизу',
@@ -539,7 +556,7 @@ De remarcat că traducerile sînt în curs.',
         'dl_mirror_loc' => 'Это <a href="%s">%s</a> зеркало загрузки расположенно в %s (%s).',
         'dl_alt_mirrors' => 'Если это вам не помогло, <a href="#om" id="other_mirrors_btn">просмотрите список остальных зеркал</a>.',
         'whatdouthink?' => 'Что вы об этом думаете?',
-        'give_feedback' => 'Мы будем рады вашим отзывам и впечатлениям о Mageia 1 RC, где бы то ни было:
+        'give_feedback' => 'Мы будем рады вашим отзывам и впечатлениям о Mageia 1, где бы то ни было:
                 на <a href="http://forums.mageia.org/">наших форумах</a>,
                 <a href="http://blog.mageia.org/">нашем блоге</a>, на <em>вашем</em> блоге,
                 в Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
@@ -581,7 +598,7 @@ De remarcat că traducerile sînt în curs.',
             Bu sürüm şunlar için UYGUNDUR: SADECE geliştiriciler, paketleyiciler, deneme kullanıcıları.',
         'warn_2' => 'Sunulan ISO disk kalıbı ile ne yaparsanız sadece
                 kendiniz sorumlu olur ve risk almış olursunuz.',
-        'title_ok' => 'Yine de Mageia 1 RC sürümünü indirmek ve denemek istiyor musunuz?',
+        'title_ok' => 'Yine de Mageia 1 sürümünü indirmek ve denemek istiyor musunuz?',
         'dl_help' => 'Size uygun olan ISO kalıbını seçin; emin değilseniz ilk ikisinden seçebelirisiniz.',
         'changes_since_a2' => 'Alfa 2\' den beri yapılan değişiklikler',
         'release_docs' => 'Yayım belgeleri',
@@ -598,7 +615,7 @@ De remarcat că traducerile sînt în curs.',
         'dl_mirror_loc' => 'Bu <a href="%s">%s</a> indirme yansısı %s (%s) üzerinde yer almaktadır.',
         'dl_alt_mirrors' => 'Bu yansı size hizmet veremiyorsa, <a href="#om" id="other_mirrors_btn">diğer yansıları kullanın</a>.',
         'whatdouthink?' => 'Hakkında ne düşünüyorsunuz?',
-        'give_feedback' => 'Mageia 1 RC hakkındaki izlenimlerinizi bizimle paylaşın::
+        'give_feedback' => 'Mageia 1 hakkındaki izlenimlerinizi bizimle paylaşın::
                 <a href="http://forums.mageia.org/">forumlarımızda</a>,
                 <a href="http://blog.mageia.org/">web günlümüzde</a>, <em>kendi</em> web günlüğünüzde,
                 Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
@@ -638,7 +655,7 @@ De remarcat că traducerile sînt în curs.',
             這個版本不適用於：一般使用，公開展示，個人或產品的檢驗。
             這個版本只適用於：開發者，套件打包者與測試者。',
         'warn_2' => '不管您使用這裡提供的光碟映像檔做什麼，您都必須自負風險。',
-        'title_ok' => '您還是要下載並測試 Mageia 1 RC 嗎？',
+        'title_ok' => '您還是要下載並測試 Mageia 1 嗎？',
         'dl_help' => '請挑選您要使用的 ISO 映像檔。若您不確定，通常就是從前兩個映像檔中選一個。',
         'changes_since_a2' => 'Beta 2 之後的改變',
         'release_docs' => '相關文件',
@@ -655,7 +672,7 @@ De remarcat că traducerile sînt în curs.',
         'dl_mirror_loc' => '這個 <a href="%s">%s</a> 下載的鏡像站位於 %s (%s)。',
         'dl_alt_mirrors' => '如果它不適合您， <a href="#om" id="other_mirrors_btn">請試試看其他的鏡像站</a>。',
         'whatdouthink?' => '您覺得它如何呢？',
-        'give_feedback' => '歡迎您提供您對於 Mageia 1 RC 的心得，無論您想要發表在：
+        'give_feedback' => '歡迎您提供您對於 Mageia 1 的心得，無論您想要發表在：
                 <a href="http://forums.mageia.org/">我們的討論區</a>，
                 <a href="http://blog.mageia.org/">我們的網誌</a>，或<em>您的</em>網誌，
                 或是 Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>)。
@@ -695,7 +712,7 @@ De remarcat că traducerile sînt în curs.',
             È PER: sviluppatori, packager, SOLO per utenti che vogliono fare del test.',
         'warn_2' => 'Quasiasi cosa tu faccia con queste immagini ISO che forniamo,
                 sarà fatta a tuo rischio e pericolo e ti assumerai la piena responsabilità.',
-        'title_ok' => 'Vuoi ancora scaricare e testare Mageia 1 RC?',
+        'title_ok' => 'Vuoi ancora scaricare e testare Mageia 1?',
         'dl_help' => 'Prendi semplicemente l immagine ISO più adatta alle tue necessità; se non sei sicuro, dovresti scegliere tra le prime due.',
         'changes_since_a2' => 'Modifiche dalla Beta 2',
         'release_docs' => 'Documenti della Release',
@@ -712,7 +729,7 @@ De remarcat că traducerile sînt în curs.',
         'dl_mirror_loc' => 'Questo <a href="%s">%s</a> mirror per il download si trova in %s (%s).',
         'dl_alt_mirrors' => 'Se non funziona bene, <a href="#om" id="other_mirrors_btn">prova questi altri mirror</a>.',
         'whatdouthink?' => 'Che cosa ne pensi?',
-        'give_feedback' => 'Sei il benvenuto per darci le tue impressioni su Mageia 1 RC, in qualsiasi parte:
+        'give_feedback' => 'Sei il benvenuto per darci le tue impressioni su Mageia 1, in qualsiasi parte:
                 nei <a href="http://forums.mageia.org/">nostri forum</a>,
                 <a href="http://blog.mageia.org/">nel nostro blog</a>, nel <em>tuo</em> blog,
                 su Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
@@ -753,7 +770,7 @@ Ricorda che le traduzioni sono in corso.',
             Tato verze JE ZAMÝŠLENA PRO: vývojáře, tvůrce balíčků, POUZE pro uživatele, kteří ji chtějí vyzkoušet.',
         'warn_2' => 'Cokoli hodláte udělat s poskytnutým ISO obrazem disku,
                 uděláte na své vlastní riziko, na svou vlastní zodpovědnost.',
-        'title_ok' => 'Pořád ještě chcete stáhnout a vyzkoušet Mageia 1 RC?',
+        'title_ok' => 'Pořád ještě chcete stáhnout a vyzkoušet Mageia 1?',
         'dl_help' => 'Vyberte si vhodný ISO obraz. Pokud si náhodou nejste jisti, měli byste si vybrat z prvních dvou.',
         'changes_since_a2' => 'Změny od Beta 2',
         'release_docs' => 'Dokumenty k vydání',
@@ -770,7 +787,7 @@ Ricorda che le traduzioni sono in corso.',
         'dl_mirror_loc' => 'Tento <a href="%s">%s</a> stahovací server je umístěn na %s (%s).',
         'dl_alt_mirrors' => 'Pokud tento ve vašem případě nepracuje uspokojivě, <a href="#om" id="other_mirrors_btn">můžete použít jiný server</a>.',
         'whatdouthink?' => 'Co si o tom myslíte?',
-        'give_feedback' => 'Podělte se s námi o své dojmy z Mageia 1 RC kdekoli budete chtít:
+        'give_feedback' => 'Podělte se s námi o své dojmy z Mageia 1 kdekoli budete chtít:
                 na <a href="http://forums.mageia.org/">našich fórech</a>,
                 <a href="http://blog.mageia.org/">našem blogu</a>, na <em>svém</em> blogu,
                 na Twitteru (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
@@ -811,7 +828,7 @@ Mějte na paměti, že na překladech se ještě pracuje.',
             This is FOR: developers, packagers, test users ONLY.',
         'warn_2' => 'Whatever you may do with the provided ISO disc image
                 will be done at your own risk, with your own responsibility.',
-        'title_ok' => 'You still want to download and test Mageia 1 RC?',
+        'title_ok' => 'You still want to download and test Mageia 1?',
         'dl_help' => 'Basta escolher a imagem ISO que for melhor para você. Se você não tiver certeza, você deve escolher entre as duas primeiras.',
         'changes_since_a2' => 'Alterações desde o Beta 2',
         'release_docs' => 'Documentos de Lançamento',
@@ -829,7 +846,7 @@ Mějte na paměti, že na překladech se ještě pracuje.',
         'dl_mirror_loc' => 'This <a href="%s">%s</a> download mirror is located in %s (%s).',
         'dl_alt_mirrors' => 'If it does not work well for you, <a href="#om" id="other_mirrors_btn">check out these other mirrors</a>.',
         'whatdouthink?' => 'What do you think of it?',
-        'give_feedback' => 'You are very welcome to give your impressions on Mageia 1 RC, wherever you want:
+        'give_feedback' => 'You are very welcome to give your impressions on Mageia 1, wherever you want:
                 on <a href="http://forums.mageia.org/">our forums</a>,
                 <a href="http://blog.mageia.org/">our blog</a>, on <em>your</em> blog,
                 on Twitter (<a href="http://twitter.com/mageia_org">@mageia_org</a>).
diff --git a/en/downloads/dl.php b/en/downloads/dl.php
index 117ccf1ea..c6935c57a 100644
--- a/en/downloads/dl.php
+++ b/en/downloads/dl.php
@@ -116,16 +116,18 @@ $dl2_mirror_alt = sprintf($_t['dl_mirror_loc'],
                 ?></p>
 
                 <div class="dlinfo">
+                    <p><?php echo $dl2_mirror_alt; ?></p>
                     <?php if (isset($p['md5'])): ?>
                 <p><?php echo $_t['signs_check_1']; ?></p>
+                <div id="check-signs">
                 <pre class="term">
 $ md5sum <?php echo basename($product_dl_link), "\n", $p['md5'], "\n"; ?>
 
 $ sha1sum <?php echo basename($product_dl_link), "\n", $p['sha1'], "\n"; ?>
 </pre>
                 <p><?php echo $_t['signs_check_2']; ?></p>
+                </div>
                     <?php endif; ?>
-                <p><?php echo $dl2_mirror_alt; ?></p>
                 </div>
                 <table class="dlt2 dlinfo" id="other_mirrors" style="display: none;">
                     <thead><tr><th>Country</th><th>City</th><th>Download mirrors</th></tr></thead>
@@ -135,25 +137,22 @@ $ sha1sum <?php echo basename($product_dl_link), "\n", $p['sha1'], "\n"; ?>
                 <hr />
         </div></div>
         <div class="yui-g">
-            <div class="yui-u first"><div class="para"
-                <h2><?php echo $_t['whatdouthink?']; ?></h2>
-                <p><?php echo $_t['give_feedback']; ?></p>
-                <p><?php echo $_t['report_bug'];  ?></p>
-                <p><?php echo $_t['notify_web']; ?></p>
-
-                <hr />
+            <div class="yui-u first"><div class="para">
+                <h2>Thank <em>you</em>!</h2>
+                ...
+                <hr>
+                <h2>Spread the word!</h2>
+                <p><?php include 'dl_twitter.php'; echo dl_twitter($locale); ?></p>
+                
+                <hr>
             </div></div>
             <div class="yui-u"><div class="para">
-                <h2><?php echo sprintf($_t['wanttohelp?'], '<a href="http://mageia.org/wiki/doku.php?id=contribute">', '</a>'); ?></h2>
-                <p><?php echo $_t['ucanhelp']; ?></p>
-                <p><?php echo sprintf($_t['wherehelp'],
-                    '<a href="http://mageia.org/wiki/doku.php?id=marketing">', '</a>',
-                    '<a href="http://mageia.org/wiki/doku.php?id=web">', '</a>',
-                    '<a href="http://mageia.org/wiki/doku.php?id=translators">', '</a>',
-                    '<a href="http://mageia.org/wiki/doku.php?id=packaging">', '</a>',
-                    '<a href="http://mageia.org/wiki/doku.php?id=qateam">', '</a>',
-                    '<a href="http://mageia.org/donate/">', '</a>'
-                ); ?>
+                <h2>Need some help? Talk to us!</h2>
+                <p><?php echo $_t['give_feedback']; ?></p>
+                <p><?php echo $_t['report_bug'];  ?></p>
+                <hr>
+                <h2><?php echo sprintf($_t['wanttohelp?'], '<strong><a href="http://mageia.org/contribute/">', '</a></strong>'); ?></h2>
+                <hr>
             </div></div>
         </div>
     </div>
diff --git a/en/downloads/index.php b/en/downloads/index.php
index 7a11df7d7..6483d70aa 100644
--- a/en/downloads/index.php
+++ b/en/downloads/index.php
@@ -1,22 +1,21 @@
 <?php require '../../downloads.php';
 
-$_t['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">Mageia 1 RC</em>');
-$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 1 RC');
+$_t['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">Mageia 1</em>');
+$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 1');
 ?>
 <!DOCTYPE html>
 <html lang="<?php echo $locale; ?>">
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
     <title><?php echo $_t['page_title']; ?></title>
-    <meta name="description" content="<?php echo $_t['page_desc']; ?>" />
-    <meta name="keywords" content="<?php echo $_t['page_kw']; ?>" />
-    <meta name="author" content="Mageia" />
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css" >
+    <meta name="description" content="<?php echo $_t['page_desc']; ?>">
+    <meta name="keywords" content="<?php echo $_t['page_kw']; ?>">
+    <meta name="author" content="Mageia">
+    <link rel="stylesheet" type="text/css" href="/g/style/all.css">
     <?php include '../../analytics.php'; ?>
 </head>
 <body>
     <?php include '../../langs.php'; ?>
-    
     <div id="doc" class="yui-t7">
         <div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1></div>
         <div id="bd" role="main">
@@ -25,29 +24,7 @@ $_t['page_title'] = sprintf($_t['page_title'], 'Mageia 1 RC');
                 <p><?php echo $_t['dl_help']; ?></p>
                 <br />
                 <?php echo $dl_table; ?>
-
             </div></div>
-            <div class="yui-g">
-                <div class="yui-u first"><div class="para" style="padding-right: 0;">
-                    <h2><?php echo $_t['changes_since_a2']; ?></h2>
-                    <ul>
-                        <li>bugfixes &ndash; lots of them!</li>
-                        <li>packages version updates</li>
-                        <li>more packages in ISOs</li>
-                    </ul>
-                </div></div>
-                <div class="yui-u"><div class="para">
-                    <h2><?php echo $_t['release_docs']; ?></h2>
-                    <ul>
-                        <li><a href="/wiki/doku.php?id=iso1:rc_release_notes" hreflang="en">Release Notes</a></li>
-                        <li><a href="/wiki/doku.php?id=mageia1:errata" hreflang="en">Errata</a></li>
-                        <li><a href="http://blog.mageia.org/en/" hreflang="en">Blog post</a></li>
-                        <li><a href="/"><?php echo $_t['whatismageia']; ?></a></li>
-                    </ul>
-                    <p>Finale will be released on June, 1<sup>st</sup>.</p>
-                    <p>You can check our <a href="http://mageia.org/wiki/doku.php?id=iso_1_specifications#expected_milestones">roadmap for Mageia 1 here</a>.</p>
-                </div></div>
-            </div>
         </div>
     </div>
 </body>