diff options
Diffstat (limited to 'en')
| -rw-r--r-- | en/3/index.php | 48 | ||||
| -rw-r--r-- | en/downloads/get/definitions.ini | 129 | ||||
| -rw-r--r-- | en/index.php | 2 |
3 files changed, 61 insertions, 118 deletions
diff --git a/en/3/index.php b/en/3/index.php index 74d272c1f..7da65a6ef 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_beta3"><?php _e('Release notes')?></a></li> + <li><a href="https://wiki.mageia.org/en/Mageia_3_beta4"><?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,7 +43,7 @@ _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 beta3')); ?></h2> + <h2><?php _e('Download %s', array('Mageia 3 beta4')); ?></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, @@ -74,18 +74,18 @@ _lang_load($locale, '3'); <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-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> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-i586-DVD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta4-x86_64-DVD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta4-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-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> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-dual-CD.iso"><?php _e('dualarch')?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-dual-CD.iso&torrent=1"><?php _e('dualarch')?></a></td> </tr> <tr><td colspan="4"> </td></tr> @@ -95,48 +95,48 @@ _lang_load($locale, '3'); <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-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> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-LiveDVD-KDE4-i586-DVD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta4-LiveDVD-KDE4-x86_64-DVD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-LiveDVD-KDE4-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta4-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-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> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-LiveDVD-GNOME-i586-DVD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta4-LiveDVD-GNOME-x86_64-DVD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-LiveDVD-GNOME-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta4-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-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></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-LiveCD-KDE4-en-i586-CD.iso"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-LiveCD-KDE4-en-i586-CD.iso&torrent=1"><?php _e('32bit');?></a></td> </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-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> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-LiveCD-GNOME-en-i586-CD.iso"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-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-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> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-Boot-i586-CD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta4-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-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> + <td><a rel="nofollow" href="?q=Mageia-3-beta4-Boot-nonfree-i586-CD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="?q=Mageia-3-beta4-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 8c8df8054..d3205f899 100644 --- a/en/downloads/get/definitions.ini +++ b/en/downloads/get/definitions.ini @@ -406,112 +406,55 @@ size = "3.5 GB" ;;;;;;;;;;;;;;;;;;;;; ; -[Mageia-3-beta3-Boot-i586-CD.iso] +[Mageia-3-beta4-Boot-i586-CD.iso] file = boot.iso path = "distrib/cauldron/i586/install/images" -name = "Mageia 3 beta2 Boot 32bit CD ISO" +name = "Mageia 3 beta4 Boot 32bit CD ISO" ; -[Mageia-3-beta3-Boot-x86_64-CD.iso] +[Mageia-3-beta4-Boot-x86_64-CD.iso] file = boot.iso path = "distrib/cauldron/x86_64/install/images" -name = "Mageia 3 beta2 Boot 64bit CD ISO" +name = "Mageia 3 beta4 Boot 64bit CD ISO" ; -[Mageia-3-beta3-Boot-nonfree-i586-CD.iso] +[Mageia-3-beta4-Boot-nonfree-i586-CD.iso] file = boot-nonfree.iso path = "distrib/cauldron/i586/install/images" -name = "Mageia 3 beta2 Boot Nonfree 32bit CD ISO" +name = "Mageia 3 beta4 Boot Nonfree 32bit CD ISO" ; -[Mageia-3-beta3-Boot-nonfree-x86_64-CD.iso] +[Mageia-3-beta4-Boot-nonfree-x86_64-CD.iso] file = boot-nonfree.iso path = "distrib/cauldron/x86_64/install/images" -name = "Mageia 3 beta2 Boot Nonfree 64bit CD ISO" - -; -[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" - -; -[Mageia-3-beta3-i586-DVD.iso] -file = "Mageia-3-beta3-i586-DVD.iso" -md5 = "abb8f9ed08814ae1f8afccfc8d79db5d" -sha1 = "1ff02fc947a5e6aa18fc9d5f60026ffa770627fc" -path = "iso/cauldron/Mageia-3-beta3-i586-DVD" -torrent = "iso/cauldron/torrents/Mageia-3-beta3-i586-DVD.torrent" -name = "Mageia 3 beta3 32bit DVD" -size = "3.7 GB" - -; -[Mageia-3-beta3-x86_64-DVD.iso] -file = "Mageia-3-beta3-x86_64-DVD.iso" -md5 = "36ff3dfaa8812e597ec32ff1b7d98e4f" -sha1 = "5562b86cf6f3f68228f697749001eae6ea510b14" -path = "iso/cauldron/Mageia-3-beta3-x86_64-DVD" -torrent = "iso/cauldron/torrents/Mageia-3-beta3-x86_64-DVD.torrent" -name = "Mageia 3 beta3 64bit DVD" +name = "Mageia 3 beta4 Boot Nonfree 64bit CD ISO" + +; +[Mageia-3-beta4-dual-CD.iso] +file = "Mageia-3-beta4-dual-CD.iso" +md5 = "6705d39b940a79b3febbd412ed35dedf" +sha1 = "001327f9cb076d84f839c364e3c723e20e67c8db" +path = "iso/cauldron/Mageia-3-beta4-dual-CD" +torrent = "iso/cauldron/torrents/Mageia-3-beta4-dual-CD.torrent" +name = "Mageia 3 beta4 dual CD" +size = "701 MB" + +; +[Mageia-3-beta4-i586-DVD.iso] +file = "Mageia-3-beta4-i586-DVD.iso" +md5 = "f14f426695e59bd4ba99bfcf21a642dc" +sha1 = "0a18859347095245f3eb610e40ec537d8183f24b" +path = "iso/cauldron/Mageia-3-beta4-i586-DVD" +torrent = "iso/cauldron/torrents/Mageia-3-beta4-i586-DVD.torrent" +name = "Mageia 3 beta4 32bit DVD" size = "3.8 GB" +; +[Mageia-3-beta4-x86_64-DVD.iso] +file = "Mageia-3-beta4-x86_64-DVD.iso" +md5 = "8e4fed8ad28e47d5abc7a467bbf9c80f" +sha1 = "aa8abd54b01c9b83a338910252d44a808213ad6c" +path = "iso/cauldron/Mageia-3-beta4-x86_64-DVD" +torrent = "iso/cauldron/torrents/Mageia-3-beta4-x86_64-DVD.torrent" +name = "Mageia 3 beta4 64bit DVD" +size = "3.8 GB"
\ No newline at end of file diff --git a/en/index.php b/en/index.php index c8496edbf..dc6d855c3 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 3')); ?></a></li> + <li><a href="3/" class="dl-btn-other"><?php _e('Test Mageia 3%s', array(' beta 4')); ?></a></li> </ul> </div> </div> |