aboutsummaryrefslogtreecommitdiffstats
path: root/en/6/download_index.php
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2016-07-01 18:43:13 +0200
committerfilip <filip.komar@gmail.com>2016-07-01 18:43:13 +0200
commit162a0ebba360fd12255839dd64385570225d3580 (patch)
tree73109995ce31fce8eac89762978178d3155c3ba4 /en/6/download_index.php
parent491ce973883788d156b9a8eabc5cde8c70f5a3a5 (diff)
downloadwww-162a0ebba360fd12255839dd64385570225d3580.tar
www-162a0ebba360fd12255839dd64385570225d3580.tar.gz
www-162a0ebba360fd12255839dd64385570225d3580.tar.bz2
www-162a0ebba360fd12255839dd64385570225d3580.tar.xz
www-162a0ebba360fd12255839dd64385570225d3580.zip
Live CD ia abandoned
Diffstat (limited to 'en/6/download_index.php')
-rwxr-xr-xen/6/download_index.php43
1 files changed, 10 insertions, 33 deletions
diff --git a/en/6/download_index.php b/en/6/download_index.php
index 511cb1721..fd3e1e1b4 100755
--- a/en/6/download_index.php
+++ b/en/6/download_index.php
@@ -65,7 +65,7 @@ function get_image($ttl, $src, $sty){
<head>
<meta charset="utf-8">
<title><?php echo sprintf(_g('Download').' '. '%s %s %s', $name, $version, $release)?></title>
- <meta name="description" content="<?php _g('Download %s DVD, CD, LiveCD, network install ISO images.', array("$name $version"))?>">
+ <meta name="description" content="<?php _g('Download %s DVD, LiveDVD, network install ISO images.', array("$name $version"))?>">
<meta name="keywords" content="<?php _g('mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent', array("$name $version"))?>">
<meta name="robots" content="index,nofollow,nosnippet">
<link rel="canonical" href="/<?php echo $locale.'/'.$version;?>/">
@@ -205,17 +205,17 @@ input[type="radio"], input[type="submit"] {
<?php if($live == true){?>
<div id="liveEx">
- <?php _g('LiveCDs and LiveDVDs',null,'h3');?>
+ <?php _g('LiveDVDs',null,'h3');?>
- <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE.', array("$name $version"), 'p');
+ <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE.', array("$name $version"), 'p');
_g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p');?>
- <p><?php _g('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?>
- <span class="warn"><?php _g('DO NOT use these LiveCDs or LiveDVDs to upgrade from the prior Mageia release!'); ?></span>
+ <p><?php _g('Use LiveDVDs for fresh new installs ONLY.');?>
+ <span class="warn"><?php _g('DO NOT use these LiveDVDs to upgrade from the prior Mageia release!'); ?></span>
<?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. For the LiveCDs it\'s about %sMB.',array('1.6','700'),'p class="dlinfo"');?>
+ <?php _g('For LiveDVDs, size of the ISOs is about %sGB.',array('1.8/3.6'),'p class="dlinfo"');?>
</div>
<?php } ?>
@@ -238,7 +238,7 @@ input[type="radio"], input[type="submit"] {
<?php if( !$dual || !$live || !$classical ){?>
<p style="margin-top:1.5em;" class="warn">
<?php if(!$dual){ _g('The dualarch is not yet available.');}?>
- <?php if(!$live) {_g('LiveCDs and LiveDVDs are not yet available.');}?>
+ <?php if(!$live) {_g('LiveDVDs are not yet available.');}?>
<?php if(!$classical){ _g('Classical Installation flavours is not yet available.');}?>
</p>
<?php }?>
@@ -246,24 +246,16 @@ input[type="radio"], input[type="submit"] {
<?php if($live){ ?>
<div class="para" id="livespin">
- <?php _g('LiveCDs and LiveDVDs',null,'h2');?>
+ <?php _g('LiveDVDs',null,'h2');?>
<div id="livedvdEx">
<?php _g('LiveDVDs',null,'h3');
_g('LiveDVDs contain all languages and is available in both 32 and 64bit.',null,'p');?>
</div>
-<!-- <div id="livecdEx">
- <?php _g('LiveCDs',null,'h3');
- _g('LiveCDs contain only English and is available only in 32bit.',null,'p');
- _g('Do not use unless you really DON\'T NEED any other language than English.',null,'p class="warn"'); ?>
- </div>-->
-
<div class="radiobutton">
<input type="radio" id="livedvd" value="DVD" name="livespin" />
<label for="livedvd" class="ui-button livedvd"><?php _g('LiveDVDs')?></label>
- <!--<input type="radio" id="livecd" value="CD" name="livespin" />
- <label for="livecd" class="ui-button livecd"><?php _g('English only (CD)')?></label>-->
</div>
</div>
@@ -402,7 +394,7 @@ input[type="radio"], input[type="submit"] {
<?php if($live){ ?>
<div class="para" id="Flive">
- <h2><?php _g('LiveCDs and LiveDVDs');?></h2>
+ <h2><?php _g('LiveDVDs');?></h2>
<table class="fr-table dlt2">
<thead>
<tr>
@@ -436,20 +428,6 @@ input[type="radio"], input[type="submit"] {
dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',true,$torrentavailable);?>
</td>
<tr>
- <th class="name">LiveCD KDE</th>
- <td>
- <?php dl_link($name,$version,$release,'LiveCD-PLASMA5-en','i586','CD',false);
- echo '</td><td>';
- dl_link($name,$version,$release,'LiveCD-PLASMA5-en','i586','CD',true,$torrentavailable);?>
- </td>
- </tr>
- <tr>
- <th class="name">LiveCD GNOME</th>
- <td>
- <?php dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',false);
- echo '</td><td>';
- dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',true,$torrentavailable);?>
- </tr>
</tbody>
</table>
@@ -506,7 +484,7 @@ input[type="radio"], input[type="submit"] {
echo '</p>';
/* _g('Upgrading<br>from %s ?', array('Mageia 5'), 'h3')?>
echo '<ul class="hl">'
- _g('<strong>do not</strong> use LiveCDs;', null, 'li');
+ _g('<strong>do not</strong> use LiveDVDs;', null, 'li');
_g('see the <a href="%s" hreflang="en">upgrade guide</a>', array($upgradeguide), 'li');
*/ ?>
@@ -612,7 +590,6 @@ $('img.lazy').each(function(){
gettooltip('.classical', '#classicalEx',40,-70)
gettooltip('.live', '#liveEx',40,-70)
gettooltip('.lan','#lanEx',40,-70)
- gettooltip('.livecd', '#livecdEx',40,-70)
gettooltip('.livedvd', '#livedvdEx',40,-70)
gettooltip('.gnome', '#gnomeEx',40,-300)
gettooltip('.kde', '#kdeEx',40,-300)
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-25 04:07:38 +0000