Mageia 4 beta1 (no torrent available yet)

3 files changed, 87 insertions, 100 deletions

diff --git a/en/4/download_index.php b/en/4/download_index.php
index a8a6ade70..29af5bf0a 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -2,7 +2,7 @@
 
 $name = 'Mageia';
 $version = '4';
-$release = 'alpha3';
+$release = 'beta1';
 
 define('HLANG', true);
 
@@ -18,7 +18,7 @@ function get_mageia_image_file_name($name, $version, $release, $variant = null,
   return implode('-', array($name, $version, $re, $medium)) . $ext;
 }
 
-function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $unavailabletorrent = false)
+function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $unavailabletorrent = true)
 {
   switch ($arch) {
   case "i586":
@@ -35,7 +35,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
     break;
   }
   
-  echo $torrent && $unavailabletorrent ? sprintf(_t('forthcoming')) :  sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>',
+  echo $torrent && $unavailabletorrent || $arch=='dual' ? sprintf(_t('forthcoming')) :  sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>',
     get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, '.iso'),
     $torrent ? '&amp;torrent=1' : '',
     implode(' ', array($name, $version, $release, $variant, $arch, $medium)),
@@ -72,7 +72,6 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
     <?php include '../'.$version.'/nav.php'; ?>
             <p class="unstable-release-warning"><?php _e('Be careful! This is an alpha, unstable release.');
             _e('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');?></p>
-	<p style="color:#3494d3">Beta 1 is a bit delayed as it still doesn't satisfy QA tests. Thanks for your patience.</p>
 
     <div id="doc4" class="yui-t7">
         <div id="bd" role="main">
@@ -219,7 +218,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
                         <tbody>
                           <tr>
                         <th><?php _e('Network installer, Free Software CD')?></th>
-                        <td class="size">~35MB<br>~20MB</td>
+                        <td class="size">~27MB<br>~36MB</td>
 			<td><?php dl_link($name,$version,$release,'Boot','i586','CD',false);
 			echo '<br>';
 			dl_link($name,$version,$release,'Boot','x86_64','CD',false);?>
@@ -228,7 +227,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
                     <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 class="size">~27MB<br>~36MB</td>
 			<td><?php dl_link($name,$version,$release,'Boot-nonfree','i586','CD',false);
 			echo '<br>';
 			dl_link($name,$version,$release,'Boot-nonfree','x86_64','CD',false);?>
diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index 83e518240..16d3da057 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -542,40 +542,40 @@ size = "3.7 GB"
 ;;;;; Mageia 4
 ;;;;;;;;;;;;;;;;;;;;;
 
-[Mageia-4-alpha3-Boot-i586-CD.iso]
+[Mageia-4-beta1-Boot-i586-CD.iso]
 file = boot.iso
 path = "distrib/cauldron/i586/install/images"
-md5 = "98371744e872c5e50a5b70235383293f"
+md5 = "762c1ed8dc70c1e46f3aeb21212496b7"
 sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 alpha3 Boot 32bit CD ISO"
-size = "32 MB"
+name = "Mageia 4 beta1 Boot 32bit CD ISO"
+size = "27 MB"
 
 ;
-[Mageia-4-alpha3-Boot-nonfree-i586-CD.iso]
+[Mageia-4-beta1-Boot-nonfree-i586-CD.iso]
 file = boot-nonfree.iso
 path = "distrib/cauldron/i586/install/images"
-md5 = "5944851eb8e96d4e3d459317f5b21df1"
+md5 = "49432fdeaca664f6b721ff7021e34f0d"
 sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 alpha3 Boot Nonfree 32bit CD ISO"
-size= "47 MB"
+name = "Mageia 4 beta1 Boot Nonfree 32bit CD ISO"
+size= "36 MB"
 
 ;
-[Mageia-4-alpha3-Boot-x86_64-CD.iso]
+[Mageia-4-beta1-Boot-x86_64-CD.iso]
 file = boot.iso
 path = "distrib/cauldron/x86_64/install/images"
-md5 = "1382ab894dd136f86fe20e32576ea7be"
+md5 = "c71d733a65f03d7b02c19326c1f4beb0"
 sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 alpha3 Boot 64bit CD ISO"
-size = "16 MB"
+name = "Mageia 4 beta1 Boot 64bit CD ISO"
+size = "27 MB"
 
 ;
-[Mageia-4-alpha3-Boot-nonfree-x86_64-CD.iso]
+[Mageia-4-beta1-Boot-nonfree-x86_64-CD.iso]
 file = boot-nonfree.iso
 path = "distrib/cauldron/x86_64/install/images"
-md5 = "ece0e1ab80dc09bac7a1d39693666b51"
+md5 = "fc9a027d61cacf1fbbeb15a9bb506850"
 sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 alpha3 Boot Nonfree 64bit CD ISO"
-size ="24 MB"
+name = "Mageia 4 beta1 Boot Nonfree 64bit CD ISO"
+size ="36 MB"
 
 
 
@@ -586,99 +586,87 @@ size ="24 MB"
 ;
 
 ;
-[Mageia-4-alpha3-LiveCD-GNOME-en-i586-CD.iso]
-file = "Mageia-4-alpha3-LiveCD-GNOME-en-i586-CD.iso"
-md5 = "36f57f33836ec09d23ef8257417e68e3"
-sha1 = "57f60a30057f146beffe0d9609db4a205226a65d"
+[Mageia-4-beta1-LiveCD-GNOME-en-i586-CD.iso]
+file = "Mageia-4-beta1-LiveCD-GNOME-en-i586-CD.iso"
+md5 = "e3ecd710ea104d15cf939c505a9ca494"
+sha1 = "eb85e67e493f98ef994281c6f3cda49432bfb126"
 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-4-alpha3-LiveCD-GNOME-en-i586-CD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha3-LiveCD-GNOME-en-i586-CD.torrent"
-name = "Mageia 4 alpha3 LiveCD GNOME en 32bit CD"
-size = "582 MB"
+path = "iso/cauldron/Mageia-4-beta1-LiveCD-GNOME-en-i586-CD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveCD-GNOME-en-i586-CD.torrent"
+name = "Mageia 4 beta1 LiveCD GNOME en 32bit CD"
+size = "683 MB"
 
 ;
-[Mageia-4-alpha3-LiveCD-KDE4-en-i586-CD.iso]
-file = "Mageia-4-alpha3-LiveCD-KDE4-en-i586-CD.iso"
-md5 = "a565335f0272a3aada1d989a5b52248c"
-sha1 = "d98babe63f24fb0ecf540f257d8f127a1ea805a5"
+[Mageia-4-beta1-LiveCD-KDE4-en-i586-CD.iso]
+file = "Mageia-4-beta1-LiveCD-KDE4-en-i586-CD.iso"
+md5 = "658fdf7bfb6fd5942c7be061106ae6ce"
+sha1 = "6a72b5564945e8a97c7a5ce9ada67cbeda8ef6d0"
 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-4-alpha3-LiveCD-KDE4-en-i586-CD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha3-LiveCD-KDE4-en-i586-CD.torrent"
-name = "Mageia 4 alpha3 LiveCD KDE4 en 32bit CD"
-size = "619 MB"
-
-;
-[Mageia-4-alpha3-LiveDVD-GNOME-i586-DVD.iso]
-file = "Mageia-4-alpha3-LiveDVD-GNOME-i586-DVD.iso"
-md5 = "bfa59fba0c60c642e54ab2f41601f22e"
-sha1 = "a1d78547c5843e09a8f4c38b8383a200865df37d"
-langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-alpha3-LiveDVD-GNOME-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha3-LiveDVD-GNOME-i586-DVD.torrent"
-name = "Mageia 4 alpha3 LiveDVD GNOME 32bit DVD"
-size = "1.3 GB"
+path = "iso/cauldron/Mageia-4-beta1-LiveCD-KDE4-en-i586-CD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveCD-KDE4-en-i586-CD.torrent"
+name = "Mageia 4 beta1 LiveCD KDE4 en 32bit CD"
+size = "658 MB"
 
 ;
-[Mageia-4-alpha3-LiveDVD-GNOME-x86_64-DVD.iso]
-file = "Mageia-4-alpha3-LiveDVD-GNOME-x86_64-DVD.iso"
-md5 = "1312cc0274fa0c2c783c24cbd7d8324d"
-sha1 = "9e10e9403b1f39c7ec14177d112db0323aeb4b92"
+[Mageia-4-beta1-LiveDVD-GNOME-i586-DVD.iso]
+file = "Mageia-4-beta1-LiveDVD-GNOME-i586-DVD.iso"
+md5 = "8542fa1e21f83462665b1f2c17e1aab7"
+sha1 = "44b4597b89638264765b3099b4470d8f524f473e"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-alpha3-LiveDVD-GNOME-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha3-LiveDVD-GNOME-x86_64-DVD.torrent"
-name = "Mageia 4 alpha3 LiveDVD GNOME 64bit DVD"
-size = "1.3 GB"
+path = "iso/cauldron/Mageia-4-beta1-LiveDVD-GNOME-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveDVD-GNOME-i586-DVD.torrent"
+name = "Mageia 4 beta1 LiveDVD GNOME 32bit DVD"
+size = "1.4 GB"
 
 ;
-[Mageia-4-alpha3-LiveDVD-KDE4-i586-DVD.iso]
-file = "Mageia-4-alpha3-LiveDVD-KDE4-i586-DVD.iso"
-md5 = "9d543393f54d69f4ab7240891bd5e772"
-sha1 = "e8bb489978b8fd0efea1c6cb2ac4d715ba114ca7"
+[Mageia-4-beta1-LiveDVD-GNOME-x86_64-DVD.iso]
+file = "Mageia-4-beta1-LiveDVD-GNOME-x86_64-DVD.iso"
+md5 = "ca03afa6e42e75cfea7ea56c30c0498c"
+sha1 = "838742574dd280971016c41c9f0f9443f259cc7e"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-alpha3-LiveDVD-KDE4-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha3-LiveDVD-KDE4-i586-DVD.torrent"
-name = "Mageia 4 alpha3 LiveDVD KDE4 32bit DVD"
+path = "iso/cauldron/Mageia-4-beta1-LiveDVD-GNOME-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveDVD-GNOME-x86_64-DVD.torrent"
+name = "Mageia 4 beta1 LiveDVD GNOME 64bit DVD"
 size = "1.4 GB"
 
 ;
-[Mageia-4-alpha3-LiveDVD-KDE4-x86_64-DVD.iso]
-file = "Mageia-4-alpha3-LiveDVD-KDE4-x86_64-DVD.iso"
-md5 = "5f8fbaa5ddb8c01ee2cd388a6eb6a418"
-sha1 = "fd3bd9154b35c7cceb524489edb0ddf24987efc0"
+[Mageia-4-beta1-LiveDVD-KDE4-i586-DVD.iso]
+file = "Mageia-4-beta1-LiveDVD-KDE4-i586-DVD.iso"
+md5 = "34b64c7f0dec53c99afc775018577220"
+sha1 = "3e29ec69da884b1271969342f3bf3a77b911990f"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-alpha3-LiveDVD-KDE4-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha3-LiveDVD-KDE4-x86_64-DVD.torrent"
-name = "Mageia 4 alpha3 LiveDVD KDE4 64bit DVD"
+path = "iso/cauldron/Mageia-4-beta1-LiveDVD-KDE4-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveDVD-KDE4-i586-DVD.torrent"
+name = "Mageia 4 beta1 LiveDVD KDE4 32bit DVD"
 size = "1.4 GB"
 
 ;
-[Mageia-4-alpha3-dual-CD.iso]
-file = "Mageia-4-alpha3-dual-CD.iso"
-md5 = "2db6ef011499c8c46396029590b8cdd7"
-sha1 = "91aa1d7ea563afedc7751b3518923ee783472122"
-path = "iso/cauldron/Mageia-4-alpha3-dual-CD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha3-dual-CD.torrent"
-name = "Mageia 4 alpha3 dual CD"
-size = "697 MB"
-
-;
-[Mageia-4-alpha3-i586-DVD.iso]
-file = "Mageia-4-alpha3-i586-DVD.iso"
-md5 = "553db7f79eaf792bc0b7f2f4f4fe22cf"
-sha1 = "44f706e399d3e879fd3744008877be5263421cae"
-path = "iso/cauldron/Mageia-4-alpha3-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha3-i586-DVD.torrent"
-name = "Mageia 4 alpha3 32bit DVD"
-size = "3.8 GB"
+[Mageia-4-beta1-LiveDVD-KDE4-x86_64-DVD.iso]
+file = "Mageia-4-beta1-LiveDVD-KDE4-x86_64-DVD.iso"
+md5 = "4ba32ef6e235e0ecfc454fd6bc7185c0"
+sha1 = "c59c4c1b98d38ff0aee81e04e191fd72e2deea99"
+langs = "English (American) (en_US)"
+path = "iso/cauldron/Mageia-4-beta1-LiveDVD-KDE4-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveDVD-KDE4-x86_64-DVD.torrent"
+name = "Mageia 4 beta1 LiveDVD KDE4 64bit DVD"
+size = "1.5 GB"
 
 ;
-[Mageia-4-alpha3-x86_64-DVD.iso]
-file = "Mageia-4-alpha3-x86_64-DVD.iso"
-md5 = "e73d91f74fc1c3de08ae918d4582a7ef"
-sha1 = "7512a89c977519be012f0aa62c10754a84f69782"
-path = "iso/cauldron/Mageia-4-alpha3-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha3-x86_64-DVD.torrent"
-name = "Mageia 4 alpha3 64bit DVD"
-size = "3.8 GB"
-
-
+[Mageia-4-beta1-i586-DVD.iso]
+file = "Mageia-4-beta1-i586-DVD.iso"
+md5 = "c659504f97d23a61ea346f0b4aecb5e3"
+sha1 = "c29ad967929d62f15973c4d3609a727c13878f77"
+path = "iso/cauldron/Mageia-4-beta1-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta1-i586-DVD.torrent"
+name = "Mageia 4 beta1 32bit DVD"
+size = "3.6 GB"
+
+;
+[Mageia-4-beta1-x86_64-DVD.iso]
+file = "Mageia-4-beta1-x86_64-DVD.iso"
+md5 = "4cdbf34df22e20bdebd5f13e265a4771"
+sha1 = "a6896e2c478b852dbc90e2ca271daba8732f966f"
+path = "iso/cauldron/Mageia-4-beta1-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta1-x86_64-DVD.torrent"
+name = "Mageia 4 beta1 64bit DVD"
+size = "3.6 GB"
diff --git a/en/index.php b/en/index.php
index f11480fce..2486c328e 100644
--- a/en/index.php
+++ b/en/index.php
@@ -246,7 +246,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="4/" class="dl-btn-other"><?php _e('Test'); ?> Mageia 4 alpha 3</a>
+		<li><a href="4/" class="dl-btn-other"><?php _e('Test'); ?> Mageia 4 beta 1</a>
 		</li>
             </ul>
         </div>