diff options
| author | Romain d'Alverny <rda@mageia.org> | 2012-05-11 16:51:31 +0000 |
|---|---|---|
| committer | Romain d'Alverny <rda@mageia.org> | 2012-05-11 16:51:31 +0000 |
| commit | fd0396e495006d9356657d335b7e190373ad009d (patch) | |
| tree | 737299e8a06469622f3d1d8c2b2ec7f29f9044f7 | |
| parent | 6bcb8806646986476fc26d5a2cb6313fd413958a (diff) | |
| download | www-fd0396e495006d9356657d335b7e190373ad009d.tar www-fd0396e495006d9356657d335b7e190373ad009d.tar.gz www-fd0396e495006d9356657d335b7e190373ad009d.tar.bz2 www-fd0396e495006d9356657d335b7e190373ad009d.tar.xz www-fd0396e495006d9356657d335b7e190373ad009d.zip | |
updated layout and boot-nonfree
| -rw-r--r-- | en/2/index.php | 100 | ||||
| -rw-r--r-- | en/2/locales.php | 47 |
2 files changed, 93 insertions, 54 deletions
diff --git a/en/2/index.php b/en/2/index.php index 5656e678e..4eb4acebd 100644 --- a/en/2/index.php +++ b/en/2/index.php @@ -6,10 +6,9 @@ include 'locales.php'; $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); -$_t['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">Mageia 2 rc</em>'); -$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 2 rc'); +$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 2', 'release candidate'); +$_t['page_h1'] = sprintf($_t['page_h1'], 'Mageia 2', 'release candidate'); -require '../downloads/lib.php'; require '../downloads/get/lib.php'; ?> <!DOCTYPE html> @@ -24,54 +23,18 @@ require '../downloads/get/lib.php'; <link rel="stylesheet" href="/g/style/all.css"> <?php include '../../analytics.php'; ?> </head> -<body class="release"> +<body class="release downloads"> <?php echo $hsnav; ?> + <h1 id="mgnavt"><?php _e('page_h1')?></h1> <div id="doc4" class="yui-t7"> - <?php include 'nav.php'; ?> - <div id="hd" role="banner"><h1><a id="logo" href="/<?php echo $locale; ?>/"><span>Mageia</span></a> <span class="lsep">|</span> - <span class="subh">2 <em class="tag">release candidate</em></span></h1></div> <div id="bd" role="main"> <div class="yui-g"> - <div class="para"> - <p class="green-sign" style="margin-top: -13px;"> - This is a <em>candidate release</em> – - please check it out and report any outstanding issue<br> - DO NOT use it for production, the final stable release is coming on May 22<sup>nd</sup>.</p> - </div> + <div class="para"><p class="green-sign" style="margin-top: -13px;"><?php _e('rc-warning');?></p></div> </div> <div class="yui-ge bb1"> <div class="yui-u first rb1"> <div class="para"> - <h2>Download and test Mageia 2 rc</h2> - <p>You can check the <a href="https://wiki.mageia.org/en/Mageia_2_rc">release notes on the wiki</a>: - what's new, what to expect, what to test, how to report and contribute.</p> - <?php /* - <p>Major features planned for the final release notably include:</p> - <ul> - <li>KDE 4.8.x, GNOME 3.4.x, Sugar 0.95,</li> - <li>glibc 2.14.1, kernel 3.3, systemd,</li> - <li>MariaDB 5.5, PostgreSQL 8.4.10, 9.0.6 and 9.1.2,</li> - <br> - <li>upgradable from Mageia 1 (which was from Mandriva 2010.0 and 2010.1)</li> - <li>stable, secure, maintained,</li> - <li>and many others.</li> - </ul> - <p>Major benefits from Mageia 2:</p> - <ul> - <li>.</li> - </ul> - */ ?> - </div> - <div class="para"> - <h3>Full, exclusively Free Software DVDs and dual arch CD</h3> - <ul> - <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-i586-DVD.iso">Mageia 2 rc 32bit DVD</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-i586-DVD.iso&torrent=1">torrent</a></li> - <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-x86_64-DVD.iso">Mageia 2 rc 64bit DVD</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-x86_64-DVD.iso&torrent=1">torrent</a></li> - <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-dual-CD.iso">Mageia 2 rc dual CD</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-dual-CD.iso&torrent=1">torrent</a></li> - </ul> + <h2>Mageia 2 rc Free Software Installation Flavours</h2> <p class="dlinfo warn">Note that these DVD and CD ISOs are made of Free Software exclusively. As a consequence, proprietary Wi-Fi and video drivers are not included. If you need WiFi or specific video drivers <em>at install time</em>, @@ -83,19 +46,49 @@ require '../downloads/get/lib.php'; <p class="dlinfo">Up to 167 locales are supported: Deutsch, English, español, français, italiano, português, svenska, nederlands, polski, dansk, Русский and so much more! See the comprehensive list.</p> + <table class="fr-table dlt"> + <tbody> + <tr> + <th>DVD<br><span class="dlinfo">(3.4GB)</span></th> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-i586-DVD.iso" title="Mageia 2 rc 32bit DVD">32bit</a>, + <a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-i586-DVD.iso&torrent=1" title="Mageia 2 rc 32bit DVD">torrent</a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-x86_64-DVD.iso" title="Mageia 2 rc 64bit DVD">64bit</a>, + <a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-x86_64-DVD.iso&torrent=1" title="Mageia 2 rc 64bit DVD">torrent</a></td> + </tr> + <tr> + <th>CD<br><span class="dlinfo">(700MB)</span></th> + <td colspan="2"><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-dual-CD.iso" title="Mageia 2 rc dual CD">dualarch</a>, + <a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-dual-CD.iso&torrent=1" title="Mageia 2 rc dual CD">torrent</a></td> + </tr> + </tbody> + </table> </div> + <hr> <div class="para"> - <h3>Wired network-based install CD</h3> - <ul> - <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-Boot-i586-CD.iso">32bit</a></li> - <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-Boot-x86_64-CD.iso">64bit</a></li> - </ul> - <p class="dlinfo">Good to download (about 40 MB) and boot quickly into install mode - from <em>wired</em> network or local disk.</p> + <h2>Mageia 2 rc Wired Network-based Installation CD</h2> + <p class="dlinfo">Download quickly (about 40 MB) and immediately boot into install mode + from <em>wired</em> network or a local disk.</p> + + <table class="fr-table dlt"> + <tbody> + <tr> + <th>Pure Free Software</th> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-Boot-i586-CD.iso">32bit</a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-Boot-x86_64-CD.iso">64bit</a></td> + </tr> + <tr> + <th>With added nonfree firmware<br> + <span class="dlinfo">needed for some disc controllers, some network cards, etc.</span></th> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-Boot-nonfree-i586-CD.iso">32bit</a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-rc-Boot-nonfree-x86_64-CD.iso">64bit</a></td> + </tr> + </tbody> + </table> + </div> + <hr> <div class="para"> - <h3>LiveCDs, for a live test or full install</h3> - <!--<p>beta2 LiveCDs still have blocking issues; will be available later.</p>--> + <h2>Mageia 2 rc LiveCDs</h2> <table class="dlt2"> <thead><tr><th></th><th>GNOME</th><th>KDE</th></tr></thead> <tbody> @@ -175,7 +168,8 @@ require '../downloads/get/lib.php'; <div class="yui-u"> <div class="para"> <h3><a href="https://wiki.mageia.org/en/Mageia_2_rc">Release notes</a></h3> - <p>are <a href="https://wiki.mageia.org/en/Mageia_2_rc">on the wiki</a>!</p> + <p>You can check the <a href="https://wiki.mageia.org/en/Mageia_2_rc">release notes on the wiki</a>: + what's new, what to expect, what to test, how to report and contribute.</p> </div> <div class="para"> <h3>Release plan</h3> diff --git a/en/2/locales.php b/en/2/locales.php index b78f13375..024124f86 100644 --- a/en/2/locales.php +++ b/en/2/locales.php @@ -2,6 +2,10 @@ $_t = array( 'en' => array( + 'page_title' => 'Download %s %s', + 'page_h1' => 'Download <em><strong>%s</strong> %s</em>', + 'page_desc' => 'Download Mageia', + 'page_kw' => 'mageia, mageia 2, linux, free, download, iso, torrent, vm', 'release_docs' => 'Release Documents', 'whatismageia' => 'What is Mageia?', 'size' => 'Size', @@ -22,8 +26,49 @@ $_t = array( 'def-Africa/India set' => 'African/Indian 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.', + 'All supported' => 'All supported', 'Country' => 'Country', 'City' => 'City', - 'Download mirrors', 'Download mirrors' + 'Download mirrors' => 'Download mirrors', + 'unstable-warning' => 'This is a <em>beta</em> release. + PLEASE DO NOT USE IT FOR PRODUCTION. + <a href="/en/support/report-a-bug/" style="color: #fff">Report bugs <u>HERE</u></a>.', + + 'rc-warning' => 'This is a <em>candidate release</em> + – please check it out and report any outstanding issue<br> + DO NOT use it for production, the final stable release is coming on May 22<sup>nd</sup>.' + ), + 'fr' => array( + 'page_title' => 'Télécharger %s %s', + 'page_h1' => 'Télécharger <em><strong>%s</strong> %s</em>', + 'unstable-warning' => 'ATTENTION ! Il s’agit d’une version <em>beta</em>, instable. + NE L’INSTALLEZ PAS et NE L’UTILISEZ PAS en PRODUCTION ! + <a href="/en/support/report-a-bug/" style="color: #fff">Rapportez les bugs <u>ICI</u></a>.', + 'rc-warning' => 'Ceci est une pré-version de Mageia 2 + – merci de la vérifier et de nous rapporter tout problème. + NE L’UTILISEZ PAS en production pour le moment. Mageia 2 arrive le 22 mai !', + 'release_docs' => 'Notes de publication', + 'whatismageia' => 'Qu’est-ce que Mageia ?', + 'size' => 'Taille', + 'flavour' => 'Flavour', + 'language' => 'Langue', + 'link' => 'Lien', + 'for_full_install' => 'Versions pur Logiciel Libre :', + 'warn-free' => 'Note that these DVD ISOs are made of Free Software <em>exclusively</em>. As a consequence, <em>proprietary Wi-Fi and video drivers ' + . 'are not included</em>. If you need WiFi or specific video drivers at install time, you should go with above LiveCDs instead.', + 'for_test_live' => 'Versions LiveCD pour utiliser ou tester :', + 'for_network' => 'Versions pour installation réseau :', + 'def-Europa set 1' => 'European set 1 of languages: Deutsch, English (several variants), Greek, Español, Français, Italiano, Dutch, Português, Português do Brasil, Turkish.', + 'def-Europa set 2' => 'European 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' => 'Asian set 1 of languages: American English, Indonesian, Japanese, Korean, + Thai, Vietnamese, Chinese Simplified, Chinese Traditional.', + 'def-Africa/India set' => 'African/Indian 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.', + 'Country' => 'Pays', + 'City' => 'Ville', + 'Download mirrors' => 'Serveurs miroirs', ) );
\ No newline at end of file |