release of mga6sta1

NOTE that live CD is disabled

1 files changed, 16 insertions, 16 deletions

diff --git a/en/6/download_index.php b/en/6/download_index.php
index dbf21e3f4..511cb1721 100755
--- a/en/6/download_index.php
+++ b/en/6/download_index.php
@@ -2,10 +2,10 @@
 
 $name = 'Mageia';
 $version = '6';
-$release = 'dev1';
+$release = 'sta1';
 $torrentavailable=true;
 $classical=true;
-$live=false;
+$live=true;
 $dual=false;
 
 
@@ -141,9 +141,9 @@ input[type="radio"], input[type="submit"]  {
     <h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1>
         <?php include '../6/nav.php'; ?>
         <p class="unstable-release-warning"><?php
-		_g('Be careful! This is an alpha, unstable release.');
-//		_g('Be careful! This is a beta, unstable release.');
-//		_g('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');
+// 		_g('Be careful! This is an alpha, unstable release.');
+		_g('Be careful! This is a beta, unstable release.');
+		_g('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');
 //		_g('This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s.', array(_r('May 2015'))); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
 
 
@@ -253,17 +253,17 @@ input[type="radio"], input[type="submit"]  {
         _g('LiveDVDs contain all languages and is available in both 32 and 64bit.',null,'p');?>
     </div>
 
-    <div id="livecdEx">
+<!--    <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>-->
 
     <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>
+        <!--<input type="radio" id="livecd" value="CD" name="livespin" />
+        <label for="livecd" class="ui-button livecd"><?php _g('English only (CD)')?></label>-->
     </div>
 </div>
 
@@ -280,7 +280,7 @@ input[type="radio"], input[type="submit"]  {
     </div>
 
     <div class="radiobutton">
-        <input type="radio" id="kde" value="KDE4" name="desktop" />
+        <input type="radio" id="kde" value="PLASMA5" name="desktop" />
         <label for="kde" class="ui-button kde"><?php _g('KDE Desktop')?></label>
         <input type="radio" id="gnome" value="GNOME" name="desktop" />
         <label for="gnome" class="ui-button gnome"><?php _g('GNOME Desktop')?></label>
@@ -415,13 +415,13 @@ input[type="radio"], input[type="submit"]  {
                                 <tr>
                         <th class="name" style="width:60%">LiveDVD KDE</th>
                         <td>
-                            <?php dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',false);
+                            <?php dl_link($name,$version,$release,'LiveDVD-PLASMA5','i586','DVD',false);
                             echo '<br>';
-                            dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',false);
+                            dl_link($name,$version,$release,'LiveDVD-PLASMA5','x86_64','DVD',false);
                             echo '</td><td>';
-                            dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',true,$torrentavailable);
+                            dl_link($name,$version,$release,'LiveDVD-PLASMA5','i586','DVD',true,$torrentavailable);
                             echo '<br>';
-                            dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',true,$torrentavailable);?>
+                            dl_link($name,$version,$release,'LiveDVD-PLASMA5','x86_64','DVD',true,$torrentavailable);?>
                         </td>
                     </tr>
                     <tr>
@@ -438,9 +438,9 @@ input[type="radio"], input[type="submit"]  {
                     <tr>
                         <th class="name">LiveCD KDE</th>
                         <td>
-                            <?php dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',false);
+                            <?php dl_link($name,$version,$release,'LiveCD-PLASMA5-en','i586','CD',false);
                             echo '</td><td>';
-                            dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',true,$torrentavailable);?>
+                            dl_link($name,$version,$release,'LiveCD-PLASMA5-en','i586','CD',true,$torrentavailable);?>
                         </td>
                     </tr>
                     <tr>