From 2d7236cbfed7124cd82ddfab87fe00b23ed94648 Mon Sep 17 00:00:00 2001 From: Manuel Hiebel Date: Sat, 18 May 2013 16:36:53 +0000 Subject: prepare mageia 3 web site --- en/2/for-pc/index.php | 98 +++++++++++++++++++++++++++++++++++++++++++++++ en/2/for-server/index.php | 56 +++++++++++++++++++++++++++ en/2/index.php | 4 +- en/2/nav.php | 6 +-- en/3/download_index.php | 4 +- en/3/nav.php | 46 ++++++++++++++++++++++ en/about/index.php | 4 +- en/for-pc/index.php | 24 ++++++------ en/for-server/index.php | 28 +++++++------- en/map/index.php | 2 +- en/support/index.php | 3 +- langs/en/3.en.lang | 7 ++++ langs/en/about.en.lang | 8 ++-- langs/en/map.en.lang | 6 +-- langs/en/support.en.lang | 3 ++ langs/fr/about.fr.lang | 4 +- langs/fr/map.fr.lang | 5 +-- langs/fr/support.fr.lang | 3 ++ 18 files changed, 261 insertions(+), 50 deletions(-) create mode 100644 en/2/for-pc/index.php create mode 100644 en/2/for-server/index.php create mode 100644 en/3/nav.php 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 _e('Mageia 2, for your PC')?> + + + + + + +

Mageia 2 »

+ +
+
+ +
    +
  • KDE4 SC 4.8.2,
  • +
  • GNOME 3.4,
  • +
  • XFCE 4.9,
  • +
  • LXDE,
  • +
  • Razor-Qt,
  • +
  • E17.
  • +
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ Mageia 2 Release notes.', array('https://wiki.mageia.org/en/Mageia_2_Release_Notes')); + _h('You can take a look at the Mageia Application Database to get a more complete list of Mageia packages.', array('http://mageia.madb.org/')); + ?> +
+ + 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 _e('Mageia 2, for your server')?> + + + + + + +

Mageia 2 »

+ +
+
+ Mageia App DB.', + array('http://mageia.madb.org')); + + _h('Administration', null, 'h3'); + _h('For centralised administration, we include puppet 2.7.11; we use it widely in our own infrastructure.', + 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.'); + ?> +
+
+
+ Mageia 2 Release notes.'); + _h('You can take a look at the Mageia Application Database to get a more complete list of Mageia packages.', + array('http://mageia.madb.org/')); + ?> +
+ + 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');
- Mageia 2 + Mageia 2 Mageia community.', array('../community')); @@ -47,4 +47,4 @@ _lang_load($locale, '2');
- \ No newline at end of file + 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';

Mageia 3')?>

- +
@@ -182,7 +182,7 @@ require '../downloads/get/lib.php'; '; - _e('It is here now.', array('../2/download_index.php')); + _e('It is here now.', array('/2/')); echo '

'; ?>
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 @@ + 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('
  • %s
  • ', + $k, + $k == $sru ? ' class="sel"' : null, + $v); +} +$pnav = implode($pnav); + +echo <<
      {$pnav}
    +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");
    - Mageia + Mageia

    community project, supported by a nonprofit organisation of elected contributors.'); @@ -45,7 +45,7 @@ _lang_load($locale, "about"); _t('gathered hundreds of careful individuals and several companies worldwide,'), _t('who coproduce the infrastructure, the distribution itself, documentation, delivery and support, using Free Software tools;'), ''; - _h('released two major stable releases in June 2011 and in May 2012.', null, 'li'); + _h('released three major stable releases in June 2011, in May 2012 and in in May 2013.', null, 'li'); ?>