From 62141c65c64de7f7683e69e2de090ae06dad1297 Mon Sep 17 00:00:00 2001
From: Manuel Hiebel <leuhmanu@mageia.org>
Date: Fri, 13 Dec 2013 23:30:09 +0000
Subject: Mageia 4 beta2 (with dual as DVD iso)

---
 en/4/download_index.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'en/4')

diff --git a/en/4/download_index.php b/en/4/download_index.php
index ffa18b047..4373adb33 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -2,7 +2,7 @@
 
 $name = 'Mageia';
 $version = '4';
-$release = 'beta1';
+$release = 'beta2';
 
 define('HLANG', true);
 
@@ -35,7 +35,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
     break;
   }
   
-  echo $torrent && $unavailabletorrent || $arch=='dual' ? sprintf(_t('forthcoming')) :  sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>',
+  echo $torrent && $unavailabletorrent ? 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)),
@@ -108,12 +108,12 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
 				</td>
                             </tr>
                             <tr>
-                                <th class="name">CD</th>
-                                <td class="size">700MB</td>
+                                <th class="name">DVD dualarch</th>
+                                <td class="size">1GB</td>
 				<td>
-				<?php dl_link($name,$version,$release,null,'dual','CD',false);;
+				<?php dl_link($name,$version,$release,null,'dual','DVD',false);;
 				echo '</td><td>';
-				dl_link($name,$version,$release,null,'dual','CD',true);?>
+				dl_link($name,$version,$release,null,'dual','DVD',true);?>
 				</td>
                             </tr>
                         </tbody>
@@ -218,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">~27MB<br>~36MB</td>
+                        <td class="size">~27MB</td>
 			<td><?php dl_link($name,$version,$release,'Boot','i586','CD',false);
 			echo '<br>';
 			dl_link($name,$version,$release,'Boot','x86_64','CD',false);?>
@@ -227,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">~27MB<br>~36MB</td>
+                        <td class="size">~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);?>
-- 
cgit v1.2.1