aboutsummaryrefslogtreecommitdiffstats
path: root/en/6
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2016-07-01 19:05:36 +0200
committerfilip <filip.komar@gmail.com>2016-07-01 19:05:36 +0200
commit41598035befe67e30f05f3978925431e29eb2041 (patch)
tree5334835d7ead2e8de8b89f2e2235a4e3767c05c6 /en/6
parent162a0ebba360fd12255839dd64385570225d3580 (diff)
downloadwww-41598035befe67e30f05f3978925431e29eb2041.tar
www-41598035befe67e30f05f3978925431e29eb2041.tar.gz
www-41598035befe67e30f05f3978925431e29eb2041.tar.bz2
www-41598035befe67e30f05f3978925431e29eb2041.tar.xz
www-41598035befe67e30f05f3978925431e29eb2041.zip
dual is abandoned too
Diffstat (limited to 'en/6')
-rwxr-xr-xen/6/download_index.php35
1 files changed, 3 insertions, 32 deletions
diff --git a/en/6/download_index.php b/en/6/download_index.php
index fd3e1e1b4..bd0a76504 100755
--- a/en/6/download_index.php
+++ b/en/6/download_index.php
@@ -6,7 +6,6 @@ $release = 'sta1';
$torrentavailable=true;
$classical=true;
$live=true;
-$dual=false;
define('HLANG', true);
@@ -38,9 +37,6 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
case "x86_64":
$bit = _r('64 bit');
break;
- case "dual":
- $bit = _r('Dualarch');
- break;
default:
$bit = '';
break;
@@ -197,7 +193,7 @@ input[type="radio"], input[type="submit"] {
_g('The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO.');?>
</p>
- <?php _g('For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it\'s about %sGB.',array('3.5','1.2'),'p class="dlinfo"');?>
+ <?php _g('For 32 and 64bit, size of the ISOs is about %sGB.',array('3.7'),'p class="dlinfo"');?>
</div>
<?php } ?>
@@ -215,7 +211,7 @@ input[type="radio"], input[type="submit"] {
<?php _g('Use a classical installation and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?>
</p>
- <?php _g('For LiveDVDs, size of the ISOs is about %sGB.',array('1.8/3.6'),'p class="dlinfo"');?>
+ <?php _g('For LiveDVDs, size of the ISOs is about %sGB.',array('1.7'),'p class="dlinfo"');?>
</div>
<?php } ?>
@@ -235,9 +231,8 @@ input[type="radio"], input[type="submit"] {
<input type="radio" id="lan" value="Boot" name="format" />
<label for="lan" class="ui-button lan"><?php _g('Network Installation')?></label>
</div>
-<?php if( !$dual || !$live || !$classical ){?>
+<?php if( !$live || !$classical ){?>
<p style="margin-top:1.5em;" class="warn">
- <?php if(!$dual){ _g('The dualarch is not yet available.');}?>
<?php if(!$live) {_g('LiveDVDs are not yet available.');}?>
<?php if(!$classical){ _g('Classical Installation flavours is not yet available.');}?>
</p>
@@ -309,26 +304,11 @@ input[type="radio"], input[type="submit"] {
_g('This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though.',null,'p')?>
</div>
-<?php if($dual){?>
- <div id='dualEx'>
- <?php _g('Dualarch',null,'h3');?>
- <?php _g('The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB.',array('XFCE','1'),'p');
- echo '<p>';
- _g('Dual iso size is intended to be small for advanced users, only network proprietary drivers are included.', null, ' ');
- _g('You will have to add remote nonfree media if you need some more.', null,' ');
- _g('Furthermore UEFI is not supported.');
- echo '</p>';
- _g('It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU.',null, 'p');
- _g('This ISO is generally for advanced users and system administrator for fast deployment of Mageia.',null, 'p');?>
- </div>
-<?php } ?>
<div class="radiobutton">
<input type="radio" id="32b" value="i586" name="arch" />
<label for="32b" class="ui-button 32b"><?php _g('32 bit')?></label>
<input type="radio" id="64b" value="x86_64" name="arch" />
<label for="64b" class="ui-button 64b"><?php _g('64 bit')?></label>
- <?php if($dual == true){ ?><input type="radio" id="dual" value="dual" name="arch" />
- <label for="dual" class="ui-button dual"><?php _g('Dualarch')?></label><?php } ?>
</div>
</div>
@@ -379,14 +359,6 @@ input[type="radio"], input[type="submit"] {
dl_link($name,$version,$release,null,'x86_64','DVD',true,$torrentavailable);?>
</td>
</tr>
-<?php if($dual){ ?> <tr>
- <th class="name">DVD dualarch</th>
- <td>
- <?php dl_link($name,$version,$release,null,'dual','DVD',false);?>
- </td><td>
- <?php dl_link($name,$version,$release,null,'dual','DVD',true,$torrentavailable);?>
- </td>
- </tr><?php } ?>
</tbody>
</table>
</div>
@@ -597,7 +569,6 @@ $('img.lazy').each(function(){
gettooltip('.nonfree','#nonfreeEx',40,-70)
gettooltip('.32b', '#32bEx',40,-70)
gettooltip('.64b', '#64bEx',40,-70)
- gettooltip('.dual', '#dualEx',40,-70)
gettooltip('.directlink', '#directEx',40,-40)
gettooltip('.torrentlink','#torrentEx',40,-40)