49 files changed, 772 insertions, 2 deletions
diff --git a/6/index.php b/6/index.php
new file mode 100644
index 000000000..7d775ebdf
--- /dev/null
+++ b/6/index.php
@@ -0,0 +1,5 @@
+<?php
+
+require_once '../langs.inc.php';
+relocate($langs, '6/');
+
diff --git a/ar/6 b/ar/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/ar/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/ast/6 b/ast/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/ast/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/ca/6 b/ca/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/ca/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/cs/6 b/cs/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/cs/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/cy/6 b/cy/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/cy/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/de/6 b/de/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/de/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/el/6 b/el/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/el/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/en-gb/6 b/en-gb/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/en-gb/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/en/6/download_index.php b/en/6/download_index.php
new file mode 100755
index 000000000..e81182d2f
--- /dev/null
+++ b/en/6/download_index.php
@@ -0,0 +1,629 @@
+<?php
+
+$name = 'Mageia';
+$version = '6';
+$release = 'dev1';
+$torrentavailable=true;
+$classical=true;
+$live=false;
+$dual=false;
+
+
+define('HLANG', true);
+define('ALIGNMENT', 'Center');
+
+require '../../langs.php';
+$dictionary = read_translation_file($locale, "cauldron");
+
+function get_mageia($name, $version, $release)
+{
+  $re   = empty($release) ? $version : $version . '-' . $release;
+  return implode('-', array($name, $re));
+}
+
+function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext)
+{
+  $va   = empty($variant) ? $arch : $variant . '-' . $arch;
+  $re   = empty($release) ? $va : $release . '-' . $va;
+
+  return implode('-', array($name, $version, $re, $medium)) . $ext;
+}
+
+function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $torrentavailable = true)
+{
+  switch ($arch) {
+  case "i586":
+    $bit = _r('32 bit');
+    break;
+  case "x86_64":
+    $bit = _r('64 bit');
+    break;
+  case "dual":
+    $bit = _r('Dualarch');
+    break;
+  default:
+    $bit = '';
+    break;
+  }
+
+echo $torrent && !$torrentavailable  ? 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)),
+    $bit
+  );
+}
+
+function get_image($ttl, $src, $sty){
+    echo sprintf('<noscript><img class="lazy" src="%s" alt="%s" title="%s" style="%s" /></noscript>', $src, $ttl, $ttl, $sty);
+    echo sprintf('<img class="lazy" src="%s" alt="%s" title="%s" style="%s" />', $src, $ttl, $ttl, $sty);
+}
+
+?>
+<!DOCTYPE html>
+<html dir="ltr" lang="<?php echo $locale; ?>">
+<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="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;?>/">
+    <link rel="stylesheet" href="/g/style/all.css">
+    <script src="/g/js/jquery-1.10.1.min.js"></script>
+    <script src="/g/js/tooltipsy.min.js"></script>
+    <?php include '../../analytics.php'; ?>
+    <style>
+.radiobutton{
+    display: table;
+    border-spacing:0.4em 0;
+    margin: 0px auto; 
+}
+.radiobutton .ui-button{
+    display: table-cell;
+    height: 100%;
+}
+.ui-button,.ui-button:link {
+    border: 1px solid #AED0EA;
+    -moz-box-sizing: content-box;
+    outline: 0 none !important;
+    background: repeat-x scroll 50% 50% #D7EBF9;
+    font-size: 1.4em;
+    cursor: pointer;
+    text-align: center;
+    vertical-align: middle;
+    border-radius: 6px;
+    padding: .5em .4em;
+    min-width: 200px;
+    text-decoration: none;
+    color: black;
+    text-shadow: 1px 2px 3px rgba(0,0,0, 0.5);
+    -moz-box-shadow: 0 0 5px rgba(0, 0, 0, .5);
+    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .5);
+    box-shadow: 2px 2px 5px rgba(0, 0, 0, .5);
+}
+.iso2usb {cursor:pointer}
+
+input[type="radio"]:checked + label,.ui-button:active  {
+    background: #2383C2;
+    background: -webkit-linear-gradient(top, #3494D3 0%, #2383C2 50%);
+    background: -moz-linear-gradient(top, #3494D3 0%, #2383C2 50%);
+    background: -o-linear-gradient(top, #3494D3 0%, #2383C2 50%);
+    background: linear-gradient(top, #3494D3 0%, #2383C2 50%);
+}
+input[type="radio"], input[type="submit"]  {
+    display: none;
+}
+.ui-button:hover{
+    background: #23AEC2;
+}
+
+.tooltipsy{
+    padding: 0.5em;
+    width:auto;
+    max-width: 500px;
+    color: #303030;
+    background-color: #F0F9FF;
+    border: 1px solid #deca7e;
+    text-align: left;
+    -moz-box-shadow: 0 0 10px rgba(0, 0, 0, .5);
+    -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .5);
+    box-shadow: 0 0 10px rgba(0, 0, 0, .5);
+    text-shadow: none;
+    border-radius: 6px;
+}
+</style>
+</head>
+<body class="release downloads">
+    <?php echo $hsnav; ?>
+
+    <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('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>
+
+
+    <div id="doc4" class="yui-t7">
+        <div id="bd" role="main">
+            <div class="yui-ge bb1">
+            <div class="yui-u first rb1">
+
+<noscript>
+<div class="para warn"><?php _g('It looks like you have JavaScript disable. Please <a href="%s">enable</a> it to have better render. At the <a href="%s">end</a> of this page there will be download link for you. But what is written between is important.',array('http://www.enable-javascript.com/','#Fclassical'),'p'); ?></div>
+<style>.radiobutton .ui-button{display: none;}</style>
+</noscript>
+
+<div class="para">
+    <p>
+    <?php _g('Mageia is provided as ISO image files that have to be written to blank <a href="%s">CD or DVD discs</a>.', array(_r('https://wiki.mageia.org/en/Writing_CD_and_DVD_images')), ' '); ?>
+    <br>
+    <?php _g('All ISOs can also be launched from a <a %s>USB drive</a>.', array('href="' . _r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive') . '"'));
+    echo '</p>';
+    _g('To <a %s>dump</a> a Mageia installation ISO on a USB stick, you may try one of several tools:', array('class="iso2usb"'),'p');
+    echo '<ul><li>';
+    _g('For Linux, IsoDumper, available inside repo. Or any tools based on dd.', null, ' ');
+    _g('Unetbootin is not supported.', null, 'span class="warn"'); ?>
+    </li>
+    <?php _g('For Windows please have a look on our <a href="%s">wiki</a> for your options.', array(_r('https://wiki.mageia.org/en/Dump_Mageia_ISO_on_a_USB_flash_drive_-_Alternative_tools')), 'li'); ?>
+    </ul>
+    <div id="iso2usbEx"><p>
+    <?php _g('"Dumping" an image onto a flash device destroys any prior file-system in the partition; access to any data not destroyed will be lost, and partition capacity will be reduced to the image size. In other words, all prior data on the device is at risk.'); ?>
+    </p></div>
+    <p>
+    <?php _g('If you have <a href="%s">UEFI</a>, a procedure is available in the <a href="%s">wiki</a>.', array(_r('http://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface'),_r('https://wiki.mageia.org/en/Installing_on_systems_with_UEFI_firmware' /*this will be changed to tooltip, so no more url*/))) ;?>
+    </p>
+</div>
+
+<div class="para" id="format">
+
+<?php if($classical == true){?>
+<div id="classicalEx">
+    <?php _g('Classical Installation Flavours',null,'h2')?>
+
+    <?php _g('The Classical ISO is the traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'), 'p'); ?>
+    <p>
+        <?php _g('Up to 167 locales are supported:'); ?>
+            Deutsch, English, Español, Français, Italiano, Português, Svenska, Nederlands, Polski, Dansk, Pусский
+        <?php _g('and so much more!'); ?>
+        <a href="https://wiki.mageia.org/en/Available_locales" hreflang="en"><?php _g('See the comprehensive list')?></a>.
+    </p>
+    <p><?php
+        _g('These ISOs contains Free Software and some proprietary drivers.');
+        _g('You will be asked of which kind of Software you want to install.');
+        _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"');?>
+
+</div>
+<?php } ?>
+
+
+<?php if($live == true){?>
+<div id="liveEx">
+    <?php _g('LiveCDs and 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');
+    _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>
+    <?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"');?>
+</div>
+<?php } ?>
+
+<div id="lanEx">
+    <?php _g('Wired Network-based Installation CD',null,'h3');
+    _g('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.',null,'p');
+    _g('Have a look in the <a href="%s">wiki</a> to get a list of possibilities.',array(_r('https://wiki.mageia.org/en/Boot.iso_install')),'p');
+
+    _g('Size of the ISOs is about 50MB.',null,'p class="dlinfo"');?>
+</div>
+
+<div class="radiobutton">
+    <?php if( $classical ){?><input type="radio" value="DVD" name="format" id="classical"/>
+    <label for="classical" class="ui-button classical" ><?php _g('Classic Installation')?></label><?php }?>
+    <?php if($live){ ?><input type="radio" id="live" value="Live" name="format" />
+    <label for="live" class="ui-button live"><?php _g('Live Media');?></label><?php }?>
+    <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 ){?>
+<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(!$classical){ _g('Classical Installation flavours is not yet available.');}?>
+</p>
+<?php }?>
+</div>
+
+<?php if($live){ ?>
+<div class="para" id="livespin">
+    <?php _g('LiveCDs and 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>
+
+<div class="para" id="desktop">
+    <?php _g('Desktop',null,'h2');?>
+
+    <div id="gnomeEx">
+        <?php _g('GNOME Desktop',null,'h3');?>
+        <?php get_image('GNOME', '/g/5/gnome.png', 'width: 100%');?>
+    </div>
+    <div id="kdeEx">
+        <?php _g('KDE Desktop',null,'h3');?>
+        <?php get_image('KDE', '/g/5/kde.png', 'width: 100%');?>
+    </div>
+
+    <div class="radiobutton">
+        <input type="radio" id="kde" value="KDE4" 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>
+    </div>
+</div><?php }/*live*/?>
+
+<div class="para" id="nat">
+    <?php _g('Network installer',null,'h2');?>
+
+    <div id="freeEx">
+        <?php _g('Network installer, Free Software CD', null,'h3');
+        _g('Contain only free software',null,'p')?>
+    </div>
+    <div id="nonfreeEx">
+        <?php _g('Network installer + nonfree firmware CD', null,'h3');
+        _g('Contain nonfree drivers needed for some disc controllers, some network cards, etc.',null,'p')?>
+    </div>
+    <div class="radiobutton">
+        <input type="radio" id="free" value="-" name="nat" />
+        <label for="free" class="ui-button free"><?php _g('Free Software CD')?></label>
+        <input type="radio" id="nonfree" value="nonfree" name="nat" />
+        <label for="nonfree" class="ui-button nonfree"><?php _g('Nonfree Firmware CD')?></label>
+    </div>
+</div>
+
+<div class="para" id="arch">
+    <?php _g('Supported Architecture',null,'h2');?>
+    <div id='64bEx'>
+        <?php _g('64 bit',null,'h3');
+        _g('Most new computers support x86-64 (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it.',null,'p')?>
+    </div>
+    <div id='32bEx'>
+        <?php _g('32 bit',null,'h3');
+        _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>
+
+<div class="dllink para" id="dllink" >
+    <?php _g('Download Method',null,'h2');?>
+    <div id="directEx">
+        <?php _g('Direct Link',null,'h3');
+        _g('You will be redirected to a HTTP or FTP mirror.',null,'p') ?>
+    </div>
+
+
+    <div id="torrentEx">
+<?php if($torrentavailable){ ?>
+    <?php _g('BitTorrent',null,'h3');
+    _g('We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files.',array(_r('http://en.wikipedia.org/wiki/BitTorrent')),'p');?>
+<?php } else { echo _g('BitTorrent link are not yet available.',null, 'p style="margin-top:1.5em;" class="warn"'); } ?> 
+    </div>
+
+    <div class="radiobutton">
+    <?php if($torrentavailable){ ?>
+        <a href="#" id="torrentlink" class="ui-button torrentlink"><?php _g('BitTorrent')?></a><?php }?>
+        <a href="#" id="directlink" class="ui-button directlink"><?php _g('Direct Link')?></a>
+    </div>
+</div>
+
+<noscript>
+<?php if ($classical){ ?>
+                    <div class="para" id="Fclassical">
+                        <h2><?php _g('Classical Installation Flavours')?></h2>
+                        <table class="fr-table dlt2">
+                        <thead>
+                            <tr>
+                                <th><?php _g('Format');?></th>
+                                <th><?php _g('link');?></th>
+                                <th><?php _g('BitTorrent');?></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <th class="name" >DVD 32bit<br>DVD 64bit</th>
+                                <td>
+                                    <?php dl_link($name,$version,$release,null,'i586','DVD',false);
+                                    echo '<br>';
+                                    dl_link($name,$version,$release,null,'x86_64','DVD',false);
+                                    echo '</td><td>';
+                                    dl_link($name,$version,$release,null,'i586','DVD',true,$torrentavailable);
+                                    echo '<br>';
+                                    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>
+<?php } ?>
+
+<?php if($live){ ?>
+                    <div class="para" id="Flive">
+                        <h2><?php _g('LiveCDs and LiveDVDs');?></h2>
+                        <table class="fr-table dlt2">
+                        <thead>
+                            <tr>
+                                <th><?php _g('Desktop');?></th>
+                                <th><?php _g('link');?></th>
+                                <th><?php _g('BitTorrent');?></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                                <tr>
+                        <th class="name" style="width:60%">LiveDVD KDE</th>
+                        <td>
+                            <?php dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',false);
+                            echo '<br>';
+                            dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',false);
+                            echo '</td><td>';
+                            dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',true,$torrentavailable);
+                            echo '<br>';
+                            dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',true,$torrentavailable);?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="name">LiveDVD GNOME</th>
+                        <td>
+                            <?php dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',false);
+                            echo '<br>';
+                            dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',false);
+                            echo '</td><td>';
+                            dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',true,$torrentavailable);
+                            echo '<br>';
+                            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-KDE4-en','i586','CD',false);
+                            echo '</td><td>';
+                            dl_link($name,$version,$release,'LiveCD-KDE4-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>
+
+                    </div>
+<?php }?>
+
+                    <div class="para" id="Flan">
+                        <h2><?php _g('Wired Network-based Installation CD')?></h2>
+
+                        <table class="fr-table dlt2">
+                        <thead>
+                        <tr>
+                            <th><?php _g('Format');?></th>
+                            <th><?php _g('link');?></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr>
+                        <th><?php _g('Network installer, Free Software CD')?></th>
+                        <td><?php dl_link($name,$version,$release,'Boot','i586','CD',false);
+                            echo '<br>';
+                            dl_link($name,$version,$release,'Boot','x86_64','CD',false);?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th><?php _g('Network installer + nonfree firmware CD')?><br>
+                        <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);?>
+                        </td>
+                    </tr>
+                        </tbody>
+                        </table>
+                    </div>
+</noscript>
+                </div>
+
+                <div class="yui-u">
+                    <div class="para" style="padding-left: 1em;">
+                        <ul class="hl">
+                            <li><a href=<?php echo sprintf('"%s">',$releasenotes); _g('Release notes')?></a></li>
+                            <li><a href=<?php echo sprintf('"%s">',$errata); _g('More about known issues or limitation in installation and usage')?></a></li>
+                            <?php _g('<a href="%s">Which to choose</a>', array(_r('https://wiki.mageia.org/en/Installation_Media')), 'li')?>
+                            <?php _g('<a href="%s">Get ISO on USB flash drive</a>', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')),'li') ?>
+                            <?php _g('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array(_r('https://wiki.mageia.org/en/Newcomers_start_here')), 'li')?>
+                            <?php _g('Help us on %s', array("<a href=\"../contribute\">$name $version</a>"), 'li')?>
+                        </ul>
+                        <br>
+                            <?php echo '<br>';
+                            _g('Looking for a stable release?', null, 'h3');
+                            echo '<p>';
+                            _g('It is <a href="%s">here</a>.', array('../downloads/'));
+                            echo '</p>';
+/*                            _g('Upgrading<br>from %s ?', array('Mageia 4'), 'h3')?>
+                            echo '<ul class="hl">'
+                            _g('<strong>do not</strong> use LiveCDs;', null, 'li');
+                            _g('see the <a href="%s" hreflang="en">upgrade guide</a>', array($upgradeguide), 'li');
+                            
+*/									?>
+
+                    </div>
+                    <hr>
+                </div>
+            </div>
+        </div>
+    </div>
+<script>
+
+$(function () {
+
+function scrolltoid(id){ $('html, body').animate({ scrollTop: $(id).offset().top }, 800); }
+
+function gettooltip($cl, $id, $x, $y){
+$($cl).tooltipsy({
+    alignTo: 'cursor',
+    offset: [($x), ($y)],
+    delay:500,
+    content: function ($el, $tip) {
+    $tip.html($($id).remove().html())
+    },
+    hide: function (e, $el) {
+    setTimeout(function(){
+        $el.hide(); 
+    }, 400);
+    }
+});
+}
+
+function lazyload(){
+$('img.lazy').each(function(){
+        $(this)
+        .attr( 'src', $(this).data('src') )
+        .removeClass('hidden')
+        .removeAttr('data-src');
+});
+}
+
+    $('#iso2usb,#arch,#nat,#desktop,#livespin,#dllink').hide();
+    $('input[name=format]').click(function () {
+        $('#arch,label[for="dual"]')[this.id == 'classical' ? 'slideDown' : 'slideUp']();
+        $('label[for="64b"],#64bex').show();
+        $('#livespin')[this.id == 'live' ? 'slideDown' : 'slideUp']();
+        $('#nat')[this.id == 'lan' ? 'slideDown' : 'slideUp']();
+        if ($('#classical').is(':checked')) {
+            $('input[name="arch"],input[name="dllink"]').prop('checked', false);
+        }
+
+        if ($('#live').is(':checked')) {
+            $('input[name="livespin"],input[name="arch"],input[name="dllink"]').prop('checked', false);
+        }
+
+        if ($('#lan').is(':checked')) {
+            $('input[name="nat"],input[name="arch"],input[name="dllink"]').prop('checked', false);
+        }
+
+        $('#desktop')[$('#lan,#live,#classical').is(':checked') ? 'slideUp' : 'slideDown']();
+        $('#dllink')[$('#lan,#live,#classical').is(':checked') ? 'slideUp' : 'slideDown']();
+    });
+
+    $('input[name=nat]').click(function () {
+        $('#arch')[ $('#free,#nonfree').is(':checked') ? 'slideDown' : 'slideUp']();
+    });
+
+    $('input[name=livespin]').click(function () {
+        $('#desktop')[ $('#livecd,#livedvd').is(':checked') ? 'slideDown' : 'slideUp']();
+        if ($('#livecd').is(':checked') && $('#64b').is(':checked')) {
+            $('input[id="32b"]').prop('checked', true);
+        }
+        $('label[for="64b"],#64bex')[$('#livecd').is(':checked') ? 'slideUp' : 'slideDown']();
+        lazyload();
+    });
+
+    $('input[name=desktop]').click(function () {
+        $('#arch')[ $('#gnome,#kde').is(':checked') ? 'slideDown' : 'slideUp']();
+        scrolltoid('#arch')
+    });
+
+    $('input[name=arch]').click(function () {
+        $('#dllink')[$('#32b,#64b,#dual').is(':checked') ? 'slideDown' : 'slideUp']();
+        $('input[name="dllink"]').prop('checked', false);
+        $('#torrentEx,#torrentlink')[$('#lan').is(':checked') ? 'hide' : 'show']();
+        scrolltoid('#dllink')
+    });
+
+    $('#directlink,#torrentlink').hover(function () {
+        format = $('input[name=format]:checked').val();
+        livespin = $('input[name=livespin]:checked').val();
+        desktop = $('input[name=desktop]:checked').val();
+        desktop = (livespin == 'CD') ? desktop + '-en' : desktop;
+        nat = (nat = $('input[name=nat]:checked').val()) == '-' ? '-' : '-' + nat + '-';
+        arch = $('input[name=arch]:checked').val();
+        getname ='<?php echo get_mageia($name, $version, $release)?>' + '-';
+        file = $('#live').is(':checked') ? format + livespin + '-' + desktop + '-' + arch + '-' + livespin + '.iso' : $('#classical').is(':checked') ? arch + '-' + format + '.iso' : format + nat + arch + '-CD.iso';
+        file = (this.id == 'torrentlink') ? getname + file + '&torrent=1' : getname + file ;
+        $("a.ui-button").attr('href','../downloads/get/?q=' + file);
+    });
+
+    gettooltip('.iso2usb', '#iso2usbEx',0,1)
+    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)
+    gettooltip('.free', '#freeEx',40,-70)
+    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)
+
+});
+</script>
+</body>
+</html>
diff --git a/en/6/index.php b/en/6/index.php
new file mode 100644
index 000000000..0a8f24091
--- /dev/null
+++ b/en/6/index.php
@@ -0,0 +1 @@
+<?php include '../6/download_index.php';
diff --git a/en/6/nav.php b/en/6/nav.php
new file mode 100644
index 000000000..4a78eacd0
--- /dev/null
+++ b/en/6/nav.php
@@ -0,0 +1,27 @@
+<?php
+
+//$releasenotes = _r('https://wiki.mageia.org/en/Mageia_6_Release_Notes');
+$errata = _r('https://wiki.mageia.org/en/Mageia_6_Errata');
+$upgradeguide = _r('https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4');
+
+$nav = array( 
+
+//    $releasenotes => _r('Release notes'),
+    $errata => _r('Errata'),
+     "//bugs.mageia.org/" => _r('Bugs Reports'),
+);
+
+$sru = trim($_SERVER['REQUEST_URI']);
+
+$pnav = array();
+foreach ($nav as $k => $v) {
+    $pnav[] = sprintf('<li><a href="%s"%s>%s</a></li>',
+        $k,
+        $k == $sru ? ' class="sel"' : null,
+        $v);
+}
+$pnav = implode($pnav);
+
+echo <<<S
+<div id="mgnavsub"><ul id="mgnavsubl">{$pnav}</ul></div>
+S;
diff --git a/en/downloads/6/index.php b/en/downloads/6/index.php
new file mode 100644
index 000000000..d578b219c
--- /dev/null
+++ b/en/downloads/6/index.php
@@ -0,0 +1,2 @@
+<?php
+header('Location: /6/');
diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index e4037dd3e..0f64cb029 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -952,3 +952,68 @@ path = "iso/5/Mageia-5-x86_64-DVD"
 torrent = "iso/5/torrents/Mageia-5-x86_64-DVD.torrent"
 name = "Mageia 5 64bit DVD"
 size = "3.6 GB"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;; Mageia 6
+;;;;;;;;;;;;;;;;;;;;;
+
+;
+[Mageia-6-dev1-i586-DVD.iso]
+file = "Mageia-6-dev1-i586-DVD.iso"
+md5 = "2105eb0dd0933c45982526be3e106b57"
+md5.gpg = "Mageia-6-dev1-i586-DVD.md5.gpg"
+sha1 = "19672795f8644413e162dc9e42dadb4bf03f9330"
+sha1.gpg = "Mageia-6-dev1-i586-DVD.sha1.gpg"
+sha512 = "ece09eec96e0bab51e892de5b677400a8e9a9dbd12e3eae75a8d578edcf475a71e38780bd74839a8cc9539cafeaff3ca53dd52421b61a4a8312e5508b4cd24c1"
+path = "iso/cauldron/Mageia-6-dev1-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-6-dev1-i586-DVD.torrent"
+name = "Mageia 6 dev1 32bit DVD"
+size = "3.9 GB"
+
+;
+[Mageia-6-dev1-x86_64-DVD.iso]
+file = "Mageia-6-dev1-x86_64-DVD.iso"
+md5 = "3888434ac95d0b98b957cf10f4b95e79"
+md5.gpg = "Mageia-6-dev1-x86_64-DVD.md5.gpg"
+sha1 = "167e8a0b310f99c2c10415fc28de65eb233123e2"
+sha1.gpg = "Mageia-6-dev1-x86_64-DVD.sha1.gpg"
+sha512 = "425250773939e06ee652075b72b15f56010a39e036e8772e7d8ae2539f48b0935bf316ed7df950007d264a546bbf5e4520c3c5edf9a6e4f7b5011022d31a4028"
+path = "iso/cauldron/Mageia-6-dev1-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-6-dev1-x86_64-DVD.torrent"
+name = "Mageia 6 dev1 64bit DVD"
+size = "4.3 GB"
+
+[Mageia-6-dev1-Boot-i586-CD.iso]
+file = "boot.iso"
+path = "distrib/cauldron/i586/install/images"
+md5 = "changes frequently"
+sha1 = "changes frequently"
+name = "Mageia 6 dev1 Boot 32bit CD ISO"
+size = "31 MB"
+
+;
+[Mageia-6-dev1-Boot-nonfree-i586-CD.iso]
+file = "boot-nonfree.iso"
+path = "distrib/cauldron/i586/install/images"
+md5 = "changes frequently"
+sha1 = "changes frequently"
+name = "Mageia 6 dev1 Boot Nonfree 32bit CD ISO"
+size= "46 MB"
+
+;
+[Mageia-6-dev1-Boot-x86_64-CD.iso]
+file = "boot.iso"
+path = "distrib/cauldron/x86_64/install/images"
+md5 = "changes frequently"
+sha1 = "changes frequently"
+name = "Mageia 6 dev1 Boot 64bit CD ISO"
+size = "38 MB"
+
+;
+[Mageia-6-dev1-Boot-nonfree-x86_64-CD.iso]
+file = "boot-nonfree.iso"
+path = "distrib/cauldron/x86_64/install/images"
+md5 = "changes frequently"
+sha1 = "changes frequently"
+name = "Mageia 6 dev1 Boot Nonfree 64bit CD ISO"
+size = "53 MB"
+\ No newline at end of file
diff --git a/en/index.php b/en/index.php
index 1ad31497f..7ee7499eb 100644
--- a/en/index.php
+++ b/en/index.php
@@ -279,7 +279,7 @@ $nav = array(
                 </li>
                 <li><a href="contribute/" class="dl-btn-other"><?php _g('<strong>Get involved</strong> in the next version'); ?></a>
         </li> 
-        <!--<li><a href="6/" class="dl-btn-other"><?php _g('Test'); ?> Mageia 6 alpha</a></li>-->
+        <li><a href="6/" class="dl-btn-other"><?php _g('Test'); ?> Mageia 6 dev1</a></li>
 
             </ul>
         </div>
diff --git a/en/map/index.php b/en/map/index.php
index 7c1f397a5..af3c263af 100644
--- a/en/map/index.php
+++ b/en/map/index.php
@@ -37,7 +37,7 @@ $map = array(
         't' => _r('Downloads'),
         'l' => '/{L}/downloads/',
         'i' => array(
-//             array('t' => _r('6 (in development)'), 'l' => '/{L}/6/'),
+            array('t' => _r('6 (in development)'), 'l' => '/{L}/6/'),
             array('t' => _r('5 (June 2015)'),      'l' => '/{L}/5/'),
             array('t' => _r('4 (February 2014)'),  'l' => '/{L}/4/'),
             array('t' => _r('3 (May 2013)'),       'l' => '/{L}/3/'),
diff --git a/eo/6 b/eo/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/eo/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/es/6 b/es/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/es/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/et/6 b/et/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/et/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/eu/6 b/eu/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/eu/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/fi/6 b/fi/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/fi/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/fr/6 b/fr/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/fr/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/hr/6 b/hr/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/hr/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/hu/6 b/hu/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/hu/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/ia/6 b/ia/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/ia/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/id/6 b/id/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/id/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/it/6 b/it/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/it/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/ja/6 b/ja/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/ja/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/lt/6 b/lt/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/lt/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/lv/6 b/lv/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/lv/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/nb/6 b/nb/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/nb/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/nl/6 b/nl/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/nl/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/pl/6 b/pl/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/pl/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/pt-br/6 b/pt-br/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/pt-br/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/pt/6 b/pt/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/pt/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/ro/6 b/ro/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/ro/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/ru/6 b/ru/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/ru/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/sco/6 b/sco/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/sco/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/sk/6 b/sk/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/sk/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/sl/6 b/sl/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/sl/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/sq/6 b/sq/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/sq/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/sv/6 b/sv/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/sv/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/th/6 b/th/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/th/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/tools/web_projects.dat b/tools/web_projects.dat
index e11c02416..29daa5123 100644
--- a/tools/web_projects.dat
+++ b/tools/web_projects.dat
@@ -9,6 +9,7 @@ resources[2]="en/2/download_index.php en/2/for-pc/index.php en/2/for-server/inde
 resources[3]="en/3/download_index.php en/3/for-pc/index.php en/3/for-server/index.php en/3/index.php en/3/nav.php"
 resources[4]="en/4/download_index.php en/4/nav.php en/4/index.php"
 resources[5]="en/5/download_index.php en/5/nav.php en/5/index.php"
+resources[cauldron]="en/6/download_index.php en/6/nav.php en/6/index.php"
 resources[404]="404.php"
 resources[about]="en/about/index.php"
 resources[calendar]="en/calendar/index.php"
diff --git a/tr/6 b/tr/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/tr/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/uk/6 b/uk/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/uk/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/ur/6 b/ur/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/ur/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/zh-cn/6 b/zh-cn/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/zh-cn/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file
diff --git a/zh-tw/6 b/zh-tw/6
new file mode 120000
index 000000000..04963a017
--- /dev/null
+++ b/zh-tw/6
@@ -0,0 +1 @@
+../en/6
+\ No newline at end of file