aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2014-02-01 09:20:35 +0000
committerManuel Hiebel <leuhmanu@mageia.org>2014-02-01 09:20:35 +0000
commit61ee6b47a395b21cc99f4a2791c1370c88336abe (patch)
treee30238950ec4c1aa339049e4c5edcb32539bebac
parent9d64fa07bcd20d604482806f678d288ecaef4f1a (diff)
downloadwww-61ee6b47a395b21cc99f4a2791c1370c88336abe.tar
www-61ee6b47a395b21cc99f4a2791c1370c88336abe.tar.gz
www-61ee6b47a395b21cc99f4a2791c1370c88336abe.tar.bz2
www-61ee6b47a395b21cc99f4a2791c1370c88336abe.tar.xz
www-61ee6b47a395b21cc99f4a2791c1370c88336abe.zip
Mageia 4 final is here
-rw-r--r--en/3/for-pc/index.php (renamed from en/for-pc/index.php)6
-rw-r--r--en/3/for-server/index.php (renamed from en/for-server/index.php)6
-rw-r--r--en/3/index.php4
-rw-r--r--en/3/nav.php6
-rwxr-xr-xen/4/download_index.php122
-rw-r--r--en/4/index.php103
-rw-r--r--en/4/nav.php7
-rwxr-xr-xen/5/download_index.php269
-rw-r--r--en/5/index.php1
-rw-r--r--en/5/nav.php24
-rw-r--r--en/downloads/get/definitions.ini173
-rw-r--r--en/downloads/index.php2
-rw-r--r--en/index.php18
-rw-r--r--en/map/index.php3
-rw-r--r--en/support/index.php5
-rw-r--r--g/4/background.pngbin0 -> 360691 bytes
-rw-r--r--g/4/cinnamon.pngbin0 -> 162369 bytes
-rw-r--r--g/4/drakconf.pngbin0 -> 107137 bytes
-rw-r--r--g/4/gnome.pngbin0 -> 122719 bytes
-rw-r--r--g/4/kde.pngbin0 -> 184202 bytes
-rw-r--r--g/4/mageiawelcome1.pngbin0 -> 84006 bytes
-rw-r--r--g/4/mageiawelcome2.pngbin0 -> 132548 bytes
-rw-r--r--g/4/mageiawelcome3.pngbin0 -> 105249 bytes
-rw-r--r--g/4/mageiawelcome4.pngbin0 -> 70388 bytes
-rw-r--r--g/4/mageiawelcome5.pngbin0 -> 110614 bytes
-rw-r--r--g/4/mate.pngbin0 -> 169972 bytes
-rw-r--r--g/4/razorqt.pngbin0 -> 156037 bytes
-rw-r--r--g/4/xfce.pngbin0 -> 162146 bytes
28 files changed, 569 insertions, 180 deletions
diff --git a/en/for-pc/index.php b/en/3/for-pc/index.php
index e1db1fbed..3e90bd5dd 100644
--- a/en/for-pc/index.php
+++ b/en/3/for-pc/index.php
@@ -1,7 +1,7 @@
<?php
define('HLANG', true);
-require '../../langs.php';
+require '../../../langs.php';
_lang_load($locale, '3');
?>
@@ -15,12 +15,12 @@ _lang_load($locale, '3');
.para { text-align: left; float: left; width: 250px; display: block; border-right: 1px solid #eef; border-bottom: 1px solid #eef; }
hr { margin-top: 2em; }
</style>
- <?php include '../../analytics.php'; ?>
+ <?php include '../../../analytics.php'; ?>
</head>
<body class="downloads">
<?php echo $hsnav; ?>
<h1 id="mgnavtitle"><a href="../3/">Mageia 3</a> &raquo; <?php _e('for your PC')?></h1>
- <?php include '../3/nav.php'; ?>
+ <?php include '../nav.php'; ?>
<div class="para" style="width: 600px;">
<section>
<?php
diff --git a/en/for-server/index.php b/en/3/for-server/index.php
index 8c241ded8..3cfc3958e 100644
--- a/en/for-server/index.php
+++ b/en/3/for-server/index.php
@@ -1,7 +1,7 @@
<?php
define('HLANG', true);
-require '../../langs.php';
+require '../../../langs.php';
_lang_load($locale, '3');
?>
@@ -15,12 +15,12 @@ _lang_load($locale, '3');
.para { text-align: left; float: left; width: 250px; display: block; border-right: 1px solid #eef; border-bottom: 1px solid #eef; }
hr { margin-top: 2em; }
</style>
- <?php include '../../analytics.php'; ?>
+ <?php include '..././../analytics.php'; ?>
</head>
<body class="downloads">
<?php echo $hsnav; ?>
<h1 id="mgnavtitle"><a href="../3/">Mageia 3</a> &raquo; <?php _e('for your server')?></h1>
- <?php include '../3/nav.php'; ?>
+ <?php include '../nav.php'; ?>
<div class="para" style="width: 600px;">
<section>
<?php
diff --git a/en/3/index.php b/en/3/index.php
index b988cd3b3..688e93bf4 100644
--- a/en/3/index.php
+++ b/en/3/index.php
@@ -24,14 +24,14 @@ _lang_load($locale, '3');
<?php include '../3/nav.php'; ?>
<div class="para" style="width: 600px;">
<section>
- <a href="../downloads" title="Mageia 3"><img src="/g/3/mageia-3-desktop-550.png" alt="Mageia 3" style="width: 550px; display: block; margin: 2em auto 3em auto; box-shadow: 0 0 5px #aaa;"></a>
+ <a href="../3/download_index.php" title="Mageia 3"><img src="/g/3/mageia-3-desktop-550.png" alt="Mageia 3" style="width: 550px; display: block; margin: 2em auto 3em auto; box-shadow: 0 0 5px #aaa;"></a>
<?php
_h('Mageia 3 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.', array('../community'));
_h('What\'s new?', null, 'h2');
_h('Too much to include here! See the <a href="https://wiki.mageia.org/en/Mageia_3_Release_Notes">release notes</a> for an extensive exposé.');
?>
- <p><a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;"><?php _e('Download it right away!');?></a></p>
+ <p><a href="../3/download_index.php" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;"><?php _e('Download it right away!');?></a></p>
<?php
_h('Mageia in context', null, 'h2');
_h('Mageia is both a Community and a Linux Distribution, with Mageia 3 being our third release.');
diff --git a/en/3/nav.php b/en/3/nav.php
index 997459647..feaba4a9b 100644
--- a/en/3/nav.php
+++ b/en/3/nav.php
@@ -2,9 +2,9 @@
$nav = array(
"/{$locale}/3/" => _t('Mageia&nbsp;3'),
- "/{$locale}/downloads/" => _t('Download'),
- "/{$locale}/for-pc/" => _t('For PC'),
- "/{$locale}/for-server/" => _t('For server'),
+ "/{$locale}/3/download_index.php/" => _t('Download'),
+ "/{$locale}/3/for-pc/" => _t('For PC'),
+ "/{$locale}/3/for-server/" => _t('For server'),
);
$sru = trim($_SERVER['REQUEST_URI']);
diff --git a/en/4/download_index.php b/en/4/download_index.php
index 71c0fa52a..3bdab007a 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -1,24 +1,20 @@
<?php
-$name = 'Mageia';
-$version = '4';
-$release = 'RC';
define('HLANG', true);
require '../../langs.php';
-_lang_load($locale, $version);
+_lang_load($locale, '4');
require '../downloads/get/lib.php';
-function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext)
+function get_mageia_image_file_name($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;
+ return implode('-', array('Mageia','4', $va, $medium)) . $ext;
}
-function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $unavailabletorrent = false)
+function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $unavailabletorrent = false)
{
switch ($arch) {
case "i586":
@@ -36,9 +32,9 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
}
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'),
+ get_mageia_image_file_name($variant, $arch, $medium, '.iso'),
$torrent ? '&amp;torrent=1' : '',
- implode(' ', array($name, $version, $release, $variant, $arch, $medium)),
+ implode(' ', array('Mageia 4', $variant, $arch, $medium)),
$bit
);
}
@@ -49,30 +45,18 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<html dir="ltr" lang="<?php echo $locale; ?>">
<head>
<meta charset="utf-8">
- <title><?php echo sprintf(_t('Download') . ' %s %s %s',$name, $version, $release)?></title>
+ <title><?php echo sprintf(_t('Download') . 'Mageia 4')?></title>
<meta name="description" content="<?php _e('Download Mageia 4 DVD, CD, LiveCD, network install ISO images.') ?>">
<meta name="keywords" content="<?php _e('mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent')?>">
<meta name="robots" content="index,nofollow,nosnippet">
- <link rel="canonical" href="/<?php echo $locale.'/'.$verion;?>/">
+ <link rel="canonical" href="/<?php echo $locale.'/4';?>/">
<link rel="stylesheet" href="/g/style/all.css">
<?php include '../../analytics.php'; ?>
- <style>
- .unstable-release-warning {
- padding: 1em 1em 1em 2.2em;
- margin: 0;
- background: #cc0000;
- color: white;
- text-align: left;
- }
- </style>
</head>
<body class="release downloads">
<?php echo $hsnav; ?>
- <h1 id="mgnavt"><?php echo sprintf(_t('Download') . '<strong>%s %s %s</strong>',$name, $version, $release)?></h1>
- <?php include '../'.$version.'/nav.php'; ?>
- <p class="unstable-release-warning"><?php //_e('Be careful! This is a beta, unstable release.');
- //_e('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');?>
-<?php _e('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 February 2014.'); _e('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
+ <h1 id="mgnavt"><?php echo sprintf(_t('Download') . '<strong>Mageia 4</strong>')?></h1>
+ <?php include '../4/nav.php'; ?>
<div id="doc4" class="yui-t7">
<div id="bd" role="main">
<div class="yui-ge bb1">
@@ -91,26 +75,26 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<tbody>
<tr>
<th class="name" style="width:60%">DVD 32bit<br>DVD 64bit<br>
- <span class="dlinfo"><?php _e('Desktop'); ?>: GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ...</th>
- <td class="size">3.9GB</td>
+ <span class="dlinfo"><?php _e('Desktop'); ?>: GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ...</span></th>
+ <td class="size">3.7GB</td>
<td>
- <?php dl_link($name,$version,$release,null,'i586','DVD',false);
+ <?php dl_link(null,'i586','DVD',false);
echo '<br>';
- dl_link($name,$version,$release,null,'x86_64','DVD',false);
+ dl_link(null,'x86_64','DVD',false);
echo '</td><td>';
- dl_link($name,$version,$release,null,'i586','DVD',true);
+ dl_link(null,'i586','DVD',true);
echo '<br>';
- dl_link($name,$version,$release,null,'x86_64','DVD',true);?>
+ dl_link(null,'x86_64','DVD',true);?>
</td>
</tr>
<tr>
<th class="name">DVD dualarch<br>
- <span class="dlinfo"><?php _e('Desktop'); ?>: XFCE</th>
+ <span class="dlinfo"><?php _e('Desktop'); ?>: XFCE</span></th>
<td class="size">1GB</td>
<td>
- <?php dl_link($name,$version,$release,null,'dual','DVD',false);?>
+ <?php dl_link(null,'dual','DVD',false);?>
</td><td>
- <?php dl_link($name,$version,$release,null,'dual','DVD',true);?>
+ <?php dl_link(null,'dual','DVD',true);?>
</td>
</tr>
</tbody>
@@ -136,7 +120,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<h2><?php _e('LiveCDs and LiveDVDs');?></h2>
<p class="dlinfo"><?php _e('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?>
<span class="warn"><?php _e('DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!'); ?></span>
- <?php /*_e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));*/?></p>
+ <?php _e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));?></p>
<table class="fr-table dlt2">
<thead>
<tr>
@@ -152,13 +136,13 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<span class="dlinfo"><?php _e('All languages')?></span></th>
<td class="size">1.4GB</td>
<td>
- <?php dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',false);
+ <?php dl_link('LiveDVD-KDE4','i586','DVD',false);
echo '<br>';
- dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',false);
+ dl_link('LiveDVD-KDE4','x86_64','DVD',false);
echo '</td><td>';
- dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',true);
+ dl_link('LiveDVD-KDE4','i586','DVD',true);
echo '<br>';
- dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',true);?>
+ dl_link('LiveDVD-KDE4','x86_64','DVD',true);?>
</td>
</tr>
<tr>
@@ -166,22 +150,22 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<span class="dlinfo"><?php _e('All languages')?></span></th>
<td class="size">1.4GB</td>
<td>
- <?php dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',false);
+ <?php dl_link('LiveDVD-GNOME','i586','DVD',false);
echo '<br>';
- dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',false);
+ dl_link('LiveDVD-GNOME','x86_64','DVD',false);
echo '</td><td>';
- dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',true);
+ dl_link('LiveDVD-GNOME','i586','DVD',true);
echo '<br>';
- dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',true);?>
+ dl_link('LiveDVD-GNOME','x86_64','DVD',true);?>
</td>
<tr>
<th class="name">LiveCD KDE<br>
<span class="dlinfo"><?php _e('English only')?></span></th>
<td class="size">700MB</td>
<td>
- <?php dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',false);
+ <?php dl_link('LiveCD-KDE4-en','i586','CD',false);
echo '</td><td>';
- dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',true);?>
+ dl_link('LiveCD-KDE4-en','i586','CD',true);?>
</td>
</tr>
<tr>
@@ -189,9 +173,9 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<span class="dlinfo"><?php _e('English only')?></span></th>
<td class="size">700MB</td>
<td>
- <?php dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',false);
+ <?php dl_link('LiveCD-GNOME-en','i586','CD',false);
echo '</td><td>';
- dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',true);?>
+ dl_link('LiveCD-GNOME-en','i586','CD',true);?>
</tr>
</tbody>
@@ -201,8 +185,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<div class="para">
<h2><?php _e('Wired Network-based Installation CD')?></h2>
- <p class="dlinfo"><?php _e('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.')?>
- <span class="warn"><?php _e('These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.'); ?></span></p>
+ <p class="dlinfo"><?php _e('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.')?></p>
<table class="fr-table dlt2">
<thead>
@@ -215,43 +198,56 @@ 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</td>
- <td><?php dl_link($name,$version,$release,'Boot','i586','CD',false);
+ <td class="size">27MB<br>53MB</td>
+ <td><?php dl_link('Boot','i586','CD',false);
echo '<br>';
- dl_link($name,$version,$release,'Boot','x86_64','CD',false);?>
+ dl_link('Boot','x86_64','CD',false);?>
</td>
</tr>
<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">~36MB</td>
- <td><?php dl_link($name,$version,$release,'Boot-nonfree','i586','CD',false);
+ <td class="size">37MB<br>74MB</td>
+ <td><?php dl_link('Boot-nonfree','i586','CD',false);
echo '<br>';
- dl_link($name,$version,$release,'Boot-nonfree','x86_64','CD',false);?>
+ dl_link('Boot-nonfree','x86_64','CD',false);?>
</td>
</tr>
</tbody>
</table>
-
-
</div>
</div>
<div class="yui-u">
<div class="para" style="padding-left: 1em;">
+ <h2>Mageia 4</h2>
+ <?php _h('February 1<sup>st</sup> 2014')?>
<ul class="hl">
- <li><?php _e('<a href="%s%s_%s_%s">Release notes</a>', array('https://wiki.mageia.org/en/',$name,$version,$release))?></li>
+ <li><?php _e('<a href="%s%s_%s_%s">Release notes</a>', array('https://wiki.mageia.org/en/','Mageia',4,'Release_Notes'))?></li>
<li><?php _e('<a href="%s">Errata</a>', array('https://wiki.mageia.org/en/Mageia_4_Errata'))?></li>
<li><?php _e('<a href="%s">Which to choose</a>', array('https://wiki.mageia.org/en/Installation_Media'))?></li>
<li><?php _e('<a href="%s">Get ISO on USB flash stick</a>', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F'))?></li>
- <li><?php _e('Help us on <a href="%s">Mageia 4</a>', array('../contribute/'))?></li>
+ <li><?php _e('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array('https://wiki.mageia.org/en/Newcomers_start_here'))?></li>
</ul>
<br>
<br>
+ <?php _h('Upgrading<br>from Mageia 3?', null, 'h3')?>
+ <ul class="hl"><?php
+ _h('<strong>do not</strong> use LiveCDs;', null, 'li');
+ _h('see the <a href="%s" hreflang="en">upgrade guide</a>', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'), 'li');
+ ?></ul>
+ <br>
+ <br>
<?php
- _h('Looking for a stable release?', null, 'h3');
+ _h('Looking for Mageia 3?', null, 'h3');
echo '<p>';
- _e('It is <a href="%s">here</a>.', array('../downloads/'));
- echo '</p>';
+ _e('It is <a href="%s">here now</a>.', array('../3/'));
+ /*echo '<span class="warn">', _t('But please remember that it already <a href="%s">reached EOL</a>.',array('https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/')) . '</span>'; */?>
+ </p>
+ <br>
+ <br>
+ <?php
+ _h('Need more challenge?', null, 'h3');
+ _h('You can <a href="%s">help</a> us <a href="%s">on Mageia 5</a>.', array('../contribute/','../contribute/'));
?>
</div>
<hr>
diff --git a/en/4/index.php b/en/4/index.php
index d2f8c161a..8b02cf7b3 100644
--- a/en/4/index.php
+++ b/en/4/index.php
@@ -1 +1,102 @@
-<?php include '../4/download_index.php';
+<?php
+
+define('HLANG', true);
+require '../../langs.php';
+
+_lang_load($locale, '4');
+?>
+<!doctype html>
+<html lang="<?php echo $locale; ?>">
+<head>
+ <meta charset="utf-8">
+ <title><?php _e('Mageia 4')?></title>
+ <link rel="stylesheet" href="/g/style/all.css">
+ <meta name="description" content="<?php _e('Mageia 4 is the new, solid, stable Linux distribution from the Mageia project.')?>">
+ <?php include '../../analytics.php'; ?>
+ <style>.para{text-align: justify;text-align: -webkit-auto;}</style>
+ <link rel="stylesheet" href="/g/style/bjqs.css">
+ <script src="/g/js/jquery-1.10.1.min.js"></script>
+ <script src="/g/js/bjqs-1.3.min.js"></script>
+ </head>
+
+<body class="downloads">
+ <?php echo $hsnav; ?>
+ <h1 id="mgnavtitle"><a href="../4/">Mageia 4</a></h1>
+ <?php include '../4/nav.php'; ?>
+ <div id="doc5" class="yui-t3">
+ <div id="bd" role="main">
+ <div class="yui-ge bb1">
+ <div class="yui-u first" style="width:55.5%">
+ <div class="para">
+
+<?php _h('About Mageia 4', null, 'h2');
+
+ _h('Mageia 4 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'));?>
+
+ <p><a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;"><?php _e('Download it right away!');?></a></p>
+
+<?php _h('Live ISO\'s let you try Mageia without installation. Use <a href="%s">these instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can run Mageia 4 directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or KDE.', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F'));
+ _h('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.');
+
+ _h('The Classical ISO is the more traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'));
+
+ _h('Mageia 4 includes several desktop managers including KDE, Gnome, XFCE, Mate, and Cinnamon.');
+
+ _h('There are lots of applications in the official repositories. You can have a look at the <a href="%s">Mageia Application Database</a> to get a complete list of packages inside Mageia.', array('http://mageia.madb.org'));
+
+ _h('What\'s new?', null, 'h2');
+
+ _h('There\'s plenty of new goodness in Mageia 4, too much to include here - see the <a hreflang="en" href="%s">release notes</a> for an extensive exposé.',array('https://wiki.mageia.org/en/Mageia_4_Release_Notes'));
+
+ _h('To help users configure and use Mageia, and to provide some information about the community and the project, we\'ve added the new <a href="%s">MageiaWelcome</a>.It starts automatically when a session opens for the first time in any of the graphical environments.',array('https://wiki.mageia.org/en/Feature:MageiaWelcome'));
+
+ _h('We\'ve added two new desktop environments: Mate and Cinnamon, both available from the classic installer DVD/ISO. To make it more friendly we re-factored the <a href="%s">custom desktop choice</a>.',array('//doc.mageia.org/installer/4/en/content/choosePackageGroups.html'));
+
+ _h('There\'s been a lot of work done on Mageia software. Many packages were ported from Gtk2 to Gtk3, to use more modern components. We\'ve also ported all the tools from the deprecated usermode to polkit when privileges are needed.');
+
+ _h('TexLive used to need around 1GB of data for installation - now it\'s separated into 3 packages which will usually mean a much smaller footprint.');
+ ?>
+ </div>
+ </div>
+
+ <div class="yui-u" style="width:44.5%">
+ <div id="banner" style="text-align:center; display: block; padding: 2em 0em 4em;">
+ <!-- start Basic Jquery Slider -->
+ <ul class="bjqs">
+ <li><img src="/g/4/kde.png" title="KDE"></li>
+ <li><img src="/g/4/razorqt.png" title="RazorQT"></li>
+ <li><img src="/g/4/xfce.png" title="XFCE"></li>
+ <li><img src="/g/4/gnome.png" title="Gnome"></li>
+ <li><img src="/g/4/cinnamon.png" title="Cinnamon"></li>
+ <li><img src="/g/4/mate.png" title="Mate"></li>
+ <li><img src="/g/4/mageiawelcome1.png" title="Mageia Welcome 1."></li>
+ <li><img src="/g/4/mageiawelcome2.png" title="Mageia Welcome 2."></li>
+ <li><img src="/g/4/mageiawelcome3.png" title="Mageia Welcome 3."></li>
+ <li><img src="/g/4/mageiawelcome4.png" title="Mageia Welcome 4."></li>
+ <li><img src="/g/4/mageiawelcome5.png" title="Mageia Welcome 5."></li>
+ <li><img src="/g/4/drakconf.png" title="<?php _e('Mageia Control Center');?>"></li>
+ </ul>
+
+ </div>
+ <div class="para" style="padding: 1em 2em 1em 0em">
+
+ <?php
+ _h('Mageia in context', null, 'h2');
+
+ _h('Mageia is both a Community and a Linux Distribution, with Mageia 4 being our fourth release.');
+
+ _h('Mageia 4 is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.',array('../about/'));
+
+ _h('Mageia 4 has been made by more than <a href="%s">100 people from all around the world</a>.',array('//people.mageia.org/g/'));
+
+ _h('Our work adds to the excellent work of the wider Linux and Free Software community. We aim to blend all the excellent work done by the community, adding the special Mageia ingredients, to bring you the best, most stable, reliable and enjoyable experience we can make for regular users, developers and businesses.');
+
+ _h('We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to <a href="%s">join us</a>.', array('../contribute'));
+ ?>
+ </div>
+
+</div>
+</div>
+
+ </body>
+</html>
diff --git a/en/4/nav.php b/en/4/nav.php
index 42d0bef81..750ee134a 100644
--- a/en/4/nav.php
+++ b/en/4/nav.php
@@ -1,11 +1,10 @@
<?php
$nav = array(
- "https://wiki.mageia.org/en/Mageia_4_Development#Development_Planning" => _t('Development roadmap'),
- "https://wiki.mageia.org/en/FeatureMageia4_Review" => _t('Features review'),
- "https://wiki.mageia.org/en/Mageia_4_$release" => _t('Release notes'),
+ "/{$locale}/4/" => _t('Mageia&nbsp;4'),
+ "/{$locale}/downloads/" => _t('Download'),
+ "https://wiki.mageia.org/en/Mageia_4_Release_Notes" => _t('Release notes'),
_t('https://wiki.mageia.org/en/Mageia_4_Errata') => _t('Errata'),
- "//bugs.mageia.org/" => _t('Bugs Reports'),
);
$sru = trim($_SERVER['REQUEST_URI']);
diff --git a/en/5/download_index.php b/en/5/download_index.php
new file mode 100755
index 000000000..5f29487d9
--- /dev/null
+++ b/en/5/download_index.php
@@ -0,0 +1,269 @@
+<?php
+
+$name = 'Mageia';
+$version = '4';
+$release = 'RC';
+
+define('HLANG', true);
+
+require '../../langs.php';
+_lang_load($locale, $version);
+require '../downloads/get/lib.php';
+
+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, $unavailabletorrent = false)
+{
+ switch ($arch) {
+ case "i586":
+ $bit = _d('32bit');
+ break;
+ case "x86_64":
+ $bit = _d('64bit');
+ break;
+ case "dual":
+ $bit = _d('dualarch');
+ break;
+ default:
+ $bit = '';
+ break;
+ }
+
+echo _t('forthcoming');
+
+/*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)),
+ $bit
+ ); */
+}
+
+?>
+
+<!DOCTYPE html>
+<html dir="ltr" lang="<?php echo $locale; ?>">
+<head>
+ <meta charset="utf-8">
+ <title><?php echo sprintf(_t('Download') . ' %s %s %s',$name, $version, $release)?></title>
+ <meta name="description" content="<?php _e('Download Mageia 4 DVD, CD, LiveCD, network install ISO images.') ?>">
+ <meta name="keywords" content="<?php _e('mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent')?>">
+ <meta name="robots" content="index,nofollow,nosnippet">
+ <link rel="canonical" href="/<?php echo $locale.'/'.$verion;?>/">
+ <link rel="stylesheet" href="/g/style/all.css">
+ <?php include '../../analytics.php'; ?>
+ <style>
+ .unstable-release-warning {
+ padding: 1em 1em 1em 2.2em;
+ margin: 0;
+ background: #cc0000;
+ color: white;
+ text-align: center;
+ }
+ </style>
+</head>
+<body class="release downloads">
+ <?php echo $hsnav; ?>
+ <h1 id="mgnavt"><?php echo sprintf(_t('Download') . '<strong>%s %s %s</strong>',$name, $version, $release)?></h1>
+ <?php include '../'.$version.'/nav.php'; ?>
+ <p class="unstable-release-warning"><?php _e('Be careful! This is a alpha, unstable release.');
+//_e('Be careful! This is a beta, unstable release.');
+ //_e('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');?>
+<?php //_e('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 February 2014.'); _e('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">
+ <div class="para" id="classical">
+ <h2><?php _e('Classical Installation Flavours')?></h2>
+ <table class="fr-table dlt2">
+ <thead>
+ <tr>
+ <th><?php _e('Format');?></th>
+ <th class="size"><?php _e('size');?></th>
+ <th><?php _e('link');?></th>
+ <th><?php _e('BitTorrent');?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th class="name" style="width:60%">DVD 32bit<br>DVD 64bit<br>
+ <span class="dlinfo"><?php _e('Desktop'); ?>: GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ...</span></th>
+ <td class="size">3.9GB</td>
+ <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);
+ echo '<br>';
+ dl_link($name,$version,$release,null,'x86_64','DVD',true);?>
+ </td>
+ </tr>
+ <tr>
+ <th class="name">DVD dualarch<br>
+ <span class="dlinfo"><?php _e('Desktop'); ?>: XFCE</span></th>
+ <td class="size">1GB</td>
+ <td>
+ <?php dl_link($name,$version,$release,null,'dual','DVD',false);?>
+ </td><td>
+ <?php dl_link($name,$version,$release,null,'dual','DVD',true);?>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <p class="dlinfo"><?php _e('Notes:'); ?></p>
+ <ul class="dlinfo hl">
+ <li>
+ <?php _e('Up to 167 locales are supported:'); ?>
+ Deutsch, English, español, français, italiano, português, svenska, nederlands,
+ polski, dansk, Русский
+ <?php _e('and so much more!'); ?>
+ <a href="https://wiki.mageia.org/en/Available_locales" hreflang="en"><?php _e('See the comprehensive list')?></a>.</li>
+ <li><?php
+ _e('These DVD and CD ISOs contains Free Software and some proprietary drivers.');
+ _e('You will be asked of which kind of Software you want to install.');
+ ?></li>
+ <li><?php _e('The dualarch DVD contains only a minimal list of packages.')?></li>
+ </ul>
+ </div>
+
+ <div class="para" id="live">
+ <h2><?php _e('LiveCDs and LiveDVDs');?></h2>
+ <p class="dlinfo"><?php _e('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?>
+ <span class="warn"><?php _e('DO NOT use these LiveCDs or LiveDVDs to upgrade from from the
+prior Mageia release!'); ?></span>
+ <?php /*_e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));*/?></p>
+ <table class="fr-table dlt2">
+ <thead>
+ <tr>
+ <th><?php _e('Desktop');?></th>
+ <th class="size"><?php _e('size');?></th>
+ <th><?php _e('link');?></th>
+ <th><?php _e('BitTorrent');?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th class="name" style="width:60%">LiveDVD KDE<br>
+ <span class="dlinfo"><?php _e('All languages')?></span></th>
+ <td class="size">1.4GB</td>
+ <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);
+ echo '<br>';
+ dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',true);?>
+ </td>
+ </tr>
+ <tr>
+ <th class="name">LiveDVD GNOME<br>
+ <span class="dlinfo"><?php _e('All languages')?></span></th>
+ <td class="size">1.4GB</td>
+ <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);
+ echo '<br>';
+ dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',true);?>
+ </td>
+ <tr>
+ <th class="name">LiveCD KDE<br>
+ <span class="dlinfo"><?php _e('English only')?></span></th>
+ <td class="size">700MB</td>
+ <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);?>
+ </td>
+ </tr>
+ <tr>
+ <th class="name">LiveCD GNOME<br>
+ <span class="dlinfo"><?php _e('English only')?></span></th>
+ <td class="size">700MB</td>
+ <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);?>
+ </tr>
+
+ </tbody>
+ </table>
+
+ </div>
+
+ <div class="para">
+ <h2><?php _e('Wired Network-based Installation CD')?></h2>
+ <p class="dlinfo"><?php _e('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.')?>
+ <span class="warn"><?php _e('These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.'); ?></span></p>
+
+ <table class="fr-table dlt2">
+ <thead>
+ <tr>
+ <th><?php _e('Format');?></th>
+ <th class="size"><?php _e('size');?></th>
+ <th><?php _e('link');?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th><?php _e('Network installer, Free Software CD')?></th>
+ <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);?>
+ </td>
+ </tr>
+ <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">~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);?>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+
+ </div>
+ </div>
+ <div class="yui-u">
+ <div class="para" style="padding-left: 1em;">
+ <ul class="hl">
+ <li><?php _e('<a href="%s%s_%s_%s">Release notes</a>', array('https://wiki.mageia.org/en/',$name,$version,$release))?></li>
+ <li><?php _e('<a href="%s">Errata</a>', array('https://wiki.mageia.org/en/Mageia_4_Errata'))?></li>
+ <li><?php _e('<a href="%s">Which to choose</a>', array('https://wiki.mageia.org/en/Installation_Media'))?></li>
+ <li><?php _e('<a href="%s">Get ISO on USB flash stick</a>', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F'))?></li>
+ <li><?php _e('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array('https://wiki.mageia.org/en/Newcomers_start_here'))?></li>
+ <li><?php _e('Help us on'); echo'<a href="../contribute">',"$name $version";?></a></li>
+
+ </ul>
+ <br>
+ <br>
+ <?php
+ _h('Looking for a stable release?', null, 'h3');
+ echo '<p>';
+ _e('It is <a href="%s">here</a>.', array('../downloads/'));
+ echo '</p>';
+ ?>
+ </div>
+ <hr>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
diff --git a/en/5/index.php b/en/5/index.php
new file mode 100644
index 000000000..d2f8c161a
--- /dev/null
+++ b/en/5/index.php
@@ -0,0 +1 @@
+<?php include '../4/download_index.php';
diff --git a/en/5/nav.php b/en/5/nav.php
new file mode 100644
index 000000000..42d0bef81
--- /dev/null
+++ b/en/5/nav.php
@@ -0,0 +1,24 @@
+<?php
+
+$nav = array(
+ "https://wiki.mageia.org/en/Mageia_4_Development#Development_Planning" => _t('Development roadmap'),
+ "https://wiki.mageia.org/en/FeatureMageia4_Review" => _t('Features review'),
+ "https://wiki.mageia.org/en/Mageia_4_$release" => _t('Release notes'),
+ _t('https://wiki.mageia.org/en/Mageia_4_Errata') => _t('Errata'),
+ "//bugs.mageia.org/" => _t('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/get/definitions.ini b/en/downloads/get/definitions.ini
index 2a71c9cfc..0a7cbae11 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -542,40 +542,40 @@ size = "3.7 GB"
;;;;; Mageia 4
;;;;;;;;;;;;;;;;;;;;;
-[Mageia-4-RC-Boot-i586-CD.iso]
+[Mageia-4-Boot-i586-CD.iso]
file = "boot.iso"
-path = "distrib/cauldron/i586/install/images"
-md5 = "11e5db99684612a0353d1e46b77ee58b"
-sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 RC Boot 32bit CD ISO"
+path = "distrib/4/i586/install/images"
+md5 = "d1eedb536532cfd47d7e8d4258f4c4e8"
+sha1 = "5e7f5946d621cca20f6621ec5c1e64cb0bc88050"
+name = "Mageia 4 Boot 32bit CD ISO"
size = "27 MB"
;
-[Mageia-4-RC-Boot-nonfree-i586-CD.iso]
+[Mageia-4-Boot-nonfree-i586-CD.iso]
file = "boot-nonfree.iso"
-path = "distrib/cauldron/i586/install/images"
-md5 = "7eb58f9f7649e5bc18bdfbbbd4cebf28"
-sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 RC Boot Nonfree 32bit CD ISO"
-size= "36 MB"
+path = "distrib/4/i586/install/images"
+md5 = "43c77b69b82bac36b5d9a6553e805ce1"
+sha1 = "f17523d19bc86f534214e01280d088d222ca18de"
+name = "Mageia 4 Boot Nonfree 32bit CD ISO"
+size= "37 MB"
;
-[Mageia-4-RC-Boot-x86_64-CD.iso]
+[Mageia-4-Boot-x86_64-CD.iso]
file = "boot.iso"
-path = "distrib/cauldron/x86_64/install/images"
-md5 = "2f1e607544b4d63f93372f3a43ec7cd9"
-sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 RC Boot 64bit CD ISO"
-size = "27 MB"
+path = "distrib/4/x86_64/install/images"
+md5 = "a3a77a9a42060b7dc40bd832c6b104b1"
+sha1 = "c09c3107db3f699e84999ec35c357dcf5e07c822"
+name = "Mageia 4 Boot 64bit CD ISO"
+size = "53 MB"
;
-[Mageia-4-RC-Boot-nonfree-x86_64-CD.iso]
+[Mageia-4-Boot-nonfree-x86_64-CD.iso]
file = "boot-nonfree.iso"
-path = "distrib/cauldron/x86_64/install/images"
-md5 = "aec53c870b5592620921bddc792732c3"
-sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 RC Boot Nonfree 64bit CD ISO"
-size ="36 MB"
+path = "distrib/4/x86_64/install/images"
+md5 = "5bb8c70d50d70be35aba3b8e935474ef"
+sha1 = "50cf2213d728dbc31a3228087d6daf829f2d5388"
+name = "Mageia 4 Boot Nonfree 64bit CD ISO"
+size = "74 MB"
@@ -583,100 +583,99 @@ size ="36 MB"
;from fidd
;
-
;
;
-[Mageia-4-RC-LiveCD-GNOME-en-i586-CD.iso]
-file = "Mageia-4-RC-LiveCD-GNOME-en-i586-CD.iso"
-md5 = "02143c02df5ca339172b35e7f1b4d48f"
-sha1 = "829289434044841cd10b0eaa6868f521ae703583"
+[Mageia-4-LiveCD-GNOME-en-i586-CD.iso]
+file = "Mageia-4-LiveCD-GNOME-en-i586-CD.iso"
+md5 = "6923866fe01a61530817b1548513afd1"
+sha1 = "5391879ff032908a91c25addab96dc1862119c61"
langs = "English (Australia) (en_AU), English (Canada) (en_CA), English (en_GB), English (Ireland) (en_IE), English (New-Zealand) (en_NZ), English (American) (en_US), English (South Africa) (en_ZA)"
-path = "iso/cauldron/Mageia-4-RC-LiveCD-GNOME-en-i586-CD"
-torrent = "iso/cauldron/torrents/Mageia-4-RC-LiveCD-GNOME-en-i586-CD.torrent"
-name = "Mageia 4 RC LiveCD GNOME en 32bit CD"
+path = "iso/4/Mageia-4-LiveCD-GNOME-en-i586-CD"
+torrent = "iso/4/torrents/Mageia-4-LiveCD-GNOME-en-i586-CD.torrent"
+name = "Mageia 4 LiveCD GNOME en 32bit CD"
size = "656 MB"
;
-[Mageia-4-RC-LiveCD-KDE4-en-i586-CD.iso]
-file = "Mageia-4-RC-LiveCD-KDE4-en-i586-CD.iso"
-md5 = "bc7ccf5b6e9fa6fe0d8b153f2bd5bfec"
-sha1 = "894e682b5ffc2f9b067936423a0442625b127bc8"
+[Mageia-4-LiveCD-KDE4-en-i586-CD.iso]
+file = "Mageia-4-LiveCD-KDE4-en-i586-CD.iso"
+md5 = "45541fa5e15e20633ccdcfc810fe1578"
+sha1 = "17de7f954957f8245c5af42525779fa323ed9d95"
langs = "English (Australia) (en_AU), English (Canada) (en_CA), English (en_GB), English (Ireland) (en_IE), English (New-Zealand) (en_NZ), English (American) (en_US), English (South Africa) (en_ZA)"
-path = "iso/cauldron/Mageia-4-RC-LiveCD-KDE4-en-i586-CD"
-torrent = "iso/cauldron/torrents/Mageia-4-RC-LiveCD-KDE4-en-i586-CD.torrent"
-name = "Mageia 4 RC LiveCD KDE4 en 32bit CD"
+path = "iso/4/Mageia-4-LiveCD-KDE4-en-i586-CD"
+torrent = "iso/4/torrents/Mageia-4-LiveCD-KDE4-en-i586-CD.torrent"
+name = "Mageia 4 LiveCD KDE4 en 32bit CD"
size = "649 MB"
;
-[Mageia-4-RC-LiveDVD-GNOME-i586-DVD.iso]
-file = "Mageia-4-RC-LiveDVD-GNOME-i586-DVD.iso"
-md5 = "a71ec8f6d3cb69b521aef9ca1cbde695"
-sha1 = "287cb1f130a321c5a60f615f3a99d8810a81f597"
+[Mageia-4-LiveDVD-GNOME-i586-DVD.iso]
+file = "Mageia-4-LiveDVD-GNOME-i586-DVD.iso"
+md5 = "b917adc6d8980148e10fec1966753737"
+sha1 = "ce5220459fd141f1ee8656186aa171bfa80f60a9"
langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-RC-LiveDVD-GNOME-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-RC-LiveDVD-GNOME-i586-DVD.torrent"
-name = "Mageia 4 RC LiveDVD GNOME 32bit DVD"
+path = "iso/4/Mageia-4-LiveDVD-GNOME-i586-DVD"
+torrent = "iso/4/torrents/Mageia-4-LiveDVD-GNOME-i586-DVD.torrent"
+name = "Mageia 4 LiveDVD GNOME 32bit DVD"
size = "1.4 GB"
;
-[Mageia-4-RC-LiveDVD-GNOME-x86_64-DVD.iso]
-file = "Mageia-4-RC-LiveDVD-GNOME-x86_64-DVD.iso"
-md5 = "f5851a814d66fffca9b73d7422e25092"
-sha1 = "47097d93525d759e32bf15b90a1330b1da63a958"
+[Mageia-4-LiveDVD-GNOME-x86_64-DVD.iso]
+file = "Mageia-4-LiveDVD-GNOME-x86_64-DVD.iso"
+md5 = "e15f2bf9543e8a155000e4fc9fa63b21"
+sha1 = "95da79bbcc152aa9169599e7419779195a478e09"
langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-RC-LiveDVD-GNOME-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-RC-LiveDVD-GNOME-x86_64-DVD.torrent"
-name = "Mageia 4 RC LiveDVD GNOME 64bit DVD"
+path = "iso/4/Mageia-4-LiveDVD-GNOME-x86_64-DVD"
+torrent = "iso/4/torrents/Mageia-4-LiveDVD-GNOME-x86_64-DVD.torrent"
+name = "Mageia 4 LiveDVD GNOME 64bit DVD"
size = "1.4 GB"
;
-[Mageia-4-RC-LiveDVD-KDE4-i586-DVD.iso]
-file = "Mageia-4-RC-LiveDVD-KDE4-i586-DVD.iso"
-md5 = "650438a9cef65e05930211d569f61805"
-sha1 = "cc693fab8b3828459111c8f5420ab08182f2e7e5"
+[Mageia-4-LiveDVD-KDE4-i586-DVD.iso]
+file = "Mageia-4-LiveDVD-KDE4-i586-DVD.iso"
+md5 = "d00a43e92ad28eadb79a6d474de81841"
+sha1 = "0b1df4fca2d16a815291ee925171e658ff3cf577"
langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-RC-LiveDVD-KDE4-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-RC-LiveDVD-KDE4-i586-DVD.torrent"
-name = "Mageia 4 RC LiveDVD KDE4 32bit DVD"
+path = "iso/4/Mageia-4-LiveDVD-KDE4-i586-DVD"
+torrent = "iso/4/torrents/Mageia-4-LiveDVD-KDE4-i586-DVD.torrent"
+name = "Mageia 4 LiveDVD KDE4 32bit DVD"
size = "1.4 GB"
;
-[Mageia-4-RC-LiveDVD-KDE4-x86_64-DVD.iso]
-file = "Mageia-4-RC-LiveDVD-KDE4-x86_64-DVD.iso"
-md5 = "c3103c731b26337942a121ba5f22f5f4"
-sha1 = "c38d7b89726e767ff4fc983318362e3572896796"
+[Mageia-4-LiveDVD-KDE4-x86_64-DVD.iso]
+file = "Mageia-4-LiveDVD-KDE4-x86_64-DVD.iso"
+md5 = "5ea3ad2be9b2ca703fe308141d23c988"
+sha1 = "239659aa414ae2f662a7da47711fd09e079ffc1b"
langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-RC-LiveDVD-KDE4-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-RC-LiveDVD-KDE4-x86_64-DVD.torrent"
-name = "Mageia 4 RC LiveDVD KDE4 64bit DVD"
+path = "iso/4/Mageia-4-LiveDVD-KDE4-x86_64-DVD"
+torrent = "iso/4/torrents/Mageia-4-LiveDVD-KDE4-x86_64-DVD.torrent"
+name = "Mageia 4 LiveDVD KDE4 64bit DVD"
size = "1.5 GB"
;
-[Mageia-4-RC-dual-DVD.iso]
-file = "Mageia-4-RC-dual-DVD.iso"
-md5 = "6575cde7a1e14e5ba8df020e2c4617b2"
-sha1 = "91d91b518da4dc2c7139dbc4e28b1aa7dd98b51e"
-path = "iso/cauldron/Mageia-4-RC-dual-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-RC-dual-DVD.torrent"
-name = "Mageia 4 RC dual DVD"
+[Mageia-4-dual-DVD.iso]
+file = "Mageia-4-dual-DVD.iso"
+md5 = "f0f6e9842b687c35d808d406232ba97b"
+sha1 = "4efaf6356988c4348c53ddff2f3bb75363d3a965"
+path = "iso/4/Mageia-4-dual-DVD"
+torrent = "iso/4/torrents/Mageia-4-dual-DVD.torrent"
+name = "Mageia 4 dual DVD"
size = "1 GB"
;
-[Mageia-4-RC-i586-DVD.iso]
-file = "Mageia-4-RC-i586-DVD.iso"
-md5 = "8377797be15a187de9154427e09dd1da"
-sha1 = "2d6f037422c65aa3de02d69eb46da3644fda16b8"
-path = "iso/cauldron/Mageia-4-RC-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-RC-i586-DVD.torrent"
-name = "Mageia 4 RC 32bit DVD"
+[Mageia-4-i586-DVD.iso]
+file = "Mageia-4-i586-DVD.iso"
+md5 = "452b3003766f2bcec202e0399a6708e8"
+sha1 = "69bf4c87537452b10443c0cce3db07ef3af1c3a1"
+path = "iso/4/Mageia-4-i586-DVD"
+torrent = "iso/4/torrents/Mageia-4-i586-DVD.torrent"
+name = "Mageia 4 32bit DVD"
size = "3.6 GB"
;
-[Mageia-4-RC-x86_64-DVD.iso]
-file = "Mageia-4-RC-x86_64-DVD.iso"
-md5 = "ec1ce42c4b003b5e9bea6911968195c8"
-sha1 = "3e544cf20473eeddf92dab97a9a8cb0bd0418767"
-path = "iso/cauldron/Mageia-4-RC-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-RC-x86_64-DVD.torrent"
-name = "Mageia 4 RC 64bit DVD"
+[Mageia-4-x86_64-DVD.iso]
+file = "Mageia-4-x86_64-DVD.iso"
+md5 = "558ecab2670cb8ae9db63216cf7484df"
+sha1 = "9b92024e4ae0b4d4a122b0f8dd8d4c6a97c7b674"
+path = "iso/4/Mageia-4-x86_64-DVD"
+torrent = "iso/4/torrents/Mageia-4-x86_64-DVD.torrent"
+name = "Mageia 4 64bit DVD"
size = "3.6 GB"
diff --git a/en/downloads/index.php b/en/downloads/index.php
index 038df9c10..d2f8c161a 100644
--- a/en/downloads/index.php
+++ b/en/downloads/index.php
@@ -1 +1 @@
-<?php include '../3/download_index.php';
+<?php include '../4/download_index.php';
diff --git a/en/index.php b/en/index.php
index c8a075498..7ff3ea0a7 100644
--- a/en/index.php
+++ b/en/index.php
@@ -7,8 +7,6 @@ require '../langs.php';
_lang_load($locale, 'index');
$nav = array(
- 'nav-for-pc' => array('for-pc/', _t('For PC')),
- 'nav-for-server' => array('for-server/', _t('For server')),
'nav-support' => array('support/', _t('Support')),
'nav-community' => array('community/', _t('Community')),
'nav-about' => array('about/', _t('About&nbsp;Mageia.Org'))
@@ -59,7 +57,7 @@ $nav = array(
padding-bottom: 0px;
color: #fff;
text-shadow: 0 0 1px #333;
- background: url(/g/3/background_tile.png)
+ background: #193255;
/*
background: -webkit-radial-gradient(20% 350px, circle cover, #3494D3 0%, #2383C2 50%);
background: -moz-radial-gradient(26% 370px, circle cover, #3494D3 0%, #2383C2 50%);
@@ -80,7 +78,7 @@ $nav = array(
color: #000;
text-decoration: none;
width: 280px;
- background: rgba(255,255,255,0.9);
+ background: #E8EBEE;
padding: 20px 20px 15px 20px;
border-radius: 4px;
text-shadow: none;
@@ -181,7 +179,7 @@ $nav = array(
@media (min-width: 1000px) {
h2 { margin-bottom: 0.3em; }
ul#p li:before { content: " > "; }
- #up > .container { background: url(/g/3/background.png) no-repeat 100% 0px; }
+ #up > .container { background: url(/g/4/background.png) no-repeat 100% 100%; }
#b1 { padding: 70px 0 70px; }
#navb {
@@ -237,17 +235,17 @@ $nav = array(
<span id="dl-btn-mageia">Mageia 3</span>
<span style="font-size: 32px; color: green; float: right;" class="icon-download-alt"></span>
<span class="dl-btn free-dl"><?php _e('Free Download'); ?></span>
- <span class="dl-btn"><?php _e('version 3 (May 2013)'); ?></span>
+ <span class="dl-btn"><?php _e('version 4 (February 2014)'); ?></span>
</a>
<p class="dl-info">
- <?php _e('<a href="%s" hreflang="en">Release notes</a>', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes')); ?>,
- <?php _e('<a href="%s" hreflang="en">errata</a>', array('https://wiki.mageia.org/en/Mageia_3_Errata')); ?>.
+ <?php _e('<a href="%s" hreflang="en">Release notes</a>', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes')); ?>,
+ <?php _e('<a href="%s" hreflang="en">errata</a>', array('https://wiki.mageia.org/en/Mageia_4_Errata')); ?>.
</p>
</li>
<li><a href="contribute/" class="dl-btn-other"><?php _e('<strong>Get involved</strong> in the next version'); ?></a>
</li>
- <li><a href="4/" class="dl-btn-other"><?php _e('Test'); ?> Mageia 4 RC</a>
- </li>
+ <!--<li><a href="4/" class="dl-btn-other"><?php _e('Test'); ?> Mageia 5 alpha 1</a>
+ </li>-->
</ul>
</div>
</div>
diff --git a/en/map/index.php b/en/map/index.php
index 4b31df91a..d118d392b 100644
--- a/en/map/index.php
+++ b/en/map/index.php
@@ -39,7 +39,8 @@ $map = array(
't' => _t('Downloads'),
'l' => '/{L}/downloads/',
'i' => array(
- array('t' => _t('4 (in development)'), 'l' => '/{L}/4/'),
+ //array('t' => _t('5 (in development)', 'l' => '/{L}/5/'),
+ array('t' => _t('4 (February 2014)'), 'l' => '/{L}/4/'),
array('t' => _t('3 (May 2013)'), 'l' => '/{L}/3/'),
array('t' => _t('2 (May 2012)'), 'l' => '/{L}/2/'),
array('t' => _t('1 (June 2011)'), 'l' => '/{L}/1/'),
diff --git a/en/support/index.php b/en/support/index.php
index b2ea4447b..86ddb91c1 100644
--- a/en/support/index.php
+++ b/en/support/index.php
@@ -49,9 +49,10 @@ _lang_load($locale, 'support');
_h('Lifecycle', null, 'h3');
_h('Mageia releases are supported at least for 18 months.');
echo '<ul class="hl">';
- _h('Mageia 1 was supported until December 1st, 2012.', null, 'li');
- _h('Mageia 2 was supported until November 22nd, 2013.', null, 'li');
+ _h('Mageia 4 will be supported until April 1st, 2015.', null, 'li');
_h('Mageia 3 will be supported until November 19th, 2014.', null, 'li');
+ _h('Mageia 2 was supported until November 22nd, 2013.', null, 'li');
+ _h('Mageia 1 was supported until December 1st, 2012.', null, 'li');
echo '</ul>';
echo '<hr>';
diff --git a/g/4/background.png b/g/4/background.png
new file mode 100644
index 000000000..eb268a24c
--- /dev/null
+++ b/g/4/background.png
Binary files differ
diff --git a/g/4/cinnamon.png b/g/4/cinnamon.png
new file mode 100644
index 000000000..dff118832
--- /dev/null
+++ b/g/4/cinnamon.png
Binary files differ
diff --git a/g/4/drakconf.png b/g/4/drakconf.png
new file mode 100644
index 000000000..bc36f776f
--- /dev/null
+++ b/g/4/drakconf.png
Binary files differ
diff --git a/g/4/gnome.png b/g/4/gnome.png
new file mode 100644
index 000000000..f947bae52
--- /dev/null
+++ b/g/4/gnome.png
Binary files differ
diff --git a/g/4/kde.png b/g/4/kde.png
new file mode 100644
index 000000000..a46f91337
--- /dev/null
+++ b/g/4/kde.png
Binary files differ
diff --git a/g/4/mageiawelcome1.png b/g/4/mageiawelcome1.png
new file mode 100644
index 000000000..408208ac8
--- /dev/null
+++ b/g/4/mageiawelcome1.png
Binary files differ
diff --git a/g/4/mageiawelcome2.png b/g/4/mageiawelcome2.png
new file mode 100644
index 000000000..e4de3e0dc
--- /dev/null
+++ b/g/4/mageiawelcome2.png
Binary files differ
diff --git a/g/4/mageiawelcome3.png b/g/4/mageiawelcome3.png
new file mode 100644
index 000000000..679c367bd
--- /dev/null
+++ b/g/4/mageiawelcome3.png
Binary files differ
diff --git a/g/4/mageiawelcome4.png b/g/4/mageiawelcome4.png
new file mode 100644
index 000000000..72265984c
--- /dev/null
+++ b/g/4/mageiawelcome4.png
Binary files differ
diff --git a/g/4/mageiawelcome5.png b/g/4/mageiawelcome5.png
new file mode 100644
index 000000000..4b9bc1f5f
--- /dev/null
+++ b/g/4/mageiawelcome5.png
Binary files differ
diff --git a/g/4/mate.png b/g/4/mate.png
new file mode 100644
index 000000000..a3fca8646
--- /dev/null
+++ b/g/4/mate.png
Binary files differ
diff --git a/g/4/razorqt.png b/g/4/razorqt.png
new file mode 100644
index 000000000..fd67ba28e
--- /dev/null
+++ b/g/4/razorqt.png
Binary files differ
diff --git a/g/4/xfce.png b/g/4/xfce.png
new file mode 100644
index 000000000..a082491ba
--- /dev/null
+++ b/g/4/xfce.png
Binary files differ