diff options
author | Romain d'Alverny <rda@mageia.org> | 2013-03-10 14:25:59 +0000 |
---|---|---|
committer | Romain d'Alverny <rda@mageia.org> | 2013-03-10 14:25:59 +0000 |
commit | 7b26bb7383b17052d8024808ea086ecd3fcddcd6 (patch) | |
tree | 9e3d43d9a71034fceefb2879f6dc0bde80197034 /en | |
parent | cab1bcf9e733e2fb5e45aa3792a06697b7536072 (diff) | |
download | www-7b26bb7383b17052d8024808ea086ecd3fcddcd6.tar www-7b26bb7383b17052d8024808ea086ecd3fcddcd6.tar.gz www-7b26bb7383b17052d8024808ea086ecd3fcddcd6.tar.bz2 www-7b26bb7383b17052d8024808ea086ecd3fcddcd6.tar.xz www-7b26bb7383b17052d8024808ea086ecd3fcddcd6.zip |
M3b3 release - Live{CD,DVD} and boot.isos only
Diffstat (limited to 'en')
-rw-r--r-- | en/3/index.php | 54 | ||||
-rw-r--r-- | en/downloads/get/definitions.ini | 70 | ||||
-rw-r--r-- | en/index.php | 2 |
3 files changed, 98 insertions, 28 deletions
diff --git a/en/3/index.php b/en/3/index.php index d98f99308..ee0e1a7d5 100644 --- a/en/3/index.php +++ b/en/3/index.php @@ -34,7 +34,7 @@ _lang_load($locale, '3'); <ul> <li><a href="https://wiki.mageia.org/en/Mageia_3_development#Development_Planning"><?php _e('Development roadmap')?></a></li> <li><a href="https://wiki.mageia.org/en/FeatureMageia3_Review"><?php _e('Features review')?></a></li> - <li><a href="https://wiki.mageia.org/en/Mageia_3_beta2"><?php _e('Release notes')?></a></li> + <li><a href="https://wiki.mageia.org/en/Mageia_3_beta3"><?php _e('Release notes')?></a></li> <li><a href="https://wiki.mageia.org/en/Mageia_3_Errata"><?php _e('Errata')?></a></li> <li><a href="//bugs.mageia.org/"><?php _e('Bugs Reports')?></a></li> </ul> @@ -43,17 +43,19 @@ _lang_load($locale, '3'); <p class="unstable-release-warning"><?php _e('Be careful! This is a beta, unstable release.'); _e('It is only intended for developer use. DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.'); ?></p> <div class="para"> - <h2><?php _e('Download %s', array('Mageia 3 beta2')); ?></h2> + <h2><?php _e('Download %s', array('Mageia 3 beta3')); ?></h2> <ul class="dlinfo hl"> <li><?php _e('Up to 167 locales are supported:'); ?> Deutsch, English, español, français, italiano, português, svenska, nederlands, polski, dansk, Русский <?php _e('and so much more!'); ?> <a href="https://wiki.mageia.org/en/Mageia_2_supported_locales" hreflang="en"><?php _e('See the comprehensive list')?></a>.</li> +<?php /* <li><?php _e('Installer DVD and CD ISOs now contains Free Software and some proprietary drivers.'); _e('You will be asked of which kind of Software you want to install.'); ?></li> +*/?> <li><?php _e('Use LiveCDs or LiveDVDs for fresh new installs ONLY, NOT FOR UPGRADE.')?></li> <li><?php _e('If you are looking for a stable version of Mageia, <a href="%s" rel="nofollow">go here</a>.', array('/downloads/'))?></li> <li><?php _e('Enjoy! And <a href="%s">please report bugs</a> if you find some.', array('https://bugs.mageia.org/'))?></li> @@ -70,73 +72,73 @@ _lang_load($locale, '3'); </tr> </thead> <tbody> +<?php /* <tr> <th class="name"><?php _e('Installer DVD')?><br> <span class="dlinfo"><?php _e('Free Software and some proprietary drivers')?></span></th> <td class="size">4.0GB</td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-i586-DVD.iso"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-beta2-x86_64-DVD.iso"><?php _e('64bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-beta2-x86_64-DVD.iso&torrent=1"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-i586-DVD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta3-x86_64-DVD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta3-x86_64-DVD.iso&torrent=1"><?php _e('64bit');?></a></td> </tr> -<?php /* <tr> <th class="name"><?php _e('Installer CD')?><br> <span class="dlinfo"><?php _e('100% Free Software')?></span></th> <td class="size">700MB</td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-dual-CD.iso"><?php _e('dualarch')?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-dual-CD.iso&torrent=1"><?php _e('dualarch')?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-dual-CD.iso"><?php _e('dualarch')?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-dual-CD.iso&torrent=1"><?php _e('dualarch')?></a></td> </tr> -*/ ?> <tr><td colspan="4"> </td></tr> <tr><td colspan="4"> </td></tr> +*/ ?> <tr> <th class="name"><?php _e('LiveDVD KDE')?><br> <span class="dlinfo"><?php _e('not suitable for upgrade')?></span></th> <td class="size">1.4GB</td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-KDE4-i586-DVD.iso"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-KDE4-x86_64-DVD.iso"><?php _e('64bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-KDE4-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-KDE4-x86_64-DVD.iso&torrent=1"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-LiveDVD-KDE4-i586-DVD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta3-LiveDVD-KDE4-x86_64-DVD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-LiveDVD-KDE4-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta3-LiveDVD-KDE4-x86_64-DVD.iso&torrent=1"><?php _e('64bit');?></a></td> </tr> <tr> <th class="name"><?php _e('LiveDVD GNOME')?><br> <span class="dlinfo"><?php _e('not suitable for upgrade')?></th> <td class="size">1.4GB</td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-GNOME-i586-DVD.iso"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-GNOME-x86_64-DVD.iso"><?php _e('64bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-GNOME-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-GNOME-x86_64-DVD.iso&torrent=1"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-LiveDVD-GNOME-i586-DVD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta3-LiveDVD-GNOME-x86_64-DVD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-LiveDVD-GNOME-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta3-LiveDVD-GNOME-x86_64-DVD.iso&torrent=1"><?php _e('64bit');?></a></td> </tr> <tr><td colspan="4"> </td></tr> <tr> <th class="name"><?php _e('LiveCD KDE, English-only')?><br> <span class="dlinfo"><?php _e('not suitable for upgrade')?></th> <td class="size">680MB</td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveCD-KDE4-en-i586-CD.iso"><?php _e('32bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveCD-KDE4-en-i586-CD.iso&torrent=1"><?php _e('32bit');?></a><br> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-LiveCD-KDE4-en-i586-CD.iso"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-LiveCD-KDE4-en-i586-CD.iso&torrent=1"><?php _e('32bit');?></a><br> </tr> <tr> <th class="name"><?php _e('LiveCD GNOME, English-only')?><br> <span class="dlinfo"><?php _e('not suitable for upgrade')?></th> <td class="size">680MB</td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveCD-GNOME-en-i586-CD.iso"><?php _e('32bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveCD-GNOME-en-i586-CD.iso&torrent=1"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-LiveCD-GNOME-en-i586-CD.iso"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-LiveCD-GNOME-en-i586-CD.iso&torrent=1"><?php _e('32bit');?></a></td> </tr> <tr><td colspan="3"> </td></tr> <tr> <th><?php _e('Network installer, Free Software CD')?></th> <td class="size">~35MB<br>~20MB</td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-Boot-i586-CD.iso"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-beta2-Boot-x86_64-CD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-Boot-i586-CD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta3-Boot-x86_64-CD.iso"><?php _e('64bit');?></a></td> </tr> <tr> <th><?php _e('Network installer + nonfree firmware CD')?><br> <span class="dlinfo"><?php _e('needed for some disc controllers, some network cards, etc.')?></span></th> <td class="size">~55MB<br>~30MB</td> - <td><a rel="nofollow" href="?q=Mageia-3-beta2-Boot-nonfree-i586-CD.iso"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-beta2-Boot-nonfree-x86_64-CD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta3-Boot-nonfree-i586-CD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta3-Boot-nonfree-x86_64-CD.iso"><?php _e('64bit');?></a></td> </tr> </tbody> </table> diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini index 6ca20d383..f2e1e1485 100644 --- a/en/downloads/get/definitions.ini +++ b/en/downloads/get/definitions.ini @@ -402,7 +402,7 @@ size = "3.5 GB" ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;; Mageia 3 beta2 (2013-01-26, leuhmanu commited by filip) +;;;;; Mageia 3 beta2 & 3 (2013-03-10, rda) ;;;;;;;;;;;;;;;;;;;;; ; @@ -514,3 +514,71 @@ path = "iso/cauldron/Mageia-3-beta2-x86_64-DVD" torrent = "iso/cauldron/torrents/Mageia-3-beta2-x86_64-DVD.torrent" name = "Mageia 3 beta2 64bit DVD" size = "4.0 GB" + + +; +[Mageia-3-beta3-LiveCD-GNOME-en-i586-CD.iso] +file = "Mageia-3-beta3-LiveCD-GNOME-en-i586-CD.iso" +md5 = "063947d246d8d0996ba06bb1e36ede28" +sha1 = "388f2c1ab5d2c4f3abee16f1168eaefffb1e0959" +langs = "English (Australia) (en_AU), English (Canada) (en_CA), English (en_GB), English (Ireland) (en_IE), English (New-Zealand) (en_NZ), English (American) (en_US), English (South Africa) (en_ZA)" +path = "iso/cauldron/Mageia-3-beta3-LiveCD-GNOME-en-i586-CD" +torrent = "iso/cauldron/torrents/Mageia-3-beta3-LiveCD-GNOME-en-i586-CD.torrent" +name = "Mageia 3 beta3 LiveCD GNOME en 32bit CD" +size = "672 MB" + +; +[Mageia-3-beta3-LiveCD-KDE4-en-i586-CD.iso] +file = "Mageia-3-beta3-LiveCD-KDE4-en-i586-CD.iso" +md5 = "f428273f849c92282d1a31aefed2d2f4" +sha1 = "16d27af98050ec8675ef70536f4f913e916c1174" +langs = "English (Australia) (en_AU), English (Canada) (en_CA), English (en_GB), English (Ireland) (en_IE), English (New-Zealand) (en_NZ), English (American) (en_US), English (South Africa) (en_ZA)" +path = "iso/cauldron/Mageia-3-beta3-LiveCD-KDE4-en-i586-CD" +torrent = "iso/cauldron/torrents/Mageia-3-beta3-LiveCD-KDE4-en-i586-CD.torrent" +name = "Mageia 3 beta3 LiveCD KDE4 en 32bit CD" +size = "673 MB" + +; +[Mageia-3-beta3-LiveDVD-GNOME-i586-DVD.iso] +file = "Mageia-3-beta3-LiveDVD-GNOME-i586-DVD.iso" +md5 = "0ff500d734f9292f4062625541b0e97d" +sha1 = "1e49346185c5da06c0f18acddd3d15926ff4f26f" +langs = "English (American) (en_US)" +path = "iso/cauldron/Mageia-3-beta3-LiveDVD-GNOME-i586-DVD" +torrent = "iso/cauldron/torrents/Mageia-3-beta3-LiveDVD-GNOME-i586-DVD.torrent" +name = "Mageia 3 beta3 LiveDVD GNOME 32bit DVD" +size = "1.3 GB" + +; +[Mageia-3-beta3-LiveDVD-GNOME-x86_64-DVD.iso] +file = "Mageia-3-beta3-LiveDVD-GNOME-x86_64-DVD.iso" +md5 = "c9fbcdc531ba47ebf7b327c3f08dbcd4" +sha1 = "c258bb193b147f4d7b9464c2fc3fd716e624d430" +langs = "English (American) (en_US)" +path = "iso/cauldron/Mageia-3-beta3-LiveDVD-GNOME-x86_64-DVD" +torrent = "iso/cauldron/torrents/Mageia-3-beta3-LiveDVD-GNOME-x86_64-DVD.torrent" +name = "Mageia 3 beta3 LiveDVD GNOME 64bit DVD" +size = "1.3 GB" + +; +[Mageia-3-beta3-LiveDVD-KDE4-i586-DVD.iso] +file = "Mageia-3-beta3-LiveDVD-KDE4-i586-DVD.iso" +md5 = "a6916ee8a984436e66b7b5efc6598468" +sha1 = "d91f0c7fcc2b5d27ae9321fede9a6c1f4432ff76" +langs = "English (American) (en_US)" +path = "iso/cauldron/Mageia-3-beta3-LiveDVD-KDE4-i586-DVD" +torrent = "iso/cauldron/torrents/Mageia-3-beta3-LiveDVD-KDE4-i586-DVD.torrent" +name = "Mageia 3 beta3 LiveDVD KDE4 32bit DVD" +size = "1.3 GB" + +; +[Mageia-3-beta3-LiveDVD-KDE4-x86_64-DVD.iso] +file = "Mageia-3-beta3-LiveDVD-KDE4-x86_64-DVD.iso" +md5 = "458ff88facaca19a63d3fa0129bab9fc" +sha1 = "5ba94479360e45d63c58f50221696ab20defce6a" +langs = "English (American) (en_US)" +path = "iso/cauldron/Mageia-3-beta3-LiveDVD-KDE4-x86_64-DVD" +torrent = "iso/cauldron/torrents/Mageia-3-beta3-LiveDVD-KDE4-x86_64-DVD.torrent" +name = "Mageia 3 beta3 LiveDVD KDE4 64bit DVD" +size = "1.4 GB" + diff --git a/en/index.php b/en/index.php index 438175d60..c8496edbf 100644 --- a/en/index.php +++ b/en/index.php @@ -248,7 +248,7 @@ $nav = array( </li> <li><a href="contribute/" class="dl-btn-other"><?php _e('<strong>Get involved</strong> in the next version'); ?></a> </li> - <li><a href="3/" class="dl-btn-other"><?php _e('Test Mageia 3%s', array(' beta 2')); ?></a></li> + <li><a href="3/" class="dl-btn-other"><?php _e('Test Mageia 3%s', array(' beta 3')); ?></a></li> </ul> </div> </div> |