mga4 alpha2 is here, with no dual

3 files changed, 83 insertions, 61 deletions

diff --git a/en/4/download_index.php b/en/4/download_index.php
index 12d40b03c..509b432b3 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -2,7 +2,7 @@
 
 $name = 'Mageia';
 $version = '4';
-$release = 'alpha1';
+$release = 'alpha2';
 
 define('HLANG', true);
 
@@ -35,7 +35,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
     break;
   }
   
-  echo $torrent && $unavailabletorrent || !$variant ? 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)),
diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index 4b7e33cd0..33ac99439 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -542,106 +542,130 @@ size = "3.7 GB"
 ;;;;; Mageia 4
 ;;;;;;;;;;;;;;;;;;;;;
 
-[Mageia-4-alpha1-Boot-i586-CD.iso]
+[Mageia-4-alpha2-Boot-i586-CD.iso]
 file = boot.iso
 path = "distrib/cauldron/i586/install/images"
 md5 = "a4101bff21b6b948308c2ad33d676d3b"
 sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 alpha1 Boot 32bit CD ISO"
+name = "Mageia 4 alpha2 Boot 32bit CD ISO"
 size = "32 MB"
 
 ;
-[Mageia-4-alpha1-Boot-x86_64-CD.iso]
+[Mageia-4-alpha2-Boot-x86_64-CD.iso]
 file = boot.iso
 path = "distrib/cauldron/x86_64/install/images"
 md5 = "826a61ad369b37e7ba8f95d87c8d3474"
 sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 alpha1 Boot 64bit CD ISO"
+name = "Mageia 4 alpha2 Boot 64bit CD ISO"
 size = "16 MB"
 
 ;
-[Mageia-4-alpha1-Boot-nonfree-i586-CD.iso]
+[Mageia-4-alpha2-Boot-nonfree-i586-CD.iso]
 file = boot-nonfree.iso
 path = "distrib/cauldron/i586/install/images"
 md5 = "f302023d16e8f7b19cfec306f88e4cb9"
 sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 alpha1 Boot Nonfree 32bit CD ISO"
+name = "Mageia 4 alpha2 Boot Nonfree 32bit CD ISO"
 size= "47 MB"
 
 ;
-[Mageia-4-alpha1-Boot-nonfree-x86_64-CD.iso]
+[Mageia-4-alpha2-Boot-nonfree-x86_64-CD.iso]
 file = boot-nonfree.iso
 path = "distrib/cauldron/x86_64/install/images"
 md5 = "376fde8445e213741d0225d6a2a31df1"
 sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 alpha1 Boot Nonfree 64bit CD ISO"
+name = "Mageia 4 alpha2 Boot Nonfree 64bit CD ISO"
 size ="24 MB"
 
 
 ;from fidd
 ,
-[Mageia-4-alpha1-LiveCD-GNOME-en-i586-CD.iso]
-file = "Mageia-4-alpha1-LiveCD-GNOME-en-i586-CD.iso"
-md5 = "5011921d4cb484a723654866a7f26e0b"
-sha1 = "0627dc58db5f0caae0f3a86762007ae784267751"
+;
+[Mageia-4-alpha2-LiveCD-GNOME-en-i586-CD.iso]
+file = "Mageia-4-alpha2-LiveCD-GNOME-en-i586-CD.iso"
+md5 = "eefd6f88badcd98d3fc96be37714a80d"
+sha1 = "0a9b33e6ac1cef32ed87cd90b2adaa1782f8d746"
 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-alpha1-LiveCD-GNOME-en-i586-CD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha1-LiveCD-GNOME-en-i586-CD.torrent"
-name = "Mageia 4 alpha1 LiveCD GNOME en 32bit CD"
-size = "651 MB"
+path = "iso/cauldron/Mageia-4-alpha2-LiveCD-GNOME-en-i586-CD"
+torrent = "iso/cauldron/torrents/Mageia-4-alpha2-LiveCD-GNOME-en-i586-CD.torrent"
+name = "Mageia 4 alpha2 LiveCD GNOME en 32bit CD"
+size = "571 MB"
 
 ;
-[Mageia-4-alpha1-LiveCD-KDE4-en-i586-CD.iso]
-file = "Mageia-4-alpha1-LiveCD-KDE4-en-i586-CD.iso"
-md5 = "da7f7cd9fed8ed5e274b5f9ca95e6570"
-sha1 = "1ef7887739907997b05f5dea221752aa16f02d45"
+[Mageia-4-alpha2-LiveCD-KDE4-en-i586-CD.iso]
+file = "Mageia-4-alpha2-LiveCD-KDE4-en-i586-CD.iso"
+md5 = "6251870baf896c94a521a1407650dd6d"
+sha1 = "2aeaa9ec29e691dfad01c14cfdc6fc0ccc3f80d7"
 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-alpha1-LiveCD-KDE4-en-i586-CD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha1-LiveCD-KDE4-en-i586-CD.torrent"
-name = "Mageia 4 alpha1 LiveCD KDE4 en 32bit CD"
-size = "630 MB"
+path = "iso/cauldron/Mageia-4-alpha2-LiveCD-KDE4-en-i586-CD"
+torrent = "iso/cauldron/torrents/Mageia-4-alpha2-LiveCD-KDE4-en-i586-CD.torrent"
+name = "Mageia 4 alpha2 LiveCD KDE4 en 32bit CD"
+size = "593 MB"
 
 ;
-[Mageia-4-alpha1-LiveDVD-GNOME-i586-DVD.iso]
-file = "Mageia-4-alpha1-LiveDVD-GNOME-i586-DVD.iso"
-md5 = "b33c6c5a9921744d9b291728ad08c28a"
-sha1 = "29067c62482c4a1d0537f3134836ba063c90a55c"
+[Mageia-4-alpha2-LiveDVD-GNOME-i586-DVD.iso]
+file = "Mageia-4-alpha2-LiveDVD-GNOME-i586-DVD.iso"
+md5 = "798ef9d84fe2b1da884b69cf3c15eeb6"
+sha1 = "ef0f2cb54ef303431bcdc3c87c5ff708ecc740c7"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-alpha1-LiveDVD-GNOME-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha1-LiveDVD-GNOME-i586-DVD.torrent"
-name = "Mageia 4 alpha1 LiveDVD GNOME 32bit DVD"
-size = "1.3 GB"
+path = "iso/cauldron/Mageia-4-alpha2-LiveDVD-GNOME-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-alpha2-LiveDVD-GNOME-i586-DVD.torrent"
+name = "Mageia 4 alpha2 LiveDVD GNOME 32bit DVD"
+size = "1.2 GB"
 
 ;
-[Mageia-4-alpha1-LiveDVD-GNOME-x86_64-DVD.iso]
-file = "Mageia-4-alpha1-LiveDVD-GNOME-x86_64-DVD.iso"
-md5 = "d0c4ec2f70d8a0be19aa98356bf1f8a3"
-sha1 = "6091ededd87d5fd79c53e8236e1a05f3a239bfd6"
+[Mageia-4-alpha2-LiveDVD-GNOME-x86_64-DVD.iso]
+file = "Mageia-4-alpha2-LiveDVD-GNOME-x86_64-DVD.iso"
+md5 = "e1bf53c52e7d83dc806c0d5baeee28bf"
+sha1 = "ac3e560807c834d98c59e09e06224ed1b72e3124"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-alpha1-LiveDVD-GNOME-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha1-LiveDVD-GNOME-x86_64-DVD.torrent"
-name = "Mageia 4 alpha1 LiveDVD GNOME 64bit DVD"
-size = "1.4 GB"
+path = "iso/cauldron/Mageia-4-alpha2-LiveDVD-GNOME-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-alpha2-LiveDVD-GNOME-x86_64-DVD.torrent"
+name = "Mageia 4 alpha2 LiveDVD GNOME 64bit DVD"
+size = "1.3 GB"
 
 ;
-[Mageia-4-alpha1-LiveDVD-KDE4-i586-DVD.iso]
-file = "Mageia-4-alpha1-LiveDVD-KDE4-i586-DVD.iso"
-md5 = "2a1698950fc87f6ea38aee8bbb280142"
-sha1 = "f52705a10c116b09e16d4a3b9c3ae90f0cc3f3ce"
+[Mageia-4-alpha2-LiveDVD-KDE4-i586-DVD.iso]
+file = "Mageia-4-alpha2-LiveDVD-KDE4-i586-DVD.iso"
+md5 = "9742259c12a9adc32302a955aa956204"
+sha1 = "7efa3f1cc30f8dc944087412dee35d32ad635333"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-alpha1-LiveDVD-KDE4-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha1-LiveDVD-KDE4-i586-DVD.torrent"
-name = "Mageia 4 alpha1 LiveDVD KDE4 32bit DVD"
-size = "1.4 GB"
+path = "iso/cauldron/Mageia-4-alpha2-LiveDVD-KDE4-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-alpha2-LiveDVD-KDE4-i586-DVD.torrent"
+name = "Mageia 4 alpha2 LiveDVD KDE4 32bit DVD"
+size = "1.3 GB"
 
 ;
-[Mageia-4-alpha1-LiveDVD-KDE4-x86_64-DVD.iso]
-file = "Mageia-4-alpha1-LiveDVD-KDE4-x86_64-DVD.iso"
-md5 = "1710dbc3755fa0e118dc39ecb96d2db5"
-sha1 = "673f0854e42314448121741cc0cbfc7f61548d2a"
+[Mageia-4-alpha2-LiveDVD-KDE4-x86_64-DVD.iso]
+file = "Mageia-4-alpha2-LiveDVD-KDE4-x86_64-DVD.iso"
+md5 = "0e9e306cd9b237e2008d33d1a8a83eb3"
+sha1 = "b189b8cb817e39cbc78868396f34cac688153252"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-alpha1-LiveDVD-KDE4-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-alpha1-LiveDVD-KDE4-x86_64-DVD.torrent"
-name = "Mageia 4 alpha1 LiveDVD KDE4 64bit DVD"
+path = "iso/cauldron/Mageia-4-alpha2-LiveDVD-KDE4-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-alpha2-LiveDVD-KDE4-x86_64-DVD.torrent"
+name = "Mageia 4 alpha2 LiveDVD KDE4 64bit DVD"
 size = "1.4 GB"
 
+;No dual
+
+;
+[Mageia-4-alpha2-i586-DVD.iso]
+file = "Mageia-4-alpha2-i586-DVD.iso"
+md5 = "3e0bf0b9fa64e464f6543dd65272deac"
+sha1 = "dd267bae35bc66241d402331e18b645af9ece813"
+path = "iso/cauldron/Mageia-4-alpha2-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-alpha2-i586-DVD.torrent"
+name = "Mageia 4 alpha2 32bit DVD"
+size = "3.8 GB"
+
+;
+[Mageia-4-alpha2-x86_64-DVD.iso]
+file = "Mageia-4-alpha2-x86_64-DVD.iso"
+md5 = "5c1e5ab0583d155f1cd30f8ddddb37b0"
+sha1 = "99220d84baaa5c8111ce7290a9169fa6b063f7c3"
+path = "iso/cauldron/Mageia-4-alpha2-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-alpha2-x86_64-DVD.torrent"
+name = "Mageia 4 alpha2 64bit DVD"
+size = "3.7 GB"
+
+
diff --git a/en/index.php b/en/index.php
index dd96cb0c0..10677c770 100644
--- a/en/index.php
+++ b/en/index.php
@@ -246,10 +246,8 @@ $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 1'); ?></a>
-		</li> 
-		<!--<li><a href="4/" class="dl-btn-other"><?php _e('Test'); ?> Mageia 4 alpha 2</a>
-		</li>-->
+		<li><a href="4/" class="dl-btn-other"><?php _e('Test'); ?> Mageia 4 alpha 2</a>
+		</li>
             </ul>
         </div>
     </div>