diff options
| -rw-r--r-- | en/2/for-pc/index.php | 98 | ||||
| -rw-r--r-- | en/2/for-server/index.php | 56 | ||||
| -rw-r--r-- | en/2/index.php | 4 | ||||
| -rw-r--r-- | en/2/nav.php | 6 | ||||
| -rwxr-xr-x | en/3/download_index.php | 4 | ||||
| -rw-r--r-- | en/3/nav.php | 46 | ||||
| -rw-r--r-- | en/about/index.php | 4 | ||||
| -rw-r--r-- | en/for-pc/index.php | 24 | ||||
| -rw-r--r-- | en/for-server/index.php | 28 | ||||
| -rw-r--r-- | en/map/index.php | 2 | ||||
| -rw-r--r-- | en/support/index.php | 3 | ||||
| -rw-r--r-- | langs/en/3.en.lang | 7 | ||||
| -rw-r--r-- | langs/en/about.en.lang | 8 | ||||
| -rw-r--r-- | langs/en/map.en.lang | 6 | ||||
| -rw-r--r-- | langs/en/support.en.lang | 3 | ||||
| -rwxr-xr-x | langs/fr/about.fr.lang | 4 | ||||
| -rw-r--r-- | langs/fr/map.fr.lang | 5 | ||||
| -rwxr-xr-x | langs/fr/support.fr.lang | 3 |
18 files changed, 261 insertions, 50 deletions
diff --git a/en/2/for-pc/index.php b/en/2/for-pc/index.php new file mode 100644 index 000000000..f220b354e --- /dev/null +++ b/en/2/for-pc/index.php @@ -0,0 +1,98 @@ +<?php + +define('HLANG', true); +require '../../../langs.php'; +_lang_load($locale, '2'); + +?> +<!DOCTYPE html> +<html lang="<?php echo $locale; ?>"> +<head> + <meta charset="utf-8"> + <title><?php _e('Mageia 2, for your PC')?></title> + <link rel="stylesheet" href="/g/style/all.css"> + <style> + .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'; ?> +</head> +<body class="downloads"> + <?php echo $hsnav; ?> + <h1 id="mgnavtitle"><a href="../2/">Mageia 2</a> » <?php _e('for your PC')?></h1> + <?php include '../nav.php'; ?> + <div class="para" style="width: 600px;"> + <section> + <?php + _h('Plenty', null, 'h2'); + _h('There are 19 881 packages in our repositories. And that\'s just for the 64-bit branch.'); + _h('The total number is double that – and then if you consider the backports, and the packages in the Cauldron still testing... you\'ll see that Mageia users are spoiled for choice.'); + _h('Here\'s a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:'); + _h('Environments', null, 'h2'); + _h('Mageia 2 has all the major desktop environments:'); + ?> + <ul> + <li>KDE4 SC 4.8.2,</li> + <li>GNOME 3.4,</li> + <li>XFCE 4.9,</li> + <li>LXDE,</li> + <li>Razor-Qt,</li> + <li>E17.</li> + </ul> + <?php + _h('And then there are the window managers, including Openbox, WindowMaker, IceWM, Fluxbox, Fvwm2 and Awesome.'); + _h('Applications →', null, 'h2'); + _h('There are many, many to choose from – including all the most popular.'); + ?> + </section> + </div> + <div class="para" style="width: 300px"> + <?php + _h('Web', null, 'h3'); + _h('Choose your web browser from Firefox ESR 10.0.4, Chromium-browser 180.1025.160, Epiphany 3.4.1 or Opera 11.64 – or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.8.2, Thunderbird ESR 10.0.4, Evolution 3.4.1 or maybe Claws-Mail or Mutt.'); + ?> + </div> + <div class="para" style="width: 300px"> + <?php + _h('Messaging', null, 'h3'); + _h('Choose from Kopete, Pidgin, Empathy or Kadu for instant messaging; use Quassel, Konversation, XChat-Gnome or KVIrc for IRC chat; try QuteCom or Ekiga (or even Skype) for VOIP.'); + ?> + </div> + <div class="para" style="width: 300px"> + <?php + _h('Office', null, 'h3'); + _h('The two full-featured office suites LibreOffice and Calligra are there, as well as AbiWord, and a host of text editors including Kate; for finance there\'s KMyMoney, Skrooge or the professional-level GnuCash.'); + ?> + </div> + <div class="para" style="width: 300px"> + <?php + _h('Image', null, 'h3'); + _h('Use GIMP for powerful image manipulation, or Inkscape for vector drawing; Blender is there for serious animation. DigiKam or Showfoto will take care of your photos, talk to your camera and give you more basic image editing.'); + ?> + </div> + <div class="para" style="width: 300px"> + <?php + _h('Sound', null, 'h3'); + _h('For playing audio files, choose from Amarok 2.5.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don\'t infringe local laws.'); + ?> + </div> + <div class="para" style="width: 300px"> + <?php + _h('Video', null, 'h3'); + _h('For editing video files, try Avidemux, Kino or OpenShot; for subtitles, there\'s Gaupol or Subtitles Composer; use MythTV, Miro, tvtime, FreetuxTV or Me TV for watching or recording TV programmes.'); + ?> + </div> + <div class="para" style="width: 300px"> + <?php + _h('Plus', null, 'h3'); + _h('Then there\'s ZoneMinder, for CCTV Security; VirtualBox or WINE for virtualisation; and a range of development environments such as Anjuta, Eclipse, Netbeans or KDevelop.'); + ?> + </div> + <div class="para"> + <?php + _h('For more information about these and other packages, check the <a href="%s">Mageia 2 Release notes</a>.', array('https://wiki.mageia.org/en/Mageia_2_Release_Notes')); + _h('You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.', array('http://mageia.madb.org/')); + ?> + </div> +</body> +</html> diff --git a/en/2/for-server/index.php b/en/2/for-server/index.php new file mode 100644 index 000000000..540ff023f --- /dev/null +++ b/en/2/for-server/index.php @@ -0,0 +1,56 @@ +<?php + +define('HLANG', true); +require '../../../langs.php'; +_lang_load($locale, '2'); + +?> +<!DOCTYPE html> +<html lang="<?php echo $locale; ?>"> +<head> + <meta charset="utf-8"> + <title><?php _e('Mageia 2, for your server')?></title> + <link rel="stylesheet" href="/g/style/all.css"> + <style> + .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'; ?> +</head> +<body class="downloads"> + <?php echo $hsnav; ?> + <h1 id="mgnavtitle"><a href="../2/">Mageia 2</a> » <?php _e('for your server')?></h1> + <?php include '../nav.php'; ?> + <div class="para" style="width: 600px;"> + <section> + <?php + _h('Mageia 2 has all the main services and server packages you will need to run your server.'); + _h('Aside from the cross-section included here, you will find many others in the repositories: you can use rpmdrake to search for packages, or check the <a href="%s">Mageia App DB</a>.', + array('http://mageia.madb.org')); + + _h('Administration', null, 'h3'); + _h('For centralised administration, we include puppet 2.7.11; we use it widely in <a href="%s">our own infrastructure</a>.', + array('http://svnweb.mageia.org/adm/puppet/')); + + _h('The entire High Availability stack has been updated, and now includes drbd 8.3.11, Corosync 2.0.0 and Pacemaker 1.1.7.'); + + _h('Databases', null, 'h3'); + _h('Databases included are PostgreSQL 8.4.11; MariaDB, which replaces MySQL 5.5.23; BDB.'); + _h('And there are NoSQL servers too: CouchDB 1.1.1, Redis 2.4.8, Cassandra 1.4.0, MongoDB 2.0.3.'); + + _h('Servers', null, 'h3'); + _h('Web servers include Apache 2.2.22, Cherokee 1.2.101 and lighttpd 1.4.30.'); + _h('For file and directory sharing and network printing on heterogeneous networks, we have Samba 3.6.5, OpenLDAP 2.4.29 and Cups 1.5.2.'); + _h('Mail servers included with Mageia 2 are Postfix 2.8.8, Cyrus-imapd 2.4.13 and Dovecot 1.2.17.'); + ?> + </section> + </div> + <div class="para"> + <?php + _h('For more information about these and other packages, check the <a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes">Mageia 2 Release notes</a>.'); + _h('You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.', + array('http://mageia.madb.org/')); + ?> + </div> +</body> +</html> diff --git a/en/2/index.php b/en/2/index.php index 7e341cd17..115eee24f 100644 --- a/en/2/index.php +++ b/en/2/index.php @@ -24,7 +24,7 @@ _lang_load($locale, '2'); <?php include '../2/nav.php'; ?> <div class="para" style="width: 600px;"> <section> - <a href="../downloads/" title="Mageia 2"><img src="/g/2/images/mageia-2-desktop-550.jpg" alt="Mageia 2" style="width: 550px; display: block; margin: 2em auto 3em auto; box-shadow: 0 0 5px #aaa;"></a> + <a href="../download_index.php" title="Mageia 2"><img src="/g/2/images/mageia-2-desktop-550.jpg" alt="Mageia 2" style="width: 550px; display: block; margin: 2em auto 3em auto; box-shadow: 0 0 5px #aaa;"></a> <?php _h('Mageia 2 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.', array('../community')); @@ -47,4 +47,4 @@ _lang_load($locale, '2'); </section> </div> </body> -</html>
\ No newline at end of file +</html> diff --git a/en/2/nav.php b/en/2/nav.php index c17e591b2..482d0a9a6 100644 --- a/en/2/nav.php +++ b/en/2/nav.php @@ -25,9 +25,9 @@ else $nav = array( "/{$locale}/2/" => _t('Mageia 2'), - "/{$locale}/downloads/" => _t('Download'), - "/{$locale}/for-pc/" => _t('For PC'), - "/{$locale}/for-server/" => _t('For server'), + "/{$locale}/2/download_index/" => _t('Download'), + "/{$locale}/2/for-pc/" => _t('For PC'), + "/{$locale}/2/for-server/" => _t('For server'), ); $sru = trim($_SERVER['REQUEST_URI']); diff --git a/en/3/download_index.php b/en/3/download_index.php index 1130ac0e4..9c99ad024 100755 --- a/en/3/download_index.php +++ b/en/3/download_index.php @@ -23,7 +23,7 @@ require '../downloads/get/lib.php'; <body class="release downloads"> <?php echo $hsnav; ?> <h1 id="mgnavt"><?php _e('Download <strong>Mageia 3</strong>')?></h1> - <!--<?php include '../3/nav.php'; ?>--> + <?php include '../3/nav.php'; ?> <div id="doc4" class="yui-t7"> <div id="bd" role="main"> <div class="yui-ge bb1"> @@ -182,7 +182,7 @@ require '../downloads/get/lib.php'; <?php _h('Looking for Mageia 2?', null, 'h3'); echo '<p>'; - _e('It is <a href="%s">here now</a>.', array('../2/download_index.php')); + _e('It is <a href="%s">here now</a>.', array('/2/')); echo '</p>'; ?> <br> diff --git a/en/3/nav.php b/en/3/nav.php new file mode 100644 index 000000000..2b7e4628e --- /dev/null +++ b/en/3/nav.php @@ -0,0 +1,46 @@ +<?php + +$_nt = array( + 'cs' => array('for-you' => 'Pro vás', 'dl' => 'Stáhnout', 'next' => 'A dále?', 'notes' => 'Poznámky'), + 'de' => array('for-you' => 'Für Sie', 'dl' => 'Download', 'next' => 'Und nun?', 'notes' => 'Release-Notes'), + 'el' => array('for-you' => 'Για εσάς', 'dl' => 'Λήψη', 'next' => 'Και μετά;', 'notes' => 'Σημειώσεις'), + 'en' => array('for-you' => 'For you', 'dl' => 'Download', 'next' => 'And next?', 'notes' => 'Notes'), + 'es' => array('for-you' => 'Para usted', 'dl' => 'Descargar', 'next' => '¿Y qué sigue?', 'notes' => 'Notas'), + 'et' => array('for-you' => 'Teie jaoks', 'dl' => 'Allalaadimine', 'next' => 'Ja mis edasi?', 'notes' => 'Märkmed'), + 'fr' => array('for-you' => 'Pour vous', 'dl' => 'Télécharger', 'next' => 'Et après ?'), + 'it' => array('for-you' => 'Per voi', 'dl' => 'Scaricare', 'next' => 'E dopo ?', 'notes' => 'Note'), + 'nb' => array('for-you' => 'For deg', 'dl' => 'Last ned', 'next' => 'Neste steg?', 'notes' => 'Merknader'), + 'nl' => array('for-you' => 'Voor u', 'dl' => 'Download', 'next' => 'En nu?', 'notes' => 'Opmerkingen'), + 'pt' => array('for-you' => 'Para si', 'dl' => 'Transferir', 'next' => 'E depois?', 'notes' => 'Notas'), + 'ro' => array('for-you' => 'Pentru voi', 'dl' => 'Descărcați', 'next' => 'Și după?', 'notes' => 'Notele ediției'), + 'tr' => array('for-you' => 'Sizin için', 'dl' => 'İndirin', 'next' => 'Peki sonra?', 'notes' => 'Notlar'), + 'uk' => array('for-you' => 'Для вас', 'dl' => 'Звантаження', 'next' => 'Що далі?', 'notes' => 'Нотатки'), + 'zh-tw' => array('for-you' => '為了您', 'dl' => '下載', 'next' => '下一步呢？', 'notes' => '通告') +); + +if (array_key_exists($locale, $_nt)) + $_nt = array_merge($_nt['en'], $_nt[$locale]); +else + $_nt = $_nt['en']; + +$nav = array( + "/{$locale}/3/" => _t('Mageia 3'), + "/{$locale}/downloads/" => _t('Download'), + "/{$locale}/for-pc/" => _t('For PC'), + "/{$locale}/for-server/" => _t('For server'), +); + +$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/about/index.php b/en/about/index.php index a32055976..f5dfefd5d 100644 --- a/en/about/index.php +++ b/en/about/index.php @@ -29,7 +29,7 @@ _lang_load($locale, "about"); <div id="doc" class="yui-t7"> <div id="bd" role="main"> <div class="yui-g"><div class="para" style="padding-top: 2em;"> - <img src="/g/media/logo/mageia-2011.svg" id="abtlg" alt="Mageia"> + <img src="/g/media/logo/mageia-2013.svg" id="abtlg" alt="Mageia"> <p><?php _e('Mageia is a GNU/Linux-based, Free Software operating system.'); _e('It is a <a href="../community/">community project</a>, supported by <a href="#mageia.org">a nonprofit organisation</a> of elected contributors.'); @@ -45,7 +45,7 @@ _lang_load($locale, "about"); _t('gathered <a href="../community/">hundreds of careful individuals and several companies worldwide</a>,'), _t('who coproduce the infrastructure, the distribution itself, <a href="http://wiki.mageia.org/">documentation</a>, <a href="../downloads/">delivery</a> and <a href="../support/">support</a>, using Free Software tools;'), '</li>'; - _h('released two major stable releases <a href="../1/">in June 2011</a> and <a href="../2/">in May 2012</a>.', null, 'li'); + _h('released three major stable releases <a href="../1/">in June 2011</a>, <a href="../2/">in May 2012</a> and in <a href="../3/">in May 2013</a>.', null, 'li'); ?></ul> <!-- <ul> diff --git a/en/for-pc/index.php b/en/for-pc/index.php index e28bb484c..53355221f 100644 --- a/en/for-pc/index.php +++ b/en/for-pc/index.php @@ -2,14 +2,14 @@ define('HLANG', true); require '../../langs.php'; -_lang_load($locale, '2'); +_lang_load($locale, '3'); ?> <!DOCTYPE html> <html lang="<?php echo $locale; ?>"> <head> <meta charset="utf-8"> - <title><?php _e('Mageia 2, for your PC')?></title> + <title><?php _e('Mageia 3, for your PC')?></title> <link rel="stylesheet" href="/g/style/all.css"> <style> .para { text-align: left; float: left; width: 250px; display: block; border-right: 1px solid #eef; border-bottom: 1px solid #eef; } @@ -19,8 +19,8 @@ _lang_load($locale, '2'); </head> <body class="downloads"> <?php echo $hsnav; ?> - <h1 id="mgnavtitle"><a href="../2/">Mageia 2</a> » <?php _e('for your PC')?></h1> - <?php include '../2/nav.php'; ?> + <h1 id="mgnavtitle"><a href="../3/">Mageia 3</a> » <?php _e('for your PC')?></h1> + <?php include '../3/nav.php'; ?> <div class="para" style="width: 600px;"> <section> <?php @@ -29,12 +29,12 @@ _lang_load($locale, '2'); _h('The total number is double that – and then if you consider the backports, and the packages in the Cauldron still testing... you\'ll see that Mageia users are spoiled for choice.'); _h('Here\'s a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:'); _h('Environments', null, 'h2'); - _h('Mageia 2 has all the major desktop environments:'); + _h('Mageia 3 has all the major desktop environments:'); ?> <ul> - <li>KDE4 SC 4.8.2,</li> - <li>GNOME 3.4,</li> - <li>XFCE 4.9,</li> + <li>KDE4 SC 4.10.2,</li> + <li>GNOME 3.6,</li> + <li>XFCE 4.10,</li> <li>LXDE,</li> <li>Razor-Qt,</li> <li>E17.</li> @@ -49,7 +49,7 @@ _lang_load($locale, '2'); <div class="para" style="width: 300px"> <?php _h('Web', null, 'h3'); - _h('Choose your web browser from Firefox ESR 10.0.4, Chromium-browser 180.1025.160, Epiphany 3.4.1 or Opera 11.64 – or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.8.2, Thunderbird ESR 10.0.4, Evolution 3.4.1 or maybe Claws-Mail or Mutt.'); + _h('Choose your web browser from Firefox ESR 17.0.6, Chromium-browser 26.0.1410.65, Epiphany 3.6.1 or Opera 12.15 – or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.8.2, Thunderbird ESR 17.0.6, Evolution 3.4.1 or maybe Claws-Mail or Mutt.'); ?> </div> <div class="para" style="width: 300px"> @@ -73,7 +73,7 @@ _lang_load($locale, '2'); <div class="para" style="width: 300px"> <?php _h('Sound', null, 'h3'); - _h('For playing audio files, choose from Amarok 2.5.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don\'t infringe local laws.'); + _h('For playing audio files, choose from Amarok 2.7.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don\'t infringe local laws.'); ?> </div> <div class="para" style="width: 300px"> @@ -90,9 +90,9 @@ _lang_load($locale, '2'); </div> <div class="para"> <?php - _h('For more information about these and other packages, check the <a href="%s">Mageia 2 Release notes</a>.', array('https://wiki.mageia.org/en/Mageia_2_Release_Notes')); + _h('For more information about these and other packages, check the <a href="%s">Mageia 3 Release notes</a>.', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes')); _h('You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.', array('http://mageia.madb.org/')); ?> </div> </body> -</html>
\ No newline at end of file +</html> diff --git a/en/for-server/index.php b/en/for-server/index.php index 675867ed7..dfa2d4f11 100644 --- a/en/for-server/index.php +++ b/en/for-server/index.php @@ -2,14 +2,14 @@ define('HLANG', true); require '../../langs.php'; -_lang_load($locale, '2'); +_lang_load($locale, '3'); ?> <!DOCTYPE html> <html lang="<?php echo $locale; ?>"> <head> <meta charset="utf-8"> - <title><?php _e('Mageia 2, for your server')?></title> + <title><?php _e('Mageia 3, for your server')?></title> <link rel="stylesheet" href="/g/style/all.css"> <style> .para { text-align: left; float: left; width: 250px; display: block; border-right: 1px solid #eef; border-bottom: 1px solid #eef; } @@ -19,38 +19,38 @@ _lang_load($locale, '2'); </head> <body class="downloads"> <?php echo $hsnav; ?> - <h1 id="mgnavtitle"><a href="../2/">Mageia 2</a> » <?php _e('for your server')?></h1> - <?php include '../2/nav.php'; ?> + <h1 id="mgnavtitle"><a href="../3/">Mageia 3</a> » <?php _e('for your server')?></h1> + <?php include '../3/nav.php'; ?> <div class="para" style="width: 600px;"> <section> <?php - _h('Mageia 2 has all the main services and server packages you will need to run your server.'); + _h('Mageia 3 has all the main services and server packages you will need to run your server.'); _h('Aside from the cross-section included here, you will find many others in the repositories: you can use rpmdrake to search for packages, or check the <a href="%s">Mageia App DB</a>.', array('http://mageia.madb.org')); _h('Administration', null, 'h3'); - _h('For centralised administration, we include puppet 2.7.11; we use it widely in <a href="%s">our own infrastructure</a>.', + _h('For centralised administration, we include puppet 2.7.21; we use it widely in <a href="%s">our own infrastructure</a>.', array('http://svnweb.mageia.org/adm/puppet/')); - _h('The entire High Availability stack has been updated, and now includes drbd 8.3.11, Corosync 2.0.0 and Pacemaker 1.1.7.'); + _h('The entire High Availability stack has been updated, and now includes drbd 8.4.2, Corosync 2.3.0 and Pacemaker 1.1.8.'); _h('Databases', null, 'h3'); - _h('Databases included are PostgreSQL 8.4.11; MariaDB, which replaces MySQL 5.5.23; BDB.'); - _h('And there are NoSQL servers too: CouchDB 1.1.1, Redis 2.4.8, Cassandra 1.4.0, MongoDB 2.0.3.'); + _h('Databases included are PostgreSQL 8.4; MariaDB, which replaces MySQL 5.5.28; BDB.'); + _h('And there are NoSQL servers too: CouchDB 1.2.1, Redis 2.6.5, Cassandra 1.4.0, MongoDB 2.2.2.'); _h('Servers', null, 'h3'); - _h('Web servers include Apache 2.2.22, Cherokee 1.2.101 and lighttpd 1.4.30.'); - _h('For file and directory sharing and network printing on heterogeneous networks, we have Samba 3.6.5, OpenLDAP 2.4.29 and Cups 1.5.2.'); - _h('Mail servers included with Mageia 2 are Postfix 2.8.8, Cyrus-imapd 2.4.13 and Dovecot 1.2.17.'); + _h('Web servers include Apache 2.4.4, Cherokee 1.2.101 and lighttpd 1.4.32.'); + _h('For file and directory sharing and network printing on heterogeneous networks, we have Samba 3.6.15, OpenLDAP 2.4.33 and Cups 1.5.4.'); + _h('Mail servers included with Mageia 3 are Postfix 2.9.6, Cyrus-imapd 2.4.17 and Dovecot 2.1.15.'); ?> </section> </div> <div class="para"> <?php - _h('For more information about these and other packages, check the <a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes">Mageia 2 Release notes</a>.'); + _h('For more information about these and other packages, check the <a href="https://wiki.mageia.org/en/Mageia_3_Release_Notes">Mageia 3 Release notes</a>.'); _h('You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.', array('http://mageia.madb.org/')); ?> </div> </body> -</html>
\ No newline at end of file +</html> diff --git a/en/map/index.php b/en/map/index.php index bfb6959f2..51a2afceb 100644 --- a/en/map/index.php +++ b/en/map/index.php @@ -37,7 +37,7 @@ $map = array( 't' => _t('Downloads'), 'l' => '/{L}/downloads/', 'i' => array( - array('t' => _t('3 (in development)'), 'l' => '/{L}/3/'), + 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/'), array('t' => _t('Download mirrors'), 'l' => 'http://mirrors.mageia.org/') diff --git a/en/support/index.php b/en/support/index.php index 2dbbc0aea..2da8185cd 100644 --- a/en/support/index.php +++ b/en/support/index.php @@ -43,7 +43,7 @@ _lang_load($locale, 'support'); _h('Updates', null, 'h2 id="updates"'); _h('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="../2/">Mageia 2</a>')); _h('You can install these from the Mageia Control Center.'); - _h('You may subscribe to our %s announce list to be notified of these.', array('<a href="https://ml.mageia.org/wwsympa-wrapper.fcgi/info/updates-announce">updates-announce</a>')); + _h('You may subscribe to our %s announce list to be notified of these.', array('<a href="https://ml.mageia.org/l/info/updates-announce">updates-announce</a>')); echo '<hr>'; _h('Lifecycle', null, 'h3'); @@ -51,6 +51,7 @@ _lang_load($locale, 'support'); echo '<ul class="hl">'; _h('Mageia 1 was supported until December 1st, 2012.', null, 'li'); _h('Mageia 2 will be supported until November 22nd, 2013.', null, 'li'); + _h('Mageia 3 will be supported until November 188888888nd, 2014.', null, 'li'); echo '</ul>'; echo '<hr>'; diff --git a/langs/en/3.en.lang b/langs/en/3.en.lang index d94378eb7..92fd54a87 100644 --- a/langs/en/3.en.lang +++ b/langs/en/3.en.lang @@ -100,6 +100,13 @@ Use LiveCDs and LiveDVDs for fresh new installs ONLY. ;DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 2! DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 2! +# added manually +;Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>. +Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>. + +# added manually +;see the <a href="%s" hreflang="en">upgrade guide</a> +see the <a href="%s" hreflang="en">upgrade guide</a> # en/3/download_index.php +88 ;Desktop diff --git a/langs/en/about.en.lang b/langs/en/about.en.lang index 95b462b9d..3d37a9720 100644 --- a/langs/en/about.en.lang +++ b/langs/en/about.en.lang @@ -60,11 +60,9 @@ gathered <a href="../community/">hundreds of careful individuals and several com ;who coproduce the infrastructure, the distribution itself, <a href="http://wiki.mageia.org/">documentation</a>, <a href="../downloads/">delivery</a> and <a href="../support/">support</a>, using Free Software tools; who coproduce the infrastructure, the distribution itself, <a href="http://wiki.mageia.org/">documentation</a>, <a href="../downloads/">delivery</a> and <a href="../support/">support</a>, using Free Software tools; - -# /en/about/index.php +48 -;released two major stable releases <a href="../1/">in June 2011</a> and <a href="../2/">in May 2012</a>. -released two major stable releases <a href="../1/">in June 2011</a> and <a href="../2/">in May 2012</a>. - +# /en/about/index.php +48 (modified manually) +;released three major stable releases <a href="../1/">in June 2011</a>, <a href="../2/">in May 2012</a> and in <a href="../3/">in May 2013</a>. +released three major stable releases <a href="../1/">in June 2011</a>, <a href="../2/">in May 2012</a> and in <a href="../3/">in May 2013</a>. # /en/about/index.php +69 ;<a href=%s>Mageia.Org's legal constitution</a> and <a href=%s>governance</a> rules; diff --git a/langs/en/map.en.lang b/langs/en/map.en.lang index 47fe0570f..b02aaabb9 100644 --- a/langs/en/map.en.lang +++ b/langs/en/map.en.lang @@ -86,9 +86,9 @@ Timeline Downloads -# en/map/index.php +40 (added manually) -;3 (in development) -3 (in development) +# en/map/index.php +40 (modified manually) +;3 (May 2013) +3 (May 2013) # en/map/index.php +42 diff --git a/langs/en/support.en.lang b/langs/en/support.en.lang index 82cdde8bc..b7f654069 100644 --- a/langs/en/support.en.lang +++ b/langs/en/support.en.lang @@ -90,6 +90,9 @@ Mageia 1 was supported until December 1st, 2012. ;Mageia 2 will be supported until November 22nd, 2013. Mageia 2 will be supported until November 22nd, 2013. +# added manually +;Mageia 3 will be supported until November 18nd, 2014. +Mageia 3 will be supported until November 18nd, 2014. # ../../svn/web/en/support/index.php +58 ;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through: diff --git a/langs/fr/about.fr.lang b/langs/fr/about.fr.lang index 30480557e..737994420 100755 --- a/langs/fr/about.fr.lang +++ b/langs/fr/about.fr.lang @@ -55,8 +55,8 @@ qui coproduisent l’infrastructure, la distribution Mageia elle-même, sa < # /en/about/index.php +51 -;released two major stable releases <a href="../1/">in June 2011</a> and <a href="../2/">in May 2012</a>. -a publié deux versions stables majeures <a href="../1/">en juin 2011</a> et <a href="../2/">en mai 2012</a>. +;released three major stable releases <a href="../1/">in June 2011</a>, <a href="../2/">in May 2012</a> and in <a href="../3/">in May 2013</a>. +a publié trois versions stables majeures <a href="../1/">en juin 2011</a>, <a href="../2/">en mai 2012</a>, et <a href="../3/">en mai 2013</a>. ;<a href=%s>Mageia.Org's legal constitution</a> and <a href=%s>governance</a> rules; <a href=%s>statuts de l’association Mageia.Org</a>, <a href=%s>règles de gouvernance</a> ; diff --git a/langs/fr/map.fr.lang b/langs/fr/map.fr.lang index 623fa432c..8df6c809e 100644 --- a/langs/fr/map.fr.lang +++ b/langs/fr/map.fr.lang @@ -87,9 +87,8 @@ Téléchargements # en/map/index.php +40 (added manually) -;3 (in development) -3 (en développement) - +;3 (May 2013) +3 (mai 2013) # en/map/index.php +42 ;2 (May 2012) diff --git a/langs/fr/support.fr.lang b/langs/fr/support.fr.lang index bc9fbc6d3..90653938a 100755 --- a/langs/fr/support.fr.lang +++ b/langs/fr/support.fr.lang @@ -70,6 +70,9 @@ Mageia 1 a été maintenue jusqu'au 1<sup>er</sup> décembre 2012. ;Mageia 2 will be supported until November 22nd, 2013. Mageia 2 sera maintenue jusqu'au 22 novembre 2013. +# add manually +;Mageia 3 will be supported until November 18nd, 2014. +Mageia 3 sera maintenue jusqu'au 18 novembre 2014. ;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through: Si vous avez besoin d’aide ou d’information sur Mageia, après ou avant l’installation, ou sur le projet, vous pouvez nous rejoindre (utilisateurs et contributeurs au projet) via : |